diff --git a/.gitignore b/.gitignore index 2e7dfe16e7b..837249e00a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ log +config/piwik.yml public/assets public/attachments +public/export tmp .DS_Store *~ +doc diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000000..68390769855 --- /dev/null +++ b/.mailmap @@ -0,0 +1,6 @@ +Andrzej Zaborowski +Andy Allan +Grant Slater +Harry Wood +Kai Krueger +Richard Fairhurst diff --git a/CONFIGURE.md b/CONFIGURE.md new file mode 100644 index 00000000000..8cae440bdd4 --- /dev/null +++ b/CONFIGURE.md @@ -0,0 +1,117 @@ +# Configuration + +After [installing](INSTALL.md) this software, you may need to carry out some of these configuration steps, depending on your tasks. + +## 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. + +* Use this [yet-to-be-written script](https://github.com/openstreetmap/openstreetmap-website/issues/282) + +## Managing Users + +If you create a user by signing up to your local website, you need to confirm the user before you can log in, which normally happens by clicking a link sent via email. If don't want to set up your development box to send emails to public email addresses then you can create the user as normal and then confirm it manually through the Rails console: + +``` +$ bundle exec rails console +>> user = User.find_by_display_name("My New User Name") +=> #[ ... ] +>> user.status = "active" +=> "active" +>> user.save! +=> true +>> quit +``` + +### Giving Administrator/Moderator Permissions + +To give administrator or moderator permissions: + +``` +$ bundle exec rails console +>> user = User.find_by_display_name("My New User Name") +=> #[ ... ] +>> user.roles.create(:role => "administrator", :granter_id => user.id) +=> #[ ... ] +>> user.roles.create(:role => "moderator", :granter_id => user.id) +=> #[ ... ] +>> user.save! +=> true +>> quit +``` + +## OAuth Consumer Keys + +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. + +Do the following: +* Log into your Rails Port instance - e.g. http://localhost:3000 +* Click on your user name to go to your user page +* 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" +* 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/application.yml in your rails tree +* Uncomment and change the "potlatch2_key" configuration value +* Restart your rails server + +An example excerpt from application.yml: + +``` +# Default editor +default_editor: "potlatch2" +# OAuth consumer key for Potlatch 2 +potlatch2_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. + +## Troubleshooting + +Rails has its own log. To inspect the log, do this: + +``` +tail -f log/development.log +``` + +If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](http://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](http://wiki.openstreetmap.org/wiki/IRC) + +## Maintaining your installation + +If your installation stops working for some reason: + +* Sometimes gem dependencies change. To update go to your rails_port directory and run ''bundle install'' as root. + +* The OSM database schema is changed periodically and you need to keep up with these improvements. Go to your rails_port directory and run: + +``` +bundle exec rake db:migrate +``` + +## Testing on the osm dev server + +For example, after developing a patch for the rails_port, you might want to demonstrate it to others or ask for comments and testing. To do this one can [set up an instance of the rails_port on the dev server in ones user directory](http://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). + +# Contributing + +For information on contributing changes to the codes, see [CONTRIBUTING.md](CONTRIBUTING.md) + +# Production Deployment + +If you want to deploy The Rails Port for production use, you'll need to make a few changes. + +* It's not recommended to use `rails server` in production. Our recommended approach is to use [Phusion Passenger](https://www.phusionpassenger.com/). +* Passenger will, by design, use the Production environment and therefore the production database - make sure it contains the appropriate data and user accounts. +* Your production database will also need the extensions and functions installed - see [INSTALL.md](INSTALL.md) +* The included version of the map call is quite slow and eats a lot of memory. You should consider using [CGIMap](https://github.com/zerebubuth/openstreetmap-cgimap) instead. +* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](http://git.openstreetmap.org/gpx-import.git/). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000000..9da33fe8c21 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,99 @@ +* http://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials. +* http://rubyonrails.org/ - The homepage of Rails, also has links and tutorials + +## Coding style + +When writing code it is generally a good idea to try and match your +formatting to that of any existing code in the same file, or to other +similar files if you are writing new code. Consistency of layout is +far more important that the layout itself as it makes reading code +much easier. + +One golden rule of formatting -- please don't use tabs in your code +as they will cause the file to be formatted differently for different +people depending on how they have their editor configured. + +## Testing + +Having a good suite of tests is very important to the stability and +maintainability of any code base. The tests in the Rails port code are +by no means complete, but they are extensive, and must continue to be +so with any new functionality which is written. Tests are also useful +in giving others confidence in the code you've written, and can +greatly speed up the process of merging in new code. + +When hacking, you should: + +* Write new tests to cover the new functionality you've added. +* Where appropriate, modify existing tests to reflect new or changed +functionality. +* Never comment out or remove a test just because it doesn't pass. + +You can run the existing test suite with: + +``` +bundle exec rake test +``` + +You can generate test coverage stats with: + +``` +sudo gem install rcov +rcov -x gems test/*/*.rb +``` + +The tests are automatically run on commit with the results shown at [http://cruise.openstreetmap.org/](http://cruise.openstreetmap.org/) + +## Comments + +Sometimes it's not apparent from the code itself what it does, or, +more importantly, **why** it does that. Good comments help your fellow +developers to read the code and satisfy themselves that it's doing the +right thing. + +When hacking, you should: + +* Comment your code - don't go overboard, but explain the bits which +might be difficult to understand what the code does, why it does it +and why it should be the way it is. +* Check existing comments to ensure that they are not misleading. + +## Code Documentation + +To generate the HTML documentation of the API/rails code, run the command + +``` +rake doc:app +``` + +## Committing + +When you submit patches, the project maintainer has to read them and +understand them. This is difficult enough at the best of times, and +misunderstanding patches can lead to them being more difficult to +merge. To help with this, when submitting you should: + +* Split up large patches into smaller units of functionality. +* Keep your commit messages relevant to the changes in each individual +unit. + +When writing commit messages please try and stick to the same style as +other commits, namely: + +* A one line summary, starting with a capital and with no full stop. +* A blank line. +* Full description, as proper sentences with capitals and full stops. + +For simple commits the one line summary is often enough and the body +of the commit message can be left out. + +## Sending the patches + +If you have forked on GitHub then the best way to submit your patches is to +push your changes back to GitHub and then send a "pull request" on GitHub. + +Otherwise you should either push your changes to a publicly visible git repository +and send the details to the [rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) +list or generate patches with `git format-patch` and send them to the +[rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) list. + diff --git a/Gemfile b/Gemfile index 6629e350576..d98a2a1fcc8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,41 +1,62 @@ -# Gem source to use source 'http://rubygems.org' # Require rails -gem 'rails', '3.2.6' +gem 'rails', '4.0.3' # Require things which have moved to gems in ruby 1.9 -gem 'bigdecimal', :platforms => :ruby_19 +gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 -# Require the postgres database driver +# Require things which have moved to gems in ruby 2.0 +gem 'psych', :platforms => :ruby_20 + +# Require json for multi_json +gem 'json' + +# Use postgres as the database gem 'pg' -# Load jquery support +# Use SCSS for stylesheets +gem 'sass-rails', '~> 4.0.0' + +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' + +# Use CoffeeScript for .js.coffee assets and views +gem 'coffee-rails', '~> 4.0.0' + +# Use jquery as the JavaScript library gem 'jquery-rails' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 1.2' +gem 'jsonify-rails' + +# Use R2 for RTL conversion +gem 'r2' + # Load rails plugins -gem 'rails-i18n', ">= 0.6.3" +gem 'rails-i18n', "~> 4.0.0" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin' +gem 'oauth-plugin', '>= 0.5.1' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' -gem 'composite_primary_keys', '>= 5.0.8' -gem 'http_accept_language', '>= 1.0.2' -gem 'paperclip', '~> 2.0' +gem 'composite_primary_keys', '>= 6.0.1' +gem 'http_accept_language', '~> 2.0.0' +gem 'paperclip', '~> 4.0' gem 'deadlock_retry', '>= 1.2.0' +gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.3', :require => 'i18n-js' +gem 'rack-cors' +gem 'actionpack-page_caching' # We need ruby-openid 2.2.0 or later for ruby 1.9 support gem 'ruby-openid', '>= 2.2.0' -# Browser detection support -gem 'browser' - # Markdown formatting support gem 'redcarpet' # Character conversion support for ruby 1.8 -gem 'iconv', :platforms => :ruby_18 +gem 'iconv', '= 0.1', :platforms => :ruby_18 # Load libxml support for XML parsing and generation gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml' @@ -47,22 +68,27 @@ gem 'htmlentities' # Load SystemTimer for implementing request timeouts gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18 -# Load httpclient for SOAP support for Quova GeoIP queries +# Load httpclient and soap4r for SOAP support for Quova GeoIP queries gem 'httpclient' +gem 'soap4r-ruby1.9' -# Load memcache in case we are using it -gem 'memcached', '>= 1.4.1' +# Load memcache client in case we are using it +gem 'dalli' +gem 'kgio' + +# Gems useful for development +group :development do + gem 'vendorer' +end # Gems needed for running tests group :test do gem 'timecop' - gem 'minitest', :platforms => :ruby_19 + gem 'minitest', '~> 4.7.0', :platforms => [:ruby_19, :ruby_20] end -# Gems needed for compiling assets -group :assets do - gem 'sass-rails', '~> 3.2.3' - gem 'coffee-rails', '~> 3.2.1' - gem 'uglifier', '>= 1.0.3' - gem 'therubyracer' +# Needed in development as well so rake can see konacha tasks +group :development, :test do + gem 'konacha' + gem 'poltergeist' end diff --git a/Gemfile.lock b/Gemfile.lock index f6e1bf4ca07..d477fcfca67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,190 +2,233 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.6) - actionpack (= 3.2.6) - mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) + actionmailer (4.0.3) + actionpack (= 4.0.3) + mail (~> 2.5.4) + actionpack (4.0.3) + activesupport (= 4.0.3) + builder (~> 3.1.0) erubis (~> 2.7.0) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionpack-page_caching (1.0.2) + actionpack (>= 4.0.0, < 5) + activemodel (4.0.3) + activesupport (= 4.0.3) + builder (~> 3.1.0) + activerecord (4.0.3) + activemodel (= 4.0.3) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.3) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.3) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + arel (4.0.2) + atomic (1.1.15) bigdecimal (1.1.0) - browser (0.1.4) - builder (3.0.0) - cocaine (0.2.1) - coffee-rails (3.2.2) + builder (3.1.4) + capybara (2.2.1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + climate_control (0.0.3) + activesupport (>= 3.0) + cliver (0.3.2) + cocaine (0.5.3) + climate_control (>= 0.0.3, < 1.0) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.3.3) - composite_primary_keys (5.0.8) - activerecord (~> 3.2.0) + coffee-script-source (1.7.0) + colorize (0.6.0) + composite_primary_keys (6.0.1) + activerecord (>= 4.0.0) + dalli (2.7.0) deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - faraday (0.8.1) - multipart-post (~> 1.1) - hike (1.2.1) + execjs (2.0.2) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + hike (1.2.3) htmlentities (4.3.1) - http_accept_language (1.0.2) - httpauth (0.1) - httpclient (2.2.5) - i18n (0.6.0) + http_accept_language (2.0.1) + httpclient (2.3.4.1) + i18n (0.6.9) iconv (0.1) - journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.7.3) - jwt (0.1.4) - json (>= 1.2.4) - libv8 (3.3.10.4) - libxml-ruby (2.3.3) - mail (2.4.4) - i18n (>= 0.4.0) + jquery-rails (3.1.0) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.1) + jsonify (0.3.1) + multi_json (~> 1.0) + jsonify-rails (0.3.2) + actionpack + jsonify (< 0.4.0) + jwt (0.1.11) + multi_json (>= 1.5) + kgio (2.9.2) + konacha (3.1.0) + actionpack (>= 3.1, < 5) + capybara + colorize + railties (>= 3.1, < 5) + sprockets + libxml-ruby (2.7.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - memcached (1.4.3) - mime-types (1.19) - minitest (3.2.0) - multi_json (1.3.6) - multipart-post (1.1.5) - nokogiri (1.5.5) - oauth (0.4.6) - oauth-plugin (0.4.1) + mime-types (1.25.1) + mini_portile (0.5.2) + minitest (4.7.5) + multi_json (1.8.4) + multi_xml (0.5.5) + multipart-post (2.0.0) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) + oauth (0.4.7) + oauth-plugin (0.5.1) multi_json oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (0.8.0) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (0.9.3) + faraday (>= 0.8, < 0.10) + jwt (~> 0.1.8) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) - open_id_authentication (1.1.0) + open_id_authentication (1.2.0) rack-openid (~> 1.3) - paperclip (2.7.0) - activerecord (>= 2.3.0) - activesupport (>= 2.3.2) - cocaine (>= 0.0.2) + openstreetmap-i18n-js (3.0.0.rc5.3) + i18n + paperclip (4.1.1) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.3) mime-types - pg (0.14.0) - polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-openid (1.3.1) + pg (0.17.1) + poltergeist (1.5.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.4) + psych (2.0.4) + r2 (0.2.2) + rack (1.5.2) + rack-cors (0.2.9) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) - bundler (~> 1.0) - railties (= 3.2.6) - rails-i18n (0.6.5) - i18n (~> 0.5) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) - rack-ssl (~> 1.3.2) + rails (4.0.3) + actionmailer (= 4.0.3) + actionpack (= 4.0.3) + activerecord (= 4.0.3) + activesupport (= 4.0.3) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.3) + sprockets-rails (~> 2.0.0) + rails-i18n (4.0.1) + i18n (~> 0.6) + rails (~> 4.0) + railties (4.0.3) + actionpack (= 4.0.3) + activesupport (= 4.0.3) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - redcarpet (2.1.1) - rinku (1.7.0) - ruby-openid (2.2.0) - sanitize (2.0.3) - nokogiri (>= 1.4.4, < 1.6) - sass (3.1.20) - sass-rails (3.2.5) - railties (~> 3.2.0) + thor (>= 0.18.1, < 2.0) + rake (10.1.1) + redcarpet (3.1.1) + rinku (1.7.3) + ruby-openid (2.5.0) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.2.14) + sass-rails (4.0.1) + railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) - tilt (~> 1.3) - sprockets (2.1.3) + sprockets-rails (~> 2.0.0) + soap4r-ruby1.9 (2.0.5) + sprockets (2.11.0) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - therubyracer (0.10.1) - libv8 (~> 3.3.10) - thor (0.15.4) - tilt (1.3.3) - timecop (0.3.5) - treetop (1.4.10) + sprockets-rails (2.0.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + thor (0.18.1) + thread_safe (0.2.0) + atomic (>= 1.1.7, < 2) + tilt (1.4.1) + timecop (0.7.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (1.2.6) + tzinfo (0.3.38) + uglifier (2.4.0) execjs (>= 0.3.0) - multi_json (~> 1.3) + json (>= 1.8.0) validates_email_format_of (1.5.3) + vendorer (0.1.14) + websocket-driver (0.3.2) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES SystemTimer (>= 1.1.3) - bigdecimal - browser - coffee-rails (~> 3.2.1) - composite_primary_keys (>= 5.0.8) + actionpack-page_caching + bigdecimal (~> 1.1.0) + coffee-rails (~> 4.0.0) + composite_primary_keys (>= 6.0.1) + dalli deadlock_retry (>= 1.2.0) dynamic_form htmlentities - http_accept_language (>= 1.0.2) + http_accept_language (~> 2.0.0) httpclient - iconv + iconv (= 0.1) jquery-rails + json + jsonify-rails + kgio + konacha libxml-ruby (>= 2.0.5) - memcached (>= 1.4.1) - minitest - oauth-plugin (>= 0.4.1) + minitest (~> 4.7.0) + oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) - paperclip (~> 2.0) + openstreetmap-i18n-js (>= 3.0.0.rc5.3) + paperclip (~> 4.0) pg - rails (= 3.2.6) - rails-i18n (>= 0.6.3) + poltergeist + psych + r2 + rack-cors + rails (= 4.0.3) + rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) ruby-openid (>= 2.2.0) sanitize - sass-rails (~> 3.2.3) - therubyracer + sass-rails (~> 4.0.0) + soap4r-ruby1.9 timecop - uglifier (>= 1.0.3) + uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) + vendorer diff --git a/INSTALL.md b/INSTALL.md new file mode 100644 index 00000000000..2f954d1060f --- /dev/null +++ b/INSTALL.md @@ -0,0 +1,226 @@ +# Installation + +These instructions are designed for setting up The Rails Port for development and testing. +If you want to deploy the software for your own project, then see the notes at the end. + +These instructions are based on Ubuntu 12.04 LTS, which is the platform used by the OSMF servers. +The instructions also work, with only minor amendments, for all other current Ubuntu releases, Fedora and MacOSX + +We don't recommend attempting to develop or deploy this software on Windows. If you need to use Windows, then +try developing this sofware using Ubuntu in a virtual machine. + +## Dependencies + +Many of the dependencies are managed through the standard Ruby on Rails mechanisms - +i.e. ruby gems specified in the Gemfile and installed using bundler. However, there are a large number +of packages required before you can get the various gems installed. + +## Minimum requirements + +* Ruby 1.9.3 +* RubyGems 1.3.1+ +* Postgres 8.3+ +* ImageMagick +* Bundler +* Javascript Runtime + +These can be installed on Ubuntu 10.10 or later with: + +``` +sudo apt-get install ruby1.9.1 libruby1.9.1 ruby1.9.1-dev ri1.9.1 \ + libmagickwand-dev libxml2-dev libxslt1-dev nodejs \ + apache2 apache2-threaded-dev build-essential git-core \ + postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \ + libsasl2-dev +gem1.9.1 install bundle +``` + +Note that the "1.9.1" Ubuntu packages do in fact contain ruby 1.9.3. + +### Alternative platforms + +#### Fedora + +For Fedora, you can install the minimum requirements with: + +``` +sudo yum install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \ + libxml2-devel js \ + gcc gcc-c++ git \ + postgresql postgresql-server postgresql-contrib postgresql-devel \ + perl-podlators +``` + +If you didn't already have Postgres installed then create a Postgres instance and start the server: + +``` +sudo postgresql-setup initdb +sudo systemctl start postgresql.service +``` + +Optionally set Postgres to start on boot: + +``` +sudo systemctl enable postgresql.service +``` + +#### MacOSX + +For MacOSX, you will need XCode installed from the Mac App Store; OS X 10.7 (Lion) or later; and some familiarity with Unix development via the Terminal. + +Installing Postgres: + +* Install Postgres.app from http://postgresapp.com/ +* Add Postgres to your path, by editing your profile: + +`nano ~/.profile` + +and adding: + +`export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH` + +Installing other dependencies: + +* Install Homebrew from http://mxcl.github.io/homebrew/ +* Install the latest version of Ruby: brew install ruby +* Install ImageMagick: brew install imagemagick +* Install Bundler: gem install bundler + +Note that OS X does not have a /home directory by default, so if you are using the GPX functions, you will need to change the directories specified in config/application.yml. + +## Cloning the repository + +The repository is reasonably large (~150MB) and it's unlikely that you need the full history. If you are happy to wait for it all to download, run: + +``` +git clone https://github.com/openstreetmap/openstreetmap-website.git +``` + +To clone only the most recent version (~23MB), instead use a 'shallow clone': + +``` +git clone --depth=1 https://github.com/openstreetmap/openstreetmap-website.git +``` + +If you want to add in the full history later on, perhaps to run `git blame` or `git log`, run `git fetch --depth=1000000` + + +## Ruby gems + +We use [Bundler](http://gembundler.com/) to manage the rubygems required for the project. + +``` +cd openstreetmap-website +bundle install +``` + +## Application setup + +We need to create the `config/application.yml` file from the example template. This contains various configuration options. + +``` +cp config/example.application.yml config/application.yml +``` + +You can customize your installation of The Rails Port by changing the values in `config/application.yml` + +## Database setup + +The Rails Port uses three databases - one for development, one for testing, and one for production. The database-specific configuration +options are stored in `config/database.yml`, which we need to create from the example template. + +``` +cp config/example.database.yml config/database.yml +``` + +PostgreSQL is configured to, by default, accept local connections without requiring a username or password. This is fine for development. +If you wish to set up your database differently, then you should change the values found in the `config/database.yml` file, and amend the +instructions below as appropriate. + +### PostgreSQL account setup + +We need to create a PostgreSQL role (i.e. user account) for your current user, and it needs to be a superuser so that we can create more database. + +``` +sudo -u postgres -i +createuser -s +exit +``` + +### Create the databases + +To create the three databases - for development, testing and production - run: + +``` +bundle exec rake db:create +``` + +### PostgreSQL Btree-gist Extension + +We need to load the btree-gist extension, which is needed for showing changesets on the history tab. + +For PostgreSQL < 9.1 (change the version number in the path as necessary): + +``` +psql -d openstreetmap < /usr/share/postgresql/9.0/contrib/btree_gist.sql +``` + +For PostgreSQL >= 9.1: + +``` +psql -d openstreetmap -c "CREATE EXTENSION btree_gist" +``` + +### PostgreSQL Functions + +We need to install special functions into the postgresql databases, and these are provided by a library that needs compiling first. + +``` +cd db/functions +make libpgosm.so +cd ../.. +``` + +Then we create the functions within each database. We're using `pwd` to substitute in the current working directory, since PostgreSQL needs the full path. + +``` +psql -d openstreetmap -c "CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '`pwd`/db/functions/libpgosm', 'maptile_for_point' LANGUAGE C STRICT" +psql -d openstreetmap -c "CREATE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '`pwd`/db/functions/libpgosm', 'tile_for_point' LANGUAGE C STRICT" +psql -d openstreetmap -c "CREATE FUNCTION xid_to_int4(xid) RETURNS int4 AS '`pwd`/db/functions/libpgosm', 'xid_to_int4' LANGUAGE C STRICT" +``` + +### Database structure + +To create all the tables, indexes and constraints, run: + +``` +bundle exec rake db:migrate +``` + +## Running the tests + +To ensure that everything is set up properly, you should now run: + +``` +bundle exec rake test +``` + +This test will take a few minutes, reporting tests run, assertions, and any errors. If you receive no errors, then your installation is successful. + +The unit tests may output parser errors related to "Attribute lat redefined." These can be ignored. + +### Starting the server + +Rails comes with a built-in webserver, so that you can test on your own machine without needing a server. Run + +``` +bundle exec rails server +``` + +You can now view the site in your favourite web-browser at `http://localhost:3000/` + +Note that the OSM map tiles you see aren't created from your local database - they are just the standard map tiles. + +# Configuration + +After installing this software, you may need to carry out some [configuration steps](CONFIGURE.md), depending on your tasks. diff --git a/README.md b/README.md index 4579b9b80b5..90a9b93ef4a 100644 --- a/README.md +++ b/README.md @@ -1,135 +1,40 @@ -# Description +# "The Rails Port" -This is the Rails port, the [Ruby on Rails](http://rubyonrails.org/) -application that powers [OpenStreetMap](http://www.openstreetmap.org). +This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/) +application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API. +The software is also known as "openstreetmap-website". -The Rails port provides almost all the services which are available -on the OpenStreetMap site, including: +This repository consists of: -* The web site itself, including the edit pages. -* The editing [API](http://wiki.openstreetmap.org/wiki/API_v0.6). -* Browse pages - a web front-end to the OpenStreetMap data. -* The user system, including preferences, diary entries, friends and - user-to-user messaging. -* GPX uploads, browsing and API. +* The web site, including user accounts, diary entries, user-to-user messaging +* The XML-based editing [API](http://wiki.openstreetmap.org/wiki/API_v0.6) +* The integrated versions of the [Potlatch](http://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](http://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](http://wiki.openstreetmap.org/wiki/ID) editors +* The Browse pages - a web front-end to the OpenStreetMap data +* The GPX uploads, browsing and API. -There are some non-Rails services which the site includes, for -example; tiles, geocoding, GPX file loading. There are also some -utilities which provide other services on the OpenStreetMap site, -or improve its function, but are not integrated with the Rails -port, for example; Osmosis, CGImap. +A fully-functional Rails Port installation depends on other services, including map tile +servers and geocoding services, that are provided by other software. The default installation +uses publically-available services to help with development and testing. # License This software is licensed under the [GNU General Public License 2.0](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt), -a copy of which can be found in the LICENSE file. +a copy of which can be found in the [LICENSE](LICENSE) file. -# Running it +# Installation -You can find documentation on [how to setup and -run](http://wiki.openstreetmap.org/wiki/The_Rails_Port) the software -on the OpenStreetMap wiki. +The Rails Port is a Ruby on Rails application that uses PostgreSQL as its database, and has a large +number of dependencies for installation. For full details please see [INSTALL.md](INSTALL.md) -# Hacking it +# Development -The canonical Git repository for this software is hosted at -[git.openstreetmap.org](http://git.openstreetmap.org/?p=rails.git), -but much of the development is done on GitHub and for most people -[this repository on Github](https://github.com/openstreetmap/openstreetmap-website) -will be a better place to start. +We're always keen to have more developers! Pull requests are very welcome. -Anybody hacking on the code is welcome to join the -[rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) mailing -list where other people hacking on the code hang out and will be happy -to help with any problems you may encounter. If you are looking for a -project to help out with, please take a look at the list of -[Top Ten Tasks](http://wiki.openstreetmap.org/wiki/Top_Ten_Tasks) that -EWG maintains on the wiki. - -There are also weekly IRC meetings, at 1800 GMT on Mondays in #osm-ewg on -the OFTC network where questions can be asked and ideas discussed. For more -information, please see [the EWG page] -(http://www.osmfoundation.org/wiki/Engineering_Working_Group#Meetings). You can -join the channel using your favourite IRC client or [irc.openstreetmap.org](http://irc.openstreetmap.org/). - -## Rails - -If you're not already familiar with Ruby on Rails then it's probably -worth having a look at [Rails Guides](http://guides.rubyonrails.org/) for an introduction. - -While working with Rails you will probably find the [API documentation](http://api.rubyonrails.org/) -helpful as a reference. - -## Coding style - -When writing code it is generally a good idea to try and match your -formatting to hat of any existing code in the same file, or to other -similar files if you are writing new code. Consistency of layout is -far more important that the layout itself as it makes reading code -much easier. - -One golden rule of formatting -- please don't use tabs in your code -as they will cause the file to be formatted differently for different -people depending on how they have their editor configured. - -## Testing - -Having a good suite of tests is very important to the stability and -maintainability of any code base. The tests in the Rails port code are -by no means complete, but they are extensive, and must continue to be -so with any new functionality which is written. Tests are also useful -in giving others confidence in the code you've written, and can -greatly speed up the process of merging in new code. - -When hacking, you should: - -* Write new tests to cover the new functionality you've added. -* Where appropriate, modify existing tests to reflect new or changed -functionality. -* Never comment out or remove a test just because it doesn't pass. - -## Comments - -Sometimes it's not apparent from the code itself what it does, or, -more importantly, **why** it does that. Good comments help your fellow -developers to read the code and satisfy themselves that it's doing the -right thing. - -When hacking, you should: - -* Comment your code - don't go overboard, but explain the bits which -might be difficult to understand what the code does, why it does it -and why it should be the way it is. -* Check existing comments to ensure that they are not misleading. - -## Committing - -When you submit patches, the project maintainer has to read them and -understand them. This is difficult enough at the best of times, and -misunderstanding patches can lead to them being more difficult to -merge. To help wit this, when submitting you should: - -* Split up large patches into smaller units of functionality. -* Keep your commit messages relevant to the changes in each individual -unit. - -When writing commit messages please try and stick to the same style as -other commits, namely: - -* A one line summary, starting with a capital and with no full stop. -* A blank line. -* Full description, as proper sentences with capitals and full stops. - -For simple commits the one line summary is often enough and the body -of the commit message can be left out. - -## Sending the patches - -If you have forked on GitHub then the best way to submit your patches is to -push your changes back to GitHub and then send a "pull request" on GitHub. - -Otherwise you should either push your changes to a publicly visible git repository -and send the details to the [rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) -list or generate patches with `git format-patch` and send them to the -[rails-dev](http://lists.openstreetmap.org/listinfo/rails-dev) list. +* Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues). +* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components +* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) +* There is a [rails-dev@openstreetmap.org](http://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. +* IRC - there is the #osm-dev channel on irc.oftc.net. +* There are also weekly meetings of the OpenStreetMap Foundation Engineering Working Group (EWG) on Mondays at 1700 UTC on the #osm-ewg channel. +More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTING.md) file. diff --git a/Vendorfile b/Vendorfile new file mode 100644 index 00000000000..0cca4055cba --- /dev/null +++ b/Vendorfile @@ -0,0 +1,58 @@ +folder 'vendor/assets' do + folder 'jquery' do + file 'jquery.cookie.js', 'https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js' + file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js' + file 'jquery.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.js' + end + + folder 'bootstrap' do + file 'bootstrap.tooltip.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js' + file 'bootstrap.dropdown.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.js' + end + + folder 'leaflet' do + file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet-src.js' + file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.2/leaflet.css' + + [ 'layers.png', 'layers-2x.png', + 'marker-icon.png', 'marker-icon-2x.png', + 'marker-shadow.png' ].each do |image| + file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.2/images/#{image}" + end + + from 'git://github.com/kajic/leaflet-locationfilter.git' do + file 'leaflet.locationfilter.css', 'src/locationfilter.css' + file 'leaflet.locationfilter.js', 'src/locationfilter.js' + folder 'img', 'src/img' + end + + from 'git://github.com/domoritz/leaflet-locatecontrol.git' do + file 'leaflet.locate.js', 'src/L.Control.Locate.js' + end + + from 'git://github.com/jfirebaugh/leaflet-osm.git' do + file 'leaflet.osm.js', 'leaflet-osm.js' + end + end + + folder 'ohauth' do + from 'git://github.com/osmlab/ohauth.git' do + file 'ohauth.js' + end + end + + folder 'iD' do + from 'git://github.com/openstreetmap/iD', :branch => 'release' do + folder 'iD/img', 'dist/img' + folder 'iD/locales', 'dist/locales' + file 'iD.css.erb', 'dist/iD.css' do |path| + rewrite(path) { |content| content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') } + end + file 'iD.js', 'dist/iD.js' + end + end + + folder 'javascripts' do + file 'html5shiv.js', 'https://raw.github.com/aFarkas/html5shiv/master/src/html5shiv.js' + end +end diff --git a/app/assets/images/NoteMarker.svg b/app/assets/images/NoteMarker.svg new file mode 100644 index 00000000000..47b7bb5712e --- /dev/null +++ b/app/assets/images/NoteMarker.svg @@ -0,0 +1,56 @@ + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/RSS.gif b/app/assets/images/RSS.gif deleted file mode 100644 index b0e4adf1d51..00000000000 Binary files a/app/assets/images/RSS.gif and /dev/null differ diff --git a/app/assets/images/RSS.png b/app/assets/images/RSS.png new file mode 100644 index 00000000000..4838e5a702f Binary files /dev/null and b/app/assets/images/RSS.png differ diff --git a/app/assets/images/RSS.svg b/app/assets/images/RSS.svg new file mode 100644 index 00000000000..bd2919ebf12 --- /dev/null +++ b/app/assets/images/RSS.svg @@ -0,0 +1,84 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/app/assets/images/about/osm.png b/app/assets/images/about/osm.png new file mode 100644 index 00000000000..d5479eea39b Binary files /dev/null and b/app/assets/images/about/osm.png differ diff --git a/app/assets/images/about/sprite.png b/app/assets/images/about/sprite.png new file mode 100644 index 00000000000..bc76ee09751 Binary files /dev/null and b/app/assets/images/about/sprite.png differ diff --git a/app/assets/images/about/sprite@2x.png b/app/assets/images/about/sprite@2x.png new file mode 100644 index 00000000000..65d09d73d6e Binary files /dev/null and b/app/assets/images/about/sprite@2x.png differ diff --git a/app/assets/images/arrow.png b/app/assets/images/arrow.png deleted file mode 100644 index aa9b58fc261..00000000000 Binary files a/app/assets/images/arrow.png and /dev/null differ diff --git a/app/assets/images/attribution_example.png b/app/assets/images/attribution_example.png new file mode 100644 index 00000000000..463c80ed063 Binary files /dev/null and b/app/assets/images/attribution_example.png differ diff --git a/app/assets/images/browse/aerodrome.p.16.png b/app/assets/images/browse/aerodrome.p.16.png new file mode 100644 index 00000000000..8f13cd76fe4 Binary files /dev/null and b/app/assets/images/browse/aerodrome.p.16.png differ diff --git a/app/assets/images/browse/tourist.png b/app/assets/images/browse/tourism.png similarity index 100% rename from app/assets/images/browse/tourist.png rename to app/assets/images/browse/tourism.png diff --git a/app/assets/images/browse/tourist_ruin.p.16.png b/app/assets/images/browse/tourist_ruins.p.16.png similarity index 100% rename from app/assets/images/browse/tourist_ruin.p.16.png rename to app/assets/images/browse/tourist_ruins.p.16.png diff --git a/app/assets/images/closed_note_marker.png b/app/assets/images/closed_note_marker.png new file mode 100644 index 00000000000..ad2812fbed6 Binary files /dev/null and b/app/assets/images/closed_note_marker.png differ diff --git a/app/assets/images/closed_note_marker@2x.png b/app/assets/images/closed_note_marker@2x.png new file mode 100644 index 00000000000..ea434e90e55 Binary files /dev/null and b/app/assets/images/closed_note_marker@2x.png differ diff --git a/app/assets/images/color-palette.svg b/app/assets/images/color-palette.svg new file mode 100644 index 00000000000..329288e1a03 --- /dev/null +++ b/app/assets/images/color-palette.svg @@ -0,0 +1,151 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/confirm-illustration.png b/app/assets/images/confirm-illustration.png new file mode 100644 index 00000000000..ad673d547ac Binary files /dev/null and b/app/assets/images/confirm-illustration.png differ diff --git a/app/assets/images/confirm-illustration.svg b/app/assets/images/confirm-illustration.svg new file mode 100644 index 00000000000..9bb5715b80a --- /dev/null +++ b/app/assets/images/confirm-illustration.svg @@ -0,0 +1,1255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010000011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + diff --git a/app/assets/images/key/osmarender/admin.png b/app/assets/images/key/osmarender/admin.png deleted file mode 100644 index 80a10f20cf4..00000000000 Binary files a/app/assets/images/key/osmarender/admin.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/allotments.png b/app/assets/images/key/osmarender/allotments.png deleted file mode 100644 index ed1af15bfcf..00000000000 Binary files a/app/assets/images/key/osmarender/allotments.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/bridleway.png b/app/assets/images/key/osmarender/bridleway.png deleted file mode 100644 index 3652d188d40..00000000000 Binary files a/app/assets/images/key/osmarender/bridleway.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/brownfield.png b/app/assets/images/key/osmarender/brownfield.png deleted file mode 100644 index b1f348519b6..00000000000 Binary files a/app/assets/images/key/osmarender/brownfield.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/building.png b/app/assets/images/key/osmarender/building.png deleted file mode 100644 index e2b9902fc1b..00000000000 Binary files a/app/assets/images/key/osmarender/building.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/byway.png b/app/assets/images/key/osmarender/byway.png deleted file mode 100644 index 2791234acc3..00000000000 Binary files a/app/assets/images/key/osmarender/byway.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/cemetery.png b/app/assets/images/key/osmarender/cemetery.png deleted file mode 100644 index fa5b9846133..00000000000 Binary files a/app/assets/images/key/osmarender/cemetery.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/centre.png b/app/assets/images/key/osmarender/centre.png deleted file mode 100644 index 0ac055eb984..00000000000 Binary files a/app/assets/images/key/osmarender/centre.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/commercial.png b/app/assets/images/key/osmarender/commercial.png deleted file mode 100644 index 2b9bac94258..00000000000 Binary files a/app/assets/images/key/osmarender/commercial.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/common.png b/app/assets/images/key/osmarender/common.png deleted file mode 100644 index ed1af15bfcf..00000000000 Binary files a/app/assets/images/key/osmarender/common.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/cycleway.png b/app/assets/images/key/osmarender/cycleway.png deleted file mode 100644 index 7b37a80ea57..00000000000 Binary files a/app/assets/images/key/osmarender/cycleway.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/farm.png b/app/assets/images/key/osmarender/farm.png deleted file mode 100644 index ed1af15bfcf..00000000000 Binary files a/app/assets/images/key/osmarender/farm.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/footway.png b/app/assets/images/key/osmarender/footway.png deleted file mode 100644 index dd9d9124c9e..00000000000 Binary files a/app/assets/images/key/osmarender/footway.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/forest.png b/app/assets/images/key/osmarender/forest.png deleted file mode 100644 index 5fa90f1e65a..00000000000 Binary files a/app/assets/images/key/osmarender/forest.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/heathland.png b/app/assets/images/key/osmarender/heathland.png deleted file mode 100644 index 07db3315d1c..00000000000 Binary files a/app/assets/images/key/osmarender/heathland.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/industrial.png b/app/assets/images/key/osmarender/industrial.png deleted file mode 100644 index b1f348519b6..00000000000 Binary files a/app/assets/images/key/osmarender/industrial.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/lake.png b/app/assets/images/key/osmarender/lake.png deleted file mode 100644 index 4d80a033c48..00000000000 Binary files a/app/assets/images/key/osmarender/lake.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/mapkey.png b/app/assets/images/key/osmarender/mapkey.png deleted file mode 100644 index 64c858fb21c..00000000000 Binary files a/app/assets/images/key/osmarender/mapkey.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/military.png b/app/assets/images/key/osmarender/military.png deleted file mode 100644 index 40fa3cd9fb1..00000000000 Binary files a/app/assets/images/key/osmarender/military.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/motorway.png b/app/assets/images/key/osmarender/motorway.png deleted file mode 100644 index 456eae5f4ed..00000000000 Binary files a/app/assets/images/key/osmarender/motorway.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/park.png b/app/assets/images/key/osmarender/park.png deleted file mode 100644 index e9a3448b77c..00000000000 Binary files a/app/assets/images/key/osmarender/park.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/pitch.png b/app/assets/images/key/osmarender/pitch.png deleted file mode 100644 index e9a3448b77c..00000000000 Binary files a/app/assets/images/key/osmarender/pitch.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/primary.png b/app/assets/images/key/osmarender/primary.png deleted file mode 100644 index caf298d6313..00000000000 Binary files a/app/assets/images/key/osmarender/primary.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/rail.png b/app/assets/images/key/osmarender/rail.png deleted file mode 100644 index 21f0c9f6147..00000000000 Binary files a/app/assets/images/key/osmarender/rail.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/reserve.png b/app/assets/images/key/osmarender/reserve.png deleted file mode 100644 index ff15c82595c..00000000000 Binary files a/app/assets/images/key/osmarender/reserve.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/resident.png b/app/assets/images/key/osmarender/resident.png deleted file mode 100644 index 9be0e490383..00000000000 Binary files a/app/assets/images/key/osmarender/resident.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/retail.png b/app/assets/images/key/osmarender/retail.png deleted file mode 100644 index 38c33058025..00000000000 Binary files a/app/assets/images/key/osmarender/retail.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/school.png b/app/assets/images/key/osmarender/school.png deleted file mode 100644 index a80f78bf471..00000000000 Binary files a/app/assets/images/key/osmarender/school.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/secondary.png b/app/assets/images/key/osmarender/secondary.png deleted file mode 100644 index 2695a4d5b9e..00000000000 Binary files a/app/assets/images/key/osmarender/secondary.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/station.png b/app/assets/images/key/osmarender/station.png deleted file mode 100644 index 0b1fae27dba..00000000000 Binary files a/app/assets/images/key/osmarender/station.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/subway.png b/app/assets/images/key/osmarender/subway.png deleted file mode 100644 index c225c2af652..00000000000 Binary files a/app/assets/images/key/osmarender/subway.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/summit.png b/app/assets/images/key/osmarender/summit.png deleted file mode 100644 index f777f6ea3ef..00000000000 Binary files a/app/assets/images/key/osmarender/summit.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/tourist.png b/app/assets/images/key/osmarender/tourist.png deleted file mode 100644 index ceb7b19a7d7..00000000000 Binary files a/app/assets/images/key/osmarender/tourist.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/track.png b/app/assets/images/key/osmarender/track.png deleted file mode 100644 index 3c67f5438b7..00000000000 Binary files a/app/assets/images/key/osmarender/track.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/tram.png b/app/assets/images/key/osmarender/tram.png deleted file mode 100644 index 4dc979de340..00000000000 Binary files a/app/assets/images/key/osmarender/tram.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/trunk.png b/app/assets/images/key/osmarender/trunk.png deleted file mode 100644 index c28b77571f9..00000000000 Binary files a/app/assets/images/key/osmarender/trunk.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/unsurfaced.png b/app/assets/images/key/osmarender/unsurfaced.png deleted file mode 100644 index 6837c48abe9..00000000000 Binary files a/app/assets/images/key/osmarender/unsurfaced.png and /dev/null differ diff --git a/app/assets/images/key/osmarender/wood.png b/app/assets/images/key/osmarender/wood.png deleted file mode 100644 index 5fa90f1e65a..00000000000 Binary files a/app/assets/images/key/osmarender/wood.png and /dev/null differ diff --git a/app/assets/images/map_sprite.png b/app/assets/images/map_sprite.png new file mode 100644 index 00000000000..99734b12f4f Binary files /dev/null and b/app/assets/images/map_sprite.png differ diff --git a/app/assets/images/marker-blue.png b/app/assets/images/marker-blue.png new file mode 100644 index 00000000000..7614b7c7f68 Binary files /dev/null and b/app/assets/images/marker-blue.png differ diff --git a/app/assets/images/marker-green.png b/app/assets/images/marker-green.png new file mode 100644 index 00000000000..56a0b1c47ef Binary files /dev/null and b/app/assets/images/marker-green.png differ diff --git a/app/assets/images/marker-red.png b/app/assets/images/marker-red.png new file mode 100644 index 00000000000..46c70185a9c Binary files /dev/null and b/app/assets/images/marker-red.png differ diff --git a/app/assets/images/marker-yellow.png b/app/assets/images/marker-yellow.png new file mode 100644 index 00000000000..eb6d6ef74c3 Binary files /dev/null and b/app/assets/images/marker-yellow.png differ diff --git a/app/assets/images/menu-icon.png b/app/assets/images/menu-icon.png new file mode 100644 index 00000000000..da3f92c5d9b Binary files /dev/null and b/app/assets/images/menu-icon.png differ diff --git a/app/assets/images/new.png b/app/assets/images/new.png index 202e10eca8a..d6355e0217a 100644 Binary files a/app/assets/images/new.png and b/app/assets/images/new.png differ diff --git a/app/assets/images/new.svg b/app/assets/images/new.svg new file mode 100644 index 00000000000..ef65650f78a --- /dev/null +++ b/app/assets/images/new.svg @@ -0,0 +1,73 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/new_note_marker.png b/app/assets/images/new_note_marker.png new file mode 100644 index 00000000000..a41464487e7 Binary files /dev/null and b/app/assets/images/new_note_marker.png differ diff --git a/app/assets/images/new_note_marker@2x.png b/app/assets/images/new_note_marker@2x.png new file mode 100644 index 00000000000..6098079cd7c Binary files /dev/null and b/app/assets/images/new_note_marker@2x.png differ diff --git a/app/assets/images/notice.png b/app/assets/images/notice.png new file mode 100644 index 00000000000..a2698d77bae Binary files /dev/null and b/app/assets/images/notice.png differ diff --git a/app/assets/images/notice.svg b/app/assets/images/notice.svg new file mode 100644 index 00000000000..cb779ce217c --- /dev/null +++ b/app/assets/images/notice.svg @@ -0,0 +1,73 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/app/assets/images/open_note_marker.png b/app/assets/images/open_note_marker.png new file mode 100644 index 00000000000..6fe5cb7ac4a Binary files /dev/null and b/app/assets/images/open_note_marker.png differ diff --git a/app/assets/images/open_note_marker@2x.png b/app/assets/images/open_note_marker@2x.png new file mode 100644 index 00000000000..e465ca918a0 Binary files /dev/null and b/app/assets/images/open_note_marker@2x.png differ diff --git a/app/assets/images/osm_logo_114.png b/app/assets/images/osm_logo_114.png new file mode 100644 index 00000000000..63713fb9a2b Binary files /dev/null and b/app/assets/images/osm_logo_114.png differ diff --git a/app/assets/images/osm_logo_144.png b/app/assets/images/osm_logo_144.png new file mode 100644 index 00000000000..35a97545058 Binary files /dev/null and b/app/assets/images/osm_logo_144.png differ diff --git a/app/assets/images/osm_logo_228.png b/app/assets/images/osm_logo_228.png new file mode 100644 index 00000000000..752d6363b4d Binary files /dev/null and b/app/assets/images/osm_logo_228.png differ diff --git a/app/assets/images/osm_logo_57.png b/app/assets/images/osm_logo_57.png new file mode 100644 index 00000000000..94893c7e211 Binary files /dev/null and b/app/assets/images/osm_logo_57.png differ diff --git a/app/assets/images/osm_logo_72.png b/app/assets/images/osm_logo_72.png new file mode 100644 index 00000000000..dc4e6d5aaba Binary files /dev/null and b/app/assets/images/osm_logo_72.png differ diff --git a/app/assets/images/roles/administrator.png b/app/assets/images/roles/administrator.png index b566decb400..ea363d25767 100644 Binary files a/app/assets/images/roles/administrator.png and b/app/assets/images/roles/administrator.png differ diff --git a/app/assets/images/roles/administrator.svg b/app/assets/images/roles/administrator.svg new file mode 100644 index 00000000000..460d9b44991 --- /dev/null +++ b/app/assets/images/roles/administrator.svg @@ -0,0 +1,60 @@ + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/app/assets/images/roles/blank_administrator.png b/app/assets/images/roles/blank_administrator.png index c68f9e42716..8f56b6ea6e8 100644 Binary files a/app/assets/images/roles/blank_administrator.png and b/app/assets/images/roles/blank_administrator.png differ diff --git a/app/assets/images/roles/blank_administrator.svg b/app/assets/images/roles/blank_administrator.svg new file mode 100644 index 00000000000..3e56c789a6f --- /dev/null +++ b/app/assets/images/roles/blank_administrator.svg @@ -0,0 +1,89 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/app/assets/images/roles/blank_moderator.png b/app/assets/images/roles/blank_moderator.png index cf5ceea36d9..7dc30728432 100644 Binary files a/app/assets/images/roles/blank_moderator.png and b/app/assets/images/roles/blank_moderator.png differ diff --git a/app/assets/images/roles/blank_moderator.svg b/app/assets/images/roles/blank_moderator.svg new file mode 100644 index 00000000000..1b2a09177f1 --- /dev/null +++ b/app/assets/images/roles/blank_moderator.svg @@ -0,0 +1,65 @@ + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/app/assets/images/roles/moderator.png b/app/assets/images/roles/moderator.png index eaedf95d2ed..f7534beb55c 100644 Binary files a/app/assets/images/roles/moderator.png and b/app/assets/images/roles/moderator.png differ diff --git a/app/assets/images/roles/moderator.svg b/app/assets/images/roles/moderator.svg new file mode 100644 index 00000000000..9288dac4ffb --- /dev/null +++ b/app/assets/images/roles/moderator.svg @@ -0,0 +1,71 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/app/assets/images/routing-sprite.png b/app/assets/images/routing-sprite.png new file mode 100644 index 00000000000..37d94886ddf Binary files /dev/null and b/app/assets/images/routing-sprite.png differ diff --git a/app/assets/images/searching-small.gif b/app/assets/images/searching-small.gif new file mode 100644 index 00000000000..06dbc2bc21d Binary files /dev/null and b/app/assets/images/searching-small.gif differ diff --git a/app/assets/images/searching.gif b/app/assets/images/searching.gif index 5b33f7e54f4..b1451fd7d43 100644 Binary files a/app/assets/images/searching.gif and b/app/assets/images/searching.gif differ diff --git a/app/assets/images/sign-up-illustration-arm.png b/app/assets/images/sign-up-illustration-arm.png new file mode 100644 index 00000000000..5f780299ed0 Binary files /dev/null and b/app/assets/images/sign-up-illustration-arm.png differ diff --git a/app/assets/images/sign-up-illustration.png b/app/assets/images/sign-up-illustration.png new file mode 100644 index 00000000000..0a92b9c5b1f Binary files /dev/null and b/app/assets/images/sign-up-illustration.png differ diff --git a/app/assets/images/sign-up-illustration.svg b/app/assets/images/sign-up-illustration.svg new file mode 100644 index 00000000000..7f3a3338f82 --- /dev/null +++ b/app/assets/images/sign-up-illustration.svg @@ -0,0 +1,1359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010000011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + diff --git a/app/assets/images/sotm-birmingham-ad.png b/app/assets/images/sotm-birmingham-ad.png new file mode 100644 index 00000000000..05bb1466be7 Binary files /dev/null and b/app/assets/images/sotm-birmingham-ad.png differ diff --git a/app/assets/images/sotm-us-ad.png b/app/assets/images/sotm-us-ad.png new file mode 100644 index 00000000000..c1ab6f26145 Binary files /dev/null and b/app/assets/images/sotm-us-ad.png differ diff --git a/app/assets/images/sotm.png b/app/assets/images/sotm.png deleted file mode 100644 index 8c11ebed4dc..00000000000 Binary files a/app/assets/images/sotm.png and /dev/null differ diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png new file mode 100644 index 00000000000..e7490c84cbc Binary files /dev/null and b/app/assets/images/sprite.png differ diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg new file mode 100644 index 00000000000..b61018d1352 --- /dev/null +++ b/app/assets/images/sprite.svg @@ -0,0 +1,269 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/terms-illustration.png b/app/assets/images/terms-illustration.png new file mode 100644 index 00000000000..475da0e87e5 Binary files /dev/null and b/app/assets/images/terms-illustration.png differ diff --git a/app/assets/images/terms-illustration.svg b/app/assets/images/terms-illustration.svg new file mode 100644 index 00000000000..2bb1aaf9909 --- /dev/null +++ b/app/assets/images/terms-illustration.svg @@ -0,0 +1,1620 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010000011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + 101010101010100011100010101010011010101010101001010110010111010101011010000101010000110001101010110010101101101010111010101011 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/users/images/large.png b/app/assets/images/users/images/large.png index ae33d8a870b..ec0a7fde6e1 100644 Binary files a/app/assets/images/users/images/large.png and b/app/assets/images/users/images/large.png differ diff --git a/app/assets/images/users/images/small.png b/app/assets/images/users/images/small.png index cfaeb24c06e..19fd092ccd6 100644 Binary files a/app/assets/images/users/images/small.png and b/app/assets/images/users/images/small.png differ diff --git a/app/assets/images/users/images/user-icons.svg b/app/assets/images/users/images/user-icons.svg new file mode 100644 index 00000000000..85288b24227 --- /dev/null +++ b/app/assets/images/users/images/user-icons.svg @@ -0,0 +1,182 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png new file mode 100644 index 00000000000..969c53f964f Binary files /dev/null and b/app/assets/images/welcome-sprite.png differ diff --git a/app/assets/images/welcome-sprite.svg b/app/assets/images/welcome-sprite.svg new file mode 100644 index 00000000000..0151c5ced08 --- /dev/null +++ b/app/assets/images/welcome-sprite.svg @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + ? + + + diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 00000000000..6ac398fc591 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,130 @@ +//= require jquery +//= require jquery_ujs +//= require jquery.timers +//= require jquery.cookie +//= require jquery.throttle-debounce +//= require bootstrap.tooltip +//= require bootstrap.dropdown +//= require augment +//= require osm +//= require leaflet +//= require leaflet.osm +//= require leaflet.map +//= require leaflet.zoom +//= require leaflet.locationfilter +//= require i18n/translations +//= require oauth +//= require piwik +//= require richtext +//= require querystring + +var querystring = require('querystring-component'); + +function remoteEditHandler(bbox, object) { + var loaded = false, + query = { + left: bbox.getWest() - 0.0001, + top: bbox.getNorth() + 0.0001, + right: bbox.getEast() + 0.0001, + bottom: bbox.getSouth() - 0.0001 + }; + + if (object) query.select = object.type + object.id; + + var iframe = $('
' + + '' + + escapeHTML(I18n.t('javascripts.share.view_larger_map')) + ''); + + // Image + + if (locationFilter.isEnabled()) { + bounds = locationFilter.getBounds(); + } + + var scale = $("#mapnik_scale").val(), + size = L.bounds(L.CRS.EPSG3857.project(bounds.getSouthWest()), + L.CRS.EPSG3857.project(bounds.getNorthEast())).getSize(), + maxScale = Math.floor(Math.sqrt(size.x * size.y / 0.3136)); + + $('#mapnik_minlon').val(bounds.getWest()); + $('#mapnik_minlat').val(bounds.getSouth()); + $('#mapnik_maxlon').val(bounds.getEast()); + $('#mapnik_maxlat').val(bounds.getNorth()); + + if (scale < maxScale) { + scale = roundScale(maxScale); + $("#mapnik_scale").val(scale); + } + + $("#mapnik_image_width").text(Math.round(size.x / scale / 0.00028)); + $("#mapnik_image_height").text(Math.round(size.y / scale / 0.00028)); + } + + function select() { + $(this).select(); + } + + function getScale() { + var bounds = map.getBounds(), + centerLat = bounds.getCenter().lat, + halfWorldMeters = 6378137 * Math.PI * Math.cos(centerLat * Math.PI / 180), + meters = halfWorldMeters * (bounds.getEast() - bounds.getWest()) / 180, + pixelsPerMeter = map.getSize().x / meters, + metersPerPixel = 1 / (92 * 39.3701); + return Math.round(1 / (pixelsPerMeter * metersPerPixel)); + } + + function roundScale(scale) { + var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2); + return precision * Math.ceil(scale / precision); + } + + return $container[0]; + }; + + return control; +}; diff --git a/app/assets/javascripts/leaflet.sidebar.js b/app/assets/javascripts/leaflet.sidebar.js new file mode 100644 index 00000000000..db9e7aef250 --- /dev/null +++ b/app/assets/javascripts/leaflet.sidebar.js @@ -0,0 +1,47 @@ +L.OSM.sidebar = function(selector) { + var control = {}, + sidebar = $(selector), + current = $(), + currentButton = $(), + map; + + control.addTo = function (_) { + map = _; + return control; + }; + + control.addPane = function(pane) { + pane + .hide() + .appendTo(sidebar); + }; + + control.togglePane = function(pane, button) { + current + .hide() + .trigger('hide'); + + currentButton + .removeClass('active'); + + if (current === pane) { + $(sidebar).hide(); + current = currentButton = $(); + } else { + $(sidebar).show(); + current = pane; + currentButton = button || $(); + } + + map.invalidateSize({pan: false, animate: false}); + + current + .show() + .trigger('show'); + + currentButton + .addClass('active'); + }; + + return control; +}; diff --git a/app/assets/javascripts/leaflet.zoom.js b/app/assets/javascripts/leaflet.zoom.js new file mode 100644 index 00000000000..80b4ab1bced --- /dev/null +++ b/app/assets/javascripts/leaflet.zoom.js @@ -0,0 +1,72 @@ +L.OSM.Zoom = L.Control.extend({ + options: { + position: 'topright' + }, + + onAdd: function (map) { + var zoomName = 'zoom', + container = L.DomUtil.create('div', zoomName); + + this._map = map; + + this._zoomInButton = this._createButton( + '', I18n.t('javascripts.map.zoom.in'), zoomName + 'in', container, this._zoomIn, this); + this._zoomOutButton = this._createButton( + '', I18n.t('javascripts.map.zoom.out'), zoomName + 'out', container, this._zoomOut, this); + + map.on('zoomend zoomlevelschange', this._updateDisabled, this); + + return container; + }, + + onRemove: function (map) { + map.off('zoomend zoomlevelschange', this._updateDisabled, this); + }, + + _zoomIn: function (e) { + this._map.zoomIn(e.shiftKey ? 3 : 1); + }, + + _zoomOut: function (e) { + this._map.zoomOut(e.shiftKey ? 3 : 1); + }, + + _createButton: function (html, title, className, container, fn, context) { + var link = L.DomUtil.create('a', 'control-button ' + className, container); + link.innerHTML = html; + link.href = '#'; + link.title = title; + + var sprite = L.DomUtil.create('span', 'icon ' + className, link); + + var stop = L.DomEvent.stopPropagation; + + L.DomEvent + .on(link, 'click', stop) + .on(link, 'mousedown', stop) + .on(link, 'dblclick', stop) + .on(link, 'click', L.DomEvent.preventDefault) + .on(link, 'click', fn, context); + + return link; + }, + + _updateDisabled: function () { + var map = this._map, + className = 'leaflet-disabled'; + + L.DomUtil.removeClass(this._zoomInButton, className); + L.DomUtil.removeClass(this._zoomOutButton, className); + + if (map._zoom === map.getMinZoom()) { + L.DomUtil.addClass(this._zoomOutButton, className); + } + if (map._zoom === map.getMaxZoom()) { + L.DomUtil.addClass(this._zoomInButton, className); + } + } +}); + +L.OSM.zoom = function (options) { + return new L.OSM.Zoom(options); +}; diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb deleted file mode 100644 index d645f06f043..00000000000 --- a/app/assets/javascripts/map.js.erb +++ /dev/null @@ -1,260 +0,0 @@ -var epsg4326 = new OpenLayers.Projection("EPSG:4326"); -var map; -var markers; -var vectors; -var popup; - -function createMap(divName, options) { - options = options || {}; - - map = new OpenLayers.Map(divName, { - controls: options.controls || [ - new OpenLayers.Control.ArgParser(), - new OpenLayers.Control.Attribution(), - new SimpleLayerSwitcher(), - new OpenLayers.Control.Navigation(), - new OpenLayers.Control.Zoom(), - new OpenLayers.Control.PanZoomBar(), - new OpenLayers.Control.ScaleLine({geodesic: true}) - ], - numZoomLevels: 20, - displayProjection: new OpenLayers.Projection("EPSG:4326"), - theme: "<%= asset_path 'theme/default/style.css' %>" - }); - - var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), { - attribution: "", - keyid: "mapnik", - displayOutsideMaxExtent: true, - wrapDateLine: true, - layerCode: "M" - }); - map.addLayer(mapnik); - - var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), { - attribution: "Tiles courtesy of Andy Allan", - keyid: "cyclemap", - displayOutsideMaxExtent: true, - wrapDateLine: true, - layerCode: "C" - }); - map.addLayer(cyclemap); - - var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), { - attribution: "Tiles courtesy of Andy Allan", - keyid: "transportmap", - displayOutsideMaxExtent: true, - wrapDateLine: true, - layerCode: "T" - }); - map.addLayer(transportmap); - - var mapquest = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.mapquest"), [ - "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", - "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png" - ], { - attribution: "Tiles courtesy of MapQuest ", - keyid: "mapquest", - displayOutsideMaxExtent: true, - wrapDateLine: true, - numZoomLevels: 19, - layerCode: "Q" - }); - map.addLayer(mapquest); - - markers = new OpenLayers.Layer.Markers("Markers", { - displayInLayerSwitcher: false, - numZoomLevels: 20, - projection: "EPSG:900913" - }); - map.addLayer(markers); - - return map; -} - -function getArrowIcon() { - var size = new OpenLayers.Size(25, 22); - var offset = new OpenLayers.Pixel(-22, -20); - var icon = new OpenLayers.Icon("<%= asset_path 'arrow.png' %>", size, offset); - - return icon; -} - -function addMarkerToMap(position, icon, description) { - var marker = new OpenLayers.Marker(proj(position), icon); - - markers.addMarker(marker); - - if (description) { - marker.events.register("mouseover", marker, function() { - openMapPopup(marker, description); - }); - } - - return marker; -} - -function addObjectToMap(url, zoom, callback) { - var layer = new OpenLayers.Layer.Vector("Objects", { - strategies: [ - new OpenLayers.Strategy.Fixed() - ], - protocol: new OpenLayers.Protocol.HTTP({ - url: url, - format: new OpenLayers.Format.OSM() - }), - style: { - strokeColor: "blue", - strokeWidth: 3, - strokeOpacity: 0.5, - fillOpacity: 0.2, - fillColor: "lightblue", - pointRadius: 6 - }, - projection: new OpenLayers.Projection("EPSG:4326"), - displayInLayerSwitcher: false - }); - - layer.events.register("loadend", layer, function() { - var extent; - - if (this.features.length) { - extent = this.features[0].geometry.getBounds(); - - for (var i = 1; i < this.features.length; i++) { - extent.extend(this.features[i].geometry.getBounds()); - } - - if (zoom) { - if (extent) { - this.map.zoomToExtent(extent); - } else { - this.map.zoomToMaxExtent(); - } - } - } - - if (callback) { - callback(extent); - } - }); - - map.addLayer(layer); -} - -function addBoxToMap(boxbounds, id, outline) { - if (!vectors) { - // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions - vectors = new OpenLayers.Layer.Vector("Boxes", { - displayInLayerSwitcher: false - }); - map.addLayer(vectors); - } - var geometry; - if (outline) { - vertices = boxbounds.toGeometry().getVertices(); - vertices.push(new OpenLayers.Geometry.Point(vertices[0].x, vertices[0].y)); - geometry = proj(new OpenLayers.Geometry.LineString(vertices)); - } else { - geometry = proj(boxbounds.toGeometry()); - } - var box = new OpenLayers.Feature.Vector(geometry, {}, { - strokeWidth: 2, - strokeColor: '#ee9900', - fillOpacity: 0 - }); - box.fid = id; - - vectors.addFeatures(box); - - return box; -} - -function openMapPopup(marker, description) { - closeMapPopup(); - - popup = new OpenLayers.Popup.FramedCloud("popup", marker.lonlat, null, - description, marker.icon, true); - popup.setBackgroundColor("#E3FFC5"); - map.addPopup(popup); - - return popup; -} - -function closeMapPopup() { - if (popup) { - map.removePopup(popup); - delete popup; - } -} - -function removeMarkerFromMap(marker){ - markers.removeMarker(marker); -} - -function removeBoxFromMap(box){ - vectors.removeFeature(box); -} - -function proj(x) { - return x.clone().transform(epsg4326, map.getProjectionObject()); -} - -function unproj(x) { - return x.clone().transform(map.getProjectionObject(), epsg4326); -} - -function setMapCenter(center, zoom) { - zoom = parseInt(zoom, 10); - var numzoom = map.getNumZoomLevels(); - if (zoom >= numzoom) zoom = numzoom - 1; - map.setCenter(proj(center), zoom); -} - -function getEventPosition(event) { - return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326); -} - -function getMapLayers() { - var layerConfig = ""; - - for (var i = 0; i < map.layers.length; i++) { - if (map.layers[i].layerCode && map.layers[i].getVisibility()) { - layerConfig += map.layers[i].layerCode; - } - } - - return layerConfig; -} - -function setMapLayers(layerConfig) { - if (layerConfig.charAt(0) == "B" || layerConfig.charAt(0) == "0") { - var l = 0; - - for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) { - var c = layerConfig.charAt(l++); - - if (c == "B") { - map.setBaseLayer(layers[i]); - } else { - map.layers[i].setVisibility(false); - } - } - } else { - for (var i = 0; i < map.layers.length; i++) { - if (map.layers[i].layerCode) { - if (layerConfig.indexOf(map.layers[i].layerCode) >= 0) { - if (map.layers[i].isBaseLayer) { - map.setBaseLayer(map.layers[i]); - } else { - map.layers[i].setVisibility(true); - } - } else if (!map.layers[i].isBaseLayer) { - map.layers[i].setVisibility(false); - } - } - } - } -} diff --git a/app/assets/javascripts/menu.js b/app/assets/javascripts/menu.js deleted file mode 100644 index a01fc39cc68..00000000000 --- a/app/assets/javascripts/menu.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Open a menu. - */ -function openMenu(anchor, menu, align) { - var anchorPosition = anchor.offset(); - var offset; - - if (align == "left") { - offset = 0; - } else if (align == "right") { - offset = menu.outerWidth() - anchor.outerWidth(); - } - - menu.show(); - - menu.offset({ - top: anchorPosition.top + anchor.outerHeight(), - left: anchorPosition.left - offset - }); -} - -/* - * Setup a menu, triggered by hovering over an anchor for a given time. - */ -function createMenu(anchorid, menuid, align) { - var $anchor = $("#" + anchorid); - var $arrow = $("#" + anchorid + " .menuicon"); - var $menu = $("#" + menuid); - var $page = $(":not(#" + menuid + ", #" + anchorid + ")"); - - function hide() { - $menu.hide(); - $page.off("click", hide); - } - - $arrow.click(function(e) { - if ($anchor.is(":not(.disabled)")) { - e.stopPropagation(); - e.preventDefault(); - if ($menu.is(":visible")) { - $menu.hide(); - $page.off("click", hide); - } else { - openMenu($anchor, $menu.show(), align); - $page.on("click", hide); - } - } - }); -} diff --git a/app/assets/javascripts/oauth.js b/app/assets/javascripts/oauth.js new file mode 100644 index 00000000000..98ce302e105 --- /dev/null +++ b/app/assets/javascripts/oauth.js @@ -0,0 +1,25 @@ +//= require ohauth + +$(document).ready(function () { + function makeAbsolute(url) { + var a = document.createElement('a'); + a.href = url; + return a.href; + } + + if (OSM.oauth_token) { + var headerGenerator = window.ohauth.headerGenerator({ + consumer_key: OSM.oauth_consumer_key, + consumer_secret: OSM.oauth_consumer_secret, + token: OSM.oauth_token, + token_secret: OSM.oauth_token_secret + }); + + $.ajaxPrefilter(function(options, jqxhr) { + if (options.oauth) { + options.headers = options.headers || {}; + options.headers.Authorization = headerGenerator(options.type, makeAbsolute(options.url), jqxhr.data); + } + }); + } +}); diff --git a/app/assets/javascripts/openlayers.js.erb b/app/assets/javascripts/openlayers.js.erb deleted file mode 100644 index b493a0517c2..00000000000 --- a/app/assets/javascripts/openlayers.js.erb +++ /dev/null @@ -1,36 +0,0 @@ -//= require OpenLayers -//= require OpenStreetMap -//= require SimpleLayerSwitcher - -OpenLayers.Util.imageURLs = { - "404.png": "<%= asset_path 'img/404.png' %>", - "blank.gif": "<%= asset_path 'img/blank.gif' %>", - "cloud-popup-relative.png": "<%= asset_path 'img/cloud-popup-relative.png' %>", - "drag-rectangle-off.png": "<%= asset_path 'img/drag-rectangle-off.png' %>", - "drag-rectangle-on.png": "<%= asset_path 'img/drag-rectangle-on.png' %>", - "east-mini.png": "<%= asset_path 'img/east-mini.png' %>", - "layer-switcher-maximize.png": "<%= asset_path 'img/layer-switcher-maximize.png' %>", - "layer-switcher-minimize.png": "<%= asset_path 'img/layer-switcher-minimize.png' %>", - "marker-blue.png": "<%= asset_path 'img/marker-blue.png' %>", - "marker-gold.png": "<%= asset_path 'img/marker-gold.png' %>", - "marker-green.png": "<%= asset_path 'img/marker-green.png' %>", - "marker.png": "<%= asset_path 'img/marker.png' %>", - "measuring-stick-off.png": "<%= asset_path 'img/measuring-stick-off.png' %>", - "measuring-stick-on.png": "<%= asset_path 'img/measuring-stick-on.png' %>", - "north-mini.png": "<%= asset_path 'img/north-mini.png' %>", - "panning-hand-off.png": "<%= asset_path 'img/panning-hand-off.png' %>", - "panning-hand-on.png": "<%= asset_path 'img/panning-hand-on.png' %>", - "slider.png": "<%= asset_path 'img/slider.png' %>", - "south-mini.png": "<%= asset_path 'img/south-mini.png' %>", - "west-mini.png": "<%= asset_path 'img/west-mini.png' %>", - "zoombar.png": "<%= asset_path 'img/zoombar.png' %>", - "zoom-minus-mini.png": "<%= asset_path 'img/zoom-minus-mini.png' %>", - "zoom-plus-mini.png": "<%= asset_path 'img/zoom-plus-mini.png' %>", - "zoom-world-mini.png": "<%= asset_path 'img/zoom-world-mini.png' %>" -}; - -OpenLayers.Util.origGetImageLocation = OpenLayers.Util.getImageLocation; - -OpenLayers.Util.getImageLocation = function(image) { - return OpenLayers.Util.imageURLs[image] || OpenLayers.Util.origGetImageLocation(image); -}; diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb new file mode 100644 index 00000000000..033b2de8122 --- /dev/null +++ b/app/assets/javascripts/osm.js.erb @@ -0,0 +1,178 @@ +OSM = { +<% if defined?(PIWIK) %> + PIWIK: <%= PIWIK.to_json %>, +<% end %> + + MAX_REQUEST_AREA: <%= MAX_REQUEST_AREA.to_json %>, + SERVER_URL: <%= SERVER_URL.to_json %>, + API_VERSION: <%= API_VERSION.to_json %>, + STATUS: <%= STATUS.to_json %>, + MAX_NOTE_REQUEST_AREA: <%= MAX_NOTE_REQUEST_AREA.to_json %>, + + apiUrl: function (object) { + var url = "/api/" + OSM.API_VERSION + "/" + object.type + "/" + object.id; + + if (object.type === "way" || object.type === "relation") { + url += "/full"; + } else if (object.version) { + url += "/" + object.version; + } + + return url; + }, + + params: function(search) { + var params = {}; + + search = (search || window.location.search).replace('?', '').split(/&|;/); + + for (var i = 0; i < search.length; ++i) { + var pair = search[i], + j = pair.indexOf('='), + key = pair.slice(0, j), + val = pair.slice(++j); + params[key] = decodeURIComponent(val); + } + + return params; + }, + + mapParams: function (search) { + var params = OSM.params(search), mapParams = {}, loc, match; + + if (params.mlon && params.mlat) { + mapParams.marker = true; + mapParams.mlon = parseFloat(params.mlon); + mapParams.mlat = parseFloat(params.mlat); + } + + // Old-style object parameters; still in use for edit links e.g. /edit?way=1234 + if (params.node) { + mapParams.object = {type: 'node', id: parseInt(params.node)}; + } else if (params.way) { + mapParams.object = {type: 'way', id: parseInt(params.way)}; + } else if (params.relation) { + mapParams.object = {type: 'relation', id: parseInt(params.relation)}; + } + + var hash = OSM.parseHash(location.hash); + + // Decide on a map starting position. Various ways of doing this. + if (hash.center) { + mapParams.lon = hash.center.lng; + mapParams.lat = hash.center.lat; + mapParams.zoom = hash.zoom; + } else if (params.bbox) { + var bbox = params.bbox.split(','); + mapParams.bounds = L.latLngBounds( + [parseFloat(bbox[1]), parseFloat(bbox[0])], + [parseFloat(bbox[3]), parseFloat(bbox[2])]); + } else if (params.minlon && params.minlat && params.maxlon && params.maxlat) { + mapParams.bounds = L.latLngBounds( + [parseFloat(params.minlat), parseFloat(params.minlon)], + [parseFloat(params.maxlat), parseFloat(params.maxlon)]); + } else if (params.lon && params.lat) { + mapParams.lon = parseFloat(params.lon); + mapParams.lat = parseFloat(params.lat); + mapParams.zoom = parseInt(params.zoom || 5); + } else if (params.mlon && params.mlat) { + mapParams.lon = parseFloat(params.mlon); + mapParams.lat = parseFloat(params.mlat); + mapParams.zoom = parseInt(params.zoom || 12); + } else if (loc = $.cookie('_osm_location')) { + loc = loc.split("|"); + mapParams.lon = parseFloat(loc[0]); + mapParams.lat = parseFloat(loc[1]); + mapParams.zoom = parseInt(loc[2]); + } else if (OSM.home) { + mapParams.lon = OSM.home.lon; + mapParams.lat = OSM.home.lat; + mapParams.zoom = 10; + } else if (OSM.location) { + mapParams.bounds = L.latLngBounds( + [OSM.location.minlat, + OSM.location.minlon], + [OSM.location.maxlat, + OSM.location.maxlon]); + } else { + mapParams.lon = -0.1; + mapParams.lat = 51.5; + mapParams.zoom = parseInt(params.zoom || 5); + } + + mapParams.layers = hash.layers || (loc && loc[3]) || ''; + + var scale = parseFloat(params.scale); + if (scale > 0) { + mapParams.zoom = Math.log(360.0 / (scale * 512.0)) / Math.log(2.0); + } + + return mapParams; + }, + + parseHash: function(hash) { + var args = {}; + + var i = hash.indexOf('#'); + if (i < 0) { + return args; + } + + hash = querystring.parse(hash.substr(i + 1)); + + var map = (hash.map || '').split('/'), + zoom = parseInt(map[0], 10), + lat = parseFloat(map[1]), + lon = parseFloat(map[2]); + + if (!isNaN(zoom) && !isNaN(lat) && !isNaN(lon)) { + args.center = new L.LatLng(lat, lon); + args.zoom = zoom; + } + + if (hash.layers) { + args.layers = hash.layers; + } + + return args; + }, + + formatHash: function(args) { + var center, zoom, layers; + + if (args instanceof L.Map) { + center = args.getCenter(); + zoom = args.getZoom(); + layers = args.getLayersCode(); + } else { + center = args.center || L.latLng(args.lat, args.lon); + zoom = args.zoom; + layers = args.layers || ''; + } + + center = center.wrap(); + layers = layers.replace('M', ''); + + var precision = OSM.zoomPrecision(zoom), + hash = '#map=' + zoom + + '/' + center.lat.toFixed(precision) + + '/' + center.lng.toFixed(precision); + + if (layers) { + hash += '&layers=' + layers; + } + + return hash; + }, + + zoomPrecision: function(zoom) { + return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); + }, + + locationCookie: function(map) { + var center = map.getCenter().wrap(), + zoom = map.getZoom(), + precision = OSM.zoomPrecision(zoom); + return [center.lng.toFixed(precision), center.lat.toFixed(precision), zoom, map.getLayersCode()].join('|'); + } +}; diff --git a/app/assets/javascripts/piwik.js b/app/assets/javascripts/piwik.js new file mode 100644 index 00000000000..a48e903add4 --- /dev/null +++ b/app/assets/javascripts/piwik.js @@ -0,0 +1,28 @@ +if (OSM.PIWIK) { + $(document).ready(function () { + var base = document.location.protocol + "//" + OSM.PIWIK.location + "/"; + var piwikTracker; + + var piwikLoader = $.ajax({ + url: base + "piwik.js", + dataType: "script", + cache: true, + success: function () { + piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site); + + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); + + $("meta[name=piwik-goal]").each(function () { + piwikTracker.trackGoal($(this).attr("content")); + }); + } + }); + + $("body").on("piwikgoal", function (e, goal) { + piwikLoader.done(function () { + piwikTracker.trackGoal(goal); + }); + }); + }); +} diff --git a/app/assets/javascripts/pngfix.js b/app/assets/javascripts/pngfix.js deleted file mode 100644 index e6ca5d6f773..00000000000 --- a/app/assets/javascripts/pngfix.js +++ /dev/null @@ -1,25 +0,0 @@ -function correctPNG() // correctly handle PNG transparency in Win IE 5.5 or higher. -{ - for(var i=0; i 0 && !img.id.match(/^OpenLayers/)) - { - var imgID = (img.id) ? "id='" + img.id + "' " : "" - var imgClass = (img.className) ? "class='" + img.className + "' " : "" - var imgTitle = (img.title) ? "title='" + img.title + "' " : "title='" + img.alt + "' " - var imgStyle = "display:inline-block;" + img.style.cssText - if (img.align == "left") imgStyle = "float:left;" + imgStyle - if (img.align == "right") imgStyle = "float:right;" + imgStyle - if (img.parentElement.href) imgStyle = "cursor:hand;" + imgStyle - var strNewHTML = "" - img.outerHTML = strNewHTML - i = i-1 - } - } -} -window.attachEvent("onload", correctPNG); diff --git a/app/assets/javascripts/querystring.js b/app/assets/javascripts/querystring.js new file mode 100644 index 00000000000..24e4382ad36 --- /dev/null +++ b/app/assets/javascripts/querystring.js @@ -0,0 +1,71 @@ +require=(function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s 0 && param) ? decodeURIComponent(param) : param; + }); + } + + return (controller[action] || $.noop).apply(controller, params); + }; + + return route; + } + + var routes = []; + for (var r in rts) + routes.push(Route(r, rts[r])); + + routes.recognize = function(path) { + for (var i = 0; i < this.length; i++) { + if (this[i].match(path)) return this[i]; + } + }; + + var currentPath = window.location.pathname.replace(/(.)\/$/, '$1') + window.location.search, + currentRoute = routes.recognize(currentPath), + currentHash = location.hash || OSM.formatHash(map); + + var router = {}; + + if (window.history && window.history.pushState) { + $(window).on('popstate', function(e) { + if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change? + var path = window.location.pathname + window.location.search; + if (path === currentPath) return; + currentRoute.run('unload'); + currentPath = path; + currentRoute = routes.recognize(currentPath); + currentRoute.run('popstate', currentPath); + map.setState(e.originalEvent.state, {animate: false}); + }); + + router.route = function (url) { + var path = url.replace(/#.*/, ''), + route = routes.recognize(path); + if (!route) return false; + currentRoute.run('unload'); + window.history.pushState(OSM.parseHash(url), document.title, url); + currentPath = path; + currentRoute = route; + currentRoute.run('pushstate', currentPath); + return true; + }; + + router.replace = function (url) { + window.history.replaceState(OSM.parseHash(url), document.title, url); + }; + + router.stateChange = function(state) { + if (state.center) { + window.history.replaceState(state, document.title, OSM.formatHash(state)); + } else { + window.history.replaceState(state, document.title, window.location); + } + }; + } else { + router.route = router.replace = function (url) { + window.location.assign(url); + }; + + router.stateChange = function(state) { + if (state.center) window.location.replace(OSM.formatHash(state)); + }; + } + + router.updateHash = function() { + var hash = OSM.formatHash(map); + if (hash === currentHash) return; + currentHash = hash; + router.stateChange(OSM.parseHash(hash)); + }; + + router.hashUpdated = function() { + var hash = location.hash; + if (hash === currentHash) return; + currentHash = hash; + var state = OSM.parseHash(hash); + map.setState(state); + router.stateChange(state, hash); + }; + + router.moveListenerOn = function() { + map.on('moveend', router.updateHash); + }; + + router.moveListenerOff = function() { + map.off('moveend', router.updateHash); + }; + + router.load = function() { + var loadState = currentRoute.run('load', currentPath); + router.stateChange(loadState || {}); + }; + + router.setCurrentPath = function (path) { + currentPath = path; + currentRoute = routes.recognize(currentPath); + }; + + map.on('moveend baselayerchange overlaylayerchange', router.updateHash); + $(window).on('hashchange', router.hashUpdated); + + return router; +}; diff --git a/app/assets/javascripts/site.js b/app/assets/javascripts/site.js deleted file mode 100644 index 311798aa573..00000000000 --- a/app/assets/javascripts/site.js +++ /dev/null @@ -1,269 +0,0 @@ -//= require jquery -//= require jquery_ujs -//= require jquery.autogrowtextarea -//= require jquery.timers - -/* - * Called as the user scrolls/zooms around to aniplate hrefs of the - * view tab and various other links - */ -function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,objid) { - var decimals = Math.pow(10, Math.floor(zoom/3)); - var node; - - lat = Math.round(lat * decimals) / decimals; - lon = Math.round(lon * decimals) / decimals; - - if (minlon) { - minlon = Math.round(minlon * decimals) / decimals; - minlat = Math.round(minlat * decimals) / decimals; - maxlon = Math.round(maxlon * decimals) / decimals; - maxlat = Math.round(maxlat * decimals) / decimals; - } - - $(".geolink").each(function (index, link) { - var args = getArgs(link.href); - - if ($(link).hasClass("llz")) { - args.lat = lat; - args.lon = lon; - args.zoom = zoom; - } else if (minlon && $(link).hasClass("bbox")) { - args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat; - } - - if (layers && $(link).hasClass("layers")) { - args.layers = layers; - } - - if (objtype && $(link).hasClass("object")) { - args[objtype] = objid; - } - - var classes = $(link).attr("class").split(" "); - - $(classes).each(function (index, classname) { - if (match = classname.match(/^minzoom([0-9]+)$/)) { - var minzoom = match[1]; - var name = link.id.replace(/anchor$/, ""); - - $(link).off("click.minzoom"); - - if (zoom >= minzoom) { - $(link).attr("title", i18n("javascripts.site." + name + "_tooltip")); - $(link).removeClass("disabled"); - } else { - $(link).on("click.minzoom", function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; }); - $(link).attr("title", i18n("javascripts.site." + name + "_disabled_tooltip")); - $(link).addClass("disabled"); - } - } - }); - - link.href = setArgs(link.href, args); - }); - - $("#shortlinkanchor").each(function () { - var args = getArgs(this.href); - var code = makeShortCode(lat, lon, zoom); - var prefix = shortlinkPrefix(); - - // Add ?{node,way,relation}=id to the arguments - if (objtype && objid) { - args[objtype] = objid; - } - - // This is a hack to omit the default mapnik layer from the shortlink. - if (layers && layers != "M") { - args.layers = layers; - } - else { - delete args.layers; - } - - // Here we're assuming that all parameters but ?layers= and - // ?{node,way,relation}= can be safely omitted from the shortlink - // which encodes lat/lon/zoom. If new URL parameters are added to - // the main slippy map this needs to be changed. - if (args.layers || args[objtype]) { - this.href = setArgs(prefix + "/go/" + code, args); - } else { - this.href = prefix + "/go/" + code; - } - }); -} - -/* - * Get the URL prefix to use for a short link - */ -function shortlinkPrefix() { - if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) { - return "http://osm.org"; - } else { - return ""; - } -} - -/* - * Called to get the arguments from a URL as a hash. - */ -function getArgs(url) { - var args = {}; - var querystart = url.indexOf("?"); - - if (querystart >= 0) { - var querystring = url.substring(querystart + 1); - var queryitems = querystring.split("&"); - - for (var i = 0; i < queryitems.length; i++) { - if (match = queryitems[i].match(/^(.*)=(.*)$/)) { - args[unescape(match[1])] = unescape(match[2]); - } else { - args[unescape(queryitems[i])] = null; - } - } - } - - return args; -} - -/* - * Called to set the arguments on a URL from the given hash. - */ -function setArgs(url, args) { - var queryitems = []; - - for (arg in args) { - if (args[arg] == null) { - queryitems.push(escape(arg)); - } else { - queryitems.push(escape(arg) + "=" + escape(args[arg])); - } - } - - return url.replace(/\?.*$/, "") + "?" + queryitems.join("&"); -} - -/* - * Called to interpolate JavaScript variables in strings using a - * similar syntax to rails I18n string interpolation - the only - * difference is that [[foo]] is the placeholder syntax instead - * of {{foo}} which allows the same string to be processed by both - * rails and then later by javascript. - */ -function i18n(string, keys) { - string = i18n_strings[string] || string; - - for (var key in keys) { - var re_key = '\\[\\[' + key + '\\]\\]'; - var re = new RegExp(re_key, "g"); - - string = string.replace(re, keys[key]); - } - - return string; -} - -/* - * Called to interlace the bits in x and y, making a Morton code. - */ -function interlace(x, y) { - x = (x | (x << 8)) & 0x00ff00ff; - x = (x | (x << 4)) & 0x0f0f0f0f; - x = (x | (x << 2)) & 0x33333333; - x = (x | (x << 1)) & 0x55555555; - - y = (y | (y << 8)) & 0x00ff00ff; - y = (y | (y << 4)) & 0x0f0f0f0f; - y = (y | (y << 2)) & 0x33333333; - y = (y | (y << 1)) & 0x55555555; - - return (x << 1) | y; -} - -/* - * Called to create a short code for the short link. - */ -function makeShortCode(lat, lon, zoom) { - char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~"; - var x = Math.round((lon + 180.0) * ((1 << 30) / 90.0)); - var y = Math.round((lat + 90.0) * ((1 << 30) / 45.0)); - // JavaScript only has to keep 32 bits of bitwise operators, so this has to be - // done in two parts. each of the parts c1/c2 has 30 bits of the total in it - // and drops the last 4 bits of the full 64 bit Morton code. - var str = ""; - var c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff); - for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) { - digit = (c1 >> (24 - 6 * i)) & 0x3f; - str += char_array.charAt(digit); - } - for (var i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) { - digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f; - str += char_array.charAt(digit); - } - for (var i = 0; i < ((zoom + 8) % 3); ++i) { - str += "-"; - } - return str; -} - -/* - * Click handler to switch a rich text control to preview mode - */ -function previewRichtext(event) { - var editor = $(this).parents(".richtext_container").find("textarea"); - var preview = $(this).parents(".richtext_container").find(".richtext_preview"); - var width = editor.outerWidth() - preview.outerWidth() + preview.innerWidth(); - var minHeight = editor.outerHeight() - preview.outerHeight() + preview.innerHeight(); - - if (preview.contents().length == 0) { - preview.oneTime(500, "loading", function () { - preview.addClass("loading"); - }); - - preview.load(editor.attr("data-preview-url"), { text: editor.val() }, function () { - preview.stopTime("loading"); - preview.removeClass("loading"); - }); - } - - editor.hide(); - preview.width(width); - preview.css("min-height", minHeight + "px"); - preview.show(); - - $(this).siblings(".richtext_doedit").prop("disabled", false); - $(this).prop("disabled", true); - - event.preventDefault(); -} - -/* - * Click handler to switch a rich text control to edit mode - */ -function editRichtext(event) { - var editor = $(this).parents(".richtext_container").find("textarea"); - var preview = $(this).parents(".richtext_container").find(".richtext_preview"); - - preview.hide(); - editor.show(); - - $(this).siblings(".richtext_dopreview").prop("disabled", false); - $(this).prop("disabled", true); - - event.preventDefault(); -} - -/* - * Setup any rich text controls - */ -$(document).ready(function () { - $(".richtext_preview").hide(); - $(".richtext_content textarea").change(function () { - $(this).parents(".richtext_container").find(".richtext_preview").empty(); - }); - $(".richtext_doedit").prop("disabled", true); - $(".richtext_dopreview").prop("disabled", false); - $(".richtext_doedit").click(editRichtext); - $(".richtext_dopreview").click(previewRichtext); -}); diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js new file mode 100644 index 00000000000..fb4aa030036 --- /dev/null +++ b/app/assets/javascripts/user.js @@ -0,0 +1,59 @@ +//= require leaflet.locate + +$(document).ready(function () { + var map = L.map("map", { + attributionControl: false, + zoomControl: false + }).addLayer(new L.OSM.Mapnik()); + + var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright'; + + L.OSM.zoom({position: position}) + .addTo(map); + + L.control.locate({ + position: position, + strings: { + title: I18n.t('javascripts.map.locate.title'), + popup: I18n.t('javascripts.map.locate.popup') + } + }).addTo(map); + + if (OSM.home) { + map.setView([OSM.home.lat, OSM.home.lon], 12); + } else { + map.setView([0, 0], 0); + } + + if ($("#map").hasClass("set_location")) { + var marker = L.marker([0, 0], {icon: getUserIcon()}); + + if (OSM.home) { + marker.setLatLng([OSM.home.lat, OSM.home.lon]); + marker.addTo(map); + } + + map.on("click", function (e) { + if ($('#updatehome').is(':checked')) { + var zoom = map.getZoom(), + precision = OSM.zoomPrecision(zoom), + location = e.latlng.wrap(); + + $('#homerow').removeClass(); + $('#home_lat').val(location.lat.toFixed(precision)); + $('#home_lon').val(location.lng.toFixed(precision)); + + marker.setLatLng(e.latlng); + marker.addTo(map); + } + }); + } else { + $("[data-user]").each(function () { + var user = $(this).data('user'); + if (user.lon && user.lat) { + L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map) + .bindPopup(user.description); + } + }); + } +}); diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js new file mode 100644 index 00000000000..aa28e99e9d8 --- /dev/null +++ b/app/assets/javascripts/welcome.js @@ -0,0 +1,47 @@ +$(document).ready(function() { + var params = OSM.params(); + + if (params.lat && params.lon) { + params.lat = parseFloat(params.lat); + params.lon = parseFloat(params.lon); + params.zoom = params.zoom || 17; + + var url = '/edit'; + + if (params.editor) { + url += '?editor=' + params.editor; + } + + url += OSM.formatHash(params); + + $('.start-mapping').attr('href', url); + + } else { + function geoSuccess(position) { + window.location = '/edit' + OSM.formatHash({ + zoom: 17, + lat: position.coords.latitude, + lon: position.coords.longitude + }); + } + + $('.start-mapping').on('click', function(e) { + e.preventDefault(); + $('.start-mapping').addClass('loading'); + + if (navigator.geolocation) { + // handle firefox's weird implementation + // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 + window.setTimeout(manualEdit, 4000); + + navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); + } else { + manualEdit(); + } + }); + } + + function manualEdit() { + window.location = '/?edit_help=1'; + } +}); diff --git a/app/assets/openlayers/SimpleLayerSwitcher.js b/app/assets/openlayers/SimpleLayerSwitcher.js deleted file mode 100644 index db3c720bb45..00000000000 --- a/app/assets/openlayers/SimpleLayerSwitcher.js +++ /dev/null @@ -1,175 +0,0 @@ -var SimpleLayerSwitcher = OpenLayers.Class(OpenLayers.Control, { - layerStates: null, - layersDiv: null, - ascending: true, - - initialize: function(options) { - OpenLayers.Control.prototype.initialize.apply(this, arguments); - this.layerStates = []; - }, - - destroy: function() { - OpenLayers.Event.stopObservingElement(this.div); - - //clear out layers info and unregister their events - this.map.events.un({ - "addlayer": this.redraw, - "changelayer": this.redraw, - "removelayer": this.redraw, - "changebaselayer": this.redraw, - scope: this - }); - OpenLayers.Control.prototype.destroy.apply(this, arguments); - }, - - setMap: function(map) { - OpenLayers.Control.prototype.setMap.apply(this, arguments); - - this.map.events.on({ - "addlayer": this.redraw, - "changelayer": this.redraw, - "removelayer": this.redraw, - "changebaselayer": this.redraw, - scope: this - }); - }, - - draw: function() { - OpenLayers.Control.prototype.draw.apply(this); - this.loadContents(); - this.redraw(); - return this.div; - }, - - checkRedraw: function() { - var redraw = false; - if ( !this.layerStates.length || - (this.map.layers.length != this.layerStates.length) ) { - redraw = true; - } else { - for (var i=0, len=this.layerStates.length; iUTF-8 UTF-8 data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%06%00%00%00%1F%F3%FFa%00%00%00%19tEXtSoftware%00www.inkscape.org%9B%EE%3C%1A%00%00%01'IDATx%9C%9D%93%B1q%C30%0CE%1F%5Dd%80l%90I%C4*%A7%22%95%CF%85J%97%AE%B2%82%3DC%CE%03%A0%B3%9B%B8f%95%A3%17H%93%05%5C%A7%C8%0A%3F%05E%8A%92l%E7.%D0%E9N%02%81%07%E0Cr%FCaf%A6%FC%BC%5E%AF%DD%F4%3C%3Bt%C5%87%99)%84P%0E%DA%B6%BD%0AI%00%A1%A8%A8%1E%263S%D7u%C9'F%FE%9B%80%0C%C9%C9%22%BD'%B0%0A%AC%86%2CJ%DB%0E%22%11%8F%2F%D4%B3%22%8D%F34%CE%13u%06R%0C%40%D7u%AA%01%C5r%40%0Dq%88%C6%F9i%E8%7C%8CX%5D%A9M%95%D6%A3%A2Ti%C3Xx%CA%9C%F5mf3h%11%B6%07%B8%0APh%97%DD%1E%9E%5E%08!%D0%B6m%F1%87%108%1E%8EY5%007%03%5Cv%7B%00%3E%BF%3E%F8~x%1E%CD%B89l%00%F0I%0FWw%00%20%DB%AEJr%B6%E5%FB%09%80%C6y%CE%7D%91%1AP%B6p%2B%D9%BB%06%18V%3A%B5E%9F%AC%5B%95%AFY%3F%EE%20%A2mW%AA%93%DFN%3F%A0%E1%9B%F0u%E5%BC%BC%89%88%BC.%1F%D5'%DF%FD%C1%EE%F8%FFg%BFp%96%DF%E2%DCw%25%2B%00%00%00%00IEND%AEB%60%82 - + diff --git a/app/assets/stylesheets/browse.css.scss b/app/assets/stylesheets/browse.css.scss index dd1bf30c23b..0aa762a12c2 100644 --- a/app/assets/stylesheets/browse.css.scss +++ b/app/assets/stylesheets/browse.css.scss @@ -1,143 +1,155 @@ -.node { padding-left: 25px; } -.way { padding-left: 25px; } -.relation { padding-left: 25px; } +/* Make space for icons */ + +.node::before, +.way::before, +.relation::before { + display: inline-block; + width: 25px; + margin-left: -25px; +} + +.node, .way, .relation { + margin-left: 25px; +} + +/* Deleted objects */ .deleted { text-decoration: line-through; } /* Nodes (and ways as areas) */ -.aeroway.aerodrome { background: image-url('browse/aerodrome.p.16.png') no-repeat center left; } - -.amenity.atm { background: image-url('browse/atm2.p.16.png') no-repeat center left; } -.amenity.bank { background: image-url('browse/bank2.p.16.png') no-repeat center left; } -.amenity.bar { background: image-url('browse/bar.p.16.png') no-repeat center left; } -.amenity.bicycle_parking { background: image-url('browse/transport_parking_bicycle.p.16.png') no-repeat center left; } -.amenity.bicycle_rental { background: image-url('browse/transport_rental_bicycle.p.16.png') no-repeat center left; } -.amenity.bus_station { background: image-url('browse/bus_station.n.16.png') no-repeat center left; } -.amenity.cafe { background: image-url('browse/cafe.p.16.png') no-repeat center left; } -.amenity.car_rental { background: image-url('browse/transport_rental_car.p.16.png') no-repeat center left; } -.amenity.car_sharing { background: image-url('browse/car_share.p.16.png') no-repeat center left; } -.amenity.cinema { background: image-url('browse/cinema.p.16.png') no-repeat center left; } -.amenity.dentist { background: image-url('browse/health_dentist.p.16.png') no-repeat center left; } -.amenity.doctors { background: image-url('browse/health_doctors.p.16.png') no-repeat center left; } -.amenity.drinking_water { background: image-url('browse/drinkingtap.p.16.png') no-repeat center left; } -.amenity.fast_food { background: image-url('browse/fast_food.p.16.png') no-repeat center left; } -.amenity.fire_station { background: image-url('browse/firestation.p.16.png') no-repeat center left; } -.amenity.fuel { background: image-url('browse/fuel.p.16.png') no-repeat center left; } -.amenity.hospital { background: image-url('browse/hospital.p.16.png') no-repeat center left; } -.amenity.library { background: image-url('browse/library.p.16.png') no-repeat center left; } -.amenity.nursery { background: image-url('browse/education_nursery.p.16.png') no-repeat center left; } -.amenity.parking { background: image-url('browse/parking.p.16.png') no-repeat center left; } -.amenity.pharmacy { background: image-url('browse/pharmacy.p.16.png') no-repeat center left; } -.amenity.place_of_worship { background: image-url('browse/place_of_worship_unknown3.p.16.png') no-repeat center left; } -.amenity.police { background: image-url('browse/police.p.16.png') no-repeat center left; } -.amenity.post_box { background: image-url('browse/post_box.p.16.png') no-repeat center left; } -.amenity.post_office { background: image-url('browse/post_office.p.16.png') no-repeat center left; } -.amenity.prison { background: image-url('browse/prison.p.16.png') no-repeat center left; } -.amenity.pub { background: image-url('browse/pub.p.16.png') no-repeat center left; } -.amenity.restaurant { background: image-url('browse/restaurant.p.16.png') no-repeat center left; } -.amenity.recycling { background: image-url('browse/recycling.p.16.png') no-repeat center left; } -.amenity.school { background: image-url('browse/education_school.p.16.png') no-repeat center left; } -.amenity.shelter { background: image-url('browse/shelter2.p.16.png') no-repeat center left; } -.amenity.telephone { background: image-url('browse/telephone.p.16.png') no-repeat center left; } -.amenity.theatre { background: image-url('browse/theatre.p.16.png') no-repeat center left; } -.amenity.toilets { background: image-url('browse/toilets.p.16.png') no-repeat center left; } -.amenity.university { background: image-url('browse/education_university.p.16.png') no-repeat center left; } -.amenity.veterinary { background: image-url('browse/health_veterinary.p.16.png') no-repeat center left; } - -.barrier.gate { background: image-url('browse/gate2.p.16.png') no-repeat center left; } - -.highway.bus_stop { background: image-url('browse/bus_stop.p.16.png') no-repeat center left; } -.highway.mini_roundabout { background: image-url('browse/mini_round.p.16.png') no-repeat center left; } -.highway.traffic_signals { background: image-url('browse/traffic_light.png') no-repeat center left; } -.highway.turning_circle { background: image-url('browse/turning_circle.p.16.png') no-repeat center left; } - -.historic.castle { background: image-url('browse/tourist_castle.p.16.png') no-repeat center left; } -.historic.memorial { background: image-url('browse/tourist_memorial.p.16.png') no-repeat center left; } -.historic.monument { background: image-url('browse/tourist_monument.p.16.png') no-repeat center left; } -.historic.ruins { background: image-url('browse/tourist_ruins.p.16.png') no-repeat center left; } -.historic.wreck { background: image-url('browse/tourist_wreck.p.16.png') no-repeat center left; } - -.man_made.lighthouse { background: image-url('browse/lighthouse.p.16.png') no-repeat center left; } -.man_made.windmill { background: image-url('browse/tourist_windmill.p.16.png') no-repeat center left; } - -.natural.tree { background: image-url('browse/tree.p.16.png') no-repeat center left; } - -.railway.halt { background: image-url('browse/halt.p.16.png') no-repeat center left; } -.railway.station { background: image-url('browse/station.p.16.png') no-repeat center left; } -.railway.level_crossing { background: image-url('browse/level_crossing.p.16.png') no-repeat center left; } - -.shop { background: image-url('browse/shop_convenience.p.16.png') no-repeat center left; } -.shop.bakery { background: image-url('browse/shop_bakery.p.16.png') no-repeat center left; } -.shop.bicycle { background: image-url('browse/shop_bicycle.p.16.png') no-repeat center left; } -.shop.books { background: image-url('browse/shop_books.p.16.png') no-repeat center left; } -.shop.butcher { background: image-url('browse/shop_butcher.p.16.png') no-repeat center left; } -.shop.clothes { background: image-url('browse/shop_clothes.p.16.png') no-repeat center left; } -.shop.convenience { background: image-url('browse/shop_convenience.p.16.png') no-repeat center left; } -.shop.diy { background: image-url('browse/shop_diy.p.16.png') no-repeat center left; } -.shop.estate_agent { background: image-url('browse/shop_estateagent2.p.16.png') no-repeat center left; } -.shop.fish { background: image-url('browse/shop_fish.p.16.png') no-repeat center left; } -.shop.garden_centre { background: image-url('browse/shop_garden_centre.p.16.png') no-repeat center left; } -.shop.gift { background: image-url('browse/shop_gift.p.16.png') no-repeat center left; } -.shop.greengrocer { background: image-url('browse/shop_greengrocer.p.16.png') no-repeat center left; } -.shop.hairdresser { background: image-url('browse/shop_hairdresser.p.16.png') no-repeat center left; } -.shop.jewelry { background: image-url('browse/shop_jewelry.p.16.png') no-repeat center left; } -.shop.supermarket { background: image-url('browse/shop_supermarket.p.16.png') no-repeat center left; } - -.tourism.alpine_hut { background: image-url('browse/alpinehut.p.16.png') no-repeat center left; } -.tourism.camp_site { background: image-url('browse/camping.n.16.png') no-repeat center left; } -.tourism.caravan_site { background: image-url('browse/caravan_park.n.16.png') no-repeat center left; } -.tourism.hostel { background: image-url('browse/hostel.p.16.png') no-repeat center left; } -.tourism.hotel { background: image-url('browse/hotel.p.16.png') no-repeat center left; } -.tourism.museum { background: image-url('browse/museum.p.16.png') no-repeat center left; } -.tourism.picnic_site { background: image-url('browse/tourist_picnic.p.16.png') no-repeat center left; } -.tourism.viewpoint { background: image-url('browse/view_point.p.16.png') no-repeat center left; } +.aeroway.aerodrome::before { content: image-url('browse/aerodrome.p.16.png'); } + +.amenity.atm::before { content: image-url('browse/atm2.p.16.png'); } +.amenity.bank::before { content: image-url('browse/bank2.p.16.png'); } +.amenity.bar::before { content: image-url('browse/bar.p.16.png'); } +.amenity.bicycle_parking::before { content: image-url('browse/transport_parking_bicycle.p.16.png'); } +.amenity.bicycle_rental::before { content: image-url('browse/transport_rental_bicycle.p.16.png'); } +.amenity.bus_station::before { content: image-url('browse/bus_station.n.16.png'); } +.amenity.cafe::before { content: image-url('browse/cafe.p.16.png'); } +.amenity.car_rental::before { content: image-url('browse/transport_rental_car.p.16.png'); } +.amenity.car_sharing::before { content: image-url('browse/car_share.p.16.png'); } +.amenity.cinema::before { content: image-url('browse/cinema.p.16.png'); } +.amenity.dentist::before { content: image-url('browse/health_dentist.p.16.png'); } +.amenity.doctors::before { content: image-url('browse/health_doctors.p.16.png'); } +.amenity.drinking_water::before { content: image-url('browse/drinkingtap.p.16.png'); } +.amenity.fast_food::before { content: image-url('browse/fast_food.p.16.png'); } +.amenity.fire_station::before { content: image-url('browse/firestation.p.16.png'); } +.amenity.fuel::before { content: image-url('browse/fuel.p.16.png'); } +.amenity.hospital::before { content: image-url('browse/hospital.p.16.png'); } +.amenity.library::before { content: image-url('browse/library.p.16.png'); } +.amenity.nursery::before { content: image-url('browse/education_nursery.p.16.png'); } +.amenity.parking::before { content: image-url('browse/parking.p.16.png'); } +.amenity.pharmacy::before { content: image-url('browse/pharmacy.p.16.png'); } +.amenity.place_of_worship::before { content: image-url('browse/place_of_worship_unknown3.p.16.png'); } +.amenity.police::before { content: image-url('browse/police.p.16.png'); } +.amenity.post_box::before { content: image-url('browse/post_box.p.16.png'); } +.amenity.post_office::before { content: image-url('browse/post_office.p.16.png'); } +.amenity.prison::before { content: image-url('browse/prison.p.16.png'); } +.amenity.pub::before { content: image-url('browse/pub.p.16.png'); } +.amenity.restaurant::before { content: image-url('browse/restaurant.p.16.png'); } +.amenity.recycling::before { content: image-url('browse/recycling.p.16.png'); } +.amenity.school::before { content: image-url('browse/education_school.p.16.png'); } +.amenity.shelter::before { content: image-url('browse/shelter2.p.16.png'); } +.amenity.telephone::before { content: image-url('browse/telephone.p.16.png'); } +.amenity.theatre::before { content: image-url('browse/theatre.p.16.png'); } +.amenity.toilets::before { content: image-url('browse/toilets.p.16.png'); } +.amenity.university::before { content: image-url('browse/education_university.p.16.png'); } +.amenity.veterinary::before { content: image-url('browse/health_veterinary.p.16.png'); } + +.barrier.gate::before { content: image-url('browse/gate2.p.16.png'); } + +.highway.bus_stop::before { content: image-url('browse/bus_stop.p.16.png'); } +.highway.mini_roundabout::before { content: image-url('browse/mini_round.p.16.png'); } +.highway.traffic_signals::before { content: image-url('browse/traffic_light.png'); } +.highway.turning_circle::before { content: image-url('browse/turning_circle.p.16.png'); } + +.historic.castle::before { content: image-url('browse/tourist_castle.p.16.png'); } +.historic.memorial::before { content: image-url('browse/tourist_memorial.p.16.png'); } +.historic.monument::before { content: image-url('browse/tourist_monument.p.16.png'); } +.historic.ruins::before { content: image-url('browse/tourist_ruins.p.16.png'); } +.historic.wreck::before { content: image-url('browse/tourist_wreck.p.16.png'); } + +.man_made.lighthouse::before { content: image-url('browse/lighthouse.p.16.png'); } +.man_made.windmill::before { content: image-url('browse/tourist_windmill.p.16.png'); } + +.natural.tree::before { content: image-url('browse/tree.p.16.png'); } + +.railway.halt::before { content: image-url('browse/halt.p.16.png'); } +.railway.station::before { content: image-url('browse/station.p.16.png'); } +.railway.level_crossing::before { content: image-url('browse/level_crossing.p.16.png'); } + +.shop::before { content: image-url('browse/shop_convenience.p.16.png'); } +.shop.bakery::before { content: image-url('browse/shop_bakery.p.16.png'); } +.shop.bicycle::before { content: image-url('browse/shop_bicycle.p.16.png'); } +.shop.books::before { content: image-url('browse/shop_books.p.16.png'); } +.shop.butcher::before { content: image-url('browse/shop_butcher.p.16.png'); } +.shop.clothes::before { content: image-url('browse/shop_clothes.p.16.png'); } +.shop.convenience::before { content: image-url('browse/shop_convenience.p.16.png'); } +.shop.diy::before { content: image-url('browse/shop_diy.p.16.png'); } +.shop.estate_agent::before { content: image-url('browse/shop_estateagent2.p.16.png'); } +.shop.fish::before { content: image-url('browse/shop_fish.p.16.png'); } +.shop.garden_centre::before { content: image-url('browse/shop_garden_centre.p.16.png'); } +.shop.gift::before { content: image-url('browse/shop_gift.p.16.png'); } +.shop.greengrocer::before { content: image-url('browse/shop_greengrocer.p.16.png'); } +.shop.hairdresser::before { content: image-url('browse/shop_hairdresser.p.16.png'); } +.shop.jewelry::before { content: image-url('browse/shop_jewelry.p.16.png'); } +.shop.supermarket::before { content: image-url('browse/shop_supermarket.p.16.png'); } + +.tourism.alpine_hut::before { content: image-url('browse/alpinehut.p.16.png'); } +.tourism.camp_site::before { content: image-url('browse/camping.n.16.png'); } +.tourism.caravan_site::before { content: image-url('browse/caravan_park.n.16.png'); } +.tourism.hostel::before { content: image-url('browse/hostel.p.16.png'); } +.tourism.hotel::before { content: image-url('browse/hotel.p.16.png'); } +.tourism.museum::before { content: image-url('browse/museum.p.16.png'); } +.tourism.picnic_site::before { content: image-url('browse/tourist_picnic.p.16.png'); } +.tourism.viewpoint::before { content: image-url('browse/view_point.p.16.png'); } /* Ways */ -.aeroway.runway { background: image-url('browse/runway.20.png') no-repeat center left; } -.aeroway.taxiway { background: image-url('browse/taxiway.20.png') no-repeat center left; } - -.building { background: image-url('browse/building.png') no-repeat center left; } - -.highway.bridleway { background: image-url('browse/bridleway.20.png') no-repeat center left; } -.highway.byway { background: image-url('browse/byway.20.png') no-repeat center left; } -.highway.cycleway { background: image-url('browse/cycleway.20.png') no-repeat center left; } -.highway.footway { background: image-url('browse/footway.20.png') no-repeat center left; } -.highway.motorway { background: image-url('browse/motorway.20.png') no-repeat center left; } -.highway.motorway_link { background: image-url('browse/motorway.20.png') no-repeat center left; } -.highway.pedestrian { background: image-url('browse/service.20.png') no-repeat center left; } -.highway.primary { background: image-url('browse/primary.20.png') no-repeat center left; } -.highway.primary_link { background: image-url('browse/primary.20.png') no-repeat center left; } -.highway.residential { background: image-url('browse/unclassified.20.png') no-repeat center left; } -.highway.secondary { background: image-url('browse/secondary.20.png') no-repeat center left; } -.highway.secondary_link { background: image-url('browse/secondary.20.png') no-repeat center left; } -.highway.service { background: image-url('browse/service.20.png') no-repeat center left; } -.highway.trunk { background: image-url('browse/trunk.20.png') no-repeat center left; } -.highway.trunk_link { background: image-url('browse/trunk.20.png') no-repeat center left; } -.highway.unclassified { background: image-url('browse/unclassified.20.png') no-repeat center left; } - -.landuse.brownfield { background: image-url('browse/brownfield.png') no-repeat center left; } -.landuse.cemetery { background: image-url('browse/cemetery.png') no-repeat center left; } -.landuse.commercial { background: image-url('browse/commercial.png') no-repeat center left; } -.landuse.farm { background: image-url('browse/farm.png') no-repeat center left; } -.landuse.forest { background: image-url('browse/forest.png') no-repeat center left; } -.landuse.industrial { background: image-url('browse/industrial.png') no-repeat center left; } -.landuse.military { background: image-url('browse/military.png') no-repeat center left; } -.landuse.residential { background: image-url('browse/residential.png') no-repeat center left; } -.landuse.retail { background: image-url('browse/retail.png') no-repeat center left; } -.landuse.tourism { background: image-url('browse/tourism.png') no-repeat center left; } -.landuse.wood { background: image-url('browse/wood.png') no-repeat center left; } - -.leisure.golf_course { background: image-url('browse/golf.png') no-repeat center left; } -.leisure.park { background: image-url('browse/park.png') no-repeat center left; } -.leisure.pitch { background: image-url('browse/pitch.png') no-repeat center left; } -.leisure.nature_reserve { background: image-url('browse/reserve.png') no-repeat center left; } - -.natural.heath { background: image-url('browse/heathland.png') no-repeat center left; } -.natural.water { background: image-url('browse/lake.png') no-repeat center left; } - -.railway.light_rail { background: image-url('browse/light_rail.20.png') no-repeat center left; } -.railway.rail { background: image-url('browse/rail.20.png') no-repeat center left; } -.railway.subway { background: image-url('browse/subway.20.png') no-repeat center left; } -.railway.tram { background: image-url('browse/tram.20.png') no-repeat center left; } +.aeroway.runway::before { content: image-url('browse/runway.20.png'); } +.aeroway.taxiway::before { content: image-url('browse/taxiway.20.png'); } + +.building::before { content: image-url('browse/building.png'); } + +.highway.bridleway::before { content: image-url('browse/bridleway.20.png'); } +.highway.byway::before { content: image-url('browse/byway.20.png'); } +.highway.cycleway::before { content: image-url('browse/cycleway.20.png'); } +.highway.footway::before { content: image-url('browse/footway.20.png'); } +.highway.motorway::before { content: image-url('browse/motorway.20.png'); } +.highway.motorway_link::before { content: image-url('browse/motorway.20.png'); } +.highway.pedestrian::before { content: image-url('browse/service.20.png'); } +.highway.primary::before { content: image-url('browse/primary.20.png'); } +.highway.primary_link::before { content: image-url('browse/primary.20.png'); } +.highway.residential::before { content: image-url('browse/unclassified.20.png'); } +.highway.secondary::before { content: image-url('browse/secondary.20.png'); } +.highway.secondary_link::before { content: image-url('browse/secondary.20.png'); } +.highway.service::before { content: image-url('browse/service.20.png'); } +.highway.trunk::before { content: image-url('browse/trunk.20.png'); } +.highway.trunk_link::before { content: image-url('browse/trunk.20.png'); } +.highway.unclassified::before { content: image-url('browse/unclassified.20.png'); } + +.landuse.brownfield::before { content: image-url('browse/brownfield.png'); } +.landuse.cemetery::before { content: image-url('browse/cemetery.png'); } +.landuse.commercial::before { content: image-url('browse/commercial.png'); } +.landuse.farm::before { content: image-url('browse/farm.png'); } +.landuse.forest::before { content: image-url('browse/forest.png'); } +.landuse.industrial::before { content: image-url('browse/industrial.png'); } +.landuse.military::before { content: image-url('browse/military.png'); } +.landuse.residential::before { content: image-url('browse/residential.png'); } +.landuse.retail::before { content: image-url('browse/retail.png'); } +.landuse.tourism::before { content: image-url('browse/tourism.png'); } +.landuse.wood::before { content: image-url('browse/wood.png'); } + +.leisure.golf_course::before { content: image-url('browse/golf.png'); } +.leisure.park::before { content: image-url('browse/park.png'); } +.leisure.pitch::before { content: image-url('browse/pitch.png'); } +.leisure.nature_reserve::before { content: image-url('browse/reserve.png'); } + +.natural.heath::before { content: image-url('browse/heathland.png'); } +.natural.water::before { content: image-url('browse/lake.png'); } + +.railway.light_rail::before { content: image-url('browse/light_rail.20.png'); } +.railway.rail::before { content: image-url('browse/rail.20.png'); } +.railway.subway::before { content: image-url('browse/subway.20.png'); } +.railway.tram::before { content: image-url('browse/tram.20.png'); } diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index ca95e9401bb..b552ce850cc 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1,30 +1,188 @@ +@import "parameters"; + /* Styles common to large and small screens */ +/* Minimal CSS reset */ + +html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input { + margin: 0; + padding: 0; + border: 0; + font-size:100%; +} + +fieldset,img { border: 0; } + +legend { color: #000; } + +sup { vertical-align: text-top; } + +sub { vertical-align: text-bottom; } + +table { + border-collapse: collapse; + border-spacing: 0; +} + +li { list-style: none; } + +input, +select, +textarea, +body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; } + +abbr, acronym { + border-bottom: .1em dotted; + cursor: help; +} + +strong { + font-weight: bold; +} + +/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */ + +.clearfix:before, +.clearfix:after { + content: " "; + display: table; +} + +.clearfix:after { + clear: both; +} + +/* Basic grid */ + +.col0 { float:left; width:04.1666%; } +.col1 { float:left; width:08.3333%; } +.col2 { float:left; width:16.6666%; } +.col3 { float:left; width:25.0000%; } +.col4 { float:left; width:33.3333%; } +.col5 { float:left; width:41.6666%; } +.col6 { float:left; width:50.0000%; } +.col7 { float:left; width:58.3333%; } +.col8 { float:left; width:66.6666%; } +.col9 { float:left; width:75.0000%; } +.col10 { float:left; width:83.3333%; } +.col11 { float:left; width:91.6666%; } +.col12 { width:100%; } + +.margin0 { margin-left:04.1666%; } +.margin1 { margin-left:08.3333%; } +.margin2 { margin-left:16.6666%; } +.margin3 { margin-left:25.0000%; } +.margin4 { margin-left:33.3333%; } +.margin5 { margin-left:41.6666%; } +.margin6 { margin-left:50.0000%; } +.margin7 { margin-left:58.3333%; } +.margin8 { margin-left:66.6666%; } +.margin9 { margin-left:75.0000%; } +.margin10 { margin-left:83.3333%; } +.margin11 { margin-left:91.6666%; } +.margin12 { margin-left:100.0000%; } + +.fillL { background-color: white; } + /* Default rules for the body of every page */ +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + body { font-family: 'Helvetica Neue',Arial,sans-serif; - font-size: 14px; - line-height: 20px; + font-size: $typeheight; + line-height: 1.6666; color: #222; background-color: #fff; margin: 0px; padding: 0px; + text-align: left; + height: 100%; } -body.slim { - background-color: #f0f0f0; +h1, h2, h3 { + font-weight: 600; + line-height: 1.2; +} + +h4, h5 { + font-weight: 500; +} + +h1 { + font-size: 18px; +} + +h2, h3 { + font-size: 16px; +} + +p > img { + width: auto; + max-width: 100%; +} + +small, aside { + font-size: 12px; } +#container { position: relative; } + +.column-1 { + width: 50%; + margin: 0 0 $lineheight/2 0; +} + +.small_icon { + vertical-align: middle; + margin-right: $lineheight/4; +} + +.red { color: $red; } + +/* Rules for icons */ + +.icon { + display:inline-block; + vertical-align:top; + width:20px; + height:20px; + background:transparent image-url("sprite.png") no-repeat 0 0; + text-indent:-9999px; + overflow:hidden; +} + +.icon.search { background-position: 0 0; } +.icon.donate { background-position: -20px 0; } +.icon.zoomin { background-position: -40px 0; } +.icon.zoomout { background-position: -60px 0; } +.icon.geolocate { background-position: -80px 0; } +.active .icon.geolocate { background-position: -80px -20px; } +.icon.layers { background-position: -100px 0; } +.icon.key { background-position: -120px 0; } +.icon.share { background-position: -140px 0; } +.icon.clipboard { background-position: -160px 0; } +.icon.link { background-position: -180px 0; } +.icon.close { background-position: -200px 0; } +.icon.close:hover { background-position: -200px -20px; } +.icon.check { background-position: -220px 0; } +.icon.note { background-position: -240px 0; } +.icon.gear { background-position: -260px 0; } + /* Rules for links */ a { - color: #00f; + color: #24d; text-decoration: none; -} - -a:hover { - text-decoration: underline; + -webkit-appearance: none; + outline: 0; + &:hover { + text-decoration: underline; + } } /* Rules for horizontal lines */ @@ -36,826 +194,1418 @@ hr { height: 1px; } -/* Default rules for headings */ +/* General styles for tables */ -h2 { - margin: 5px 0; - font-size: 25px; - line-height: 30px; +table { + width: 100%; + margin-bottom: $lineheight; + th, td { + text-align: left; + padding: $lineheight/4; + line-height: $lineheight; + } + th { + font-weight: 600; + vertical-align: top; + } + td { + vertical-align: middle; + } } -/* Rules for the whole left sidebar, including the logo */ +/* Utility for de-emphasizing content */ -#left { - position: absolute; - top: 0px; - width: 185px; - font-size: 11px; - line-height: 12px; +.deemphasize { + color: #999; + a { + color: $blue; + } } -/* Rules for the OpenStreetMap logo in the top left corner */ +/* Rules for the header */ -#logo { - width: 170px; - min-width: 170px; - padding: 5px; - text-align: center; - margin: 25px 0 5px 0; +#menu-icon { + display: none !important; + float: right; + background: image-url("menu-icon.png") no-repeat; + background-size: 30px 30px; + display: block; + width: 30px; + height: 30px; + margin: 14px 10px 0 0; + opacity: 0.6; } -#logo h1 { - font-size: 18px; - line-height: 20px; - text-align: center; - margin: 0px; -} +header { + height: $headerHeight; + position: relative; + z-index: 1001; + font-size: 14px; -#logo h2 { - font-size: 10px; - line-height: 15px; - margin: 0px; -} + h1, nav, nav > ul, nav > ul > li, .dropdown { + display: inline-block; + } + + > * { + height: 100%; + padding: $lineheight/2; + } -/* Rules for the site name */ + h1, nav.primary { + float: left; + } -#small-title { - display: none; -} + a, a:hover { + text-decoration: none; + } -/* Rules for the introductory text displayed in the left sidebar to new users */ + img.logo { + width: 30px; + height: 30px; + margin-top: -2px; + vertical-align: middle; + } -.sidebar-copy { - border-top: 1px solid #ccc; - padding: 0px 5px; -} + h1 { + margin: 0; + padding-top: 15px; -.sidebar-copy p { - margin: 5px; + a { + color: #000; + } + } } -/* - * Rules for alert boxes shown in the left sidebar when important - * information needs to be conveyed such as when the site is - * undergoing maintenance. - */ +nav.primary { + > ul { + $border: 1px solid $green; -.sidebar-alert { - padding: 4px 5px 4px 5px; - border-top: 1px solid #ccc; - margin-top: 4px; - margin-bottom: -4px; - background: #e00; - font-size: 13px; - font-weight: bold; - line-height: 17px; + border: $border; + border-radius: $border-radius; - p { - margin: 5px; + > li { + border-right: $border; + float: left; + &:last-child { + border-right: 0; + } + > a:hover { background: lighten($green, 30%); } + &.current > a:hover { background: $green; } + &.disabled > a:hover { background: lighten($green, 38%); } + &.dropdown { + > a.tab { border-right: 1px solid lighten($green, 30%); } + &.current > a.tab { border-right: 1px solid lighten($green, 10%); } + } + } } -} -/* - * Rules for notice boxes shown in the left sidebar when important, but - * non-critical information needs to be conveyed such as notices about - * donation drives. - */ + a.tab, + .dropdown-toggle { + display: inline-block; + font-weight: 500; + color: $green; + padding: 5px 15px; + } -.sidebar-notice { - padding: 4px 5px 4px 5px; - border-top: 1px solid #ccc; - margin-top: 4px; - margin-bottom: -4px; - background: #ea0; - font-size: 13px; - line-height: 17px; + .dropdown-toggle { + padding: 5px 6px; + } - p { - margin: 5px; + .caret { + border-top-color: $green; + margin-top: 10px; } -} -/* Rules for the menu displayed in the left sidebar */ + .disabled a { + color: #ccc; + cursor: default; -.left_menu { - padding: 5px 10px; - margin: 4px 0; - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; - line-height: 20px; - font-size: 14px; - font-weight: bold; -} + .caret { + border-top-color: #ccc; + } + } -.left_menu h1 { - font-style: normal; - font-size: 15px; -} + > ul li.current { + background-color: $green; -.left_menu ul { - margin: 0px; - list-style-type: none; -} + .tab { + color: #fff; + } -.left_menu li { - margin: 0px; - padding: 0px; + .caret { + border-top-color: #fff; + } + } } -/* submenus */ -.left_menu ul li ul { - font-weight: normal; - line-height: 15px; - font-size: 12px; -} +nav.secondary { + position: absolute; + right: 0; -.left_menu a { - color: #000; -} + > ul { + vertical-align: middle; + a, .dropdown-toggle { + display: inline-block; + text-decoration: none; + color: $darkgrey; + padding: 5px; -/* Rules for SOTM advert */ + &:hover { color: darken($darkgrey, 25%); } + } + } -#sotm { - width: 180px; - min-width: 180px; - margin: 5px; - padding: 0px; - border: 0px; - background: #fff; -} + > ul li.current a { + color: darken($darkgrey, 25%); + } -/* - * Rules for "optional boxes" which appear in the left sidebar on - * certain pages. Current users are the seach box on the main page - * and the tag cloud on the traces pages. - */ + .user-menu { + $border: 1px solid $grey; + border: $border; + border-radius: $border-radius; + margin-left: 10px; + + > li { + border-right: $border; + float: left; + &:last-child { + border-right: 0; + + > a { + border-radius: 0 $border-radius $border-radius 0; + } + } + &:first-child > a { border-radius: $border-radius 0 0 $border-radius; } + &:hover a { background: lighten($darkgrey, 30%); } + } -.optionalbox { - padding: 5px 10px; - margin: 4px 0; - border-top: 1px solid #ccc; -} + a { + padding: 5px 15px; -.optionalbox h1 { - font-size: 14px; - font-weight: bold; - line-height: 20px; - margin: 0px; - vertical-align: bottom; -} + } -/* Rules for the search box */ + &.logged-in > a { + padding: 0; + > .user-button { + line-height: 1.8; + padding: 5px 10px 3px 6px; + display: inline-block; + color: $darkgrey; + } + &:hover > .user-button { color: darken($darkgrey, 5%); } + } + } -.whereami { - line-height: 20px; - vertical-align: bottom; -} + .caret { + border-top-color: $grey; + margin-top: 9px; + } -.search_container { - height: 15px; - padding-bottom: 5px; -} + img.user_thumbnail_tiny { + border: 0; + vertical-align: top; + margin-top: 0px; + margin: 4px 0 0 4px; + border-radius: 2px; + } -#search_field form { - width: 100%; - margin: 0px; - padding: 0px; -} + #inboxanchor { + display: inline-block; + vertical-align: top; + height: 25px; + margin: 3px 0 3px 3px; + background-color: lighten($grey, 10%); + line-height: 20px; + border-radius: 2; + } -#search_field input[type="text"] { - width: 130px; -} + .dropdown-menu { + left: auto; + right: -1px; + border-radius: 3px 0 3px 3px; -#search_field input[type="submit"] { - width: 26px; - padding-left: 0px; - padding-right: 0px; + .count-number { + float: right; + padding: 0 5px; + margin: 0; + } + } } -.search_help { - margin-top: 2px; - margin-bottom: 0px; +#compact-secondary-nav { + display: none; + ul li a { + width: 100%; + color: #333; + &:hover { color: #fff; } + } } -/* Rules for donation request box */ - -.donate { - width: 153px; - margin: 10px 10px; - padding: 5px; - border: 1px solid #ccc; - background: #cbeea7; - line-height: 20px; - text-align: center; - font-size: 14px; - border-radius: 5px; - -moz-border-radius: 5px; +@media only screen and (max-width:960px) { + #compact-secondary-nav { + display: inline-block; + } + .compact-hide { + display: none; + } } -/* Rules for Creative Commons logo button */ +/* Utility for styling notification numbers */ -#cclogo { - margin-top: 10px; - margin-bottom: 10px; +.count-number { + padding: 2px $lineheight/4; + border-radius: 2px; + background: lighten($green, 30%); + margin: 0 2px; + font-size: 11px; + color: #333; } -/* Rules for tabbed navigation bar */ - -#top-bar { - border-bottom: 1px solid #ccc; - height: 29px; -} +/* Rules for the message shown in place of the map when javascript is disabled */ -#tabnav { - padding: 0; - margin: 0; - overflow:hidden; +#noscript { + z-index: 20000000; + position: absolute; + top: 15px; + left: 15px; } -#tabnav li { - margin: 0px; - padding: 0px; - display: inline; - list-style-type: none; -} +/* Rules for bootstrap tooltips */ -#tabnav a, #tabnav a:link, #tabnav a:visited { - background: #fff; - font-size: 14px; - line-height: 19px; - font-weight: bold; - padding: 5px 10px; - text-decoration: none; +.tooltip { + position: absolute; + display: none; color: #333; + text-align: left; + font-size: 12px; + max-width: 250px; } -#tabnav a:link.active, #tabnav a:visited.active { - border-bottom: 1px solid #aaa; - background: #9ed485; - color: #000; +.tooltip.in { + opacity: 0.8; + z-index: 1030; + height: auto; + display: block; } -#tabnav a:link:hover, #tabnav a:visited:hover { - text-decoration:underline; +.tooltip.top { + margin-top: -10px; + text-align: center; } -#tabnav a:link.disabled, -#tabnav a:visited.disabled, -#tabnav a:link:hover.disabled, -#tabnav a:visited:hover.disabled { - color: #ccc; - cursor: default; +.tooltip.right { + margin-left: 10px; } -#tabnav a:link.disabled:hover, -#tabnav a:visited.disabled:hover, -#tabnav a:link:hover.disabled:hover, -#tabnav a:visited:hover.disabled:hover { - text-decoration: none; +.tooltip.bottom { + margin-top: 10px; + text-align: center; } -/* Rules for greeting bar in the top right corner */ - -#greeting { - height: 28px; - margin: 0px; - font-size: 13px; - line-height: 28px; +.tooltip.left { + margin-left: -10px; + text-align: right; } -.greeting-bar-unread { - font-weight: bold; +.tooltip-inner { + display: inline-block; + padding: 10px; + font-weight: normal; + background-color: white; } -/* Rules for the message shown in place of the map when javascript is disabled */ - -#noscript { - z-index: 20000000; +.tooltip-arrow { position: absolute; - top: 15px; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; } -/* Rules for OpenLayers maps */ - -#map { - margin: 0px; - padding: 0px; +.tooltip.top .tooltip-arrow { + bottom: -5px; + left: 50%; + margin-left: -5px; + border-top-color: white; + border-width: 5px 5px 0; } -.olControlAttribution { - bottom: 15px !important; - left: 0px !important; - right: 0px !important; - text-align: center; +.tooltip.right .tooltip-arrow { + top: 50%; + left: -5px; + margin-top: -5px; + border-right-color: white; + border-width: 5px 5px 5px 0; } -#permalink { - z-index: 10000; - position: absolute; - bottom: 0px; - right: 0px; - padding: 5px; - background:#fff; - text-align: right; - font-size: 12px; +.tooltip.left .tooltip-arrow { + top: 50%; + right: -5px; + margin-top: -5px; + border-left-color: white; + border-width: 5px 0 5px 5px; } -#permalink a { - padding: 5px; +.tooltip.bottom .tooltip-arrow { + top: -5px; + left: 50%; + margin-left: -5px; + border-bottom-color: white; + border-width: 0 5px 5px; } -/* Rules for edit menu */ +/* Rules for Leaflet maps */ -.menuicon { - padding: 5px; +.leaflet-control .control-button { + display: block; + height: 40px; + width: 40px; + background-color: #333; + background-color: rgba(0,0,0,.6); + border-radius: 4px 0 0 4px; + margin-bottom: 10px; + outline: none; &:hover { - background: #eee; - text-decoration: none !important; + background-color: black; + } + + &.active { + background-color: #9ed485; + } + + &.disabled { + background-color: #333; + background-color: rgba(0,0,0,.5); + cursor: default; + } + + .icon { + margin: 10px; } } -.menu { - display: none; - z-index: 10000; - position: absolute; - background-color: #ffffff; - border: 1px solid #cccccc; - border-top: 0px; +.leaflet-control .zoomin, +.control-layers .control-button { + margin-bottom: 0px; + border-radius: 4px 0 0 0; } -.menu ul { - margin: 0px; - padding: 0px; +.leaflet-control .zoomout, +.control-key .control-button { + margin-bottom: 0; + border-radius: 0; } -.menu li { - padding: 2px 5px; - margin: 0px; - list-style-type: none; - border-top: 1px solid #eee; - white-space: nowrap; +.control-locate .control-button, +.control-share .control-button { + border-radius: 0 0 0 4px; } -/* Rules for attribution text under the main map shown on printouts */ +/* Rules for the sidebar and main map area */ -#attribution { - display: none; -} +.map-layout { + #content { + overflow: hidden; + position: absolute; + top: $headerHeight; + bottom: 0; + width: 100%; + } -.attribution_notice { - text-align: center; -} + #sidebar, #map { + position: relative; + height: 100%; + overflow-x: hidden; + overflow-y: auto; + } -/* Rules for the popout map sidebar */ + #sidebar { + float: left; + width: $sidebarWidth; + background: #fff; + font-size: 12px; -#sidebar { - display: none; - position: absolute; - margin: 0px; - padding: 0px; - width: 30%; - top: 0px; - bottom: 0px; -} + h2 { + padding: $lineheight $lineheight $lineheight/2; + } -#sidebar #sidebar_content { - overflow: auto; - position: absolute; - font-size: 13px; - line-height: 15px; - top: 29px; - bottom: 0px; - left: 0px; - right: 0px; -} + h3, h4 { + margin-top: $lineheight; + margin-bottom: $lineheight/2; + font-size: 13px; + } -#sidebar .sidebar_title { - margin: 0px; - padding: 3px 6px 4px 6px; - height: 29px; - font-size: 14px; - line-height: 15px; - background: #bbb; -} + .icon.close { + float: right; + cursor: pointer; + } + } -/* Rules for the map key which appears in the popout sidebar */ + .welcome { + display: none; + } -#mapkey h3 { - font-size: 110%; - font-weight: normal; - text-align: center; -} + .overlay-sidebar #sidebar { + position: absolute; + z-index: 1000; + height: auto; + border-bottom-right-radius: 5px; + overflow: hidden; + .welcome { + display: block; + } + #sidebar_content { + display: none; + } + } -#mapkey .mapkey-table { - padding-left: 5px; - padding-right: 5px; -} + .welcome { + p { + padding: $lineheight/2 $lineheight $lineheight; + font-size: 110%; + font-weight: 300; + } -#mapkey .mapkey-table-key { -} + .button { + width: 50%; + float: left; + margin: 0; + border-radius: 0; + font-weight: normal; + padding: .6em; -#mapkey .mapkey-table-value { - font-size: 90%; -} + &.learn-more { + border-right: 1px solid #fff; + } + } + } -/* Rules for search results which appear in the popout sidebar */ + #map { + height: 100%; + overflow: hidden; + } -.search_searching { - margin-top: 5px; - margin-bottom: 5px; -} + #map-ui { + display: none; + position: relative; + float: right; + width: 250px; + height: 100%; + background: white; + overflow: auto; + + .section { + border-bottom: 1px solid #DDD; + padding: 10px 20px; + } -.search_results_heading { - margin: 0px; - padding: 2px 5px; - border-bottom: 1px solid #ccc; - font-weight: bold; -} + a.close-button { + float: right; + padding:5px; + font-size:20px; + line-height:10px; + color:#222; + border:1px solid #ddd; + } -.search_results_entry { - margin: 0px; - padding: 2px 5px; + .tooltip { + opacity: 1; + border: 1px solid #ccc; + .tooltip-arrow { + border-top-color: #ccc; + } + } + } } -.search_results_error { - margin: 0px; - padding: 2px 6px 0px; - color: #f00; +.layers-ui, +.share-ui { + li:last-child { + margin-bottom: 0; + } } -/* Rules for data browser information which appears in the popout sidebar */ +.layers-ui { + .base-layers { + .leaflet-container { + width: 100%; + height: 50px; + cursor: pointer; + } -.browse_heading { - margin: 0px; - padding: 3px 6px; - border: 1px solid #ccc; - background: #ddd; -} + li { + overflow: hidden; + border-radius: 3px; + border: 2px solid #fff; + margin-bottom: 8px; + position: relative; + transition: border-color 0.08s ease-in; + + label { + position: absolute; + top: 0; + left: 0; + padding: 2px 6px; + border-bottom-right-radius: 3px; + cursor: pointer; + font-weight: 600; + font-size: 16px; + text-stroke: 2px #fff; + background: rgba(255,255,255,.9); + z-index: 2; // For IE9 + input[type="radio"] { + display: none; + } + } -.browse_details { - margin: 0px; - padding: 0px 6px; + &.active { border-color: darken($green, 10%); } + &:hover { + border-color: $grey; + &.active { border-color: darken($green, 20%); } + } + } + } + + .overlay-layers { + p { + font-size: 13px; + margin-bottom: 8px; + } + li.disabled { color: #999; } + } } -/* Rules for export information which appears in the popout sidebar */ +.share-ui { + .share-tabs { + margin-bottom: 10px; -.export_heading { - margin: 0px; - padding: 2px 5px; - border-bottom: 1px solid #ccc; - font-weight: bold; -} + a { + color: #fff; + text-decoration: none; + background-color: $lightblue; + padding: 5px 10px; + } -.export_bounds { - width: 100%; - text-align: center; -} + a:first-child { + border-right: 1px solid #fff; + border-radius: 4px 0 0 4px; + } + + a:last-child { + border-left: 1px solid #fff; + border-radius: 0 4px 4px 0; + } + + a.active { + background-color: $blue; + } + } + + .share-tab { + display: none; + } + + .share-link { + input[type=text], + textarea { + width: 100%; + font-family: monospace; + font-size: small; + line-height: 1.3; + } + } + + .share-image { + label { + margin-right: 10px; + } + } + + #embed_html { + resize: vertical; + } -.export_bound { - margin: 5px; + #mapnik_scale { + width: 100px; + } } -.export_details { - padding: 2px 6px; +.leaflet-top { + top: $lineheight/2 !important; + .leaflet-control { + margin-right: 0px !important; + margin-top: 0px !important; + } } -#export_osm { - display: none; +.leaflet-popup-scrolled { + padding-right: $lineheight; + border-bottom: 0px !important; + border-top: 0px !important; } -#export_mapnik { - display: none; +.leaflet-popup-content-wrapper { + border-radius: 4px !important; + -webkit-border-radius: 4px !important; } -#export_osmarender { +/* Rules for attribution text under the main map shown on printouts */ + +#attribution { display: none; } -.export_hint { - padding: 0px 12px; - font-style: italic; +.attribution_license, +.attribution_project { + text-align: left; } -.export_buttons { - width: 100%; +.attribution_notice { text-align: center; } -/* Rules for the main content area */ +.donate-attr { color: darken($green, 10%) !important; } -#content { - padding: 10px; - margin: 0px; - position: absolute; - bottom: 0px; -} +/* Rules for the sidebar */ -#content.site_index, -#content.site_edit, -#content.site_export { - border: 0px; - padding: 0px; +.sidebar_heading { + position: relative; + padding: $lineheight/2 $lineheight; + // background: $offwhite; + // border-bottom: 1px solid #ccc; + > .close { + float: right; + margin-top: 2px; + cursor: pointer; + } } -#slim_container { - width: 100%; -} +#browse_status { + p { + padding: $lineheight; + } -#slim_container_content { - max-width: 50em; - background-color: #FFFFFF; - margin: 10px auto; - padding: 3px; - border-radius: 25px; - -moz-border-radius: 25px; - border: 1px solid #e6e6e6; + input { + display: block; + margin-left: auto; + margin-right: auto; + } } -#slim_content { - margin: 10px; - margin-top: 90px; - max-width: 50em; +#sidebar { + #sidebar_loader, + .loader, + .load_more { + text-align: center; + margin: $lineheight auto; + width: 40px; + display: block; + } } -#slim_header { - margin: 10px; - position: absolute; - top: 0px; -} +/* Rules for the search and direction forms */ -#slim_header img { - vertical-align: middle; - margin-bottom: 5px; +header .search_forms, +.directions_form { + display: none; } -/* Rules for the home page */ +.search_form, +.directions_form { + position: relative; + padding: $lineheight/2; + padding-top: 1px; + background-color: $lightgrey; + + .query_wrapper { + position: relative; + overflow: hidden; + border-radius: 2px 0 0 2px; + } + + input[type=text] { + width: 100%; + height: 30px; + border-right: none; -.site_index #map { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; -} + transition: 300ms linear; + -webkit-transition: 300ms linear; + -moz-transition: 300ms linear; + } -.site_export #map { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; -} + input:focus { + outline: none; + box-shadow: 0px 0px 7px #9ED485; + } -/* Rules for the edit page */ + input[type=submit] { + float: right; + width: auto; + min-width: 0; + border-radius: 0 2px 2px 0; + } -.site_edit #map { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; + .query_options { + text-align: right; + font-size: 10px; + color: $blue; + } } -/* Rules for the changeset list shown by the history tab etc */ +/* Rules for the map key which appears in the popout sidebar */ -#changeset_list_container { - position: relative; +#mapkey { + .mapkey-table-key img { + display: block; + margin-left: auto; + margin-right: auto; + } + td { + padding: 0 $lineheight/4 $lineheight/4 $lineheight/4; + } } -#changeset_list { - width: 50%; - font-size: small; - border-collapse: collapse; - border-width: 0px; - margin-top: 1px; - margin-bottom: 1px; -} +/* Rules for search sidebar */ -#changeset_list td { - vertical-align: top; - padding: 3px; -} +.search_results_entry { + ul li { + border-bottom: $keyline; + &:first-child { border-top: $keyline; } + } -#changeset_list .date { - white-space: nowrap; + .search_details { + display: block; + float: right; + text-align: right; + margin-top: 0.2em; + margin-left: 0.5em; + } } -#changeset_list .user { - white-space: nowrap; +.search_results_error { + color: #f00; } -#changeset_list .area { - white-space: nowrap; -} +/* Rules for routing */ -#changeset_list .selected { - background-color: rgb(255, 255, 160); - background-color: rgba(255, 255, 85, 0.5); +#sidebar_content>table { + padding: 5px 20px 10px 15px; + width: 100%; + border-collapse: separate; } -#changeset_list_map { - position: absolute; - top: 0px; - bottom: 0px; - width: 49%; - min-height: 400px; - border: solid 1px black; +td.direction { + background-image: image-url('routing-sprite.png'); + width: 20px; height: 20px; + background-repeat: no-repeat; } - -/* Rules for the data browser */ - -#browse_navigation { - width: 250px; - text-align: center; +@for $i from 1 through 17 { +td.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; } } -table.browse_details th { - white-space: nowrap; +.directions_form input[type="submit"] { + margin-top: 30px !important; } -#browse_map { - width: 250px; +p#routing_summary { + padding: 0 $lineheight $lineheight/4; } -#browse_map #small_map { - width: 250px; - height: 300px; - border: solid 1px black; +td.instruction, td.distance { + padding-top: 0; + border-bottom: 1px solid #DDD; } - -#browse_map .geolink { - display: none; +td.distance { + color: #BBB; + text-align: right; + font-size: x-small; } +tr.turn { + cursor: pointer; +} +tr.turn:hover { + background: lighten($green, 30%); +} +.routing_engines, #route_from, #route_to { margin-left: 25px; } +.routing_marker { width: 15px; position: absolute; } -/* Rules for the trace list shown by the traces tab etc */ +/* Rules for entity history */ -#trace_list { - font-size: small; - border-collapse: collapse; - border-width: 0px; +#sidebar_content { + .browse_details { + position: relative; + border-bottom: $keyline; + } } -#trace_list .trace_summary { - font-size: 12px; - color: gray; +.browse_status { + display: none; } -#trace_list .trace_pending { - color: red; -} +/* Rules for the history sidebar */ -#trace_list .trace_public { - color: green; -} +#sidebar .changesets { + li { + padding: 15px 20px; + border-bottom: 1px solid #ddd; + cursor: pointer; -#trace_list .trace_identifiable { - color: green; -} + &.selected { background: #FFFFE6; } + /* color is derived from changeset bbox fillColor in history.js */ + } -#trace_list .trace_trackable { - color: red; + h4 { + margin: 0; + a { + color: #000; + } + } } -#trace_list .trace_private { - color: red; -} +/* Rules for the browse sidebar */ -/* Rules for the user list */ +#sidebar_content { + .browse-section { + padding: $lineheight/2 $lineheight; + border-bottom: 1px solid #ddd; -#user_list { - width: 100%; - font-size: small; -} + h4:first-child { + margin-top: 0; + word-wrap: break-word; + } + } -#user_list tr { - vertical-align: middle; -} + .browse-section:last-of-type { + border-bottom: none; + } -#user_list p { - margin-top: 0px; - margin-bottom: 0px; -} + .paginate { + float: right; + padding: 1px 6px; + border: 1px solid #eee; + border-radius: 3px; + } -#user_list_actions { - margin-top: 10px; -} + .paginate ul { + padding-left: 20px; + } -/* Rules for the new diary entry page */ + .browse-field { + margin-bottom: 10px; -.diary_entry div#map { - position: relative; - width: 90%; - height: 400px; - border: 1px solid #ccc; - display: none; -} + h4 { + padding: 5px 0 5px 10px; + font-size: 12px; + border: 1px solid #CCC; + border-radius: 4px 4px 0 0; + background-color: #F6F6F6; + } -/* Rules for the login page */ + p { + padding: 7px 10px; + font-size: 12px; + background-color: #FFF; + border: 1px solid #CCC; + border-top: 0; + border-radius: 0 0 4px 4px; + } + } -#login_wrapper div { - margin: 5px; - padding: 15px; - border-radius: 15px; - -moz-border-radius: 15px; -} + .browse-tag-list { + background-color: #F6F6F6; + border: 1px solid #ddd; + border-radius: 3px; + font-size: 12px; + table-layout: fixed; + border-collapse: separate; -#login_login { - background-color: #f5f5ff; - border: 1px solid #f3f3ff; - border-radius: 15px; - -moz-border-radius: 15px; -} + th, td { + border-bottom: 1px solid #ddd; + } -#login_login h1 { - margin-top: 5px; -} + tr:last-child th, tr:last-child td { + border-bottom: 0; + } -table#login_openid_buttons { - padding-bottom: 10px; -} + .browse-tag-k, + .browse-tag-v { + width: 50%; + padding: 6px 10px; + word-wrap: break-word; + } -#login_openid_buttons td { - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 5px; -} + .browse-tag-k { + font-weight: 500; + background-color: #F6F6F6; + } -#login_openid_buttons img { - border: 0; -} + .browse-tag-v { + border-left: 1px solid #ddd; + background-color: #fff; + } + } -#login_signup form.button-to div { - margin: 0px; - padding: 0px; -} + .warning { + margin: $lineheight/2 0; + padding: $lineheight/2; + font-size: 90%; + } -/* Rules for the account confirmation page */ + .note-comments li { + margin: $lineheight/2 0; -div#contributorTerms { - border: 1px solid black; - padding: 4px; - overflow: auto; - width: 95%; - height: 400px; -} + p { + margin-left: 10px; + } + } -div#slim_content div#contributorTerms { - width: auto; + .note-description { + overflow: hidden; + margin: 0 0 10px 10px; + } } -div#contributorTerms p#first { - margin-top: 0px; -} +/* Rules for export sidebar */ -div#contributorTerms p#last { - margin-bottom: 0px; -} +.export_form { + padding: $lineheight; -div#contributorTerms ol { - margin-bottom: 0px; -} + .export_area_inputs, + .export_button { + text-align: center; + } -div#contributorTerms img { - display: block; - margin-left: auto; - margin-right: auto; - margin-top: 10%; -} + .export_area_inputs { + margin-bottom: $lineheight/2; + input[type="text"] { + width: 80px; + text-align: center; + margin-bottom: 5px; + } + } -form#termsForm { - width: 95%; - margin-bottom: 3em; -} + .export_boxy { + background: #eee; + border: 1px solid #ccc; + border-radius: 3px; -div#slim_content form#termsForm { - width: auto; -} + #maxlat { margin-top: -1px; } + #minlon { + float: left; + margin-left: -1px; + } + #maxlon { + float: right; + margin-right: -1px; + } + #minlat { margin-bottom: 0; } + } -p#contributorGuidance { - background-color: #f5f5ff; - border: 1px solid #f3f3ff; - border-radius: 15px; - -moz-border-radius: 15px; - padding: 10px; -} + .export_bound { + margin: $lineheight/4; + } -/* Rules for the account settings page */ + .export_button { + margin-top: $lineheight; + margin-bottom: $lineheight; + } -#accountForm td { - padding-bottom: 10px; + dl { + padding-left: $lineheight/2; + dd { + margin-left: 0; + margin-bottom: 10px; + } + } } +/* Rules for the routing sidebar */ + +#sidebar_content { + #routing_credit { + text-align: center; + padding: 0.5em; + } +} + +/* Rules for edit pages */ + +.site-edit { + #content { + position: absolute; + top: $headerHeight; + bottom: 0; + width: 100%; + } + + #map { + height: 100%; + overflow: hidden; + } +} + +/* Rules for non-map content pages */ + +.content-heading { + background: $lightgrey; + + h1 { font-size: 22px; } +} + +.content-body { + h1, h2, h3, p, ul, ol { + margin-bottom: $lineheight; + } + + h1, h2, h3 { + margin-top: $lineheight/2; + } +} + +.content-inner { + position: relative; + max-width: 900px; + margin: auto; + padding: $lineheight; +} + +/* Overrides for pages that use new layout conventions */ + +.user-new, +.user-create, +.user-terms { + .content-body .content-inner { + padding: 0; + } +} + +.user-new, +.user-create, +.user-terms, +.user-confirm { + .content-heading .content-inner { + height: 200px; + } +} + +.header-illustration { + background-position: 0 0; + background-repeat: no-repeat; + position: absolute; + height: 200px; + width: 100%; + left: 0; + bottom: 0; + + &.new-user-main { + background-image: image-url("sign-up-illustration.png"); + } + + &.confirm-main { + background-image: image-url("confirm-illustration.png"); + } + + &.new-user-terms { + background-image: image-url("terms-illustration.png"); + } + + &.new-user-arm { + height: 110px; + width: 130px; + left: 260px; + top: 160px; + background-image: image-url("sign-up-illustration-arm.png"); + z-index: 100; + } +} + +#content.maximised { + top: 0; + left: 0; + right: 0; + bottom: 0; + border: 0; + z-index: 2000; +} + +/* Rules for small maps in content areas */ + +.content_map { + position: relative; + width: 45%; + height: 400px; + border: 1px solid #ccc; + margin-bottom: $lineheight; + float: right; +} + +/* Rules for the trace list shown by the traces tab etc */ + +#trace_list { + font-size: $lineheight/2; + border-width: 0px; + text-align: right; + + .trace_summary { + font-size: 12px; + color: gray; + } + + .trace_pending { + color: red; + } + + .trace_public { + color: green; + } + + .trace_identifiable { + color: green; + } + + .trace_trackable { + color: red; + } + + .trace_private { + color: red; + } +} + +/* Rules for the user profile page */ + +#userinformation { + + min-height: 100px; + .userinformation-inner { + float: left; + } + h2 { + margin-top: 0; + } + .user-description { + width: 100%; + clear: both; + } + .deemphasize { + margin: 0; + } +} + +.admin-user-info small { + margin-bottom: $lineheight/2; + display: inline; + margin-right: $lineheight; +} + +.activity-block { + clear: left; + border-bottom: 1px solid #ccc; + padding-bottom: $lineheight; + float: left; + h3 { + margin-bottom: $lineheight/2; + } +} + +.contact-activity { + margin-top: $lineheight; + width: 100%; +} + +.activity-details p { + margin-left: 70px; + margin-bottom: 0; +} + +#friends-container .contact-activity ul { + margin-left: 70px; +} + +.user-view { + // Silly exception; remove when user page is redesigned. + .content-inner { + max-width: none; + } + p#no_home_location { + margin: $lineheight; + } + .user_thumbnail { + margin-top: $lineheight/4; + float: left; + } +} + +/* Rules for the user map */ + +.content_map .leaflet-popup-content { + margin: $lineheight/2; + min-height: 50px; +} + +/* Rules for user popups on maps */ + +.user_popup { + min-width: 200px; + p { + padding: 0 0 5px 0; + margin-top: 0 0 0 60px; + font-size: 12px; + } + img.user_thumbnail { + float: left; + margin: 0 $lineheight/2 0 0; + } +} + +/* Rules for the user list */ + +#user_list { + font-size: $lineheight/2; + width: 100%; + + tr { + vertical-align: middle; + } + + p { + margin-top: 0px; + margin-bottom: 0px; + } +} + +#user_list_actions { + float: right; + margin-top: $lineheight/2; +} + +/* Rules for the diary list page */ + +.diary_post { + position: relative; + margin-top: $lineheight/2; + padding-top: $lineheight; + border-top: 1px solid #ccc; + + .post_heading { + margin-bottom: $lineheight; + + h2 { + margin-top: 0; + margin-bottom: $lineheight/2; + font-size: 24px; + } + } + + img.user_thumbnail { + float: left; + } + + small.deemphasize { + float: left; + display: block; + } + + ul.secondary-actions { + display: inline-block; + } +} + +.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div + display: inline; +} + +/* Rules for the diary entry page */ + +.diary_entry { + #map { + position: relative; + width: 90%; + height: 400px; + border: 1px solid #ccc; + display: none; + margin-bottom: $lineheight; + } + #newcomment { + border-top: 1px solid #ccc; + padding-top: $lineheight; + margin-top: $lineheight/2; + } + .comments { + max-width: 740px; + } + .diary-comment { + margin-top: $lineheight/2; + border-top: 1px dashed #ccc; + padding-top: $lineheight/2; + &:first-child { + margin-top: $lineheight; + padding-top: $lineheight; + border-top: 1px solid #ccc; + } + p { + margin-bottom: $lineheight/2; + } + .comment-heading { + margin-bottom: 0; + margin-top: 0; + } + } +} + +.diary_entry-view img.user_thumbnail { + float: left; +} + +/* Rules for the log in page */ + +#login_openid_buttons { + margin-bottom: 0; +} + +#login_openid_buttons li { + float: left; + padding: $lineheight/4 $lineheight/2; +} + +/* Rules for the account confirmation page */ + +.user-terms { + .legale { + border: 1px solid #ccc; + padding: $lineheight; + margin-bottom: $lineheight; + overflow: auto; + height: 20em; + } + + #decline { + background: $lightblue; + &:hover { + background: darken($lightblue, $hovercolor); + } + } +} + +/* Rules for the account settings page */ + #accountForm .user_map { position: relative; width: 500px; - height: 400px; + height: 400px; border: 1px solid #ccc; } -#accountImage td { - padding-bottom: 0px; +#accountForm .user_image { + margin-bottom: 0; +} + +#accountForm #user_image { + margin-left: 20px; +} + +#accountForm ul.accountImage-options { + margin-left: 120px; } .nohome .location { @@ -870,141 +1620,226 @@ p#contributorGuidance { display: inline !important; } -#accountForm input[type=submit] { - margin-top: 15px; +.content_map.settings_map { + width: 50%; + float: none; } -/* Rules for the user view */ +/* Rules for the oauth settings page */ -.user_view .user_map { - position: relative; - width: 400px; - height: 400px; - border: 1px solid #ccc; +.oauth_clients .buttons .oauth-edit { + border-radius: 2px 0 0 2px; } -.user_view .user_map p#no_home_location { - position: absolute; - top: 0px; - bottom: 0px; - width: 90%; - height: 30%; - margin: auto 5% +.oauth_clients .buttons .oauth-delete { + border-radius: 0 2px 2px 0; } -/* Rules for the user map */ +/* Rules for messages pages */ + +.messages { + width: 100%; + border: 1px solid #ddd; + + input[type="submit"] { + margin: auto; + } + tbody tr { + border-top: 1px solid #ccc; + } + + .inbox-row { + background: #f8f8ff; + } + + .inbox-row-unread { + background:#CBEEA7; + } + + .right { + float: right; + } + + tr td, + tr th { + padding: $lineheight/4; + } + p:last-child, + h2:last-child, + h3:last-child, + ol:last-child, + ul:last-child { + margin-bottom:0; + } + tr td { + height: 30px; + border-right: 1px solid $lightgrey; + } +} -.user_map .olControlPanZoomBar { +.inbox-row .inbox-mark-read { display: none; } -.user_map .olControlZoom { - display: block; +.info-line { + margin-bottom: $lineheight; + padding: $lineheight/4 0px 4px 0px; + border-bottom: 1px solid #ccc; + + form, form div { + display: inline; + } } -/* Rules for user popups on maps */ +.info-line .user_thumbnail_tiny { + vertical-align: middle; +} -.user_popup p { - padding-top: 3px; - padding-bottom: 3px; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 55px; - margin-right: 2px; +.inbox-sent { + white-space: nowrap; } -.user_popup img.user_thumbnail { - float: left; +.inbox-mark-unread, +.inbox-mark-read, +.inbox-delete { + width: 1%; } -/* Rules for message in/out box page */ +.inbox-row-unread .inbox-mark-unread { + display: none; +} -#messages { - border: 1px solid #ccc; +.message-read .message-buttons { + margin-top: $lineheight; + margin-bottom: $lineheight * 1.5; + padding-top: $lineheight; + border-top: 1px solid $lightgrey; } -.inbox-row-unread .inbox-subject { - font-weight: bold; +.message-read .buttons .mark-unread-button { + border-radius: 0; } /* Rules for "flash" notice boxes shown at the top of the content area */ -#error { - border: 1px solid red; - padding: 7px; - background-color: #fff0f0; - margin-bottom: 20px; - border-radius: 5px; - -moz-border-radius: 5px; +.error { + padding: $lineheight; + background-color: #ff7070; } -#warning { - border: 1px solid orange; - padding: 7px; - background-color: #fff6f0; - margin-bottom: 20px; - border-radius: 5px; - -moz-border-radius: 5px; +.warning { + padding: $lineheight; + background-color: #ffe0cc; } -#notice { - border: 1px solid green; - padding: 7px; - background-color: #f0fff0; - margin-bottom: 20px; - border-radius: 5px; - -moz-border-radius: 5px; +.notice { + padding: $lineheight; + background-color: #CBEEA7; } /* Rules for highlighting fields with rails validation errors */ -.field_with_errors { - padding: 2px; - background-color: red; - display: table; +.formError { + display: inline-block; + padding: 5px 10px; + margin-top: 5px; + border-radius: 4px; + font-size: 12px; + color: #fff; + background-color: #ff7070; } /* Rules for rails validation error boxes */ #errorExplanation { width: 400px; - border: 2px solid red; - padding: 7px; - padding-bottom: 12px; - margin-bottom: 20px; + border: 2px solid #ff7070; + padding: 0 $lineheight/2; + margin-bottom: $lineheight; background-color: #f0f0f0; -} -#errorExplanation h2 { - font-weight: bold; - font-size: 12px; - margin: -7px; - background-color: #c00; - color: #fff; -} + h2 { + margin: 0 -10px 10px -10px; + padding: $lineheight/4 $lineheight/4 $lineheight/4 15px; + font-weight: bold; + font-size: 12px; + background-color: #c00; + color: #fff; + text-align: left; + } -#errorExplanation p { - color: #333; - margin-bottom: 0px; - padding: 5px; -} + p { + color: #333; + margin-bottom: 0px; + padding: $lineheight/4; + } -#errorExplanation ul li { - font-size: 12px; - list-style: square; + ul { + padding-left: $lineheight; + + li { + font-size: 12px; + list-style: disc; + } + } } /* Rules for forms */ -.fieldName { - vertical-align: top; - font-weight: bold; - font-size: 12px; - line-height: 20px; +.standard-form { + fieldset { + margin-bottom: $lineheight; + } + label.standard-label { + display: block; + margin-bottom: $lineheight/4; + font-size: $typeheight; + font-weight: bold; + line-height: 1.5; + } + label.standard-label.secondary { + display: inline-block; + font-weight: normal; + } + .form-help { + font-weight: normal; + } + .form-column { + float: left; + margin-right: 20px; + } + .form-divider { + margin-top: $lineheight; + padding-top: $lineheight; + border-top: 1px solid $lightgrey; + } + .horizontal-list .form-row { + float: left; + padding-right: 10px; + } + .form-row { + margin-bottom: $lineheight/2; + } + .form-list { + margin-bottom: 0; + } + .form-list li { + margin-bottom: 5px; + } + input[type="checkbox"], + input[type="radio"] { + float: left; + margin-top: 5px; + } } -.minorNote { - font-size: 0.8em; +#remember_me_openid { + display: block; +} + +input[type="checkbox"], +input[type="radio"] { + margin-right: 5px; } input[type="text"], @@ -1012,7 +1847,19 @@ input[type="email"], input[type="url"], input[type="password"], textarea { - border: 1px solid #888; + border: 1px solid #ccc; + padding: 2px 5px; + margin: 0; + width: 200px; + + &.field_with_errors { + border: 2px solid #ff7070; + } +} + +textarea { + padding: 5px; + width: 100%; } /* Rules for user images */ @@ -1020,19 +1867,25 @@ textarea { img.user_image { max-width: 100px; max-height: 100px; - border: 1px solid black; + border: 1px solid #ccc; + margin-bottom: $lineheight; + float: left; + margin-right: $lineheight; } img.user_thumbnail { max-width: 50px; - max-height: 100px; - border: 1px solid black; + max-height: 50px; + border: 1px solid #ccc; + margin-right: $lineheight; } -/* Rule for "nowrap" class that can be applied to anything to stop wrapping */ - -.nowrap { - white-space: nowrap; +img.user_thumbnail_tiny { + width: auto; + height: auto; + max-width: 25px; + max-height: 25px; + border: 1px solid #ccc; } /* Rules for geo microformats */ @@ -1045,16 +1898,149 @@ abbr.geo { .rsssmall { position: relative; - top: 4px; + top: 3px; +} + +/* General styles for action lists / subnavs / pager navs */ + +ul.secondary-actions { + font-style: normal; + margin-bottom: 0; + margin-left: 0; + &.pager { + display: inline-block; + margin-right: 60px; + } + > li { + display: block; + float: left; + list-style: none; + border-left: 1px solid #ccc; + padding-left: $lineheight/2; + margin-right: $lineheight/2; + &:first-child { + border-left: 0; + padding-left: 0; + } + &:last-child { + margin-right: 0px; + } + } +} + +div.secondary-actions { + padding: 10px; + text-align: center; +} + +/* Utility for managing inner content areas */ + +.inner22 { padding: $lineheight;} + +.inner12 { padding: $lineheight/2 $lineheight;} + +.inner11 { padding: $lineheight/2;} + +.inner20 { padding: $lineheight 0;} + +.inner02 { padding: 0 $lineheight;} + +/* Utility for general button styles */ + +input[type="button"], +input[type="submit"], +input[type="reset"], +a.button { + cursor: pointer; + border: 0; + display: inline-block; + line-height: 20px; + padding: $lineheight/4 $lineheight/2; + min-height: 20px + $lineheight/2; + min-width: 120px; + margin: 0 0 $lineheight/2 0; + color: white; + background: $blue; + text-align: center; + border-radius: 2px; + -moz-border-radius: 2px; + &:hover { + background: darken($blue, $hovercolor); + text-decoration: none; + } + &.deemphasize { + background: $lightblue; + &:hover { + background: darken($lightblue, $hovercolor); + } + } + &:disabled { + background: $lightgrey; + &:hover { + background: $lightgrey; + } + } + &:last-child { + margin-bottom: 0; + } +} + +.buttons { + min-width: 200px; + input[type="submit"], + input[type="button"], + input[type="reset"], + .button { + box-sizing: border-box; + float: left; + border-radius: 0; + margin:0; + min-width: 75px; + max-width: 180px; + border-right:1px solid white; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + input:first-child, + .button:first-child { + border-radius:2px 0 0 2px; + } + input:last-child, + .button:last-child { + border-radius:0 2px 2px 0; + border-right-width: 0; + } + input:only-child, + .button:only-child, + *[value="Hide"] + input:last-child, + *[value="Hide"] + .button:last-child { + border-radius:2px; + border-right-width: 0; + } + /* if a 3-button set has a hidden middle button */ + *[value="Hide"] + input:nth-child(3), + *[value="Hide"] + .button:nth-child(3) { + border-radius:0 2px 2px 0; + border-right-width: 0; + } + /* if a 3-button set starts with a hidden button */ + *[value="Hide"] + input:nth-child(2):not(:last-child), + *[value="Hide"] + .button:nth-child(2):not(:last-child) { + border-radius:2px 0 0 2px; + border-right-width: 1px; + } } /* Rules for doing distinct colour of alternate table rows */ -.table0 { - background: #f6f6f6; +.table0, +.item0 { + background: $offwhite; } -.table1 { +.table1, +.item1 { background: #fff; } @@ -1065,22 +2051,116 @@ abbr.geo { border: 0; } +/* Rules for rich text */ + +.richtext, +.prose { + h1, h2 { + padding-bottom: $lineheight/2; + border-bottom: 1px dashed #cccccc; + margin-bottom: $lineheight/2; + } + + h1 { + font-size: 24px; + } + + h2 { + font-size: 18px; + } + + h3 { + font-size: $typeheight; + } + + code { + font-size: 13px; + background: #e8e8e8; + padding: 2px 3px; + } + + pre { + font-size: 13px; + background: #e8e8e8; + padding: 2px 3px; + + code { + padding: 0; + } + } + + img { + padding: $lineheight; + background-color: $offwhite; + display: block; + max-width: 100%; + margin: auto; + } + + blockquote { + border-left: $lineheight solid $offwhite; + padding-left: $lineheight; + margin: 0; + color: #7E7E7E; + } + + ul, ol { + padding-left: $lineheight; + margin-bottom: $lineheight; + margin-left: $lineheight; + } + + ul li { + list-style: disc; + } + + ol li { + list-style: decimal; + } +} + +.diary_post .richtext { + margin-top: $lineheight; + } + +.comments .richtext { + margin-left: 70px; + margin-top: 0; +} + /* Rules for rich text editors */ +input.richtext_title[type="text"] { + width: 50%; + width: -moz-calc(100% - 235px); + width: -webkit-calc(100% - 235px); + width: calc(100% - 235px); + + @media only screen and (max-width:768px) { + width: 100%; + } +} + .richtext_container { - white-space: nowrap; + margin-bottom: $lineheight; .richtext_content { + width: 50%; + width: -moz-calc(100% - 235px); + width: -webkit-calc(100% - 235px); + width: calc(100% - 235px); display: inline-block; vertical-align: top; + @media only screen and (max-width:768px) { + width: 100%; + } + .richtext_preview { display: inline-block; - margin-top: 1px; - margin-bottom: 1px; - border: 4px solid #eee; - background-color: #eee; - white-space: normal; + padding: $lineheight; + background-color: $offwhite; + overflow-x: auto; &.loading { background-image: image-url("loading.gif"); @@ -1097,30 +2177,418 @@ abbr.geo { .richtext_help { display: inline-block; vertical-align: top; - background-color: #ddd; - padding: 5px 10px 10px 10px; - font-size: 12px; + margin-left: 15px; + background-color: #f8f8ff; + padding: $lineheight/2; + width: 220px; - p { - margin: 0px; + ul { + margin-bottom: 0; } - th { + h4.heading, li { + border-bottom: 1px solid #ccc; + 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; + } + } +} + +/* Rules for the user notes list */ + +.note_list { + tr.creator { + background-color: #eeeeee; + } + + td { + padding: 3px; + } + + p { + margin-bottom: 0px; + } +} + +/* Rules for the iD editor */ + +.id-embed { + width: 100%; + height: 100%; +} + +/* Rules for dropdown menus */ + +.dropdown { + position: relative; +} + +.dropdown-toggle { + *margin-bottom: -3px; +} + +.dropdown-toggle:active, +.open .dropdown-toggle { + outline: 0; +} + +.caret { + display: inline-block; + width: 0; + height: 0; + vertical-align: top; + border-top: 4px solid #000000; + border-right: 4px solid transparent; + border-left: 4px solid transparent; + content: ""; +} + +.dropdown .caret { + margin-top: 8px; + margin-left: 2px; +} + +.dropdown-menu { + position: absolute; + top: 100%; + left: -1px; + z-index: 1000; + display: none; + float: left; + min-width: 160px; + padding: 5px 0; + margin: 0; + list-style: none; + background-color: #ffffff; + border: 1px solid #ccc; + border-radius: 0 3px 3px; + *border-right-width: 2px; + *border-bottom-width: 2px; + -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; +} + +.dropdown-menu.pull-right { + right: 0; + left: auto; +} + +.dropdown-menu .divider { + *width: 100%; + height: 1px; + margin: 9px 1px; + *margin: -5px 0 5px; + overflow: hidden; + background-color: #e5e5e5; + border-bottom: 1px solid #ffffff; +} + +.dropdown-menu > li > a { + display: block; + padding: 3px 10px; + clear: both; + font-weight: normal; + line-height: 20px; + color: #333333; + white-space: nowrap; +} + +.dropdown-menu > li > a:hover, +.dropdown-menu > li > a:focus, +.dropdown-submenu:hover > a, +.dropdown-submenu:focus > a { + color: #ffffff; + text-decoration: none; + background-color: $green; +} + +.dropdown-menu > .active > a, +.dropdown-menu > .active > a:hover, +.dropdown-menu > .active > a:focus { + color: #ffffff; + text-decoration: none; + background-color: $green; + outline: 0; +} + +.dropdown-menu > .disabled > a, +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + color: #999999; +} + +.dropdown-menu > .disabled > a:hover, +.dropdown-menu > .disabled > a:focus { + text-decoration: none; + cursor: default; + background-color: transparent; + background-image: none; +} + +.open { + *z-index: 1000; +} + +.open > .dropdown-menu { + display: block; +} + +.dropdown-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 990; +} + +/* Rules for the "Welcome" page */ +.site-welcome, .site-fixthemap { + .center { + text-align: center; + .sprite { + float: none; + margin: auto; + } + } + + .sprite { + background-image: image-url("welcome-sprite.png"); + background-size: 500px 250px; + display: block; + float: left; + } + + .icon-list { + padding-bottom: 20px; + div { + margin-bottom: 10px; + p { + padding-top: 10px; + } + } + } + .sprite.small { + width: 50px; + height: 50px; + } + + .sprite.x { + background-position: -50px 0; + } + + .sprite.term { + margin-right: 10px; + vertical-align: middle; + } + + .sprite.node { + background-position: -100px 0; + } + + .sprite.way { + background-position: -150px 0; + } + + .sprite.tag { + background-position: -200px 0; + } + + .sprite.editor { + background-position: -250px 0; + } + + .sprite.question { + background-position: -300px 0; + } + + .start-mapping { + margin: auto; + cursor: pointer; + border: none; + padding: 20px 40px; + font-size: 30px; + text-decoration: none; + } + + .note-box { + margin-top: 20px; + background-color: $offwhite; + } + + .icon.note { + background-color: #333; + border-radius: 4px; + } +} + +.site-about #content { + //background-color: #000; + background-color: #eee; + background-position: 50% 50%; + background-repeat: no-repeat; + background-size: cover; + background-attachment: fixed; + + &.photo-0 { background-image: image-url('about/0.jpg'); .photo-0 { display: block; } } + &.photo-1 { background-image: image-url('about/1.jpg'); .photo-1 { display: block; } } + &.photo-2 { background-image: image-url('about/2.jpg'); .photo-2 { display: block; } } + &.photo-3 { background-image: image-url('about/4.jpg'); .photo-3 { display: block; } } + &.photo-4 { background-image: image-url('about/4.jpg'); .photo-4 { display: block; } } + &.photo-5 { background-image: image-url('about/5.jpg'); .photo-5 { display: block; } } + + .caption { + max-width: 200px; + font: 13px/20px Helvetica, Arial, sans-serif; + position: fixed; + text-align: right; + right: 20px; + bottom: 60px; + text-shadow: #000 0px 1px 5px; + color: #eee; + opacity: 0.8; + display: none; + } + + .caption a { + color: white; + white-space: nowrap; + text-decoration: none; + } + + a.next { + display: block; + position: fixed; + right: 10px; + bottom: 10px; + width: 40px; + height: 40px; + border-radius: 5px; + text-indent: -9999px; + overflow: hidden; + background: image-url('about/sprite.png') -120px 0px no-repeat; + background-color: #000; + background-color: rgba(0, 0, 0, 0.5); + } + + .content-inner { + position: relative; + color: #333; + min-width: 320px; + max-width: 640px; + + .section { + margin-bottom: 30px; + } + + .section:last-child { + margin-bottom: 0; + } + } + + .text { + background: white; + padding: 40px; + } + + .attr { + position: relative; + padding: 170px 40px 20px; + background: #333; + background: rgba(0, 0, 0, .8); + margin-bottom: 0; + margin-top: -20px; + + h1 { + display: block; + color: white; + font-weight: 300; + font-size: 34px; + span { + color: #76c551; + } } - td { - font-family: fixed; - line-height: 16px; - padding: 0px !important; + .user-image { + position: absolute; + top: 0px; + right: 240px; + left: 0px; + height: 150px; + background-position: 0 50%; + background-repeat: no-repeat; + background-image: image-url('about/osm.png'); + background-size: cover; + background-color: #76c551; } - input.richtext_doedit { - margin-top: 5px !important; + .byosm { + position: absolute; + top: 0px; + right: 0px; + z-index: 1; + width: 240px; + height: 150px; + padding: 20px 20px 20px 40px; + font: 500 20px/24px Helvetica, Arial, sans-serif; + white-space: nowrap; + color: #fff; + background: #76c551; } - input.richtext_dopreview { - margin-top: 5px !important; + .byosm span { + display: inline-block; + width: 20px; + margin-left: -20px; } } + + h2 { + margin-bottom: 10px; + } + + .icon { + width: 30px; + height: 30px; + margin-right: 10px; + vertical-align: middle; + background: 40px 40px image-url('about/sprite.png') no-repeat; + + &.local { background-position: 0px 0px; } + &.community { background-position: 0px -40px; } + &.open { background-position: 0px -80px; } + &.partners { background-position: 0px -120px; } + &.infringement { background-position: 0px -160px; } + } } + +@import 'browse'; + +@media only screen and (max-width:960px) { + .header-illustration.new-user-arm { + display: none; + } +} + diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss new file mode 100644 index 00000000000..6ad3ff38a41 --- /dev/null +++ b/app/assets/stylesheets/embed.css.scss @@ -0,0 +1,19 @@ +/* + *= require leaflet + */ + +html { + width: 100%; + height: 100%; +} + +body { + width: 100%; + height: 100%; + margin: 0px; +} + +#map { + width: 100%; + height: 100%; +} diff --git a/app/assets/stylesheets/large-ltr.css b/app/assets/stylesheets/large-ltr.css index 00ce0910b6e..20cacea0213 100644 --- a/app/assets/stylesheets/large-ltr.css +++ b/app/assets/stylesheets/large-ltr.css @@ -1,5 +1,4 @@ /* - *= require common - *= require ltr + *= require ltr/common *= require large */ diff --git a/app/assets/stylesheets/large-rtl.css b/app/assets/stylesheets/large-rtl.css index 5919290ed44..7f0edf07220 100644 --- a/app/assets/stylesheets/large-rtl.css +++ b/app/assets/stylesheets/large-rtl.css @@ -1,5 +1,4 @@ /* - *= require common - *= require rtl + *= require rtl/common *= require large */ diff --git a/app/assets/stylesheets/large.css b/app/assets/stylesheets/large.css index 05da4445f8c..050272b7737 100644 --- a/app/assets/stylesheets/large.css +++ b/app/assets/stylesheets/large.css @@ -1,19 +1 @@ /* Styles specific to large screens */ - -/* Rules for greeting bar in the top right corner */ - -#small-greeting { - display: none; -} - -/* Rules for the main content area */ - -#content { - top: 30px; -} - -/* Rules for OpenLayers maps */ - -.olControlZoom { - display: none; -} diff --git a/app/assets/stylesheets/leaflet-all.css.scss b/app/assets/stylesheets/leaflet-all.css.scss new file mode 100644 index 00000000000..10ad2607a5a --- /dev/null +++ b/app/assets/stylesheets/leaflet-all.css.scss @@ -0,0 +1,27 @@ +/* + *= require leaflet + *= require leaflet.locationfilter + */ + +/* Override to serve images through the asset pipeline. */ +div.leaflet-marker-icon.location-filter.resize-marker { + background-image: image-url("img/resize-handle.png"); +} + +div.leaflet-marker-icon.location-filter.move-marker { + background-image: image-url("img/move-handle.png"); +} + +/* Override some conflicting styles. + https://github.com/openstreetmap/openstreetmap-website/pull/121#issuecomment-10206946 */ +.leaflet-popup-content img.user_thumbnail { + max-width: 50px !important; +} + +.user_popup p { + margin: 0 !important; +} + +.site .leaflet-popup p { + margin: 0 0 20px 0; +} diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss deleted file mode 100644 index bbfebdbc1fc..00000000000 --- a/app/assets/stylesheets/ltr.css.scss +++ /dev/null @@ -1,242 +0,0 @@ -/* Styles for LTR languages */ - -/* Default rules for the body of every page */ - -html body { - text-align: left; -} - -/* Rules for the menu displayed in the left sidebar */ - -.left_menu { - left: 0px; -} - -.left_menu td { - padding-right: 4px; -} - -.left_menu h1 { - text-align: left; - padding: 0em 0em 0em 1em; -} - -.left_menu ul { - padding-left: 0px; -} - -.left_menu img { - margin: 2px 8px 0px 0px; -} - -/* - * Rules for "optional boxes" which appear in the left sidebar on - * certain pages. Current users are the seach box on the main page - * and the tag cloud on the traces pages. - */ - -.optionalbox { - left: 0px; - text-align: left; -} - -/* Rules for the search box */ - -.whereami { - float: right; -} - -/* Rules for tabbed navigation bar */ - -#top-bar { - margin-left: 185px; -} - -#tabnav a, -#tabnav a:link, -#tabnav a:visited { - float: left; - margin-right: 1px; -} - -/* Rules for greeting bar in the top right corner */ - -#greeting { - float: right; - padding-right: 10px; -} - -/* Rules for the message shown in place of the map when javascript is disabled */ - -#noscript { - left: 15px -} - -/* Rules for OpenLayers maps */ - -#map { - border-left: 1px solid #ccc; -} - -/* Rules for attribution text under the main map shown on printouts */ - -.attribution_license { - text-align: left; -} - -.attribution_project { - text-align: right; -} - -/* Rules for the popout map sidebar */ - -#sidebar { - left: 0px; - border-left: 1px solid #ccc; -} - -#sidebar #sidebar_title { - text-align: left; -} - -#sidebar #sidebar_close { - text-align: right; -} - -/* Rules for the main content area */ - -#content { - border-left: 1px solid #ccc; - left: 185px; - right: 0px; - text-align: left; -} - -#slim_header img { - margin-right: 5px; -} - -/* Rules for the copyright page */ - -#cc_logo { - float: right; -} - -/* Rules for the changeset list shown by the history tab etc */ - -#changeset_list { - text-align: left; -} - -#changeset_list_map { - float: right; - right: 0px; -} - -/* Rules for the data browser */ - -#browse_navigation { - float: right; - margin-left: 10px; -} - -#browse_map { - float: right; - text-align: right; - margin-left: 10px; -} - -/* Rules for the trace list shown by the traces tab etc */ - -#trace_list { - text-align: right; -} - -/* Rules for the diary list */ - -.diary_entry_list img.user_thumbnail { - float: right; -} - -/* Rules for the diary entry view */ - -.diary_entry_view img.user_image { - float: right; -} - -.diary_entry_view img.user_thumbnail { - float: right; -} - -/* Rules for the user list */ - -#user_list_actions { - float: right; -} - -/* Rules for the account confirmation page */ - -form#termsForm div#buttons { - float: right; -} - -form#termsForm input#agree { - margin-left: 50px; -} - -/* Rules for the user view */ - -.user_view img.user_image { - float: right; -} - -.user_view .user_map { - float: right; -} - -/* Rules for rails validation error boxes */ - -#errorExplanation h2 { - text-align: left; - padding: 5px 5px 5px 15px; -} - -/* Rules for forms */ - -.fieldName { - text-align: right; -} - -.submitButton { - text-align: right; -} - -input.openid_url { - background: image-url('openid_input.png') repeat-y left white; - padding-left: 16px; -} - -/* Rules for rich text editors */ - -.richtext_container { - .richtext_help { - margin-left: 15px; - - th { - text-align: left; - padding: 0px 15px 0px 0px !important; - } - - td { - text-align: left; - } - - input.richtext_doedit { - margin-right: 10px !important; - } - - input.richtext_dopreview { - margin-left: 10px !important; - } - } -} diff --git a/app/assets/stylesheets/ltr/common.css.scss b/app/assets/stylesheets/ltr/common.css.scss new file mode 120000 index 00000000000..b8c32829631 --- /dev/null +++ b/app/assets/stylesheets/ltr/common.css.scss @@ -0,0 +1 @@ +../common.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/ltr/small.css.scss b/app/assets/stylesheets/ltr/small.css.scss new file mode 120000 index 00000000000..f08fdd55f63 --- /dev/null +++ b/app/assets/stylesheets/ltr/small.css.scss @@ -0,0 +1 @@ +../small.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss new file mode 100644 index 00000000000..b26b29105b0 --- /dev/null +++ b/app/assets/stylesheets/parameters.scss @@ -0,0 +1,17 @@ +/* Parameters */ +$lineheight: 20px; +$typeheight: 14px; + +$offwhite: #f4f4ff; +$blue: #7092FF; +$lightblue: #B8C5F0; +$green: #7ebc6f; +$grey: #CCC; +$red: red; +$lightgrey: #EEE; +$darkgrey: #888; +$hovercolor: 20%; +$headerHeight: 55px; +$sidebarWidth: 350px; +$keyline: 1px solid $lightgrey; +$border-radius: 3px; diff --git a/app/assets/stylesheets/print-ltr.css b/app/assets/stylesheets/print-ltr.css index 5f3ae8f7ced..162c6f23cc2 100644 --- a/app/assets/stylesheets/print-ltr.css +++ b/app/assets/stylesheets/print-ltr.css @@ -1,4 +1,3 @@ /* *= require print - *= require ltr */ diff --git a/app/assets/stylesheets/print-rtl.css b/app/assets/stylesheets/print-rtl.css index 5ef84064508..162c6f23cc2 100644 --- a/app/assets/stylesheets/print-rtl.css +++ b/app/assets/stylesheets/print-rtl.css @@ -1,4 +1,3 @@ /* *= require print - *= require rtl */ diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index a7d429c4801..fa04314b1fe 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -1,57 +1,29 @@ -#small-title { +header, +#sidebar, +#permalink, +.leaflet-control { display: none; } -#left { - display: none; -} - -#greeting { - display: none; -} - -#tabnav { - display: none; -} - -#sidebar { - display: none; -} - -#permalink { - display: none; -} - -#editmenu { - display: none; -} - -.olControlZoom { - display: none; -} - -.olControlPanZoomBar { - display: none; -} - -.olControlLayerSwitcher { - display: none; -} - -.olControlScaleLine { - display: none !important; -} - -.olControlAttribution { - display: none !important; +html { + height: 100%; } #map { + position: absolute !important; + top: 0; + bottom: 40px; + left: 0; + right: 0; border: 1px solid black; - margin: auto !important; } #attribution { + position: absolute !important; + bottom: 0; + left: 0; + right: 0; + height: 40px; font-size: 12px; text-align: center; } diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss deleted file mode 100644 index 439877669e5..00000000000 --- a/app/assets/stylesheets/rtl.css.scss +++ /dev/null @@ -1,242 +0,0 @@ -/* Styles for RTL languages */ - -/* Default rules for the body of every page */ - -html body { - text-align: right; -} - -/* Rules for the menu displayed in the left sidebar */ - -.left_menu { - right: 0px; -} - -.left_menu td { - padding-left: 4px; -} - -.left_menu h1 { - text-align: right; - padding: 0em 1em 0em 0em; -} - -.left_menu ul { - padding-right: 0px; -} - -.left_menu img { - margin: 2px 0px 0px 8px; -} - -/* - * Rules for "optional boxes" which appear in the left sidebar on - * certain pages. Current users are the seach box on the main page - * and the tag cloud on the traces pages. - */ - -.optionalbox { - right: 0px; - text-align: right; -} - -/* Rules for the search box */ - -.whereami { - float: left; -} - -/* Rules for tabbed navigation bar */ - -#top-bar { - margin-right: 185px -} - -#tabnav a, -#tabnav a:link, -#tabnav a:visited { - float: right; - margin-left: 1px; -} - -/* Rules for greeting bar in the top right corner */ - -#greeting { - float: left; - padding-left: 10px; -} - -/* Rules for the message shown in place of the map when javascript is disabled */ - -#noscript { - right: 15px -} - -/* Rules for OpenLayers maps */ - -#map { - border-right: 1px solid #ccc; -} - -/* Rules for attribution text under the main map shown on printouts */ - -.attribution_license { - text-align: right; -} - -.attribution_project { - text-align: left; -} - -/* Rules for the popout map sidebar */ - -#sidebar { - right: 0px; - border-right: 1px solid #ccc; -} - -#sidebar #sidebar_title { - text-align: right; -} - -#sidebar #sidebar_close { - text-align: left; -} - -/* Rules for the main content area */ - -#content { - border-right: 1px solid #ccc; - right: 185px; - left: 0px; - text-align: right; -} - -#slim_header img { - margin-left: 5px; -} - -/* Rules for the copyright page */ - -#cc_logo { - float: left; -} - -/* Rules for the changeset list shown by the history tab etc */ - -#changeset_list { - text-align: right; -} - -#changeset_list_map { - float: left; - left: 0px; -} - -/* Rules for the data browser */ - -#browse_navigation { - float: left; - margin-right: 10px; -} - -#browse_map { - float: left; - text-align: left; - margin-right: 10px; -} - -/* Rules for the trace list shown by the traces tab etc */ - -#trace_list { - text-align: right; -} - -/* Rules for the diary list */ - -.diary_entry_list img.user_thumbnail { - float: left; -} - -/* Rules for the diary entry view */ - -.diary_entry_view img.user_image { - float: left; -} - -.diary_entry_view img.user_thumbnail { - float: left; -} - -/* Rules for the user list */ - -#user_list_actions { - float: left; -} - -/* Rules for the account confirmation page */ - -form#termsForm div#buttons { - float: left; -} - -form#termsForm input#agree { - margin-right: 50px; -} - -/* Rules for the user view */ - -.user_view img.user_image { - float: left; -} - -.user_view .user_map { - float: left; -} - -/* Rules for rails validation error boxes */ - -#errorExplanation h2 { - text-align: right; - padding: 5px 15px 5px 5px; -} - -/* Rules for forms */ - -.fieldName { - text-align: left; -} - -.submitButton { - text-align: left; -} - -input.openid_url { - background: image-url('openid_input.png') repeat-y right white; - padding-right: 16px; -} - -/* Rules for rich text editors */ - -.richtext_container { - .richtext_help { - margin-right: 15px; - - th { - text-align: right; - padding: 0px 0px 0px 15px !important; - } - - td { - text-align: right; - } - - input.richtext_doedit { - margin-left: 10px !important; - } - - input.richtext_dopreview { - margin-right: 10px !important; - } - } -} diff --git a/app/assets/stylesheets/rtl/common.css.r2.scss b/app/assets/stylesheets/rtl/common.css.r2.scss new file mode 120000 index 00000000000..b8c32829631 --- /dev/null +++ b/app/assets/stylesheets/rtl/common.css.r2.scss @@ -0,0 +1 @@ +../common.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/rtl/small.css.r2.scss b/app/assets/stylesheets/rtl/small.css.r2.scss new file mode 120000 index 00000000000..f08fdd55f63 --- /dev/null +++ b/app/assets/stylesheets/rtl/small.css.r2.scss @@ -0,0 +1 @@ +../small.css.scss \ No newline at end of file diff --git a/app/assets/stylesheets/small-ltr.css b/app/assets/stylesheets/small-ltr.css index 2526d258517..838c9198f38 100644 --- a/app/assets/stylesheets/small-ltr.css +++ b/app/assets/stylesheets/small-ltr.css @@ -1,5 +1,4 @@ /* - *= require common - *= require ltr - *= require small + *= require ltr/common + *= require ltr/small */ diff --git a/app/assets/stylesheets/small-rtl.css b/app/assets/stylesheets/small-rtl.css index 4d3a5e1fc7e..f4a1a00d462 100644 --- a/app/assets/stylesheets/small-rtl.css +++ b/app/assets/stylesheets/small-rtl.css @@ -1,5 +1,4 @@ /* - *= require common - *= require rtl - *= require small - */ + *= require rtl/common + *= require rtl/small + */ \ No newline at end of file diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index b5adaa79497..950e1214d5f 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -1,160 +1,142 @@ -/* Styles specific to a small screen, such as iPhone, Android, etc... */ - -/* Default rules for the body of every page */ +@import "parameters"; -body { - font-size: 12px; -} - -h1 { - font-size: 14px; -} - -/* Rules for the whole left sidebar, including the logo */ - -#left { - display: none; -} +/* Styles specific to a small screen, such as iPhone, Android, etc... */ -/* Rules for tabbed navigation bar */ -#top-bar { - margin: 0px; - height: 19px; +input[type="submit"], +input[type="text"] { + -webkit-appearance: none; } -#tabnav { - height: 14px; - margin: 0px; - padding-top: 5px; - margin-top: 18px; - font-size: 10px; - line-height: 10px; +.column-1 { + width: 100%; } -#tabnav a, #tabnav a:link, #tabnav a:visited { - font-size: 10px; - line-height: 10px; - padding: 2px 5px; - margin-right: 1px; +#menu-icon { + display: inline-block !important; } -/* Rules for the site name - shown when left sidebar is hidden */ - -#small-title { - font-size: 12px; - line-height: 14px; - height: 16px; +nav.primary, +nav.secondary { + float: none !important; + position: relative; display: block; - position: absolute; - top: 0; - padding: 2px; - width: 110px; /* TODO: find better fix for overlap */ - background-color: #fff; - z-index: 100; + clear: both; } -#small-title img { - position: absolute; -} +header { + height: auto; + min-height: $headerHeight; + background: #fff; -#small-title h1 { - position: absolute; - left: 18px; - font-size: 12px; - margin: 2px; -} + h1 { + padding-bottom: 15px; + } -/* Rules for greeting bar in the top right corner */ + &.closed nav { + display: none; + } -#greeting { - position: absolute; - top: 0px; - right: 0px; - height: 14px; - font-size: 12px; - line-height: 12px; - white-space: nowrap; - background: none; + .search_forms { + display: block; + } } -#full-greeting { +#sidebar .search_forms, +#edit_tab, +#export_tab { display: none; } -#small-greeting { - display: inline; -} - -/* Rules for OpenLayers maps */ - -#map { - border: 0; -} - -.olControlPanZoomBar { +nav.primary { + padding: 0; + + ul, li { + border: none; + border-radius: 0; + width: 100%; + } + + ul { + border-top: 1px solid #eee; + li { + border-bottom: 1px solid #eee; + border-right: none; + > a { + border-radius: 0; + width: 100%; + text-align: center; + font-size: 15px; + } + } + } +} + +nav.secondary { + border-bottom: 1px solid #eee; + + .user-menu { + display: block; + width: 100%; + margin-left: 0; + > li { + width: 49%; + > a { + width: 100%; + text-align: center; + } + } + } +} + +#compact-secondary-nav { display: none; } -/* Rules for the main content area */ - -#content { - left: 0px; - right: 0px; - top: 38px; - margin-left: 0px; - margin-right: 0px; - border-left: 0px; - border-right: 0px; -} - -#content.site_index { - left: 0px; - right: 0px; - top: 38px; - bottom: 0px; - padding-bottom: 0px; -} - -/* Rules for search sidebar when shown */ - -#sidebar { - border: 0px; - border-right: 1px solid #ccccdd; - margin: 0px; -} - -.sidebar_title, #sidebar_content { - font-size: 10px !important; -} - -p.search_results_entry { - padding: 2px 0px; +.compact-hide { + display: inline-block; } -/* Rules for the signup form */ +.map-layout { + #sidebar, #map { + position: relative; + overflow-x: hidden; + width: 100%; + height: 50%; + } -#signupForm input[type="text"], #signupForm input[type="password"] { - width: 100%; -} + .overlay-sidebar { + #sidebar { + width: 300px; + } -#signupForm input#user_email { - max-width: 30em; -} + #map { + height: 100%; + } + } -#signupForm input#user_email_confirmation { - max-width: 30em; + #map-ui { + z-index: 9999; + width: 100%; + overflow-y: scroll; + } } -#signupForm input#user_display_name { - max-width: 20em; +#sidebar .welcome { + display: none !important; } -#signupForm input#user_pass_crypt { - max-width: 20em; +.leaflet-top.leaflet-right { + top: 10px !important; + z-index: 0; } -#signupForm input#user_pass_crypt_confirmation { - max-width: 20em; +.content_map { + width: 100%; + border: none; + float: none; + height: 200px; + max-height: none; + min-height: auto; } /* Rules for the login form */ @@ -175,77 +157,36 @@ p.search_results_entry { } #login_openid_buttons td { - padding-left: 2px; - padding-right: 2px; - padding-top: 2px; - padding-bottom: 2px; + padding: 2px; } -/* Rules for the profile page */ +/* Rules for the user view */ .user_map { width: 100% !important; height: 300px !important; } -/* Rules for the user settings page */ - -#user_new_email { - width: 60% !important; -} - -#user_description, #user_preferred_editor { - width: 90% !important; -} - -.minorNote { - display: block; -} - -/* Rules for the browse pages */ - -#browse_navigation { - width: 100% !important; - margin-top: 0 !important; -} - -#small_map, #browse_map { - width: 100% !important; -} - -#changeset_list tr { - display: block; - clear: left; - width: 100%; -} - -#changeset_list th { - display: none; -} - -#changeset_list td { - display: block; - float: left; - padding-right: 10px; -} - -#changeset_list td.comment, #changeset_list td.area { - width: 96%; - clear: left; +#userinformation .deemphasize { + position: relative; + right: auto; left: auto; + margin-top: 10px; + top: auto; } -/* Rules for the diary entries pages */ +/* Rules for the sign-up page */ -#diary_entry_title, #diary_entry_body, #diary_entry_language_code, #diary_comment_body { - width: 100% !important; -} +.user-new, +.user-create { + .col6 { + width: 100%; + } -#usemap { - display: block; + .aside { + display: none; + } } -/* Rules for the messaging pages */ - -#message_title, #message_body { - width: 100% !important; +.site-about #content .attr h1 { + font-size: 28px; } diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index a24ac52651d..13372273c2e 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -133,7 +133,7 @@ def startchangeset(usertoken, cstags, closeid, closecomment, opennew) amf_handle_error("'startchangeset'",nil,nil) do user = getuser(usertoken) if !user then return -1,"You are not logged in, so Potlatch can't write any changes to the database." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if cstags @@ -185,10 +185,10 @@ def getpresets(usertoken,lang) #:doc: user = getuser(usertoken) if user && !user.languages.empty? - request.user_preferred_languages = user.languages + http_accept_language.user_preferred_languages = user.languages end - lang = request.compatible_language_from(getlocales) + lang = http_accept_language.compatible_language_from(getlocales) (real_lang, localised) = getlocalized(lang) # Tell Potlatch what language it's using @@ -459,7 +459,7 @@ def findgpx(searchterm, usertoken) amf_handle_error_with_timeout("'findgpx'" ,nil,nil) do user = getuser(usertoken) if !user then return -1,"You must be logged in to search for GPX traces." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end query = Trace.visible_to(user) if searchterm.to_i > 0 then @@ -523,7 +523,7 @@ def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, versio amf_handle_error("'putrelation' #{relid}" ,'relation',relid) do user = getuser(usertoken) if !user then return -1,"You are not logged in, so the relation could not be saved." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if !tags_ok(tags) then return -1,"One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end @@ -613,7 +613,7 @@ def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, po user = getuser(usertoken) if !user then return -1,"You are not logged in, so the way could not be saved." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end @@ -722,7 +722,7 @@ def putpoi(usertoken, changeset_id, version, id, lon, lat, tags, visible) #:doc: amf_handle_error("'putpoi' #{id}", 'node',id) do user = getuser(usertoken) if !user then return -1,"You are not logged in, so the point could not be saved." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end if !tags_ok(tags) then return -1,"One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1." end @@ -807,7 +807,7 @@ def deleteway(usertoken, changeset_id, way_id, way_version, deletednodes) #:doc: amf_handle_error("'deleteway' #{way_id}" ,'way', way_id) do user = getuser(usertoken) unless user then return -1,"You are not logged in, so the way could not be deleted." end - unless user.active_blocks.empty? then return -1,t('application.setup_user_auth.blocked') end + if user.blocks.active.exists? then return -1,t('application.setup_user_auth.blocked') end if REQUIRE_TERMS_AGREED and user.terms_agreed.nil? then return -1,"You must accept the contributor terms before you can edit." end way_id = way_id.to_i diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 602b79d69c5..2c442c19058 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -128,9 +128,6 @@ def map end @nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(MAX_NUMBER_OF_NODES+1) - # get all the nodes, by tag not yet working, waiting for change from NickB - # need to be @nodes (instance var) so tests in /spec can be performed - #@nodes = Node.search(bbox, params[:tag]) node_ids = @nodes.collect(&:id) if node_ids.length > MAX_NUMBER_OF_NODES @@ -151,9 +148,9 @@ def map # find which ways are needed ways = Array.new if node_ids.length > 0 - way_nodes = WayNode.find_all_by_node_id(node_ids) + way_nodes = WayNode.where(:node_id => node_ids) way_ids = way_nodes.collect { |way_node| way_node.id[0] } - ways = Way.find(way_ids, :include => [:way_nodes, :way_tags]) + ways = Way.preload(:way_nodes, :way_tags).find(way_ids) list_of_way_nodes = ways.collect { |way| way.way_nodes.collect { |way_node| way_node.node_id } @@ -285,7 +282,12 @@ def capabilities timeout = XML::Node.new 'timeout' timeout['seconds'] = API_TIMEOUT.to_s api << timeout - + status = XML::Node.new 'status' + status['database'] = database_status.to_s + status['api'] = api_status.to_s + status['gpx'] = gpx_status.to_s + api << status + doc.root << api render :text => doc.to_s, :content_type => "text/xml" diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b512a404dc5..3830df88bf4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,20 +3,13 @@ class ApplicationController < ActionController::Base protect_from_forgery - if STATUS == :database_readonly or STATUS == :database_offline - def self.cache_sweeper(*sweepers) - end - end + before_filter :fetch_body def authorize_web if session[:user] @user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first - if @user.display_name != cookies["_osm_username"] - logger.info "Session user '#{@user.display_name}' does not match cookie user '#{cookies['_osm_username']}'" - reset_session - @user = nil - elsif @user.status == "suspended" + if @user.status == "suspended" session.delete(:user) session_expires_automatically @@ -48,11 +41,15 @@ def require_user if request.get? redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end end + def require_oauth + @oauth = @user.access_token(OAUTH_KEY) if @user and defined? OAUTH_KEY + end + ## # requires the user to be logged in by the token or HTTP methods, or have an # OAuth token with the right capability. this method is a bit of a pain to call @@ -110,6 +107,9 @@ def require_allow_read_gpx def require_allow_write_gpx require_capability(:allow_write_gpx) end + def require_allow_write_notes + require_capability(:allow_write_notes) + end ## # require that the user is a moderator, or fill out a helpful error message @@ -120,7 +120,7 @@ def require_moderator flash[:error] = t('application.require_moderator.not_a_moderator') redirect_to :action => 'index' else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end end @@ -146,7 +146,7 @@ def setup_user_auth # have we identified the user? if @user # check if the user has been banned - if not @user.active_blocks.empty? + if @user.blocks.active.exists? # NOTE: need slightly more helpful message than this. report_error t('application.setup_user_auth.blocked'), :forbidden end @@ -204,20 +204,49 @@ def check_database_writable(need_api = false) end def check_api_readable - if STATUS == :database_offline or STATUS == :api_offline + if api_status == :offline report_error "Database offline for maintenance", :service_unavailable return false end end def check_api_writable - if STATUS == :database_offline or STATUS == :database_readonly or - STATUS == :api_offline or STATUS == :api_readonly + unless api_status == :online report_error "Database offline for maintenance", :service_unavailable return false end end + def database_status + if STATUS == :database_offline + :offline + elsif STATUS == :database_readonly + :readonly + else + :online + end + end + + def api_status + status = database_status + if status == :online + if STATUS == :api_offline + status = :offline + elsif STATUS == :api_readonly + status = :readonly + end + end + return status + end + + def gpx_status + status = database_status + if status == :online + status = :offline if STATUS == :gpx_offline + end + return status + end + def require_public_data unless @user.data_public? report_error "You must make your edits public to upload new data", :forbidden @@ -243,51 +272,56 @@ def report_error(message, status = :bad_request) render :text => result.to_s, :content_type => "text/xml" else - render :text => message, :status => status + render :text => message, :status => status, :content_type => "text/plain" end end def set_locale response.header['Vary'] = 'Accept-Language' - if @user - if !@user.languages.empty? - request.user_preferred_languages = @user.languages - response.header['Vary'] = '*' - elsif !request.user_preferred_languages.empty? - @user.languages = request.user_preferred_languages - @user.save - end + if @user && !@user.languages.empty? + http_accept_language.user_preferred_languages = @user.languages + response.header['Vary'] = '*' + end + + I18n.locale = select_locale + + if @user && @user.languages.empty? && !http_accept_language.user_preferred_languages.empty? + @user.languages = http_accept_language.user_preferred_languages + @user.save + end + + response.headers['Content-Language'] = I18n.locale.to_s + end + + def select_locale(locales = I18n.available_locales) + if params[:locale] + http_accept_language.user_preferred_languages = [ params[:locale] ] end - if request.compatible_language_from(I18n.available_locales).nil? - request.user_preferred_languages = request.user_preferred_languages.collect do |pl| + if http_accept_language.compatible_language_from(locales).nil? + http_accept_language.user_preferred_languages = http_accept_language.user_preferred_languages.collect do |pl| pls = [ pl ] while pl.match(/^(.*)-[^-]+$/) - pls.push($1) if I18n.available_locales.include?($1.to_sym) + pls.push($1) if locales.include?($1) or locales.include?($1.to_sym) pl = $1 end pls end.flatten - - if @user and not request.compatible_language_from(I18n.available_locales).nil? - @user.languages = request.user_preferred_languages - @user.save - end end - I18n.locale = request.compatible_language_from(I18n.available_locales) || I18n.default_locale - - response.headers['Content-Language'] = I18n.locale.to_s + http_accept_language.compatible_language_from(locales) || I18n.default_locale end + helper_method :select_locale + def api_call_handle_error begin yield rescue ActiveRecord::RecordNotFound => ex - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found rescue LibXML::XML::Error, ArgumentError => ex report_error ex.message, :bad_request rescue ActiveRecord::RecordInvalid => ex @@ -332,7 +366,7 @@ def web_timeout rescue ActionView::Template::Error => ex ex = ex.original_exception - if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /^Timeout::Error/ + if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /execution expired/ ex = Timeout::Error.new end @@ -345,40 +379,6 @@ def web_timeout render :action => "timeout" end - ## - # extend caches_action to include the parameters, locale and logged in - # status in all cache keys - def self.caches_action(*actions) - options = actions.extract_options! - cache_path = options[:cache_path] || Hash.new - - options[:unless] = case options[:unless] - when NilClass then Array.new - when Array then options[:unless] - else unlessp = [ options[:unless] ] - end - - options[:unless].push(Proc.new do |controller| - controller.params.include?(:page) - end) - - options[:cache_path] = Proc.new do |controller| - cache_path.merge(controller.params).merge(:host => SERVER_URL, :locale => I18n.locale) - end - - actions.push(options) - - super *actions - end - - ## - # extend expire_action to expire all variants - def expire_action(options = {}) - I18n.available_locales.each do |locale| - super options.merge(:host => SERVER_URL, :locale => locale) - end - end - ## # is the requestor logged in? def logged_in? @@ -401,10 +401,45 @@ def render_unknown_user(name) respond_to do |format| format.html { render :template => "user/no_such_user", :status => :not_found } - format.all { render :nothing => true, :status => :not_found } + format.all { render :text => "", :status => :not_found } end end - + + ## + # Unfortunately if a PUT or POST request that has a body fails to + # read it then Apache will sometimes fail to return the response it + # is given to the client properly, instead erroring: + # + # https://issues.apache.org/bugzilla/show_bug.cgi?id=44782 + # + # To work round this we call rewind on the body here, which is added + # as a filter, to force it to be fetched from Apache into a file. + def fetch_body + request.body.rewind + end + + def map_layout + request.xhr? ? 'xhr' : 'map' + end + + def preferred_editor + editor = if params[:editor] + params[:editor] + elsif @user and @user.preferred_editor + @user.preferred_editor + else + DEFAULT_EDITOR + end + + if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ and editor == 'id' + editor = 'potlatch2' + end + + editor + end + + helper_method :preferred_editor + private # extract authorisation credentials from headers, returns user = nil if none diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index f423c638875..e16ec29147b 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -1,87 +1,78 @@ class BrowseController < ApplicationController - layout 'site' + layout :map_layout before_filter :authorize_web before_filter :set_locale before_filter { |c| c.check_database_readable(true) } - around_filter :web_timeout, :except => [:start] + before_filter :require_oauth + around_filter :web_timeout - def start - @max_features = case - when browser.ie? && browser.version.to_i < 8 then 100 - when browser.ie? && browser.version.to_i < 9 then 500 - else 2000 - end - end - def relation @type = "relation" - @relation = Relation.find(params[:id]) - @next = Relation.visible.where("id > ?", @relation.id).order("id ASC").first - @prev = Relation.visible.where("id < ?", @relation.id).order("id DESC").first + @feature = Relation.find(params[:id]) + render 'feature' rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end - + def relation_history @type = "relation" - @relation = Relation.find(params[:id]) + @feature = Relation.find(params[:id]) + render 'history' rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end - + def way @type = "way" - @way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members]) - @next = Way.visible.where("id > ?", @way.id).order("id ASC").first - @prev = Way.visible.where("id < ?", @way.id).order("id DESC").first - - # Used for edit link, takes approx middle node of way - @midnode = @way.nodes[@way.nodes.length/2] + @feature = Way.preload(:way_tags, :containing_relation_members, :changeset => :user, :nodes => [:node_tags, :ways => :way_tags]).find(params[:id]) + render 'feature' rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end - + def way_history @type = "way" - @way = Way.find(params[:id], :include => [:way_tags, {:old_ways => {:changeset => :user}}]) + @feature = Way.preload(:way_tags, :old_ways => { :changeset => :user }).find(params[:id]) + render 'history' rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end def node @type = "node" - @node = Node.find(params[:id]) - @next = Node.visible.where("id > ?", @node.id).order("id ASC").first - @prev = Node.visible.where("id < ?", @node.id).order("id DESC").first + @feature = Node.find(params[:id]) + render 'feature' rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end - + def node_history @type = "node" - @node = Node.find(params[:id]) + @feature = Node.find(params[:id]) + render 'history' rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end - + def changeset @type = "changeset" - @changeset = Changeset.find(params[:id]) @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'node_page') @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page') @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page') - - @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}" - @next = Changeset.where("id > ?", @changeset.id).order("id ASC").first - @prev = Changeset.where("id < ?", @changeset.id).order("id DESC").first - if @changeset.user.data_public? - @next_by_user = Changeset.where("user_id = ? AND id > ?", @changeset.user_id, @changeset.id).order("id ASC").first - @prev_by_user = Changeset.where("user_id = ? AND id < ?", @changeset.user_id, @changeset.id).order("id DESC").first + @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first + @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first end rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end + + def note + @type = "note" + @note = Note.find(params[:id]) + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found + end end diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 947732fb1a1..735fa73a88c 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -33,29 +33,29 @@ def create end ## - # Return XML giving the basic info about the changeset. Does not + # Return XML giving the basic info about the changeset. Does not # return anything about the nodes, ways and relations in the changeset. def read changeset = Changeset.find(params[:id]) render :text => changeset.to_xml.to_s, :content_type => "text/xml" end - + ## # marks a changeset as closed. this may be called multiple times # on the same changeset, so is idempotent. - def close + def close assert_method :put - - changeset = Changeset.find(params[:id]) + + changeset = Changeset.find(params[:id]) check_changeset_consistency(changeset, @user) # to close the changeset, we'll just set its closed_at time to - # now. this might not be enough if there are concurrency issues, + # now. this might not be enough if there are concurrency issues, # but we'll have to wait and see. changeset.set_closed_time_now changeset.save! - render :nothing => true + render :text => "" end ## @@ -70,11 +70,11 @@ def expand_bbox cs = Changeset.find(params[:id]) check_changeset_consistency(cs, @user) - + # keep an array of lons and lats lon = Array.new lat = Array.new - + # the request is in pseudo-osm format... this is kind-of an # abuse, maybe should change to some other format? doc = XML::Parser.string(request.raw_post).parse @@ -82,17 +82,17 @@ def expand_bbox lon << n['lon'].to_f * GeoRecord::SCALE lat << n['lat'].to_f * GeoRecord::SCALE end - + # add the existing bounding box to the lon-lat array lon << cs.min_lon unless cs.min_lon.nil? lat << cs.min_lat unless cs.min_lat.nil? lon << cs.max_lon unless cs.max_lon.nil? lat << cs.max_lat unless cs.max_lat.nil? - + # collapse the arrays to minimum and maximum - cs.min_lon, cs.min_lat, cs.max_lon, cs.max_lat = + cs.min_lon, cs.min_lat, cs.max_lon, cs.max_lat = lon.min, lat.min, lon.max, lat.max - + # save the larger bounding box and return the changeset, which # will include the bigger bounding box. cs.save! @@ -109,7 +109,7 @@ def expand_bbox # Furthermore, each element in the diff can only reference the current # changeset. # - # Returns: a diffResult document, as described in + # Returns: a diffResult document, as described in # http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6 def upload # only allow POST requests, as the upload method is most definitely @@ -120,7 +120,7 @@ def upload changeset = Changeset.find(params[:id]) check_changeset_consistency(changeset, @user) - + diff_reader = DiffReader.new(request.raw_post, changeset) Changeset.transaction do result = diff_reader.commit @@ -132,57 +132,61 @@ def upload # download the changeset as an osmChange document. # # to make it easier to revert diffs it would be better if the osmChange - # format were reversible, i.e: contained both old and new versions of + # format were reversible, i.e: contained both old and new versions of # modified elements. but it doesn't at the moment... # # this method cannot order the database changes fully (i.e: timestamp and # version number may be too coarse) so the resulting diff may not apply - # to a different database. however since changesets are not atomic this + # to a different database. however since changesets are not atomic this # behaviour cannot be guaranteed anyway and is the result of a design # choice. def download changeset = Changeset.find(params[:id]) - + # get all the elements in the changeset which haven't been redacted # and stick them in a big array. - elements = [changeset.old_nodes.unredacted, - changeset.old_ways.unredacted, + elements = [changeset.old_nodes.unredacted, + changeset.old_ways.unredacted, changeset.old_relations.unredacted].flatten - - # sort the elements by timestamp and version number, as this is the - # almost sensible ordering available. this would be much nicer if - # global (SVN-style) versioning were used - then that would be + + # sort the elements by timestamp and version number, as this is the + # almost sensible ordering available. this would be much nicer if + # global (SVN-style) versioning were used - then that would be # unambiguous. - elements.sort! do |a, b| + elements.sort! do |a, b| if (a.timestamp == b.timestamp) a.version <=> b.version else - a.timestamp <=> b.timestamp + a.timestamp <=> b.timestamp end end - + + # create changeset and user caches + changeset_cache = {} + user_display_name_cache = {} + # create an osmChange document for the output result = OSM::API.new.get_xml_doc result.root.name = "osmChange" # generate an output element for each operation. note: we avoid looking - # at the history because it is simpler - but it would be more correct to + # at the history because it is simpler - but it would be more correct to # check these assertions. elements.each do |elt| result.root << - if (elt.version == 1) + if (elt.version == 1) # first version, so it must be newly-created. created = XML::Node.new "create" - created << elt.to_xml_node + created << elt.to_xml_node(changeset_cache, user_display_name_cache) else unless elt.visible # if the element isn't visible then it must have been deleted deleted = XML::Node.new "delete" - deleted << elt.to_xml_node + deleted << elt.to_xml_node(changeset_cache, user_display_name_cache) else # must be a modify modified = XML::Node.new "modify" - modified << elt.to_xml_node + modified << elt.to_xml_node(changeset_cache, user_display_name_cache) end end end @@ -200,12 +204,13 @@ def query # create the conditions that the user asked for. some or all of # these may be nil. - changesets = Changeset.scoped + changesets = Changeset.all changesets = conditions_bbox(changesets, bbox) changesets = conditions_user(changesets, params['user'], params['display_name']) changesets = conditions_time(changesets, params['time']) changesets = conditions_open(changesets, params['open']) changesets = conditions_closed(changesets, params['closed']) + changesets = conditions_ids(changesets, params['changesets']) # create the results document results = OSM::API.new.get_xml_doc @@ -217,7 +222,7 @@ def query render :text => results.to_s, :content_type => "text/xml" end - + ## # updates a changeset's tags. none of the changeset's attributes are # user-modifiable, so they will be ignored. @@ -238,101 +243,59 @@ def update changeset.update_from(new_changeset, @user) render :text => changeset.to_xml, :mime_type => "text/xml" else - - render :nothing => true, :status => :bad_request + + render :text => "", :status => :bad_request end end ## # list edits (open changesets) in reverse chronological order def list - if request.format == :atom and params[:page] - redirect_to params.merge({ :page => nil }), :status => :moved_permanently + if request.format == :atom and params[:max_id] + redirect_to params.merge({ :max_id => nil }), :status => :moved_permanently + return + end + + if params[:display_name] + user = User.find_by_display_name(params[:display_name]) + if !user || !user.active? + render_unknown_user params[:display_name] + return + end + end + + if (params[:friends] || params[:nearby]) && !@user && request.format == :html + require_user + return + end + + if request.format == :html and !params[:list] + require_oauth + render :action => :history, :layout => map_layout else - changesets = conditions_nonempty(Changeset.scoped) + changesets = conditions_nonempty(Changeset.all) if params[:display_name] - user = User.find_by_display_name(params[:display_name]) - - if user and user.active? - if user.data_public? or user == @user - changesets = changesets.where(:user_id => user.id) - else - changesets = changesets.where("false") - end + if user.data_public? or user == @user + changesets = changesets.where(:user_id => user.id) else - render_unknown_user params[:display_name] - return - end - end - - if params[:friends] - if @user - changesets = changesets.where(:user_id => @user.friend_users.public) - elsif request.format == :html - require_user - return - end - end - - if params[:nearby] - if @user - changesets = changesets.where(:user_id => @user.nearby) - elsif request.format == :html - require_user - return + changesets = changesets.where("false") end + elsif params[:bbox] + changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params)) + elsif params[:friends] && @user + changesets = changesets.where(:user_id => @user.friend_users.public) + elsif params[:nearby] && @user + changesets = changesets.where(:user_id => @user.nearby) end - if params[:bbox] - bbox = BoundingBox.from_bbox_params(params) - elsif params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat] - bbox = BoundingBox.from_lon_lat_params(params) - end - - if bbox - changesets = conditions_bbox(changesets, bbox) - bbox_link = render_to_string :partial => "bbox", :object => bbox - end - - if user - user_link = render_to_string :partial => "user", :object => user - end - - if params[:friends] and @user - @title = t 'changeset.list.title_friend' - @heading = t 'changeset.list.heading_friend' - @description = t 'changeset.list.description_friend' - elsif params[:nearby] and @user - @title = t 'changeset.list.title_nearby' - @heading = t 'changeset.list.heading_nearby' - @description = t 'changeset.list.description_nearby' - elsif user and bbox - @title = t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s - @heading = t 'changeset.list.heading_user_bbox', :user => user.display_name, :bbox => bbox.to_s - @description = t 'changeset.list.description_user_bbox', :user => user_link, :bbox => bbox_link - elsif user - @title = t 'changeset.list.title_user', :user => user.display_name - @heading = t 'changeset.list.heading_user', :user => user.display_name - @description = t 'changeset.list.description_user', :user => user_link - elsif bbox - @title = t 'changeset.list.title_bbox', :bbox => bbox.to_s - @heading = t 'changeset.list.heading_bbox', :bbox => bbox.to_s - @description = t 'changeset.list.description_bbox', :bbox => bbox_link - else - @title = t 'changeset.list.title' - @heading = t 'changeset.list.heading' - @description = t 'changeset.list.description' + if params[:max_id] + changesets = changesets.where("changesets.id <= ?", params[:max_id]) end - @page = (params[:page] || 1).to_i - @page_size = 20 + @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags) - @bbox = bbox - - @edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags) - - render :action => :list + render :action => :list, :layout => false end end @@ -345,7 +308,7 @@ def feed private #------------------------------------------------------------ # utility functions below. - #------------------------------------------------------------ + #------------------------------------------------------------ ## # if a bounding box was specified do some sanity checks. @@ -382,13 +345,13 @@ def conditions_user(changesets, user, name) # make sure we found a user raise OSM::APINotFoundError.new if u.nil? - # should be able to get changesets of public users only, or + # should be able to get changesets of public users only, or # our own changesets regardless of public-ness. unless u.data_public? # get optional user auth stuff so that users can see their own # changesets if they're non-public setup_user_auth - + raise OSM::APINotFoundError if @user.nil? or @user.id != u.id end return changesets.where(:user_id => u.id) @@ -399,14 +362,14 @@ def conditions_user(changesets, user, name) ## # restrict changes to those closed during a particular time period - def conditions_time(changesets, time) + def conditions_time(changesets, time) unless time.nil? - # if there is a range, i.e: comma separated, then the first is + # if there is a range, i.e: comma separated, then the first is # low, second is high - same as with bounding boxes. if time.count(',') == 1 # check that we actually have 2 elements in the array times = time.split(/,/) - raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 + raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 from, to = times.collect { |t| DateTime.parse(t) } return changesets.where("closed_at >= ? and created_at <= ?", from, to) @@ -434,11 +397,11 @@ def conditions_open(changesets, open) if open.nil? return changesets else - return changesets.where("closed_at >= ? and num_changes <= ?", + return changesets.where("closed_at >= ? and num_changes <= ?", Time.now.getutc, Changeset::MAX_ELEMENTS) end end - + ## # query changesets which are closed # ('closed at' time has passed or changes limit is hit) @@ -446,16 +409,30 @@ def conditions_closed(changesets, closed) if closed.nil? return changesets else - return changesets.where("closed_at < ? or num_changes > ?", + return changesets.where("closed_at < ? or num_changes > ?", Time.now.getutc, Changeset::MAX_ELEMENTS) end end + ## + # query changesets by a list of ids + # (either specified as array or comma-separated string) + def conditions_ids(changesets, ids) + if ids.nil? + return changesets + elsif ids.empty? + raise OSM::APIBadUserInput.new("No changesets were given to search for") + else + ids = ids.split(',').collect { |n| n.to_i } + return changesets.where(:id => ids) + end + end + ## # eliminate empty changesets (where the bbox has not been set) # this should be applied to all changeset list displays def conditions_nonempty(changesets) return changesets.where("num_changes > 0") end - + end diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 68d3a81ee93..091744e2226 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -9,16 +9,11 @@ class DiaryEntryController < ApplicationController before_filter :check_database_writable, :only => [:new, :edit] before_filter :require_administrator, :only => [:hide, :hidecomment] - caches_action :list, :layout => false, :unless => :user_specific_list? - caches_action :rss, :layout => true - caches_action :view, :layout => false - cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment] - def new @title = t 'diary_entry.new.title' if params[:diary_entry] - @diary_entry = DiaryEntry.new(params[:diary_entry]) + @diary_entry = DiaryEntry.new(entry_params) @diary_entry.user = @user if @diary_entry.save @@ -29,7 +24,7 @@ def new else @user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code) end - redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name + redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name else render :action => 'edit' end @@ -37,6 +32,7 @@ def new default_lang = @user.preferences.where(:k => "diary.default_language").first lang_code = default_lang ? default_lang.v : @user.preferred_language @diary_entry = DiaryEntry.new(:language_code => lang_code) + set_map_location render :action => 'edit' end end @@ -47,18 +43,18 @@ def edit if @user != @diary_entry.user redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] - elsif params[:diary_entry] - if @diary_entry.update_attributes(params[:diary_entry]) - redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] - end + elsif params[:diary_entry] and @diary_entry.update_attributes(entry_params) + redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] end + + set_map_location rescue ActiveRecord::RecordNotFound render :action => "no_such_entry", :status => :not_found end def comment @entry = DiaryEntry.find(params[:id]) - @diary_comment = @entry.comments.build(params[:diary_comment]) + @diary_comment = @entry.comments.build(comment_params) @diary_comment.user = @user if @diary_comment.save if @diary_comment.user != @entry.user @@ -69,6 +65,8 @@ def comment else render :action => 'view' end + rescue ActiveRecord::RecordNotFound + render :action => "no_such_entry", :status => :not_found end def list @@ -77,91 +75,77 @@ def list if @this_user @title = t 'diary_entry.list.user_title', :user => @this_user.display_name - @entry_pages, @entries = paginate(:diary_entries, - :conditions => { - :user_id => @this_user.id, - :visible => true - }, - :order => 'created_at DESC', - :per_page => 20) + @entries = @this_user.diary_entries else render_unknown_user params[:display_name] + return end - elsif params[:language] - @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name - @entry_pages, @entries = paginate(:diary_entries, :include => :user, - :conditions => { - :users => { :status => ["active", "confirmed"] }, - :visible => true, - :language_code => params[:language] - }, - :order => 'created_at DESC', - :per_page => 20) elsif params[:friends] if @user @title = t 'diary_entry.list.title_friends' - @entry_pages, @entries = paginate(:diary_entries, :include => :user, - :conditions => { - :user_id => @user.friend_users, - :visible => true - }, - :order => 'created_at DESC', - :per_page => 20) + @entries = DiaryEntry.where(:user_id => @user.friend_users) else require_user - return + return end elsif params[:nearby] if @user @title = t 'diary_entry.list.title_nearby' - @entry_pages, @entries = paginate(:diary_entries, :include => :user, - :conditions => { - :user_id => @user.nearby, - :visible => true - }, - :order => 'created_at DESC', - :per_page => 20) + @entries = DiaryEntry.where(:user_id => @user.nearby) else require_user - return - end + return + end else - @title = t 'diary_entry.list.title' - @entry_pages, @entries = paginate(:diary_entries, :include => :user, - :conditions => { - :users => { :status => ["active", "confirmed"] }, - :visible => true - }, - :order => 'created_at DESC', - :per_page => 20) + @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] }) + + if params[:language] + @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name + @entries = @entries.where(:language_code => params[:language]) + else + @title = t 'diary_entry.list.title' + end end + + @page = (params[:page] || 1).to_i + @page_size = 20 + + @entries = @entries.visible + @entries = @entries.order("created_at DESC") + @entries = @entries.offset((@page - 1) * @page_size) + @entries = @entries.limit(@page_size) + @entries = @entries.includes(:user, :language) end def rss - @entries = DiaryEntry.includes(:user).order("created_at DESC").limit(20) - if params[:display_name] user = User.active.find_by_display_name(params[:display_name]) if user - @entries = user.diary_entries.visible + @entries = user.diary_entries @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name) @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name) @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary" else - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found + return end - elsif params[:language] - @entries = @entries.visible.where(:language_code => params[:language]).joins(:user).where(:users => { :status => ["active", "confirmed"] }) - @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name) - @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name) - @link = "http://#{SERVER_URL}/diary/#{params[:language]}" else - @entries = @entries.visible.joins(:user).where(:users => { :status => ["active", "confirmed"] }) - @title = I18n.t('diary_entry.feed.all.title') - @description = I18n.t('diary_entry.feed.all.description') - @link = "http://#{SERVER_URL}/diary" + @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] }) + + if params[:language] + @entries = @entries.where(:language_code => params[:language]) + @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name) + @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name) + @link = "http://#{SERVER_URL}/diary/#{params[:language]}" + else + @title = I18n.t('diary_entry.feed.all.title') + @description = I18n.t('diary_entry.feed.all.description') + @link = "http://#{SERVER_URL}/diary" + end end + + @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20) end def view @@ -176,34 +160,46 @@ def view def hide entry = DiaryEntry.find(params[:id]) - entry.update_attributes({:visible => false}, :without_protection => true) + entry.update_attributes(:visible => false) redirect_to :action => "list", :display_name => entry.user.display_name end def hidecomment comment = DiaryComment.find(params[:comment]) - comment.update_attributes({:visible => false}, :without_protection => true) + comment.update_attributes(:visible => false) redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id end def comments @comment_pages, @comments = paginate(:diary_comments, - :conditions => { + :conditions => { :user_id => @this_user, :visible => true }, :order => 'created_at DESC', :per_page => 20) @page = (params[:page] || 1).to_i - end + end private + ## + # return permitted diary entry parameters + def entry_params + params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude) + end + + ## + # return permitted diary comment parameters + def comment_params + params.require(:diary_comment).permit(:body) + end + ## # require that the user is a administrator, or fill out a helpful error message # and return them to the user page. def require_administrator unless @user.administrator? flash[:error] = t('user.filter.not_an_administrator') - redirect_to :controller => 'diary_entry', :action => 'view', :display_name => params[:id] + redirect_to :controller => 'diary_entry', :action => 'view' end end @@ -212,4 +208,22 @@ def require_administrator def user_specific_list? params[:friends] or params[:nearby] end + + ## + # decide on a location for the diary entry map + def set_map_location + if @diary_entry.latitude and @diary_entry.longitude + @lon = @diary_entry.longitude + @lat = @diary_entry.latitude + @zoom = 12 + elsif @user.home_lat.nil? or @user.home_lon.nil? + @lon = params[:lon] || -0.1 + @lat = params[:lat] || 51.5 + @zoom = params[:zoom] || 4 + else + @lon = @user.home_lon + @lat = @user.home_lat + @zoom = 12 + end + end end diff --git a/app/controllers/directions_controller.rb b/app/controllers/directions_controller.rb new file mode 100644 index 00000000000..d153f03205b --- /dev/null +++ b/app/controllers/directions_controller.rb @@ -0,0 +1,9 @@ +class DirectionsController < ApplicationController + before_filter :authorize_web + before_filter :set_locale + before_filter :require_oauth, :only => [:search] + + def search + render :layout => map_layout + end +end diff --git a/app/controllers/export_controller.rb b/app/controllers/export_controller.rb index 2102a5704f4..00eba741f57 100644 --- a/app/controllers/export_controller.rb +++ b/app/controllers/export_controller.rb @@ -3,8 +3,7 @@ class ExportController < ApplicationController before_filter :authorize_web before_filter :set_locale - def start - end + caches_page :embed #When the user clicks 'Export' we redirect to a URL which generates the export download def finish @@ -20,7 +19,10 @@ def finish format = params[:mapnik_format] scale = params[:mapnik_scale] - redirect_to "http://parent.tile.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}" + redirect_to "http://render.openstreetmap.org/cgi-bin/export?bbox=#{bbox}&scale=#{scale}&format=#{format}" end end + + def embed + end end diff --git a/app/controllers/friend_controller.rb b/app/controllers/friend_controller.rb deleted file mode 100644 index 292f5c99680..00000000000 --- a/app/controllers/friend_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class FriendController < ApplicationController -end diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 2b03790aacd..73422c2f0a3 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -1,3 +1,5 @@ +# coding: utf-8 + class GeocoderController < ApplicationController require 'uri' require 'net/http' @@ -5,45 +7,36 @@ class GeocoderController < ApplicationController before_filter :authorize_web before_filter :set_locale + before_filter :require_oauth, :only => [:search] def search - @query = params[:query] - @sources = Array.new - - @query.sub(/^\s+/, "") - @query.sub(/\s+$/, "") + normalize_params - if @query.match(/^[+-]?\d+(\.\d*)?\s*[\s,]\s*[+-]?\d+(\.\d*)?$/) + @sources = [] + if params[:lat] && params[:lon] @sources.push "latlon" - elsif @query.match(/^\d{5}(-\d{4})?$/) + @sources.push "osm_nominatim_reverse" + @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME) + elsif params[:query].match(/^\d{5}(-\d{4})?$/) @sources.push "us_postcode" @sources.push "osm_nominatim" - elsif @query.match(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i) + elsif params[:query].match(/^(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW])\s*[0-9][ABD-HJLNP-UW-Z]{2})$/i) @sources.push "uk_postcode" @sources.push "osm_nominatim" - elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i) + elsif params[:query].match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i) @sources.push "ca_postcode" @sources.push "osm_nominatim" else @sources.push "osm_nominatim" @sources.push "geonames" if defined?(GEONAMES_USERNAME) end + + render :layout => map_layout end def search_latlon - # get query parameters - query = params[:query] - - # create result array - @results = Array.new - - # decode the location - if m = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/) - lat = m[1].to_f - lon = m[3].to_f - end - - # generate results + lat = params[:lat].to_f + lon = params[:lon].to_f if lat < -90 or lat > 90 @error = "Latitude #{lat} out of range" render :action => "error" @@ -51,9 +44,9 @@ def search_latlon @error = "Longitude #{lon} out of range" render :action => "error" else - @results.push({:lat => lat, :lon => lon, - :zoom => POSTCODE_ZOOM, - :name => "#{lat}, #{lon}"}) + @results = [{:lat => lat, :lon => lon, + :zoom => params[:zoom], + :name => "#{lat}, #{lon}"}] render :action => "results" end @@ -132,84 +125,6 @@ def search_ca_postcode render :action => "error" end - def search_osm_namefinder - # get query parameters - query = params[:query] - - # create result array - @results = Array.new - - # ask OSM namefinder - response = fetch_xml("http://gazetteer.openstreetmap.org/namefinder/search.xml?find=#{escape_query(query)}") - - # parse the response - response.elements.each("searchresults/named") do |named| - lat = named.attributes["lat"].to_s - lon = named.attributes["lon"].to_s - zoom = named.attributes["zoom"].to_s - place = named.elements["place/named"] || named.elements["nearestplaces/named"] - type = named.attributes["info"].to_s.capitalize - name = named.attributes["name"].to_s - description = named.elements["description"].to_s - - if name.empty? - prefix = "" - name = type - else - prefix = t "geocoder.search_osm_namefinder.prefix", :type => type - end - - if place - distance = format_distance(place.attributes["approxdistance"].to_i) - direction = format_direction(place.attributes["direction"].to_i) - placename = format_name(place.attributes["name"].to_s) - suffix = t "geocoder.search_osm_namefinder.suffix_place", :distance => distance, :direction => direction, :placename => placename - - if place.attributes["rank"].to_i <= 30 - parent = nil - parentrank = 0 - parentscore = 0 - - place.elements.each("nearestplaces/named") do |nearest| - nearestrank = nearest.attributes["rank"].to_i - nearestscore = nearestrank / nearest.attributes["distance"].to_f - - if nearestrank > 30 and - ( nearestscore > parentscore or - ( nearestscore == parentscore and nearestrank > parentrank ) ) - parent = nearest - parentrank = nearestrank - parentscore = nearestscore - end - end - - if parent - parentname = format_name(parent.attributes["name"].to_s) - - if place.attributes["info"].to_s == "suburb" - suffix = t "geocoder.search_osm_namefinder.suffix_suburb", :suffix => suffix, :parentname => parentname - else - parentdistance = format_distance(parent.attributes["approxdistance"].to_i) - parentdirection = format_direction(parent.attributes["direction"].to_i) - suffix = t "geocoder.search_osm_namefinder.suffix_parent", :suffix => suffix, :parentdistance => parentdistance, :parentdirection => parentdirection, :parentname => parentname - end - end - end - else - suffix = "" - end - - @results.push({:lat => lat, :lon => lon, :zoom => zoom, - :prefix => prefix, :name => name, :suffix => suffix, - :description => description}) - end - - render :action => "results" - rescue Exception => ex - @error = "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}" - render :action => "error" - end - def search_osm_nominatim # get query parameters query = params[:query] @@ -229,7 +144,7 @@ def search_osm_nominatim end # ask nominatim - response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}") + response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") # create result array @results = Array.new @@ -248,13 +163,24 @@ def search_osm_nominatim type = place.attributes["type"].to_s name = place.attributes["display_name"].to_s min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",") - prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize + if type.empty? + prefix_name = "" + else + prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize + end + if klass == 'boundary' and type == 'administrative' + rank = (place.attributes["place_rank"].to_i + 1) / 2 + prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name + end prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name + object_type = place.attributes["osm_type"] + object_id = place.attributes["osm_id"] @results.push({:lat => lat, :lon => lon, :min_lat => min_lat, :max_lat => max_lat, :min_lon => min_lon, :max_lon => max_lon, - :prefix => prefix, :name => name}) + :prefix => prefix, :name => name, + :type => object_type, :id => object_id}) @more_params[:exclude].push(place.attributes["place_id"].to_s) end @@ -268,11 +194,14 @@ def search_geonames # get query parameters query = params[:query] + # get preferred language + lang = I18n.locale.to_s.split("-").first + # create result array @results = Array.new # ask geonames.org - response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&maxRows=20&username=#{GEONAMES_USERNAME}") + response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{GEONAMES_USERNAME}") # parse the response response.elements.each("geonames/geoname") do |geoname| @@ -292,50 +221,7 @@ def search_geonames render :action => "error" end - def description - @sources = Array.new - - @sources.push({ :name => "osm_nominatim" }) - @sources.push({ :name => "geonames" }) - end - - def description_osm_namefinder - # get query parameters - lat = params[:lat] - lon = params[:lon] - types = params[:types] - max = params[:max] - - # create result array - @results = Array.new - - # ask OSM namefinder - response = fetch_xml("http://gazetteer.openstreetmap.org/namefinder/search.xml?find=#{types}+near+#{lat},#{lon}&max=#{max}") - - # parse the response - response.elements.each("searchresults/named") do |named| - lat = named.attributes["lat"].to_s - lon = named.attributes["lon"].to_s - zoom = named.attributes["zoom"].to_s - place = named.elements["place/named"] || named.elements["nearestplaces/named"] - type = named.attributes["info"].to_s - name = named.attributes["name"].to_s - description = named.elements["description"].to_s - distance = format_distance(place.attributes["approxdistance"].to_i) - direction = format_direction((place.attributes["direction"].to_i - 180) % 360) - prefix = t "geocoder.description_osm_namefinder.prefix", :distance => distance, :direction => direction, :type => type - @results.push({:lat => lat, :lon => lon, :zoom => zoom, - :prefix => prefix.capitalize, :name => name, - :description => description}) - end - - render :action => "results" - rescue Exception => ex - @error = "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}" - render :action => "error" - end - - def description_osm_nominatim + def search_osm_nominatim_reverse # get query parameters lat = params[:lat] lon = params[:lon] @@ -344,14 +230,21 @@ def description_osm_nominatim # create result array @results = Array.new - # ask OSM namefinder - response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}") + # ask nominatim + response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") # parse the response response.elements.each("reversegeocode/result") do |result| + lat = result.attributes["lat"].to_s + lon = result.attributes["lon"].to_s + object_type = result.attributes["osm_type"] + object_id = result.attributes["osm_id"] description = result.get_text.to_s - @results.push({:prefix => "#{description}"}) + @results.push({:lat => lat, :lon => lon, + :zoom => zoom, + :name => description, + :type => object_type, :id => object_id}) end render :action => "results" @@ -360,22 +253,28 @@ def description_osm_nominatim render :action => "error" end - def description_geonames + def search_geonames_reverse # get query parameters lat = params[:lat] lon = params[:lon] + # get preferred language + lang = I18n.locale.to_s.split("-").first + # create result array @results = Array.new # ask geonames.org - response = fetch_xml("http://ws.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}") + response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{GEONAMES_USERNAME}") # parse the response response.elements.each("geonames/countrySubdivision") do |geoname| name = geoname.get_text("adminName1").to_s country = geoname.get_text("countryName").to_s - @results.push({:prefix => "#{name}, #{country}"}) + @results.push({:lat => lat, :lon => lon, + :zoom => GEONAMES_ZOOM, + :name => name, + :suffix => ", #{country}"}) end render :action => "results" @@ -426,4 +325,67 @@ def count_results(results) def escape_query(query) return URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N')) end + + def normalize_params + query = params[:query] + return unless query + + query.strip! + + if latlon = query.match(/^([NS])\s*(\d{1,3}(\.\d*)?)\W*([EW])\s*(\d{1,3}(\.\d*)?)$/).try(:captures) # [NSEW] decimal degrees + params.merge!(nsew_to_decdeg(latlon)).delete(:query) + elsif latlon = query.match(/^(\d{1,3}(\.\d*)?)\s*([NS])\W*(\d{1,3}(\.\d*)?)\s*([EW])$/).try(:captures) # decimal degrees [NSEW] + params.merge!(nsew_to_decdeg(latlon)).delete(:query) + + elsif latlon = query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?$/).try(:captures) # [NSEW] degrees, decimal minutes + params.merge!(ddm_to_decdeg(latlon)).delete(:query) + elsif latlon = query.match(/^(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([NS])\W*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([EW])$/).try(:captures) # degrees, decimal minutes [NSEW] + params.merge!(ddm_to_decdeg(latlon)).delete(:query) + + elsif latlon = query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?$/).try(:captures) # [NSEW] degrees, minutes, decimal seconds + params.merge!(dms_to_decdeg(latlon)).delete(:query) + elsif latlon = query.match(/^(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]\s*([NS])\W*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\s*([EW])$/).try(:captures) # degrees, minutes, decimal seconds [NSEW] + params.merge!(dms_to_decdeg(latlon)).delete(:query) + + elsif latlon = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/) + params.merge!({:lat => latlon[1].to_f, :lon => latlon[3].to_f}).delete(:query) + end + end + + def nsew_to_decdeg(captures) + begin + Float(captures[0]) + captures[2].downcase != 's' ? lat = captures[0].to_f : lat = -(captures[0].to_f) + captures[5].downcase != 'w' ? lon = captures[3].to_f : lon = -(captures[3].to_f) + rescue + captures[0].downcase != 's' ? lat = captures[1].to_f : lat = -(captures[1].to_f) + captures[3].downcase != 'w' ? lon = captures[4].to_f : lon = -(captures[4].to_f) + end + {:lat => lat, :lon => lon} + end + + def ddm_to_decdeg(captures) + begin + Float(captures[0]) + captures[3].downcase != 's' ? lat = captures[0].to_f + captures[1].to_f/60 : lat = -(captures[0].to_f + captures[1].to_f/60) + captures[7].downcase != 'w' ? lon = captures[4].to_f + captures[5].to_f/60 : lon = -(captures[4].to_f + captures[5].to_f/60) + rescue + captures[0].downcase != 's' ? lat = captures[1].to_f + captures[2].to_f/60 : lat = -(captures[1].to_f + captures[2].to_f/60) + captures[4].downcase != 'w' ? lon = captures[5].to_f + captures[6].to_f/60 : lon = -(captures[5].to_f + captures[6].to_f/60) + end + {:lat => lat, :lon => lon} + end + + def dms_to_decdeg(captures) + begin + Float(captures[0]) + captures[4].downcase != 's' ? lat = captures[0].to_f + (captures[1].to_f + captures[2].to_f/60)/60 : lat = -(captures[0].to_f + (captures[1].to_f + captures[2].to_f/60)/60) + captures[9].downcase != 'w' ? lon = captures[5].to_f + (captures[6].to_f + captures[7].to_f/60)/60 : lon = -(captures[5].to_f + (captures[6].to_f + captures[7].to_f/60)/60) + rescue + captures[0].downcase != 's' ? lat = captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60 : lat = -(captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60) + captures[5].downcase != 'w' ? lon = captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60 : lon = -(captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60) + end + {:lat => lat, :lon => lon} + end + end diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb index 94bee5d3505..fd638e4e775 100644 --- a/app/controllers/message_controller.rb +++ b/app/controllers/message_controller.rb @@ -17,7 +17,7 @@ def new if @user.sent_messages.where("sent_on >= ?", Time.now.getutc - 1.hour).count >= MAX_MESSAGES_PER_HOUR flash[:error] = t 'message.new.limit_exceeded' else - @message = Message.new(params[:message]) + @message = Message.new(message_params) @message.to_user_id = @this_user.id @message.from_user_id = @user.id @message.sent_on = Time.now.getutc @@ -29,6 +29,7 @@ def new end end else + @message = Message.new(:recipient => @this_user) @title = t 'message.new.title' end end @@ -38,9 +39,15 @@ def reply message = Message.find(params[:message_id]) if message.to_user_id == @user.id then - @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" - @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}" - @this_user = User.find(message.from_user_id) + message.update_attribute(:message_read, true) + + @message = Message.new( + :recipient => message.sender, + :title => "Re: #{message.title.sub(/^Re:\s*/, '')}", + :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}", + ) + + @title = @message.title render :action => 'new' else @@ -98,11 +105,9 @@ def mark notice = t 'message.mark.as_read' end @message.message_read = message_read - if @message.save - if not request.xhr? - flash[:notice] = notice - redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name - end + if @message.save and not request.xhr? + flash[:notice] = notice + redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name end rescue ActiveRecord::RecordNotFound @title = t'message.no_such_message.title' @@ -111,10 +116,10 @@ def mark # Delete the message. def delete - message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id]) - message.from_user_visible = false if message.sender == @user - message.to_user_visible = false if message.recipient == @user - if message.save + @message = Message.where("to_user_id = ? OR from_user_id = ?", @user.id, @user.id).find(params[:message_id]) + @message.from_user_visible = false if @message.sender == @user + @message.to_user_visible = false if @message.recipient == @user + if @message.save and not request.xhr? flash[:notice] = t 'message.delete.deleted' if params[:referer] @@ -127,4 +132,10 @@ def delete @title = t'message.no_such_message.title' render :action => 'no_such_message', :status => :not_found end +private + ## + # return permitted message parameters + def message_params + params.require(:message).permit(:title, :body) + end end diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 5064a3c0b64..1e34bc10d50 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -26,8 +26,10 @@ def create # Dump the details on a node given in params[:id] def read node = Node.find(params[:id]) - if node.visible? - response.last_modified = node.timestamp + + response.last_modified = node.timestamp + + if node.visible render :text => node.to_xml.to_s, :content_type => "text/xml" else render :text => "", :status => :gone @@ -62,6 +64,10 @@ def delete # Dump the details on many nodes whose ids are given in the "nodes" parameter. def nodes + if not params['nodes'] + raise OSM::APIBadUserInput.new("The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]") + end + ids = params['nodes'].split(',').collect { |n| n.to_i } if ids.length == 0 diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb new file mode 100644 index 00000000000..76c97ba5b37 --- /dev/null +++ b/app/controllers/notes_controller.rb @@ -0,0 +1,362 @@ +class NotesController < ApplicationController + + layout 'site', :only => [:mine] + + before_filter :check_api_readable + before_filter :authorize_web, :only => [:mine] + before_filter :setup_user_auth, :only => [:create, :comment] + before_filter :authorize, :only => [:close, :reopen, :destroy] + before_filter :require_moderator, :only => [:destroy] + before_filter :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy] + before_filter :require_allow_write_notes, :only => [:create, :comment, :close, :reopen, :destroy] + before_filter :set_locale + after_filter :compress_output + around_filter :api_call_handle_error, :api_call_timeout + + ## + # Return a list of notes in a given area + def index + # Figure out the bbox - we prefer a bbox argument but also + # support the old, deprecated, method with four arguments + if params[:bbox] + bbox = BoundingBox.from_bbox_params(params) + else + raise OSM::APIBadUserInput.new("No l was given") unless params[:l] + raise OSM::APIBadUserInput.new("No r was given") unless params[:r] + raise OSM::APIBadUserInput.new("No b was given") unless params[:b] + raise OSM::APIBadUserInput.new("No t was given") unless params[:t] + + bbox = BoundingBox.from_lrbt_params(params) + end + + # Get any conditions that need to be applied + notes = closed_condition(Note.all) + + # Check that the boundaries are valid + bbox.check_boundaries + + # Check the the bounding box is not too big + bbox.check_size(MAX_NOTE_REQUEST_AREA) + + # Find the notes we want to return + @notes = notes.bbox(bbox).order("updated_at DESC").limit(result_limit).preload(:comments) + + # Render the result + respond_to do |format| + format.rss + format.xml + format.json + format.gpx + end + end + + ## + # Create a new note + def create + # Check the arguments are sane + raise OSM::APIBadUserInput.new("No lat was given") unless params[:lat] + raise OSM::APIBadUserInput.new("No lon was given") unless params[:lon] + raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank? + + # Extract the arguments + lon = OSM.parse_float(params[:lon], OSM::APIBadUserInput, "lon was not a number") + lat = OSM.parse_float(params[:lat], OSM::APIBadUserInput, "lat was not a number") + comment = params[:text] + + # Include in a transaction to ensure that there is always a note_comment for every note + Note.transaction do + # Create the note + @note = Note.create(:lat => lat, :lon => lon) + raise OSM::APIBadUserInput.new("The note is outside this world") unless @note.in_world? + + # Save the note + @note.save! + + # Add a comment to the note + add_comment(@note, comment, "opened") + end + + # Return a copy of the new note + respond_to do |format| + format.xml { render :action => :show } + format.json { render :action => :show } + end + end + + ## + # Add a comment to an existing note + def comment + # Check the arguments are sane + raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank? + + # Extract the arguments + id = params[:id].to_i + comment = params[:text] + + # Find the note and check it is valid + @note = Note.find(id) + raise OSM::APINotFoundError unless @note + raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? + raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed? + + # Add a comment to the note + Note.transaction do + add_comment(@note, comment, "commented") + end + + # Return a copy of the updated note + respond_to do |format| + format.xml { render :action => :show } + format.json { render :action => :show } + end + end + + ## + # Close a note + def close + # Check the arguments are sane + raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + + # Extract the arguments + id = params[:id].to_i + comment = params[:text] + + # Find the note and check it is valid + @note = Note.find_by_id(id) + raise OSM::APINotFoundError unless @note + raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? + raise OSM::APINoteAlreadyClosedError.new(@note) if @note.closed? + + # Close the note and add a comment + Note.transaction do + @note.close + + add_comment(@note, comment, "closed") + end + + # Return a copy of the updated note + respond_to do |format| + format.xml { render :action => :show } + format.json { render :action => :show } + end + end + + ## + # Reopen a note + def reopen + # Check the arguments are sane + raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + + # Extract the arguments + id = params[:id].to_i + comment = params[:text] + + # Find the note and check it is valid + @note = Note.find_by_id(id) + raise OSM::APINotFoundError unless @note + raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? or @user.moderator? + raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? or not @note.visible? + + # Reopen the note and add a comment + Note.transaction do + @note.reopen + + add_comment(@note, comment, "reopened") + end + + # Return a copy of the updated note + respond_to do |format| + format.xml { render :action => :show } + format.json { render :action => :show } + end + end + + ## + # Get a feed of recent notes and comments + def feed + # Get any conditions that need to be applied + notes = closed_condition(Note.all) + + # Process any bbox + if params[:bbox] + bbox = BoundingBox.from_bbox_params(params) + + bbox.check_boundaries + bbox.check_size(MAX_NOTE_REQUEST_AREA) + + notes = notes.bbox(bbox) + end + + # Find the comments we want to return + @comments = NoteComment.where(:note_id => notes).order("created_at DESC").limit(result_limit).preload(:note) + + # Render the result + respond_to do |format| + format.rss + end + end + + ## + # Read a note + def show + # Check the arguments are sane + raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + + # Find the note and check it is valid + @note = Note.find(params[:id]) + raise OSM::APINotFoundError unless @note + raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? + + # Render the result + respond_to do |format| + format.xml + format.rss + format.json + format.gpx + end + end + + ## + # Delete (hide) a note + def destroy + # Check the arguments are sane + raise OSM::APIBadUserInput.new("No id was given") unless params[:id] + + # Extract the arguments + id = params[:id].to_i + comment = params[:text] + + # Find the note and check it is valid + @note = Note.find(id) + raise OSM::APINotFoundError unless @note + raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? + + # Mark the note as hidden + Note.transaction do + @note.status = "hidden" + @note.save + + add_comment(@note, comment, "hidden", false) + end + + # Return a copy of the updated note + respond_to do |format| + format.xml { render :action => :show } + format.json { render :action => :show } + end + end + + ## + # Return a list of notes matching a given string + def search + # Check the arguments are sane + raise OSM::APIBadUserInput.new("No query string was given") unless params[:q] + + # Get any conditions that need to be applied + @notes = closed_condition(Note.all) + @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q]) + + # Find the notes we want to return + @notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments) + + # Render the result + respond_to do |format| + format.rss { render :action => :index } + format.xml { render :action => :index } + format.json { render :action => :index } + format.gpx { render :action => :index } + end + end + + ## + # Display a list of notes by a specified user + def mine + if params[:display_name] + if @this_user = User.active.find_by_display_name(params[:display_name]) + @title = t 'note.mine.title', :user => @this_user.display_name + @heading = t 'note.mine.heading', :user => @this_user.display_name + @description = t 'note.mine.subheading', :user => render_to_string(:partial => "user", :object => @this_user) + @page = (params[:page] || 1).to_i + @page_size = 10 + @notes = @this_user.notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a + else + @title = t 'user.no_such_user.title' + @not_found_user = params[:display_name] + + render :template => 'user/no_such_user', :status => :not_found + end + end + end + +private + #------------------------------------------------------------ + # utility functions below. + #------------------------------------------------------------ + + ## + # Render an OK response + def render_ok + if params[:format] == "js" + render :text => "osbResponse();", :content_type => "text/javascript" + else + render :text => "ok " + @note.id.to_s + "\n", :content_type => "text/plain" if @note + render :text => "ok\n", :content_type => "text/plain" unless @note + end + end + + ## + # Get the maximum number of results to return + def result_limit + if params[:limit] + if params[:limit].to_i > 0 and params[:limit].to_i <= 10000 + params[:limit].to_i + else + raise OSM::APIBadUserInput.new("Note limit must be between 1 and 10000") + end + else + 100 + end + end + + ## + # Generate a condition to choose which bugs we want based + # on their status and the user's request parameters + def closed_condition(notes) + if params[:closed] + closed_since = params[:closed].to_i + else + closed_since = 7 + end + + if closed_since < 0 + notes = notes.where("status != 'hidden'") + elsif closed_since > 0 + notes = notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))") + else + notes = notes.where("status = 'open'") + end + + return notes + end + + ## + # Add a comment to a note + def add_comment(note, text, event, notify = true) + attributes = { :visible => true, :event => event, :body => text } + + if @user + attributes[:author_id] = @user.id + else + attributes[:author_ip] = request.remote_ip + end + + comment = note.comments.create(attributes) + + note.comments.map { |c| c.author }.uniq.each do |user| + if notify and user and user != @user + Notifier.note_comment_notification(comment, user).deliver + end + end + end +end diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb index 56f19dbda17..320dab1b527 100644 --- a/app/controllers/oauth_clients_controller.rb +++ b/app/controllers/oauth_clients_controller.rb @@ -15,7 +15,7 @@ def new end def create - @client_application = @user.client_applications.build(params[:client_application]) + @client_application = @user.client_applications.build(application_params) if @client_application.save flash[:notice] = t'oauth_clients.create.flash' redirect_to :action => "show", :id => @client_application.id @@ -33,16 +33,22 @@ def show def edit @client_application = @user.client_applications.find(params[:id]) + rescue ActiveRecord::RecordNotFound + @type = "client application" + render :action => "not_found", :status => :not_found end def update @client_application = @user.client_applications.find(params[:id]) - if @client_application.update_attributes(params[:client_application]) + if @client_application.update_attributes(application_params) flash[:notice] = t'oauth_clients.update.flash' redirect_to :action => "show", :id => @client_application.id else render :action => "edit" end + rescue ActiveRecord::RecordNotFound + @type = "client application" + render :action => "not_found", :status => :not_found end def destroy @@ -50,5 +56,12 @@ def destroy @client_application.destroy flash[:notice] = t'oauth_clients.destroy.flash' redirect_to :action => "index" + rescue ActiveRecord::RecordNotFound + @type = "client application" + render :action => "not_found", :status => :not_found + end +private + def application_params + params.require(:client_application).permit(:name, :url, :callback_url, :support_url, ClientApplication.all_permissions) end end diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 856fdd79032..c7251f0a7c0 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -3,7 +3,7 @@ class OauthController < ApplicationController include OAuth::Controllers::ProviderController - layout 'slim' + layout 'site' def login_required authorize_web @@ -67,10 +67,12 @@ def oauth1_authorize end else @token.invalidate! + @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name) render :action => "authorize_failure" end end else + @message = t "oauth.oauthorize_failure.invalid" render :action => "authorize_failure" end end diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb index c23df70dfad..a542a9bde48 100644 --- a/app/controllers/old_controller.rb +++ b/app/controllers/old_controller.rb @@ -39,7 +39,7 @@ def history def version if @old_element.redacted? and not show_redactions? - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden else response.last_modified = @old_element.timestamp @@ -66,7 +66,7 @@ def redact end # just return an empty 200 OK for success - render :nothing => true + render :text => "" end private diff --git a/app/controllers/old_relation_member_controller.rb b/app/controllers/old_relation_member_controller.rb deleted file mode 100644 index d7023ab4639..00000000000 --- a/app/controllers/old_relation_member_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class OldRelationMemberController < ApplicationController - -end diff --git a/app/controllers/old_way_node_controller.rb b/app/controllers/old_way_node_controller.rb deleted file mode 100644 index 69fa97048de..00000000000 --- a/app/controllers/old_way_node_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class OldWayNodeController < ApplicationController -end diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index 0b989d11e5f..9e7466a4ad4 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -45,7 +45,7 @@ def update relation.update_from new_relation, @user render :text => relation.version.to_s, :content_type => "text/plain" else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end end @@ -56,7 +56,7 @@ def delete relation.delete_with_history!(new_relation, @user) render :text => relation.version.to_s, :content_type => "text/plain" else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end end @@ -125,24 +125,28 @@ def full render :text => doc.to_s, :content_type => "text/xml" else - render :nothing => true, :status => :gone + render :text => "", :status => :gone end end def relations + if not params['relations'] + raise OSM::APIBadUserInput.new("The parameter relations is required, and must be of the form relations=id[,id[,id...]]") + end + ids = params['relations'].split(',').collect { |w| w.to_i } - if ids.length > 0 - doc = OSM::API.new.get_xml_doc + if ids.length == 0 + raise OSM::APIBadUserInput.new("No relations were given to search for") + end - Relation.find(ids).each do |relation| - doc.root << relation.to_xml_node - end + doc = OSM::API.new.get_xml_doc - render :text => doc.to_s, :content_type => "text/xml" - else - render :text => "You need to supply a comma separated list of ids.", :status => :bad_request + Relation.find(ids).each do |relation| + doc.root << relation.to_xml_node end + + render :text => doc.to_s, :content_type => "text/xml" end def relations_for_way diff --git a/app/controllers/relation_member_controller.rb b/app/controllers/relation_member_controller.rb deleted file mode 100644 index 3eb7fcaa1a0..00000000000 --- a/app/controllers/relation_member_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class RelationMemberController < ApplicationController - - - -end diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 622ebb1ce37..dd7c2febe89 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -32,13 +32,13 @@ def do_search(do_ways,do_nodes,do_relations) if do_nodes response.headers['Error'] = "Searching of nodes is currently unavailable" - render :nothing => true, :status => :service_unavailable + render :text => "", :status => :service_unavailable return false end unless value response.headers['Error'] = "Searching for a key without value is currently unavailable" - render :nothing => true, :status => :service_unavailable + render :text => "", :status => :service_unavailable return false end diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index fa33deeeeea..5597fd4aef6 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,84 +1,90 @@ class SiteController < ApplicationController - layout 'site', :except => [:key, :permalink] - layout false, :only => [:key, :permalink] + layout 'site' + layout :map_layout, :only => [:index, :export] before_filter :authorize_web before_filter :set_locale - before_filter :require_user, :only => [:edit] - - def export - render :action => 'index' + before_filter :redirect_browse_params, :only => :index + before_filter :redirect_map_params, :only => [:index, :edit, :export] + before_filter :require_user, :only => [:edit, :welcome] + before_filter :require_oauth, :only => [:index] + + def index + unless STATUS == :database_readonly or STATUS == :database_offline + session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR']) + end end def permalink lon, lat, zoom = ShortLink::decode(params[:code]) - new_params = params.clone - new_params.delete :code + new_params = params.except(:code, :lon, :lat, :zoom, :node, :way, :relation, :changeset) + if new_params.has_key? :m new_params.delete :m new_params[:mlat] = lat new_params[:mlon] = lon + end + + if params.has_key? :node + new_params[:controller] = 'browse' + new_params[:action] = 'node' + new_params[:id] = params[:node] + elsif params.has_key? :way + new_params[:controller] = 'browse' + new_params[:action] = 'way' + new_params[:id] = params[:way] + elsif params.has_key? :relation + new_params[:controller] = 'browse' + new_params[:action] = 'relation' + new_params[:id] = params[:relation] + elsif params.has_key? :changeset + new_params[:controller] = 'browse' + new_params[:action] = 'changeset' + new_params[:id] = params[:changeset] else - new_params[:lat] = lat - new_params[:lon] = lon + new_params[:controller] = 'site' + new_params[:action] = 'index' end - new_params[:zoom] = zoom - new_params[:controller] = 'site' - new_params[:action] = 'index' + + new_params[:anchor] = "map=#{zoom}/#{lat}/#{lon}" + redirect_to new_params end def key expires_in 7.days, :public => true + render :layout => false end def edit - editor = params[:editor] || @user.preferred_editor || DEFAULT_EDITOR + editor = preferred_editor if editor == "remote" - render :action => :index - else - # Decide on a lat lon to initialise potlatch with. Various ways of doing this - if params['lon'] and params['lat'] - @lon = params['lon'].to_f - @lat = params['lat'].to_f - @zoom = params['zoom'].to_i - - elsif params['mlon'] and params['mlat'] - @lon = params['mlon'].to_f - @lat = params['mlat'].to_f - @zoom = params['zoom'].to_i - - elsif params['bbox'] - bbox = BoundingBox.from_bbox_params(params) - - @lon = bbox.centre_lon - @lat = bbox.centre_lat - @zoom = 16 - elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat'] - bbox = BoundingBox.from_lon_lat_params(params) - - @lon = bbox.centre_lon - @lat = bbox.centre_lat - @zoom = 16 - - elsif params['gpx'] - @lon = Trace.find(params['gpx']).longitude - @lat = Trace.find(params['gpx']).latitude - - elsif cookies.key?("_osm_location") - @lon, @lat, @zoom, layers = cookies["_osm_location"].split("|") - - elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? - @lon = @user.home_lon - @lat = @user.home_lat - - else - #catch all. Do nothing. lat=nil, lon=nil - #Currently this results in potlatch starting up at 0,0 (Atlantic ocean). - end - - @zoom = '17' if @zoom.nil? + require_oauth + render :action => :index, :layout => map_layout + return + end + + if params[:node] + bbox = Node.find(params[:node]).bbox.to_unscaled + @lat = bbox.centre_lat + @lon = bbox.centre_lon + @zoom = 18 + elsif params[:way] + bbox = Way.find(params[:way]).bbox.to_unscaled + @lat = bbox.centre_lat + @lon = bbox.centre_lon + @zoom = 17 + elsif params[:note] + note = Note.find(params[:note]) + @lat = note.lat + @lon = note.lon + @zoom = 17 + elsif params[:gpx] + trace = Trace.visible_to(@user).find(params[:gpx]) + @lat = trace.latitude + @lon = trace.longitude + @zoom = 16 end end @@ -86,7 +92,60 @@ def copyright @locale = params[:copyright_locale] || I18n.locale end + def welcome + end + + def help + end + + def about + end + + def export + end + + def offline + end + def preview render :text => RichText.new(params[:format], params[:text]).to_html end + + def id + render "id", :layout => false + end + + private + + def redirect_browse_params + if params[:node] + redirect_to node_path(params[:node]) + elsif params[:way] + redirect_to way_path(params[:way]) + elsif params[:relation] + redirect_to relation_path(params[:relation]) + elsif params[:note] + redirect_to browse_note_path(params[:note]) + elsif params[:query] + redirect_to search_path(:query => params[:query]) + end + end + + def redirect_map_params + anchor = [] + + if params[:lat] && params[:lon] + anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" + end + + if params[:layers] + anchor << "layers=#{params.delete(:layers)}" + elsif params.delete(:notes) == 'yes' + anchor << "layers=N" + end + + if anchor.present? + redirect_to params.merge(:anchor => anchor.join('&')) + end + end end diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 05f97bf0d50..9c4a9d8bd18 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -16,12 +16,6 @@ class TraceController < ApplicationController before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data] around_filter :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data] - caches_action :list, :unless => :logged_in?, :layout => false - caches_action :view, :layout => false - caches_action :georss, :layout => true - cache_sweeper :trace_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete] - cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete] - # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.). # target_user - if set, specifies the user to fetch traces for. if not set will fetch all traces def list @@ -66,13 +60,7 @@ def list end if params[:tag] - @tag = params[:tag] - - files = Tracetag.where(:tag => params[:tag]).select(:gpx_id).all - - if files.length > 0 - @traces = @traces.where(:id => files.collect { |tt| tt.gpx_id }) - end + @traces = @traces.tagged(params[:tag]) end @page = (params[:page] || 1).to_i @@ -134,8 +122,8 @@ def create logger.info("id is #{@trace.id}") flash[:notice] = t 'trace.create.trace_uploaded' - if @user.traces.count(:conditions => { :inserted => false }) > 4 - flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.count(:conditions => { :inserted => false }) + if @user.traces.where(:inserted => false).count > 4 + flash[:warning] = t 'trace.trace_header.traces_waiting', :count => @user.traces.where(:inserted => false).count end redirect_to :action => :list, :display_name => @user.display_name @@ -151,7 +139,7 @@ def create @trace.errors.add(:gpx_file, "can't be blank") end else - @trace = Trace.new({:visibility => default_visibility}, :without_protection => true) + @trace = Trace.new(:visibility => default_visibility) end @title = t 'trace.create.upload_trace' @@ -162,24 +150,31 @@ def data if trace.visible? and (trace.public? or (@user and @user == trace.user)) if Acl.no_trace_download(request.remote_ip) - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden elsif request.format == Mime::XML - send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.to_s, :disposition => 'attachment') + send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment') + elsif request.format == Mime::GPX + send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => 'attachment') else send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment') end else - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end def edit @trace = Trace.find(params[:id]) - if @user and @trace.user == @user + if not @trace.visible? + render :text => "", :status => :not_found + elsif @user.nil? or @trace.user != @user + render :text => "", :status => :forbidden + else @title = t 'trace.edit.title', :name => @trace.name + if params[:trace] @trace.description = params[:trace][:description] @trace.tagstring = params[:trace][:tagstring] @@ -188,54 +183,42 @@ def edit redirect_to :action => 'view', :display_name => @user.display_name end end - else - render :nothing => true, :status => :forbidden end rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end def delete trace = Trace.find(params[:id]) - if @user and trace.user == @user - if trace.visible? - trace.visible = false - trace.save - flash[:notice] = t 'trace.delete.scheduled_for_deletion' - redirect_to :action => :list, :display_name => @user.display_name - else - render :nothing => true, :status => :not_found - end + if not trace.visible? + render :text => "", :status => :not_found + elsif @user.nil? or trace.user != @user + render :text => "", :status => :forbidden else - render :nothing => true, :status => :forbidden + trace.visible = false + trace.save + flash[:notice] = t 'trace.delete.scheduled_for_deletion' + redirect_to :action => :list, :display_name => @user.display_name end rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end def georss - traces = Trace.public + @traces = Trace.public.visible if params[:display_name] - traces = traces.joins(:user).where(:users => {:display_name => params[:display_name]}) + @traces = @traces.joins(:user).where(:users => {:display_name => params[:display_name]}) end if params[:tag] - traces = traces.where("EXISTS (SELECT * FROM gpx_file_tags AS gft WHERE gft.gpx_id = gpx_files.id AND gft.tag = ?)", params[:tag]) + @traces = @traces.tagged(params[:tag]) end - traces = traces.order("timestamp DESC") - traces = traces.limit(20) - traces = traces.includes(:user) - - rss = OSM::GeoRSS.new - - traces.each do |trace| - rss.add(trace.latitude, trace.longitude, trace.name, trace.user.display_name, url_for({:controller => 'trace', :action => 'view', :id => trace.id, :display_name => trace.user.display_name}), " 'icon', :id => trace.id, :display_name => trace.user.display_name})}'> GPX file with #{trace.size} points from #{trace.user.display_name}", trace.timestamp) - end - - render :text => rss.to_s, :content_type => "application/rss+xml" + @traces = @traces.order("timestamp DESC") + @traces = @traces.limit(20) + @traces = @traces.includes(:user) end def picture @@ -246,13 +229,13 @@ def picture expires_in 7.days, :private => !trace.public?, :public => trace.public? send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end else - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end def icon @@ -263,13 +246,13 @@ def icon expires_in 7.days, :private => !trace.public?, :public => trace.public? send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline') else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end else - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + render :text => "", :status => :not_found end def api_read @@ -278,7 +261,7 @@ def api_read if trace.public? or trace.user == @user render :text => trace.to_xml.to_s, :content_type => "text/xml" else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end @@ -297,9 +280,9 @@ def api_update trace.visibility = new_trace.visibility trace.save! - render :nothing => true, :status => :ok + render :text => "", :status => :ok else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end @@ -310,9 +293,9 @@ def api_delete trace.visible = false trace.save! - render :nothing => true, :status => :ok + render :text => "", :status => :ok else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end @@ -320,13 +303,13 @@ def api_data trace = Trace.find(params[:id]) if trace.public? or trace.user == @user - if request.format == Mime::XML - send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.to_s, :disposition => 'attachment') + if request.format == Mime::XML or request.format == Mime::GPX + send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment') else send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment') end else - render :nothing => true, :status => :forbidden + render :text => "", :status => :forbidden end end @@ -349,12 +332,12 @@ def api_create if @trace.id render :text => @trace.id.to_s, :content_type => "text/plain" elsif @trace.valid? - render :nothing => true, :status => :internal_server_error + render :text => "", :status => :internal_server_error else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end end @@ -368,11 +351,11 @@ def do_create(file, tags, description, visibility) filename = "/tmp/#{rand}" # ...and save the uploaded file to that location - File.open(filename, "w") { |f| f.write(file.read) } + File.open(filename, "wb") { |f| f.write(file.read) } # Create the trace object, falsely marked as already # inserted to stop the import daemon trying to load it - @trace = Trace.new({ + @trace = Trace.new( :name => name, :tagstring => tags, :description => description, @@ -380,7 +363,7 @@ def do_create(file, tags, description, visibility) :inserted => true, :user => @user, :timestamp => Time.now.getutc - }, :without_protection => true) + ) Trace.transaction do begin diff --git a/app/controllers/tracepoint_controller.rb b/app/controllers/tracepoint_controller.rb deleted file mode 100644 index fed84c60171..00000000000 --- a/app/controllers/tracepoint_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class TracepointController < ApplicationController -end diff --git a/app/controllers/tracetag_controller.rb b/app/controllers/tracetag_controller.rb deleted file mode 100644 index ec44ee07b15..00000000000 --- a/app/controllers/tracetag_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class TracetagController < ApplicationController -end diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 455e45c3f23..2284174be1e 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -35,13 +35,13 @@ def edit def create if @valid_params - @user_block = UserBlock.new({ + @user_block = UserBlock.new( :user_id => @this_user.id, :creator_id => @user.id, :reason => params[:user_block][:reason], :ends_at => Time.now.getutc() + @block_period.hours, :needs_view => params[:user_block][:needs_view] - }, :without_protection => true) + ) if @user_block.save flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name) @@ -59,11 +59,11 @@ def update if @user_block.creator_id != @user.id flash[:error] = t('user_block.update.only_creator_can_edit') redirect_to :action => "edit" - elsif @user_block.update_attributes({ + elsif @user_block.update_attributes( :ends_at => Time.now.getutc() + @block_period.hours, :reason => params[:user_block][:reason], :needs_view => params[:user_block][:needs_view] - }, :without_protection => true) + ) flash[:notice] = t('user_block.update.success') redirect_to(@user_block) else diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index bccd5d5cb49..dbfc44a37ad 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,22 +1,23 @@ class UserController < ApplicationController - layout :choose_layout + layout 'site', :except => [:api_details] - skip_before_filter :verify_authenticity_token, :only => [:api_details, :api_gpx_files] + skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files] before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details] before_filter :authorize, :only => [:api_details, :api_gpx_files] - before_filter :authorize_web, :except => [:api_details, :api_gpx_files] - before_filter :set_locale, :except => [:api_details, :api_gpx_files] + before_filter :authorize_web, :except => [:api_read, :api_details, :api_gpx_files] + before_filter :set_locale, :except => [:api_read, :api_details, :api_gpx_files] before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend] - before_filter :check_database_readable, :except => [:login, :api_details, :api_gpx_files] + before_filter :require_self, :only => [:account] + before_filter :check_database_readable, :except => [:login, :api_read, :api_details, :api_gpx_files] before_filter :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend] - before_filter :check_api_readable, :only => [:api_details, :api_gpx_files] + before_filter :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files] before_filter :require_allow_read_prefs, :only => [:api_details] before_filter :require_allow_read_gpx, :only => [:api_gpx_files] - before_filter :require_cookies, :only => [:login, :confirm] + before_filter :require_cookies, :only => [:new, :login, :confirm] before_filter :require_administrator, :only => [:set_status, :delete, :list] - before_filter :lookup_this_user, :only => [:set_status, :delete] - - cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete] + around_filter :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files] + before_filter :lookup_user_by_id, :only => [:api_read] + before_filter :lookup_user_by_name, :only => [:set_status, :delete] def terms @legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || DEFAULT_LEGALE @@ -24,55 +25,13 @@ def terms if request.xhr? render :partial => "terms" - elsif using_open_id? - # The redirect from the OpenID provider reenters here - # again and we need to pass the parameters through to - # the open_id_authentication function - @user = session.delete(:new_user) - - openid_verify(nil, @user) do |user| - end - - if @user.openid_url.nil? or @user.invalid? - render :action => 'new' - else - render :action => 'terms' - end - elsif params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last) - render :action => 'blocked' else - session[:referer] = params[:referer] - @title = t 'user.terms.title' - @user = User.new(params[:user]) if params[:user] - if params[:user] and params[:user][:openid_url] and @user.pass_crypt.empty? - # We are creating an account with OpenID and no password - # was specified so create a random one - @user.pass_crypt = SecureRandom.base64(16) - @user.pass_crypt_confirmation = @user.pass_crypt - end - - if @user - if @user.invalid? - if @user.new_record? - # Something is wrong with a new user, so rerender the form - render :action => :new - else - # Error in existing user, so go to account settings - flash[:errors] = @user.errors - redirect_to :action => :account, :display_name => @user.display_name - end - elsif @user.terms_agreed? - # Already agreed to terms, so just show settings - redirect_to :action => :account, :display_name => @user.display_name - elsif params[:user] and params[:user][:openid_url] and not params[:user][:openid_url].empty? - # Verify OpenID before moving on - session[:new_user] = @user - openid_verify(params[:user][:openid_url], @user) - end - else - # Not logged in, so redirect to the login page + if @user and @user.terms_agreed? + # Already agreed to terms, so just show settings + redirect_to :action => :account, :display_name => @user.display_name + elsif @user.nil? and session[:new_user].nil? redirect_to :action => :login, :referer => request.fullpath end end @@ -112,28 +71,46 @@ def save else redirect_to :action => :account, :display_name => @user.display_name end - elsif Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last) - render :action => 'blocked' else - @user = User.new(params[:user]) + @user = session.delete(:new_user) - @user.status = "pending" - @user.data_public = true - @user.description = "" if @user.description.nil? - @user.creation_ip = request.remote_ip - @user.languages = request.user_preferred_languages - @user.terms_agreed = Time.now.getutc - @user.terms_seen = true - @user.openid_url = nil if @user.openid_url and @user.openid_url.empty? - - if @user.save - flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL) - flash[:notice] = t 'user.new.flash create success message', :email => @user.email - Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver - session[:token] = @user.tokens.create.token - redirect_to :action => 'login', :referer => params[:referer] - else - render :action => 'new', :referer => params[:referer] + if check_signup_allowed(@user.email) + @user.data_public = true + @user.description = "" if @user.description.nil? + @user.creation_ip = request.remote_ip + @user.languages = http_accept_language.user_preferred_languages + @user.terms_agreed = Time.now.getutc + @user.terms_seen = true + @user.openid_url = nil if @user.openid_url and @user.openid_url.empty? + + if @user.save + flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK) + + referer = welcome_path + + begin + uri = URI(session[:referer]) + /map=(.*)\/(.*)\/(.*)/.match(uri.fragment) do |m| + editor = Rack::Utils.parse_query(uri.query).slice('editor') + referer = welcome_path({'zoom' => m[1], + 'lat' => m[2], + 'lon' => m[3]}.merge(editor)) + end + rescue + # Use default + end + + if @user.status == "active" + session[:referer] = referer + successful_login(@user) + else + session[:token] = @user.tokens.create.token + Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver + redirect_to :action => 'confirm', :display_name => @user.display_name + end + else + render :action => 'new', :referer => params[:referer] + end end end end @@ -222,6 +199,8 @@ def reset_password flash[:error] = t 'user.reset_password.flash token bad' redirect_to :action => 'lost_password' end + else + render :text => "", :status => :bad_request end end @@ -229,7 +208,23 @@ def new @title = t 'user.new.title' @referer = params[:referer] || session[:referer] - if @user + if using_open_id? + # The redirect from the OpenID provider reenters here + # again and we need to pass the parameters through to + # the open_id_authentication function + @user = session.delete(:new_user) + + openid_verify(nil, @user) do |user, verified_email| + user.status = "active" if user.email == verified_email + end + + if @user.openid_url.nil? or @user.invalid? + render :action => 'new' + else + session[:new_user] = @user + redirect_to :action => 'terms' + end + elsif @user # The user is logged in already, so don't show them the signup # page, instead send them to the home page if @referer @@ -244,8 +239,38 @@ def new :openid_url => params[:openid]) flash.now[:notice] = t 'user.new.openid association' - elsif Acl.no_account_creation(request.remote_ip) - render :action => 'blocked' + else + check_signup_allowed + end + end + + def create + @user = User.new(user_params) + + if check_signup_allowed(@user.email) + session[:referer] = params[:referer] + + @user.status = "pending" + + if @user.openid_url.present? && @user.pass_crypt.empty? + # We are creating an account with OpenID and no password + # was specified so create a random one + @user.pass_crypt = SecureRandom.base64(16) + @user.pass_crypt_confirmation = @user.pass_crypt + end + + if @user.invalid? + # Something is wrong with a new user, so rerender the form + render :action => "new" + elsif @user.openid_url.present? + # Verify OpenID before moving on + session[:new_user] = @user + openid_verify(@user.openid_url, @user) + else + # Save the user record + session[:new_user] = @user + redirect_to :action => :terms + end end end @@ -259,10 +284,6 @@ def login else password_authentication(params[:username], params[:password]) end - elsif params[:notice] - flash.now[:notice] = t "user.login.notice_#{params[:notice]}" - elsif flash[:notice].nil? - flash.now[:notice] = t 'user.login.notice' end end @@ -289,55 +310,43 @@ def logout def confirm if request.post? - if token = UserToken.find_by_token(params[:confirm_string]) - if token.user.active? - flash[:error] = t('user.confirm.already active') - redirect_to :action => 'login' - else - user = token.user - user.status = "active" - user.email_valid = true - user.save! - referer = token.referer - token.destroy - - if session[:token] - token = UserToken.find_by_token(session[:token]) - session.delete(:token) - else - token = nil - end - - if token.nil? or token.user != user - flash[:notice] = t('user.confirm.success') - redirect_to :action => :login, :referer => referer - else - token.destroy - - session[:user] = user.id - cookies.permanent["_osm_username"] = user.display_name - - if referer.nil? - flash[:notice] = t('user.confirm.success') + "

" + t('user.confirm.before you start') - redirect_to :action => :account, :display_name => user.display_name - else - flash[:notice] = t('user.confirm.success') - redirect_to referer - end - end - end + token = UserToken.find_by_token(params[:confirm_string]) + if token && token.user.active? + flash[:error] = t('user.confirm.already active') + redirect_to :action => 'login' + elsif !token || token.expired? + flash[:error] = t('user.confirm.unknown token') + redirect_to :action => 'confirm' else - user = User.find_by_display_name(params[:display_name]) + user = token.user + user.status = "active" + user.email_valid = true + user.save! + referer = token.referer + token.destroy - if user and user.active? - flash[:error] = t('user.confirm.already active') - elsif user - flash[:error] = t('user.confirm.unknown token') + t('user.confirm.reconfirm', :reconfirm => url_for(:action => 'confirm_resend', :display_name => params[:display_name])) + if session[:token] + token = UserToken.find_by_token(session[:token]) + session.delete(:token) else - flash[:error] = t('user.confirm.unknown token') + token = nil end - redirect_to :action => 'login' + if token.nil? or token.user != user + flash[:notice] = t('user.confirm.success') + redirect_to :action => :login, :referer => referer + else + token.destroy + + session[:user] = user.id + + redirect_to referer || welcome_path + end + end + else + user = User.find_by_display_name(params[:display_name]) + if !user || user.active? + redirect_to root_path end end end @@ -368,7 +377,6 @@ def confirm_email end token.destroy session[:user] = @user.id - cookies.permanent["_osm_username"] = @user.display_name redirect_to :action => 'account', :display_name => @user.display_name else flash[:error] = t 'user.confirm_email.failure' @@ -377,6 +385,15 @@ def confirm_email end end + def api_read + render :text => "", :status => :gone unless @this_user.visible? + end + + def api_details + @this_user = @user + render :action => :api_read + end + def api_gpx_files doc = OSM::API.new.get_xml_doc @user.traces.each do |trace| @@ -397,47 +414,55 @@ def view end def make_friend - if params[:display_name] - name = params[:display_name] - new_friend = User.active.where(:display_name => name).first - friend = Friend.new - friend.user_id = @user.id - friend.friend_user_id = new_friend.id - unless @user.is_friends_with?(new_friend) - if friend.save - flash[:notice] = t 'user.make_friend.success', :name => name - Notifier.friend_notification(friend).deliver + @new_friend = User.find_by_display_name(params[:display_name]) + + if @new_friend + if request.post? + friend = Friend.new + friend.user_id = @user.id + friend.friend_user_id = @new_friend.id + unless @user.is_friends_with?(@new_friend) + if friend.save + flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name + Notifier.friend_notification(friend).deliver + else + friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name)) + end else - friend.add_error(t('user.make_friend.failed', :name => name)) + flash[:warning] = t 'user.make_friend.already_a_friend', :name => @new_friend.display_name end - else - flash[:warning] = t 'user.make_friend.already_a_friend', :name => name - end - if params[:referer] - redirect_to params[:referer] - else - redirect_to :controller => 'user', :action => 'view' + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'user', :action => 'view' + end end + else + render_unknown_user params[:display_name] end end def remove_friend - if params[:display_name] - name = params[:display_name] - friend = User.active.where(:display_name => name).first - if @user.is_friends_with?(friend) - Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}" - flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name - else - flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name - end + @friend = User.find_by_display_name(params[:display_name]) - if params[:referer] - redirect_to params[:referer] - else - redirect_to :controller => 'user', :action => 'view' + if @friend + if request.post? + if @user.is_friends_with?(@friend) + Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{@friend.id}" + flash[:notice] = t 'user.remove_friend.success', :name => @friend.display_name + else + flash[:error] = t 'user.remove_friend.not_a_friend', :name => @friend.display_name + end + + if params[:referer] + redirect_to params[:referer] + else + redirect_to :controller => 'user', :action => 'view' + end end + else + render_unknown_user params[:display_name] end end @@ -486,7 +511,7 @@ def password_authentication(username, password) if user = User.authenticate(:username => username, :password => password) successful_login(user) elsif user = User.authenticate(:username => username, :password => password, :pending => true) - failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name)) + unconfirmed_login(user) elsif User.authenticate(:username => username, :password => password, :suspended => true) failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org") else @@ -517,7 +542,7 @@ def openid_authentication(openid_url) if user = User.find_by_openid_url(identity_url) case user.status when "pending" then - failed_login t('user.login.account not active') + unconfirmed_login(user) when "active", "confirmed" then successful_login(user) when "suspended" then @@ -534,8 +559,9 @@ def openid_authentication(openid_url) # to the create account page with username and email filled # in if they have been given by the OpenID provider through # the simple registration protocol. - nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"] - email = sreg["email"] || ax["http://axschema.org/contact/email"] + nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first + email = sreg["email"] || ax["http://axschema.org/contact/email"].first + redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url end elsif result.missing? @@ -553,8 +579,18 @@ def openid_authentication(openid_url) def openid_verify(openid_url, user) user.openid_url = openid_url - authenticate_with_open_id(openid_expand_url(openid_url), :method => :get) do |result, identity_url| + authenticate_with_open_id(openid_expand_url(openid_url), :method => :get, :required => [:email, "http://axschema.org/contact/email"]) do |result, identity_url, sreg, ax| if result.successful? + # Do we trust the emails this provider returns? + if openid_email_verified(identity_url) + # Guard against not getting any extension data + sreg = Hash.new if sreg.nil? + ax = Hash.new if ax.nil? + + # Get the verified email + verified_email = sreg["email"] || ax["http://axschema.org/contact/email"].first + end + # We need to use the openid url passed back from the OpenID provider # rather than the one supplied by the user, as these can be different. # @@ -562,7 +598,7 @@ def openid_verify(openid_url, user) # than a user specific url. Only once it comes back from the provider # provider do we know the unique address for the user. user.openid_url = identity_url - yield user + yield user, verified_email elsif result.missing? flash.now[:error] = t 'user.login.openid missing provider' elsif result.invalid? @@ -588,13 +624,19 @@ def openid_expand_url(openid_url) else return openid_url end - end + end + + ## + # check if we trust an OpenID provider to return a verified + # email, so that we can skpi verifying it ourselves + def openid_email_verified(openid_url) + openid_url.match(/https:\/\/www.google.com\/accounts\/o8\/id?(.*)/) or + openid_url.match(/https:\/\/me.yahoo.com\/(.*)/) + end ## # process a successful login def successful_login(user) - cookies.permanent["_osm_username"] = user.display_name - session[:user] = user.id session_expires_after 28.days if session[:remember_me] @@ -629,6 +671,15 @@ def failed_login(message) session.delete(:referer) end + ## + # + def unconfirmed_login(user) + redirect_to :action => 'confirm', :display_name => user.display_name + + session.delete(:remember_me) + session.delete(:referer) + end + ## # update a user's details def update_user(user, params) @@ -648,8 +699,15 @@ def update_user(user, params) user.languages = params[:user][:languages].split(",") case params[:image_action] - when "new" then user.image = params[:user][:image] - when "delete" then user.image = nil + when "new" then + user.image = params[:user][:image] + user.image_use_gravatar = false + when "delete" then + user.image = nil + user.image_use_gravatar = false + when "gravatar" then + user.image = nil + user.image_use_gravatar = true end user.home_lat = params[:user][:home_lat] @@ -666,9 +724,7 @@ def update_user(user, params) if user.save set_locale - cookies.permanent["_osm_username"] = user.display_name - - if user.new_email.blank? + if user.new_email.blank? or user.new_email == user.email flash.now[:notice] = t 'user.account.flash update success' else user.email = user.new_email @@ -708,35 +764,58 @@ def require_administrator end end + ## + # require that the user in the URL is the logged in user + def require_self + if params[:display_name] != @user.display_name + render :text => "", :status => :forbidden + end + end + ## # ensure that there is a "this_user" instance variable - def lookup_this_user - @this_user = User.find_by_display_name(params[:display_name]) - rescue ActiveRecord::RecordNotFound - redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user + def lookup_user_by_id + @this_user = User.find(params[:id]) end ## - # Choose the layout to use. See - # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts - def choose_layout - oauth_url = url_for(:controller => :oauth, :action => :authorize, :only_path => true) - - if [ 'api_details' ].include? action_name - nil - elsif params[:referer] and URI.parse(params[:referer]).path == oauth_url - 'slim' - else - 'site' - end + # ensure that there is a "this_user" instance variable + def lookup_user_by_name + @this_user = User.find_by_display_name(params[:display_name]) + rescue ActiveRecord::RecordNotFound + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user end ## # def disable_terms_redirect - # this is necessary otherwise going to the user terms page, when + # this is necessary otherwise going to the user terms page, when # having not agreed already would cause an infinite redirect loop. # it's .now so that this doesn't propagate to other pages. flash.now[:skip_terms] = true end + + ## + # return permitted user parameters + def user_params + params.require(:user).permit(:email, :email_confirmation, :display_name, :openid_url, :pass_crypt, :pass_crypt_confirmation) + end + + ## + # check signup acls + def check_signup_allowed(email = nil) + if email.nil? + domain = nil + else + domain = email.split("@").last + end + + if blocked = Acl.no_account_creation(request.remote_ip, domain) + logger.info "Blocked signup from #{request.remote_ip} for #{email}" + + render :action => 'blocked' + end + + not blocked + end end diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb index 377e78313ef..059f00bbe38 100644 --- a/app/controllers/user_preference_controller.rb +++ b/app/controllers/user_preference_controller.rb @@ -4,40 +4,10 @@ class UserPreferenceController < ApplicationController before_filter :authorize before_filter :require_allow_read_prefs, :only => [:read_one, :read] before_filter :require_allow_write_prefs, :except => [:read_one, :read] + around_filter :api_call_handle_error - def read_one - pref = UserPreference.find(@user.id, params[:preference_key]) - - render :text => pref.v.to_s - rescue ActiveRecord::RecordNotFound => ex - render :text => 'OH NOES! PREF NOT FOUND!', :status => :not_found - end - - def update_one - begin - pref = UserPreference.find(@user.id, params[:preference_key]) - pref.v = request.raw_post.chomp - pref.save - rescue ActiveRecord::RecordNotFound - pref = UserPreference.new - pref.user = @user - pref.k = params[:preference_key] - pref.v = request.raw_post.chomp - pref.save - end - - render :nothing => true - end - - def delete_one - UserPreference.delete(@user.id, params[:preference_key]) - - render :nothing => true - rescue ActiveRecord::RecordNotFound => ex - render :text => "param: #{params[:preference_key]} not found", :status => :not_found - end - - # print out all the preferences as a big xml block + ## + # return all the preferences as an XML document def read doc = OSM::API.new.get_xml_doc @@ -53,48 +23,70 @@ def read render :text => doc.to_s, :content_type => "text/xml" end + ## + # return the value for a single preference + def read_one + pref = UserPreference.find(@user.id, params[:preference_key]) + + render :text => pref.v.to_s, :content_type => "text/plain" + end + # update the entire set of preferences def update - begin - p = XML::Parser.string(request.raw_post) - rescue LibXML::XML::Error, ArgumentError => ex - raise OSM::APIBadXMLError.new("preferences", xml, ex.message) + old_preferences = @user.preferences.reduce({}) do |preferences,preference| + preferences[preference.k] = preference + preferences end - doc = p.parse - prefs = [] + new_preferences = {} - keyhash = {} + doc = XML::Parser.string(request.raw_post).parse doc.find('//preferences/preference').each do |pt| - pref = UserPreference.new - - unless keyhash[pt['k']].nil? # already have that key - render :text => 'OH NOES! CAN HAS UNIQUE KEYS?', :status => :not_acceptable + if preference = old_preferences.delete(pt["k"]) + preference.v = pt["v"] + elsif new_preferences.include?(pt["k"]) + raise OSM::APIDuplicatePreferenceError.new(pt["k"]) + else + preference = @user.preferences.build(:k => pt["k"], :v => pt["v"]) end - keyhash[pt['k']] = 1 + new_preferences[preference.k] = preference + end - pref.k = pt['k'] - pref.v = pt['v'] - pref.user_id = @user.id - prefs << pref + old_preferences.each_value do |preference| + preference.delete end - if prefs.size > 150 - render :text => 'Too many preferences', :status => :request_entity_too_large + new_preferences.each_value do |preference| + preference.save! end - # kill the existing ones - UserPreference.delete_all(['user_id = ?', @user.id]) + render :text => "", :content_type => "text/plain" + end - # save the new ones - prefs.each do |pref| - pref.save! + ## + # update the value of a single preference + def update_one + begin + pref = UserPreference.find(@user.id, params[:preference_key]) + rescue ActiveRecord::RecordNotFound + pref = UserPreference.new + pref.user = @user + pref.k = params[:preference_key] end - render :nothing => true - rescue Exception => ex - render :text => 'OH NOES! FAIL!: ' + ex.to_s, :status => :internal_server_error + pref.v = request.raw_post.chomp + pref.save! + + render :text => "", :content_type => "text/plain" + end + + ## + # delete a single preference + def delete_one + UserPreference.find(@user.id, params[:preference_key]).delete + + render :text => "", :content_type => "text/plain" end end diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index 7dad891e219..8f623a04dff 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -10,9 +10,7 @@ class UserRolesController < ApplicationController before_filter :in_role, :only => [:revoke] def grant - @this_user.roles.create({ - :role => @role, :granter_id => @user.id - }, :without_protection => true) + @this_user.roles.create(:role => @role, :granter_id => @user.id) redirect_to :controller => 'user', :action => 'view', :display_name => @this_user.display_name end diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index c3ffe3c0f45..2ce49b7e84f 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -19,7 +19,7 @@ def create way.create_with_history @user render :text => way.id.to_s, :content_type => "text/plain" else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end end @@ -43,7 +43,7 @@ def update way.update_from(new_way, @user) render :text => way.version.to_s, :content_type => "text/plain" else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end end @@ -56,7 +56,7 @@ def delete way.delete_with_history!(new_way, @user) render :text => way.version.to_s, :content_type => "text/plain" else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end end @@ -64,6 +64,7 @@ def full way = Way.includes(:nodes => :node_tags).find(params[:id]) if way.visible + visible_nodes = {} changeset_cache = {} user_display_name_cache = {} @@ -71,9 +72,10 @@ def full way.nodes.uniq.each do |node| if node.visible doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) + visible_nodes[node.id] = node end end - doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache) + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) render :text => doc.to_s, :content_type => "text/xml" else @@ -82,23 +84,23 @@ def full end def ways - begin - ids = params['ways'].split(',').collect { |w| w.to_i } - rescue - ids = [] + if not params['ways'] + raise OSM::APIBadUserInput.new("The parameter ways is required, and must be of the form ways=id[,id[,id...]]") end - if ids.length > 0 - doc = OSM::API.new.get_xml_doc + ids = params['ways'].split(',').collect { |w| w.to_i } - Way.find(ids).each do |way| - doc.root << way.to_xml_node - end + if ids.length == 0 + raise OSM::APIBadUserInput.new("No ways were given to search for") + end - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :bad_request + doc = OSM::API.new.get_xml_doc + + Way.find(ids).each do |way| + doc.root << way.to_xml_node end + + render :text => doc.to_s, :content_type => "text/xml" end ## diff --git a/app/controllers/way_node_controller.rb b/app/controllers/way_node_controller.rb deleted file mode 100644 index 41549ed8f27..00000000000 --- a/app/controllers/way_node_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class WayNodeController < ApplicationController - - - -end diff --git a/app/helpers/amf_helper.rb b/app/helpers/amf_helper.rb deleted file mode 100644 index 5735422c218..00000000000 --- a/app/helpers/amf_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module AmfHelper -end diff --git a/app/helpers/api_helper.rb b/app/helpers/api_helper.rb deleted file mode 100644 index 1f82fcf9b44..00000000000 --- a/app/helpers/api_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApiHelper -end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 37dcf90e09d..5266bf633ec 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -9,42 +9,24 @@ def linkify(text) end end - def html_escape_unicode(text) - chars = ActiveSupport::Multibyte::Unicode.u_unpack(text).map do |c| - c < 127 ? c.chr : "&##{c.to_s};" - end - - return chars.join("") - end - def rss_link_to(*args) - return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); + return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); end def atom_link_to(*args) - return link_to(image_tag("RSS.gif", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); - end - - def javascript_strings - js = "" - - js << "\n" - - return raw(js) + return link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], { :class => "rsssmall" }); end def style_rules css = "" - css << ".hidden { display: none }"; - css << ".hide_unless_logged_in { display: none }" unless @user; - css << ".hide_if_logged_in { display: none }" if @user; - css << ".hide_if_user_#{@user.id} { display: none }" if @user; - css << ".show_if_user_#{@user.id} { display: inline }" if @user; - css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?; + css << ".hidden { display: none !important }" + css << ".hide_unless_logged_in { display: none !important }" unless @user + css << ".hide_if_logged_in { display: none !important }" if @user + css << ".hide_if_user_#{@user.id} { display: none !important }" if @user + css << ".show_if_user_#{@user.id} { display: inline !important }" if @user + css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator? + css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator? return content_tag(:style, css, :type => "text/css") end @@ -75,52 +57,6 @@ def if_administrator(tag = :div, &block) content_tag(tag, capture(&block), :class => "hide_unless_administrator") end - def describe_location(lat, lon, zoom = nil, language = nil) - zoom = zoom || 14 - language = language || request.user_preferred_languages.join(',') - url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" - - begin - response = OSM::Timer.timeout(4) do - REXML::Document.new(Net::HTTP.get(URI.parse(url))) - end - rescue Exception - response = nil - end - - if response and result = response.get_text("reversegeocode/result") - result.to_s - else - "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" - end - end - - def user_image(user, options = {}) - options[:class] ||= "user_image" - - image_tag user.image.url(:large), options - end - - def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" - - image_tag user.image.url(:small), options - end - - def preferred_editor - if params[:editor] - params[:editor] - elsif @user and @user.preferred_editor - @user.preferred_editor - else - DEFAULT_EDITOR - end - end - - def scale_to_zoom(scale) - Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0) - end - def richtext_area(object_name, method, options = {}) id = "#{object_name.to_s}_#{method.to_s}" format = options.delete(:format) || "markdown" @@ -128,31 +64,40 @@ def richtext_area(object_name, method, options = {}) content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format))) - output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview") + output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext") end output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do output_buffer << render("site/#{format}_help") - output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit", :disabled => true) - output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview") + output_buffer << content_tag(:div, :class => "buttons") do + output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true) + output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize") + end end end end -private + def dir + if dir = params[:dir] + dir == "rtl" ? "rtl" : "ltr" + else + I18n.t("html.dir") + end + end - def javascript_strings_for_key(key) - js = "" - value = I18n.t(key, :locale => "en") + def friendly_date(date) + content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly)) + end - if value.is_a?(String) - js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n" + def body_class + if content_for? :body_class + content_for :body_class else - value.each_key do |k| - js << javascript_strings_for_key("#{key}.#{k}") - end + "#{params[:controller]} #{params[:controller]}-#{params[:action]}" end + end - return js + def current_page_class(path) + :current if current_page?(path) end end diff --git a/app/helpers/asset_helper.rb b/app/helpers/asset_helper.rb new file mode 100644 index 00000000000..67c1a141d7d --- /dev/null +++ b/app/helpers/asset_helper.rb @@ -0,0 +1,11 @@ +module AssetHelper + def assets(directory) + assets = {} + + Rails.application.assets.index.each_logical_path("#{directory}/*") do |path| + assets[path.sub(/^#{directory}\//, "")] = asset_path(path) + end + + assets + end +end diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index ffc638cdf49..b192a63d558 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -1,8 +1,4 @@ module BrowseHelper - def link_to_page(page, page_param) - return link_to(page, page_param => page) - end - def printable_name(object, version=false) if object.id.is_a?(Array) id = object.id[0] @@ -14,7 +10,7 @@ def printable_name(object, version=false) name = t 'printable_name.with_version', :id => name, :version => object.version.to_s end - # don't look at object tags if redacted, so as to avoid giving + # don't look at object tags if redacted, so as to avoid giving # away redacted version tag information. unless object.redacted? if object.tags.include? "name:#{I18n.locale}" @@ -28,11 +24,16 @@ def printable_name(object, version=false) end def link_class(type, object) + classes = [ type ] + if object.redacted? - type + " deleted" + classes << "deleted" else - type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') + classes += icon_tags(object).flatten.map { |t| h(t) } + classes << "deleted" unless object.visible? end + + classes.join(" ") end def link_title(object) @@ -61,9 +62,21 @@ def format_value(key, value) end end + def type_and_paginated_count(type, pages) + if pages.page_count == 1 + t "browse.changeset.#{type}", + :count => pages.item_count + else + t "browse.changeset.#{type}_paginated", + :x => pages.current_page.first_item, + :y => pages.current_page.last_item, + :count => pages.item_count + end + end + private - ICON_TAGS = [ + ICON_TAGS = [ "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse", "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway" ] @@ -97,25 +110,34 @@ def wikipedia_link(key, value) if key == "wikipedia" # This regex should match Wikipedia language codes, everything # from de to zh-classical - if value =~ /^([a-z-]{2,12}):(.+)$/ + if value =~ /^([a-z-]{2,12}):(.+)$/i # Value is : so split it up + # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315 lang = $1 - value = $2 else # Value is <title> so default to English Wikipedia lang = 'en' end elsif key =~ /^wikipedia:(\S+)$/ - # Language is in the key, so assume value is a simple title + # Language is in the key, so assume value is the title lang = $1 else # Not a wikipedia key! return nil end + if value =~ /^([^#]*)(#.*)/ then + # Contains a reference to a section of the wikipedia article + # Must break it up to correctly build the url + value = $1 + section = $2 + else + section = "" + end + return { - :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}", - :title => value + :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}", + :title => value + section } end end diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb new file mode 100644 index 00000000000..cae1335c4c1 --- /dev/null +++ b/app/helpers/changeset_helper.rb @@ -0,0 +1,32 @@ +module ChangesetHelper + def changeset_user_link(changeset) + if changeset.user.data_public? + link_to(changeset.user.display_name, user_path(changeset.user.display_name)) + else + t('browse.anonymous') + end + end + + def changeset_details(changeset) + if changeset.closed_at > DateTime.now + action = :created + time = distance_of_time_in_words_to_now(changeset.created_at) + title = l(changeset.created_at) + else + action = :closed + time = distance_of_time_in_words_to_now(changeset.closed_at) + title = "#{t('browse.created')}: #{l(changeset.created_at)} #{t('browse.closed')}: #{l(changeset.closed_at)}".html_safe + end + + if params.key?(:display_name) + t "browse.#{action}_html", + :time => time, + :title => title + else + t "browse.#{action}_by_html", + :time => time, + :title => title, + :user => changeset_user_link(changeset) + end + end +end diff --git a/app/helpers/diary_entry_helper.rb b/app/helpers/diary_entry_helper.rb deleted file mode 100644 index bf6af03da8a..00000000000 --- a/app/helpers/diary_entry_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module DiaryEntryHelper -end diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb deleted file mode 100644 index 34acf5f1a7b..00000000000 --- a/app/helpers/export_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ExportHelper -end diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb index 4c58d54dde5..04f437a7c47 100644 --- a/app/helpers/geocoder_helper.rb +++ b/app/helpers/geocoder_helper.rb @@ -2,10 +2,12 @@ module GeocoderHelper def result_to_html(result) html_options = { :class => "set_position", :data => {} } - if result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat] - url = "?minlon=#{result[:min_lon]}&minlat=#{result[:min_lat]}&maxlon=#{result[:max_lon]}&maxlat=#{result[:max_lat]}" + if result[:type] and result[:id] + url = url_for(:controller => :browse, :action => result[:type], :id => result[:id]) + elsif result[:min_lon] and result[:min_lat] and result[:max_lon] and result[:max_lat] + url = "/?bbox=#{result[:min_lon]},#{result[:min_lat]},#{result[:max_lon]},#{result[:max_lat]}" else - url = "?mlat=#{result[:lat]}&mlon=#{result[:lon]}&zoom=#{result[:zoom]}" + url = "/#map=#{result[:zoom]}/#{result[:lat]}/#{result[:lon]}" end result.each do |key,value| @@ -17,7 +19,10 @@ def result_to_html(result) html << " " if result[:prefix] and result[:name] html << link_to(result[:name], url, html_options) if result[:name] html << result[:suffix] if result[:suffix] + html.html_safe + end - return raw(html) + def describe_location(lat, lon, zoom = nil, language = nil) + Nominatim.describe_location(lat, lon, zoom, language) end end diff --git a/app/helpers/node_helper.rb b/app/helpers/node_helper.rb deleted file mode 100644 index ff049b0fc29..00000000000 --- a/app/helpers/node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module NodeHelper -end diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb new file mode 100644 index 00000000000..e0eef269b4f --- /dev/null +++ b/app/helpers/note_helper.rb @@ -0,0 +1,25 @@ +module NoteHelper + def note_event(event, at, by) + if by.nil? + I18n.t("browse.note." + event + "_by_anonymous", + :when => friendly_date(at), + :exact_time => l(at) + ).html_safe + else + I18n.t("browse.note." + event + "_by", + :when => friendly_date(at), + :exact_time => l(at), + :user => note_author(by) + ).html_safe + end + end + + def note_author(author, link_options = {}) + if author.nil? + "" + else + link_to h(author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => author.display_name}) + end + end + +end diff --git a/app/helpers/notifier_helper.rb b/app/helpers/notifier_helper.rb new file mode 100644 index 00000000000..4b2cd2a06d9 --- /dev/null +++ b/app/helpers/notifier_helper.rb @@ -0,0 +1,5 @@ +module NotifierHelper + def fp(text) + format_paragraph(text, 72, 0) + end +end diff --git a/app/helpers/oauth_clients_helper.rb b/app/helpers/oauth_clients_helper.rb deleted file mode 100644 index 3b909aaf3bb..00000000000 --- a/app/helpers/oauth_clients_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OauthClientsHelper -end \ No newline at end of file diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb deleted file mode 100644 index 010cf9f5aee..00000000000 --- a/app/helpers/oauth_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OauthHelper -end diff --git a/app/helpers/old_node_helper.rb b/app/helpers/old_node_helper.rb deleted file mode 100644 index c39bc621f92..00000000000 --- a/app/helpers/old_node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldNodeHelper -end diff --git a/app/helpers/old_way_helper.rb b/app/helpers/old_way_helper.rb deleted file mode 100644 index d7982a66145..00000000000 --- a/app/helpers/old_way_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldWayHelper -end diff --git a/app/helpers/old_way_node_helper.rb b/app/helpers/old_way_node_helper.rb deleted file mode 100644 index 933d6613f5e..00000000000 --- a/app/helpers/old_way_node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldWayNodeHelper -end diff --git a/app/helpers/old_way_tag_helper.rb b/app/helpers/old_way_tag_helper.rb deleted file mode 100644 index c23661b8ab3..00000000000 --- a/app/helpers/old_way_tag_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module OldWayTagHelper -end diff --git a/app/helpers/site_helper.rb b/app/helpers/site_helper.rb deleted file mode 100644 index c8794867379..00000000000 --- a/app/helpers/site_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SiteHelper -end diff --git a/app/helpers/swf_helper.rb b/app/helpers/swf_helper.rb deleted file mode 100644 index cf2a311dc5e..00000000000 --- a/app/helpers/swf_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SwfHelper -end diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb new file mode 100644 index 00000000000..da4ad8967e3 --- /dev/null +++ b/app/helpers/title_helper.rb @@ -0,0 +1,6 @@ +module TitleHelper + def set_title(title = false) + response.headers["X-Page-Title"] = t('layouts.project_name.title') + (title ? ' | ' + title : '') + @title = title + end +end diff --git a/app/helpers/trace_points_helper.rb b/app/helpers/trace_points_helper.rb deleted file mode 100644 index 0252b91fead..00000000000 --- a/app/helpers/trace_points_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TracePointsHelper -end diff --git a/app/helpers/tracepoint_helper.rb b/app/helpers/tracepoint_helper.rb deleted file mode 100644 index 8a5a031a904..00000000000 --- a/app/helpers/tracepoint_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TracepointHelper -end diff --git a/app/helpers/tracetag_helper.rb b/app/helpers/tracetag_helper.rb deleted file mode 100644 index c1479e1243c..00000000000 --- a/app/helpers/tracetag_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module TracetagHelper -end diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index acaecff48fd..ba37a13341a 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -1,4 +1,49 @@ module UserHelper + # User images + + def user_image(user, options = {}) + options[:class] ||= "user_image" + options[:alt] ||= "" + + if user.image_use_gravatar + user_gravatar_tag(user, options) + else + image_tag user.image.url(:large), options + end + end + + def user_thumbnail(user, options = {}) + options[:class] ||= "user_thumbnail" + options[:alt] ||= "" + + if user.image_use_gravatar + user_gravatar_tag(user, options) + else + image_tag user.image.url(:small), options + end + end + + def user_thumbnail_tiny(user, options = {}) + options[:class] ||= "user_thumbnail_tiny" + options[:alt] ||= "" + + if user.image_use_gravatar + user_gravatar_tag(user, options) + else + image_tag user.image.url(:small), options + end + end + + def user_image_url(user, options = {}) + if user.image_use_gravatar + user_gravatar_url(user, options) + else + image_url(user.image.url) + end + end + + # OpenID support + def openid_logo image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo" end @@ -11,4 +56,20 @@ def openid_button(name, url) :title => t("user.login.openid_providers.#{name}.title") ) end + + # Gravatar support + + # See http://en.gravatar.com/site/implement/images/ for details. + def user_gravatar_url(user, options = {}) + size = options[:size] || 100 + hash = Digest::MD5::hexdigest(user.email.downcase) + default_image_url = image_url("users/images/large.png") + url = "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}" + end + + def user_gravatar_tag(user, options = {}) + url = user_gravatar_url(user, options) + options.delete(:size) + image_tag url, options + end end diff --git a/app/helpers/user_preference_helper.rb b/app/helpers/user_preference_helper.rb deleted file mode 100644 index bd7e11bdd5a..00000000000 --- a/app/helpers/user_preference_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module UserPreferenceHelper -end diff --git a/app/helpers/way_helper.rb b/app/helpers/way_helper.rb deleted file mode 100644 index e597a980b73..00000000000 --- a/app/helpers/way_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module WayHelper -end diff --git a/app/helpers/way_node_helper.rb b/app/helpers/way_node_helper.rb deleted file mode 100644 index 884dbccb845..00000000000 --- a/app/helpers/way_node_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module WayNodeHelper -end diff --git a/app/helpers/way_tag_helper.rb b/app/helpers/way_tag_helper.rb deleted file mode 100644 index 66a53ff3442..00000000000 --- a/app/helpers/way_tag_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module WayTagHelper -end diff --git a/app/models/access_token.rb b/app/models/access_token.rb index a1888343a0e..3aa6f9daf7f 100644 --- a/app/models/access_token.rb +++ b/app/models/access_token.rb @@ -2,7 +2,7 @@ class AccessToken < OauthToken belongs_to :user belongs_to :client_application - scope :valid, where(:invalidated_at => nil) + scope :valid, -> { where(:invalidated_at => nil) } validates_presence_of :user, :secret diff --git a/app/models/changeset.rb b/app/models/changeset.rb index b76d0c5a7e1..adb41b204ea 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -1,7 +1,7 @@ class Changeset < ActiveRecord::Base require 'xml/libxml' - belongs_to :user + belongs_to :user, :counter_cache => true has_many :changeset_tags diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 9a074fb30b2..ff031d62b7f 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -13,11 +13,6 @@ class ClientApplication < ActiveRecord::Base validates_format_of :support_url, :with => /\Ahttp(s?):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true validates_format_of :callback_url, :with => /\A[a-z][a-z0-9.+-]*:\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, :allow_blank=>true - attr_accessible :name, :url, :support_url, :callback_url, - :allow_read_prefs, :allow_write_prefs, - :allow_write_diary, :allow_write_api, - :allow_read_gpx, :allow_write_gpx - before_validation :generate_keys, :on => :create attr_accessor :token_callback_url @@ -59,7 +54,7 @@ def create_request_token(params={}) permissions.each do |p| params[p] = true end - RequestToken.create(params, :without_protection => true) + RequestToken.create(params) end def access_token_for_user(user) @@ -70,7 +65,7 @@ def access_token_for_user(user) params[p] = true end - token = access_tokens.create(params, :without_protection => true) + token = access_tokens.create(params) end token @@ -87,7 +82,8 @@ def permissions # have to say up-front what permissions they want and when users sign up they # can agree or not agree to each of them. PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary, - :allow_write_api, :allow_read_gpx, :allow_write_gpx ] + :allow_write_api, :allow_read_gpx, :allow_write_gpx, + :allow_write_notes] def generate_keys self.key = OAuth::Helper.generate_key(40)[0,40] diff --git a/app/models/country.rb b/app/models/country.rb deleted file mode 100644 index b7cec2b683c..00000000000 --- a/app/models/country.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Country < ActiveRecord::Base -end diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb index 075d288edb8..9d29f52b78e 100644 --- a/app/models/diary_comment.rb +++ b/app/models/diary_comment.rb @@ -5,9 +5,8 @@ class DiaryComment < ActiveRecord::Base validates_presence_of :body validates_associated :diary_entry - attr_accessible :body - after_initialize :set_defaults + after_save :spam_check def body RichText.new(read_attribute(:body_format), read_attribute(:body)) @@ -27,4 +26,8 @@ def digest def set_defaults self.body_format = "markdown" unless self.attribute_present?(:body_format) end + + def spam_check + user.spam_check + end end diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb index 64a412d28c7..58f8710f95d 100644 --- a/app/models/diary_entry.rb +++ b/app/models/diary_entry.rb @@ -1,19 +1,11 @@ class DiaryEntry < ActiveRecord::Base - belongs_to :user + belongs_to :user, :counter_cache => true belongs_to :language, :foreign_key => 'language_code' - - has_many :comments, :class_name => "DiaryComment", - :include => :user, - :order => "diary_comments.id" - has_many :visible_comments, :class_name => "DiaryComment", - :include => :user, - :conditions => { - :users => { :status => ["active", "confirmed" ] }, - :visible => true - }, - :order => "diary_comments.id" - - scope :visible, where(:visible => true) + + has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment" + has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => ["active", "confirmed"] }).order(:id) }, :class_name => "DiaryComment" + + scope :visible, -> { where(:visible => true) } validates_presence_of :title, :body validates_length_of :title, :within => 1..255 @@ -24,9 +16,8 @@ class DiaryEntry < ActiveRecord::Base :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180 validates_associated :language - attr_accessible :title, :body, :language_code, :latitude, :longitude - after_initialize :set_defaults + after_save :spam_check def body RichText.new(read_attribute(:body_format), read_attribute(:body)) @@ -37,4 +28,8 @@ def body def set_defaults self.body_format = "markdown" unless self.attribute_present?(:body_format) end + + def spam_check + user.spam_check + end end diff --git a/app/models/diary_sweeper.rb b/app/models/diary_sweeper.rb deleted file mode 100644 index e7fd0305730..00000000000 --- a/app/models/diary_sweeper.rb +++ /dev/null @@ -1,38 +0,0 @@ -class DiarySweeper < ActionController::Caching::Sweeper - observe DiaryComment, DiaryEntry - - def after_create(record) - expire_cache_for(record) - end - - def after_update(record) - expire_cache_for(record) - end - - def after_destroy(record) - expire_cache_for(record) - end - -private - - def expire_cache_for(record) - case - when record.is_a?(DiaryEntry) then entry = record - when record.is_a?(DiaryComment) then entry = record.diary_entry - end - - expire_action(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id) - - expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => nil) - expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil) - expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => entry.user.display_name) - - expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => nil) - expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => entry.language_code, :display_name => nil) - expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => entry.user.display_name) - - if record.is_a?(DiaryEntry) - expire_fragment(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id, :part => "location") - end - end -end diff --git a/app/models/message.rb b/app/models/message.rb index f897af3c290..b51c59f4359 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -9,8 +9,6 @@ class Message < ActiveRecord::Base validates_inclusion_of :message_read, :in => [ true, false ] validates_as_utf8 :title - attr_accessible :title, :body - after_initialize :set_defaults def self.from_mail(mail, from, to) @@ -26,14 +24,14 @@ def self.from_mail(mail, from, to) body = mail.decoded end - message = Message.new({ + message = Message.new( :sender => from, :recipient => to, :sent_on => mail.date.new_offset(0), :title => mail.subject.sub(/\[OpenStreetMap\] */, ""), :body => body, :body_format => "text" - }, :without_protection => true) + ) end def body diff --git a/app/models/node.rb b/app/models/node.rb index 2f528076eba..09f494b7cc5 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -4,12 +4,13 @@ class Node < ActiveRecord::Base include GeoRecord include ConsistencyValidations include NotRedactable + include ObjectMetadata self.table_name = "current_nodes" belongs_to :changeset - has_many :old_nodes, :order => :version + has_many :old_nodes, -> { order(:version) } has_many :way_nodes has_many :ways, :through => :way_nodes @@ -20,7 +21,7 @@ class Node < ActiveRecord::Base has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :timestamp,:version, :changeset_id @@ -31,38 +32,14 @@ class Node < ActiveRecord::Base validate :validate_position validates_associated :changeset - scope :visible, where(:visible => true) - scope :invisible, where(:visible => false) + scope :visible, -> { where(:visible => true) } + scope :invisible, -> { where(:visible => false) } # Sanity check the latitude and longitude and add an error if it's broken def validate_position errors.add(:base, "Node is not in the world") unless in_world? end - # - # Search for nodes matching tags within bounding_box - # - # Also adheres to limitations such as within max_number_of_nodes - # - def self.search(bounding_box, tags = {}) - # @fixme a bit of a hack to search for only visible nodes - # couldn't think of another to add to tags condition - #conditions_hash = tags.merge({ 'visible' => 1 }) - - # using named placeholders http://www.robbyonrails.com/articles/2005/10/21/using-named-placeholders-in-ruby - #keys = [] - #values = {} - - #conditions_hash.each do |key,value| - # keys << "#{key} = :#{key}" - # values[key.to_sym] = value - #end - #conditions = keys.join(' AND ') - - find_by_area(bounding_box, :conditions => {:visible => true}, - :limit => MAX_NUMBER_OF_NODES+1) - end - # Read in xml as text and return it's Node object representation def self.from_xml(xml, create=false) begin @@ -83,8 +60,8 @@ def self.from_xml_node(pt, create=false) raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt['lat'].nil? raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil? - node.lat = pt['lat'].to_f - node.lon = pt['lon'].to_f + node.lat = OSM.parse_float(pt['lat'], OSM::APIBadXMLError, "node", pt, "lat not a number") + node.lon = OSM.parse_float(pt['lon'], OSM::APIBadXMLError, "node", pt, "lon not a number") raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil? node.changeset_id = pt['changeset'].to_i @@ -199,47 +176,19 @@ def to_xml end def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el1 = XML::Node.new 'node' - el1['id'] = self.id.to_s - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset_id.to_s - - if self.visible? - el1['lat'] = self.lat.to_s - el1['lon'] = self.lon.to_s - end - - if changeset_cache.key?(self.changeset_id) - # use the cache if available - else - changeset_cache[self.changeset_id] = self.changeset.user_id - end + el = XML::Node.new 'node' + el['id'] = self.id.to_s - user_id = changeset_cache[self.changeset_id] + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - if user_display_name_cache.key?(user_id) - # use the cache if available - elsif self.changeset.user.data_public? - user_display_name_cache[user_id] = self.changeset.user.display_name - else - user_display_name_cache[user_id] = nil + if self.visible? + el['lat'] = self.lat.to_s + el['lon'] = self.lon.to_s end - if not user_display_name_cache[user_id].nil? - el1['user'] = user_display_name_cache[user_id] - el1['uid'] = user_id.to_s - end + add_tags_to_xml_node(el, self.node_tags) - self.tags.each do |k,v| - el2 = XML::Node.new('tag') - el2['k'] = k.to_s - el2['v'] = v.to_s - el1 << el2 - end - - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - return el1 + return el end def tags_as_hash @@ -247,13 +196,7 @@ def tags_as_hash end def tags - unless @tags - @tags = {} - self.node_tags.each do |tag| - @tags[tag.k] = tag.v - end - end - @tags + @tags ||= Hash[self.node_tags.collect { |t| [t.k, t.v] }] end def tags=(t) diff --git a/app/models/note.rb b/app/models/note.rb new file mode 100644 index 00000000000..27357e58a86 --- /dev/null +++ b/app/models/note.rb @@ -0,0 +1,64 @@ +class Note < ActiveRecord::Base + include GeoRecord + + has_many :comments, -> { where(:visible => true).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id + + validates_presence_of :id, :on => :update + validates_uniqueness_of :id + validates_numericality_of :latitude, :only_integer => true + validates_numericality_of :longitude, :only_integer => true + validates_presence_of :closed_at if :status == "closed" + validates_inclusion_of :status, :in => ["open", "closed", "hidden"] + validate :validate_position + + scope :visible, -> { where("status != 'hidden'") } + scope :invisible, -> { where("status = 'hidden'") } + + after_initialize :set_defaults + + # Sanity check the latitude and longitude and add an error if it's broken + def validate_position + errors.add(:base, "Note is not in the world") unless in_world? + end + + # Close a note + def close + self.status = "closed" + self.closed_at = Time.now.getutc + self.save + end + + # Reopen a note + def reopen + self.status = "open" + self.closed_at = nil + self.save + end + + # Check if a note is visible + def visible? + status != "hidden" + end + + # Check if a note is closed + def closed? + not closed_at.nil? + end + + # Return the author object, derived from the first comment + def author + self.comments.first.author + end + + # Return the author IP address, derived from the first comment + def author_ip + self.comments.first.author_ip + end + +private + + # Fill in default values for new notes + def set_defaults + self.status = "open" unless self.attribute_present?(:status) + end +end diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb new file mode 100644 index 00000000000..07d43cd741d --- /dev/null +++ b/app/models/note_comment.rb @@ -0,0 +1,17 @@ +class NoteComment < ActiveRecord::Base + belongs_to :note, :foreign_key => :note_id, :touch => true + belongs_to :author, :class_name => "User", :foreign_key => :author_id + + validates_presence_of :id, :on => :update + validates_uniqueness_of :id + validates_presence_of :note_id + validates_associated :note + validates_presence_of :visible + validates_associated :author + validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ] + + # Return the comment text + def body + RichText.new("text", read_attribute(:body)) + end +end diff --git a/app/models/notifier.rb b/app/models/notifier.rb index 343c3db2292..be6679c41b7 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -5,117 +5,161 @@ class Notifier < ActionMailer::Base helper :application def signup_confirm(user, token) - @locale = user.preferred_language_from(I18n.available_locales) - @url = url_for(:host => SERVER_URL, - :controller => "user", :action => "confirm", - :display_name => user.display_name, - :confirm_string => token.token) - - mail :to => user.email, - :subject => I18n.t('notifier.signup_confirm.subject', :locale => @locale) + with_recipient_locale user do + @url = url_for(:host => SERVER_URL, + :controller => "user", :action => "confirm", + :display_name => user.display_name, + :confirm_string => token.token) + + mail :to => user.email, + :subject => I18n.t('notifier.signup_confirm.subject') + end end def email_confirm(user, token) - @locale = user.preferred_language_from(I18n.available_locales) - @address = user.new_email - @url = url_for(:host => SERVER_URL, - :controller => "user", :action => "confirm_email", - :confirm_string => token.token) - - mail :to => user.new_email, - :subject => I18n.t('notifier.email_confirm.subject', :locale => @locale) + with_recipient_locale user do + @address = user.new_email + @url = url_for(:host => SERVER_URL, + :controller => "user", :action => "confirm_email", + :confirm_string => token.token) + + mail :to => user.new_email, + :subject => I18n.t('notifier.email_confirm.subject') + end end def lost_password(user, token) - @locale = user.preferred_language_from(I18n.available_locales) - @url = url_for(:host => SERVER_URL, - :controller => "user", :action => "reset_password", - :token => token.token) + with_recipient_locale user do + @url = url_for(:host => SERVER_URL, + :controller => "user", :action => "reset_password", + :token => token.token) - mail :to => user.email, - :subject => I18n.t('notifier.lost_password.subject', :locale => @locale) + mail :to => user.email, + :subject => I18n.t('notifier.lost_password.subject') + end end def gpx_success(trace, possible_points) - @locale = trace.user.preferred_language_from(I18n.available_locales) - @trace_name = trace.name - @trace_points = trace.size - @trace_description = trace.description - @trace_tags = trace.tags - @possible_points = possible_points - - mail :to => trace.user.email, - :subject => I18n.t('notifier.gpx_notification.success.subject', :locale => @locale) + with_recipient_locale trace.user do + @trace_name = trace.name + @trace_points = trace.size + @trace_description = trace.description + @trace_tags = trace.tags + @possible_points = possible_points + + mail :to => trace.user.email, + :subject => I18n.t('notifier.gpx_notification.success.subject') + end end def gpx_failure(trace, error) - @locale = trace.user.preferred_language_from(I18n.available_locales) - @trace_name = trace.name - @trace_description = trace.description - @trace_tags = trace.tags - @error = error - - mail :to => trace.user.email, - :subject => I18n.t('notifier.gpx_notification.failure.subject', :locale => @locale) + with_recipient_locale trace.user do + @trace_name = trace.name + @trace_description = trace.description + @trace_tags = trace.tags + @error = error + + mail :to => trace.user.email, + :subject => I18n.t('notifier.gpx_notification.failure.subject') + end end - + def message_notification(message) - @locale = message.recipient.preferred_language_from(I18n.available_locales) - @to_user = message.recipient.display_name - @from_user = message.sender.display_name - @text = message.body - @title = message.title - @readurl = url_for(:host => SERVER_URL, - :controller => "message", :action => "read", - :message_id => message.id) - @replyurl = url_for(:host => SERVER_URL, - :controller => "message", :action => "reply", - :message_id => message.id) - - mail :from => from_address(message.sender.display_name, "m", message.id, message.digest), - :to => message.recipient.email, - :subject => I18n.t('notifier.message_notification.subject_header', :subject => message.title, :locale => @locale) + with_recipient_locale message.recipient do + @to_user = message.recipient.display_name + @from_user = message.sender.display_name + @text = message.body + @title = message.title + @readurl = url_for(:host => SERVER_URL, + :controller => "message", :action => "read", + :message_id => message.id) + @replyurl = url_for(:host => SERVER_URL, + :controller => "message", :action => "reply", + :message_id => message.id) + + mail :from => from_address(message.sender.display_name, "m", message.id, message.digest), + :to => message.recipient.email, + :subject => I18n.t('notifier.message_notification.subject_header', :subject => message.title) + end end def diary_comment_notification(comment) - @locale = comment.diary_entry.user.preferred_language_from(I18n.available_locales) - @to_user = comment.diary_entry.user.display_name - @from_user = comment.user.display_name - @text = comment.body - @title = comment.diary_entry.title - @readurl = url_for(:host => SERVER_URL, - :controller => "diary_entry", - :action => "view", - :display_name => comment.diary_entry.user.display_name, - :id => comment.diary_entry.id, - :anchor => "comment#{comment.id}") - @commenturl = url_for(:host => SERVER_URL, - :controller => "diary_entry", - :action => "view", - :display_name => comment.diary_entry.user.display_name, - :id => comment.diary_entry.id, - :anchor => "newcomment") - @replyurl = url_for(:host => SERVER_URL, - :controller => "message", - :action => "new", - :display_name => comment.user.display_name, - :title => "Re: #{comment.diary_entry.title}") - - mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest), - :to => comment.diary_entry.user.email, - :subject => I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name, :locale => @locale) + with_recipient_locale comment.diary_entry.user do + @to_user = comment.diary_entry.user.display_name + @from_user = comment.user.display_name + @text = comment.body + @title = comment.diary_entry.title + @readurl = url_for(:host => SERVER_URL, + :controller => "diary_entry", + :action => "view", + :display_name => comment.diary_entry.user.display_name, + :id => comment.diary_entry.id, + :anchor => "comment#{comment.id}") + @commenturl = url_for(:host => SERVER_URL, + :controller => "diary_entry", + :action => "view", + :display_name => comment.diary_entry.user.display_name, + :id => comment.diary_entry.id, + :anchor => "newcomment") + @replyurl = url_for(:host => SERVER_URL, + :controller => "message", + :action => "new", + :display_name => comment.user.display_name, + :title => "Re: #{comment.diary_entry.title}") + + mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest), + :to => comment.diary_entry.user.email, + :subject => I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name) + end end def friend_notification(friend) - @locale = friend.befriendee.preferred_language_from(I18n.available_locales) - @friend = friend + with_recipient_locale friend.befriendee do + @friend = friend - mail :to => friend.befriendee.email, - :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => @locale) + mail :to => friend.befriendee.email, + :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name) + end + end + + def note_comment_notification(comment, recipient) + with_recipient_locale recipient do + @noteurl = browse_note_url(comment.note, :host => SERVER_URL) + @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale) + @comment = comment.body + @owner = recipient == comment.note.author + @event = comment.event + + if comment.author + @commenter = comment.author.display_name + else + @commenter = I18n.t("notifier.note_comment_notification.anonymous") + end + + if @owner + subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter) + else + subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter) + end + + mail :to => recipient.email, :subject => subject + end end private + def with_recipient_locale(recipient) + old_locale = I18n.locale + + begin + I18n.locale = recipient.preferred_language_from(I18n.available_locales) + + yield + ensure + I18n.locale = old_locale + end + end + def from_address(name, type, id, digest) if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>" diff --git a/app/models/oauth_nonce.rb b/app/models/oauth_nonce.rb index 3ae50d3a4ba..84211e31d35 100644 --- a/app/models/oauth_nonce.rb +++ b/app/models/oauth_nonce.rb @@ -4,8 +4,6 @@ class OauthNonce < ActiveRecord::Base validates_presence_of :nonce, :timestamp validates_uniqueness_of :nonce, :scope => :timestamp - attr_accessible :nonce, :timestamp - # Remembers a nonce and it's associated timestamp. It returns false if it has already been used def self.remember(nonce, timestamp) oauth_nonce = OauthNonce.create(:nonce => nonce, :timestamp => timestamp) diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb index b38fe0ec043..0fe0bea301e 100644 --- a/app/models/oauth_token.rb +++ b/app/models/oauth_token.rb @@ -2,7 +2,7 @@ class OauthToken < ActiveRecord::Base belongs_to :client_application belongs_to :user - scope :authorized, where("authorized_at IS NOT NULL and invalidated_at IS NULL") + scope :authorized, -> { where("authorized_at IS NOT NULL and invalidated_at IS NULL") } validates_uniqueness_of :token validates_presence_of :client_application, :token @@ -14,7 +14,7 @@ def invalidated? end def invalidate! - update_attribute(:invalidated_at, Time.now) + update_attributes(:invalidated_at => Time.now) end def authorized? diff --git a/app/models/old_node.rb b/app/models/old_node.rb index c2ec43c9c04..90304acae4c 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -1,6 +1,7 @@ class OldNode < ActiveRecord::Base include GeoRecord include ConsistencyValidations + include ObjectMetadata self.table_name = "nodes" self.primary_keys = "node_id", "version" @@ -19,6 +20,8 @@ class OldNode < ActiveRecord::Base belongs_to :redaction belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id" + has_many :old_tags, :class_name => 'OldNodeTag', :foreign_key => [:node_id, :version] + def validate_position errors.add(:base, "Node is not in the world") unless in_world? end @@ -42,35 +45,20 @@ def to_xml return doc end - def to_xml_node - el1 = XML::Node.new 'node' - el1['id'] = self.node_id.to_s + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) + el = XML::Node.new 'node' + el['id'] = self.node_id.to_s - self.tags.each do |k,v| - el2 = XML::Node.new('tag') - el2['k'] = k.to_s - el2['v'] = v.to_s - el1 << el2 - end + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) if self.visible? - el1['lat'] = self.lat.to_s - el1['lon'] = self.lon.to_s - end - - el1['changeset'] = self.changeset.id.to_s - if self.changeset.user.data_public? - el1['user'] = self.changeset.user.display_name - el1['uid'] = self.changeset.user.id.to_s + el['lat'] = self.lat.to_s + el['lon'] = self.lon.to_s end - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - el1['version'] = self.version.to_s - - el1['redacted'] = self.redaction.id.to_s if self.redacted? + add_tags_to_xml_node(el, self.old_tags) - return el1 + return el end def save_with_dependencies! @@ -92,14 +80,7 @@ def save_with_dependencies! end def tags - unless @tags - @tags = Hash.new - OldNodeTag.where(:node_id => self.node_id, :version => self.version).each do |tag| - @tags[tag.k] = tag.v - end - end - @tags = Hash.new unless @tags - @tags + @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }] end def tags=(t) diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 390c142dbc1..dc89afa5029 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -1,5 +1,6 @@ class OldRelation < ActiveRecord::Base include ConsistencyValidations + include ObjectMetadata self.table_name = "relations" self.primary_keys = "relation_id", "version" @@ -12,7 +13,7 @@ class OldRelation < ActiveRecord::Base belongs_to :redaction belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id" - has_many :old_members, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version], :order => :sequence_id + has_many :old_members, -> { order(:sequence_id) }, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version] has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version] validates_associated :changeset @@ -59,24 +60,13 @@ def save_with_dependencies! end def members - unless @members - @members = Array.new - OldRelationMember.where(:relation_id => self.relation_id, :version => self.version).order(:sequence_id).each do |m| - @members += [[m.type,m.id,m.role]] - end + @members ||= self.old_members.collect do |member| + [member.member_type, member.member_id, member.member_role] end - @members end def tags - unless @tags - @tags = Hash.new - OldRelationTag.where(:relation_id => self.relation_id, :version => self.version).each do |tag| - @tags[tag.k] = tag.v - end - end - @tags = Hash.new unless @tags - @tags + @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }] end def members=(s) @@ -93,36 +83,23 @@ def to_xml return doc end - def to_xml_node - el1 = XML::Node.new 'relation' - el1['id'] = self.relation_id.to_s - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - if self.changeset.user.data_public? - el1['user'] = self.changeset.user.display_name - el1['uid'] = self.changeset.user.id.to_s - end - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset_id.to_s - - el1['redacted'] = self.redaction.id.to_s if self.redacted? - + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) + el = XML::Node.new 'relation' + el['id'] = self.relation_id.to_s + + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) + self.old_members.each do |member| - e = XML::Node.new 'member' - e['type'] = member.member_type.to_s.downcase - e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML - e['role'] = member.member_role.to_s - el1 << e + member_el = XML::Node.new 'member' + member_el['type'] = member.member_type.to_s.downcase + member_el['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML + member_el['role'] = member.member_role.to_s + el << member_el end - self.old_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end + add_tags_to_xml_node(el, self.old_tags) - return el1 + return el end # Temporary method to match interface to nodes diff --git a/app/models/old_way.rb b/app/models/old_way.rb index bc114d73a51..1552bae0497 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -1,5 +1,6 @@ class OldWay < ActiveRecord::Base include ConsistencyValidations + include ObjectMetadata self.table_name = "ways" self.primary_keys = "way_id", "version" @@ -64,24 +65,11 @@ def save_with_dependencies! end def nds - unless @nds - @nds = Array.new - OldWayNode.where(:way_id => self.way_id, :version => self.version).order(:sequence_id).each do |nd| - @nds += [nd.node_id] - end - end - @nds + @nds ||= self.old_nodes.order(:sequence_id).collect { |n| n.node_id } end def tags - unless @tags - @tags = Hash.new - OldWayTag.where(:way_id => self.way_id, :version => self.version).each do |tag| - @tags[tag.k] = tag.v - end - end - @tags = Hash.new unless @tags - @tags + @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }] end def nds=(s) @@ -92,34 +80,21 @@ def tags=(t) @tags = t end - def to_xml_node - el1 = XML::Node.new 'way' - el1['id'] = self.way_id.to_s - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - if self.changeset.user.data_public? - el1['user'] = self.changeset.user.display_name - el1['uid'] = self.changeset.user.id.to_s - end - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset.id.to_s + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) + el = XML::Node.new 'way' + el['id'] = self.way_id.to_s + + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - el1['redacted'] = self.redaction.id.to_s if self.redacted? - self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order - e = XML::Node.new 'nd' - e['ref'] = nd.node_id.to_s - el1 << e + node_el = XML::Node.new 'nd' + node_el['ref'] = nd.node_id.to_s + el << node_el end - self.old_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end + add_tags_to_xml_node(el, self.old_tags) - return el1 + return el end # Read full version of old way @@ -130,12 +105,10 @@ def to_xml_node # (i.e. is it visible? are we actually reverting to an earlier version?) def get_nodes_undelete - points = [] - self.nds.each do |n| + self.nds.collect do |n| node = Node.find(n) - points << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible] + [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible] end - points end def get_nodes_revert(timestamp) diff --git a/app/models/relation.rb b/app/models/relation.rb index e5ea85d6d02..008f365c4a2 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -3,18 +3,19 @@ class Relation < ActiveRecord::Base include ConsistencyValidations include NotRedactable + include ObjectMetadata self.table_name = "current_relations" belongs_to :changeset - has_many :old_relations, :order => 'version' + has_many :old_relations, -> { order(:version) } - has_many :relation_members, :order => 'sequence_id' + has_many :relation_members, -> { order(:sequence_id) } has_many :relation_tags has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :timestamp,:version, :changeset_id @@ -24,11 +25,11 @@ class Relation < ActiveRecord::Base validates_numericality_of :changeset_id, :version, :integer_only => true validates_associated :changeset - scope :visible, where(:visible => true) - scope :invisible, where(:visible => false) - scope :nodes, lambda { |*ids| joins(:relation_members).where(:current_relation_members => { :member_type => "Node", :member_id => ids }) } - scope :ways, lambda { |*ids| joins(:relation_members).where(:current_relation_members => { :member_type => "Way", :member_id => ids }) } - scope :relations, lambda { |*ids| joins(:relation_members).where(:current_relation_members => { :member_type => "Relation", :member_id => ids }) } + scope :visible, -> { where(:visible => true) } + scope :invisible, -> { where(:visible => false) } + scope :nodes, ->(*ids) { joins(:relation_members).where(:current_relation_members => { :member_type => "Node", :member_id => ids.flatten }) } + scope :ways, ->(*ids) { joins(:relation_members).where(:current_relation_members => { :member_type => "Way", :member_id => ids.flatten }) } + scope :relations, ->(*ids) { joins(:relation_members).where(:current_relation_members => { :member_type => "Relation", :member_id => ids.flatten }) } TYPES = ["node", "way", "relation"] @@ -77,6 +78,12 @@ def self.from_xml_node(pt, create=false) relation.add_tag_keyval(tag['k'], tag['v']) end + # need to initialise the relation members array explicitly, as if this + # isn't done for a new relation then @members attribute will be nil, + # and the members will be loaded from the database instead of being + # empty, as intended. + relation.members = Array.new + pt.find('member').each do |member| #member_type = logger.debug "each member" @@ -100,33 +107,10 @@ def to_xml end def to_xml_node(visible_members = nil, changeset_cache = {}, user_display_name_cache = {}) - el1 = XML::Node.new 'relation' - el1['id'] = self.id.to_s - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset_id.to_s - - if changeset_cache.key?(self.changeset_id) - # use the cache if available - else - changeset_cache[self.changeset_id] = self.changeset.user_id - end - - user_id = changeset_cache[self.changeset_id] + el = XML::Node.new 'relation' + el['id'] = self.id.to_s - if user_display_name_cache.key?(user_id) - # use the cache if available - elsif self.changeset.user.data_public? - user_display_name_cache[user_id] = self.changeset.user.display_name - else - user_display_name_cache[user_id] = nil - end - - if not user_display_name_cache[user_id].nil? - el1['user'] = user_display_name_cache[user_id] - el1['uid'] = user_id.to_s - end + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) self.relation_members.each do |member| p=0 @@ -142,42 +126,28 @@ def to_xml_node(visible_members = nil, changeset_cache = {}, user_display_name_c end end if p - e = XML::Node.new 'member' - e['type'] = member.member_type.downcase - e['ref'] = member.member_id.to_s - e['role'] = member.member_role - el1 << e + member_el = XML::Node.new 'member' + member_el['type'] = member.member_type.downcase + member_el['ref'] = member.member_id.to_s + member_el['role'] = member.member_role + el << member_el end end - self.relation_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end - return el1 + add_tags_to_xml_node(el, self.relation_tags) + + return el end # FIXME is this really needed? def members - unless @members - @members = Array.new - self.relation_members.each do |member| - @members += [[member.member_type,member.member_id,member.member_role]] - end + @members ||= self.relation_members.map do |member| + [member.member_type, member.member_id, member.member_role] end - @members end def tags - unless @tags - @tags = Hash.new - self.relation_tags.each do |tag| - @tags[tag.k] = tag.v - end - end - @tags + @tags ||= Hash[self.relation_tags.collect { |t| [t.k, t.v] }] end def members=(m) @@ -188,9 +158,9 @@ def tags=(t) @tags = t end - def add_member(type,id,role) - @members = Array.new unless @members - @members += [[type,id.to_i,role]] + def add_member(type, id, role) + @members ||= [] + @members << [type, id.to_i, role] end def add_tag_keyval(k, v) diff --git a/app/models/request_token.rb b/app/models/request_token.rb index 6e4ec40c357..1ac502bc765 100644 --- a/app/models/request_token.rb +++ b/app/models/request_token.rb @@ -21,7 +21,7 @@ def exchange! params[p] = read_attribute(p) } - access_token = AccessToken.create(params, :without_protection => true) + access_token = AccessToken.create(params) invalidate! access_token end diff --git a/app/models/session.rb b/app/models/session.rb deleted file mode 100644 index 619a7a7df99..00000000000 --- a/app/models/session.rb +++ /dev/null @@ -1,7 +0,0 @@ -class Session < ActiveRecord::Base - def [](key) - @data = Marshal.load(Base64.decode64(self.data)) unless @data - - return @data[key] - end -end diff --git a/app/models/spam_observer.rb b/app/models/spam_observer.rb deleted file mode 100644 index 07fa84ffd07..00000000000 --- a/app/models/spam_observer.rb +++ /dev/null @@ -1,15 +0,0 @@ -class SpamObserver < ActiveRecord::Observer - observe User, DiaryEntry, DiaryComment - - def after_save(record) - case - when record.is_a?(User) then user = record - when record.is_a?(DiaryEntry) then user = record.user - when record.is_a?(DiaryComment) then user = record.user - end - - if user.status == "active" and user.spam_score > SPAM_THRESHOLD - user.update_column(:status, "suspended") - end - end -end diff --git a/app/models/trace.rb b/app/models/trace.rb index b72fda07dcd..df66496a260 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -1,13 +1,14 @@ class Trace < ActiveRecord::Base self.table_name = "gpx_files" - belongs_to :user + belongs_to :user, :counter_cache => true has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all - scope :visible, where(:visible => true) - scope :visible_to, lambda { |u| visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) } - scope :public, where(:visibility => ["public", "identifiable"]) + scope :visible, -> { where(:visible => true) } + scope :visible_to, ->(u) { visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) } + scope :public, -> { where(:visibility => ["public", "identifiable"]) } + scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) } validates_presence_of :user_id, :name, :timestamp validates_presence_of :description, :on => :create @@ -111,7 +112,7 @@ def mime_type elsif zipped mimetype = "application/x-zip" else - mimetype = "text/xml" + mimetype = "application/gpx+xml" end return mimetype @@ -288,10 +289,10 @@ def import end if gpx.actual_points > 0 - max_lat = Tracepoint.maximum('latitude', :conditions => ['gpx_id = ?', id]) - min_lat = Tracepoint.minimum('latitude', :conditions => ['gpx_id = ?', id]) - max_lon = Tracepoint.maximum('longitude', :conditions => ['gpx_id = ?', id]) - min_lon = Tracepoint.minimum('longitude', :conditions => ['gpx_id = ?', id]) + max_lat = Tracepoint.where(:gpx_id => id).maximum(:latitude) + min_lat = Tracepoint.where(:gpx_id => id).minimum(:latitude) + max_lon = Tracepoint.where(:gpx_id => id).maximum(:longitude) + min_lon = Tracepoint.where(:gpx_id => id).minimum(:longitude) max_lat = max_lat.to_f / 10000000 min_lat = min_lat.to_f / 10000000 diff --git a/app/models/trace_sweeper.rb b/app/models/trace_sweeper.rb deleted file mode 100644 index 777a58a5525..00000000000 --- a/app/models/trace_sweeper.rb +++ /dev/null @@ -1,27 +0,0 @@ -class TraceSweeper < ActionController::Caching::Sweeper - observe Trace - - def after_create(record) - expire_cache_for(record) - end - - def after_update(record) - expire_cache_for(record) - end - - def after_destroy(record) - expire_cache_for(record) - end - -private - - def expire_cache_for(record) - expire_action(:controller => 'trace', :action => 'view', :display_name => record.user.display_name, :id => record.id) - - expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil) - expire_action(:controller => 'trace', :action => 'list', :display_name => record.user.display_name, :tag => nil) - - expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => nil) - expire_action(:controller => 'trace', :action => 'georss', :display_name => record.user.display_name, :tag => nil) - end -end diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb index 1b8ba2309de..00f195e69a1 100644 --- a/app/models/tracetag.rb +++ b/app/models/tracetag.rb @@ -1,10 +1,8 @@ class Tracetag < ActiveRecord::Base self.table_name = "gpx_file_tags" - validates_format_of :tag, :with => /^[^\/;.,?]*$/ + validates_format_of :tag, :with => /\A[^\/;.,?]*\z/ validates_length_of :tag, :within => 1..255 - attr_accessible :tag - belongs_to :trace, :foreign_key => 'gpx_id' end diff --git a/app/models/tracetag_sweeper.rb b/app/models/tracetag_sweeper.rb deleted file mode 100644 index f9de1dd82a5..00000000000 --- a/app/models/tracetag_sweeper.rb +++ /dev/null @@ -1,25 +0,0 @@ -class TracetagSweeper < ActionController::Caching::Sweeper - observe Tracetag - - def after_create(record) - expire_cache_for(record) - end - - def after_update(record) - expire_cache_for(record) - end - - def after_destroy(record) - expire_cache_for(record) - end - -private - - def expire_cache_for(record) - expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => record.tag) - expire_action(:controller => 'trace', :action => 'list', :display_name => record.trace.user.display_name, :tag => record.tag) - - expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => record.tag) - expire_action(:controller => 'trace', :action => 'georss', :display_name => record.trace.user.display_name, :tag => record.tag) - end -end diff --git a/app/models/user.rb b/app/models/user.rb index 636f8342439..b27e0cda54b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,27 +1,36 @@ class User < ActiveRecord::Base require 'xml/libxml' - has_many :traces, :conditions => { :visible => true } - has_many :diary_entries, :order => 'created_at DESC' - has_many :diary_comments, :order => 'created_at DESC' - has_many :messages, :foreign_key => :to_user_id, :conditions => { :to_user_visible => true }, :order => 'sent_on DESC' - has_many :new_messages, :class_name => "Message", :foreign_key => :to_user_id, :conditions => { :to_user_visible => true, :message_read => false }, :order => 'sent_on DESC' - has_many :sent_messages, :class_name => "Message", :foreign_key => :from_user_id, :conditions => { :from_user_visible => true }, :order => 'sent_on DESC' - has_many :friends, :include => :befriendee, :conditions => "users.status IN ('active', 'confirmed')" + has_many :traces, -> { where(:visible => true) } + has_many :diary_entries, -> { order(:created_at => :desc) } + has_many :diary_comments, -> { order(:created_at => :desc) } + has_many :messages, -> { where(:to_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :foreign_key => :to_user_id + has_many :new_messages, -> { where(:to_user_visible => true, :message_read => false).order(:sent_on => :desc) }, :class_name => "Message", :foreign_key => :to_user_id + has_many :sent_messages, -> { where(:from_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :from_user_id + has_many :friends, -> { joins(:befriendee).where(:users => { :status => ["active", "confirmed"] }) } has_many :friend_users, :through => :friends, :source => :befriendee has_many :tokens, :class_name => "UserToken" has_many :preferences, :class_name => "UserPreference" - has_many :changesets, :order => 'created_at DESC' + has_many :changesets, -> { order(:created_at => :desc) } + has_many :note_comments, :foreign_key => :author_id + has_many :notes, :through => :note_comments has_many :client_applications - has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application] + has_many :oauth_tokens, -> { order(:authorized_at => :desc).preload(:client_application) }, :class_name => "OauthToken" + + has_many :blocks, :class_name => "UserBlock" + has_many :blocks_created, :class_name => "UserBlock", :foreign_key => :creator_id + has_many :blocks_revoked, :class_name => "UserBlock", :foreign_key => :revoker_id - has_many :active_blocks, :class_name => "UserBlock", :conditions => proc { [ "user_blocks.ends_at > :ends_at or user_blocks.needs_view", { :ends_at => Time.now.getutc } ] } has_many :roles, :class_name => "UserRole" - scope :visible, where(:status => ["pending", "active", "confirmed"]) - scope :active, where(:status => ["active", "confirmed"]) - scope :public, where(:data_public => true) + scope :visible, -> { where(:status => ["pending", "active", "confirmed"]) } + scope :active, -> { where(:status => ["active", "confirmed"]) } + scope :public, -> { where(:data_public => true) } + + has_attached_file :image, + :default_url => "/assets/:class/:attachment/:style.png", + :styles => { :large => "100x100>", :small => "50x50>" } validates_presence_of :email, :display_name validates_confirmation_of :email#, :message => ' addresses must match' @@ -33,23 +42,18 @@ class User < ActiveRecord::Base validates_length_of :display_name, :within => 3..255, :allow_nil => true validates_email_format_of :email, :if => Proc.new { |u| u.email_changed? } validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? } - validates_format_of :display_name, :with => /^[^\/;.,?]*$/, :if => Proc.new { |u| u.display_name_changed? } - validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? } - validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\A[^\/;.,?%#]*\z/, :if => Proc.new { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\A\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\S\z/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? } validates_numericality_of :home_lat, :allow_nil => true validates_numericality_of :home_lon, :allow_nil => true validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true - - attr_accessible :display_name, :email, :email_confirmation, :openid_url, - :pass_crypt, :pass_crypt_confirmation, :consider_pd + validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/ after_initialize :set_defaults before_save :encrypt_password - - has_attached_file :image, - :default_url => "/assets/:class/:attachment/:style.png", - :styles => { :large => "100x100>", :small => "50x50>" } + after_save :spam_check def self.authenticate(options) if options[:username] and options[:password] @@ -63,7 +67,14 @@ def self.authenticate(options) end end - user = nil if user and user.pass_crypt != OSM::encrypt_password(options[:password], user.pass_salt) + if user and PasswordHash.check(user.pass_crypt, user.pass_salt, options[:password]) + if PasswordHash.upgrade?(user.pass_crypt, user.pass_salt) + user.pass_crypt, user.pass_salt = PasswordHash.create(options[:password]) + user.save + end + else + user = nil + end elsif options[:token] token = UserToken.find_by_token(options[:token]) user = token.user if token @@ -76,10 +87,10 @@ def self.authenticate(options) user = nil end - token.update_attribute(:expiry, 1.week.from_now) if token and user + token.update_column(:expiry, 1.week.from_now) if token and user return user - end + end def to_xml doc = OSM::API.new.get_xml_doc @@ -122,7 +133,7 @@ def preferred_language_from(array) end def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) - if self.home_lon and self.home_lat + if self.home_lon and self.home_lat gc = OSM::GreatCircle.new(self.home_lat, self.home_lon) bounds = gc.bounds(radius) sql_for_distance = gc.sql_for_distance("home_lat", "home_lon") @@ -138,14 +149,7 @@ def distance(nearby_user) end def is_friends_with?(new_friend) - res = false - @new_friend = new_friend - self.friends.each do |friend| - if friend.friend_user_id == @new_friend.id - return true - end - end - return false + self.friends.where(:friend_user_id => new_friend.id).exists? end ## @@ -179,10 +183,10 @@ def has_role?(role) end ## - # returns the first active block which would require users to view + # returns the first active block which would require users to view # a message, or nil if there are none. def blocked_on_view - active_blocks.detect { |b| b.needs_view? } + blocks.active.detect { |b| b.needs_view? } end ## @@ -195,6 +199,7 @@ def delete self.image = nil self.email_valid = false self.new_email = nil + self.openid_url = nil self.status = "deleted" self.save end @@ -202,8 +207,8 @@ def delete ## # return a spam score for a user def spam_score - changeset_score = self.changesets.limit(10).length * 50 - trace_score = self.traces.limit(10).length * 50 + changeset_score = self.changesets.size * 50 + trace_score = self.traces.size * 50 diary_entry_score = self.diary_entries.inject(0) { |s,e| s += e.body.spam_score } diary_comment_score = self.diary_comments.inject(0) { |s,c| s += c.body.spam_score } @@ -216,6 +221,14 @@ def spam_score return score.to_i end + ## + # perform a spam check on a user + def spam_check + if status == "active" and spam_score > SPAM_THRESHOLD + update_column(:status, "suspended") + end + end + ## # return an oauth access token for a specified application def access_token(application_key) @@ -231,8 +244,8 @@ def set_defaults def encrypt_password if pass_crypt_confirmation - self.pass_salt = OSM::make_token(8) - self.pass_crypt = OSM::encrypt_password(pass_crypt, pass_salt) + self.pass_crypt, self.pass_salt = PasswordHash.create(pass_crypt) + self.pass_crypt_confirmation = nil end end end diff --git a/app/models/user_block.rb b/app/models/user_block.rb index 8821926bbd3..cb1a97dcabf 100644 --- a/app/models/user_block.rb +++ b/app/models/user_block.rb @@ -9,6 +9,12 @@ class UserBlock < ActiveRecord::Base PERIODS = USER_BLOCK_PERIODS + ## + # scope to match active blocks + def self.active + self.where("needs_view or ends_at > ?", Time.now.getutc) + end + ## # return a renderable version of the reason text. def reason @@ -26,11 +32,11 @@ def active? # revokes the block, allowing the user to use the API again. the argument # is the user object who is revoking the ban. def revoke!(revoker) - update_attributes({ + update_attributes( :ends_at => Time.now.getutc(), :revoker_id => revoker.id, :needs_view => false - }, :without_protection => true) + ) end private diff --git a/app/models/user_sweeper.rb b/app/models/user_sweeper.rb deleted file mode 100644 index 8ce48e5b34d..00000000000 --- a/app/models/user_sweeper.rb +++ /dev/null @@ -1,55 +0,0 @@ -class UserSweeper < ActionController::Caching::Sweeper - observe User - - def before_update(record) - expire_cache_for(User.find(record.id), record) - end - - def before_destroy(record) - expire_cache_for(record, nil) - end - -private - - def expire_cache_for(old_record, new_record) - if old_record and - (new_record.nil? or - old_record.visible? != new_record.visible? or - old_record.display_name != new_record.display_name or - old_record.image.fingerprint != new_record.image.fingerprint) - old_record.diary_entries.each do |entry| - expire_action(:controller => 'diary_entry', :action => 'view', :display_name => old_record.display_name, :id => entry.id) - expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil) - expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => entry.language_code, :display_name => nil) - end - - old_record.diary_comments.each do |comment| - expire_action(:controller => 'diary_entry', :action => 'view', :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id) - end - - expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => nil) - expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => old_record.display_name) - - expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => nil) - expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => old_record.display_name) - - old_record.traces.each do |trace| - expire_action(:controller => 'trace', :action => 'view', :display_name => old_record.display_name, :id => trace.id) - - trace.tags.each do |tag| - expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => tag.tag) - expire_action(:controller => 'trace', :action => 'list', :display_name => old_record.display_name, :tag => tag.tag) - - expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => tag.tag) - expire_action(:controller => 'trace', :action => 'georss', :display_name => old_record.display_name, :tag => tag.tag) - end - end - - expire_action(:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil) - expire_action(:controller => 'trace', :action => 'list', :display_name => old_record.display_name, :tag => nil) - - expire_action(:controller => 'trace', :action => 'georss', :display_name => nil, :tag => nil) - expire_action(:controller => 'trace', :action => 'georss', :display_name => old_record.display_name, :tag => nil) - end - end -end diff --git a/app/models/user_token.rb b/app/models/user_token.rb index 9a754d3442c..735fd848580 100644 --- a/app/models/user_token.rb +++ b/app/models/user_token.rb @@ -1,10 +1,12 @@ class UserToken < ActiveRecord::Base belongs_to :user - attr_accessible :referer - after_initialize :set_defaults + def expired? + expiry < Time.now + end + private def set_defaults diff --git a/app/models/way.rb b/app/models/way.rb index 9bd792ddcf5..1da048c96b0 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -3,20 +3,21 @@ class Way < ActiveRecord::Base include ConsistencyValidations include NotRedactable + include ObjectMetadata self.table_name = "current_ways" belongs_to :changeset - has_many :old_ways, :order => 'version' + has_many :old_ways, -> { order(:version) } - has_many :way_nodes, :order => 'sequence_id' - has_many :nodes, :through => :way_nodes, :order => 'sequence_id' + has_many :way_nodes, -> { order(:sequence_id) } + has_many :nodes, -> { order("sequence_id") }, :through => :way_nodes has_many :way_tags has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update validates_presence_of :changeset_id,:version, :timestamp @@ -26,8 +27,8 @@ class Way < ActiveRecord::Base validates_numericality_of :id, :on => :update, :integer_only => true validates_associated :changeset - scope :visible, where(:visible => true) - scope :invisible, where(:visible => false) + scope :visible, -> { where(:visible => true) } + scope :invisible, -> { where(:visible => false) } # Read in xml as text and return it's Way object representation def self.from_xml(xml, create=false) @@ -100,33 +101,10 @@ def to_xml end def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {}) - el1 = XML::Node.new 'way' - el1['id'] = self.id.to_s - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset_id.to_s - - if changeset_cache.key?(self.changeset_id) - # use the cache if available - else - changeset_cache[self.changeset_id] = self.changeset.user_id - end - - user_id = changeset_cache[self.changeset_id] - - if user_display_name_cache.key?(user_id) - # use the cache if available - elsif self.changeset.user.data_public? - user_display_name_cache[user_id] = self.changeset.user.display_name - else - user_display_name_cache[user_id] = nil - end + el = XML::Node.new 'way' + el['id'] = self.id.to_s - if not user_display_name_cache[user_id].nil? - el1['user'] = user_display_name_cache[user_id] - el1['uid'] = user_id.to_s - end + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) # make sure nodes are output in sequence_id order ordered_nodes = [] @@ -146,39 +124,23 @@ def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cac ordered_nodes.each do |nd_id| if nd_id and nd_id != '0' - e = XML::Node.new 'nd' - e['ref'] = nd_id - el1 << e + node_el = XML::Node.new 'nd' + node_el['ref'] = nd_id + el << node_el end end - self.way_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end - return el1 + add_tags_to_xml_node(el, self.way_tags) + + return el end def nds - unless @nds - @nds = Array.new - self.way_nodes.each do |nd| - @nds += [nd.node_id] - end - end - @nds + @nds ||= self.way_nodes.collect { |n| n.node_id } end def tags - unless @tags - @tags = {} - self.way_tags.each do |tag| - @tags[tag.k] = tag.v - end - end - @tags + @tags ||= Hash[self.way_tags.collect { |t| [t.k, t.v] }] end def nds=(s) diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb deleted file mode 100644 index eb90fad1044..00000000000 --- a/app/views/browse/_changeset_details.html.erb +++ /dev/null @@ -1,92 +0,0 @@ -<table> - - <tr> - <th><%= t 'browse.changeset_details.created_at' %></th> - <td><%= l changeset_details.created_at %></td> - </tr> - - <tr> - <th><%= t 'browse.changeset_details.closed_at' %></th> - <td><%= l changeset_details.closed_at %></td> - </tr> - - <% if changeset_details.user.data_public? %> - <tr> - <th><%= t 'browse.changeset_details.belongs_to' %></th> - <td><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></td> - </tr> - <% end %> - - <%= render :partial => "tag_details", :object => changeset_details %> - - <tr> - <th><%= t 'browse.changeset_details.bounding_box' %></th> - <% unless changeset_details.has_valid_bbox? %> - <td><%= t 'browse.changeset_details.no_bounding_box' %></td> - <% else - bbox = changeset_details.bbox.to_unscaled - %> - <td> - <table> - <tr> - <td colspan="3" style="text-align:center"><%=bbox.max_lat -%></td> - </tr> - <tr> - <td><%=bbox.min_lon -%></td> - <td>(<%= link_to t('browse.changeset_details.box'), root_path(:minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => 'yes'), :title => t('browse.changeset_details.show_area_box') %>)</td> - <td><%=bbox.max_lon -%></td> - </tr> - <tr> - <td colspan="3" style="text-align:center"><%= bbox.min_lat -%></td> - </tr> - </table> - </td> - <% end %> - </tr> - - <% unless @nodes.empty? %> - <tr valign="top"> - <th><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></th> - <td> - <table cellpadding="0"> - <% @nodes.each do |node| %> - <tr><td><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></td></tr> - <% end %> - </table> - </td> - </tr> - <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> - <% end %> - - <% unless @ways.empty? %> - <tr valign="top"> - <th><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></th> - <td> - <table cellpadding="0"> - <% @ways.each do |way| %> - <tr><td><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></td></tr> - <% end %> - <%= - #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members - %> - </table> - </td> - </tr> - <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> - <% end %> - - <% unless @relations.empty? %> - <tr valign="top"> - <th><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></th> - <td> - <table cellpadding="0"> - <% @relations.each do |relation| %> - <tr><td><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></td></tr> - <% end %> - </table> - </td> - </tr> - <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> - <% end %> - -</table> diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 07b44a94a7d..971e467aa02 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,38 +1,33 @@ -<tr> - <% if common_details.visible? %> - <th><%= t 'browse.common_details.edited_at' %></th> +<h4> + <% if common_details.changeset.tags['comment'].present? %> + <%= linkify(h(common_details.changeset.tags['comment'])) %> <% else %> - <th><%= t 'browse.common_details.deleted_at' %></th> + <%= t 'browse.no_comment' %> <% end %> - <td><%= l common_details.timestamp %></td> -</tr> +</h4> -<% if common_details.changeset.user.data_public? %> - <tr> - <% if common_details.visible? %> - <th><%= t 'browse.common_details.edited_by' %></th> - <% else %> - <th><%= t 'browse.common_details.deleted_by' %></th> - <% end %> - <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td> - </tr> -<% end %> - -<tr> - <th><%= t 'browse.common_details.version' %></th> - <td><%= h(common_details.version) %></td> -</tr> +<div class="details"> + <%= + t "browse.#{common_details.visible? ? :edited : :deleted}_by_html", + :time => distance_of_time_in_words_to_now(common_details.timestamp), + :user => changeset_user_link(common_details.changeset), + :title => l(common_details.timestamp) + %> +</div> -<tr> - <th><%= t 'browse.common_details.in_changeset' %></th> - <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td> -</tr> +<div class="details"> + <%= t 'browse.version' %> + #<%= h(common_details.version) %> + · + <%= t 'browse.in_changeset' %> + #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> +</div> -<% if common_details.changeset.tags['comment'] %> - <tr> - <th><%= t 'browse.common_details.changeset_comment' %></th> - <td><%= linkify(h(common_details.changeset.tags['comment'])) %></td> - </tr> +<% if @type == "node" and common_details.visible? %> +<div class="details geo"> + <%= t 'browse.location' %> + <%= link_to(content_tag(:span, number_with_delimiter(common_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(common_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(common_details.lat), :lon => h(common_details.lon), :zoom => "18"}) %> +</div> <% end %> -<%= render :partial => "tag_details", :object => common_details %> +<%= render :partial => "tag_details", :object => common_details.tags %> diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb index 6cc0cce6e04..de41d924719 100644 --- a/app/views/browse/_containing_relation.html.erb +++ b/app/views/browse/_containing_relation.html.erb @@ -1,11 +1,8 @@ -<tr> - <td><%= - linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s - - if containing_relation.member_role.blank? - raw t 'browse.containing_relation.entry', :relation_name => linked_name - else - raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) - end - %></td> -</tr> +<li><%= + linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s + if containing_relation.member_role.blank? + raw t 'browse.containing_relation.entry', :relation_name => linked_name + else + raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role) + end +%></li> \ No newline at end of file diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb deleted file mode 100644 index 2c29a0d0089..00000000000 --- a/app/views/browse/_map.html.erb +++ /dev/null @@ -1,161 +0,0 @@ -<%= javascript_include_tag 'openlayers.js' %> -<%= javascript_include_tag 'map.js' %> - -<iframe id="linkloader" style="display: none"> -</iframe> - -<div id="browse_map"> - <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %> - <div id="small_map"> - </div> - <span id="loading"><%= t 'browse.map.loading' %></span> - <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %> - <br /> - <%= link_to(h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %> - <% unless map.instance_of? Changeset %> - <br /> - <%= link_to(t("browse.map.larger." + map.class.to_s.downcase), { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %> - <br /> - <%= link_to(h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"), { :controller => :site, :action => :edit }, { :id => "object_edit", :class => "geolink object" }) %> - <% end %> - <% else %> - <%= t 'browse.map.deleted' %> - <% end %> -</div> - -<div id="area_edit_menu" class="menu"> - <ul> - <% Editors::ALL_EDITORS.each do |editor| %> - <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), { :controller => :site, :action => :edit, :editor => editor }, { :id => "#{editor}_area_edit", :class => "geolink bbox" } %></li> - <% end %> - </ul> -</div> - -<div id="object_edit_menu" class="menu"> - <ul> - <% Editors::ALL_EDITORS.each do |editor| %> - <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), { :controller => :site, :action => :edit, :editor => editor }, { :id => "#{editor}_object_edit", :class => "geolink object" } %></li> - <% end %> - </ul> -</div> - -<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %> - <script type="text/javascript"> - OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>"); - - function remoteEditHandler(event, bbox, select) { - var left = bbox.left - 0.0001; - var top = bbox.top + 0.0001; - var right = bbox.right + 0.0001; - var bottom = bbox.bottom - 0.0001; - var loaded = false; - - $("#linkloader").load(function () { loaded = true; }); - - if (select) { - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select); - } else { - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom); - } - - setTimeout(function () { - if (!loaded) alert("<%=j t('site.index.remote_failed') %>"); - }, 1000); - - return false; - } - - function init() { - var map = createMap("small_map", { - controls: [ new OpenLayers.Control.Navigation() ] - }); - - <% if map.instance_of? Changeset -%> - <% bbox = map.bbox.to_unscaled %> - var minlon = <%= bbox.min_lon %>; - var minlat = <%= bbox.min_lat %>; - var maxlon = <%= bbox.max_lon %>; - var maxlat = <%= bbox.max_lat %>; - var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat); - var centre = bbox.getCenterLonLat(); - - map.zoomToExtent(proj(bbox)); - addBoxToMap(bbox); - - $("#loading").hide(); - $("#browse_map .geolink").show(); - - $("#remote_area_edit").click(function (event) { - return remoteEditHandler(event, bbox); - }); - - <% if preferred_editor == "remote" -%> - $("#area_edit").click(function (event) { - return remoteEditHandler(event, bbox); - }); - <% end -%> - - updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat); - <% else -%> - var obj_type = "<%= map.class.name.downcase %>"; - var obj_id = <%= map.id %>; - var obj_version = <%= map.version %>; - var obj_visible = <%= map.visible %>; - var url = "/api/<%= API_VERSION %>/<%= map.class.name.downcase %>/<%= map.id %>"; - - if (obj_type != "node") { - url += "/full"; - } else if (!obj_visible) { - var previous_version = obj_version - 1; - url += "/" + previous_version; - } - - $("#object_larger_map").hide(); - $("#object_edit").hide(); - - addObjectToMap(url, true, function(extent) { - $("#loading").hide(); - $("#browse_map .geolink").show(); - - if (extent) { - extent.transform(map.getProjectionObject(), map.displayProjection); - - var centre = extent.getCenterLonLat(); - - $("#remote_area_edit").click(function (event) { - return remoteEditHandler(event, extent); - }); - - <% if preferred_editor == "remote" -%> - $("#area_edit").click(function (event) { - return remoteEditHandler(event, extent); - }); - <% end -%> - - $("#remote_object_edit").click(function (event) { - return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>"); - }); - - <% if preferred_editor == "remote" -%> - $("#object_edit").click(function (event) { - return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>"); - }); - <% end -%> - - $("#object_larger_map").show(); - $("#object_edit").show(); - - updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>); - } else { - $("#small_map").hide(); - } - }); - <% end -%> - - createMenu("area_edit", "area_edit_menu", "right"); - createMenu("object_edit", "object_edit_menu", "right"); - } - - window.onload = init; - </script> -<% end %> diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb deleted file mode 100644 index 54e792a9fdc..00000000000 --- a/app/views/browse/_navigation.html.erb +++ /dev/null @@ -1,42 +0,0 @@ -<% type = (@next || @prev).class.name.downcase %> -<% margin = @next_by_user || @prev_by_user ? 9 : 18 %> -<div id="browse_navigation" style="margin-top: <%= margin %>px"> - <% if @next_by_user or @prev_by_user %> - <span class="nowrap"> - <% if @prev_by_user %> - <%= link_to t('browse.navigation.paging.user.prev', :id => @prev_by_user.id.to_s), - { :id => @prev_by_user.id }, - { :title => t("browse.navigation.user.prev_#{type}_tooltip", :user => @prev_by_user.user.display_name) } %> - | - <% end %> - <%= - user = (@prev_by_user || @next_by_user).user.display_name - link_to h(user), - { :controller => "changeset", :action => "list", :display_name => user }, - { :title => t("browse.navigation.user.name_#{type}_tooltip", :user => h(user)) } - %> - <% if @next_by_user %> - | - <%= link_to t('browse.navigation.paging.user.next', :id => @next_by_user.id.to_s), - { :id => @next_by_user.id }, - { :title => t("browse.navigation.user.next_#{type}_tooltip", :user => @next_by_user.user.display_name) } %> - <% end %> - </span> - <br/> - <% end %> - <span class="nowrap"> - <% if @prev %> - <%= link_to t('browse.navigation.paging.all.prev', :id => @prev.id.to_s), - { :id => @prev.id }, - { :title => t("browse.navigation.all.prev_#{type}_tooltip") } %> - <% end %> - <% if @prev and @next %> - | - <% end %> - <% if @next %> - <%= link_to t('browse.navigation.paging.all.next', :id => @next.id.to_s), - { :id => @next.id }, - { :title => t("browse.navigation.all.next_#{type}_tooltip") } %> - <% end %> - </span> -</div> diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb new file mode 100644 index 00000000000..581c49b0915 --- /dev/null +++ b/app/views/browse/_node.html.erb @@ -0,0 +1,23 @@ +<% if node.redacted? %> + <div class='browse-section browse-redacted'> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.node'), + :version => node.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => node.redaction.id), node.redaction) %> + </div> +<% else %> + <div class='browse-section browse-node'> + <%= render :partial => "common_details", :object => node %> + + <% unless node.ways.empty? and node.containing_relation_members.empty? %> + <h4><%= t 'browse.part_of' %></h4> + <ul> + <% node.ways.uniq.each do |way| %> + <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li> + <% end %> + <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %> + </ul> + <% end %> + </div> +<% end %> diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb deleted file mode 100644 index 23176eab230..00000000000 --- a/app/views/browse/_node_details.html.erb +++ /dev/null @@ -1,30 +0,0 @@ -<% if node_details.redacted? %> -<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %></p> -<% else %> -<table class="browse_details" id="<%= node_details.version %>"> - - <%= render :partial => "common_details", :object => node_details %> - - <% if node_details.visible -%> - <tr> - <th><%= t 'browse.node_details.coordinates' %></th> - <td><div class="geo"><%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %></div></td> - </tr> - <% end -%> - - <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %> - <tr valign="top"> - <th><%= t 'browse.node_details.part_of' %></th> - <td> - <table cellpadding="0"> - <% node_details.ways.each do |way| %> - <tr><td><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></td></tr> - <% end %> - <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %> - </table> - </td> - </tr> - <% end %> - -</table> -<% end %> diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb index f0342403e2c..67f1c75a3bc 100644 --- a/app/views/browse/_paging_nav.html.erb +++ b/app/views/browse/_paging_nav.html.erb @@ -1,15 +1,5 @@ -<tr><td colspan='2'> -<% current_page = pages.current_page %> - -<%= t'browse.paging_nav.showing_page' %> -<%= current_page.number %> (<%= current_page.first_item %><% -if (current_page.first_item < current_page.last_item) # if more than 1 trace on page - %>-<%= current_page.last_item %><% -end %> -<%= t'browse.paging_nav.of'%> <%= pages.item_count %>) - <% if pages.page_count > 1 %> -| <%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %> + <span class="paginate"> + <%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %> + </span> <% end %> -</td> -</tr> diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb new file mode 100644 index 00000000000..1644228ae69 --- /dev/null +++ b/app/views/browse/_relation.html.erb @@ -0,0 +1,23 @@ +<% if relation.redacted? %> + <div class='browse-section browse-redacted'> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.relation'), + :version => relation.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => relation.redaction.id), relation.redaction) %> + </div> +<% else %> + <div class='browse-section browse-relation'> + <%= render :partial => "common_details", :object => relation %> + + <% unless relation.relation_members.empty? %> + <h4><%= t'browse.relation.members' %></h4> + <ul><%= render :partial => "relation_member", :collection => relation.relation_members %></ul> + <% end %> + + <% unless relation.containing_relation_members.empty? %> + <h4><%= t'browse.part_of' %></h4> + <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul> + <% end %> + </div> +<% end %> diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb deleted file mode 100644 index 57314817dd7..00000000000 --- a/app/views/browse/_relation_details.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<% if relation_details.redacted? %> -<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p> -<% else %> -<table class="browse_details" id="<%= relation_details.version %>"> - - <%= render :partial => "common_details", :object => relation_details %> - - <% unless relation_details.relation_members.empty? %> - <tr valign="top"> - <th><%= t'browse.relation_details.members' %></th> - <td> - <table cellpadding="0"> - <%= render :partial => "relation_member", :collection => relation_details.relation_members %> - </table> - </td> - </tr> - <% end %> - - <% unless relation_details.containing_relation_members.empty? %> - <tr valign="top"> - <th><%= t'browse.relation_details.part_of' %></th> - <td> - <table cellpadding="0"> - <%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %> - </table> - </td> - </tr> - <% end %> - -</table> -<% end %> diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb index 71d28397170..2673df3c35c 100644 --- a/app/views/browse/_relation_member.html.erb +++ b/app/views/browse/_relation_member.html.erb @@ -1,14 +1,12 @@ <% member_class = link_class(relation_member.member_type.downcase, relation_member.member) linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member) - type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase + type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase %> -<tr> - <td class="<%= member_class %>"><%= + <li class="<%= member_class %>"><%= if relation_member.member_role.blank? raw t'browse.relation_member.entry', :type => type_str, :name => linked_name else raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role) end - %></td> -</tr> + %></li> \ No newline at end of file diff --git a/app/views/browse/_sidebar.html.erb b/app/views/browse/_sidebar.html.erb deleted file mode 100644 index 3777d710a3c..00000000000 --- a/app/views/browse/_sidebar.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -<div> - <div style="text-align: center"> - <p style="margin-top: 10px; margin-bottom: 20px"> - <a id="browse_select_view" href="#"><%= t'browse.start.view_data' %></a> - <br /> - <a id="browse_select_box" href="#"><%= t'browse.start.manually_select' %></a> - <br /> - <a id="browse_hide_areas_box" href="#"><%= t'browse.start.hide_areas' %></a> - </p> - </div> - <div id="browse_status" style="text-align: center; display: none"> - </div> - <div id="browse_content"> - </div> -</div> diff --git a/app/views/browse/_tag.html.erb b/app/views/browse/_tag.html.erb index 2eadad4f2db..2081ba28d42 100644 --- a/app/views/browse/_tag.html.erb +++ b/app/views/browse/_tag.html.erb @@ -1,3 +1,4 @@ <tr> - <td><%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %></td> -</tr> + <th class='browse-tag-k'><%= format_key(tag[0]) %></th> + <td class='browse-tag-v'><%= format_value(tag[0], tag[1]) %></td> +</tr> diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb index b5f2d97e752..16e3b51b286 100644 --- a/app/views/browse/_tag_details.html.erb +++ b/app/views/browse/_tag_details.html.erb @@ -1,10 +1,6 @@ -<% unless tag_details.tags.empty? %> - <tr valign="top"> - <th><%= t'browse.tag_details.tags' %></th> - <td> - <table cellpadding="0"> - <%= render :partial => "tag", :collection => tag_details.tags.sort %> - </table> - </td> - </tr> +<% unless tag_details.empty? %> + <h4><%= t 'browse.tag_details.tags' %></h4> + <table class='browse-tag-list'> + <%= render :partial => "tag", :collection => tag_details.sort %> + </table> <% end %> diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb new file mode 100644 index 00000000000..aff405dde2b --- /dev/null +++ b/app/views/browse/_way.html.erb @@ -0,0 +1,35 @@ +<% if way.redacted? %> + <div class='browse-section browse-redacted'> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.way'), + :version => way.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => way.redaction.id), way.redaction) %> + </div> +<% else %> + <div class='browse-section browse-way'> + <%= render :partial => "common_details", :object => way %> + + <% unless way.way_nodes.empty? %> + <h4><%= t'browse.way.nodes' %></h4> + <ul> + <% way.way_nodes.each do |wn| %> + <li> + <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> + <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> + <% if related_ways.size > 0 then %> + (<%= raw t 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) + <% end %> + </li> + <% end %> + </ul> + <% end %> + + <% unless way.containing_relation_members.empty? %> + <h4><%= t'browse.part_of' %></h4> + <ul> + <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %> + </ul> + <% end %> + </div> +<% end %> diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb deleted file mode 100644 index 1313cb25057..00000000000 --- a/app/views/browse/_way_details.html.erb +++ /dev/null @@ -1,39 +0,0 @@ -<% if way_details.redacted? %> -<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p> -<% else %> -<table class="browse_details" id="<%= way_details.version %>"> - - <%= render :partial => "common_details", :object => way_details %> - - <% unless way_details.way_nodes.empty? %> - <tr valign="top"> - <th><%= t'browse.way_details.nodes' %></th> - <td> - <table cellpadding="0"> - <% way_details.way_nodes.each do |wn| %> - <tr><td> - <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> - <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> - <% if related_ways.size > 0 then %> - (<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) - <% end %> - </td></tr> - <% end %> - </table> - </td> - </tr> - <% end %> - - <% unless way_details.containing_relation_members.empty? %> - <tr valign="top"> - <th><%= t'browse.way_details.part_of' %></th> - <td> - <table cellpadding="0"> - <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %> - </table> - </td> - </tr> - <% end %> - -</table> -<% end %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 2796f7c5f15..31799f0e9f9 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,12 +1,72 @@ -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> +<% set_title(t('browse.changeset.title', :id => @changeset.id)) %> + +<h2> + <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a> + <%= t('browse.changeset.title', :id => @changeset.id) %> +</h2> + +<div class="browse-section"> + <h4><%= linkify(h(@changeset.tags['comment'].to_s.presence || t('browse.no_comment'))) %></h4> + <div class="details"><%= changeset_details(@changeset) %></div> + + <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> + + <% unless @ways.empty? %> + <h4> + <%= type_and_paginated_count('way', @way_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> + </h4> + <ul> + <% @ways.each do |way| %> + <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li> + <% end %> + </ul> + <% end %> + + <% unless @relations.empty? %> + <h4> + <%= type_and_paginated_count('relation', @relation_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> + </h4> + <ul> + <% @relations.each do |relation| %> + <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li> + <% end %> + </ul> + <% end %> + + <% unless @nodes.empty? %> + <h4> + <%= type_and_paginated_count('node', @node_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> + </h4> + <ul> + <% @nodes.each do |node| %> + <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li> + <% end %> + </ul> + <% end %> +</div> + +<% if @next_by_user || @prev_by_user %> + <div class='secondary-actions'> + <% if @prev_by_user %> + <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %> + · + <% end %> + <%= + user = (@prev_by_user || @next_by_user).user.display_name + link_to user, :controller => "changeset", :action => "list", :display_name => user + %> + <% if @next_by_user %> + · + <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %> + <% end %> + </div> <% end %> -<%= render :partial => "navigation" %> -<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2> -<% if @changeset.has_valid_bbox? %> -<%= render :partial => "map", :object => @changeset %> -<% end %> -<%= render :partial => "changeset_details", :object => @changeset %> -<hr /> -<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> -| <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> + +<div class='secondary-actions'> + <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> + · + <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> +</div> diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb new file mode 100644 index 00000000000..1e0f118d838 --- /dev/null +++ b/app/views/browse/feature.html.erb @@ -0,0 +1,14 @@ +<% set_title(t("browse.#{@type}.title", :name => printable_name(@feature))) %> + +<h2> + <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a> + <%= t("browse.#{@type}.title", :name => printable_name(@feature)) %> +</h2> + +<%= render :partial => @type, :object => @feature %> + +<div class='secondary-actions'> + <%= link_to(t('browse.download_xml'), :controller => @type, :action => "read") %> + · + <%= link_to(t('browse.view_history'), :action => "#{@type}_history") %> +</div> diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb new file mode 100644 index 00000000000..fa483bfb06b --- /dev/null +++ b/app/views/browse/history.html.erb @@ -0,0 +1,14 @@ +<% set_title(t("browse.#{@type}.history_title", :name => printable_name(@feature))) %> + +<h2> + <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a> + <%= t("browse.#{@type}.history_title", :name => printable_name(@feature)) %> +</h2> + +<%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %> + +<div class='secondary-actions'> + <%= link_to(t('browse.download_xml'), :controller => "old_#{@type}", :action => "history") %> + · + <%= link_to(t('browse.view_details'), :action => @type) %> +</div> diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb new file mode 100644 index 00000000000..49922494e25 --- /dev/null +++ b/app/views/browse/new_note.html.erb @@ -0,0 +1,18 @@ +<% set_title(t "browse.note.new_note") %> + +<h2> + <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a> + <%= t "browse.note.new_note" %> +</h2> + +<div class="note browse-section"> + <p class="warning"><%= t('javascripts.notes.new.intro') %></p> + <form action="#"> + <input type="hidden" name="lon"> + <input type="hidden" name="lat"> + <textarea class="comment" name="text" cols="40" rows="10"></textarea> + <div class="buttons clearfix"> + <input type="submit" name="add" value="<%= t('javascripts.notes.new.add') %>" disabled="1"> + </div> + </form> +</div> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb deleted file mode 100644 index 8f0a2001b14..00000000000 --- a/app/views/browse/node.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -<% -@name = printable_name @node -@title = t('browse.node.node') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> -<%= render :partial => "navigation" %> -<h2><%= t'browse.node.node_title', :node_name => @name %></h2> -<% if @node.visible -%> -<%= render :partial => "map", :object => @node %> -<% end -%> -<%= render :partial => "node_details", :object => @node %> -<hr /> -<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %> -| <%= link_to(t('browse.node.view_history'), :action => "node_history") %> -<% if @node.visible -%> -| <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %> -<% end -%> diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb deleted file mode 100644 index 937ad7dc083..00000000000 --- a/app/views/browse/node_history.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<% -@name = printable_name @node -@title = t('browse.node_history.node_history') + ' | ' + @name -%> -<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2> -<% if @node.visible -%> -<%= render :partial => "map", :object => @node %> -<% end -%> -<% @node.old_nodes.reverse.each do |node| %> - <%= render :partial => "node_details", :object => node %> - <hr /> -<% end %> -<%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %> -| <%= link_to(t('browse.node_history.view_details'), :action => "node") %> diff --git a/app/views/browse/not_found.html.erb b/app/views/browse/not_found.html.erb index f536ef9ffea..a8974b47470 100644 --- a/app/views/browse/not_found.html.erb +++ b/app/views/browse/not_found.html.erb @@ -6,4 +6,7 @@ 'changeset' => I18n.t('browse.not_found.type.changeset'), }; %> -<p><%= t'browse.not_found.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %></p> + +<h2> + <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a> + <%= t'browse.not_found.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %></h2> diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb new file mode 100644 index 00000000000..fa6f75ff9e0 --- /dev/null +++ b/app/views/browse/note.html.erb @@ -0,0 +1,57 @@ +<% set_title(t('browse.note.title', :id => @note.id)) %> + +<h2> + <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a> + <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> +</h2> + +<div class="browse-section"> + <h4><%= t('browse.note.description') %></h4> + <div class="note-description"> + <%= h(@note.comments.first.body.to_html) %> + </div> + + <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>"> + <%= note_event('open', @note.created_at, @note.author) %> + <% if @note.status == "closed" %> + <br/> + <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %> + <% end %> + </div> + + <% if @note.comments.find { |comment| comment.author.nil? } -%> + <p class='warning'><%= t "javascripts.notes.show.anonymous_warning" %></p> + <% end -%> + + <% if @note.comments.length > 1 %> + <div class='note-comments'> + <ul> + <% @note.comments[1..-1].each do |comment| %> + <li id="c<%= comment.id %>"> + <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small> + <%= comment.body.to_html %> + </li> + <% end %> + </ul> + </div> + <% end %> + + <% if @note.status == "open" %> + <form action="#"> + <textarea class="comment" name="text" cols="40" rows="5"></textarea> + <div class="buttons clearfix"> + <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>"> + <input type="submit" name="close" value="<%= t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, 'json') %>"> + <input type="submit" name="comment" value="<%= t('javascripts.notes.show.comment') %>" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, 'json') %>" disabled="1"> + </div> + </form> + <% else %> + <form action="#"> + <input type="hidden" name="text" value=""> + <div class="buttons clearfix"> + <input type="submit" name="hide" value="<%= t('javascripts.notes.show.hide') %>" class="hide_unless_moderator deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, 'json') %>"> + <input type="submit" name="reopen" value="<%= t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, 'json') %>"> + </div> + </form> + <% end %> +</div> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb deleted file mode 100644 index 28e251ac2e1..00000000000 --- a/app/views/browse/relation.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<% -@name = printable_name @relation -@title = t('browse.relation.relation') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> -<%= render :partial => "navigation" %> -<h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2> -<%= render :partial => "map", :object => @relation %> -<%= render :partial => "relation_details", :object => @relation %> -<hr /> -<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %> -| <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %> diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb deleted file mode 100644 index 8fb08e6e9c9..00000000000 --- a/app/views/browse/relation_history.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% -@name = printable_name @relation -@title = t('browse.relation_history.relation_history') + ' | ' + @name -%> -<h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2> -<%= render :partial => "map", :object => @relation %> -<% @relation.old_relations.reverse.each do |relation| %> - <%= render :partial => "relation_details", :object => relation %> - <hr /> -<% end %> -<%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %> -| <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %> diff --git a/app/views/browse/start.js.erb b/app/views/browse/start.js.erb deleted file mode 100644 index 8f04d7a8344..00000000000 --- a/app/views/browse/start.js.erb +++ /dev/null @@ -1,533 +0,0 @@ -var browseBoxControl; -var browseMode = "auto"; -var browseBounds; -var browseFeatureList; -var browseActiveFeature; -var browseDataLayer; -var browseSelectControl; -var browseObjectList; -var areasHidden = false; - -OpenLayers.Feature.Vector.style['default'].strokeWidth = 3; -OpenLayers.Feature.Vector.style['default'].cursor = "pointer"; - -function startBrowse() { - map.dataLayer.active = true; - - $("#sidebar_title").html("<%=j t 'browse.start_rjs.data_frame_title' %>"); - $("#sidebar_content").html("<%=j render :partial => "sidebar" %>"); - - openSidebar({ onclose: stopBrowse }); - - var vectors = new OpenLayers.Layer.Vector(); - - browseBoxControl = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, { - handlerOptions: { - sides: 4, - snapAngle: 90, - irregular: true, - persist: true - } - }); - browseBoxControl.handler.callbacks.done = endDrag; - map.addControl(browseBoxControl); - - map.events.register("moveend", map, updateData); - map.events.triggerEvent("moveend"); - - $("#browse_select_view").click(useMap); - - $("#browse_select_box").click(startDrag); - - $("#browse_hide_areas_box").html("<%=j t 'browse.start_rjs.hide_areas' %>"); - $("#browse_hide_areas_box").show(); - $("#browse_hide_areas_box").click(hideAreas); -} - -function updateData() { - if (browseMode == "auto") { - if (map.getZoom() >= 15) { - useMap(false); - } else { - setStatus("<%=j t 'browse.start_rjs.zoom_or_select' %>"); - } - } -} - -function stopBrowse() { - if (map.dataLayer.active) { - map.dataLayer.active = false; - - if (browseSelectControl) { - browseSelectControl.destroy(); - browseSelectControl = null; - } - - if (browseBoxControl) { - browseBoxControl.destroy(); - browseBoxControl = null; - } - - if (browseActiveFeature) { - browseActiveFeature.destroy(); - browseActiveFeature = null; - } - - if (browseDataLayer) { - browseDataLayer.destroy(); - browseDataLayer = null; - } - - map.dataLayer.setVisibility(false); - map.events.unregister("moveend", map, updateData); - } -} - -function startDrag() { - $("#browse_select_box").html("<%=j t 'browse.start_rjs.drag_a_box' %>"); - - browseBoxControl.activate(); - - return false; -} - -function useMap(reload) { - var bounds = map.getExtent(); - var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326); - - if (!browseBounds || !browseBounds.containsBounds(projected)) { - var center = bounds.getCenterLonLat(); - var tileWidth = bounds.getWidth() * 1.2; - var tileHeight = bounds.getHeight() * 1.2; - var tileBounds = new OpenLayers.Bounds(center.lon - (tileWidth / 2), - center.lat - (tileHeight / 2), - center.lon + (tileWidth / 2), - center.lat + (tileHeight / 2)); - - browseBounds = tileBounds; - getData(tileBounds, reload); - - browseMode = "auto"; - - $("#browse_select_view").hide(); - } - - return false; -} - -function hideAreas() { - $("#browse_hide_areas_box").html("<%=j t 'browse.start_rjs.show_areas' %>"); - $("#browse_hide_areas_box").show(); - $("#browse_hide_areas_box").click(showAreas); - - areasHidden = true; - - useMap(true); -} - -function showAreas() { - $("#browse_hide_areas_box").html("<%=j t 'browse.start_rjs.hide_areas' %>"); - $("#browse_hide_areas_box").show(); - $("#browse_hide_areas_box").click(hideAreas); - - areasHidden = false; - - useMap(true); -} - -function endDrag(bbox) { - var bounds = bbox.getBounds(); - var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326); - - browseBoxControl.deactivate(); - browseBounds = projected; - getData(bounds); - - browseMode = "manual"; - - $("#browse_select_box").html("<%=j t 'browse.start_rjs.manually_select' %>"); - $("#browse_select_view").show(); -} - -function displayFeatureWarning(count, limit, callback) { - clearStatus(); - - var div = document.createElement("div"); - - var p = document.createElement("p"); - p.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.loaded_an_area_with_num_features' %>", { num_features: count, max_features: limit }))); - div.appendChild(p); - - var input = document.createElement("input"); - input.type = "submit"; - input.value = "<%=j t 'browse.start_rjs.load_data' %>"; - input.onclick = callback; - div.appendChild(input); - - $("#browse_content").html(""); - $("#browse_content").append(div); -} - -function customDataLoader(resp, options) { - if (map.dataLayer.active) { - var request = resp.priv; - var doc = request.responseXML; - - if (!doc || !doc.documentElement) { - doc = request.responseText; - } - - resp.features = this.format.read(doc); - - if (!this.maxFeatures || resp.features.length <= this.maxFeatures) { - options.callback.call(options.scope, resp); - } else { - displayFeatureWarning(resp.features.length, this.maxFeatures, function () { - options.callback.call(options.scope, resp); - }); - } - } -} - -function getData(bounds, reload) { - var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326")); - var size = projected.getWidth() * projected.getHeight(); - - if (size > <%= MAX_REQUEST_AREA %>) { - setStatus(i18n("<%=j t 'browse.start_rjs.unable_to_load_size', :max_bbox_size => MAX_REQUEST_AREA %>", { bbox_size: size })); - } else { - loadData("/api/<%= API_VERSION %>/map?bbox=" + projected.toBBOX(), reload); - } -} - -function loadData(url, reload) { - setStatus("<%=j t 'browse.start_rjs.loading' %>"); - - $("#browse_content").empty(); - - var formatOptions = { - checkTags: true, - interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid'] - }; - - if (areasHidden) formatOptions.areaTags = []; - - if (!browseDataLayer || reload) { - var style = new OpenLayers.Style(); - - style.addRules([new OpenLayers.Rule({ - symbolizer: { - Polygon: { fillColor: '#ff0000', strokeColor: '#ff0000' }, - Line: { fillColor: '#ffff00', strokeColor: '#000000', strokeOpacity: '0.4' }, - Point: { fillColor: '#00ff00', strokeColor: '#00ff00' } - } - })]); - - if (browseDataLayer) browseDataLayer.destroyFeatures(); - - browseDataLayer = new OpenLayers.Layer.Vector("Data", { - strategies: [ - new OpenLayers.Strategy.Fixed() - ], - protocol: new OpenLayers.Protocol.HTTP({ - url: url, - format: new OpenLayers.Format.OSM(formatOptions), - maxFeatures: <%= @max_features %>, - handleRead: customDataLoader - }), - projection: new OpenLayers.Projection("EPSG:4326"), - displayInLayerSwitcher: false, - styleMap: new OpenLayers.StyleMap({ - 'default': style, - 'select': { strokeColor: '#0000ff', strokeWidth: 8 } - }) - }); - browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded ); - map.addLayer(browseDataLayer); - - browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect }); - browseSelectControl.handlers.feature.stopDown = false; - browseSelectControl.handlers.feature.stopUp = false; - map.addControl(browseSelectControl); - browseSelectControl.activate(); - } else { - browseDataLayer.destroyFeatures(); - browseDataLayer.refresh({ url: url }); - } - - browseActiveFeature = null; -} - -function dataLoaded() { - if (this.map.dataLayer.active) { - clearStatus(); - - browseObjectList = document.createElement("div"); - - var heading = document.createElement("p"); - heading.className = "browse_heading"; - heading.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.object_list.heading' %>")); - browseObjectList.appendChild(heading); - - var list = document.createElement("ul"); - - for (var i = 0; i < this.features.length; i++) { - var feature = this.features[i]; - - // Type, for linking - var type = featureType(feature); - var typeName = featureTypeName(feature); - var li = document.createElement("li"); - li.appendChild(document.createTextNode(typeName + " ")); - - // Link, for viewing in the tab - var link = document.createElement("a"); - link.href = "/browse/" + type + "/" + feature.osm_id; - var name = featureName(feature); - link.appendChild(document.createTextNode(name)); - link.feature = feature; - link.onclick = OpenLayers.Function.bind(viewFeatureLink, link); - li.appendChild(link); - - list.appendChild(li); - } - - browseObjectList.appendChild(list); - - var link = document.createElement("a"); - link.href = this.url; - link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.object_list.api' %>")); - browseObjectList.appendChild(link); - - $("#browse_content").html(browseObjectList); - } -} - -function viewFeatureLink() { - var layer = this.feature.layer; - - for (var i = 0; i < layer.selectedFeatures.length; i++) { - var f = layer.selectedFeatures[i]; - layer.drawFeature(f, layer.styleMap.createSymbolizer(f, "default")); - } - - onFeatureSelect(this.feature); - - if (browseMode != "auto") { - map.setCenter(this.feature.geometry.getBounds().getCenterLonLat()); - } - - return false; -} - -function loadObjectList() { - $("#browse_content").empty(); - $("#browse_content").append(browseObjectList); - - return false; -} - -function onFeatureSelect(feature) { - // Unselect previously selected feature - if (browseActiveFeature) { - browseActiveFeature.layer.drawFeature( - browseActiveFeature, - browseActiveFeature.layer.styleMap.createSymbolizer(browseActiveFeature, "default") - ); - } - - // Redraw in selected style - feature.layer.drawFeature( - feature, feature.layer.styleMap.createSymbolizer(feature, "select") - ); - - // If the current object is the list, don't innerHTML="", since that could clear it. - if ($("#browse_content").firstChild == browseObjectList) { - $("#browse_content").removeChild(browseObjectList); - } else { - $("#browse_content").empty(); - } - - // Create a link back to the object list - var div = document.createElement("div"); - div.style.textAlign = "center"; - div.style.marginBottom = "20px"; - $("#browse_content").append(div); - var link = document.createElement("a"); - link.href = "#"; - link.onclick = loadObjectList; - link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.object_list.back' %>")); - div.appendChild(link); - - var table = document.createElement("table"); - table.width = "100%"; - table.className = "browse_heading"; - $("#browse_content").append(table); - - var tr = document.createElement("tr"); - table.appendChild(tr); - - var heading = document.createElement("td"); - heading.appendChild(document.createTextNode(featureNameSelect(feature))); - tr.appendChild(heading); - - var td = document.createElement("td"); - td.align = "right"; - tr.appendChild(td); - - var type = featureType(feature); - var link = document.createElement("a"); - link.href = "/browse/" + type + "/" + feature.osm_id; - link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.object_list.details' %>")); - td.appendChild(link); - - var div = document.createElement("div"); - div.className = "browse_details"; - - $("#browse_content").append(div); - - // Now the list of attributes - var ul = document.createElement("ul"); - for (var key in feature.attributes) { - var li = document.createElement("li"); - var b = document.createElement("b"); - b.appendChild(document.createTextNode(key)); - li.appendChild(b); - li.appendChild(document.createTextNode(": " + feature.attributes[key])); - ul.appendChild(li); - } - - div.appendChild(ul); - - var link = document.createElement("a"); - link.href = "/browse/" + type + "/" + feature.osm_id + "/history"; - link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.show_history' %>")); - link.onclick = OpenLayers.Function.bind(loadHistory, { - type: type, feature: feature, link: link - }); - - div.appendChild(link); - - // Stash the currently drawn feature - browseActiveFeature = feature; -} - -function loadHistory() { - this.link.href = ""; - this.link.innerHTML = "<%=j t 'browse.start_rjs.wait' %>"; - - $.ajax("/api/<%= API_VERSION %>/" + this.type + "/" + this.feature.osm_id + "/history", { - complete: OpenLayers.Function.bind(displayHistory, this) - }); - - return false; -} - -function displayHistory(request) { - if (browseActiveFeature.osm_id != this.feature.osm_id || $("#browse_content").firstChild == browseObjectList) { - return false; - } - - this.link.parentNode.removeChild(this.link); - - var doc = request.responseXML; - - var table = document.createElement("table"); - table.width = "100%"; - table.className = "browse_heading"; - $("#browse_content").append(table); - - var tr = document.createElement("tr"); - table.appendChild(tr); - - var heading = document.createElement("td"); - heading.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.history_for_feature' %>", { feature: featureNameHistory(this.feature) }))); - tr.appendChild(heading); - - var td = document.createElement("td"); - td.align = "right"; - tr.appendChild(td); - - var link = document.createElement("a"); - link.href = "/browse/" + this.type + "/" + this.feature.osm_id + "/history"; - link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.details' %>")); - td.appendChild(link); - - var div = document.createElement("div"); - div.className = "browse_details"; - - var nodes = doc.getElementsByTagName(this.type); - var history = document.createElement("ul"); - for (var i = nodes.length - 1; i >= 0; i--) { - var user = nodes[i].getAttribute("user") || "<%=j t 'browse.start_rjs.private_user' %>"; - var timestamp = nodes[i].getAttribute("timestamp"); - var item = document.createElement("li"); - item.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.edited_by_user_at_timestamp' %>", { user: user, timestamp: timestamp }))); - history.appendChild(item); - } - div.appendChild(history); - - $("#browse_content").append(div); -} - -function featureType(feature) { - if (feature.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") { - return "node"; - } else { - return "way"; - } -} - -function featureTypeName(feature) { - if (featureType(feature) == "node") { - return "<%=j t 'browse.start_rjs.object_list.type.node' %>"; - } else if (featureType(feature) == "way") { - return "<%=j t 'browse.start_rjs.object_list.type.way' %>"; - } -} - -function featureName(feature) { - if (feature.attributes['name:<%= I18n.locale %>']) { - return feature.attributes['name:<%= I18n.locale %>']; - } else if (feature.attributes.name) { - return feature.attributes.name; - } else { - return feature.osm_id; - } -} - -function featureNameSelect(feature) { - if (feature.attributes['name:<%= I18n.locale %>']) { - return feature.attributes['name:<%= I18n.locale %>']; - } else if (feature.attributes.name) { - return feature.attributes.name; - } else if (featureType(feature) == "node") { - return i18n("<%=j t 'browse.start_rjs.object_list.selected.type.node' %>", { id: feature.osm_id }); - } else if (featureType(feature) == "way") { - return i18n("<%=j t 'browse.start_rjs.object_list.selected.type.way' %>", { id: feature.osm_id }); - } -} - -function featureNameHistory(feature) { - if (feature.attributes['name:<%= I18n.locale %>']) { - return feature.attributes['name:<%= I18n.locale %>']; - } else if (feature.attributes.name) { - return feature.attributes.name; - } else if (featureType(feature) == "node") { - return i18n("<%=j t 'browse.start_rjs.object_list.history.type.node' %>", { id: feature.osm_id }); - } else if (featureType(feature) == "way") { - return i18n("<%=j t 'browse.start_rjs.object_list.history.type.way' %>", { id: feature.osm_id }); - } -} - -function setStatus(status) { - $("#browse_status").html(status); - $("#browse_status").show(); -} - -function clearStatus() { - $("#browse_status").html(""); - $("#browse_status").hide(); -} - -startBrowse(); diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb deleted file mode 100644 index 167ac6959f0..00000000000 --- a/app/views/browse/way.html.erb +++ /dev/null @@ -1,17 +0,0 @@ -<% -@name = printable_name @way -@title = t('browse.way.way') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> -<%= render :partial => "navigation" %> -<h2><%= t'browse.way.way_title', :way_name => @name %></h2> -<%= render :partial => "map", :object => @way %> -<%= render :partial => "way_details", :object => @way %> -<hr /> -<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %> -| <%= link_to(t('browse.way.view_history'), :action => "way_history") %> -<% unless @midnode.nil? -%> -| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %> -<% end -%> diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb deleted file mode 100644 index f581dd18961..00000000000 --- a/app/views/browse/way_history.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% -@name = printable_name @way -@title = t('browse.way_history.way_history') + ' | ' + @name -%> -<h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2> -<%= render :partial => "map", :object => @way %> -<% @way.old_ways.reverse.each do |way| %> - <%= render :partial => "way_details", :object => way %> - <hr /> -<% end %> -<%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %> -| <%= link_to(t('browse.way_history.view_details'), :action => "way") %> diff --git a/app/views/changeset/_bbox.atom.builder b/app/views/changeset/_bbox.atom.builder deleted file mode 100644 index de3b1f11292..00000000000 --- a/app/views/changeset/_bbox.atom.builder +++ /dev/null @@ -1 +0,0 @@ -xml.a(bbox.to_s, :href => url_for(:controller => "site", :action => "index", :minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => "yes")) diff --git a/app/views/changeset/_bbox.html.erb b/app/views/changeset/_bbox.html.erb deleted file mode 100644 index f9424befd88..00000000000 --- a/app/views/changeset/_bbox.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= link_to bbox.to_s, :controller => "site", :action => "index", :minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => "yes" %> diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb index 88447dde695..cbc60695b80 100644 --- a/app/views/changeset/_changeset.html.erb +++ b/app/views/changeset/_changeset.html.erb @@ -1,48 +1,26 @@ -<% cl = cycle('table0', 'table1') %> +<% + changeset_data = {:id => changeset.id} -<tr class="<%= cl %>" id="tr-changeset-<%= changeset.id%>"> - <td> - <%= - id_link = link_to(changeset.id, - {:controller => 'browse', :action => 'changeset', :id => changeset.id}, - {:title => t('changeset.changeset.view_changeset_details')}) - raw t 'changeset.changeset.id', :id => id_link - %> - </td> + if changeset.has_valid_bbox? + bbox = changeset.bbox.to_unscaled + changeset_data[:bbox] = { + :minlon => bbox.min_lon, + :minlat => bbox.min_lat, + :maxlon => bbox.max_lon, + :maxlat => bbox.max_lat + } + end +%> - <td class="date"> - <span class="date"> - <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %> - <% else %><%= l changeset.closed_at, :format => :long %><% end %> - </span> - - <%if showusername %> - <br /> - <span class="user"> - <% if changeset.user.data_public? %> - <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %> - <% else %> - <i><%= t'changeset.changeset.anonymous' %></i> - <% end %> - </span> - <% end %> - </td> - - <td class="comment"> - <% if changeset.tags['comment'].to_s != '' %> - <%= linkify(h(changeset.tags['comment'])) %> - <% else %> - <%= t'changeset.changeset.no_comment' %> - <% end %> - </td> -</tr> - -<script type="text/javascript"> -$("#tr-changeset-<%= changeset.id%>").mouseover(function() { - highlightChangeset("<%= changeset.id %>"); -}); - -$("#tr-changeset-<%= changeset.id%>").mouseout(function() { - unHighlightChangeset("<%= changeset.id %>"); -}); -</script> +<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %> + <h4> + <a class="changeset_id" href="<%= changeset_path(changeset.id) %>"> + <%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %> + </a> + </h4> + <div class="details"> + <%= changeset_details(changeset) %> + · + #<%= changeset.id %> + </div> +<% end %> diff --git a/app/views/changeset/_changesets.html.erb b/app/views/changeset/_changesets.html.erb deleted file mode 100644 index 2bd40dafc31..00000000000 --- a/app/views/changeset/_changesets.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% showusername = true if showusername.nil? %> -<table id="changeset_list"> - <%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %> -</table> diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb deleted file mode 100644 index d20813d6205..00000000000 --- a/app/views/changeset/_map.html.erb +++ /dev/null @@ -1,88 +0,0 @@ -<%= javascript_include_tag 'openlayers.js' %> -<%= javascript_include_tag 'map.js' %> - -<div id="changeset_list_map"> -</div> - -<script type="text/javascript"> - OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>"); - - var highlight; - - function highlightChangeset(id) { - var feature = vectors.getFeatureByFid(id); - var bounds = feature.geometry.getBounds(); - - if (bounds.containsBounds(map.getExtent())) { - bounds = map.getExtent().scale(1.1); - } - - if (highlight) vectors.removeFeatures(highlight); - - highlight = new OpenLayers.Feature.Vector(bounds.toGeometry(), {}, { - strokeWidth: 2, - strokeColor: "#ee9900", - fillColor: "#ffff55", - fillOpacity: 0.5 - }); - - vectors.addFeatures(highlight); - - $("#tr-changeset-" + id).addClass("selected"); - } - - function unHighlightChangeset(id) { - vectors.removeFeatures(highlight); - - $("#tr-changeset-" + id).removeClass("selected"); - } - - $(document).ready(function () { - var map = createMap("changeset_list_map", { - controls: [ - new OpenLayers.Control.Navigation(), - new OpenLayers.Control.Zoom(), - new OpenLayers.Control.PanZoomBar() - ] - }); - - var bounds = new OpenLayers.Bounds(); - - <% @edits.each do |edit| %> - <% if edit.has_valid_bbox? %> - <% bbox = edit.bbox.to_unscaled %> - var minlon = <%= bbox.min_lon %>; - var minlat = <%= bbox.min_lat %>; - var maxlon = <%= bbox.max_lon %>; - var maxlat = <%= bbox.max_lat %>; - var bbox = new OpenLayers.Bounds(minlon, minlat, maxlon, maxlat); - - bounds.extend(bbox); - - addBoxToMap(bbox, "<%= edit.id %>", true); - <% end %> - <% end %> - - vectors.events.on({ - "featureselected": function(feature) { - highlightChangeset(feature.feature.fid); - }, - "featureunselected": function(feature) { - unHighlightChangeset(feature.feature.fid); - } - }); - - var selectControl = new OpenLayers.Control.SelectFeature(vectors, { - multiple: false, - hover: true - }); - map.addControl(selectControl); - selectControl.activate(); - - <% if ! @bbox.nil? %> - map.zoomToExtent(proj(new OpenLayers.Bounds(<%= @bbox %>))); - <% else %> - map.zoomToExtent(proj(bounds)); - <% end %> - }); -</script> diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb new file mode 100644 index 00000000000..77118b4b4b5 --- /dev/null +++ b/app/views/changeset/history.html.erb @@ -0,0 +1,30 @@ +<% content_for :auto_discovery_link_tag do -%> + <% unless params[:friends] or params[:nearby] -%> + <%= auto_discovery_link_tag :atom, params.merge(:max_id => nil, :xhr => nil, :action => :feed) %> + <% end -%> +<% end -%> + +<% + if params[:friends] and @user + set_title(t 'changeset.list.title_friend') + @heading = t 'changeset.list.title_friend' + elsif params[:nearby] and @user + set_title(t 'changeset.list.title_nearby') + @heading = t 'changeset.list.title_nearby' + elsif params[:display_name] + set_title(t 'changeset.list.title_user', :user => params[:display_name]) + @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe + else + set_title(t 'changeset.list.title') + @heading = t 'changeset.list.title' + end +%> + +<h2> + <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a> + <%= @heading %> +</h2> + +<div class="changesets"> + <%= image_tag "searching.gif", :class => "loader" %> +</div> diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder index 591f269b611..619dc4a082d 100644 --- a/app/views/changeset/list.atom.builder +++ b/app/views/changeset/list.atom.builder @@ -4,12 +4,6 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, "xmlns:georss" => "http://www.georss.org/georss") do |feed| feed.title @title - feed.subtitle :type => 'xhtml' do |xhtml| - xhtml.p do |p| - p << @description - end - end - feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max feed.icon "http://#{SERVER_URL}/favicon.ico" feed.logo "http://#{SERVER_URL}/images/mag_map-rss2.0.png" @@ -46,16 +40,16 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, xhtml.style "th { text-align: left } tr { vertical-align: top }" xhtml.table do |table| table.tr do |tr| - tr.th t("browse.changeset_details.created_at") + tr.th t("browse.created") tr.td l(changeset.created_at) end table.tr do |tr| - tr.th t("browse.changeset_details.closed_at") + tr.th t("browse.closed") tr.td l(changeset.closed_at) end if changeset.user.data_public? table.tr do |tr| - tr.th t("browse.changeset_details.belongs_to") + tr.th t("browse.changeset.belongs_to") tr.td do |td| td.a h(changeset.user.display_name), :href => url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false) end diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb index bf8adbe20a3..36ec593793f 100644 --- a/app/views/changeset/list.html.erb +++ b/app/views/changeset/list.html.erb @@ -1,19 +1,17 @@ -<h1><%= @heading %></h1> -<p><%= raw(@description) %></p> - -<%= render :partial => 'changeset_paging_nav' %> - -<div id="changeset_list_container"> - <%= render :partial => 'map' %> - <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %> -</div> - -<%= render :partial => 'changeset_paging_nav' %> - -<% unless params[:friends] or params[:nearby] -%> -<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %> - -<% content_for :head do -%> -<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %> -<% end -%> +<% if @edits.present? %> + <ol class="changesets"> + <%= render :partial => 'changeset', :collection => @edits %> + </ol> +<% if @edits.size == 20 -%> + <div class="changeset_more"> + <%= link_to t('changeset.list.load_more'), url_for(params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %> + <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %> + </div> <% end -%> +<% elsif params[:bbox] %> + <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more_area' : 'changeset.list.empty_area') %></div> +<% elsif params[:display_name] %> + <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more_user' : 'changeset.list.empty_user') %></div> +<% else %> + <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more' : 'changeset.list.empty') %></div> +<% end %> diff --git a/app/views/changeset/timeout.html.erb b/app/views/changeset/timeout.html.erb index a5225572247..3ba59fae765 100644 --- a/app/views/changeset/timeout.html.erb +++ b/app/views/changeset/timeout.html.erb @@ -1 +1 @@ -<p><%= t'changeset.timeout.sorry' %></p> +<p><%= t'changeset.timeout.sorry' %></p> \ No newline at end of file diff --git a/app/views/diary_entry/_diary_comment.html.erb b/app/views/diary_entry/_diary_comment.html.erb index 163af888f31..c651c294304 100644 --- a/app/views/diary_entry/_diary_comment.html.erb +++ b/app/views/diary_entry/_diary_comment.html.erb @@ -1,7 +1,8 @@ -<%= user_thumbnail diary_comment.user %> -<h4 id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => l(diary_comment.created_at, :format => :friendly))) %></h4> -<%= diary_comment.body.to_html %> -<%= if_administrator(:span) do %> - <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %> -<% end %> -<hr /> +<div class="clearfix diary-comment"> + <%= user_thumbnail diary_comment.user %> + <p class="deemphasize comment-heading" id="comment<%= diary_comment.id %>"><%= raw(t('diary_entry.diary_comment.comment_from', :link_user => (link_to h(diary_comment.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_comment.user.display_name), :comment_created_at => link_to(l(diary_comment.created_at, :format => :friendly), :anchor => "comment#{diary_comment.id}"))) %></p> + <div class="richtext"><%= diary_comment.body.to_html %></div> + <%= if_administrator(:span) do %> + <%= link_to t('diary_entry.diary_comment.hide_link'), hide_diary_comment_path(:display_name => diary_comment.diary_entry.user.display_name, :id => diary_comment.diary_entry.id, :comment => diary_comment.id), :method => :post, :data=> { :confirm => t('diary_entry.diary_comment.confirm') } %> + <% end %> +</div> diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb index eae60e8221a..410e1304766 100644 --- a/app/views/diary_entry/_diary_entry.html.erb +++ b/app/views/diary_entry/_diary_entry.html.erb @@ -1,30 +1,38 @@ -<b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br /> +<div class='diary_post'> + <div class='post_heading clearfix'> + <% if !@this_user %> + <%= user_thumbnail diary_entry.user %> + <% end %> -<div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>"> - <%= diary_entry.body.to_html %> -</div> + <h2><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></h2> + + <small class='deemphasize'> + <%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %> + </small> + + </div> + + <div class="richtext" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>"> + <%= diary_entry.body.to_html %> + </div> -<% if diary_entry.latitude and diary_entry.longitude %> - <%= render :partial => "location", :object => diary_entry %> - <br /> -<% end %> - -<%= raw(t 'diary_entry.diary_entry.posted_by', :link_user => (link_to h(diary_entry.user.display_name), :controller => 'user', :action => 'view', :display_name => diary_entry.user.display_name), :created => l(diary_entry.created_at, :format => :friendly), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entry', :action => 'list', :display_name => nil, :language => diary_entry.language_code)) %> - -<% if params[:action] == 'list' %> - <br /> - <%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %> - | - <%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %> - | - <%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %> -<% end %> -<%= if_user(diary_entry.user, :span) do %> - | <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %> -<% end %> -<%= if_administrator(:span) do %> - | <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %> -<% end %> - -<br /> -<hr /> + <% if diary_entry.latitude and diary_entry.longitude %> + <%= render :partial => "location", :object => diary_entry %> + <% end %> + + <ul class='secondary-actions clearfix'> + <% if params[:action] == 'list' %> + <li><%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li> + <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %></li> + <li><%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li> + <% end %> + + <%= if_user(diary_entry.user, :li) do %> + <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %> + <% end %> + + <%= if_administrator(:li) do %> + <%= link_to t('diary_entry.diary_entry.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('diary_entry.diary_entry.confirm') } %> + <% end %> + </ul> +</div> diff --git a/app/views/diary_entry/_diary_list_entry.html.erb b/app/views/diary_entry/_diary_list_entry.html.erb index 49644327276..ca583ef47a7 100644 --- a/app/views/diary_entry/_diary_list_entry.html.erb +++ b/app/views/diary_entry/_diary_list_entry.html.erb @@ -1,2 +1 @@ -<%= user_thumbnail diary_list_entry.user %> -<%= render :partial => "diary_entry", :object => diary_list_entry %> +<%= render :partial => "diary_entry", :object => diary_list_entry %> \ No newline at end of file diff --git a/app/views/diary_entry/_location.html.erb b/app/views/diary_entry/_location.html.erb index 4779471de21..a3ba473a8a6 100644 --- a/app/views/diary_entry/_location.html.erb +++ b/app/views/diary_entry/_location.html.erb @@ -2,8 +2,6 @@ <a href="<%= url_for :controller => 'site', :action => 'index', :lat => location.latitude, :lon => location.longitude, :zoom => 14 %>"> <abbr class="geo" title="<%= number_with_precision(location.latitude, :precision => 4) %>; <%= number_with_precision(location.longitude, :precision => 4) %>"> -<% cache(:controller => 'diary_entry', :action => 'view', :display_name => location.user.display_name, :id => location.id, :part => "location") do %> <%= describe_location location.latitude, location.longitude, 14, location.language_code %> -<% end %> </abbr> </a> diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb index f477ab8b63e..9dc800cff56 100644 --- a/app/views/diary_entry/comments.html.erb +++ b/app/views/diary_entry/comments.html.erb @@ -1,23 +1,24 @@ -<h1><%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %></h1> +<% content_for :heading do %> + <h1><%= t('diary_entry.comments.has_commented_on', :display_name => @this_user.display_name) %></h1> +<% end %> -<table width="100%"> +<table class="messages" width="100%"> <tr> - <th><%= t 'diary_entry.comments.post' %></th> - <th><%= t 'diary_entry.comments.when' %></th> - <th><%= t 'diary_entry.comments.comment' %></th> + <th width="25%"><%= t 'diary_entry.comments.post' %></th> + <th width="25%"><%= t 'diary_entry.comments.when' %></th> + <th width="50%"><%= t 'diary_entry.comments.comment' %></th> </tr> <% @comments.each do |comment| -%> <% cl = cycle('table0', 'table1') %> <tr class="<%= cl %>"> - <td><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td> - <td><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td> - <td><%= comment.body.to_html %></td> + <td width="25%"><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td> + <td width="25%"><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td> + <td width="50%" class="richtext"><%= comment.body.to_html %></td> </tr> <% end -%> </table> -<%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %> -<% if @comment_pages.current.next and @comment_pages.current.previous %> -| -<% end %> -<%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %> +<div class='secondary-actions clearfix'> + <span><%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %> + <%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %></span> +</div> diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb index 6b4d9c17793..4021eaa4d30 100644 --- a/app/views/diary_entry/edit.html.erb +++ b/app/views/diary_entry/edit.html.erb @@ -1,94 +1,48 @@ -<h1><%= @title %></h1> - -<%= error_messages_for 'diary_entry' %> - -<%= form_for :diary_entry do |f| %> - <table class="diary_entry"> - <tr valign="top"> - <td class="fieldName"><%= t 'diary_entry.edit.subject' -%></td> - <td><%= f.text_field :title, :size => 60 %></td> - </tr> - <tr valign="top"> - <td class="fieldName"><%= t 'diary_entry.edit.body' -%></td> - <td><%= richtext_area :diary_entry, :body, :cols => 80, :format => @diary_entry.body_format %></td> - </tr> - <tr valign="top"> - <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td> - <td><%= f.collection_select :language_code, Language.order(:english_name), :code, :name %></td> - </tr> - <tr valign="top"> - <td class="fieldName"><%= t 'diary_entry.edit.location' -%></td> - <td> - <div id="map"></div> - <span class="location"><%= t 'diary_entry.edit.latitude' -%> <%= f.text_field :latitude, :size => 20, :id => "latitude" %> <%= t 'diary_entry.edit.longitude' -%> <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span> - <a href="javascript:openMap()" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a> - <br/><br/> - </td> - </tr> - <tr> - <td></td> - <td> - <%= submit_tag t('diary_entry.edit.save_button') %> - <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %> - </td> - </tr> - </table> +<% content_for :head do %> + <%= javascript_include_tag "diary_entry" %> <% end %> -<% if @diary_entry.latitude and @diary_entry.longitude %> - <% lon = @diary_entry.longitude %> - <% lat = @diary_entry.latitude %> - <% zoom = '12' %> -<% elsif @user.home_lat.nil? or @user.home_lon.nil? %> - <% lon = h(params['lon'] || '-0.1') %> - <% lat = h(params['lat'] || '51.5') %> - <% zoom = h(params['zoom'] || '4') %> -<% else %> - <% lon = @user.home_lon %> - <% lat = @user.home_lat %> - <% zoom = '12' %> +<% content_for :heading do %> + <h1><%= @title %></h1> <% end %> -<%= javascript_include_tag 'openlayers.js' %> -<%= javascript_include_tag 'map.js' %> - -<script type="text/javascript"> - <!-- - var marker; - - OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>"); - - function setLocation( e ) { - closeMapPopup(); - - var lonlat = getEventPosition(e); - - $("#latitude").val(lonlat.lat); - $("#longitude").val(lonlat.lon); - - if (marker) { - removeMarkerFromMap(marker); - } - - marker = addMarkerToMap(lonlat, null, "<%= t 'diary_entry.edit.marker_text' -%>"); - } - - function openMap() { - $("#map").show(); - $("#usemap").hide(); - - var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>); - var zoom = <%= zoom %>; - - var map = createMap("map"); - - setMapCenter(centre, zoom); - - <% if @diary_entry.latitude and @diary_entry.longitude %> - marker = addMarkerToMap(centre, null, "<%= t 'diary_entry.edit.marker_text' -%>"); - <% end %> +<%= error_messages_for 'diary_entry' %> - map.events.register("click", map, setLocation); - } -// --> -</script> +<%= form_for :diary_entry do |f| %> + <div class="diary_entry standard-form"> + <fieldset> + <div class='form-row'> + <label class="standard-label"><%= t 'diary_entry.edit.subject' -%></label> + <%= f.text_field :title, :class => "richtext_title" %> + </div> + <div class='form-row'> + <label class="standard-label"><%= t 'diary_entry.edit.body' -%></label> + <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %> + </div> + <div class='form-row'> + <label class="standard-label"><%= t 'diary_entry.edit.language' -%></label> + <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %> + </div> + </fieldset> + <fieldset class='location'> + <label class="standard-label"><%= t 'diary_entry.edit.location' -%></label> + <%= content_tag "div", "", :id => "map", :data => {:lat => @lat, :lon => @lon, :zoom => @zoom} %> + <div class='form-row clearfix'> + <div class='form-column'> + <label class="secondary standard-label"><%= t 'diary_entry.edit.latitude' -%></label> + <%= f.text_field :latitude, :size => 20, :id => "latitude" %> + </div> + <div class='form-column'> + <label class="secondary standard-label"><%= t 'diary_entry.edit.longitude' -%></label> + <%= f.text_field :longitude, :size => 20, :id => "longitude" %> + </div> + <div class='form-column'> + <a href="#" id="usemap"><%= t 'diary_entry.edit.use_map_link' -%></a> + </div> + </div> + </fieldset> + + <%= submit_tag t('diary_entry.edit.save_button') %> + <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %> + </div> +<% end %> diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 9de2efea541..0f3415fb64a 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -1,25 +1,32 @@ -<% if @this_user %> - <%= user_image @this_user %> -<% end %> - -<h2><%= h(@title) %></h2> - -<% if @this_user %> - <%= if_user(@this_user) do %> - <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> - <% end %> -<% else %> - <%= if_logged_in do %> - <%= link_to image_tag("new.png", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %> - <% end %> +<% content_for :heading do %> + <div <% if @this_user %> id="userinformation"<% end %> > + <% if @this_user %> + <%= user_image @this_user %> + <% end %> + <h1><%= h(@title) %></h1> + + <ul class='secondary-actions clearfix'> + <% unless params[:friends] or params[:nearby] -%> + <li><%= rss_link_to :action => 'rss', :language => params[:language] %></li> + <% end -%> + + <% if @this_user %> + <%= if_user(@this_user) do %> + <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li> + <% end %> + <% else %> + <%= if_logged_in do %> + <li><%= link_to image_tag("new.png", :class => "small_icon", :border=>0) + t('diary_entry.list.new'), {:controller => 'diary_entry', :action => 'new'}, {:title => t('diary_entry.list.new_title')} %></li> + <% end %> + <% end %> + </ul> + </div> <% end %> <% if @entries.empty? %> - <p><%= t 'diary_entry.list.no_entries' %></p> + <h4><%= t 'diary_entry.list.no_entries' %></h4> <% else %> - <p><%= t 'diary_entry.list.recent_entries' %></p> - - <hr /> + <h4><%= t 'diary_entry.list.recent_entries' %></h4> <% if @this_user %> <%= render :partial => 'diary_entry', :collection => @entries %> @@ -27,17 +34,23 @@ <%= render :partial => 'diary_list_entry', :collection => @entries %> <% end %> - <%= link_to t('diary_entry.list.older_entries'), { :page => @entry_pages.current.next, :language => params[:language] } if @entry_pages.current.next %> - <% if @entry_pages.current.next and @entry_pages.current.previous %>|<% end %> - <%= link_to t('diary_entry.list.newer_entries'), { :page => @entry_pages.current.previous, :language => params[:language] } if @entry_pages.current.previous %> + <% if @entries.size < @page_size -%> + <%= t('diary_entry.list.older_entries') %> + <% else -%> + <%= link_to t('diary_entry.list.older_entries'), params.merge(:page => @page + 1 ) %> + <% end -%> + + | - <br /> + <% if @page > 1 -%> + <%= link_to t('diary_entry.list.newer_entries'), params.merge(:page => @page - 1) %> + <% else -%> + <%= t('diary_entry.list.newer_entries') %> + <% end -%> <% end %> <% unless params[:friends] or params[:nearby] -%> -<%= rss_link_to :action => 'rss', :language => params[:language] %> - -<% content_for :head do -%> -<%= auto_discovery_link_tag :atom, :action => 'rss', :language => params[:language] %> -<% end -%> + <% content_for :auto_discovery_link_tag do -%> + <%= auto_discovery_link_tag :rss, :action => 'rss', :language => params[:language] %> + <% end -%> <% end -%> diff --git a/app/views/diary_entry/no_such_entry.html.erb b/app/views/diary_entry/no_such_entry.html.erb index eef0e47d2d7..ff9a811c76a 100644 --- a/app/views/diary_entry/no_such_entry.html.erb +++ b/app/views/diary_entry/no_such_entry.html.erb @@ -1,2 +1,5 @@ -<h2><%= t 'diary_entry.no_such_entry.heading', :id => h(params[:id]) %></h2> +<% content_for :heading do %> + <h2><%= t 'diary_entry.no_such_entry.heading', :id => h(params[:id]) %></h2> +<% end %> + <p><%= t 'diary_entry.no_such_entry.body', :id => h(params[:id]) %></p> diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder index 7ee36e9bdb2..35f05028da5 100644 --- a/app/views/diary_entry/rss.rss.builder +++ b/app/views/diary_entry/rss.rss.builder @@ -6,24 +6,24 @@ xml.rss("version" => "2.0", xml.channel do xml.title @title xml.description @description - xml.link url_for(:action => "list", :only_path => false) + xml.link url_for(:action => "list", :host => SERVER_URL) xml.image do xml.url "http://www.openstreetmap.org/images/mag_map-rss2.0.png" xml.title "OpenStreetMap" xml.width "100" xml.height "100" - xml.link url_for(:action => "list", :only_path => false) + xml.link url_for(:action => "list", :host=> SERVER_URL) end for entry in @entries xml.item do xml.title h(entry.title) - xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false) - xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false) + xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL) + xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL) xml.description entry.body.to_html xml.author entry.user.display_name xml.pubDate entry.created_at.to_s(:rfc822) - xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false) + xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL) if entry.latitude and entry.longitude xml.geo :lat, entry.latitude.to_s diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb index 1bce441b425..d12942a7b9b 100644 --- a/app/views/diary_entry/view.html.erb +++ b/app/views/diary_entry/view.html.erb @@ -1,26 +1,32 @@ -<%= user_image @entry.user %> - -<h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2> +<% content_for :heading do %> + <div id="userinformation" > + <%= user_image @entry.user %> + <h2><%= link_to t('diary_entry.view.user_title', :user => h(@entry.user.display_name)), :action => :list %></h2> + <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p> + </div> +<% end %> <%= render :partial => 'diary_entry', :object => @entry %> <a id="comments"></a> - +<div class='comments'> <%= render :partial => 'diary_comment', :collection => @entry.visible_comments %> - +</div> <%= if_logged_in(:div) do %> - <h4 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h4> + <h3 id="newcomment"><%= t 'diary_entry.view.leave_a_comment' %></h3> <%= error_messages_for 'diary_comment' %> <%= form_for :diary_comment, :url => { :action => 'comment' } do |f| %> <%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %> - <br /> - <br /> <%= submit_tag t('diary_entry.view.save_button') %> <% end %> <% end %> <%= if_not_logged_in(:div) do %> - <h4 id="newcomment"><%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h4> + <h3 id="newcomment"><%= raw t("diary_entry.view.login_to_leave_a_comment", :login_link => link_to(t("diary_entry.view.login"), :controller => 'user', :action => 'login', :referer => request.fullpath)) %></h3> <% end %> + +<% content_for :auto_discovery_link_tag do -%> +<%= auto_discovery_link_tag :rss, :action => :rss, :display_name => @entry.user.display_name %> +<% end -%> diff --git a/app/views/directions/search.html.erb b/app/views/directions/search.html.erb new file mode 100644 index 00000000000..ea6ee708842 --- /dev/null +++ b/app/views/directions/search.html.erb @@ -0,0 +1 @@ +<% content_for(:content_class) { "overlay-sidebar" } %> diff --git a/app/views/export/_sidebar.html.erb b/app/views/export/_sidebar.html.erb deleted file mode 100644 index 539c6f44855..00000000000 --- a/app/views/export/_sidebar.html.erb +++ /dev/null @@ -1,78 +0,0 @@ -<%= form_tag :action => "finish" do %> - - <p class="export_heading"><%= t'export.start.area_to_export' %></p> - - <div class="export_bounds"> - <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %> - <br/> - <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %> - <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %> - <br/> - <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %> - <p class="export_hint"> - <a id="drag_box" href="#"><%= t'export.start.manually_select' %></a> - </p> - </div> - - <p class="export_heading"><%= t'export.start.format_to_export' %></p> - - <div class="export_details"> - <p> - <%= radio_button_tag("format", "osm") %> <%= t'export.start.osm_xml_data' %> - <br/> - <%= radio_button_tag("format", "mapnik") %> <%= t'export.start.map_image' %> - <br/> - <%= radio_button_tag("format", "html") %> <%= t'export.start.embeddable_html' %> - </p> - </div> - - <div id="export_osm"> - <p class="export_heading"><%= t'export.start.licence' %></p> - - <div class="export_details"> - <p><%= raw t'export.start.export_details' %></p> - </div> - - <div id="export_osm_too_large"> - <p class="export_heading"><%= t'export.start.too_large.heading' %></p> - - <div class="export_details"> - <p><%= t'export.start.too_large.body' %></p> - </div> - </div> - </div> - - <div id="export_mapnik"> - <p class="export_heading"><%= t'export.start.options' %></p> - - <div class="export_details"> - <p><%= t'export.start.format' %> <%= select_tag("mapnik_format", options_for_select([["PNG", "png"], ["JPEG", "jpeg"], ["SVG", "svg"], ["PDF", "pdf"]], "png")) %></p> - <p><%= t'export.start.scale' %> 1 : <%= text_field_tag("mapnik_scale", nil, :size => 8) %> <span class="export_hint">(<%= t'export.start.max' %> 1 : <span id="mapnik_max_scale"></span>)</span></p> - <p><%= t'export.start.image_size' %> <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span></p> - </div> - </div> - - <div id="export_html"> - <p class="export_heading"><%= t'export.start.options' %></p> - - <div class="export_details"> - <p><a id="add_marker" href="#"><%= t'export.start.add_marker' %></a></p> - <p id="marker_inputs" style="display:none"> - <%= t'export.start.latitude' %> <input type="text" id="marker_lat" size="9" /> - <%= t'export.start.longitude' %> <input type="text" id="marker_lon" size="9" /> - </p> - </div> - - <p class="export_heading"><%= t'export.start.output' %></p> - - <div class="export_details"> - <p><input type="text" id="export_html_text" style="width:95%" /></p> - <p><%= t'export.start.paste_html' %></p> - </div> - </div> - - <div class="export_buttons"> - <p><%= submit_tag t('export.start.export_button'), :id => "export_commit" %></p> - </div> - -<% end %> diff --git a/app/views/export/embed.html.erb b/app/views/export/embed.html.erb new file mode 100644 index 00000000000..6c3ebdd1602 --- /dev/null +++ b/app/views/export/embed.html.erb @@ -0,0 +1,12 @@ +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta charset="utf-8"> + <title>OpenStreetMap Embedded + <%= stylesheet_link_tag "embed", :media=> "screen" %> + <%= javascript_include_tag "embed" %> + + +
+ + diff --git a/app/views/export/start.js.erb b/app/views/export/start.js.erb deleted file mode 100644 index e433a498fdb..00000000000 --- a/app/views/export/start.js.erb +++ /dev/null @@ -1,326 +0,0 @@ -var vectors; -var box; -var transform; -var markerLayer; -var markerControl; - -function startExport() { - vectors = new OpenLayers.Layer.Vector("Vector Layer", { - displayInLayerSwitcher: false - }); - map.addLayer(vectors); - - box = new OpenLayers.Control.DrawFeature(vectors, OpenLayers.Handler.RegularPolygon, { - handlerOptions: { - sides: 4, - snapAngle: 90, - irregular: true, - persist: true - } - }); - box.handler.callbacks.done = endDrag; - map.addControl(box); - - transform = new OpenLayers.Control.TransformFeature(vectors, { - rotate: false, - irregular: true - }); - transform.events.register("transformcomplete", transform, transformComplete); - map.addControl(transform); - - map.events.register("moveend", map, mapMoved); - map.events.register("changebaselayer", map, htmlUrlChanged); - - $("#sidebar_title").html("<%=j t 'export.start_rjs.export' %>"); - $("#sidebar_content").html("<%=j render :partial => "sidebar" %>"); - - $("#maxlat").change(boundsChanged); - $("#minlon").change(boundsChanged); - $("#maxlon").change(boundsChanged); - $("#minlat").change(boundsChanged); - - $("#drag_box").click(startDrag); - - $("#add_marker").click(startMarker); - - $("#format_osm").click(formatChanged); - $("#format_mapnik").click(formatChanged); - $("#format_html").click(formatChanged); - - $("#mapnik_scale").change(mapnikSizeChanged); - - openSidebar({ onclose: stopExport }); - - if (map.baseLayer.name == "Mapnik") { - $("#format_mapnik").prop("checked", true); - } - - formatChanged(); - setBounds(map.getExtent()); - - $("#viewanchor").removeClass("active"); - $("#exportanchor").addClass("active"); -} - -function stopExport() { - $("#viewanchor").addClass("active"); - $("#exportanchor").removeClass("active"); - - clearBox(); - clearMarker(); - map.events.unregister("moveend", map, mapMoved); - map.events.unregister("changebaselayer", map, htmlUrlChanged); - map.removeLayer(vectors); -} - -function boundsChanged() { - var epsg4326 = new OpenLayers.Projection("EPSG:4326"); - var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), - $("#maxlon").val(), $("#maxlat").val()); - - bounds.transform(epsg4326, map.getProjectionObject()); - - map.events.unregister("moveend", map, mapMoved); - map.zoomToExtent(bounds); - - clearBox(); - drawBox(bounds); - - validateControls(); - mapnikSizeChanged(); -} - -function startDrag() { - $("#drag_box").html("<%=j t 'export.start_rjs.drag_a_box' %>"); - - clearBox(); - box.activate(); -}; - -function endDrag(bbox) { - var bounds = bbox.getBounds(); - - map.events.unregister("moveend", map, mapMoved); - setBounds(bounds); - drawBox(bounds); - box.deactivate(); - validateControls(); - - $("#drag_box").html("<%=j t 'export.start_rjs.manually_select' %>"); -} - -function transformComplete(event) { - setBounds(event.feature.geometry.bounds); - validateControls(); -} - -function startMarker() { - $("#add_marker").html("<%=j t 'export.start_rjs.click_add_marker' %>"); - - if (!markerLayer) { - markerLayer = new OpenLayers.Layer.Vector("",{ - displayInLayerSwitcher: false, - style: { - externalGraphic: OpenLayers.Util.getImageLocation("marker.png"), - graphicXOffset: -10.5, - graphicYOffset: -25, - graphicWidth: 21, - graphicHeight: 25 - } - }); - map.addLayer(markerLayer); - - markerControl = new OpenLayers.Control.DrawFeature(markerLayer, OpenLayers.Handler.Point); - map.addControl(markerControl); - - markerLayer.events.on({ "featureadded": endMarker }); - } - - markerLayer.destroyFeatures(); - markerControl.activate(); - - return false; -} - -function endMarker(event) { - markerControl.deactivate(); - - $("#add_marker").html("<%=j t 'export.start_rjs.change_marker' %>"); - $("#marker_inputs").show(); - - var epsg4326 = new OpenLayers.Projection("EPSG:4326"); - var epsg900913 = new OpenLayers.Projection("EPSG:900913"); - var geom = event.feature.geometry.clone().transform(epsg900913, epsg4326); - - $("#marker_lon").val(geom.x.toFixed(5)); - $("#marker_lat").val(geom.y.toFixed(5)); - - htmlUrlChanged(); -} - -function clearMarker() { - $("#marker_lon").val(""); - $("#marker_lat").val(""); - $("#marker_inputs").hide(); - $("#add_marker").html("<%=j t 'export.start_rjs.add_marker' %>"); - - if (markerLayer) { - markerControl.destroy(); - markerLayer.destroy(); - markerLayer = null; - markerControl = null; - } -} - -function mapMoved() { - setBounds(map.getExtent()); - validateControls(); -} - -function setBounds(bounds) { - var epsg4326 = new OpenLayers.Projection("EPSG:4326"); - var decimals = Math.pow(10, Math.floor(map.getZoom() / 3)); - - bounds = bounds.clone().transform(map.getProjectionObject(), epsg4326); - - $("#minlon").val(Math.round(bounds.left * decimals) / decimals); - $("#minlat").val(Math.round(bounds.bottom * decimals) / decimals); - $("#maxlon").val(Math.round(bounds.right * decimals) / decimals); - $("#maxlat").val(Math.round(bounds.top * decimals) / decimals); - - mapnikSizeChanged(); - htmlUrlChanged(); -} - -function clearBox() { - transform.deactivate(); - vectors.destroyFeatures(); -} - -function drawBox(bounds) { - var feature = new OpenLayers.Feature.Vector(bounds.toGeometry()); - - vectors.addFeatures(feature); - transform.setFeature(feature); -} - -function validateControls() { - var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val()); - - if (bounds.getWidth() * bounds.getHeight() > <%= MAX_REQUEST_AREA %>) { - $("#export_osm_too_large").show(); - } else { - $("#export_osm_too_large").hide(); - } - - var max_scale = maxMapnikScale(); - var disabled = true; - - if ($("#format_osm").prop("checked")) { - disabled = bounds.getWidth() * bounds.getHeight() > <%= MAX_REQUEST_AREA %>; - } else if ($("#format_mapnik").prop("checked")) { - disabled = $("#mapnik_scale").val() < max_scale; - } - - $("#export_commit").prop("disabled", disabled); - $("#mapnik_max_scale").html(roundScale(max_scale)); -} - -function htmlUrlChanged() { - var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val()); - var layerName = map.baseLayer.keyid; - var url = "http://<%= SERVER_URL %>/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName; - var markerUrl = ""; - - if ($("#marker_lat").val() && $("#marker_lon").val()) { - markerUrl = "&mlat=" + $("#marker_lat").val() + "&mlon=" + $("#marker_lon").val(); - url += "&marker=" + $("#marker_lat").val() + "," + $("#marker_lon").val(); - } - - var html = ''; - - // Create "larger map" link - var center = bounds.getCenterLonLat(); - var epsg4326 = new OpenLayers.Projection("EPSG:4326"); - var epsg900913 = new OpenLayers.Projection("EPSG:900913"); - - bounds.transform(epsg4326, epsg900913); - var zoom = map.getZoomForExtent(bounds); - - var layers = getMapLayers(); - - html += '
'+"<%= html_escape_unicode(I18n.t('export.start_rjs.view_larger_map')) %>"+''; - - $("#export_html_text").val(html); - - if ($("#format_html").prop("checked")) { - $("#export_html_text").prop("selected", true); - } -} - -function formatChanged() { - $("#export_commit").show(); - - if ($("#format_osm").prop("checked")) { - $("#export_osm").show(); - } else { - $("#export_osm").hide(); - } - - if ($("#format_mapnik").prop("checked")) { - $("#mapnik_scale").val(roundScale(map.getScale())); - $("#export_mapnik").show(); - } else { - $("#export_mapnik").hide(); - } - - if ($("#format_html").prop("checked")) { - $("#export_html").show(); - $("#export_commit").hide(); - $("#export_html_text").prop("selected", true); - } else { - $("#export_html").hide(); - - clearMarker(); - } - - validateControls(); -} - -function maxMapnikScale() { - var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val()); - var epsg4326 = new OpenLayers.Projection("EPSG:4326"); - var epsg900913 = new OpenLayers.Projection("EPSG:900913"); - - bounds.transform(epsg4326, epsg900913); - - return Math.floor(Math.sqrt(bounds.getWidth() * bounds.getHeight() / 0.3136)); -} - -function mapnikImageSize(scale) { - var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(), $("#maxlon").val(), $("#maxlat").val()); - var epsg4326 = new OpenLayers.Projection("EPSG:4326"); - var epsg900913 = new OpenLayers.Projection("EPSG:900913"); - - bounds.transform(epsg4326, epsg900913); - - return new OpenLayers.Size(Math.round(bounds.getWidth() / scale / 0.00028), - Math.round(bounds.getHeight() / scale / 0.00028)); -} - -function roundScale(scale) { - var precision = 5 * Math.pow(10, Math.floor(Math.LOG10E * Math.log(scale)) - 2); - - return precision * Math.ceil(scale / precision); -} - -function mapnikSizeChanged() { - var size = mapnikImageSize($("#mapnik_scale").val()); - - $("#mapnik_image_width").html(size.w); - $("#mapnik_image_height").html(size.h); - - validateControls(); -} - -startExport(); diff --git a/app/views/geocoder/description.html.erb b/app/views/geocoder/description.html.erb deleted file mode 100644 index a01954d72b3..00000000000 --- a/app/views/geocoder/description.html.erb +++ /dev/null @@ -1,13 +0,0 @@ -<% @sources.each do |source| %> - <% if source[:types] %> -

<%= raw(t("geocoder.description.title.#{source[:name]}", :types => t("geocoder.description.types.#{source[:types]}"))) %>

- <% else %> -

<%= raw(t("geocoder.description.title.#{source[:name]}")) %>

- <% end %> -
- <%= image_tag "searching.gif", :class => "search_searching" %> -
- -<% end %> diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb index 61d28697d71..d990b7f0ec1 100644 --- a/app/views/geocoder/results.html.erb +++ b/app/views/geocoder/results.html.erb @@ -1,25 +1,15 @@ <% if @results.empty? %> -

<%= t 'geocoder.results.no_results' %>

+

<%= t 'geocoder.results.no_results' %>

<% else %> - <% @results.each do |result| %> -

<%= result_to_html(result) %>

- <% end %> +
    + <% @results.each do |result| %> +
  • <%= result_to_html(result) %>

  • + <% end %> +
<% if @more_params %> -
-

- <%= link_to t('geocoder.results.more_results'), "#" %> -

- <%= image_tag "searching.gif", :class => "search_searching" %> +
+ <%= link_to t('geocoder.results.more_results'), url_for(@more_params), :class => "button load_more" %> + <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
- <% end %> <% end %> diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb index 7bc8fcd76c2..ac655147a9a 100644 --- a/app/views/geocoder/search.html.erb +++ b/app/views/geocoder/search.html.erb @@ -1,9 +1,10 @@ +

+ + <%= t('site.sidebar.search_results') %> +

<% @sources.each do |source| %> -

<%= raw(t "geocoder.search.title.#{source}") %>

-
"> - <%= image_tag "searching.gif", :class => "search_searching" %> +

<%= raw(t "geocoder.search.title.#{source}") %>

+
"> + <%= image_tag "searching.gif", :class => "loader" %>
- <% end %> diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb new file mode 100644 index 00000000000..a4d93cc0ec5 --- /dev/null +++ b/app/views/layouts/_content.html.erb @@ -0,0 +1,19 @@ +
+ <% if content_for? :content %> + <%= yield :content %> + <% else %> + <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +
+
+ <%= yield :heading %> +
+
+ <% end %> +
+
+ <%= yield %> +
+
+ <% end %> +
diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb index 0380a509454..51ef3fe4154 100644 --- a/app/views/layouts/_flash.html.erb +++ b/app/views/layouts/_flash.html.erb @@ -1,11 +1,20 @@ <% if flash[:error] %> -
<%= raw flash[:error] %>
+

+ <%= image_tag("notice.png", :class => "small_icon", :border => 0) %> + <%= raw flash[:error] %> +

<% end %> <% if flash[:warning] %> -
<%= raw flash[:warning] %>
+

+ <%= image_tag("notice.png", :class => "small_icon", :border => 0) %> + <%= raw flash[:warning] %> +

<% end %> <% if flash[:notice] %> -
<%= raw flash[:notice] %>
+

+ <%= image_tag("notice.png", :class => "small_icon", :border => 0) %> + <%= raw flash[:notice] %> +

<% end %> diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 8a0f62d922a..13f70708162 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,20 +1,50 @@ + - <%= javascript_strings %> - <%= javascript_include_tag "site" %> - <%= javascript_include_tag "menu" %> - - <%= stylesheet_link_tag "small-#{t 'html.dir'}", :media => "only screen and (max-width:641px)" %> - <%= stylesheet_link_tag "large-#{t 'html.dir'}", :media => "screen and (min-width: 642px)" %> - <%= stylesheet_link_tag "print-#{t 'html.dir'}", :media => "print" %> - + + <%= javascript_include_tag "application" %> + <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %> + <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 722px)" %> + <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> + <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %> + <%= favicon_link_tag "favicon.ico" %> - <%= favicon_link_tag "osm_logo.png", :rel => "apple-touch-icon", :type => "image/png" %> + <%= favicon_link_tag "osm_logo_57.png", :rel => "apple-touch-icon", :sizes => "57x57", :type => "image/png" %> + <%= favicon_link_tag "osm_logo_72.png", :rel => "apple-touch-icon", :sizes => "72x72", :type => "image/png" %> + <%= favicon_link_tag "osm_logo_114.png", :rel => "apple-touch-icon", :sizes => "114x114", :type => "image/png" %> + <%= favicon_link_tag "osm_logo_144.png", :rel => "apple-touch-icon", :sizes => "144x144", :type => "image/png" %> + <%= favicon_link_tag "osm_logo_228.png", :rel => "icon", :sizes => "228x228", :type => "image/png" %> + <%= tag("meta", { :name => "msapplication-TileImage", :content => image_path("osm_logo_144.png") }) %> <%= tag("link", { :rel => "publisher", :href => "https://plus.google.com/111953119785824514010" }) %> <%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => asset_path("osm.xml") }) %> <%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %> + <%= tag("meta", :property => "og:image", :content => image_path("osm_logo.png")) %> + <% if flash[:piwik_goal] -%> + <%= tag("meta", :name => "piwik-goal", :content => flash[:piwik_goal]) %> + <% end -%> <%= style_rules %> <%= yield :head %> + <%= yield :auto_discovery_link_tag %> <%= csrf_meta_tag %> - <%= t 'layouts.project_name.title' %><%= ' | '+ @title if @title %> + + <%= t 'layouts.project_name.title' %><%= ' | ' + @title if @title %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb new file mode 100644 index 00000000000..09a75d89189 --- /dev/null +++ b/app/views/layouts/_header.html.erb @@ -0,0 +1,91 @@ +
+

+ + <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %> + <%= t 'layouts.project_name.h1' %> + +

+ + + +
diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb index 18716618fa7..cdd708e1cb5 100644 --- a/app/views/layouts/_inbox.html.erb +++ b/app/views/layouts/_inbox.html.erb @@ -1,7 +1,3 @@ -<% -inbox_attributes = {} -inbox_attributes[:id] = "inboxanchor" -inbox_attributes[:class] = 'greeting-bar-unread' if @user.new_messages.size > 0 -inbox_attributes[:title] = t 'layouts.inbox_tooltip', :count => @user.new_messages.size -%> -<%= link_to t('layouts.inbox', :count => @user.new_messages.size), {:controller => 'message', :action => 'inbox', :display_name => @user.display_name}, inbox_attributes %> +<% if @user.new_messages.size > 0 %> +<%= @user.new_messages.size %> +<% end %> diff --git a/app/views/layouts/_piwik.html.erb b/app/views/layouts/_piwik.html.erb deleted file mode 100644 index 0ba307437c5..00000000000 --- a/app/views/layouts/_piwik.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb new file mode 100644 index 00000000000..6e1aa5dc23f --- /dev/null +++ b/app/views/layouts/_search.html.erb @@ -0,0 +1,32 @@ +
+
+
+ <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %> + · + <%= link_to t('site.search.get_directions'), directions_path, { :class => "geolink", :title => t('site.search.get_directions_title') } %> +
+ + <%= submit_tag t('site.search.submit_text') %> + +
+ <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %> +
+
+ +
+
+ <%= link_to t('site.search.close_directions'), root_path, { :class => "geolink", :title => t('site.search.close_directions_title') } %> +
+ + <%= submit_tag t('site.search.submit_text') %> + +
+ <%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %> + <%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %> + <%= image_tag "marker-red.png" , :class => 'routing_marker', :id => 'marker_to' , :draggable => 'true' %> + <%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') %> + + <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %> +
+
+
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb new file mode 100644 index 00000000000..e72214cbefe --- /dev/null +++ b/app/views/layouts/map.html.erb @@ -0,0 +1,83 @@ +<% content_for :head do %> + <%= javascript_include_tag "index" %> +<% end %> + +<% content_for(:body_class) { "map-layout" } %> + +<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> + <% content_for :greeting do %> + <%= link_to t("layouts.home"), + "#", + :id => "homeanchor", + :class => "set_position", + :data => { :lat => @user.home_lat, + :lon => @user.home_lon, + :zoom => 15 } %> + <% end %> +<% end %> + +<% content_for :header do %> + <%= render :partial => "layouts/search", :locals => { :autofocus => false } %> +<% end %> + +<% content_for :content do %> + + + + +
+
+ +
+
+ +
+ + + + + + + + +
<%= t 'site.index.license.license_url' %><%= t 'site.index.license.project_url' %>
<%= t 'site.index.license.copyright' %>
+
+<% end %> + +<%= render :template => 'layouts/site' %> diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 2c6752ab9d7..69ac7aa023a 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -1,155 +1,11 @@ - - + + <%= render :partial => "layouts/head" %> - -
- <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %> -

<%= t 'layouts.project_name.h1' %>

-
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - - <%= yield %> -
- -
- - <% if @user and @user.id %> - <%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %> - <%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %> | - <%= yield :greeting %> - <%= render :partial => "layouts/inbox" %> | - <%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%> - <% else %> - <%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> | - <%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %> - <% end %> - -
    - <% - viewclass = 'geolink llz layers' - editclass = 'geolink llz object minzoom13 disabled' - historyclass = 'geolink bbox minzoom11' - exportclass = 'geolink llz layers' - viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index' - editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit' - historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list' - exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export' - %> -
  • <%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %>
  • -
  • <%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %>
  • -
  • <%= link_to t('layouts.history'), {:controller => 'changeset', :action => 'list' }, {:id => 'historyanchor', :title => t('javascripts.site.history_tooltip'), :class => historyclass} %>
  • -
  • <%= link_to t('layouts.export'), {:controller => 'site', :action => 'export'}, {:id => 'exportanchor', :title => t('layouts.export_tooltip'), :class => exportclass} %>
  • -
-
- - - - - -
- - - <%= yield :optionals %> - - <% unless @user %> - - <% end %> - - <% if STATUS == :database_offline or STATUS == :api_offline %> - - <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> - - <% end %> - - <% if false %> - - <% end %> - -
-
    -
  • <%= t'layouts.help' %> -
      -
    • <%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %>
    • -
    • <%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %>
    • -
    • <%= link_to t('layouts.copyright'), {:controller => 'site', :action => 'copyright'} %>
    • -
    -
  • -
  • <%= t'layouts.community' %> - -
  • -
  • <%= link_to t('layouts.gps_traces'), {:controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil}, {:id => 'traceanchor', :title => t('layouts.gps_traces_tooltip') } %>
  • - <%= yield :left_menu %> -
-
- - - -
- - - - <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%> - <%= render :partial => "layouts/piwik" %> + + <%= render :partial => "layouts/header" %> + <%= render :partial => "layouts/content" %> + <% if defined?(PIWIK) -%> + <% end -%> diff --git a/app/views/layouts/slim.html.erb b/app/views/layouts/slim.html.erb deleted file mode 100644 index 862f55d874f..00000000000 --- a/app/views/layouts/slim.html.erb +++ /dev/null @@ -1,19 +0,0 @@ - - - <%= render :partial => "layouts/head" %> - -
-
-
- <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> - - <%= yield %> -
- -
-

<%= image_tag("osm_logo.png", :size => "60x60", :border => 0, :alt => t('layouts.logo.alt_text')) %><%= t 'layouts.project_name.h1' %>

-
-
-
- - diff --git a/app/views/layouts/xhr.html.erb b/app/views/layouts/xhr.html.erb new file mode 100644 index 00000000000..ab33aae8d92 --- /dev/null +++ b/app/views/layouts/xhr.html.erb @@ -0,0 +1,2 @@ +<%= content_for :auto_discovery_link_tag %> +<%= yield %> diff --git a/app/views/message/_message_summary.html.erb b/app/views/message/_message_summary.html.erb index 82d528a0400..6e692ab2c85 100644 --- a/app/views/message/_message_summary.html.erb +++ b/app/views/message/_message_summary.html.erb @@ -1,14 +1,8 @@ -<% this_colour = cycle('lightgrey', 'white') %> - "> - <%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %> - <%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %> - <%= l message_summary.sent_on, :format => :friendly %> - <% if message_summary.message_read? %> - <%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %> - <% else %> - <%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %> - <% end %> - <%= button_to t('message.message_summary.reply_button'), :controller => 'message', :action => 'reply', :message_id => message_summary.id %> - <%= button_to t('message.message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath %> + <%= link_to h(message_summary.sender.display_name), :controller => 'user', :action => 'view', :display_name => message_summary.sender.display_name %> + <%= link_to h(message_summary.title), :controller => 'message', :action => 'read', :message_id => message_summary.id %> + <%= l message_summary.sent_on, :format => :friendly %> + <%= button_to t('message.message_summary.unread_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread'}, { :remote => true } %> + <%= button_to t('message.message_summary.read_button'), {:controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read'}, { :remote => true } %> + <%= button_to t('message.message_summary.delete_button'), {:controller => 'message', :action => 'delete', :message_id => message_summary.id, :referer => request.fullpath}, { :remote => true } %> diff --git a/app/views/message/_sent_message_summary.html.erb b/app/views/message/_sent_message_summary.html.erb index 830f105da6f..de21e8cd3cd 100644 --- a/app/views/message/_sent_message_summary.html.erb +++ b/app/views/message/_sent_message_summary.html.erb @@ -1,8 +1,6 @@ -<% this_colour = cycle('lightgrey', 'white') %> - - <%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %> - <%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %> - <%= l sent_message_summary.sent_on, :format => :friendly %> - <%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %> + <%= link_to h(sent_message_summary.recipient.display_name), :controller => 'user', :action => 'view', :display_name => sent_message_summary.recipient.display_name %> + <%= link_to h(sent_message_summary.title), :controller => 'message', :action => 'read', :message_id => sent_message_summary.id %> + <%= l sent_message_summary.sent_on, :format => :friendly %> + <%= button_to t('message.sent_message_summary.delete_button'), :controller => 'message', :action => 'delete', :message_id => sent_message_summary.id, :referer => request.fullpath %> diff --git a/app/views/message/delete.js.erb b/app/views/message/delete.js.erb new file mode 100644 index 00000000000..86677ab4a77 --- /dev/null +++ b/app/views/message/delete.js.erb @@ -0,0 +1,5 @@ +$("#inboxanchor").replaceWith("<%=j render :partial => "layouts/inbox" %>"); +$("#inbox-count").replaceWith("<%=j render :partial => "message_count" %>"); +$("#inbox-<%= @message.id %>").fadeOut(800, "linear", function () { + $(this).remove(); +}); diff --git a/app/views/message/inbox.html.erb b/app/views/message/inbox.html.erb index 0cbc7c77c47..4a898c0857b 100644 --- a/app/views/message/inbox.html.erb +++ b/app/views/message/inbox.html.erb @@ -1,21 +1,24 @@ -

<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>

+<% content_for :heading do %> +

<%= t'message.inbox.my_inbox'%>/<%= link_to t('message.inbox.outbox'), outbox_path(@user.display_name) %>

+<% end %> -<%= render :partial => "message_count" %> +

<%= render :partial => "message_count" %>

<% if @user.messages.size > 0 %> -
- +
+ - - <%= render :partial => "message_summary", :collection => @user.messages %> -
<%= t'message.inbox.from' %> <%= t'message.inbox.subject' %> <%= t'message.inbox.date' %>
-
+ + + <%= render :partial => "message_summary", :collection => @user.messages %> + + <% else %> -
<%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
+
<%= raw(t'message.inbox.no_messages_yet', :people_mapping_nearby_link => link_to(t('message.inbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
<% end %> diff --git a/app/views/message/mark.js.erb b/app/views/message/mark.js.erb index 2e545b62e0a..d67e74ace97 100644 --- a/app/views/message/mark.js.erb +++ b/app/views/message/mark.js.erb @@ -1,3 +1,7 @@ $("#inboxanchor").replaceWith("<%=j render :partial => "layouts/inbox" %>"); $("#inbox-count").replaceWith("<%=j render :partial => "message_count" %>"); -$("#inbox-<%= @message.id %>").replaceWith("<%=j render :partial => "message_summary", :object => @message %>"); +<% if @message.message_read? -%> +$("#inbox-<%= @message.id %>").removeClass("inbox-row-unread").addClass("inbox-row"); +<% else -%> +$("#inbox-<%= @message.id %>").removeClass("inbox-row").addClass("inbox-row-unread"); +<% end -%> diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb index ed95e2252fc..35f5b4a0422 100644 --- a/app/views/message/new.html.erb +++ b/app/views/message/new.html.erb @@ -1,24 +1,22 @@ -

<%= raw(t'message.new.send_message_to', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %>

+<% content_for :heading do %> +

<%= raw(t'message.new.send_message_to', :name => link_to(h(@message.recipient.display_name), {:controller => 'user', :action => 'view', :display_name => @message.recipient.display_name})) %>

+<% end %> <%= error_messages_for 'message' %> -<%= form_for :message, :url => { :action => "new", :display_name => @this_user.display_name } do |f| %> - - - - - - - - - - - - - -
<%= t'message.new.subject' %><%= f.text_field :title, :size => 60, :value => @subject %>
<%= t'message.new.body' %><%= richtext_area :message, :body, :cols => 80, :value => @body %>
<%= submit_tag t('message.new.send_button') %>
+<%= form_for :message, :html => { :class => 'standard-form' }, :url => { :action => "new", :display_name => @message.recipient.display_name } do |f| %> +
+
+ + <%= f.text_field :title, :size => 60, :class => "richtext_title" %> +
+
+ + <%= richtext_area :message, :body, :cols => 80, :rows => 20 %> +
+
+ <%= submit_tag t('message.new.send_button') %> + <%= link_to t('message.new.back'), { :controller => 'message', :action => 'inbox', :display_name => @user.display_name }, :class => 'deemphasize button' %> +
+
<% end %> - -
- -<%= link_to t('message.new.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %> diff --git a/app/views/message/no_such_message.html.erb b/app/views/message/no_such_message.html.erb index 6fd52124a40..9bf6ddbea85 100644 --- a/app/views/message/no_such_message.html.erb +++ b/app/views/message/no_such_message.html.erb @@ -1,2 +1,5 @@ -

<%= t'message.no_such_message.heading' %>

+<% content_for :heading do %> +

<%= t'message.no_such_message.heading' %>

+<% end %> +

<%= t'message.no_such_message.body' %>

diff --git a/app/views/message/outbox.html.erb b/app/views/message/outbox.html.erb index 6f6823c1bbf..ebf04c9fb37 100644 --- a/app/views/message/outbox.html.erb +++ b/app/views/message/outbox.html.erb @@ -1,19 +1,23 @@ -

<%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %>

+<% content_for :heading do %> +

<%= raw(t'message.outbox.my_inbox', :inbox_link => link_to(t('message.outbox.inbox'), inbox_path(@user.display_name))) %>/<%= t'message.outbox.outbox' %>

+<% end %> -

<%= t'message.outbox.messages', :count => @user.sent_messages.size %>

+

<%= t'message.outbox.messages', :count => @user.sent_messages.size %>

<% if @user.sent_messages.size > 0 %> -
- +
+ + + <%= render :partial => "sent_message_summary", :collection => @user.sent_messages %> -
<%= t'message.outbox.to' %> <%= t'message.outbox.subject' %> <%= t'message.outbox.date' %>
-
+ + <% else %> -
<%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
+
<%= raw(t'message.outbox.no_sent_messages', :people_mapping_nearby_link => link_to(t('message.outbox.people_mapping_nearby'), :controller => 'user', :action => 'view', :display_name => @user.display_name)) %>
<% end %> diff --git a/app/views/message/read.html.erb b/app/views/message/read.html.erb index d829c79e945..0c9b622e8e1 100644 --- a/app/views/message/read.html.erb +++ b/app/views/message/read.html.erb @@ -1,73 +1,39 @@ <% if @user == @message.recipient %> + <% content_for :heading do %> +

<%= h(@message.title) %>

+ <% end %> -

<%= t'message.read.reading_your_messages' %>

+
+ <%= user_thumbnail_tiny @message.sender %> + <%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %> +
+ <%= l @message.sent_on, :format => :friendly %> +
+
- - - - - - - - - - - - - - - - - - - - - -
<%= t'message.read.from' %><%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %><%= user_thumbnail @message.sender %>
<%= t'message.read.subject' %><%= h(@message.title) %>
<%= t'message.read.date' %><%= l @message.sent_on, :format => :friendly %>
<%= @message.body.to_html %>
+
<%= @message.body.to_html %>
-
- - - - - - - -
<%= button_to t('message.read.reply_button'), :controller => 'message', :action => 'reply', :message_id => @message.id %><%= button_to t('message.read.unread_button'), :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %><%= link_to t('message.read.back_to_inbox'), :controller => 'message', :action => 'inbox', :display_name => @user.display_name %>
+
+ <%= button_to t('message.read.reply_button'), {:controller => 'message', :action => 'reply', :message_id => @message.id}, :class => 'reply-button' %> + <%= button_to t('message.read.unread_button'), {:controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread'}, :class => 'mark-unread-button' %> <% else %> -

<%= t'message.read.reading_your_sent_messages' %>

+

<%= h(@message.title) %>

- - - - - - - - - - - - - - - - - - - - - -
<%= t'message.read.to' %><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %><%= user_thumbnail @message.recipient %>
<%= t'message.read.subject' %><%= h(@message.title) %>
<%= t'message.read.date' %><%= l @message.sent_on, :format => :friendly %>
<%= @message.body.to_html %>
+
+ <%= user_thumbnail_tiny @message.recipient %> + <%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %> +
+ <%= l @message.sent_on, :format => :friendly %> +
+
-
+
<%= @message.body.to_html %>
- - - - -
<%= link_to t('message.read.back_to_outbox'), :controller => 'message', :action => 'outbox', :display_name => @user.display_name %>
+
<% end %> + + <%= link_to t('message.read.back'), {:controller => 'message', :action => 'outbox', :display_name => @user.display_name }, :class => "button deemphasize" %> +
diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb new file mode 100644 index 00000000000..c0d6e17d32b --- /dev/null +++ b/app/views/notes/_comment.html.erb @@ -0,0 +1,8 @@ +
+ <% if comment.author.nil? -%> +
<%= t "note.description.#{comment.event}_at_html", :when => friendly_date(comment.created_at) %>
+ <% else -%> +
<%= t "note.description.#{comment.event}_at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %>
+ <% end -%> +
<%= comment.body %>
+
diff --git a/app/views/notes/_description.html.erb b/app/views/notes/_description.html.erb new file mode 100644 index 00000000000..4f03a1d59aa --- /dev/null +++ b/app/views/notes/_description.html.erb @@ -0,0 +1,3 @@ +
+ <%= render :partial => "comment", :collection => description.comments %> +
diff --git a/app/views/notes/_entry.html.erb b/app/views/notes/_entry.html.erb new file mode 100644 index 00000000000..6f0c8fb717e --- /dev/null +++ b/app/views/notes/_entry.html.erb @@ -0,0 +1,4 @@ +

<%= t "note.entry.comment" %>

+<%= render :partial => "comment", :object => entry %> +

<%= t "note.entry.full" %>

+<%= render :partial => "description", :object => entry.note %> diff --git a/app/views/notes/_note.gpx.builder b/app/views/notes/_note.gpx.builder new file mode 100644 index 00000000000..a55ed88f6f5 --- /dev/null +++ b/app/views/notes/_note.gpx.builder @@ -0,0 +1,24 @@ +xml.wpt("lon" => note.lon, "lat" => note.lat) do + xml.desc do + xml.cdata! render(:partial => "description", :object => note, :formats => [ :html ]) + end + + xml.extension do + xml.id note.id + xml.url note_url(note, :format => params[:format]) + + if note.closed? + xml.reopen_url reopen_note_url(note, :format => params[:format]) + else + xml.comment_url comment_note_url(note, :format => params[:format]) + xml.close_url close_note_url(note, :format => params[:format]) + end + + xml.date_created note.created_at + xml.status note.status + + if note.closed? + xml.date_closed note.closed_at + end + end +end diff --git a/app/views/notes/_note.json.jsonify b/app/views/notes/_note.json.jsonify new file mode 100644 index 00000000000..74ff5ccec62 --- /dev/null +++ b/app/views/notes/_note.json.jsonify @@ -0,0 +1,39 @@ +json.type "Feature" + +json.geometry do + json.type "Point" + json.coordinates [ note.lon, note.lat ] +end + +json.properties do + json.id note.id + json.url note_url(note, :format => params[:format]) + + if note.closed? + json.reopen_url reopen_note_url(note, :format => params[:format]) + else + json.comment_url comment_note_url(note, :format => params[:format]) + json.close_url close_note_url(note, :format => params[:format]) + end + + json.date_created note.created_at + json.status note.status + json.closed_at note.closed_at if note.closed? + + json.comments(note.comments) do |comment| + json.date comment.created_at + + if comment.author + json.uid comment.author.id + json.user comment.author.display_name + json.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL) + end + + json.action comment.event + + if comment.body + json.text comment.body.to_text + json.html comment.body.to_html + end + end +end diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder new file mode 100644 index 00000000000..802f3bc81b6 --- /dev/null +++ b/app/views/notes/_note.rss.builder @@ -0,0 +1,24 @@ +xml.item do + location = describe_location(note.lat, note.lon, 14, locale) + + if note.closed? + xml.title t('note.rss.closed', :place => location) + elsif note.comments.length > 1 + xml.title t('note.rss.comment', :place => location) + else + xml.title t('note.rss.new', :place => location) + end + + xml.link browse_note_url(note) + xml.guid note_url(note) + xml.description render(:partial => "description", :object => note, :formats => [ :html ]) + + if note.author + xml.author note.author.display_name + end + + xml.pubDate note.updated_at.to_s(:rfc822) + xml.geo :lat, note.lat + xml.geo :long, note.lon + xml.georss :point, "#{note.lat} #{note.lon}" +end diff --git a/app/views/notes/_note.xml.builder b/app/views/notes/_note.xml.builder new file mode 100644 index 00000000000..ee9570205ce --- /dev/null +++ b/app/views/notes/_note.xml.builder @@ -0,0 +1,39 @@ +xml.note("lon" => note.lon, "lat" => note.lat) do + xml.id note.id + xml.url note_url(note, :format => params[:format]) + + if note.closed? + xml.reopen_url reopen_note_url(note, :format => params[:format]) + else + xml.comment_url comment_note_url(note, :format => params[:format]) + xml.close_url close_note_url(note, :format => params[:format]) + end + + xml.date_created note.created_at + xml.status note.status + + if note.closed? + xml.date_closed note.closed_at + end + + xml.comments do + note.comments.each do |comment| + xml.comment do + xml.date comment.created_at + + if comment.author + xml.uid comment.author.id + xml.user comment.author.display_name + xml.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL) + end + + xml.action comment.event + + if comment.body + xml.text comment.body.to_text + xml.html comment.body.to_html + end + end + end + end +end diff --git a/app/views/changeset/_changeset_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb similarity index 92% rename from app/views/changeset/_changeset_paging_nav.html.erb rename to app/views/notes/_notes_paging_nav.html.erb index 52c3decb890..108cbb3d233 100644 --- a/app/views/changeset/_changeset_paging_nav.html.erb +++ b/app/views/notes/_notes_paging_nav.html.erb @@ -8,7 +8,7 @@ | <%= t('changeset.changeset_paging_nav.showing_page', :page => @page) %> | -<% if @edits.size < @page_size %> +<% if @notes.size < @page_size %> <%= t('changeset.changeset_paging_nav.next') %> <% else %> <%= link_to t('changeset.changeset_paging_nav.next'), params.merge({ :page => @page + 1 }) %> diff --git a/app/views/changeset/_user.html.erb b/app/views/notes/_user.html.erb similarity index 100% rename from app/views/changeset/_user.html.erb rename to app/views/notes/_user.html.erb diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder new file mode 100644 index 00000000000..e663d94a60f --- /dev/null +++ b/app/views/notes/feed.rss.builder @@ -0,0 +1,36 @@ +xml.instruct! + +xml.rss("version" => "2.0", + "xmlns:dc" => "http://purl.org/dc/elements/1.1/", + "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", + "xmlns:georss" => "http://www.georss.org/georss") do + xml.channel do + xml.title t('note.rss.title') + xml.description t('note.rss.description_area', :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon ) + xml.link url_for(:controller => "site", :action => "index", :only_path => false) + + @comments.each do |comment| + location = describe_location(comment.note.lat, comment.note.lon, 14, locale) + + xml.item do + xml.title t("note.rss.#{comment.event}", :place => location) + + xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false) + xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false) + + xml.description do + xml.cdata! render(:partial => "entry", :object => comment, :formats => [ :html ]) + end + + if comment.author + xml.dc :creator, comment.author.display_name + end + + xml.pubDate comment.created_at.to_s(:rfc822) + xml.geo :lat, comment.note.lat + xml.geo :long, comment.note.lon + xml.georss :point, "#{comment.note.lat} #{comment.note.lon}" + end + end + end +end diff --git a/app/views/notes/index.gpx.builder b/app/views/notes/index.gpx.builder new file mode 100644 index 00000000000..5a7f34dbd59 --- /dev/null +++ b/app/views/notes/index.gpx.builder @@ -0,0 +1,7 @@ +xml.instruct! + +xml.gpx("version" => "1.1", + "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance", + "xsi:schemaLocation" => "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd") do + xml << (render(:partial => "note", :collection => @notes) || "") +end diff --git a/app/views/notes/index.json.jsonify b/app/views/notes/index.json.jsonify new file mode 100644 index 00000000000..cb75d41c409 --- /dev/null +++ b/app/views/notes/index.json.jsonify @@ -0,0 +1,5 @@ +json.type "FeatureCollection" + +json.features(@notes) do |note| + json.ingest! render(:partial => "note", :object => note) +end diff --git a/app/views/notes/index.rss.builder b/app/views/notes/index.rss.builder new file mode 100644 index 00000000000..53806f50207 --- /dev/null +++ b/app/views/notes/index.rss.builder @@ -0,0 +1,13 @@ +xml.instruct! + +xml.rss("version" => "2.0", + "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", + "xmlns:georss" => "http://www.georss.org/georss") do + xml.channel do + xml.title t('note.rss.title') + xml.description t('note.rss.description_area', :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon ) + xml.link url_for(:controller => "site", :action => "index", :only_path => false) + + xml << (render(:partial => "note", :collection => @notes) || "") + end +end diff --git a/app/views/notes/index.xml.builder b/app/views/notes/index.xml.builder new file mode 100644 index 00000000000..c1c2be7e40a --- /dev/null +++ b/app/views/notes/index.xml.builder @@ -0,0 +1,5 @@ +xml.instruct! + +xml.osm(:version => API_VERSION, :generator => GENERATOR) do |osm| + osm << (render(:partial => "note", :collection => @notes) || "") +end diff --git a/app/views/notes/mine.html.erb b/app/views/notes/mine.html.erb new file mode 100644 index 00000000000..666c7dc8f94 --- /dev/null +++ b/app/views/notes/mine.html.erb @@ -0,0 +1,35 @@ +<% content_for :heading do %> +

<%= @heading %>

+

<%= raw @description %>

+<% end %> + +<%= render :partial => 'notes_paging_nav' %> + + + + + + + + + + +<% @notes.each do |note| -%> + class="creator"<% end %>> + + + + + + + +<% end -%> +
<%= t'note.mine.id' %><%= t'note.mine.creator' %><%= t'note.mine.description' %><%= t'note.mine.created_at' %><%= t'note.mine.last_changed' %>
+ <% if note.closed? %> + <%= image_tag("closed_note_marker.png", :alt => 'closed') %> + <% else %> + <%= image_tag("open_note_marker.png", :alt => 'open') %> + <% end %> + <%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %><%= note_author(note.author) %><%= note.comments.first.body.to_html %><%= t 'note.mine.ago_html', :when => friendly_date(note.created_at) %><%= t 'note.mine.ago_html', :when => friendly_date(note.updated_at) %>
+ +<%= render :partial => 'notes_paging_nav' %> diff --git a/app/views/notes/show.gpx.builder b/app/views/notes/show.gpx.builder new file mode 100644 index 00000000000..e54d7724692 --- /dev/null +++ b/app/views/notes/show.gpx.builder @@ -0,0 +1,7 @@ +xml.instruct! + +xml.gpx("version" => "1.1", + "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance", + "xsi:schemaLocation" => "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd") do + xml << render(:partial => "note", :object => @note) +end diff --git a/app/views/notes/show.json.jsonify b/app/views/notes/show.json.jsonify new file mode 100644 index 00000000000..3e5685fc008 --- /dev/null +++ b/app/views/notes/show.json.jsonify @@ -0,0 +1 @@ +json.ingest! render(:partial => "note", :object => @note) diff --git a/app/views/notes/show.rss.builder b/app/views/notes/show.rss.builder new file mode 100644 index 00000000000..e566ff02ec2 --- /dev/null +++ b/app/views/notes/show.rss.builder @@ -0,0 +1,13 @@ +xml.instruct! + +xml.rss("version" => "2.0", + "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", + "xmlns:georss" => "http://www.georss.org/georss") do + xml.channel do + xml.title t('note.rss.title') + xml.description t('note.rss.description_item', :id => @note.id) + xml.link url_for(:controller => "site", :action => "index", :only_path => false) + + xml << render(:partial => "note", :object => @note) + end +end diff --git a/app/views/notes/show.xml.builder b/app/views/notes/show.xml.builder new file mode 100644 index 00000000000..f16cda3a620 --- /dev/null +++ b/app/views/notes/show.xml.builder @@ -0,0 +1,5 @@ +xml.instruct! + +xml.osm(:version => API_VERSION, :generator => GENERATOR) do |osm| + osm << render(:partial => "note", :object => @note) +end diff --git a/app/views/notifier/email_confirm.text.erb b/app/views/notifier/email_confirm.text.erb index 176ef2238ab..db9ae0f93f5 100644 --- a/app/views/notifier/email_confirm.text.erb +++ b/app/views/notifier/email_confirm.text.erb @@ -1,7 +1,6 @@ <%= t 'notifier.email_confirm_plain.greeting' %> -<%= t 'notifier.email_confirm_plain.hopefully_you_1' %> -<%= t 'notifier.email_confirm_plain.hopefully_you_2', :server_url => SERVER_URL, :new_address => @address %> +<%= word_wrap(t 'notifier.email_confirm_plain.hopefully_you', :server_url => SERVER_URL, :new_address => @address) %> <%= t 'notifier.email_confirm_plain.click_the_link' %> diff --git a/app/views/notifier/lost_password.text.erb b/app/views/notifier/lost_password.text.erb index 89381801f8d..2b74e8e80f5 100644 --- a/app/views/notifier/lost_password.text.erb +++ b/app/views/notifier/lost_password.text.erb @@ -1,7 +1,6 @@ <%= t 'notifier.lost_password_plain.greeting' %> -<%= t 'notifier.lost_password_plain.hopefully_you_1' %> -<%= t 'notifier.lost_password_plain.hopefully_you_2' %> +<%= word_wrap(t 'notifier.lost_password_plain.hopefully_you') %> <%= t 'notifier.lost_password_plain.click_the_link' %> diff --git a/app/views/notifier/message_notification.html.erb b/app/views/notifier/message_notification.html.erb index 0b2ff9e6948..19704251d80 100644 --- a/app/views/notifier/message_notification.html.erb +++ b/app/views/notifier/message_notification.html.erb @@ -6,7 +6,4 @@ <%= @text.to_html %> == -

- <%= raw t'notifier.message_notification.footer1', :readurl => link_to(@readurl, @readurl) %> - <%= raw t'notifier.message_notification.footer2', :replyurl => link_to(@replyurl, @replyurl) %> -

+

<%= t'notifier.message_notification.footer_html', :readurl => link_to(@readurl, @readurl), :replyurl => link_to(@replyurl, @replyurl) %>

diff --git a/app/views/notifier/message_notification.text.erb b/app/views/notifier/message_notification.text.erb index 10a9ff361ea..c006941d9ff 100644 --- a/app/views/notifier/message_notification.text.erb +++ b/app/views/notifier/message_notification.text.erb @@ -6,5 +6,4 @@ <%= raw @text.to_text %> == -<%= raw t'notifier.message_notification.footer1', :readurl => @readurl %> -<%= raw t'notifier.message_notification.footer2', :replyurl => @replyurl %> +<%= word_wrap(t'notifier.message_notification.footer_html', :readurl => @readurl, :replyurl => @replyurl) %> diff --git a/app/views/notifier/note_comment_notification.html.erb b/app/views/notifier/note_comment_notification.html.erb new file mode 100644 index 00000000000..d82723bbb86 --- /dev/null +++ b/app/views/notifier/note_comment_notification.html.erb @@ -0,0 +1,13 @@ +

<%= t 'notifier.note_comment_notification.greeting' %>

+ +<% if @owner %> +

<%= t "notifier.note_comment_notification.#{@event}.your_note", :commenter => @commenter, :place => @place %>

+<% else %> +

<%= t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => @commenter, :place => @place %>

+<% end %> + +== +<%= @comment.to_html %> +== + +

<%= raw t 'notifier.note_comment_notification.details', :url => link_to(@noteurl, @noteurl) %>

diff --git a/app/views/notifier/note_comment_notification.text.erb b/app/views/notifier/note_comment_notification.text.erb new file mode 100644 index 00000000000..c8a967450d4 --- /dev/null +++ b/app/views/notifier/note_comment_notification.text.erb @@ -0,0 +1,13 @@ +<%= t 'notifier.note_comment_notification.greeting' %> + +<% if @owner %> +<%= t "notifier.note_comment_notification.#{@event}.your_note", :commenter => @commenter, :place => @place %> +<% else %> +<%= t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => @commenter, :place => @place %> +<% end %> + +== +<%= @comment.to_text %> +== + +<%= t 'notifier.note_comment_notification.details', :url => @noteurl %> diff --git a/app/views/notifier/signup_confirm.html.erb b/app/views/notifier/signup_confirm.html.erb index 5b7566fba97..814deee9171 100644 --- a/app/views/notifier/signup_confirm.html.erb +++ b/app/views/notifier/signup_confirm.html.erb @@ -1,21 +1,9 @@ -

<%= t'notifier.signup_confirm_html.greeting' %>

+

<%= t("notifier.signup_confirm.greeting") %>

-

<%= t'notifier.signup_confirm_html.hopefully_you' %> - <%= SERVER_URL %>.

+

<%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %>

-

<%= t'notifier.signup_confirm_html.click_the_link' %>

+

<%= t("notifier.signup_confirm.confirm") %>

-

<%= raw(link_to @url, @url) %>

+

<%= link_to @url, @url %>

-

<%= raw(t'notifier.signup_confirm_html.introductory_video', :introductory_video_link => link_to(t('notifier.signup_confirm_html.video_to_openstreetmap'), "http://showmedo.com/videos/video?name=1800000&fromSeriesID=180")) %> - <%= raw(t'notifier.signup_confirm_html.more_videos', :more_videos_link => link_to(t('notifier.signup_confirm_html.more_videos_here'), "http://showmedo.com/videos/series?name=mS2P1ZqS6")) %>

- -

<%= raw(t'notifier.signup_confirm_html.get_reading') %>

- -

<%= raw(t'notifier.signup_confirm_html.ask_questions') %>

- -

<%= raw(t'notifier.signup_confirm_html.wiki_signup') %>

- -

<%= raw(t'notifier.signup_confirm_html.user_wiki_page') %>

- -

<%= raw(t'notifier.signup_confirm_html.current_user') %>

+

<%= t("notifier.signup_confirm.welcome") %>

diff --git a/app/views/notifier/signup_confirm.text.erb b/app/views/notifier/signup_confirm.text.erb index a53f27dda99..aee44782d3e 100644 --- a/app/views/notifier/signup_confirm.text.erb +++ b/app/views/notifier/signup_confirm.text.erb @@ -1,46 +1,9 @@ -<%= t'notifier.signup_confirm_plain.greeting' %> +<%= fp(t("notifier.signup_confirm.greeting")) %> -<%= t'notifier.signup_confirm_plain.hopefully_you' %> -<%= SERVER_URL %> +<%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %> -<%= t'notifier.signup_confirm_plain.click_the_link_1' %> -<%= t'notifier.signup_confirm_plain.click_the_link_2' %> +<%= fp(t("notifier.signup_confirm.confirm")) %> -<%= @url %> + <%= @url %> -<%= t'notifier.signup_confirm_plain.introductory_video' %> - - http://showmedo.com/videos/video?name=1800000&fromSeriesID=180 - -<%= t'notifier.signup_confirm_plain.more_videos' %> - - http://showmedo.com/videos/series?name=mS2P1ZqS6 - -<%= t'notifier.signup_confirm_plain.the_wiki' %> - - <%= t'notifier.signup_confirm_plain.the_wiki_url' %> - -<%= t'notifier.signup_confirm_plain.blog_and_twitter' %> - - http://blog.openstreetmap.org/ - http://twitter.com/openstreetmap - -<%= t'notifier.signup_confirm_plain.opengeodata' %> - - http://www.opengeodata.org/ - -<%= t'notifier.signup_confirm_plain.ask_questions' %> - - http://help.openstreetmap.org/ - -<%= t'notifier.signup_confirm_plain.wiki_signup' %> - - <%= t'notifier.signup_confirm_plain.wiki_signup_url' %> - -<%= t'notifier.signup_confirm_plain.user_wiki_1' %> -<%= t'notifier.signup_confirm_plain.user_wiki_2' %> - -<%= t'notifier.signup_confirm_plain.current_user_1' %> -<%= t'notifier.signup_confirm_plain.current_user_2' %> - -http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region +<%= fp(t("notifier.signup_confirm.welcome")) %> diff --git a/app/views/oauth/authorize.html.erb b/app/views/oauth/authorize.html.erb index eaf43f9d122..d8feeed26d2 100644 --- a/app/views/oauth/authorize.html.erb +++ b/app/views/oauth/authorize.html.erb @@ -1,5 +1,9 @@ -

Authorize access to your account

-

<%= raw t('oauth.oauthorize.request_access', :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %>

+<% content_for :heading do %> +

<%= t "oauth.oauthorize.title" %>

+<% end %> + +

<%= raw t("oauth.oauthorize.request_access", :app_name => link_to(@token.client_application.name, @token.client_application.url), :user => link_to(@user.display_name, :controller => :user, :action => :view, :display_name => @user.display_name)) %>

+ <%= form_tag authorize_url do %> <%= hidden_field_tag "oauth_token", @token.token %> <%- if params[:oauth_callback] -%> diff --git a/app/views/oauth/authorize_failure.html.erb b/app/views/oauth/authorize_failure.html.erb index d8110c94f0b..4afba70e306 100644 --- a/app/views/oauth/authorize_failure.html.erb +++ b/app/views/oauth/authorize_failure.html.erb @@ -1 +1,5 @@ -

You have disallowed this request

+<% content_for :heading do %> +

<%= t "oauth.oauthorize_failure.title" %>

+<% end %> + +

<%= @message %>

diff --git a/app/views/oauth/authorize_success.html.erb b/app/views/oauth/authorize_success.html.erb index 89512db315c..c8f56af3345 100644 --- a/app/views/oauth/authorize_success.html.erb +++ b/app/views/oauth/authorize_success.html.erb @@ -1,5 +1,9 @@ -

You have allowed this request

+<% content_for :heading do %> +

<%= t "oauth.oauthorize_success.title" %>

+<% end %> + +

<%= raw t("oauth.oauthorize_success.allowed", :app_name => link_to(@token.client_application.name, @token.client_application.url)) %>

<% if @token.oob? and not @token.oauth10? %> -

The verification code is <%= @token.verifier %>

+

<%= t "oauth.oauthorize_success.verification", :code => @token.verifier %>

<% end %> diff --git a/app/views/oauth_clients/_form.html.erb b/app/views/oauth_clients/_form.html.erb index dc8f8e3d91e..96ab68ad7bc 100644 --- a/app/views/oauth_clients/_form.html.erb +++ b/app/views/oauth_clients/_form.html.erb @@ -1,23 +1,29 @@ -
-
- <%= f.text_field :name %> -
-
-
- <%= f.text_field :url %> -
-
-
- <%= f.text_field :callback_url %> -
-
-
- <%= f.text_field :support_url %> -
-

<%= t'oauth_clients.form.requests' %>

-<% ClientApplication.all_permissions.each do |perm| %> -
- <%= f.check_box perm %> -
-
-<% end %> +
+
+
+ + <%= f.text_field :name %> +
+
+ + <%= f.text_field :url %> +
+
+ + <%= f.text_field :callback_url %> +
+
+ + <%= f.text_field :support_url %> +
+
+
+

<%= t'oauth_clients.form.requests' %>

+ <% ClientApplication.all_permissions.each do |perm| %> +
+ <%= f.check_box perm %> + +
+ <% end %> +
+
\ No newline at end of file diff --git a/app/views/oauth_clients/edit.html.erb b/app/views/oauth_clients/edit.html.erb index b27f9b8fc01..397849c4442 100644 --- a/app/views/oauth_clients/edit.html.erb +++ b/app/views/oauth_clients/edit.html.erb @@ -1,6 +1,8 @@ -

<%= t'oauth_clients.edit.title' %>

+<% content_for :heading do %> +

<%= t'oauth_clients.edit.title' %>

+<% end %> + <%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put } do |f| %> <%= render :partial => "form", :locals => { :f => f } %> -
<%= submit_tag t'oauth_clients.edit.submit' %> <% end %> diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index d698728f5e7..80dbc6079af 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -1,4 +1,7 @@ -

<%= t'oauth_clients.index.title' %>

+<% content_for :heading do %> +

<%= t'oauth_clients.index.title' %>

+<% end %> + <% unless @tokens.empty? %>

<%= t'oauth_clients.index.my_tokens' %>

<%= t'oauth_clients.index.list_tokens' %>

@@ -16,7 +19,7 @@ <% end %> <% end %> - <% end %> + <% end %> <% end %>

<%= t'oauth_clients.index.my_apps' %>

@@ -30,4 +33,4 @@ <% end %> <% end %> <% end %> -

<%= link_to t('oauth_clients.index.register_new'), :action => :new %>

+

<%= link_to t('oauth_clients.index.register_new'), :action => :new %>

\ No newline at end of file diff --git a/app/views/oauth_clients/new.html.erb b/app/views/oauth_clients/new.html.erb index 2cd748ac653..7542d77b538 100644 --- a/app/views/oauth_clients/new.html.erb +++ b/app/views/oauth_clients/new.html.erb @@ -1,6 +1,10 @@ -

<%= t'oauth_clients.new.title' %>

-<%= form_for :client_application, :url => { :action => :create } do |f| %> - <%= render :partial => "form", :locals => { :f => f } %> -
- <%= submit_tag t('oauth_clients.new.submit') %> +<% content_for :heading do %> +

<%= t'oauth_clients.new.title' %>

<% end %> + +
+ <%= form_for :client_application, :url => { :action => :create } do |f| %> + <%= render :partial => "form", :locals => { :f => f } %> + <%= submit_tag t('oauth_clients.new.submit') %> + <% end %> +
diff --git a/app/views/oauth_clients/show.html.erb b/app/views/oauth_clients/show.html.erb index 8139a2d73e6..a23ce082d05 100644 --- a/app/views/oauth_clients/show.html.erb +++ b/app/views/oauth_clients/show.html.erb @@ -1,32 +1,33 @@ -

<%= t('oauth_clients.show.title', :app_name => @client_application.name) %>

-

- <%= t'oauth_clients.show.key' %> <%=@client_application.key %> -

-

- <%= t'oauth_clients.show.secret' %> <%=@client_application.secret %> -

-

- <%= t'oauth_clients.show.url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.request_token_path %> -

-

- <%= t'oauth_clients.show.access_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.access_token_path %> -

-

- <%= t'oauth_clients.show.authorize_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.authorize_path %> -

+<% content_for :heading do %> +

<%= t('oauth_clients.show.title', :app_name => @client_application.name) %>

+<% end %> +
+

+ <%= t'oauth_clients.show.key' %> <%=@client_application.key %> +

+

+ <%= t'oauth_clients.show.secret' %> <%=@client_application.secret %> +

+

+ <%= t'oauth_clients.show.url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.request_token_path %> +

+

+ <%= t'oauth_clients.show.access_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.access_token_path %> +

+

+ <%= t'oauth_clients.show.authorize_url' %> http<%='s' if request.ssl? %>://<%= request.host_with_port %><%=@client_application.oauth_server.authorize_path %> +

-

<%= t'oauth_clients.show.requests' %>

-
    <% @client_application.permissions.each do |perm| %> -
    -
  • <%= t('oauth_clients.form.' + perm.to_s) %>
  • -
    -<% end %>
- -

<%= t'oauth_clients.show.support_notice' %>

+

<%= t'oauth_clients.show.requests' %>

+
    <% @client_application.permissions.each do |perm| %> +
    +
  • <%= t('oauth_clients.form.' + perm.to_s) %>
  • +
    + <% end %>
- - - - - -
<%= button_to t('oauth_clients.show.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get %><%= button_to t('oauth_clients.show.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('oauth_clients.show.confirm') } %>
+

<%= t'oauth_clients.show.support_notice' %>

+
+
+ <%= button_to t('oauth_clients.show.edit'), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class=> "oauth-edit" %> + <%= button_to t('oauth_clients.show.delete'), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t('oauth_clients.show.confirm') }, :class=> "oauth-delete deemphasize" %> +
diff --git a/app/views/redactions/edit.html.erb b/app/views/redactions/edit.html.erb index 2a5e69d0a51..2dd63c9cbda 100644 --- a/app/views/redactions/edit.html.erb +++ b/app/views/redactions/edit.html.erb @@ -1,5 +1,8 @@ <% @title = t 'redaction.edit.title' %> -

<%= t 'redaction.edit.heading' %>

+ +<% content_for :heading do %> +

<%= t 'redaction.edit.heading' %>

+<% end %> <%= form_for(@redaction) do |f| %> <%= f.error_messages %> diff --git a/app/views/redactions/index.html.erb b/app/views/redactions/index.html.erb index 1fa683de8b6..a5a85c38d47 100644 --- a/app/views/redactions/index.html.erb +++ b/app/views/redactions/index.html.erb @@ -1,5 +1,7 @@ <% @title = t('redaction.index.title') %> -

<%= t('redaction.index.heading') %>

+<% content_for :heading do %> +

<%= t('redaction.index.heading') %>

+<% end %> <% unless @redactions.empty? %> <%= render :partial => 'redactions' %> diff --git a/app/views/redactions/new.html.erb b/app/views/redactions/new.html.erb index c714acdbc95..5004c0e1e81 100644 --- a/app/views/redactions/new.html.erb +++ b/app/views/redactions/new.html.erb @@ -1,5 +1,7 @@ <% @title = t 'redaction.new.title' %> -

<%= t 'redaction.new.heading' %>

+<% content_for :heading do %> +

<%= t 'redaction.new.heading' %>

+<% end %> <%= form_for(@redaction) do |f| %> <%= f.error_messages %> diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb index 1a24f15b43d..174fe97e4f6 100644 --- a/app/views/redactions/show.html.erb +++ b/app/views/redactions/show.html.erb @@ -1,20 +1,20 @@ <% @title = t('redaction.show.title') %> -

<%= t('redaction.show.heading', :title => @redaction.title) %>

+<% content_for :heading do %> +

<%= t('redaction.show.heading', :title => @redaction.title) %>

+<% end %>

<%= t 'redaction.show.user' %> <%= link_to(@redaction.user.display_name, {:controller => 'user', :action => 'view', :display_name => @redaction.user.display_name}) %>

-

+

<%= t 'redaction.show.description' %> <%= @redaction.description.to_html %>

<% if @user and @user.moderator? %> - - - - - -
<%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %><%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %>
+
+ <%= button_to t('redaction.show.edit'), edit_redaction_path(@redaction), :method => :get %> + <%= button_to t('redaction.show.destroy'), @redaction, :method => "delete", :remote => true, :data => { :confirm => t('redaction.show.confirm') } %> +
<% end %> diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb new file mode 100644 index 00000000000..f88942669ec --- /dev/null +++ b/app/views/site/_id.html.erb @@ -0,0 +1,37 @@ +<% if defined? ID_KEY %> +
+ +
+ +<% else %> + +<% end %> diff --git a/app/views/site/_key.html.erb b/app/views/site/_key.html.erb deleted file mode 100644 index 15f64275c5e..00000000000 --- a/app/views/site/_key.html.erb +++ /dev/null @@ -1,31 +0,0 @@ - - -<% content_for :left_menu do %> -
  • <%= link_to t("site.key.map_key"), "#", :id => "open_map_key", :title => t("site.key.map_key_tooltip") %>
  • -<% end %> diff --git a/app/views/site/_markdown_help.html.erb b/app/views/site/_markdown_help.html.erb index 832679716fe..7c5639912b3 100644 --- a/app/views/site/_markdown_help.html.erb +++ b/app/views/site/_markdown_help.html.erb @@ -1,29 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    <%= t "site.markdown_help.title_html" %>
    <%= t "site.markdown_help.headings" %># <%= t "site.markdown_help.heading" %>
    ## <%= t "site.markdown_help.subheading" %>
    <%= t "site.markdown_help.unordered" %>* <%= t "site.markdown_help.first" %>
    * <%= t "site.markdown_help.second" %>
    <%= t "site.markdown_help.ordered" %>1. <%= t "site.markdown_help.first" %>
    2. <%= t "site.markdown_help.second" %>
    <%= t "site.markdown_help.link" %>[<%= t "site.markdown_help.text" %>](<%= t "site.markdown_help.url" %>)
    <%= t "site.markdown_help.image" %>![<%= t "site.markdown_help.alt" %>](<%= t "site.markdown_help.url" %>)
    +

    <%= t "site.markdown_help.title_html" %>

    +
      +
    • +

      <%= t "site.markdown_help.headings" %>

      +

      # <%= t "site.markdown_help.heading" %>
      + ## <%= t "site.markdown_help.subheading" %>

      +
    • +
    • +

      <%= t "site.markdown_help.unordered" %>

      +

      * <%= t "site.markdown_help.first" %>
      + * <%= t "site.markdown_help.second" %>

      +
    • +
    • +

      <%= t "site.markdown_help.ordered" %>

      +

      1. <%= t "site.markdown_help.first" %>
      + 2. <%= t "site.markdown_help.second" %>

      +
    • +
    • +

      <%= t "site.markdown_help.link" %>

      + [<%= t "site.markdown_help.text" %>](<%= t "site.markdown_help.url" %>) +
    • +
    • +

      <%= t "site.markdown_help.image" %>

      + ![<%= t "site.markdown_help.alt" %>](<%= t "site.markdown_help.url" %>) +
    • +
    diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb index 2cdccc4b0cd..e360dcad00d 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -18,6 +18,15 @@ function markChanged(a) { changesaved=a; } + function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,object) { + updateLinks({ lon: lon, lat: lat }, zoom); + + var hash = OSM.formatHash({ lon: lon, lat: lat, zoom: zoom }); + if (hash !== location.hash) { + location.replace(hash); + } + } + function doSWF(lat,lon,sc) { if (sc < 11) sc = 11; @@ -42,15 +51,10 @@ // 700,600 for fixed size, 100%,100% for resizable } - doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>); - - $(document).ready(function () { - $("body").on("click", "a.set_position", function () { - var lat = parseFloat($(this).attr("data-lat")); - var lon = parseFloat($(this).attr("data-lon")); - var zoom = parseInt($(this).attr("data-zoom")); - - doSWF(lat, lon, zoom || 15); - }); - }); +<% if @lat && @lon -%> + doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>); +<% else -%> + var mapParams = OSM.mapParams(); + doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17); +<% end -%> diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb index 4559282ca46..3aeafa9cf08 100644 --- a/app/views/site/_potlatch2.html.erb +++ b/app/views/site/_potlatch2.html.erb @@ -10,7 +10,7 @@ <% end %> -<% locale = request.compatible_language_from(Potlatch2::LOCALES.keys) || "en" %> +<% locale = select_locale(Potlatch2::LOCALES.keys).to_s %> diff --git a/app/views/site/_resize.html.erb b/app/views/site/_resize.html.erb deleted file mode 100644 index a6583762fea..00000000000 --- a/app/views/site/_resize.html.erb +++ /dev/null @@ -1,47 +0,0 @@ - diff --git a/app/views/site/_search.html.erb b/app/views/site/_search.html.erb deleted file mode 100644 index f82f19d8429..00000000000 --- a/app/views/site/_search.html.erb +++ /dev/null @@ -1,60 +0,0 @@ - - -<% content_for :optionals do %> -
    - <%= t 'site.search.where_am_i' %> -

    <%= t 'site.search.search' %>

    -
    -
    - <%= form_tag "#", :id => "search_form" do %> - <%= text_field_tag :query, h(params[:query]), :tabindex => "1" %> - <%= submit_tag t('site.search.submit_text') %> - <% end %> -
    -
    -

    - <%= raw(t 'site.search.search_help') %> -

    -
    -<% end %> diff --git a/app/views/site/_sidebar.html.erb b/app/views/site/_sidebar.html.erb deleted file mode 100644 index 3b1b547b62f..00000000000 --- a/app/views/site/_sidebar.html.erb +++ /dev/null @@ -1,52 +0,0 @@ - - - diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb new file mode 100644 index 00000000000..a3954b0ceb7 --- /dev/null +++ b/app/views/site/about.html.erb @@ -0,0 +1,37 @@ +
    +
    + <%= t "about_page.copyright_html" %> +
    + +
    + +

    <%= raw t "about_page.used_by", :name => "OpenStreetMap" %>

    +
    + +
    +
    +

    <%= t "about_page.lede_text" %>

    +

    <%= t "about_page.local_knowledge_title" %>

    +

    <%= t "about_page.local_knowledge_html" %>

    +
    + +
    +

    <%= t "about_page.community_driven_title" %>

    +

    <%= t "about_page.community_driven_html", :diary_path => diary_path %>

    +
    + +
    +

    <%= t "about_page.open_data_title" %>

    +

    <%= t "about_page.open_data_html", :copyright_path => copyright_path %>

    +
    + +
    +

    <%= t "about_page.partners_title" %>

    +

    <%= t 'layouts.partners_html', + :ucl => link_to(t('layouts.partners_ucl'), "http://www.bartlett.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"), + :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %> +

    +
    +
    diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb index 03dee8716a2..d7826566888 100644 --- a/app/views/site/copyright.html.erb +++ b/app/views/site/copyright.html.erb @@ -1,43 +1,72 @@ - - +<% content_for :heading do %> <% if @locale == 'en' %> - <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> -

    <%= t 'license_page.native.title' %>

    -

    - <%= raw t 'license_page.native.text', - :native_link => link_to(t('license_page.native.native_link'), - :controller => 'site', - :action => 'copyright'), - :mapping_link => link_to(t('license_page.native.mapping_link'), - :controller => 'site', - :action => 'index') %> -

    -
    - <% end %> -<% else %> - - <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %> -

    <%= t 'license_page.foreign.title' %>

    -

    - <%= raw t 'license_page.foreign.text', - :english_original_link => link_to(t('license_page.foreign.english_link'), - :controller => 'site', - :action => 'copyright', - :copyright_locale => 'en') %> -

    -
    + + <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> +

    <%= t 'license_page.native.title' %>

    +

    + <%= raw t 'license_page.native.text', + :native_link => link_to(t('license_page.native.native_link'), + :controller => 'site', + :action => 'copyright', + :copyright_locale => nil), + :mapping_link => link_to(t('license_page.native.mapping_link'), + :controller => 'site', + :action => 'index') %> +

    +
    + <% end %> + <% else %> + + <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %> +

    <%= t 'license_page.foreign.title' %>

    +

    + <%= raw t 'license_page.foreign.text', + :english_original_link => link_to(t('license_page.foreign.english_link'), + :controller => 'site', + :action => 'copyright', + :copyright_locale => 'en') %> +

    +
    + <% end %> <% end %> + +

    <%= t "license_page.legal_babble.title_html", :locale => @locale %>

    + <% end %> -<%= raw t('license_page.legal_babble', :locale => @locale) %> +

    <%= t "license_page.legal_babble.intro_1_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.intro_2_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.intro_3_html", :locale => @locale %>

    + +

    <%= t "license_page.legal_babble.credit_title_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.credit_1_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.credit_2_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.credit_3_html", :locale => @locale %>

    +

    <%= image_tag("attribution_example.png", + :alt => t('license_page.legal_babble.attribution_example.alt'), + :border => 0, + :title => t('license_page.legal_babble.attribution_example.title')) %> + +

    <%= t "license_page.legal_babble.more_title_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.more_1_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.more_2_html", :locale => @locale %>

    + +

    <%= t "license_page.legal_babble.contributors_title_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.contributors_intro_html", :locale => @locale %>

    +
      +
    • <%= t "license_page.legal_babble.contributors_at_html", :locale => @locale %>
    • +
    • <%= t "license_page.legal_babble.contributors_ca_html", :locale => @locale %>
    • +
    • <%= t "license_page.legal_babble.contributors_fi_html", :locale => @locale %>
    • +
    • <%= t "license_page.legal_babble.contributors_fr_html", :locale => @locale %>
    • +
    • <%= t "license_page.legal_babble.contributors_nl_html", :locale => @locale %>
    • +
    • <%= t "license_page.legal_babble.contributors_nz_html", :locale => @locale %>
    • +
    • <%= t "license_page.legal_babble.contributors_za_html", :locale => @locale %>
    • +
    • <%= t "license_page.legal_babble.contributors_gb_html", :locale => @locale %>
    • +
    +

    <%= t "license_page.legal_babble.contributors_footer_1_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.contributors_footer_2_html", :locale => @locale %>

    + +

    <%= t "license_page.legal_babble.infringement_title_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.infringement_1_html", :locale => @locale %>

    +

    <%= t "license_page.legal_babble.infringement_2_html", :locale => @locale %>

    diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index d68b989df62..ae313e1f263 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -1,58 +1,13 @@ -<% if STATUS == :database_offline or STATUS == :api_offline %> -

    <%= t 'layouts.osm_offline' %> -

    -<% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -

    <%= t 'layouts.osm_read_only' %> -

    -<% elsif !@user.data_public? %> -

    <%= t 'site.edit.not_public' %>

    -

    <%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %>

    -

    <%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>

    -<% else %> -<% content_for :greeting do %> -<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> -<%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | -<% end %> -<% end %> - -<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> -<%= render :partial => 'search' %> -<%= render :partial => 'resize' %> - -<%= render :partial => preferred_editor %> - - +<% content_for :content do %> + <% if STATUS == :database_offline or STATUS == :api_offline %> +

    <%= t 'layouts.osm_offline' %>

    + <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> +

    <%= t 'layouts.osm_read_only' %>

    + <% elsif !@user.data_public? %> +

    <%= t 'site.edit.not_public' %>

    +

    <%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %>

    +

    <%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>

    + <% else %> + <%= render :partial => preferred_editor %> + <% end %> <% end %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb new file mode 100644 index 00000000000..78b98ae08f1 --- /dev/null +++ b/app/views/site/export.html.erb @@ -0,0 +1,56 @@ +<% set_title(t('export.title')) %> + +

    + + <%= t 'export.title' %> +

    + +<%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %> + <%= hidden_field_tag 'format', 'osm' %> + +
    +
    + <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %> +
    + <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %> + <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %> +

    + <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %> +
    + <%= t'export.start.manually_select' %> +
    + +

    <%= t'export.start.licence' %>

    +

    <%= raw t 'export.start.export_details' %>

    + +
    +

    + <%= t'export.start.too_large.body' %> +

    +
    + +
    +
    + <%= submit_tag t('export.start.export_button') %> +
    + +

    <%= t'export.start.too_large.advice' %>

    +
    + +
    +
    <%= t'export.start.too_large.overpass.title' %>
    +
    <%= t'export.start.too_large.overpass.description' %>
    + +
    <%= t'export.start.too_large.planet.title' %>
    +
    <%= t'export.start.too_large.planet.description' %>
    + +
    <%= t'export.start.too_large.geofabrik.title' %>
    +
    <%= t'export.start.too_large.geofabrik.description' %>
    + +
    <%= t'export.start.too_large.metro.title' %>
    +
    <%= t'export.start.too_large.metro.description' %>
    + +
    <%= t'export.start.too_large.other.title' %>
    +
    <%= t'export.start.too_large.other.description' %>
    +
    +<% end %> diff --git a/app/views/site/fixthemap.html.erb b/app/views/site/fixthemap.html.erb new file mode 100644 index 00000000000..fc5fecc9a48 --- /dev/null +++ b/app/views/site/fixthemap.html.erb @@ -0,0 +1,37 @@ +<% content_for :head do %> + <%= javascript_include_tag "fixthemap" %> +<% end %> + +<% content_for :heading do %> +

    <%= t "fixthemap.title" %>

    +<% end %> + +

    <%= t "layouts.intro_header" %>

    + +

    <%= t "layouts.intro_text" %>

    + +

    <%= t "fixthemap.how_to_help.title" %>

    + +
    +
    +

    <%= t "fixthemap.how_to_help.join_the_community.title" %>

    + <%= t "fixthemap.how_to_help.join_the_community.explanation_html" %> + +
    +
    +

    <%= t "welcome_page.add_a_note.title" %>

    +

    <%= t "welcome_page.add_a_note.paragraph_1_html" %>

    +

    <%= t "fixthemap.how_to_help.add_a_note.instructions_html", :map_url => root_path %>

    +
    +
    + +

    <%= t "fixthemap.other_concerns.title" %>

    +

    <%= t "fixthemap.other_concerns.explanation_html" %>

    + +
    +

    <%= t "welcome_page.questions.title" %>

    + +

    <%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %>

    +
    diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb new file mode 100644 index 00000000000..a1b1adb9227 --- /dev/null +++ b/app/views/site/help.html.erb @@ -0,0 +1,18 @@ +<% content_for :heading do %> +

    <%= t "help_page.title" %>

    +<% end %> + +

    <%= t "help_page.introduction" %>

    + +<% ['welcome', 'help', 'wiki'].each do |site| %> + <% unless site == 'welcome' && !@user %> +
    +

    + + <%= t "help_page.#{site}.title" %> + +

    +

    <%= t "help_page.#{site}.description" %>

    +
    + <% end %> +<% end %> diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb new file mode 100644 index 00000000000..38f2e0d3d5d --- /dev/null +++ b/app/views/site/id.html.erb @@ -0,0 +1,68 @@ + + + + + <%= stylesheet_link_tag 'iD' %> + + <%= javascript_include_tag 'iD' %> + + + +
    + + + diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index b7a9df068c6..7603bb1bdd0 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -1,303 +1,4 @@ -<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> - <% content_for :greeting do %> - <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | - <% end %> -<% end %> - -<% unless STATUS == :api_offline or STATUS == :database_offline -%> - <% content_for :editmenu do -%> -
  • <%= link_to t("browse.start_rjs.data_layer_name"), "#", :id => "show_data" %>
  • - <% end -%> -<% end -%> - -<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> -<%= render :partial => 'key' %> -<%= render :partial => 'search' %> - - - - - - - -
    - - - - - - - - -
    <%= t'site.index.license.license_url' %><%= t'site.index.license.project_url' %>
    <%= - t'site.index.license.notice', - :license_name => t('site.index.license.license_name'), - :project_name => t('site.index.license.project_name') - %>
    -
    - <% -if params[:mlon] and params[:mlat] - marker = true - mlon = params[:mlon].to_f - mlat = params[:mlat].to_f -end - -if params[:node] or params[:way] or params[:relation] - object = true - object_zoom = true - - if params[:node] - object_type = 'node' - object_id = params[:node].to_i - elsif params[:way] - object_type = 'way' - object_id = params[:way].to_i - elsif params[:relation] - object_type = 'relation' - object_id = params[:relation].to_i - end -end - -# Decide on a lat lon to initialise the map with. Various ways of doing this -if params[:bbox] - bbox = true - minlon, minlat, maxlon, maxlat = params[:bbox].split(",").collect { |c| c.to_f } - layers = params[:layers] - box = true if params[:box] == "yes" - object_zoom = false -elsif params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat] - bbox = true - minlon = params[:minlon].to_f - minlat = params[:minlat].to_f - maxlon = params[:maxlon].to_f - maxlat = params[:maxlat].to_f - layers = params[:layers] - box = true if params[:box]=="yes" - object_zoom = false -elsif params[:lon] and params[:lat] - lon = params[:lon].to_f - lat = params[:lat].to_f - zoom = params.fetch(:zoom, 5).to_i - layers = params[:layers] - object_zoom = false -elsif params[:mlon] and params[:mlat] - lon = params[:mlon].to_f - lat = params[:mlat].to_f - zoom = params.fetch(:zoom, 12).to_i - layers = params[:layers] - object_zoom = false -elsif cookies.key?("_osm_location") - lon,lat,zoom,layers = cookies["_osm_location"].split("|") -elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? - lon = @user.home_lon - lat = @user.home_lat - zoom = 10 -else - unless STATUS == :database_readonly or STATUS == :database_offline - session[:location] = OSM::IPLocation(request.env['REMOTE_ADDR']) unless session[:location] - end - - if session[:location] - bbox = true - minlon = session[:location][:minlon] - minlat = session[:location][:minlat] - maxlon = session[:location][:maxlon] - maxlat = session[:location][:maxlat] - else - lon = -0.1 - lat = 51.5 - zoom = params.fetch(:zoom, 5).to_i - end - - layers = params[:layers] -end + set_title() + content_for(:content_class) { "overlay-sidebar" } %> - -<%= javascript_include_tag 'openlayers.js' %> -<%= javascript_include_tag 'map.js' %> - -<%= render :partial => 'resize' %> - - diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb index 294224b1896..d401b4c34b3 100644 --- a/app/views/site/key.html.erb +++ b/app/views/site/key.html.erb @@ -1,19 +1,15 @@
    <% YAML.load_file("#{Rails.root}/config/key.yml").each do |name,data| %> - <% if params[:layer] == name %> - <% data.each do |entry| %> - <% if params[:zoom].to_i >= entry['min_zoom'] && params[:zoom].to_i <= entry['max_zoom'] %> - - - - - <% end %> - <% end %> + <% data.each do |entry| %> + + + + <% end %> <% end %>
    - <%= image_tag "key/#{name}/#{entry['image']}" %> - - <%= [*t("site.key.table.entry.#{entry['name']}")].to_sentence %> -
    + <%= image_tag "key/#{name}/#{entry['image']}" %> + + <%= [*t("site.key.table.entry.#{entry['name']}")].to_sentence %> +
    diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb new file mode 100644 index 00000000000..4edcf361ebb --- /dev/null +++ b/app/views/site/welcome.html.erb @@ -0,0 +1,67 @@ +<% content_for :head do %> + <%= javascript_include_tag "welcome" %> +<% end %> + +<% content_for :heading do %> +

    <%= t "welcome_page.title" %>

    +<% end %> + +

    <%= t "welcome_page.introduction_html" %>

    + +

    <%= t "welcome_page.whats_on_the_map.title" %>

    + +
    +
    +
    + +
    +

    <%= t "welcome_page.whats_on_the_map.on_html" %>

    +
    +
    +
    + +
    +

    <%= t "welcome_page.whats_on_the_map.off_html" %>

    +
    +
    + +

    <%= t "welcome_page.basic_terms.title" %>

    + +

    <%= t "welcome_page.basic_terms.paragraph_1_html" %>

    + +
    +
    + +

    <%= t "welcome_page.basic_terms.editor_html" %>

    +
    +
    + +

    <%= t "welcome_page.basic_terms.node_html" %>

    +
    +
    + +

    <%= t "welcome_page.basic_terms.way_html" %>

    +
    +
    + +

    <%= t "welcome_page.basic_terms.tag_html" %>

    +
    +
    + +
    +

    <%= t "welcome_page.questions.title" %>

    + +

    <%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %>

    +
    + + + +
    +
    +

    <%= t "welcome_page.add_a_note.title" %>

    +

    <%= t "welcome_page.add_a_note.paragraph_1_html" %>

    +

    <%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %>

    +
    +
    diff --git a/app/views/trace/_description.html.erb b/app/views/trace/_description.html.erb new file mode 100644 index 00000000000..9b81283b2de --- /dev/null +++ b/app/views/trace/_description.html.erb @@ -0,0 +1,6 @@ +<%= image_tag(url_for(:controller => :trace, :action => :icon, :id => description.id, :display_name => description.user.display_name)) %> +<% if description.size -%> +<%= t "trace.description.description_with_count", :count => description.size, :user => description.user.display_name %> +<% else -%> +<%= t "trace.description.description_without_count", :user => description.user.display_name %> +<% end -%> diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb index 32717d8242b..c05e00c4a49 100644 --- a/app/views/trace/_trace.html.erb +++ b/app/views/trace/_trace.html.erb @@ -10,21 +10,21 @@ <% end %> <%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %> - ... - <% if trace.inserted %> + ... + <% if trace.inserted %> (<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>) - <% end %> + <% end %> ... <%= t'trace.trace.ago', :time_in_words_ago => time_ago_in_words(trace.timestamp) %> <%= link_to t('trace.trace.more'), {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id}, {:title => t('trace.trace.trace_details')} %> / <%= link_to_if trace.inserted?, t('trace.trace.map'), {:controller => 'site', :action => 'index', :lat => trace.latitude, :lon => trace.longitude, :zoom => 14}, {:title => t('trace.trace.view_map')} %> / <%= link_to t('trace.trace.edit'), {:controller => 'site', :action => 'edit', :gpx => trace.id }, {:title => t('trace.trace.edit_map')} %> <%= t('trace.trace.' + trace.visibility) %>
    - <%= h(trace.description) %> + <%= trace.description %>
    <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %> <% if !trace.tags.empty? %> - <%= t'trace.trace.in' %> + <%= t'trace.trace.in' %> <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %> <% end %> diff --git a/app/views/trace/_trace_optionals.html.erb b/app/views/trace/_trace_optionals.html.erb index d541c985b9f..a20091c077b 100644 --- a/app/views/trace/_trace_optionals.html.erb +++ b/app/views/trace/_trace_optionals.html.erb @@ -1,7 +1,6 @@ <% content_for :optionals do %>
    -

    <%= t'trace.trace_optionals.tags' %>

    -
    +

    <%= t'trace.trace_optionals.tags' %>

    <% if @all_tags %> <% @all_tags.each do |tag| %> <%= link_to_tag tag %>
    diff --git a/app/views/trace/_trace_paging_nav.html.erb b/app/views/trace/_trace_paging_nav.html.erb index 724efdd7453..dea4271d2e8 100644 --- a/app/views/trace/_trace_paging_nav.html.erb +++ b/app/views/trace/_trace_paging_nav.html.erb @@ -1,15 +1,18 @@

    - <% if @page > 1 %> - <%= link_to t('trace.trace_paging_nav.previous'), params.merge({ :page => @page - 1 }) %> - <% else %> - <%= t('trace.trace_paging_nav.previous') %> - <% end %> - | <%= t('trace.trace_paging_nav.showing_page', :page => @page) %> | +<% if @traces.size > 1 %> +<% if @page > 1 %> +<%= link_to t('trace.trace_paging_nav.newer'), params.merge({ :page => @page - 1 }) %> +<% else %> +<%= t('trace.trace_paging_nav.newer') %> +<% end %> - <% if @traces.size < @page_size %> - <%= t('trace.trace_paging_nav.next') %> - <% else %> - <%= link_to t('trace.trace_paging_nav.next'), params.merge({ :page => @page + 1 }) %> - <% end %> +| <%= t('trace.trace_paging_nav.showing_page', :page => @page) %> | + +<% if @traces.size < @page_size %> +<%= t('trace.trace_paging_nav.older') %> +<% else %> +<%= link_to t('trace.trace_paging_nav.older'), params.merge({ :page => @page + 1 }) %> +<% end %> +<% end %>

    diff --git a/app/views/trace/create.html.erb b/app/views/trace/create.html.erb index 23346a95160..43d4eff3750 100644 --- a/app/views/trace/create.html.erb +++ b/app/views/trace/create.html.erb @@ -1,13 +1,33 @@ -

    <%= t'trace.create.upload_trace' %>

    +<% content_for :heading do %> +

    <%= t'trace.create.upload_trace' %>

    +<% end %> <%= error_messages_for 'trace' %> <%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %> - - - - - - -
    <%= t'trace.trace_form.upload_gpx' %><%= f.file_field :gpx_file, :size => 50, :maxlength => 255 %>
    <%= t'trace.trace_form.description' %><%= f.text_field :description, :size => 50, :maxlength => 255 %>
    <%= t'trace.trace_form.tags' %><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %> (<%= t'trace.trace_form.tags_help' %>)
    <%= t'trace.trace_form.visibility' %><%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<%= t'trace.trace_form.visibility_help' %>)
    <%= submit_tag t('trace.trace_form.upload_button') %> | <%= t'trace.trace_form.help' %>
    +
    +
    +
    + + <%= f.file_field :gpx_file %> +
    +
    + + <%= f.text_field :description %> +
    +
    + + <%= f.text_field :tagstring %> + (<%= t'trace.trace_form.tags_help' %>) +
    +
    + + <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> + (<%= t'trace.trace_form.visibility_help' %>) +
    +
    + + <%= submit_tag t('trace.trace_form.upload_button') %> + <%= t'trace.trace_form.help' %> +
    <% end %> diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb index a694d55bb07..d9ec9f14b7d 100644 --- a/app/views/trace/edit.html.erb +++ b/app/views/trace/edit.html.erb @@ -1,46 +1,62 @@ -

    <%= t 'trace.edit.heading', :name => h(@trace.name) %>

    +<% content_for :heading do %> +

    <%= t 'trace.edit.heading', :name => h(@trace.name) %>

    +<% end %> <%= form_for @trace, :url => { :action => "edit" } do |f| %> - - - - - - - - - +
    +
    +
    + +

    <%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)

    +
    +
    + +

    <%= l @trace.timestamp, :format => :friendly %>

    +
    +
    + <% if @trace.inserted? %> -
    - - - - - - + +
    +
    + +

    <%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>

    +
    +
    + +
    +
    + <%= @trace.latitude %>; + <%= @trace.longitude %> +
    + (<%=link_to t('trace.edit.map'), :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to t('trace.edit.edit'), :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>) +
    + <% end %> - - - - - - - - - - - - - - - - -
    <%= t'trace.edit.filename' %><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)
    <%= t'trace.edit.uploaded_at' %><%= l @trace.timestamp, :format => :friendly %>
    <%= t'trace.edit.points' %><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>
    <%= t'trace.edit.start_coord' %>
    <%= @trace.latitude %>; <%= @trace.longitude %>
    (<%=link_to t('trace.edit.map'), :controller => 'site', :action => 'index', :lat => @trace.latitude, :lon => @trace.longitude, :zoom => 14 %> / <%=link_to t('trace.edit.edit'), :controller => 'site', :action => 'edit', :lat => @trace.latitude, :lon => @trace.longitude, :gpx=> @trace.id, :zoom => 14 %>)
    <%= t'trace.edit.owner' %><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %>
    <%= t'trace.edit.description' %><%= f.text_field :description, :size => 50 %>
    <%= t'trace.edit.tags' %><%= f.text_field :tagstring, :size => 50 %> (<%= t'trace.edit.tags_help' %>)
    <%= t'trace.edit.visibility' %><%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<%= t'trace.edit.visibility_help' %>)
    - -

    + +
    +
    + +

    <%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %>

    +
    +
    + + <%= f.text_field :description %> +
    +
    + + <%= f.text_field :tagstring %> (<%= t'trace.edit.tags_help' %>) +
    +
    + + <%= f.select :visibility, [[t('trace.visibility.private'),"private"],[t('trace.visibility.public'),"public"],[t('trace.visibility.trackable'),"trackable"],[t('trace.visibility.identifiable'),"identifiable"]] %> (<%= t'trace.edit.visibility_help' %>) +
    +
    + +
    <%= submit_tag t'trace.edit.save_button' %> diff --git a/app/views/trace/georss.rss.builder b/app/views/trace/georss.rss.builder new file mode 100644 index 00000000000..0b2e26d11e6 --- /dev/null +++ b/app/views/trace/georss.rss.builder @@ -0,0 +1,43 @@ +xml.instruct! + +xml.rss("version" => "2.0", + "xmlns:dc" => "http://purl.org/dc/elements/1.1/", + "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#", + "xmlns:georss" => "http://www.georss.org/georss") do + xml.channel do + xml.title t("trace.georss.title") + xml.description t("trace.georss.title") + xml.link url_for(:controller => :trace, :action => :list, :only_path => false) + + xml.image do + xml.url image_path("mag_map-rss2.0.png") + xml.title t("trace.georss.title") + xml.width 100 + xml.height 100 + xml.link url_for(:controller => :trace, :action => :list, :only_path => false) + end + + @traces.each do |trace| + xml.item do + xml.title trace.name + + xml.link url_for(:controller => :trace, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false) + xml.guid url_for(:controller => :trace, :action => :view, :id => trace.id, :display_name => trace.user.display_name, :only_path => false) + + xml.description do + xml.cdata! render(:partial => "description", :object => trace, :formats => [ :html ]) + end + + xml.dc :creator, trace.user.display_name + + xml.pubDate trace.timestamp.to_s(:rfc822) + + if trace.latitude and trace.longitude + xml.geo :lat, trace.latitude + xml.geo :long, trace.longitude + xml.georss :point, "#{trace.latitude} #{trace.longitude}" + end + end + end + end +end diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb index 2475b5ad2ef..1e89e963ddf 100644 --- a/app/views/trace/list.html.erb +++ b/app/views/trace/list.html.erb @@ -1,35 +1,45 @@ -

    <%= h(@title) %>

    - -<% content_for :head do %> -<%= auto_discovery_link_tag :atom, :action => 'georss', :display_name => @display_name, :tag => @tag %> +<% content_for :heading do %> +

    <%= h(@title) %>

    +
      +
    • <%= t('trace.list.description') %>
    • +
    • <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %>
    • +
    • <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %>
    • + <% if @tag %> +
    • <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
    • +
    • <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
    • + <% else %> + <% if @display_name %> +
    • <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %>
    • + <% end %> + <%= unless_user(@target_user, :li) do %> + <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %> + <% end %> + <% end %> +
    <% end %> -

    - <%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %> - | <%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %> - <% if @tag %> - | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %> - | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %> - <% else %> - <% if @display_name %> - | <%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %> - <% end %> - <%= unless_user(@target_user, :span) do %> - | <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %> - <% end %> - <% end %> -

    +<% content_for :auto_discovery_link_tag do %> +<%= auto_discovery_link_tag :rss, :action => 'georss', :display_name => @display_name, :tag => @tag %> +<% end %> -<%= render :partial => 'trace_paging_nav' %> +<% if @traces.size > 0 %> + <%= render :partial => 'trace_paging_nav' %> - - - - - - <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %> -
    + + + + + + + + + <%= render :partial => 'trace', :collection => @traces unless @traces.nil? %> + +
    -<%= render :partial => 'trace_paging_nav' %> + <%= render :partial => 'trace_paging_nav' %> +<% else %> +

    <%= t 'trace.list.empty_html', :upload_link => trace_create_path %>

    +<% end %> <%= render :partial => 'trace_optionals' %> diff --git a/app/views/trace/offline.html.erb b/app/views/trace/offline.html.erb index d9cfb3926ee..ed6c1c58df7 100644 --- a/app/views/trace/offline.html.erb +++ b/app/views/trace/offline.html.erb @@ -1,2 +1,5 @@ +<% content_for :heading do %>

    <%= t 'trace.offline.heading' %>

    +<% end %> +

    <%= t 'trace.offline.message' %>

    diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb index 5a7c5bcc6c9..cbe6c1628e9 100644 --- a/app/views/trace/view.html.erb +++ b/app/views/trace/view.html.erb @@ -1,4 +1,6 @@ -

    <%= t 'trace.view.heading', :name => h(@trace.name) %>

    +<% content_for :heading do %> +

    <%= t 'trace.view.heading', :name => h(@trace.name) %>

    +<% end %> <% if STATUS != :gpx_offline %> <% if @trace.inserted %> @@ -12,7 +14,7 @@ <%= t'trace.view.filename' %> <%= @trace.name %> (<%= link_to t('trace.view.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>) - + <%= t'trace.view.uploaded' %> <%= l @trace.timestamp, :format => :friendly %> @@ -53,10 +55,8 @@

    <%= if_user(@trace.user) do %> - - - - - -
    <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %><%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
    +
    + <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %> + <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %> +
    <% end %> diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb index 9bac0dc2d67..4811389f12f 100644 --- a/app/views/user/_contact.html.erb +++ b/app/views/user/_contact.html.erb @@ -1,41 +1,48 @@ - - - <%= user_thumbnail contact %> - - - <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %> - <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %> - <% distance = @this_user.distance(contact) %> - <% if distance < 1 %> - (<%= t 'user.view.m away', :count => (distance * 1000).round %>) +<% + user_data = { + :lon => contact.home_lon, + :lat => contact.home_lat, + :icon => image_path(type == "friend" ? "marker-blue.png" : "marker-green.png"), + :description => render(:partial => "popup", :object => contact, :locals => {:type => type}) + } +%> +<%= content_tag :div, :class => "contact-activity clearfix", :data => {:user => user_data} do %> + <%= user_thumbnail contact %> +
    +

    + <%= link_to h(contact.display_name), :controller => 'user', :action => 'view', :display_name => contact.display_name %> + <% if @this_user.home_lon and @this_user.home_lat and contact.home_lon and contact.home_lat %> + <% distance = @this_user.distance(contact) %> + <% if distance < 1 %> + (<%= t 'user.view.m away', :count => (distance * 1000).round %>) + <% else %> + (<%= t 'user.view.km away', :count => distance.round %>) + <% end %> + <% end %> +

    +

    + <% changeset = contact.changesets.first %> + <% if changeset %> + <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> + <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %> + "<%= link_to(comment, + {:controller => 'browse', :action => 'changeset', :id => changeset.id}, + {:title => t('changeset.changeset.view_changeset_details')}) + %>" <% else %> - (<%= t 'user.view.km away', :count => distance.round %>) + <%= t'changeset.changeset.no_edits' %> + <% end %> +

    + +
      +
    • <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %>
    • +
    • + <% if @user.is_friends_with?(contact) %> + <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> + <% else %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => contact.display_name, :referer => request.fullpath), :method => :post %> <% end %> - <% end %> - - - - - <% changeset = contact.changesets.first %> - <% if changeset %> - <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> - <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %> - "<%= link_to(comment, - {:controller => 'browse', :action => 'changeset', :id => changeset.id}, - {:title => t('changeset.changeset.view_changeset_details')}) - %>" - <% else %> - <%= t'changeset.changeset.no_edits' %> - <% end %> - - - - <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => contact.display_name %> - | - <% if @user.is_friends_with?(contact) %> - <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => contact.display_name, :referer => request.fullpath %> - <% else %> - <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => contact.display_name, :referer => request.fullpath %> - <% end %> - - +
    • +
    +
    +<% end %> diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb deleted file mode 100644 index 2d886527ccf..00000000000 --- a/app/views/user/_map.html.erb +++ /dev/null @@ -1,96 +0,0 @@ -<% -if @user.home_lat.nil? or @user.home_lon.nil? - lon = h(params['lon'] || '0') - lat = h(params['lat'] || '20') - zoom = h(params['zoom'] || '1') -else - marker = true - mlon = @user.home_lon - mlat = @user.home_lat - lon = @user.home_lon - lat = @user.home_lat - zoom = '12' -end -%> - -<%= javascript_include_tag 'openlayers.js' %> -<%= javascript_include_tag 'map.js' %> - - diff --git a/app/views/user/_user.html.erb b/app/views/user/_user.html.erb index 4f2f59c92d2..b1ea3f299c0 100644 --- a/app/views/user/_user.html.erb +++ b/app/views/user/_user.html.erb @@ -19,7 +19,7 @@ %> <% 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/user/account.html.erb b/app/views/user/account.html.erb index 48896649117..94183ff4244 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,139 +1,178 @@ -

    <%= t 'user.account.my settings' %>

    -<%= error_messages_for 'user' %> -<%= form_for :user, :html => { :multipart => true } do |f| %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<% content_for :heading do %> +

    <%= t 'user.account.my settings' %>

    +
      +
    • <%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %>
    • +
    • <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>
    • +
    +<% end %> - - - - - - - - - - - - - - - - - - - - - - - - - - class="nohome" <%end%> > - - - - - - - - - - - - - -
    <%= t 'user.new.display name' %><%= f.text_field :display_name %>
    <%= t 'user.account.current email address' %><%= @user.email %> <%= t 'user.account.email never displayed publicly' %>
    <%= t 'user.account.new email address' %><%= f.email_field :new_email, {:size => 50, :maxlength => 255} %> <%= t 'user.account.email never displayed publicly' %>
    <%= t 'user.new.password' %><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %>
    <%= t 'user.new.confirm password' %><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255, :autocomplete => :off} %>
    <%= t 'user.account.openid.openid' %><%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> (<%= t 'user.account.openid.link text' %>)
    <%= t 'user.account.public editing.heading' %> - <% if @user.data_public? %> - <%= t 'user.account.public editing.enabled' %> (<%= t 'user.account.public editing.enabled link text' %>) - <% else %> - <%= t 'user.account.public editing.disabled' %> (<%= t 'user.account.public editing.disabled link text' %>) - <% end %> -
    <%= t 'user.account.contributor terms.heading' %> - <% if @user.terms_agreed? %> - <%= t 'user.account.contributor terms.agreed' %> - (<%= t 'user.account.contributor terms.link text' %>) -
    - <% if @user.consider_pd? %> - <%= t 'user.account.contributor terms.agreed_with_pd' %> +<%= error_messages_for 'user' %> +<%= form_for :user, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %> +
    +
    + + <%= f.text_field :display_name %> +
    +
    + +
    +
    + + + <%= t 'user.account.email never displayed publicly' %> +
    + +
    + + <%= f.email_field :new_email, :autocomplete => :off %> + <%= t 'user.account.email never displayed publicly' %> +
    +
    + +
    +
    + + <%= f.password_field :pass_crypt, {:value => '', :autocomplete => :off} %> +
    + +
    + + <%= f.password_field :pass_crypt_confirmation, {:value => '', :autocomplete => :off} %> +
    +
    + +
    +
    + + <%= f.url_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> + (<%= t 'user.account.openid.link text' %>) +
    +
    + +
    +
    + + + <% if @user.data_public? %> + <%= t 'user.account.public editing.enabled' %> + (<%= t 'user.account.public editing.enabled link text' %>) + <% else %> + <%= t 'user.account.public editing.disabled' %> + (<%= t 'user.account.public editing.disabled link text' %>) <% end %> - <% else %> - <%= t 'user.account.contributor terms.not yet agreed' %>
    - - <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> - <% end %> -
    <%= t 'user.account.profile description' %><%= richtext_area :user, :description, :rows => '15', :cols => '80' %>
    <%= t 'user.account.preferred languages' %><%= f.text_field :languages %>
    <%= t 'user.account.preferred editor' %><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
    - <%= t 'user.account.image' %> - - <% if @user.image.file? %> - - - - - - - - - - - - - - -
    <%= user_image @user %><%= radio_button_tag "image_action", "keep", true %><%= t 'user.account.keep image' %>
    <%= radio_button_tag "image_action", "delete" %><%= t 'user.account.delete image' %>
    <%= radio_button_tag "image_action", "new" %><%= t 'user.account.replace image' %>
    <%= f.file_field :image, :onchange => "$('image_action_new').prop('checked', true)" %>
    <%= t 'user.account.image size hint' %>
    - <% else %> - <%= hidden_field_tag "image_action", "new" %> - <%= t 'user.account.new image' %>
    <%= f.file_field :image %>
    <%= t 'user.account.image size hint' %> - <% end %> -
    <%= t 'user.account.home location' %><%= t 'user.account.no home location' %><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %> <%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %>
    -

    <%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" />

    -
    -
    <%= submit_tag t('user.account.save changes button') %>
    +
    +
    + +
    + + + <% if @user.terms_agreed? %> + <%= t 'user.account.contributor terms.agreed' %> + (<%= t 'user.account.contributor terms.link text' %>) + <% if @user.consider_pd? %> + <%= t 'user.account.contributor terms.agreed_with_pd' %> + <% end %> + <% else %> + <%= t 'user.account.contributor terms.not yet agreed' %> + <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %> + <% end %> + +
    +
    + + <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %> +
    + + +
    +
    + + <%= richtext_area :user, :description, :cols => 80, :rows => 20 %> +
    + +
    + + <%= f.text_field :languages %> +
    + +
    + + <%= user_image @user %> +
      + <% if @user.image.file? %> +
    • + <%= radio_button_tag "image_action", "keep", !@user.image_use_gravatar %> + +
    • + <% end %> + <% if @user.image.file? || @user.image_use_gravatar? %> +
    • + <%= radio_button_tag "image_action", "delete" %> + +
    • + <% end %> + <% if @user.image.file? %> +
    • + <%= radio_button_tag "image_action", "new" %> + + <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> +
    • + <% else %> +
    • + <%= radio_button_tag "image_action", "new" %> + + <%= f.file_field :image, :onchange => "$('#image_action_new').prop('checked', true)" %> +
    • + <% end %> +
    • + <%= radio_button_tag "image_action", "gravatar", @user.image_use_gravatar %> + +
    • +
    +
    +
    + +
    +
    + +
    class="nohome"<%end%> > +

    <%= t 'user.account.no home location' %>

    +
    + + <%= f.text_field :home_lat, :id => "home_lat" %> +
    +
    + + <%= f.text_field :home_lon, :id => "home_lon" %> +
    +
    +
    + +
    + checked="checked" <% end %> id="updatehome" /> + +
    + <% content_for :head do %> + <%= javascript_include_tag "user" %> + <% end %> + <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %> +
    + + <%= submit_tag t('user.account.save changes button') %> <% end %> -<%= render :partial => 'map', :locals => { :setting_location => true, :show_other_users => false } %> - <% unless @user.data_public? %>

    <%= t 'user.account.public editing note.heading' %>

    <%= raw t 'user.account.public editing note.text' %> <%= button_to t('user.account.make edits public button'), :action => :go_public %> <% end %> -
    -
    -<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %> -
    -
    diff --git a/app/views/user/api_details.builder b/app/views/user/api_details.builder deleted file mode 100644 index 6e77bfed827..00000000000 --- a/app/views/user/api_details.builder +++ /dev/null @@ -1,26 +0,0 @@ -xml.instruct! :xml, :version => "1.0" -xml.osm("version" => API_VERSION, "generator" => GENERATOR) do - xml.tag! "user", :id => @user.id, - :display_name => @user.display_name, - :account_created => @user.creation_time.xmlschema do - if @user.description - xml.tag! "description", @user.description - end - xml.tag! "contributor-terms", - :agreed => !!@user.terms_agreed, - :pd => !!@user.consider_pd - if @user.home_lat and @user.home_lon - xml.tag! "home", :lat => @user.home_lat, - :lon => @user.home_lon, - :zoom => @user.home_zoom - end - if @user.image.file? - xml.tag! "img", :href => "http://#{SERVER_URL}#{@user.image.url}" - end - if @user.languages - xml.tag! "languages" do - @user.languages.split(",") { |lang| xml.tag! "lang", lang } - end - end - end -end diff --git a/app/views/user/api_read.builder b/app/views/user/api_read.builder new file mode 100644 index 00000000000..e976954206f --- /dev/null +++ b/app/views/user/api_read.builder @@ -0,0 +1,51 @@ +xml.instruct! :xml, :version => "1.0" +xml.osm("version" => API_VERSION, "generator" => GENERATOR) do + xml.tag! "user", :id => @this_user.id, + :display_name => @this_user.display_name, + :account_created => @this_user.creation_time.xmlschema do + if @this_user.description + xml.tag! "description", @this_user.description + end + if @user && @user == @this_user + xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed, + :pd => !!@this_user.consider_pd + else + xml.tag! "contributor-terms", :agreed => !!@this_user.terms_agreed + end + if @this_user.image.file? or @this_user.image_use_gravatar + xml.tag! "img", :href => user_image_url(@this_user, :size => 256) + end + xml.tag! "roles" do + @this_user.roles.each do |role| + xml.tag! role.role + end + end + xml.tag! "changesets", :count => @this_user.changesets.size + xml.tag! "traces", :count => @this_user.traces.size + xml.tag! "blocks" do + xml.tag! "received", :count => @this_user.blocks.size, + :active => @this_user.blocks.active.size + if @this_user.moderator? + xml.tag! "issued", :count => @this_user.blocks_created.size, + :active => @this_user.blocks_created.active.size + end + end + if @user && @user == @this_user + if @this_user.home_lat and @this_user.home_lon + xml.tag! "home", :lat => @this_user.home_lat, + :lon => @this_user.home_lon, + :zoom => @this_user.home_zoom + end + if @this_user.languages + xml.tag! "languages" do + @this_user.languages.split(",") { |lang| xml.tag! "lang", lang } + end + end + xml.tag! "messages" do + xml.tag! "received", :count => @this_user.messages.size, + :unread => @this_user.new_messages.size + xml.tag! "sent", :count => @this_user.sent_messages.size + end + end + end +end diff --git a/app/views/user/blocked.html.erb b/app/views/user/blocked.html.erb index 69e700634f8..f175fe18a1d 100644 --- a/app/views/user/blocked.html.erb +++ b/app/views/user/blocked.html.erb @@ -1,4 +1,6 @@ -

    <%= t 'user.new.heading' %>

    +<% content_for :heading do %> +

    <%= t 'user.new.heading' %>

    +<% end %>

    <%= t 'user.new.no_auto_account_create' %>

    diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb index f48cd8867db..9fc33094e09 100644 --- a/app/views/user/confirm.html.erb +++ b/app/views/user/confirm.html.erb @@ -1,17 +1,32 @@ - +<% content_for :heading do %> +

    <%= t 'user.confirm.heading' %>

    +
    +<% end %> -

    <%= t 'user.confirm.heading' %>

    +<% if params[:confirm_string] %> + -

    <%= t 'user.confirm.press confirm button' %>

    +

    <%= t 'user.confirm.press confirm button' %>

    -<%= form_tag({}, { :id => "confirm" }) do %> - - - -<% end %> + <%= form_tag({}, { :id => "confirm" }) do %> + + + + <% end %> - + +<% else %> +

    + <%= t "user.confirm.introduction_1" %> + + <%= t "user.confirm.introduction_2" %> + +

    + +

    <%= t "user.confirm.reconfirm_html", + :reconfirm => url_for(:action => 'confirm_resend')%>

    +<% end %> diff --git a/app/views/user/confirm_email.html.erb b/app/views/user/confirm_email.html.erb index 5efc6a2c533..1170631caf3 100644 --- a/app/views/user/confirm_email.html.erb +++ b/app/views/user/confirm_email.html.erb @@ -2,7 +2,9 @@ $("#content").hide(); -

    <%= t 'user.confirm_email.heading' %>

    +<% content_for :heading do %> +

    <%= t 'user.confirm_email.heading' %>

    +<% end %>

    <%= t 'user.confirm_email.press confirm button' %>

    diff --git a/app/views/user/list.html.erb b/app/views/user/list.html.erb index 398debe1eed..93839cbe8d5 100644 --- a/app/views/user/list.html.erb +++ b/app/views/user/list.html.erb @@ -1,6 +1,8 @@ <% @title = t('user.list.title') %> -

    <%= t('user.list.heading') %>

    +<% content_for :heading do %> +

    <%= t('user.list.heading') %>

    +<% end %> <% unless @users.empty? %> <%= form_tag do %> @@ -28,7 +30,7 @@ <%= render :partial => 'user', :collection => @users %> -
    +
    <%= submit_tag t('user.list.confirm'), :name => "confirm" %> <%= submit_tag t('user.list.hide'), :name => "hide" %>
    diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index 5208d0a7f03..cb70281e6f6 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -1,71 +1,82 @@ -
    - -
    -

    <%= t 'user.login.heading' %>

    - - <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> - <%= hidden_field_tag('referer', h(params[:referer])) %> - -

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

    - - - - - - - - - - - - -
    <%= t 'user.login.email or username' %><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %>
    <%= t 'user.login.password' %><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
    <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> - -
    - <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> -
    - -
    - -

    <%= t 'user.login.with openid' %>

    - - - - - - - - - - -
    <%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %><%= openid_button "google", "gmail.com" %><%= openid_button "yahoo", "me.yahoo.com" %><%= openid_button "myopenid", "myopenid.com" %><%= openid_button "wordpress", "wordpress.com" %><%= openid_button "aol", "aol.com" %>
    - - - - - - - - - - -
    - <%= raw t 'user.login.openid', :logo => openid_logo %> - - <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %> +
    +<% content_for :heading do %> +

    <%= t 'user.login.heading' %>

    +<% end %> + + <%= form_tag({ :action => "login" }, { :id => "login_form" }) do %> + <%= hidden_field_tag('referer', h(params[:referer])) %> + +

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

    + +
    + +
    +
    + + <%= text_field_tag "username", params[:username], :tabindex => 1 %> +
    +
    + + <%= password_field_tag "password", "", :tabindex => 2 %> +
    + + <%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %> + +
    + +
    + <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> + + <%= submit_tag t('user.login.login_button'), :tabindex => 4 %> +
    + +
    + +

    <%= t 'user.login.with openid' %>

    + +
      +
    • <%= link_to image_tag("openid.png", :alt => t("user.login.openid_providers.openid.title")), "#", :id => "openid_open_url", :title => t("user.login.openid_providers.openid.title") %>
    • +
    • <%= openid_button "google", "gmail.com" %>
    • +
    • <%= openid_button "yahoo", "me.yahoo.com" %>
    • +
    • <%= openid_button "myopenid", "myopenid.com" %>
    • +
    • <%= openid_button "wordpress", "wordpress.com" %>
    • +
    • <%= openid_button "aol", "aol.com" %>
    • +
    + +
    + + <%= url_field_tag("openid_url", "", { :tabindex => 3, :class => "openid_url" }) %> (<%= t 'user.account.openid.link text' %>) -
    <%= check_box_tag "remember_me", "yes", false, :tabindex => 5 %>
    - - <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> - <% end %> - -
    -
    +
    + +
    + <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %> + +
    + + <%= submit_tag t('user.login.login_button'), :tabindex => 6, :id => "login_openid_submit" %> + + + +
    + + <% end %> +
    + <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %> +
    + + +
    <% end %> -

    -<% end %> +
    -
    - <%= render :partial => "terms" %> -
    +
    + <%= render :partial => "terms" %> +
    -<%= form_tag({:action => "save"}, { :id => "termsForm" }) do %> -

    - - <%= check_box('user', 'consider_pd') %> +

    + (<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>) -

    -

    + <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> - <% if @user.new_record? %> - <%= hidden_field('user', 'email') %> - <%= hidden_field('user', 'email_confirmation') %> - <%= hidden_field('user', 'display_name') %> - <%= hidden_field('user', 'pass_crypt') %> - <%= hidden_field('user', 'pass_crypt_confirmation') %> - <%= hidden_field('user', 'openid_url') %> - <% end %> -

    - <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> + +
    +

    <%= t 'user.terms.read and accept' %>

    <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> + <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> +
    + +
    +

    + <%= raw t 'user.terms.guidance', + :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', + :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %> +

    -

    -
    -

    <%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>

    +
    <% end %> diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index e8034510be4..f39bafec739 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -1,131 +1,228 @@ -<%= user_image @this_user %> +<% content_for :heading do %> +
    + <%= user_image @this_user %> +
    +

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

    + <% if @user and @this_user.id == @user.id %> + +
      +
    • + <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.changesets.size) %> +
    • +
    • + <%= link_to t('user.view.my notes'), :controller => 'notes', :action=> 'mine' %> +
    • +
    • + <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> + <%= number_with_delimiter(@user.traces.size) %> +
    • +
    • + <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.diary_entries.size) %> +
    • +
    • + <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @user.display_name %> +
    • +
    • + <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> +
    • -

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

      + <% if @user.blocks.exists? %> +
    • + <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.blocks.active.size) %> +
    • + <% end %> + + <% if @user and @user.moderator? and @user.blocks_created.exists? %> +
    • + <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> + <%= number_with_delimiter(@user.blocks_created.active.size) %> +
    • + <% end %> + +
    + + <% else %> + +
      + +
    • + <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.changesets.size) %> +
    • +
    • + <%= link_to t('user.view.notes'), :controller => 'notes', :action=> 'mine' %> +
    • +
    • + <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.traces.size) %> +
    • + + + +
    • + <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> +
    • +
    • + <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.diary_entries.size) %> +
    • +
    • + <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> +
    • +
    • + <% if @user and @user.is_friends_with?(@this_user) %> + <%= link_to t('user.view.remove as friend'), remove_friend_path(:display_name => @this_user.display_name), :method => :post %> + <% elsif @user %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name), :method => :post %> + <% else %> + <%= link_to t('user.view.add as friend'), make_friend_path(:display_name => @this_user.display_name) %> + <% end %> +
    • + + <% if @this_user.blocks.exists? %> +
    • + <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.blocks.active.size) %> +
    • + <% end %> + + <% if @this_user.moderator? and @this_user.blocks_created.exists? %> +
    • + <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> + <%= number_with_delimiter(@this_user.blocks_created.active.size) %> +
    • + <% end %> + + <% if @user and @user.moderator? %> +
    • + <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %> +
    • + <% end %> + +
    + + <% end %> + + <% if @user and @user.administrator? %> + +
      + <% if ["active", "confirmed"].include? @this_user.status %> +
    • + <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> +
    • + <% elsif ["pending"].include? @this_user.status %> +
    • + <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> +
    • + <% end %> + + <% if ["active", "suspended"].include? @this_user.status %> +
    • + <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> +
    • + <% end %> +
    • + <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %> + <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> + <% else %> + <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> +
    • + <% end %> +
    • + <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> +
    • +
    + + <% end %> + +

    + + <%= t 'user.view.mapper since' %> <%= l @this_user.creation_time.to_date, :format => :long %> + | + <%= t 'user.view.ct status' %> + <% if not @this_user.terms_agreed.nil? -%> + <%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed) %> + <% elsif not @this_user.terms_seen? -%> + <%= t 'user.view.ct undecided' %> + <% else -%> + <%= t 'user.view.ct declined' %> + <% end -%> + +

    +
    + +
    <%= @this_user.description.to_html %>
    + +
    + + <% if @user and @user.administrator? -%> + + <% end -%> + +<% end %> -
    <% if @user and @this_user.id == @user.id %> - - <%= link_to t('user.view.my diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> - | - <%= link_to t('user.view.new diary entry'), :controller => 'diary_entry', :action => 'new' %> - | - <%= link_to t('user.view.my comments' ), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> - | - <%= link_to t('user.view.my traces'), :controller => 'trace', :action=>'mine' %> - | - <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> - | - <%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %> - | - <%= link_to t('user.view.blocks on me'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @user.display_name %> - <% if @user and @user.moderator? %> - | <%= link_to t('user.view.blocks by me'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @user.display_name %> - <% end %> - <% else %> - - <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.comments'), :controller => 'diary_entry', :action => 'comments', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> - | - <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'list', :display_name => @this_user.display_name %> - | - <% if @user and @user.is_friends_with?(@this_user) %> - <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %> - <% else %> - <%= link_to t('user.view.add as friend'), :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %> - <% end %> - | - <%= link_to t('user.view.block_history'), :controller => 'user_blocks', :action => 'blocks_on', :display_name => @this_user.display_name %> - <% if @this_user.moderator? %> - | <%= link_to t('user.view.moderator_history'), :controller => 'user_blocks', :action => 'blocks_by', :display_name => @this_user.display_name %> - <% end %> - <% if @user and @user.moderator? %> - | <%= link_to t('user.view.create_block'), :controller => 'user_blocks', :action => 'new', :display_name => @this_user.display_name %> - <% end %> - <% end %> - <% if @user and @user.administrator? %> -
    - <% if ["active", "confirmed"].include? @this_user.status %> - <%= link_to t('user.view.deactivate_user'), set_status_user_path(:status => 'pending', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | - <% elsif ["pending"].include? @this_user.status %> - <%= link_to t('user.view.activate_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | - <% end %> - <% if ["active", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.confirm_user'), set_status_user_path(:status => 'confirmed', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | - <% end %> - <% if ["pending", "active", "confirmed", "suspended"].include? @this_user.status %> - <%= link_to t('user.view.hide_user'), set_status_user_path(:status => 'deleted', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | + <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> +
    +

    <%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %>

    +
    <% else %> - <%= link_to t('user.view.unhide_user'), set_status_user_path(:status => 'active', :display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> | + <% content_for :head do %> + <%= javascript_include_tag "user" %> + <% end %> + <% + user_data = { + :lon => @user.home_lon, + :lat => @user.home_lat, + :icon => image_path("marker-red.png"), + :description => render(:partial => "popup", :object => @user, :locals => {:type => "your location"}) + } + %> + <%= content_tag "div", "", :id => "map", :class => "content_map", :data => {:user => user_data} %> <% end %> - <%= link_to t('user.view.delete_user'), delete_user_path(:display_name => @this_user.display_name), :data => { :confirm => t('user.view.confirm') } %> - <% end %> -
    - -

    <%= t 'user.view.mapper since' %> <%= l @this_user.creation_time, :format => :friendly %> <%= t 'user.view.ago', :time_in_words_ago => time_ago_in_words(@this_user.creation_time) %>

    - -

    <%= t 'user.view.ct status' %> -<% if not @this_user.terms_agreed.nil? -%> -<%= t 'user.view.ct accepted', :ago =>time_ago_in_words(@this_user.terms_agreed) %> -<% elsif not @this_user.terms_seen? -%> -<%= t 'user.view.ct undecided' %> -<% else -%> -<%= t 'user.view.ct declined' %> -<% end -%> -

    - -<% if @user and @user.administrator? -%> -

    <%= t 'user.view.email address' %> <%= @this_user.email %>

    - <% unless @this_user.creation_ip.nil? -%> -

    <%= t 'user.view.created from' %> <%= @this_user.creation_ip %>

    - <% end -%> -

    <%= t 'user.view.status' %> <%= @this_user.status.capitalize %>

    -

    <%= t 'user.view.spam score' %> <%= @this_user.spam_score %>

    -<% end -%> -

    <%= t 'user.view.description' %>

    + <% friends = @this_user.friends.collect { |f| f.befriendee } %> + <% nearby = @this_user.nearby - friends %> -
    <%= @this_user.description.to_html %>
    +
    +

    <%= t 'user.view.your friends' %>

    -<% if @user and @this_user.id == @user.id %> -
    - <% if @this_user.home_lat.nil? or @this_user.home_lon.nil? %> -

    <%= raw(t 'user.view.if set location', :settings_link => (link_to t('user.view.settings_link_text'), :controller => 'user', :action => 'account', :display_name => @user.display_name)) %>

    + <% if friends.empty? %> + <%= t 'user.view.no friends' %> <% else %> - <%= render :partial => 'map', :locals => { :setting_location => false, :show_other_users => true } %> +
      +
    • <%= link_to t('user.view.friends_changesets'), friend_changesets_path %>
    • +
    • <%= link_to t('user.view.friends_diaries'), friend_diaries_path %>
    • +
    +
    + <%= render :partial => "contact", :collection => friends, :locals => {:type => "friend"} %> +
    <% end %>
    - <% friends = @this_user.friends.collect { |f| f.befriendee } %> - <% nearby = @this_user.nearby - friends %> - -

    <%= t 'user.view.your friends' %>

    - - <% if friends.empty? %> - <%= t 'user.view.no friends' %> - <% else %> - <%= link_to t('user.view.friends_changesets'), friend_changesets_path %>
    - <%= link_to t('user.view.friends_diaries'), friend_diaries_path %>

    - - <%= render :partial => "contact", :collection => friends %> -
    - <% end %> - -

    <%= t 'user.view.nearby users' %>

    - - <% if nearby.empty? %> - <%= t 'user.view.no nearby users' %> - <% else %> - <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %>
    - <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %>

    - - <%= render :partial => "contact", :collection => nearby %> -
    - <% end %> +
    +

    <%= t 'user.view.nearby users' %>

    + + <% if nearby.empty? %> + <%= t 'user.view.no nearby users' %> + <% else %> +
      +
    • <%= link_to t('user.view.nearby_changesets'), nearby_changesets_path %>
    • +
    • <%= link_to t('user.view.nearby_diaries'), nearby_diaries_path %>
    • +
    +
    + <%= render :partial => "contact", :collection => nearby, :locals => {:type => "nearby mapper"} %> +
    + <% end %> +
    <% end %> diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb index 7127cc28372..d3908dab3e8 100644 --- a/app/views/user_blocks/_blocks.html.erb +++ b/app/views/user_blocks/_blocks.html.erb @@ -17,3 +17,19 @@ <%= render :partial => 'block', :locals => {:show_revoke_link => show_revoke_link, :show_user_name => show_user_name, :show_creator_name => show_creator_name }, :collection => @user_blocks %> + +
      + <% if @user_blocks_pages.current_page.number > 1 -%> +
    • <%= link_to t('user_block.partial.previous'), params.merge({ :page => @user_blocks_pages.current_page.number - 1 }) %>
    • + <% else -%> +
    • <%= t('user_block.partial.previous') %>
    • + <% end -%> + +
    • <%= t('user_block.partial.showing_page', :page => @user_blocks_pages.current_page.number) %>
    • + + <% if @user_blocks_pages.current_page.number < @user_blocks_pages.page_count -%> +
    • <%= link_to t('user_block.partial.next'), params.merge({ :page => @user_blocks_pages.current_page.number + 1 }) %>
    • + <% else -%> +
    • <%= t('user_block.partial.next') %>
    • + <% end -%> +
    diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/user_blocks/blocks_by.html.erb index dc523cee9fb..a8d76128840 100644 --- a/app/views/user_blocks/blocks_by.html.erb +++ b/app/views/user_blocks/blocks_by.html.erb @@ -1,5 +1,7 @@ <% @title = t('user_block.blocks_by.title', :name => h(@this_user.display_name)) %> -

    <%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %>

    +<% content_for :heading do %> +

    <%= raw(t('user_block.blocks_by.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %>

    +<% end %> <% unless @user_blocks.empty? %> <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => false } %> diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb index 86ae110dfec..8e91935ed4f 100644 --- a/app/views/user_blocks/blocks_on.html.erb +++ b/app/views/user_blocks/blocks_on.html.erb @@ -1,6 +1,7 @@ <% @title = t('user_block.blocks_on.title', :name => h(@this_user.display_name)) %> -

    <%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %>

    - +<% content_for :heading do %> +

    <%= raw(t('user_block.blocks_on.heading', :name => link_to(h(@this_user.display_name), {:controller => 'user', :action => 'view', :display_name => @this_user.display_name}))) %>

    +<% end %> <% unless @user_blocks.empty? %> <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => false, :show_creator_name => true } %> <% else %> diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb index d78bd11d803..0eee8a6f642 100644 --- a/app/views/user_blocks/edit.html.erb +++ b/app/views/user_blocks/edit.html.erb @@ -1,8 +1,14 @@ <% @title = t 'user_block.edit.title', :name => h(@user_block.user.display_name) %> -

    <%= raw t('user_block.edit.title', - :name => link_to( - h(@user_block.user.display_name), - {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %>

    +<% content_for :heading do %> +

    <%= raw t('user_block.edit.title', + :name => link_to( + h(@user_block.user.display_name), + {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name})) %>

    +
      +
    • <%= link_to t('user_block.edit.show'), @user_block %>
    • +
    • <%= link_to t('user_block.edit.back'), user_blocks_path %>
    • +
    +<% end %> <%= form_for(@user_block) do |f| %> <%= f.error_messages %> @@ -23,6 +29,3 @@ <%= f.submit t('user_block.edit.submit') %>

    <% end %> - -<%= link_to t('user_block.edit.show'), @user_block %> | -<%= link_to t('user_block.edit.back'), user_blocks_path %> diff --git a/app/views/user_blocks/index.html.erb b/app/views/user_blocks/index.html.erb index 2baf91e5f25..8cf7e81b753 100644 --- a/app/views/user_blocks/index.html.erb +++ b/app/views/user_blocks/index.html.erb @@ -1,5 +1,7 @@ <% @title = t('user_block.index.title') %> -

    <%= t('user_block.index.heading') %>

    +<% content_for :heading do %> +

    <%= t('user_block.index.heading') %>

    +<% end %> <% unless @user_blocks.empty? %> <%= render :partial => 'blocks', :locals => { :show_revoke_link => (@user and @user.moderator?), :show_user_name => true, :show_creator_name => true } %> diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb index f63298373ae..9ea63f885cb 100644 --- a/app/views/user_blocks/new.html.erb +++ b/app/views/user_blocks/new.html.erb @@ -1,9 +1,10 @@ <% @title = t 'user_block.new.title', :name => h(@this_user.display_name) %> -

    <%= raw t('user_block.new.heading', - :name => link_to( - h(@this_user.display_name), - {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %>

    - +<% content_for :heading do %> +

    <%= raw t('user_block.new.heading', + :name => link_to( + h(@this_user.display_name), + {:controller => 'user', :action => 'view', :display_name => @this_user.display_name})) %>

    +<% end %> <%= form_for(@user_block) do |f| %> <%= f.error_messages %> diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 28ae01930f6..c67f7cde269 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -1,13 +1,16 @@ <% @title = t('user_block.revoke.title', :block_on => h(@user_block.user.display_name), :block_by => h(@user_block.creator.display_name)) %> -

    <%= raw t('user_block.revoke.heading', - :block_on => link_to( - h(@user_block.user.display_name), - {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}), - :block_by => link_to( - h(@user_block.creator.display_name), - {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %>

    + +<% content_for :heading do %> +

    <%= raw t('user_block.revoke.heading', + :block_on => link_to( + h(@user_block.user.display_name), + {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}), + :block_by => link_to( + h(@user_block.creator.display_name), + {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %>

    +<% end %> <% if @user_block.ends_at > Time.now %>

    @@ -16,7 +19,7 @@ <%= form_for :revoke, :url => { :action => "revoke" } do |f| %> <%= f.error_messages %> -

    +

    <%= check_box_tag 'confirm', 'yes' %> <%= label_tag 'confirm', t('user_block.revoke.confirm') %>

    diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 2311541d9f4..e882e6e3b61 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -1,13 +1,28 @@ <% @title = t('user_block.show.title', :block_on => @user_block.user.display_name, :block_by => @user_block.creator.display_name) %> -

    <%= raw t('user_block.show.heading', - :block_on => link_to( - h(@user_block.user.display_name), - {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}), - :block_by => link_to( - h(@user_block.creator.display_name), - {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %>

    + +<% content_for :heading do %> +

    <%= raw t('user_block.show.heading', + :block_on => link_to( + h(@user_block.user.display_name), + {:controller => 'user', :action => 'view', :display_name => @user_block.user.display_name}), + :block_by => link_to( + h(@user_block.creator.display_name), + {:controller => 'user', :action => 'view', :display_name => @user_block.creator.display_name})) %>

    +
      + <% if @user_block.ends_at > Time.now.getutc %> + <% if @user and @user.id == @user_block.creator_id %> +
    • <%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %>
    • + <% end %> + <% if @user and @user.moderator? %> +
    • <%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %>
    • + <% end %> + <% end %> +
    • <%= link_to t('user_block.show.back'), user_blocks_path %>
    • +
    +<% end %> + <% if @user_block.revoker %>

    <%= t'user_block.show.revoker' %> @@ -18,14 +33,4 @@

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

    <%= t'user_block.show.reason' %>

    -<%= @user_block.reason.to_html %> - -<% if @user_block.ends_at > Time.now.getutc %> -<% if @user and @user.id == @user_block.creator_id %> -<%= link_to t('user_block.show.edit'), edit_user_block_path(@user_block) %> | -<% end %> -<% if @user and @user.moderator? %> -<%= link_to(t('user_block.show.revoke'),{:controller => 'user_blocks', :action => 'revoke', :id => @user_block.id}) %> | -<% end %> -<% end %> -<%= link_to t('user_block.show.back'), user_blocks_path %> +
    <%= @user_block.reason.to_html %>
    diff --git a/config/application.rb b/config/application.rb index 879f5714d56..cc7ef05005b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,12 +12,9 @@ require 'rails/all' end -if defined?(Bundler) - # If you precompile assets before deploying to production, use this line - Bundler.require(*Rails.groups(:assets => %w(development test))) - # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) -end +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(:default, Rails.env) module OpenStreetMap class Application < Rails::Application @@ -25,18 +22,6 @@ class Application < Rails::Application # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. - # Custom directories with classes and modules you want to be autoloadable. - config.autoload_paths += %W(#{config.root}/lib) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - unless STATUS == :database_offline - config.active_record.observers = :spam_observer - end - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. # config.time_zone = 'Central Time (US & Canada)' @@ -45,12 +30,12 @@ class Application < Rails::Application # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de + # Custom directories with classes and modules you want to be autoloadable. + config.autoload_paths += %W(#{config.root}/lib) + # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation] - # Use SQL instead of Active Record's schema dumper when creating the database. # This is necessary if your schema can't be completely dumped by the schema dumper, # like if you have constraints or database-specific column types @@ -58,14 +43,6 @@ class Application < Rails::Application config.active_record.schema_format = :sql end - # Enforce whitelist mode for mass assignment. - # This will create an empty whitelist of attributes available for mass-assignment for all models - # in your app. As such, your models will need to explicitly whitelist or blacklist accessible - # parameters by using an attr_accessible or attr_protected declaration. - unless STATUS == :database_offline - config.active_record.whitelist_attributes = true - end - # Enable the asset pipeline config.assets.enabled = true diff --git a/config/countries.xml b/config/countries.xml new file mode 100644 index 00000000000..34082dd25f4 --- /dev/null +++ b/config/countries.xml @@ -0,0 +1,4753 @@ + + + +AD +Andorra +020 +AND +AN +EU +Europe +Andorra la Vella +468.0 +84000 +EUR +ca +3041565 +1.4071867141112762 +42.65604389629997 +1.7865427778319827 +42.42849259876837 + + +AE +United Arab Emirates +784 +ARE +AE +AS +Asia +Abu Dhabi +82880.0 +4975593 +AED +ar-AE,fa,en,hi,ur +290557 +51.58332824707031 +26.08415985107422 +56.38166046142578 +22.633329391479492 + + +AF +Afghanistan +004 +AFG +AF +AS +Asia +Kabul +647500.0 +29121286 +AFN +fa-AF,ps,uz-AF,tk +1149361 +60.478443 +38.483418 +74.879448 +29.377472 + + +AG +Antigua and Barbuda +028 +ATG +AC +NA +North America +St. John's +443.0 +86754 +XCD +en-AG +3576396 +-61.906425 +17.729387 +-61.672421 +16.996979 + + +AI +Anguilla +660 +AIA +AV +NA +North America +The Valley +102.0 +13254 +XCD +en-AI +3573511 +-63.172901 +18.283424 +-62.971359 +18.166815 + + +AL +Albania +008 +ALB +AL +EU +Europe +Tirana +28748.0 +2986952 +ALL +sq,el +783754 +19.293972 +42.665611 +21.068472 +39.648361 + + +AM +Armenia +051 +ARM +AM +AS +Asia +Yerevan +29800.0 +2968000 +AMD +hy +174982 +43.44978 +41.301834 +46.772435045159995 +38.830528 + + +AO +Angola +024 +AGO +AO +AF +Africa +Luanda +1246700.0 +13068161 +AOA +pt-AO +3351879 +11.679219 +-4.376826 +24.082119 +-18.042076 + + +AQ +Antarctica +010 +ATA +AY +AN +Antarctica + +1.4E7 +0 + + +6697173 +-179.9999 +-60.515533 +179.9999 +-89.9999 + + +AR +Argentina +032 +ARG +AR +SA +South America +Buenos Aires +2766890.0 +41343201 +ARS +es-AR,en,it,de,fr,gn +3865483 +-73.58297 +-21.781277 +-53.591835 +-55.061314 + + +AS +American Samoa +016 +ASM +AQ +OC +Oceania +Pago Pago +199.0 +57881 +USD +en-AS,sm,to +5880801 +-171.091888 +-11.0497 +-169.416077 +-14.382478 + + +AT +Austria +040 +AUT +AU +EU +Europe +Vienna +83858.0 +8205000 +EUR +de-AT,hr,hu,sl +2782113 +9.535916 +49.017056 +17.162722 +46.378029 + + +AU +Australia +036 +AUS +AS +OC +Oceania +Canberra +7686850.0 +21515754 +AUD +en-AU +2077456 +112.911057 +-10.062805 +153.639252 +-43.64397 + + +AW +Aruba +533 +ABW +AA +NA +North America +Oranjestad +193.0 +71566 +AWG +nl-AW,es,en +3577279 +-70.0644737196045 +12.623718127152925 +-69.86575120104982 +12.411707706190716 + + +AX +Åland +248 +ALA + +EU +Europe +Mariehamn + +26711 +EUR +sv-AX +661882 +19.317694 +60.488861 +21.011862 +59.90675 + + +AZ +Azerbaijan +031 +AZE +AJ +AS +Asia +Baku +86600.0 +8303512 +AZN +az,ru,hy +587116 +44.774113 +41.90564 +50.370083 +38.38915252685547 + + +BA +Bosnia and Herzegovina +070 +BIH +BK +EU +Europe +Sarajevo +51129.0 +4590000 +BAM +bs,hr-BA,sr-BA +3277605 +15.718945 +45.239193 +19.622223 +42.546112 + + +BB +Barbados +052 +BRB +BB +NA +North America +Bridgetown +431.0 +285653 +BBD +en-BB +3374084 +-59.648922 +13.327257 +-59.420376 +13.039844 + + +BD +Bangladesh +050 +BGD +BG +AS +Asia +Dhaka +144000.0 +156118464 +BDT +bn-BD,en +1210997 +88.028336 +26.631945 +92.673668 +20.743334 + + +BE +Belgium +056 +BEL +BE +EU +Europe +Brussels +30510.0 +10403000 +EUR +nl-BE,fr-BE,de-BE +2802361 +2.546944 +51.505444 +6.403861 +49.49361 + + +BF +Burkina Faso +854 +BFA +UV +AF +Africa +Ouagadougou +274200.0 +16241811 +XOF +fr-BF +2361809 +-5.518916 +15.082593 +2.405395 +9.401108 + + +BG +Bulgaria +100 +BGR +BU +EU +Europe +Sofia +110910.0 +7148785 +BGN +bg,tr-BG +732800 +22.371166 +44.21764 +28.612167 +41.242084 + + +BH +Bahrain +048 +BHR +BA +AS +Asia +Manama +665.0 +738004 +BHD +ar-BH,en,fa,ur +290291 +50.45414 +26.282583 +50.664471 +25.796862 + + +BI +Burundi +108 +BDI +BY +AF +Africa +Bujumbura +27830.0 +9863117 +BIF +fr-BI,rn +433561 +28.993061 +-2.310123 +30.847729 +-4.465713 + + +BJ +Benin +204 +BEN +BN +AF +Africa +Porto-Novo +112620.0 +9056010 +XOF +fr-BJ +2395170 +0.774575 +12.418347 +3.851701 +6.225748 + + +BL +Saint Barthélemy +652 +BLM +TB +NA +North America +Gustavia +21.0 +8450 +EUR +fr +3578476 +-62.8739118253784 +17.928808791949283 +-62.788983372985854 +17.878183227405575 + + +BM +Bermuda +060 +BMU +BD +NA +North America +Hamilton +53.0 +65365 +BMD +en-BM,pt +3573345 +-64.89605 +32.393833 +-64.651993 +32.246639 + + +BN +Brunei +096 +BRN +BX +AS +Asia +Bandar Seri Begawan +5770.0 +395027 +BND +ms-BN,en-BN +1820814 +114.071442 +5.047167 +115.359444 +4.003083 + + +BO +Bolivia +068 +BOL +BL +SA +South America +Sucre +1098580.0 +9947418 +BOB +es-BO,qu,ay +3923057 +-69.640762 +-9.680567 +-57.45809600000001 +-22.896133 + + +BQ +Bonaire +535 +BES + +NA +North America + + +18012 +USD +nl,pap,en +7626844 +-68.416458 +12.304535 +-68.192307 +12.017149 + + +BR +Brazil +076 +BRA +BR +SA +South America +Brasília +8511965.0 +201103330 +BRL +pt-BR,es,en,fr +3469034 +-73.985535 +5.264877 +-32.392998 +-33.750706 + + +BS +Bahamas +044 +BHS +BF +NA +North America +Nassau +13940.0 +301790 +BSD +en-BS +3572887 +-78.995911 +26.919243 +-74.423874 +22.852743 + + +BT +Bhutan +064 +BTN +BT +AS +Asia +Thimphu +47000.0 +699847 +BTN +dz +1252634 +88.75972 +28.323778 +92.125191 +26.70764 + + +BV +Bouvet Island +074 +BVT +BV +AN +Antarctica + + +0 +NOK + +3371123 +3.335499 +-54.400322 +3.487976 +-54.462383 + + +BW +Botswana +072 +BWA +BC +AF +Africa +Gaborone +600370.0 +2029307 +BWP +en-BW,tn-BW +933860 +19.999535 +-17.780813 +29.360781 +-26.907246 + + +BY +Belarus +112 +BLR +BO +EU +Europe +Minsk +207600.0 +9685000 +BYR +be,ru +630336 +23.176889 +56.165806 +32.770805 +51.256416 + + +BZ +Belize +084 +BLZ +BH +NA +North America +Belmopan +22966.0 +314522 +BZD +en-BZ,es +3582678 +-89.224815 +18.496557 +-87.776985 +15.8893 + + +CA +Canada +124 +CAN +CA +NA +North America +Ottawa +9984670.0 +33679000 +CAD +en-CA,fr-CA,iu +6251999 +-141.0 +83.110626 +-52.636291 +41.67598 + + +CC +Cocos [Keeling] Islands +166 +CCK +CK +AS +Asia +West Island +14.0 +628 +AUD +ms-CC,en +1547376 +96.816941408 +-12.072459094 +96.929489344 +-12.208725839 + + +CD +Democratic Republic of the Congo +180 +COD +CG +AF +Africa +Kinshasa +2345410.0 +70916439 +CDF +fr-CD,ln,kg +203312 +12.204144 +5.386098 +31.305912 +-13.455675 + + +CF +Central African Republic +140 +CAF +CT +AF +Africa +Bangui +622984.0 +4844927 +XAF +fr-CF,sg,ln,kg +239880 +14.420097 +11.007569 +27.463421 +2.220514 + + +CG +Republic of the Congo +178 +COG +CF +AF +Africa +Brazzaville +342000.0 +3039126 +XAF +fr-CG,kg,ln-CG +2260494 +11.205009 +3.703082 +18.649839 +-5.027223 + + +CH +Switzerland +756 +CHE +SZ +EU +Europe +Berne +41290.0 +7581000 +CHF +de-CH,fr-CH,it-CH,rm +2658434 +5.957472 +47.805332 +10.491472 +45.825695 + + +CI +Ivory Coast +384 +CIV +IV +AF +Africa +Yamoussoukro +322460.0 +21058798 +XOF +fr-CI +2287781 +-8.599302 +10.736642 +-2.494897 +4.357067 + + +CK +Cook Islands +184 +COK +CW +OC +Oceania +Avarua +240.0 +21388 +NZD +en-CK,mi +1899402 +-161.093658 +-10.023114 +-157.312134 +-21.944164 + + +CL +Chile +152 +CHL +CI +SA +South America +Santiago +756950.0 +16746491 +CLP +es-CL +3895114 +-80.785851 +-17.507553 +-66.417557 +-55.916348 + + +CM +Cameroon +120 +CMR +CM +AF +Africa +Yaoundé +475440.0 +19294149 +XAF +en-CM,fr-CM +2233387 +8.494763 +13.078056 +16.192116 +1.652548 + + +CN +China +156 +CHN +CH +AS +Asia +Beijing +9596960.0 +1330044000 +CNY +zh-CN,yue,wuu,dta,ug,za +1814991 +73.557693 +53.56086 +134.773911 +15.775416 + + +CO +Colombia +170 +COL +CO +SA +South America +Bogotá +1138910.0 +44205293 +COP +es-CO +3686110 +-81.728111 +13.380502 +-66.869835 +-4.225869 + + +CR +Costa Rica +188 +CRI +CS +NA +North America +San José +51100.0 +4516220 +CRC +es-CR,en +3624060 +-85.950623 +11.216819 +-82.555992 +8.032975 + + +CU +Cuba +192 +CUB +CU +NA +North America +Havana +110860.0 +11423000 +CUP +es-CU +3562981 +-84.957428 +23.226042 +-74.131775 +19.828083 + + +CV +Cape Verde +132 +CPV +CV +AF +Africa +Praia +4033.0 +508659 +CVE +pt-CV +3374766 +-25.358747 +17.197178 +-22.669443 +14.808022 + + +CW +Curacao +531 +CUW +UC +NA +North America +Willemstad + +141766 +ANG +nl,pap +7626836 +-69.157204 +12.385672 +-68.733948 +12.032745 + + +CX +Christmas Island +162 +CXR +KT +AS +Asia +The Settlement +135.0 +1500 +AUD +en,zh,ms-CC +2078138 +105.533276992 +-10.412356007 +105.712596992 +-10.5704829995 + + +CY +Cyprus +196 +CYP +CY +EU +Europe +Nicosia +9250.0 +1102677 +EUR +el-CY,tr-CY,en +146669 +32.27308300000004 +35.701527 +34.59791599999994 +34.6332846722908 + + +CZ +Czechia +203 +CZE +EZ +EU +Europe +Prague +78866.0 +10476000 +CZK +cs,sk +3077311 +12.096194 +51.058887 +18.860111 +48.542915 + + +DE +Germany +276 +DEU +GM +EU +Europe +Berlin +357021.0 +81802257 +EUR +de +2921044 +5.865639 +55.055637 +15.039889 +47.275776 + + +DJ +Djibouti +262 +DJI +DJ +AF +Africa +Djibouti +23000.0 +740528 +DJF +fr-DJ,ar,so-DJ,aa +223816 +41.773472 +12.706833 +43.416973 +10.909917 + + +DK +Denmark +208 +DNK +DA +EU +Europe +Copenhagen +43094.0 +5484000 +DKK +da-DK,en,fo,de-DK +2623032 +8.075611 +57.748417 +15.158834 +54.562389 + + +DM +Dominica +212 +DMA +DO +NA +North America +Roseau +754.0 +72813 +XCD +en-DM +3575830 +-61.484108 +15.631809 +-61.244152 +15.20169 + + +DO +Dominican Republic +214 +DOM +DR +NA +North America +Santo Domingo +48730.0 +9823821 +DOP +es-DO +3508796 +-72.003487 +19.929859 +-68.32 +17.543159 + + +DZ +Algeria +012 +DZA +AG +AF +Africa +Algiers +2381740.0 +34586184 +DZD +ar-DZ +2589581 +-8.673868 +37.093723 +11.979548 +18.960028 + + +EC +Ecuador +218 +ECU +EC +SA +South America +Quito +283560.0 +14790608 +USD +es-EC +3658394 +-81.078598 +1.43902 +-75.184586 +-4.998823 + + +EE +Estonia +233 +EST +EN +EU +Europe +Tallinn +45226.0 +1291170 +EUR +et,ru +453733 +21.837584 +59.676224 +28.209972 +57.516193 + + +EG +Egypt +818 +EGY +EG +AF +Africa +Cairo +1001450.0 +80471869 +EGP +ar-EG,en,fr +357994 +24.698111 +31.667334 +35.794861 +21.725389 + + +EH +Western Sahara +732 +ESH +WI +AF +Africa +El Aaiún +266000.0 +273008 +MAD +ar,mey +2461445 +-17.103182 +27.669674 +-8.670276 +20.774158 + + +ER +Eritrea +232 +ERI +ER +AF +Africa +Asmara +121320.0 +5792984 +ERN +aa-ER,ar,tig,kun,ti-ER +338010 +36.438778 +18.003084 +43.13464 +12.359555 + + +ES +Spain +724 +ESP +SP +EU +Europe +Madrid +504782.0 +46505963 +EUR +es-ES,ca,gl,eu,oc +2510769 +-9.290778 +43.791721 +4.315389 +36.000332 + + +ET +Ethiopia +231 +ETH +ET +AF +Africa +Addis Ababa +1127127.0 +88013491 +ETB +am,en-ET,om-ET,ti-ET,so-ET,sid +337996 +32.999939 +14.89375 +47.986179 +3.402422 + + +FI +Finland +246 +FIN +FI +EU +Europe +Helsinki +337030.0 +5244000 +EUR +fi-FI,sv-FI,smn +660013 +20.556944 +70.096054 +31.580944 +59.808777 + + +FJ +Fiji +242 +FJI +FJ +OC +Oceania +Suva +18270.0 +875983 +FJD +en-FJ,fj +2205218 +177.129334 +-12.480111 +-178.424438 +-20.67597 + + +FK +Falkland Islands +238 +FLK +FK +SA +South America +Stanley +12173.0 +2638 +FKP +en-FK +3474414 +-61.345192 +-51.24065 +-57.712486 +-52.360512 + + +FM +Micronesia +583 +FSM +FM +OC +Oceania +Palikir +702.0 +107708 +USD +en-FM,chk,pon,yap,kos,uli,woe,nkr,kpg +2081918 +137.33648 +10.08904 +163.03717 +1.02629 + + +FO +Faroe Islands +234 +FRO +FO +EU +Europe +Tórshavn +1399.0 +48228 +DKK +fo,da-FO +2622320 +-7.458 +62.400749 +-6.399583 +61.394943 + + +FR +France +250 +FRA +FR +EU +Europe +Paris +547030.0 +64768389 +EUR +fr-FR,frp,br,co,ca,eu,oc +3017382 +-5.142222 +51.092804 +9.561556 +41.371582 + + +GA +Gabon +266 +GAB +GB +AF +Africa +Libreville +267667.0 +1545255 +XAF +fr-GA +2400553 +8.695471 +2.322612 +14.502347 +-3.978806 + + +GB +United Kingdom +826 +GBR +UK +EU +Europe +London +244820.0 +62348447 +GBP +en-GB,cy-GB,gd +2635167 +-8.623555 +59.360249 +1.759 +49.906193 + + +GD +Grenada +308 +GRD +GJ +NA +North America +St. George's +344.0 +107818 +XCD +en-GD +3580239 +-61.802344 +12.318283928171299 +-61.57676970108031 +11.986893 + + +GE +Georgia +268 +GEO +GG +AS +Asia +Tbilisi +69700.0 +4630000 +GEL +ka,ru,hy,az +614540 +40.010139 +43.586498 +46.725971 +41.053196 + + +GF +French Guiana +254 +GUF +FG +SA +South America +Cayenne +91000.0 +195506 +EUR +fr-GF +3381670 +-54.542511 +5.776496 +-51.613949 +2.127094 + + +GG +Guernsey +831 +GGY +GK +EU +Europe +St Peter Port +78.0 +65228 +GBP +en,fr +3042362 +-2.682472 +49.738609 +-2.163889 +49.412777 + + +GH +Ghana +288 +GHA +GH +AF +Africa +Accra +239460.0 +24339838 +GHS +en-GH,ak,ee,tw +2300660 +-3.25542 +11.173301 +1.191781 +4.736723 + + +GI +Gibraltar +292 +GIB +GI +EU +Europe +Gibraltar +6.5 +27884 +GIP +en-GI,es,it,pt +2411586 +-5.36626149743654 +36.155439135670726 +-5.338285164001491 +36.10903070140248 + + +GL +Greenland +304 +GRL +GL +NA +North America +Nuuk +2166086.0 +56375 +DKK +kl,da-GL,en +3425505 +-73.04203 +83.627357 +-11.312319 +59.777401 + + +GM +Gambia +270 +GMB +GA +AF +Africa +Banjul +11300.0 +1593256 +GMD +en-GM,mnk,wof,wo,ff +2413451 +-16.825079 +13.826571 +-13.797793 +13.064252 + + +GN +Guinea +324 +GIN +GV +AF +Africa +Conakry +245857.0 +10324025 +GNF +fr-GN +2420477 +-14.926619 +12.67622 +-7.641071 +7.193553 + + +GP +Guadeloupe +312 +GLP +GP +NA +North America +Basse-Terre +1780.0 +443000 +EUR +fr-GP +3579143 +-61.544765 +16.516848 +-61.0 +15.867565 + + +GQ +Equatorial Guinea +226 +GNQ +EK +AF +Africa +Malabo +28051.0 +1014999 +XAF +es-GQ,fr +2309096 +9.346865 +2.346989 +11.335724 +0.92086 + + +GR +Greece +300 +GRC +GR +EU +Europe +Athens +131940.0 +11000000 +EUR +el-GR,en,fr +390903 +19.3736035624134 +41.7484999849641 +28.2470831714347 +34.8020663391466 + + +GS +South Georgia and the South Sandwich Islands +239 +SGS +SX +AN +Antarctica +Grytviken +3903.0 +30 +GBP +en +3474415 +-38.021175 +-53.970467 +-26.229326 +-59.479259 + + +GT +Guatemala +320 +GTM +GT +NA +North America +Guatemala City +108890.0 +13550440 +GTQ +es-GT +3595528 +-92.23629 +17.81522 +-88.223198 +13.737302 + + +GU +Guam +316 +GUM +GQ +OC +Oceania +Hagåtña +549.0 +159358 +USD +en-GU,ch-GU +4043988 +144.619247 +13.652333 +144.953979 +13.240611 + + +GW +Guinea-Bissau +624 +GNB +PU +AF +Africa +Bissau +36120.0 +1565126 +XOF +pt-GW,pov +2372248 +-16.717535 +12.680789 +-13.636522 +10.924265 + + +GY +Guyana +328 +GUY +GY +SA +South America +Georgetown +214970.0 +748486 +GYD +en-GY +3378535 +-61.384762 +8.557567 +-56.480251 +1.17508 + + +HK +Hong Kong +344 +HKG +HK +AS +Asia +Hong Kong +1092.0 +6898686 +HKD +zh-HK,yue,zh,en +1819730 +113.837753 +22.559778 +114.434753 +22.15325 + + +HM +Heard Island and McDonald Islands +334 +HMD +HM +AN +Antarctica + +412.0 +0 +AUD + +1547314 +72.596535 +-52.909416 +73.859146 +-53.192001 + + +HN +Honduras +340 +HND +HO +NA +North America +Tegucigalpa +112090.0 +7989415 +HNL +es-HN +3608932 +-89.350792 +16.510256 +-83.155403 +12.982411 + + +HR +Croatia +191 +HRV +HR +EU +Europe +Zagreb +56542.0 +4491000 +HRK +hr-HR,sr +3202326 +13.493222 +46.53875 +19.427389 +42.43589 + + +HT +Haiti +332 +HTI +HA +NA +North America +Port-au-Prince +27750.0 +9648924 +HTG +ht,fr-HT +3723988 +-74.478584 +20.08782 +-71.613358 +18.021032 + + +HU +Hungary +348 +HUN +HU +EU +Europe +Budapest +93030.0 +9982000 +HUF +hu-HU +719819 +16.111889 +48.585667 +22.906 +45.74361 + + +ID +Indonesia +360 +IDN +ID +AS +Asia +Jakarta +1919440.0 +242968342 +IDR +id,en,nl,jv +1643084 +95.009331 +5.904417 +141.021805 +-10.941861 + + +IE +Ireland +372 +IRL +EI +EU +Europe +Dublin +70280.0 +4622917 +EUR +en-IE,ga-IE +2963597 +-10.478556 +55.387917 +-6.002389 +51.451584 + + +IL +Israel +376 +ISR +IS +AS +Asia + +20770.0 +7353985 +ILS +he,ar-IL,en-IL, +294640 +34.270278754419145 +33.340137 +35.876804 +29.496639 + + +IM +Isle of Man +833 +IMN +IM +EU +Europe +Douglas +572.0 +75049 +GBP +en,gv +3042225 +-4.798722 +54.419724 +-4.3115 +54.055916 + + +IN +India +356 +IND +IN +AS +Asia +New Delhi +3287590.0 +1173108018 +INR +en-IN,hi,bn,te,mr,ta,ur,gu,kn,ml,or,pa,as,bh,sat,ks,ne,sd,kok,doi,mni,sit,sa,fr,lus,inc +1269750 +68.186691 +35.504223 +97.403305 +6.747139 + + +IO +British Indian Ocean Territory +086 +IOT +IO +AS +Asia + +60.0 +4000 +USD +en-IO +1282588 +71.259972 +-5.268333 +72.493164 +-7.438028 + + +IQ +Iraq +368 +IRQ +IZ +AS +Asia +Baghdad +437072.0 +29671605 +IQD +ar-IQ,ku,hy +99237 +38.795887 +37.378029 +48.575916 +29.069445 + + +IR +Iran +364 +IRN +IR +AS +Asia +Tehran +1648000.0 +76923300 +IRR +fa-IR,ku +130758 +44.047279 +39.777222 +63.317471 +25.064083 + + +IS +Iceland +352 +ISL +IC +EU +Europe +Reykjavik +103000.0 +308910 +ISK +is,en,de,da,sv,no +2629691 +-24.546524 +66.53463 +-13.495815 +63.393253 + + +IT +Italy +380 +ITA +IT +EU +Europe +Rome +301230.0 +60340328 +EUR +it-IT,de-IT,fr-IT,sc,ca,co,sl +3175395 +6.614889 +47.095196 +18.513445 +36.652779 + + +JE +Jersey +832 +JEY +JE +EU +Europe +Saint Helier +116.0 +90812 +GBP +en,pt +3042142 +-2.260028 +49.265057 +-2.022083 +49.169834 + + +JM +Jamaica +388 +JAM +JM +NA +North America +Kingston +10991.0 +2847232 +JMD +en-JM +3489940 +-78.366638 +18.526976 +-76.180321 +17.703554 + + +JO +Jordan +400 +JOR +JO +AS +Asia +Amman +92300.0 +6407085 +JOD +ar-JO,en +248816 +34.959999 +33.367668 +39.301167 +29.185888 + + +JP +Japan +392 +JPN +JA +AS +Asia +Tokyo +377835.0 +127288000 +JPY +ja +1861060 +122.93853 +45.52314 +145.820892 +24.249472 + + +KE +Kenya +404 +KEN +KE +AF +Africa +Nairobi +582650.0 +40046566 +KES +en-KE,sw-KE +192950 +33.908859 +5.019938 +41.899078 +-4.678047 + + +KG +Kyrgyzstan +417 +KGZ +KG +AS +Asia +Bishkek +198500.0 +5508626 +KGS +ky,uz,ru +1527747 +69.276611 +43.238224 +80.283165 +39.172832 + + +KH +Cambodia +116 +KHM +CB +AS +Asia +Phnom Penh +181040.0 +14453680 +KHR +km,fr,en +1831722 +102.339996 +14.686417 +107.627724 +10.409083 + + +KI +Kiribati +296 +KIR +KR +OC +Oceania +Tarawa +811.0 +92533 +AUD +en-KI,gil +4030945 +169.556137 +4.71957 +-150.215347 +-11.437038 + + +KM +Comoros +174 +COM +CN +AF +Africa +Moroni +2170.0 +773407 +KMF +ar,fr-KM +921929 +43.21579 +-11.362381 +44.538223 +-12.387857 + + +KN +Saint Kitts and Nevis +659 +KNA +SC +NA +North America +Basseterre +261.0 +49898 +XCD +en-KN +3575174 +-62.86956 +17.420118 +-62.543266 +17.095343 + + +KP +North Korea +408 +PRK +KN +AS +Asia +Pyongyang +120540.0 +22912177 +KPW +ko-KP +1873107 +124.315887 +43.006054 +130.674866 +37.673332 + + +KR +South Korea +410 +KOR +KS +AS +Asia +Seoul +98480.0 +48422644 +KRW +ko-KR,en +1835841 +125.887108 +38.612446 +129.584671 +33.190945 + + +KW +Kuwait +414 +KWT +KU +AS +Asia +Kuwait City +17820.0 +2789132 +KWD +ar-KW,en +285570 +46.555557 +30.095945 +48.431473 +28.524611 + + +KY +Cayman Islands +136 +CYM +CJ +NA +North America +George Town +262.0 +44270 +KYD +en-KY +3580718 +-81.432777 +19.7617 +-79.727272 +19.263029 + + +KZ +Kazakhstan +398 +KAZ +KZ +AS +Asia +Astana +2717300.0 +15340000 +KZT +kk,ru +1522867 +46.491859 +55.451195 +87.312668 +40.936333 + + +LA +Laos +418 +LAO +LA +AS +Asia +Vientiane +236800.0 +6368162 +LAK +lo,fr,en +1655842 +100.093056 +22.500389 +107.697029 +13.910027 + + +LB +Lebanon +422 +LBN +LE +AS +Asia +Beirut +10400.0 +4125247 +LBP +ar-LB,fr-LB,en,hy +272103 +35.114277 +34.691418 +36.639194 +33.05386 + + +LC +Saint Lucia +662 +LCA +ST +NA +North America +Castries +616.0 +160922 +XCD +en-LC +3576468 +-61.07415 +14.103245 +-60.874203 +13.704778 + + +LI +Liechtenstein +438 +LIE +LS +EU +Europe +Vaduz +160.0 +35000 +CHF +de-LI +3042058 +9.477805 +47.273529 +9.632195 +47.055862 + + +LK +Sri Lanka +144 +LKA +CE +AS +Asia +Colombo +65610.0 +21513990 +LKR +si,ta,en +1227603 +79.652916 +9.831361 +81.881279 +5.916833 + + +LR +Liberia +430 +LBR +LI +AF +Africa +Monrovia +111370.0 +3685076 +LRD +en-LR +2275384 +-11.492083 +8.551791 +-7.365113 +4.353057 + + +LS +Lesotho +426 +LSO +LT +AF +Africa +Maseru +30355.0 +1919552 +LSL +en-LS,st,zu,xh +932692 +27.029068 +-28.572058 +29.465761 +-30.668964 + + +LT +Lithuania +440 +LTU +LH +EU +Europe +Vilnius +65200.0 +3565000 +LTL +lt,ru,pl +597427 +20.941528 +56.446918 +26.871944 +53.901306 + + +LU +Luxembourg +442 +LUX +LU +EU +Europe +Luxembourg +2586.0 +497538 +EUR +lb,de-LU,fr-LU +2960313 +5.734556 +50.184944 +6.528472 +49.446583 + + +LV +Latvia +428 +LVA +LG +EU +Europe +Riga +64589.0 +2217969 +LVL +lv,ru,lt +458258 +20.974277 +58.082306 +28.241167 +55.668861 + + +LY +Libya +434 +LBY +LY +AF +Africa +Tripoli +1759540.0 +6461454 +LYD +ar-LY,it,en +2215636 +9.38702 +33.168999 +25.150612 +19.508045 + + +MA +Morocco +504 +MAR +MO +AF +Africa +Rabat +446550.0 +31627428 +MAD +ar-MA,fr +2542007 +-13.168586 +35.9224966985384 +-0.991750000000025 +27.662115 + + +MC +Monaco +492 +MCO +MN +EU +Europe +Monaco +1.95 +32965 +EUR +fr-MC,en,it +2993457 +7.408962249755859 +43.75196717037228 +7.439939260482788 +43.72472839869377 + + +MD +Moldova +498 +MDA +MD +EU +Europe +Chişinău +33843.0 +4324000 +MDL +ro,ru,gag,tr +617790 +26.618944 +48.490166 +30.135445 +45.468887 + + +ME +Montenegro +499 +MNE +MJ +EU +Europe +Podgorica +14026.0 +666730 +EUR +sr,hu,bs,sq,hr,rom +3194884 +18.461306 +43.570137 +20.358833 +41.850166 + + +MF +Saint Martin +663 +MAF +RN +NA +North America +Marigot +53.0 +35925 +EUR +fr +3578421 +-63.152767 +18.130354 +-63.012993 +18.052231 + + +MG +Madagascar +450 +MDG +MA +AF +Africa +Antananarivo +587040.0 +21281844 +MGA +fr-MG,mg +1062947 +43.224876 +-11.945433 +50.48378 +-25.608952 + + +MH +Marshall Islands +584 +MHL +RM +OC +Oceania +Majuro +181.3 +65859 +USD +mh,en-MH +2080185 +165.524918 +14.62 +171.931808 +5.587639 + + +MK +Macedonia +807 +MKD +MK +EU +Europe +Skopje +25333.0 +2062294 +MKD +mk,sq,tr,rmm,sr +718075 +20.464695 +42.361805 +23.038139 +40.860195 + + +ML +Mali +466 +MLI +ML +AF +Africa +Bamako +1240000.0 +13796354 +XOF +fr-ML,bm +2453866 +-12.242614 +25.000002 +4.244968 +10.159513 + + +MM +Myanmar [Burma] +104 +MMR +BM +AS +Asia +Nay Pyi Taw +678500.0 +53414374 +MMK +my +1327865 +92.189278 +28.543249 +101.176781 +9.784583 + + +MN +Mongolia +496 +MNG +MG +AS +Asia +Ulan Bator +1565000.0 +3086918 +MNT +mn,ru +2029969 +87.749664 +52.154251 +119.924309 +41.567638 + + +MO +Macao +446 +MAC +MC +AS +Asia +Macao +254.0 +449198 +MOP +zh,zh-MO,pt +1821275 +113.528946 +22.222334 +113.565834 +22.180389 + + +MP +Northern Mariana Islands +580 +MNP +CQ +OC +Oceania +Saipan +477.0 +53883 +USD +fil,tl,zh,ch-MP,en-MP +4041468 +144.88626 +20.55344 +146.06528 +14.11023 + + +MQ +Martinique +474 +MTQ +MB +NA +North America +Fort-de-France +1100.0 +432900 +EUR +fr-MQ +3570311 +-61.230118 +14.878819 +-60.81551 +14.392262 + + +MR +Mauritania +478 +MRT +MR +AF +Africa +Nouakchott +1030700.0 +3205060 +MRO +ar-MR,fuc,snk,fr,mey,wo +2378080 +-17.066521 +27.298073 +-4.827674 +14.715547 + + +MS +Montserrat +500 +MSR +MH +NA +North America +Plymouth +102.0 +9341 +XCD +en-MS +3578097 +-62.24138237036129 +16.824060205313184 +-62.144100129608205 +16.674768935441556 + + +MT +Malta +470 +MLT +MT +EU +Europe +Valletta +316.0 +403000 +EUR +mt,en-MT +2562770 +14.184376415657312 +36.079112527087844 +14.577639 +35.810276 + + +MU +Mauritius +480 +MUS +MP +AF +Africa +Port Louis +2040.0 +1294104 +MUR +en-MU,bho,fr +934292 +56.512718 +-10.319255 +63.500179 +-20.525717 + + +MV +Maldives +462 +MDV +MV +AS +Asia +Malé +300.0 +395650 +MVR +dv,en +1282028 +72.693222 +7.098361 +73.637276 +-0.692694 + + +MW +Malawi +454 +MWI +MI +AF +Africa +Lilongwe +118480.0 +15447500 +MWK +ny,yao,tum,swk +927384 +32.67395 +-9.367541 +35.916821 +-17.125 + + +MX +Mexico +484 +MEX +MX +NA +North America +Mexico City +1972550.0 +112468855 +MXN +es-MX +3996063 +-118.453949 +32.716759 +-86.703392 +14.532866 + + +MY +Malaysia +458 +MYS +MY +AS +Asia +Kuala Lumpur +329750.0 +28274729 +MYR +ms-MY,en,zh,ta,te,ml,pa,th +1733045 +99.643448 +7.363417 +119.267502 +0.855222 + + +MZ +Mozambique +508 +MOZ +MZ +AF +Africa +Maputo +801590.0 +22061451 +MZN +pt-MZ,vmw +1036973 +30.217319 +-10.471883 +40.842995 +-26.868685 + + +NA +Namibia +516 +NAM +WA +AF +Africa +Windhoek +825418.0 +2128471 +NAD +en-NA,af,de,hz,naq +3355338 +11.71563 +-16.959894 +25.256701 +-28.97143 + + +NC +New Caledonia +540 +NCL +NC +OC +Oceania +Noumea +19060.0 +216494 +XPF +fr-NC +2139685 +163.564667 +-19.549778 +168.129135 +-22.698 + + +NE +Niger +562 +NER +NG +AF +Africa +Niamey +1267000.0 +15878271 +XOF +fr-NE,ha,kr,dje +2440476 +0.16625 +23.525026 +15.995643 +11.696975 + + +NF +Norfolk Island +574 +NFK +NF +OC +Oceania +Kingston +34.6 +1828 +AUD +en-NF +2155115 +167.91543230151365 +-28.995170686948427 +167.99773740209957 +-29.063076742954735 + + +NG +Nigeria +566 +NGA +NI +AF +Africa +Abuja +923768.0 +154000000 +NGN +en-NG,ha,yo,ig,ff +2328926 +2.668432 +13.892007 +14.680073 +4.277144 + + +NI +Nicaragua +558 +NIC +NU +NA +North America +Managua +129494.0 +5995928 +NIO +es-NI,en +3617476 +-87.690308 +15.025909 +-82.738289 +10.707543 + + +NL +Netherlands +528 +NLD +NL +EU +Europe +Amsterdam +41526.0 +16645000 +EUR +nl-NL,fy-NL +2750405 +3.362556 +53.512196 +7.227944 +50.753918 + + +NO +Norway +578 +NOR +NO +EU +Europe +Oslo +324220.0 +5009150 +NOK +no,nb,nn,se,fi +3144096 +4.650167 +71.18811 +31.078052520751953 +57.977917 + + +NP +Nepal +524 +NPL +NP +AS +Asia +Kathmandu +140800.0 +28951852 +NPR +ne,en +1282988 +80.056274 +30.43339 +88.199333 +26.356722 + + +NR +Nauru +520 +NRU +NR +OC +Oceania + +21.0 +10065 +AUD +na,en-NR +2110425 +166.899033 +-0.504306 +166.945282 +-0.552333 + + +NU +Niue +570 +NIU +NE +OC +Oceania +Alofi +260.0 +2166 +NZD +niu,en-NU +4036232 +-169.951004 +-18.951069 +-169.775177 +-19.152193 + + +NZ +New Zealand +554 +NZL +NZ +OC +Oceania +Wellington +268680.0 +4252277 +NZD +en-NZ,mi +2186224 +166.7155 +-34.389668 +-180.0 +-47.286026 + + +OM +Oman +512 +OMN +MU +AS +Asia +Muscat +212460.0 +2967717 +OMR +ar-OM,en,bal,ur +286963 +51.882 +26.387972 +59.836582 +16.64575 + + +PA +Panama +591 +PAN +PM +NA +North America +Panama City +78200.0 +3410676 +PAB +es-PA,en +3703430 +-83.051445 +9.637514 +-77.17411 +7.197906 + + +PE +Peru +604 +PER +PE +SA +South America +Lima +1285220.0 +29907003 +PEN +es-PE,qu,ay +3932488 +-81.326744 +-0.012977 +-68.677986 +-18.349728 + + +PF +French Polynesia +258 +PYF +FP +OC +Oceania +Papeete +4167.0 +270485 +XPF +fr-PF,ty +4030656 +-152.877167 +-7.903573 +-134.929825 +-27.653572 + + +PG +Papua New Guinea +598 +PNG +PP +OC +Oceania +Port Moresby +462840.0 +6064515 +PGK +en-PG,ho,meu,tpi +2088628 +140.842865 +-1.318639 +155.96344 +-11.657861 + + +PH +Philippines +608 +PHL +RP +AS +Asia +Manila +300000.0 +99900177 +PHP +tl,en-PH,fil +1694008 +116.931557 +21.120611 +126.601524 +4.643306 + + +PK +Pakistan +586 +PAK +PK +AS +Asia +Islamabad +803940.0 +184404791 +PKR +ur-PK,en-PK,pa,sd,ps,brh +1168579 +60.878613 +37.097 +77.840919 +23.786722 + + +PL +Poland +616 +POL +PL +EU +Europe +Warsaw +312685.0 +38500000 +PLN +pl +798544 +14.123 +54.839138 +24.150749 +49.006363 + + +PM +Saint Pierre and Miquelon +666 +SPM +SB +NA +North America +Saint-Pierre +242.0 +7012 +EUR +fr-PM +3424932 +-56.420658 +47.146286 +-56.252991 +46.786041 + + +PN +Pitcairn Islands +612 +PCN +PC +OC +Oceania +Adamstown +47.0 +46 +NZD +en-PN +4030699 +-128.346436 +-24.315865 +-124.77285 +-24.672565 + + +PR +Puerto Rico +630 +PRI +RQ +NA +North America +San Juan +9104.0 +3916632 +USD +en-PR,es-PR +4566966 +-67.942726 +18.520166 +-65.242737 +17.926405 + + +PS +Palestine +275 +PSE +WE +AS +Asia + +5970.0 +3800000 +ILS +ar-PS +6254930 +34.21665954589844 +32.54638671875 +35.5732955932617 +31.216541290283203 + + +PT +Portugal +620 +PRT +PO +EU +Europe +Lisbon +92391.0 +10676000 +EUR +pt-PT,mwl +2264397 +-9.495944 +42.145638 +-6.182694 +36.96125 + + +PW +Palau +585 +PLW +PS +OC +Oceania +Melekeok - Palau State Capital +458.0 +19907 +USD +pau,sov,en-PW,tox,ja,fil,zh +1559582 +131.11788 +8.46966 +134.72307 +2.8036 + + +PY +Paraguay +600 +PRY +PA +SA +South America +Asunción +406750.0 +6375830 +PYG +es-PY,gn +3437598 +-62.647076 +-19.294041 +-54.259354 +-27.608738 + + +QA +Qatar +634 +QAT +QA +AS +Asia +Doha +11437.0 +840926 +QAR +ar-QA,es +289688 +50.757221 +26.154722 +51.636639 +24.482944 + + +RE +Réunion +638 +REU +RE +AF +Africa +Saint-Denis +2517.0 +776948 +EUR +fr-RE +935317 +55.219086 +-20.856855 +55.845039 +-21.372211 + + +RO +Romania +642 +ROU +RO +EU +Europe +Bucharest +237500.0 +21959278 +RON +ro,hu,rom +798549 +20.269972 +48.266945 +29.691055 +43.627304 + + +RS +Serbia +688 +SRB +RI +EU +Europe +Belgrade +88361.0 +7344847 +RSD +sr,hu,bs,rom +6290252 +18.817020416259766 +46.18138885498047 +23.00499725341797 +42.232215881347656 + + +RU +Russia +643 +RUS +RS +EU +Europe +Moscow +1.71E7 +140702000 +RUB +ru,tt,xal,cau,ady,kv,ce,tyv,cv,udm,tut,mns,bua,myv,mdf,chm,ba,inh,tut,kbd,krc,ava,sah,nog +2017370 +19.25 +81.857361 +-169.05 +41.188862 + + +RW +Rwanda +646 +RWA +RW +AF +Africa +Kigali +26338.0 +11055976 +RWF +rw,en-RW,fr-RW,sw +49518 +28.856794 +-1.053481 +30.895958 +-2.840679 + + +SA +Saudi Arabia +682 +SAU +SA +AS +Asia +Riyadh +1960582.0 +25731776 +SAR +ar-SA +102358 +34.495693 +32.158333 +55.666584 +15.61425 + + +SB +Solomon Islands +090 +SLB +BP +OC +Oceania +Honiara +28450.0 +559198 +SBD +en-SB,tpi +2103350 +155.508606 +-6.589611 +166.980865 +-11.850555 + + +SC +Seychelles +690 +SYC +SE +AF +Africa +Victoria +455.0 +88340 +SCR +en-SC,fr-SC +241170 +46.204769 +-4.283717 +56.279507 +-9.753867 + + +SD +Sudan +729 +SDN +SU +AF +Africa +Khartoum +1861484.0 +35000000 +SDG +ar-SD,en,fia +366755 +21.827774047851562 +22.232219696044922 +38.60749816894531 +8.684720993041992 + + +SE +Sweden +752 +SWE +SW +EU +Europe +Stockholm +449964.0 +9555893 +SEK +sv-SE,se,sma,fi-SE +2661886 +11.118694 +69.0625 +24.156292483918484 +55.337112 + + +SG +Singapore +702 +SGP +SN +AS +Asia +Singapore +692.7 +4701069 +SGD +cmn,en-SG,ms-SG,ta-SG,zh-SG +1880251 +103.638275 +1.471278 +104.007469 +1.258556 + + +SH +Saint Helena +654 +SHN +SH +AF +Africa +Jamestown +410.0 +7460 +SHP +en-SH +3370751 +-14.42123 +-7.887815 +-5.638753 +-16.019543 + + +SI +Slovenia +705 +SVN +SI +EU +Europe +Ljubljana +20273.0 +2007000 +EUR +sl,sh +3190538 +13.383083 +46.877918 +16.566 +45.413139 + + +SJ +Svalbard and Jan Mayen +744 +SJM +SV +EU +Europe +Longyearbyen +62049.0 +2550 +NOK +no,ru +607072 +17.699389 +80.762085 +33.287334 +79.220306 + + +SK +Slovakia +703 +SVK +LO +EU +Europe +Bratislava +48845.0 +5455000 +EUR +sk,hu +3057568 +16.84775 +49.603168 +22.570444 +47.728111 + + +SL +Sierra Leone +694 +SLE +SL +AF +Africa +Freetown +71740.0 +5245695 +SLL +en-SL,men,tem +2403846 +-13.307631 +10.0 +-10.284238 +6.929611 + + +SM +San Marino +674 +SMR +SM +EU +Europe +San Marino +61.2 +31477 +EUR +it-SM +3168068 +12.403538978820734 +43.99223730851663 +12.51653186779788 +43.8937092171425 + + +SN +Senegal +686 +SEN +SG +AF +Africa +Dakar +196190.0 +12323252 +XOF +fr-SN,wo,fuc,mnk +2245662 +-17.535236 +16.691633 +-11.355887 +12.307275 + + +SO +Somalia +706 +SOM +SO +AF +Africa +Mogadishu +637657.0 +10112453 +SOS +so-SO,ar-SO,it,en-SO +51537 +40.986595 +11.979166 +51.412636 +-1.674868 + + +SR +Suriname +740 +SUR +NS +SA +South America +Paramaribo +163270.0 +492829 +SRD +nl-SR,en,srn,hns,jv +3382998 +-58.086563 +6.004546 +-53.977493 +1.831145 + + +SS +South Sudan +728 +SSD +OD +AF +Africa +Juba +644329.0 +8260490 +SSP +en +7909807 +24.140274047851562 +12.219148635864258 +35.9405517578125 +3.493394374847412 + + +ST +São Tomé and Príncipe +678 +STP +TP +AF +Africa +São Tomé +1001.0 +175808 +STD +pt-ST +2410758 +6.47017 +1.701323 +7.466374 +0.024766 + + +SV +El Salvador +222 +SLV +ES +NA +North America +San Salvador +21040.0 +6052064 +USD +es-SV +3585968 +-90.128662 +14.445067 +-87.692162 +13.148679 + + +SX +Sint Maarten +534 +SXM +NN +NA +North America +Philipsburg + +37429 +ANG +nl,en +7609695 +-63.144039 +18.070248 +-63.012993 +18.011692 + + +SY +Syria +760 +SYR +SY +AS +Asia +Damascus +185180.0 +22198110 +SYP +ar-SY,ku,hy,arc,fr,en +163843 +35.727222 +37.319138 +42.385029 +32.310665 + + +SZ +Swaziland +748 +SWZ +WZ +AF +Africa +Mbabane +17363.0 +1354051 +SZL +en-SZ,ss-SZ +934841 +30.794107 +-25.719648 +32.13726 +-27.317101 + + +TC +Turks and Caicos Islands +796 +TCA +TK +NA +North America +Cockburn Town +430.0 +20556 +USD +en-TC +3576916 +-72.483871 +21.961878 +-71.123642 +21.422626 + + +TD +Chad +148 +TCD +CD +AF +Africa +N'Djamena +1284000.0 +10543464 +XAF +fr-TD,ar-TD,sre +2434508 +13.473475 +23.450369 +24.002661 +7.441068 + + +TF +French Southern Territories +260 +ATF +FS +AN +Antarctica +Port-aux-Français +7829.0 +140 +EUR +fr +1546748 +50.170258 +-37.790722 +77.598808 +-49.735184 + + +TG +Togo +768 +TGO +TO +AF +Africa +Lomé +56785.0 +6587239 +XOF +fr-TG,ee,hna,kbp,dag,ha +2363686 +-0.147324 +11.138977 +1.806693 +6.104417 + + +TH +Thailand +764 +THA +TH +AS +Asia +Bangkok +514000.0 +67089500 +THB +th,en +1605651 +97.345642 +20.463194 +105.639389 +5.61 + + +TJ +Tajikistan +762 +TJK +TI +AS +Asia +Dushanbe +143100.0 +7487489 +TJS +tg,ru +1220409 +67.387138 +41.042252 +75.137222 +36.674137 + + +TK +Tokelau +772 +TKL +TL +OC +Oceania + +10.0 +1466 +NZD +tkl,en-TK +4031074 +-172.50033569335938 +-8.553613662719727 +-171.21142578125 +-9.381111145019531 + + +TL +East Timor +626 +TLS +TT +OC +Oceania +Dili +15007.0 +1154625 +USD +tet,pt-TL,id,en +1966436 +124.04609680175781 +-8.135833740234375 +127.30859375 +-9.463626861572266 + + +TM +Turkmenistan +795 +TKM +TX +AS +Asia +Ashgabat +488100.0 +4940916 +TMT +tk,ru,uz +1218197 +52.441444 +42.795555 +66.684303 +35.141083 + + +TN +Tunisia +788 +TUN +TS +AF +Africa +Tunis +163610.0 +10589025 +TND +ar-TN,fr +2464461 +7.524833 +37.543915 +11.598278 +30.240417 + + +TO +Tonga +776 +TON +TN +OC +Oceania +Nuku'alofa +748.0 +122580 +TOP +to,en-TO +4032283 +-175.682266 +-15.562988 +-173.907578 +-21.455057 + + +TR +Turkey +792 +TUR +TU +AS +Asia +Ankara +780580.0 +77804122 +TRY +tr-TR,ku,diq,az,av +298795 +25.668501 +42.107613 +44.834999 +35.815418 + + +TT +Trinidad and Tobago +780 +TTO +TD +NA +North America +Port of Spain +5128.0 +1228691 +TTD +en-TT,hns,fr,es,zh +3573591 +-61.923771 +11.338342 +-60.517933 +10.036105 + + +TV +Tuvalu +798 +TUV +TV +OC +Oceania +Funafuti +26.0 +10472 +AUD +tvl,en,sm,gil +2110297 +176.064865 +-5.641972 +179.863281 +-10.801169 + + +TW +Taiwan +158 +TWN +TW +AS +Asia +Taipei +35980.0 +22894384 +TWD +zh-TW,zh,nan,hak +1668284 +119.534691 +25.29825 +122.000443 +21.901806 + + +TZ +Tanzania +834 +TZA +TZ +AF +Africa +Dodoma +945087.0 +41892895 +TZS +sw-TZ,en,ar +149590 +29.327168 +-0.990736 +40.443222 +-11.745696 + + +UA +Ukraine +804 +UKR +UP +EU +Europe +Kyiv +603700.0 +45415596 +UAH +uk,ru-UA,rom,pl,hu +690791 +22.128889 +52.369362 +40.20739 +44.390415 + + +UG +Uganda +800 +UGA +UG +AF +Africa +Kampala +236040.0 +33398682 +UGX +en-UG,lg,sw,ar +226074 +29.573252 +4.214427 +35.036049 +-1.48405 + + +UM +U.S. Minor Outlying Islands +581 +UMI + +OC +Oceania + +0.0 +0 +USD +en-UM +5854968 +-177.392029 +28.219814 +166.654526 +-0.389006 + + +US +United States +840 +USA +US +NA +North America +Washington +9629091.0 +310232863 +USD +en-US,es-US,haw,fr +6252001 +-124.733253 +49.388611 +-66.954811 +24.544245 + + +UY +Uruguay +858 +URY +UY +SA +South America +Montevideo +176220.0 +3477000 +UYU +es-UY +3439705 +-58.442722 +-30.082224 +-53.073933 +-34.980816 + + +UZ +Uzbekistan +860 +UZB +UZ +AS +Asia +Tashkent +447400.0 +27865738 +UZS +uz,ru,tg +1512440 +55.996639 +45.575001 +73.132278 +37.184444 + + +VA +Vatican City +336 +VAT +VT +EU +Europe +Vatican +0.44 +921 +EUR +la,it,fr +3164670 +12.44570678169205 +41.90743830885576 +12.45837546629481 +41.90027960306854 + + +VC +Saint Vincent and the Grenadines +670 +VCT +VC +NA +North America +Kingstown +389.0 +104217 +XCD +en-VC,fr +3577815 +-61.46090317727658 +13.377834 +-61.11388 +12.583984810969037 + + +VE +Venezuela +862 +VEN +VE +SA +South America +Caracas +912050.0 +27223228 +VEF +es-VE +3625428 +-73.354073 +12.201903 +-59.80378 +0.626311 + + +VG +British Virgin Islands +092 +VGB +VI +NA +North America +Road Town +153.0 +21730 +USD +en-VG +3577718 +-64.715363 +18.757221 +-64.268768 +18.38998 + + +VI +U.S. Virgin Islands +850 +VIR +VQ +NA +North America +Charlotte Amalie +352.0 +108708 +USD +en-VI +4796775 +-65.038231 +18.391747 +-64.565178 +17.681725 + + +VN +Vietnam +704 +VNM +VM +AS +Asia +Hanoi +329560.0 +89571130 +VND +vi,en,fr,zh,km +1562822 +102.148224 +23.388834 +109.464638 +8.559611 + + +VU +Vanuatu +548 +VUT +NH +OC +Oceania +Port Vila +12200.0 +221552 +VUV +bi,en-VU,fr-VU +2134431 +166.524979 +-13.073444 +169.904785 +-20.248945 + + +WF +Wallis and Futuna +876 +WLF +WF +OC +Oceania +Mata-Utu +274.0 +16025 +XPF +wls,fud,fr-WF +4034749 +-178.1848112896414 +-13.216758181061444 +-176.16174317718253 +-14.314559989820843 + + +WS +Samoa +882 +WSM +WS +OC +Oceania +Apia +2944.0 +192001 +WST +sm,en-WS +4034894 +-172.798599 +-13.432207 +-171.415741 +-14.040939 + + +XK +Kosovo +0 +XKX +KV +EU +Europe +Pristina + +1800000 +EUR +sq,sr +831053 +19.977481504492914 +43.2682495807952 +21.80335088694943 +41.856369601859925 + + +YE +Yemen +887 +YEM +YM +AS +Asia +Sanaa +527970.0 +23495361 +YER +ar-YE +69543 +42.5325394314234 +18.9999989031009 +54.5305388163283 +12.1110910264462 + + +YT +Mayotte +175 +MYT +MF +AF +Africa +Mamoutzou +374.0 +159042 +EUR +fr-YT +1024031 +45.03796 +-12.648891 +45.29295 +-13.000132 + + +ZA +South Africa +710 +ZAF +SF +AF +Africa +Pretoria +1219912.0 +49000000 +ZAR +zu,xh,af,nso,en-ZA,tn,st,ts,ss,ve,nr +953987 +16.458021 +-22.126612 +32.895973 +-34.839828 + + +ZM +Zambia +894 +ZMB +ZA +AF +Africa +Lusaka +752614.0 +13460305 +ZMK +en-ZM,bem,loz,lun,lue,ny,toi +895949 +21.999371 +-8.22436 +33.705704 +-18.079473 + + +ZW +Zimbabwe +716 +ZWE +ZI +AF +Africa +Harare +390580.0 +11651858 +ZWL +en-ZW,sn,nr,nd +878675 +25.237028 +-15.608835 +33.056305 +-22.417738 + + diff --git a/config/environments/development.rb b/config/environments/development.rb index 5cb58cf132f..36696f8271c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,41 +1,29 @@ OpenStreetMap::Application.configure do - # Settings specified here will take precedence over those in config/application.rb + # Settings specified here will take precedence over those in config/application.rb. # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. config.cache_classes = false - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true + # Do not eager load code on boot. + config.eager_load = false - # Show full error reports and disable caching + # Show full error reports and disable caching. config.consider_all_requests_local = true config.action_controller.perform_caching = false - # Don't care if the mailer can't send + # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false - # Print deprecation notices to the Rails logger + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin + # Raise an error on page load if there are pending migrations + config.active_record.migration_error = :page_load - # Raise exception on mass assignment protection for Active Record models - unless STATUS == :database_offline - config.active_record.mass_assignment_sanitizer = :strict - end - - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - unless STATUS == :database_offline - config.active_record.auto_explain_threshold_in_seconds = 0.5 - end - - # Do not compress assets - config.assets.compress = false - - # Expands the lines which load the assets + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. config.assets.debug = true end diff --git a/config/environments/production.rb b/config/environments/production.rb index 56c33ec9839..36f71792f40 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,81 +1,105 @@ OpenStreetMap::Application.configure do - # Settings specified here will take precedence over those in config/application.rb + # Settings specified here will take precedence over those in config/application.rb. - # Code is not reloaded between requests + # Code is not reloaded between requests. config.cache_classes = true - # Full error reports are disabled and caching is turned on + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both thread web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. config.consider_all_requests_local = false config.action_controller.perform_caching = true - # Disable rack caching - config.action_dispatch.rack_cache = false + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. + # config.action_dispatch.rack_cache = true - # Disable Rails's static asset server (Apache or nginx will already do this) + # Disable Rails's static asset server (Apache or nginx will already do this). config.serve_static_assets = false - # Compress JavaScripts and CSS - config.assets.compress = true + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass - # Don't fallback to assets pipeline if a precompiled asset is missed + # Do not fallback to assets pipeline if a precompiled asset is missed. config.assets.compile = false - # Generate digests for assets URLs + # Generate digests for assets URLs. config.assets.digest = true - # Defaults to Rails.root.join("public/assets") - # config.assets.manifest = YOUR_PATH + # Version of your assets, change this if you want to expire all your assets. + config.assets.version = '1.0' - # Specifies the header that your server uses for sending files + # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # See everything in the log (default is :info) - # config.log_level = :debug + # Set to :debug to see everything in the log. + config.log_level = :info - # Prepend all log lines with the following tags + # Prepend all log lines with the following tags. # config.log_tags = [ :subdomain, :uuid ] - # Use a different log path in production + # Use a different log path in production. if defined?(LOG_PATH) config.paths["log"] = LOG_PATH end - # Use a different logger for distributed setups + # Use a different logger for distributed setups. # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - # Use a different cache store in production + # Use a different cache store in production. if defined?(MEMCACHE_SERVERS) - config.cache_store = :mem_cache_store, MemCache.new(:namespace => "rails:cache", :no_block => true, :buffer_requests => true, :noreply => true) + config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } end - # Enable serving of images, stylesheets, and JavaScripts from an asset server + # Configure caching of static assets + config.action_controller.page_cache_directory = Rails.public_path + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. # config.action_controller.asset_host = "http://assets.example.com" - # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) - config.assets.precompile += %w( map.js menu.js pngfix.js site.js swfobject.js ) - config.assets.precompile += %w( openlayers.js ) + # Precompile additional assets. + # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. + config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js routing.js ) + config.assets.precompile += %w( user.js diary_entry.js swfobject.js ) config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) - config.assets.precompile += %w( browse.css theme/default/style.css ) - - # Disable delivery errors, bad email addresses will be ignored + config.assets.precompile += %w( leaflet-all.css leaflet.ie.css ) + config.assets.precompile += %w( embed.js embed.css ) + config.assets.precompile += %w( html5shiv.js ) + config.assets.precompile += %w( images/marker-*.png img/*-handle.png ) + config.assets.precompile += %w( potlatch2.swf ) + config.assets.precompile += %w( potlatch2/assets.zip ) + config.assets.precompile += %w( potlatch2/FontLibrary.swf ) + config.assets.precompile += %w( potlatch2/locales/*.swf ) + config.assets.precompile += %w( help/introduction.* ) + config.assets.precompile += %w( iD.js iD.css ) + config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif ) + config.assets.precompile += %w( iD/img/pattern/*.png ) + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. # config.action_mailer.raise_delivery_errors = false - # Enable threaded mode - # config.threadsafe! - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) + # the I18n.default_locale when a translation can not be found). config.i18n.fallbacks = true - # Send deprecation notices to registered listeners + # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - # config.active_record.auto_explain_threshold_in_seconds = 0.5 + # Disable automatic flushing of the log to improve performance. + # config.autoflush_log = false + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new end diff --git a/config/environments/test.rb b/config/environments/test.rb index 524cc5137ed..ebbda583634 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,5 +1,5 @@ OpenStreetMap::Application.configure do - # Settings specified here will take precedence over those in config/application.rb + # Settings specified here will take precedence over those in config/application.rb. # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that @@ -7,31 +7,30 @@ # and recreated between test runs. Don't rely on the data there! config.cache_classes = true - # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true - config.static_cache_control = "public, max-age=3600" + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false - # Log error messages when you accidentally call methods on nil - config.whiny_nils = true + # Configure static asset server for tests with Cache-Control for performance. + config.serve_static_assets = true + config.static_cache_control = "public, max-age=3600" - # Show full error reports and disable caching + # Show full error reports and disable caching. config.consider_all_requests_local = true config.action_controller.perform_caching = false - # Raise exceptions instead of rendering exception templates + # Raise exceptions instead of rendering exception templates. config.action_dispatch.show_exceptions = false - # Disable request forgery protection in test environment - config.action_controller.allow_forgery_protection = false + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false # Tell Action Mailer not to deliver emails to the real world. # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict - - # Print deprecation notices to the stderr + # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr end diff --git a/config/example.application.yml b/config/example.application.yml index cf18ab5577c..d6a855ef500 100644 --- a/config/example.application.yml +++ b/config/example.application.yml @@ -3,12 +3,15 @@ defaults: &defaults server_url: "www.openstreetmap.org" # The generator generator: "OpenStreetMap server" + copyright_owner: "OpenStreetMap and contributors" + attribution_url: "http://www.openstreetmap.org/copyright" + license_url: "http://opendatacommons.org/licenses/odbl/1-0/" # Sender addresses for emails email_from: "OpenStreetMap " email_return_path: "bounces@openstreetmap.org" # API version api_version: "0.6" - # Application status - posstible values are: + # Application status - possible values are: # :online - online and operating normally # :api_readonly - site online but API in read-only mode # :api_offline - site online but API offline @@ -24,6 +27,8 @@ defaults: &defaults max_number_of_nodes: 50000 # Maximum number of nodes that can be in a way (checked on save) max_number_of_way_nodes: 2000 + # The maximum area you're allowed to request notes from, in square degrees + max_note_request_area: 25 # Zoom level to use for postcode results from the geocoder postcode_zoom: 15 # Zoom level to use for geonames results from the geocoder @@ -68,17 +73,17 @@ defaults: &defaults # URL of Nominatim instance to use for geocoding nominatim_url: "http://nominatim.openstreetmap.org/" # Default editor - default_editor: "potlatch2" + 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 + #id_key: "" # Whether to require users to view the CTs before continuing to edit... require_terms_seen: false # Whether to require users to agree to the CTs before editing require_terms_agreed: false - # Piwik details - #piwik_location: "piwik.openstreetmap.org" - #piwik_site: 1 - #piwik_signup_goal: 1 development: <<: *defaults diff --git a/config/example.database.yml b/config/example.database.yml index 3908e51e537..7e1ffc07d02 100644 --- a/config/example.database.yml +++ b/config/example.database.yml @@ -1,12 +1,12 @@ -# Postgresql version 8.3 recommended. -# See http://wiki.openstreetmap.org/wiki/OSM_Protocol_Version_0.6/postgres for detailed setup instructions. +# Using a recent release (8.3 or higher) of PostgreSQL (http://postgresql.org/) is recommended. +# See https://github.com/openstreetmap/openstreetmap-website/blob/master/INSTALL.md#database-setup for detailed setup instructions. # development: adapter: postgresql database: openstreetmap # username: openstreetmap # password: openstreetmap - host: localhost +# host: localhost encoding: utf8 # Warning: The database defined as 'test' will be erased and @@ -17,7 +17,7 @@ test: database: osm_test # username: osm_test # password: osm_test - host: localhost +# host: localhost encoding: utf8 production: @@ -25,5 +25,5 @@ production: database: osm # username: osm # password: osm - host: localhost +# host: localhost encoding: utf8 diff --git a/config/i18n-js.yml b/config/i18n-js.yml new file mode 100644 index 00000000000..026ece64c11 --- /dev/null +++ b/config/i18n-js.yml @@ -0,0 +1,33 @@ +# Split context in several files. +# By default only one file with all translations is exported and +# no configuration is required. Your settings for asset pipeline +# are automatically recognized. +# +# If you want to split translations into several files or specify +# locale contexts that will be exported, just use this file to do +# so. +# +# If you're going to use the Rails 3.1 asset pipeline, change +# the following configuration to something like this: +# +# translations: +# - file: "app/assets/javascripts/i18n/translations.js" +# +# If you're running an old version, you can use something +# like this: +# +# translations: +# - file: "public/javascripts/translations.js" +# only: "*" +# +translations: + - file: "app/assets/javascripts/i18n/translations.js" + only: + - "*.date" + - "*.time" + - "*.browse.start_rjs.*" + - "*.javascripts.*" + - "*.site.index.remote_failed" + - "*.site.sidebar.search_results" + - "*.diary_entry.edit.marker_text" + - "*.layouts.project_name.title" diff --git a/config/initializers/action_cache_path.rb b/config/initializers/action_cache_path.rb deleted file mode 100644 index b25aa14dbdd..00000000000 --- a/config/initializers/action_cache_path.rb +++ /dev/null @@ -1,19 +0,0 @@ -module ActionController - module Caching - module Actions - class ActionCachePath - def initialize(controller, options = {}, infer_extension = true) - if infer_extension - @extension = controller.params[:format] - options.reverse_merge!(:format => @extension) if options.is_a?(Hash) - else - @extension = options[:format] - end - - path = controller.url_for(options).split(%r{://}).last - @path = normalize!(path) - end - end - end - end -end diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index ad729174fde..9a8ef011bb5 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -5,23 +5,3 @@ :domain => 'localhost', :enable_starttls_auto => false } - -# Monkey patch to allow sending of messages in specific locales -module ActionMailer - class Base - def mail_with_locale(*args) - old_locale = I18n.locale - - begin - I18n.locale = @locale - message = mail_without_locale(*args) - ensure - I18n.locale = old_locale - end - - message - end - - alias_method_chain :mail, :locale - end -end diff --git a/config/initializers/buffered_logger.rb b/config/initializers/buffered_logger.rb deleted file mode 100644 index c3a31b319a5..00000000000 --- a/config/initializers/buffered_logger.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Hack BufferedLogger to add timestamps to messages -module ActiveSupport - class BufferedLogger - alias_method :old_add, :add - - def add(severity, message = nil, progname = nil, &block) - return if self.level > severity - message = (message || (block && block.call) || progname).to_s - time = Time.now - message = "[%s.%06d #%d] %s" % [time.strftime("%Y-%m-%d %H:%M:%S"), time.usec, $$, message.sub(/^\n+/, "")] - old_add(severity, message) - end - end -end diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 00000000000..1a8ce106d2a --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,29 @@ +require "rack/cors" + +# Mark CORS responses as uncacheable as we don't want a browser to +# try and reuse a response that had a different origin, even with +# revalidation, as the origin check will fail. +module OpenStreetMap + class Cors < Rack::Cors + def call(env) + status, headers, body = super env + if headers['Access-Control-Allow-Origin'] + headers['Cache-Control'] = 'no-cache' + end + [status, headers, body] + end + end +end + +# Allow any and all cross-origin requests to the API. Allow any origin, and +# any headers. Non-browser requests do not have origin or header restrictions, +# so browser-requests should be similarly permitted. (Though the API does not +# require any custom headers, Ajax frameworks may automatically add headers +# such as X-Requested-By to requests.) +Rails.configuration.middleware.use OpenStreetMap::Cors do + allow do + origins "*" + resource "/oauth/*", :headers => :any, :methods => [:get, :post] + resource "/api/*", :headers => :any, :methods => [:get, :post, :put, :delete] + end +end diff --git a/config/initializers/field_error.rb b/config/initializers/field_error.rb new file mode 100644 index 00000000000..41f2c2d52d3 --- /dev/null +++ b/config/initializers/field_error.rb @@ -0,0 +1,9 @@ +ActionView::Base.field_error_proc = Proc.new do |html_tag, instance| + class_attr_index = html_tag.index 'class="' + + if class_attr_index + html_tag.insert class_attr_index+7, 'field_with_errors ' + else + html_tag.insert html_tag.index(/\/?>/), ' class="field_with_errors"' + end +end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 00000000000..8eb234f431a --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password, :pass_crypt, :pass_crypt_confirmation] diff --git a/config/initializers/http_accept_language.rb b/config/initializers/http_accept_language.rb index 04c3dfaf533..2e5c92df1ac 100644 --- a/config/initializers/http_accept_language.rb +++ b/config/initializers/http_accept_language.rb @@ -3,10 +3,12 @@ # https://github.com/iain/http_accept_language/pull/6 # module HttpAcceptLanguage - def compatible_language_from(available_languages) - user_preferred_languages.find do |x| - available_languages.find { |y| y.to_s == x.to_s } || - available_languages.find { |y| y.to_s =~ /^#{Regexp.escape(x.to_s)}-/ } + class Parser + def compatible_language_from(available_languages) + user_preferred_languages.find do |x| + available_languages.find { |y| y.to_s == x.to_s } || + available_languages.find { |y| y.to_s =~ /^#{Regexp.escape(x.to_s)}-/ } + end end end end diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb index 036de52d16d..156eea4ecad 100644 --- a/config/initializers/i18n.rb +++ b/config/initializers/i18n.rb @@ -1,12 +1,5 @@ module I18n module Backend - module Fallbacks - def find_first_string_or_lambda_default(defaults) - defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) } - nil - end - end - module PluralizationFallback def pluralize(locale, entry, count) super @@ -16,9 +9,41 @@ def pluralize(locale, entry, count) end end end + + module JS + class << self + def make_ordered(unordered) + ordered = ActiveSupport::OrderedHash.new + + unordered.keys.sort { |a,b| a.to_s <=> b.to_s }.each do |key| + value = unordered[key] + + if value.is_a?(Hash) + ordered[key] = make_ordered(value) + else + ordered[key] = value + end + end + + ordered + end + + def filtered_translations_with_order + make_ordered(filtered_translations_without_order) + end + + alias_method_chain :filtered_translations, :order + end + end end I18n::Backend::Simple.include(I18n::Backend::PluralizationFallback) I18n::Backend::Simple.include(I18n::Backend::Fallbacks) I18n.fallbacks.map("no" => "nb") + +I18n.enforce_available_locales = false + +Rails.configuration.after_initialize do |app| + I18n.available_locales +end diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb index 5d8d9be237b..ac033bf9dc8 100644 --- a/config/initializers/inflections.rb +++ b/config/initializers/inflections.rb @@ -1,15 +1,16 @@ # Be sure to restart your server when you modify this file. -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| # inflect.plural /^(ox)$/i, '\1en' # inflect.singular /^(ox)en/i, '\1' # inflect.irregular 'person', 'people' # inflect.uncountable %w( fish sheep ) # end -# + # These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections do |inflect| +# ActiveSupport::Inflector.inflections(:en) do |inflect| # inflect.acronym 'RESTful' # end diff --git a/config/initializers/konacha.rb b/config/initializers/konacha.rb new file mode 100644 index 00000000000..2924efab6fe --- /dev/null +++ b/config/initializers/konacha.rb @@ -0,0 +1,5 @@ +Konacha.configure do |config| + require 'capybara/poltergeist' + config.spec_dir = "test/javascripts" + config.driver = :poltergeist +end if defined?(Konacha) diff --git a/config/initializers/mail.rb b/config/initializers/mail.rb deleted file mode 100644 index b93c3f6d257..00000000000 --- a/config/initializers/mail.rb +++ /dev/null @@ -1,25 +0,0 @@ -module Mail - class Ruby18 - def Ruby18.b_value_decode(str) - match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m) - if match - encoding = match[1] - str = Ruby18.decode_base64(match[2]) - require 'iconv' - str = Iconv.conv("UTF-8//TRANSLIT//IGNORE", encoding, str) - end - str - end - - def Ruby18.q_value_decode(str) - match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m) - if match - encoding = match[1] - str = Encodings::QuotedPrintable.decode(match[2].gsub(/_/, '=20')) - require 'iconv' - str = Iconv.conv("UTF-8//TRANSLIT//IGNORE", encoding, str) - end - str - end - end -end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb index c676f6e46c5..be247274f29 100644 --- a/config/initializers/mime_types.rb +++ b/config/initializers/mime_types.rb @@ -4,3 +4,4 @@ # Mime::Type.register "text/richtext", :rtf # Mime::Type.register_alias "text/html", :iphone Mime::Type.register "application/x-amf", :amf +Mime::Type.register "application/gpx+xml", :gpx diff --git a/config/initializers/openid.rb b/config/initializers/openid.rb index a171d1e7b27..2a6de16b22f 100644 --- a/config/initializers/openid.rb +++ b/config/initializers/openid.rb @@ -1,7 +1,7 @@ if defined?(MEMCACHE_SERVERS) require "openid/store/memcache" - OpenIdAuthentication.store = OpenID::Store::Memcache.new(MemCache.new(:namespace => "rails", :string_return_types => true)) + OpenIdAuthentication.store = OpenID::Store::Memcache.new(Dalli::Client.new(MEMCACHE_SERVERS, :namespace => "rails")) else OpenIdAuthentication.store = :file end diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 64673487a43..592c9e1871c 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,7 +1,6 @@ module Paperclip class AssetUrlGenerator < UrlGenerator - include Sprockets::Helpers::IsolatedHelper - include Sprockets::Helpers::RailsHelper + include Sprockets::Rails::Helper def for(style_name, options) url = super(style_name, options) @@ -15,6 +14,12 @@ def for(style_name, options) end end +Rails.application.config.after_initialize do |app| + Paperclip::AssetUrlGenerator::VIEW_ACCESSORS.each do |attr| + Paperclip::AssetUrlGenerator.send("#{attr}=", ActionView::Base.send(attr)) + end +end + Paperclip::Attachment.default_options[:url] = "/attachments/:class/:attachment/:id_partition/:style/:fingerprint.:extension" Paperclip::Attachment.default_options[:path] = "#{ATTACHMENTS_DIR}/:class/:attachment/:id_partition/:style/:fingerprint.:extension" Paperclip::Attachment.default_options[:url_generator] = Paperclip::AssetUrlGenerator diff --git a/config/initializers/piwik.rb b/config/initializers/piwik.rb new file mode 100644 index 00000000000..1f054f7d1ed --- /dev/null +++ b/config/initializers/piwik.rb @@ -0,0 +1,5 @@ +require "yaml" + +if File.exists?(piwik_file = File.expand_path("../../piwik.yml", __FILE__)) + PIWIK = YAML.load_file(piwik_file) +end diff --git a/config/initializers/postgresql_adapter.rb b/config/initializers/postgresql_adapter.rb index 75971e4bf11..012e401d243 100644 --- a/config/initializers/postgresql_adapter.rb +++ b/config/initializers/postgresql_adapter.rb @@ -2,62 +2,32 @@ module ActiveRecord module ConnectionAdapters class PostgreSQLAdapter - def supports_disable_referential_integrity?() #:nodoc: - version = query("SHOW server_version")[0][0].split('.') - (version[0].to_i >= 9 || (version[0].to_i == 8 && version[1].to_i >= 1)) ? true : false - rescue - return false + def initialize_type_map_with_enums + OID.alias_type "format_enum", "text" + OID.alias_type "gpx_visibility_enum", "text" + OID.alias_type "note_status_enum", "text" + OID.alias_type "note_event_enum", "text" + OID.alias_type "nwr_enum", "text" + OID.alias_type "user_role_enum", "text" + OID.alias_type "user_status_enum", "text" + + initialize_type_map_without_enums end - def pk_and_sequence_for(table) - # First try looking for a sequence with a dependency on the - # given table's primary key. - result = query(<<-end_sql, 'PK and serial sequence')[0] - SELECT attr.attname, seq.relname - FROM pg_class seq, - pg_attribute attr, - pg_depend dep, - pg_namespace name, - pg_constraint cons - WHERE seq.oid = dep.objid - AND seq.relkind = 'S' - AND attr.attrelid = dep.refobjid - AND attr.attnum = dep.refobjsubid - AND attr.attrelid = cons.conrelid - AND attr.attnum = cons.conkey[1] - AND cons.contype = 'p' - AND dep.classid = '"pg_class"'::regclass - AND dep.refclassid = '"pg_class"'::regclass - AND dep.refobjid = '#{quote_table_name(table)}'::regclass - end_sql - - if result.nil? or result.empty? - # If that fails, try parsing the primary key's default value. - # Support the 7.x and 8.0 nextval('foo'::text) as well as - # the 8.1+ nextval('foo'::regclass). - result = query(<<-end_sql, 'PK and custom sequence')[0] - SELECT attr.attname, - CASE - WHEN split_part(def.adsrc, '''', 2) ~ '.' THEN - substr(split_part(def.adsrc, '''', 2), - strpos(split_part(def.adsrc, '''', 2), '.')+1) - ELSE split_part(def.adsrc, '''', 2) - END - FROM pg_class t - JOIN pg_attribute attr ON (t.oid = attrelid) - JOIN pg_attrdef def ON (adrelid = attrelid AND adnum = attnum) - JOIN pg_constraint cons ON (conrelid = adrelid AND adnum = conkey[1]) - WHERE t.oid = '#{quote_table_name(table)}'::regclass - AND cons.contype = 'p' - AND def.adsrc ~* 'nextval' - end_sql + alias_method_chain :initialize_type_map, :enums + end + + class PostgreSQLColumn + def simplified_type_with_enum(field_type) + case field_type + when /_enum$/ + :string + else + simplified_type_without_enum(field_type) end - - # [primary_key, sequence] - [result.first, result.last] - rescue - nil end + + alias_method_chain :simplified_type, :enum end end end diff --git a/config/initializers/r2.rb b/config/initializers/r2.rb new file mode 100644 index 00000000000..70676ca7e0e --- /dev/null +++ b/config/initializers/r2.rb @@ -0,0 +1,21 @@ +class R2Template < Tilt::Template + self.default_mime_type = 'text/css' + + def self.engine_initialized? + defined? ::R2 + end + + def initialize_engine + require_template_library "r2" + end + + def prepare + @output = R2.r2(data) + end + + def evaluate(scope, locals, &block) + @output + end +end + +Rails.application.assets.register_engine ".r2", R2Template diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 7d41cb64105..ac761aea5ad 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -1,7 +1,12 @@ # Be sure to restart your server when you modify this file. -# Your secret key for verifying the integrity of signed cookies. +# Your secret key is used for verifying the integrity of signed cookies. # If you change this key, all old signed cookies will become invalid! + # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -OpenStreetMap::Application.config.secret_token = '67881c9e6670d9b55b43885ea8eab34e32865ce436bdbde73e1967a11a26674906736de0aa1a0d24edf8ebcb653e1735413e6fd24e1201338e397d4a2392c614' +# You can use `rake secret` to generate a secure secret key. + +# Make sure your secret_key_base is kept private +# if you're sharing your code publicly. +OpenStreetMap::Application.config.secret_key_base = '8be565e2e25831d88231f4bcfd83dfc3ab33957c4f33bb3cff7a279f7820ec4d0c1111f246bb347c68859c0b46b4e591be9179a53a5a7165a9936000d6d2be41' diff --git a/config/initializers/session.rb b/config/initializers/session.rb new file mode 100644 index 00000000000..83b2492fe92 --- /dev/null +++ b/config/initializers/session.rb @@ -0,0 +1,13 @@ +module ActionDispatch + class Request < Rack::Request + class Session + def clear_with_rescue + clear_without_rescue + rescue + # lets not worry about it... + end + + alias_method_chain :clear, :rescue + end + end +end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index aa907140498..17173d53661 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,9 +1,7 @@ # Be sure to restart your server when you modify this file. if defined?(MEMCACHE_SERVERS) - cache = MemCache.new(:namespace => "rails:session", :string_return_types => true) - - OpenStreetMap::Application.config.session_store :mem_cache_store, :cache => cache, :key => "_osm_session" + OpenStreetMap::Application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session" else OpenStreetMap::Application.config.session_store :cache_store, :key => '_osm_session' end diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb index da4fb076f39..33725e95fd2 100644 --- a/config/initializers/wrap_parameters.rb +++ b/config/initializers/wrap_parameters.rb @@ -1,14 +1,14 @@ # Be sure to restart your server when you modify this file. -# + # This file contains settings for ActionController::ParamsWrapper which # is enabled by default. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. ActiveSupport.on_load(:action_controller) do - wrap_parameters :format => [:json] + wrap_parameters format: [:json] if respond_to?(:wrap_parameters) end -# Disable root element in JSON by default. -ActiveSupport.on_load(:active_record) do - self.include_root_in_json = false -end +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/key.yml b/config/key.yml index f3dfc58edf6..f1bfde91ffe 100644 --- a/config/key.yml +++ b/config/key.yml @@ -1,91 +1,52 @@ mapnik: - - { min_zoom: 0, max_zoom: 18, name: motorway, image: motorway.png } + - { min_zoom: 0, max_zoom: 19, name: motorway, image: motorway.png } - { min_zoom: 0, max_zoom: 11, name: trunk, image: trunk.png } - - { min_zoom: 12, max_zoom: 18, name: trunk, image: trunk12.png } + - { min_zoom: 12, max_zoom: 19, name: trunk, image: trunk12.png } - { min_zoom: 7, max_zoom: 11, name: primary, image: primary.png } - - { min_zoom: 12, max_zoom: 18, name: primary, image: primary12.png } + - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png } - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png } - - { min_zoom: 12, max_zoom: 18, name: secondary, image: secondary12.png } - - { min_zoom: 13, max_zoom: 18, name: unsurfaced, image: unsurfaced.png } - - { min_zoom: 13, max_zoom: 18, name: track, image: track.png } - - { min_zoom: 13, max_zoom: 18, name: byway, image: byway.png } - - { min_zoom: 13, max_zoom: 18, name: bridleway, image: bridleway.png } - - { min_zoom: 13, max_zoom: 18, name: cycleway, image: cycleway.png } - - { min_zoom: 13, max_zoom: 18, name: footway, image: footway.png } + - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png } + - { min_zoom: 13, max_zoom: 19, name: unsurfaced, image: unsurfaced.png } + - { min_zoom: 13, max_zoom: 19, name: track, image: track.png } + - { min_zoom: 13, max_zoom: 19, name: byway, image: byway.png } + - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png } + - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png } + - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png } - { min_zoom: 8, max_zoom: 12, name: rail, image: rail.png } - - { min_zoom: 13, max_zoom: 18, name: rail, image: rail13.png } - - { min_zoom: 13, max_zoom: 18, name: subway, image: subway.png } - - { min_zoom: 13, max_zoom: 18, name: tram, image: tram.png } - - { min_zoom: 12, max_zoom: 18, name: cable, image: cable.png } - - { min_zoom: 11, max_zoom: 18, name: runway, image: runway.png } - - { min_zoom: 12, max_zoom: 18, name: apron, image: apron.png } - - { min_zoom: 0, max_zoom: 18, name: admin, image: admin.png } - - { min_zoom: 9, max_zoom: 18, name: forest, image: forest.png } - - { min_zoom: 10, max_zoom: 18, name: wood, image: wood.png } - - { min_zoom: 10, max_zoom: 18, name: golf, image: golf.png } - - { min_zoom: 10, max_zoom: 18, name: park, image: park.png } - - { min_zoom: 8, max_zoom: 18, name: resident, image: resident.png } - - { min_zoom: 10, max_zoom: 18, name: tourist, image: tourist.png } - - { min_zoom: 10, max_zoom: 18, name: common, image: common.png } - - { min_zoom: 10, max_zoom: 18, name: retail, image: retail.png } - - { min_zoom: 10, max_zoom: 18, name: industrial, image: industrial.png } - - { min_zoom: 10, max_zoom: 18, name: commercial, image: commercial.png } - - { min_zoom: 10, max_zoom: 18, name: heathland, image: heathland.png } - - { min_zoom: 7, max_zoom: 18, name: lake, image: lake.png } - - { min_zoom: 10, max_zoom: 18, name: farm, image: farm.png } - - { min_zoom: 10, max_zoom: 18, name: brownfield, image: brownfield.png } - - { min_zoom: 11, max_zoom: 18, name: cemetery, image: cemetery.png } - - { min_zoom: 11, max_zoom: 18, name: allotments, image: allotments.png } - - { min_zoom: 11, max_zoom: 18, name: pitch, image: pitch.png } - - { min_zoom: 11, max_zoom: 18, name: centre, image: centre.png } - - { min_zoom: 11, max_zoom: 18, name: reserve, image: reserve.png } - - { min_zoom: 11, max_zoom: 18, name: military, image: military.png } - - { min_zoom: 12, max_zoom: 18, name: school, image: school.png } - - { min_zoom: 12, max_zoom: 18, name: building, image: building.png } - - { min_zoom: 12, max_zoom: 18, name: station, image: station.png } - - { min_zoom: 12, max_zoom: 18, name: summit, image: summit.png } - - { min_zoom: 12, max_zoom: 18, name: tunnel, image: tunnel.png } - - { min_zoom: 13, max_zoom: 18, name: bridge, image: bridge.png } - - { min_zoom: 15, max_zoom: 18, name: private, image: private.png } - - { min_zoom: 15, max_zoom: 18, name: permissive, image: permissive.png } - - { min_zoom: 15, max_zoom: 18, name: destination, image: destination.png } - - { min_zoom: 12, max_zoom: 18, name: construction, image: construction.png } - -osmarender: - - { min_zoom: 0, max_zoom: 18, name: motorway, image: motorway.png } - - { min_zoom: 0, max_zoom: 18, name: trunk, image: trunk.png } - - { min_zoom: 7, max_zoom: 18, name: primary, image: primary.png } - - { min_zoom: 9, max_zoom: 18, name: secondary, image: secondary.png } - - { min_zoom: 13, max_zoom: 18, name: unsurfaced, image: unsurfaced.png } - - { min_zoom: 13, max_zoom: 18, name: track, image: track.png } - - { min_zoom: 13, max_zoom: 18, name: byway, image: byway.png } - - { min_zoom: 13, max_zoom: 18, name: bridleway, image: bridleway.png } - - { min_zoom: 13, max_zoom: 18, name: cycleway, image: cycleway.png } - - { min_zoom: 13, max_zoom: 18, name: footway, image: footway.png } - - { min_zoom: 8, max_zoom: 18, name: rail, image: rail.png } - - { min_zoom: 13, max_zoom: 18, name: subway, image: subway.png } - - { min_zoom: 13, max_zoom: 18, name: tram, image: tram.png } - - { min_zoom: 0, max_zoom: 18, name: admin, image: admin.png } - - { min_zoom: 9, max_zoom: 18, name: forest, image: forest.png } - - { min_zoom: 10, max_zoom: 18, name: wood, image: wood.png } - - { min_zoom: 10, max_zoom: 18, name: park, image: park.png } - - { min_zoom: 8, max_zoom: 18, name: resident, image: resident.png } - - { min_zoom: 10, max_zoom: 18, name: tourist, image: tourist.png } - - { min_zoom: 10, max_zoom: 18, name: common, image: common.png } - - { min_zoom: 10, max_zoom: 18, name: retail, image: retail.png } - - { min_zoom: 10, max_zoom: 18, name: industrial, image: industrial.png } - - { min_zoom: 10, max_zoom: 18, name: commercial, image: commercial.png } - - { min_zoom: 10, max_zoom: 18, name: heathland, image: heathland.png } - - { min_zoom: 7, max_zoom: 18, name: lake, image: lake.png } - - { min_zoom: 10, max_zoom: 18, name: farm, image: farm.png } - - { min_zoom: 10, max_zoom: 18, name: brownfield, image: brownfield.png } - - { min_zoom: 11, max_zoom: 18, name: cemetery, image: cemetery.png } - - { min_zoom: 11, max_zoom: 18, name: allotments, image: allotments.png } - - { min_zoom: 11, max_zoom: 18, name: pitch, image: pitch.png } - - { min_zoom: 11, max_zoom: 18, name: centre, image: centre.png } - - { min_zoom: 11, max_zoom: 18, name: reserve, image: reserve.png } - - { min_zoom: 11, max_zoom: 18, name: military, image: military.png } - - { min_zoom: 12, max_zoom: 18, name: school, image: school.png } - - { min_zoom: 12, max_zoom: 18, name: building, image: building.png } - - { min_zoom: 12, max_zoom: 18, name: station, image: station.png } - - { min_zoom: 12, max_zoom: 18, name: summit, image: summit.png } + - { min_zoom: 13, max_zoom: 19, name: rail, image: rail13.png } + - { min_zoom: 13, max_zoom: 19, name: subway, image: subway.png } + - { min_zoom: 13, max_zoom: 19, name: tram, image: tram.png } + - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png } + - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png } + - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png } + - { min_zoom: 0, max_zoom: 19, name: admin, image: admin.png } + - { min_zoom: 9, max_zoom: 19, name: forest, image: forest.png } + - { min_zoom: 10, max_zoom: 19, name: wood, image: wood.png } + - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png } + - { min_zoom: 10, max_zoom: 19, name: park, image: park.png } + - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png } + - { min_zoom: 10, max_zoom: 19, name: tourist, image: tourist.png } + - { min_zoom: 10, max_zoom: 19, name: common, image: common.png } + - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png } + - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png } + - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png } + - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png } + - { min_zoom: 7, max_zoom: 19, name: lake, image: lake.png } + - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png } + - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png } + - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png } + - { min_zoom: 11, max_zoom: 19, name: allotments, image: allotments.png } + - { min_zoom: 11, max_zoom: 19, name: pitch, image: pitch.png } + - { min_zoom: 11, max_zoom: 19, name: centre, image: centre.png } + - { min_zoom: 11, max_zoom: 19, name: reserve, image: reserve.png } + - { min_zoom: 11, max_zoom: 19, name: military, image: military.png } + - { min_zoom: 12, max_zoom: 19, name: school, image: school.png } + - { min_zoom: 12, max_zoom: 19, name: building, image: building.png } + - { min_zoom: 12, max_zoom: 19, name: station, image: station.png } + - { min_zoom: 12, max_zoom: 19, name: summit, image: summit.png } + - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png } + - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png } + - { min_zoom: 15, max_zoom: 19, name: private, image: private.png } + - { min_zoom: 15, max_zoom: 19, name: permissive, image: permissive.png } + - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png } + - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png } diff --git a/config/locales/af.yml b/config/locales/af.yml index 387b30e4e9c..7cfcfbe430d 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -57,56 +57,9 @@ af: user_preference: Gebruikersvoorkeure way: Weg browse: - changeset_details: - belongs_to: "Behoort aan:" - bounding_box: "Seleksieboks:" - box: boks - closed_at: "Gesluit op:" - created_at: "Geskep op:" - has_nodes: - one: "Het die volgende node:" - other: "Het die volgende %{count} nodes:" - show_area_box: Wys gebied - common_details: - changeset_comment: "Opmerking:" - edited_at: "Gewysig op:" - edited_by: "Opgedateer deur:" - version: "Weergawe:" containing_relation: entry: Relasie %{relation_name} entry_role: Relasie %{relation_name} (as %{relation_role}) - map: - deleted: Uitgevee - larger: - area: Besigtig area op groter kaart - node: Besigtig node op groter kaart - relation: Besigtig relasie op groter kaart - way: Besigtig weg op groter kaart - loading: Besig om af te laai... - navigation: - all: - next_changeset_tooltip: Volgende stel wysigings - prev_changeset_tooltip: Vorige stel wysigings - user: - name_changeset_tooltip: Wys wysigings deur %{user} - next_changeset_tooltip: Volgende wysiging deur %{user} - prev_changeset_tooltip: Vorige wysiging deur %{user} - node: - download: "%{download_xml_link}, %{view_history_link} of %{edit_link}" - download_xml: Laai XML af - edit: wysig - node: Node - node_title: "Node: %{node_name}" - view_history: wys geskiedenis - node_details: - coordinates: "Koördinate:" - part_of: "Deel af:" - node_history: - download: "%{download_xml_link} of %{view_details_link}" - download_xml: Laai XML af - node_history: Nodegeskiedenis - node_history_title: "Nodegeskiedenis: %{node_name}" - view_details: besigtig besonderhede not_found: sorry: Jammer, %{type} %{id} kan nie gevind word nie. type: @@ -114,95 +67,25 @@ af: node: node relation: relasie way: weg - paging_nav: - of: van - showing_page: Bladsy - relation: - download: "%{download_xml_link} of %{view_history_link}" - download_xml: Laai XML af - view_history: wys geskiedenis - relation_details: - members: "Lede:" - part_of: "Deel van:" - relation_history: - download: "%{download_xml_link} of %{view_details_link}" - download_xml: Laai XML af - relation_history: Relasiegeskiedenis - relation_history_title: "Relasie Geskiedenis: %{relation_name}" - view_details: besigtig besonderhede relation_member: entry_role: "%{type} %{name} as %{role}" type: node: Node relation: Relasie way: Weg - start: - manually_select: Kies 'n ander gebied handmatig - view_data: Wys data vir die huidige kaart start_rjs: - data_frame_title: Gegewens - data_layer_name: Data - details: Details - drag_a_box: Trek 'n boks op die kaart om 'n gebied te kies - edited_by_user_at_timestamp: Verander deur [[user]] om [[timestamp]] - history_for_feature: Geskiedenis van [[feature]] load_data: Laai data - loaded_an_area_with_num_features: Hierdie area het [[num_features]] items. Party webblaaiers mag stadig raak wanneer hulle om soveel data te vertoon. Om nietemin aan te gaan, kies die skakel hier onder. loading: Laai... - manually_select: Kies 'n ander gebied handmatig - object_list: - api: Verkry die data van hierdie gebied - back: Vertoon objeklys - details: Besonderhede - heading: Objeklys - history: - type: - node: Node [[id]] - way: Weg [[id]] - selected: - type: - node: Node [[id]] - way: Weg [[id]] - type: - node: Node - way: Weg - private_user: private gebruiker - show_history: Wys Geskiedenis - unable_to_load_size: Aflaai van data onmoontlik. Area van grootte [[bbox_size]] is te groot. Moet kleiner as %{max_bbox_size} wees - wait: Wag asseblief... - zoom_or_select: Zoom in of kies 'n gebied op die kaart om te besigtig tag_details: tags: "Etikette:" timeout: sorry: Jammer, dit het te lank geneem om data vir die %{type} met die id %{id} op te soek. type: node: node - way: - download: "%{download_xml_link}, %{view_history_link} of %{edit_link}" - download_xml: Laai XML af - edit: wysig - view_history: besigtig geskiedenis - way: Weg - way_title: "Weg: %{way_name}" - way_details: - also_part_of: - one: ook deel van weg %{related_ways} - other: ook deel van weë %{related_ways} - nodes: "Nodes:" - part_of: "Deel van:" - way_history: - download: "%{download_xml_link} of %{view_details_link}" - download_xml: Laai XML af - view_details: besigtig besonderhede - way_history: Weggeskiedenis - way_history_title: "Weggeskiedenis: %{way_name}" changeset: changeset: anonymous: Anoniem - big_area: (groot) - no_comment: (geen) no_edits: (geen wysigings) - still_editing: (steeds besig met wysiging) changeset_paging_nav: next: Volgende » previous: » Vorige @@ -213,9 +96,9 @@ af: id: ID saved_at: Gestoor op user: Gebruiker - list: - description: Onlangse wysigings diary_entry: + comments: + when: Wanneer diary_comment: comment_from: Kommentaar van %{link_user} op %{comment_created_at} confirm: Bevestig @@ -273,7 +156,7 @@ af: title: Die opgevraagde dagboekinskrywing bestaan nie view: leave_a_comment: Los opmerking agter - login: Teken in + login: Meld aan login_to_leave_a_comment: U moet eers %{login_link} alvorens u kommentaar kan lewer save_button: Stoor title: "%{user} se dagboek | %{title}" @@ -297,28 +180,15 @@ af: osm_xml_data: OpenStreetMap XML-data output: Afvoer scale: Skaal - too_large: - heading: Gebied te groot zoom: Zoom - start_rjs: - add_marker: Plaas 'n merker op die kaart - change_marker: Verander posisie van merker - click_add_marker: Kliek op die kaart om 'n merker te plaas - drag_a_box: Trek 'n boks op die kaart om 'n gebied te kies - export: Eksporteer - manually_select: Kies 'n ander gebied handmatig - view_larger_map: Wys groter kaart geocoder: description: title: geonames: Ligging vanaf GeoNames - osm_namefinder: "%{types} vanaf OpenStreetMap Namefinder" types: cities: Stede places: Plekke towns: Dorpe - description_osm_namefinder: - prefix: "%{distance} %{direction} van %{type}" direction: east: oos north: noord @@ -340,12 +210,8 @@ af: ca_postcode: Resultate vanaf Geocoder.CA geonames: Resultate vanaf GeoNames latlon: Resultate vanaf intern - osm_namefinder: Resultate vanaf OpenStreetMap Namefinder uk_postcode: Resultate vanaf NPEMap / FreeThe Postcode us_postcode: Resultate vanaf Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} van %{parentname})" - suffix_place: ", %{distance} %{direction} van %{placename}" search_osm_nominatim: prefix: amenity: @@ -706,33 +572,20 @@ af: map: base: cycle_map: Fietskaart - site: - edit_zoom_alert: u moet in zoom om die kaart te wysig - history_zoom_alert: U moet in zoom om die kaart se wysigingsgeskiedenis te sien layouts: copyright: Outeursreg & lisensie donate: Ondersteun OpenStreetMap deur aan die Hardeware Opgradeer-fonds te %{link}. - donate_link_text: skenk edit: Wysig export: Eksporteer - export_tooltip: Eksporteer kaartdata gps_traces: GPS-spore gps_traces_tooltip: Beheer GPS-spore history: Geskiedenis home: tuis - home_tooltip: Gaan na tuisligging - inbox: inboks (%{count}) - inbox_tooltip: - one: U inboks bevat 1 ongeleesde boodskap - other: U inboks bevat %{count} ongeleesde boodskappe - zero: U inboks bevat geen ongelees boodskappe nie - intro_1: OpenStreetMap is 'n vry bewerkbare kaart van die hele wêreld. Dit word deur mense soos u geskep. - log_in: Teken in + log_in: meld aan log_in_tooltip: Teken aan met 'n bestaande rekening logo: alt_text: OpenStreetMap-logo - logout: teken uit - logout_tooltip: Teken uit + logout: teken af make_a_donation: text: Maak 'n donasie title: Ondersteun OpenStreetMap met'n geldelike donasie @@ -742,10 +595,6 @@ af: tag_line: Die vrye wiki-wêreldkaart user_diaries: Gebruikersdagboeke user_diaries_tooltip: Wys gebruikersdagboeke - view: Wys - view_tooltip: Wys die kaart - welcome_user: Welkom, %{user_link} - welcome_user_link_tooltip: U gebruikersblad license_page: foreign: title: Oor hierdie vertaling @@ -791,11 +640,8 @@ af: title: Gestuur to: Aan read: - back_to_inbox: Terug na inboks - back_to_outbox: Terug na uitboks date: Datum from: Van - reading_your_messages: Besig om u boodskappe te lees reply_button: Antwoord subject: Onderwerp title: Lees boodskap @@ -815,7 +661,6 @@ af: hopefully_you: Iemand (hopelik u) wil graag sy e-posadres op %{server_url} verander na %{new_address}. email_confirm_plain: greeting: Hallo, - hopefully_you_2: "%{server_url} na %{new_address}." friend_notification: subject: "[OpenStreetMap] %{user} het u as 'n vriend bygevoeg" gpx_notification: @@ -833,31 +678,10 @@ af: lost_password_plain: click_the_link: As dit u is, kliek op die onderstaande skakel om die wagwoord te herstel. greeting: Hallo, - hopefully_you_1: Iemand (waarskynlik u) het gevra om die wagwoord te herstel vir - hopefully_you_2: die gebruiker met die e-posadresse op openstreetmap.org. message_notification: - footer1: U kan ook die boodskap by %{readurl} lees - footer2: en u kan antwoord by %{replyurl} hi: Hallo %{to_user}, signup_confirm: subject: "[OpenStreetMap] Bevestig u e-posadres" - signup_confirm_html: - get_reading: Lees meer oor OpenStreetMap op die wiki of die opengeodata-blog waar u ook na podgooie kan luister! - greeting: Hallo daar! - hopefully_you: Iemand (hopelik u) wil graag 'n rekening skep op - introductory_video: U kan na 'n %{introductory_video_link} kyk. - more_videos: Daar is %{more_videos_link}. - more_videos_here: meer video's hier - video_to_openstreetmap: inleidende video oor OpenStreetMap - signup_confirm_plain: - click_the_link_1: As dit u is, welkom! Kliek asseblief op die onderstaande skakel om u rekening te bevestig - current_user_2: "is beskikbaar op:" - greeting: Hallo daar! - more_videos: "Daar is meer videos hier:" - the_wiki: "Lees meer oor OpenStreetMap op die wiki:" - user_wiki_1: Ons beveel aan dat u 'n gebruikersblad op die wiki skep met onder andere - user_wiki_2: kategorie-etikette wat aandui waar u woon, soos [[Category:Users_in_Pretoria]]. - wiki_signup: "U kan ook op die OpenStreetMap-wiki registreer by:" oauth: oauthorize: allow_read_prefs: u gebruikersvoorkeure te lees. @@ -900,14 +724,9 @@ af: anon_edits_link_text: Lees waarom dit die geval is. user_page_link: gebruikersbladsy index: - license: - license_name: Creative Commons Naamsvermelding 2.0 - notice: Gelisensieer onder die %{license_name} lisensie deur die %{project_name} en sy bydraers. - project_name: OpenStreetMap-projek permalink: Permanente skakel shortlink: Kort skakel key: - map_key: Sleutel table: entry: admin: Administratiewe grens @@ -975,7 +794,6 @@ af: wood: Bos search: search: Soek - search_help: "voorbeelde: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' meer voorbeelde..." submit_text: OK where_am_i: Waar is ek? sidebar: @@ -1043,8 +861,6 @@ af: trace_optionals: tags: Etikette trace_paging_nav: - next: Volgende » - previous: » Vorige showing_page: Bladsy %{page} view: delete_track: Verwyder hierdie spoor @@ -1110,18 +926,18 @@ af: summary_no_ip: "%{name} geskep op %{date}" title: Gebruikers login: - auth failure: Jammer, kon nie met hierdie inligting aanteken nie. + auth failure: Jammer, kon nie met hierdie inligting aanmeld nie. email or username: "E-posadres of gebruikersnaam:" - heading: Teken in - login_button: Teken in + heading: Meld aan + login_button: Meld aan lost password link: Wagwoord vergeet? password: "Wagwoord:" remember: "Onthou my:" - title: Teken in + title: Meld aan logout: heading: Teken van OpenStreetMap af - logout_button: Teken uit - title: Teken uit + logout_button: Teken af + title: Teken af lost_password: email address: "E-posadres:" heading: Wagwoord vergeet? @@ -1138,9 +954,6 @@ af: continue: Gaan voort display name: "Vertoon naam:" email address: "E-posadres:" - fill_form: Vul die vorm in en ons stuur so spoedig moontlik aan u 'n e-pos om u rekening te aktiveer. - flash create success message: U rekening is suksesvol geskep. Kontroleer u e-pos vir 'n bevestigingsboodskap.

    Let daarop dat u nie sal kan aanteken alvorens u nie u rekening bevestig het nie.

    As u 'n spamfilter gebruik, sorg asseblief dat dit boodskappe vanaf webmaster@openstreetmap.org sal toelaat. Die stelsel stuur nie antwoorde op bevestigings-epos nie. - heading: Skep 'n rekening license_agreement: Deur 'n rekening hier te skep bevestig u dat u akkoord gaan met voorwaarde dat al die werk wat u na OpenStreetMap oplaai onder die Creative Commons-lisensie (by-sa) gelisensieer word (nie-eksklusief). not displayed publicly: Word nie publiek vertoon nie (sien geheimhoudingbeleid) password: "Wagwoord:" @@ -1249,7 +1062,7 @@ af: helper: time_future: Verval oor %{time}. time_past: Het %{time} gelede verval. - until_login: Aktief totdat die gebruiker inteken. + until_login: Aktief totdat die gebruiker aanmeld. index: empty: Daar is nog geen blokkades ingestel nie. heading: Lys van gebruikersblokkades @@ -1284,7 +1097,7 @@ af: confirm: Is u seker? edit: Wysig heading: "%{block_on} geblokkeer deur %{block_by}" - needs_view: Die gebruiker moet aanteken alvorens hierdie blokkade verwyder sal word. + needs_view: Die gebruiker moet aanmeld alvorens hierdie blokkade verwyder sal word. reason: "Rede vir blokkade:" revoke: Terugtrek revoker: "Teruggetrek deur:" diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 5a2e808a9a8..d6ac17cf642 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -9,6 +9,8 @@ # Author: Heroid # Author: Mdupont # Author: MicroBoy +# Author: Nemo bis +# Author: 아라 aln: activerecord: attributes: @@ -85,76 +87,15 @@ aln: blocked: qasja juaj në API është bllokuar. Ju lutemi të log-in për ndërfaqe web për të mësuar më shumë. browse: changeset: - changeset: "Ndryshim: %{id}" changesetxml: Ndryshim en XML - download: Shkarkone %{changeset_xml_link} ose %{osmchange_xml_link} feed: title: Ndryshim %{id} title_comment: Ndryshimi %{id} - %{comment} osmchangexml: Ndryshim i OSM-s en XML title: Ndryshim - changeset_details: - belongs_to: "I përket:" - bounding_box: "Baroka e Rrethume:" - box: kutia - closed_at: "U mshel në:" - created_at: "U krijue en:" - has_nodes: - other: one= - has_relations: - one: "Ka pas %{count} lidhje:" - other: "Ka pas marrëdhënieve %{count} :" - has_ways: - other: one= - no_bounding_box: Nuk ka barok qe osht kon vnu n'kto ndrryshime. - show_area_box: Tregoje kutinë e fushës - common_details: - changeset_comment: "Komenti :" - edited_at: "U ndryshu en:" - edited_by: "U ndryshue pej:" - in_changeset: "En ndryshimin :" - version: "Verzioni:" containing_relation: entry: Lidhja %{relation_name} entry_role: Lidhja %{relation_name} (sikur %{relation_role}) - map: - deleted: U shlye - larger: - area: Kqyre zonën n'hartë ma t'madhe - node: Kqyre pikën n'hartë ma t'madhe - relation: Kqyre lidhjen n'hartë ma t'madhe - way: Kqyre udhën n'hartë ma t'madhe - loading: Tu u ngarkue... - navigation: - all: - next_changeset_tooltip: Tjerat ndryshime - next_node_tooltip: Pika tjetēr - next_relation_tooltip: Lidhja e ardhshme - next_way_tooltip: Rruga tjeter - prev_changeset_tooltip: Ndryshimi kalum - prev_node_tooltip: Pika e kalume - prev_relation_tooltip: Lidhja e kalume - prev_way_tooltip: Mnyra e mahershme - user: - name_changeset_tooltip: Kshyri ndryshimet prej %{user} - next_changeset_tooltip: Tjetri ndryshim prej %{user} - prev_changeset_tooltip: Ndryshimi i ma hershēm prej %{user} - node: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" - download_xml: Merre me XML - edit: ndrro - node: Nyje - node_title: "Nyja: %{node_name}" - view_history: kqyre historinë - node_details: - coordinates: "Koordinatat:" - part_of: "Pjesë e:" - node_history: - download: "%{download_xml_link} ose %{view_details_link}" - download_xml: Merre me XML - node_history: Historia e Pikës - node_history_title: "Historia e Pikës: %{node_name}" - view_details: kqyri detajet not_found: sorry: Na vjen keq, %{type} me ID %{id}, nuk mujti me u gjetë. type: @@ -162,65 +103,15 @@ aln: node: pikë relation: lidhje way: udhë - paging_nav: - of: pi - showing_page: Tu e tregue faqen - relation: - download: "%{download_xml_link} ose %{view_history_link}" - download_xml: Shkarkoje XML - relation: Lidhja - relation_title: "Lidhja: %{relation_name}" - view_history: Kshyre historinë - relation_details: - members: "Anëtarët:" - part_of: "Pjesë e:" - relation_history: - download: "%{download_xml_link} ose %{view_details_link}" - download_xml: Merre me XML - relation_history: Historia e Lidhjes - relation_history_title: "Historia e Lidhjes: %{relation_name}" - view_details: kqyri detajet relation_member: entry_role: "%{type} %{name} asht si %{role}" type: node: Nyje relation: Lidhje way: Udhë - start: - manually_select: Manualisht zgedh ni zon qetër - view_data: Shini te dhanat per harten e tanishme start_rjs: - data_frame_title: Te dhanunat - data_layer_name: Të dhanunat - details: Detajet - drag_a_box: Tërhjeke nji kuti n'hartë për me e zgjedhë zonën - edited_by_user_at_timestamp: E ka ndryshue [[user]] në [[timestamp]] - history_for_feature: Historia për [[feature]] load_data: Ngarkoji të dhanunat - loaded_an_area_with_num_features: "Ti e ke marrë ni zonë që ka [[num_features]] . E do browsera nuk e qesin fort mirë kualitetin e t'dhanunave me ta. Browseri duhet me i kallxue ma pak se 100 t'dhanuna në t'njejtin vakt: me bo diqka tjetër munet me ta ngadalsue browserin. Nëse je i/e sigurtë, nësë don mi pa t'dhanunat, duhesh me klikue ktë pullë." loading: Tu u ngarkue... - manually_select: Zgjidhe nji fushë tjetër - object_list: - api: Rimerre ktë zonë prej API - back: Kqyre listën e t'dhanunave - details: Detajet - heading: Lista e t'dhanunave - history: - type: - node: Pika [[id]] - way: Udha [[id]] - selected: - type: - node: Pika [[id]] - way: Rruga [[id]] - type: - node: Pikë - way: Udhë - private_user: Përdorues privat - show_history: Kqyre Historinë - unable_to_load_size: "Nuk kemi muejt me e shfaqë: madhësinë e kutisë [[bbox_size]] asht shum e madhe (duhet me kenë ma e vogël se %{max_bbox_size})" - wait: Pritni... - zoom_or_select: Afroje ose zgedhe zonën n'hartë qe po don me e pa. tag_details: tags: "Etiketat:" wiki_link: @@ -234,33 +125,10 @@ aln: node: pikë relation: lidhje way: rrugë - way: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" - download_xml: Shkarko XML - edit: ndrro - view_history: kqyre historine - way: Udhë - way_title: "Udhë: %{way_name}" - way_details: - also_part_of: - one: edhe kjo asht pjes e udhës %{related_ways} - other: edhe kjo asht pjes e udhëve %{related_ways} - nodes: "Nyjet:" - part_of: "Pjesë e:" - way_history: - download: "%{download_xml_link} ose %{view_details_link}" - download_xml: Merre me XML - view_details: kqyre n'detaje - way_history: Historia e Udhës - way_history_title: "Historia e udhës: %{way_name}" changeset: changeset: anonymous: Anonim - big_area: (I madh) - no_comment: (Asnjë) no_edits: (Nuk ka redaktimet) - show_area_box: Kqyre Zonen e Barokes - still_editing: (hala tu ndryshu) view_changeset_details: Shikoni detajet changeset changeset_paging_nav: next: Tjetra » @@ -273,18 +141,8 @@ aln: saved_at: Ruhen në user: Përdorues list: - description: Ndryshimet ma të fundit - description_bbox: Changesets brenda %{bbox} - description_user: Changesets nga %{user} - description_user_bbox: Changesets nga %{user} në %{bbox} - heading: Changesets - heading_bbox: Changesets - heading_user: Changesets - heading_user_bbox: Changesets title: Changesets - title_bbox: Changesets brenda %{bbox} title_user: Changesets nga %{user} - title_user_bbox: Changesets nga %{user} në %{bbox} diary_entry: diary_comment: comment_from: Komenti prej %{link_user} në %{comment_created_at} @@ -370,28 +228,16 @@ aln: scale: Shkallë too_large: body: Kjo zonë është shum e madhe që të eksportohet si XML në OpenStreetMap. Të lutna afroje ma ngat ose mere një zonë ma të vogel. - heading: Zona shumë e madhe zoom: Zmadho - start_rjs: - add_marker: Shto ni isharet ne hart - change_marker: Ndrysho poziten e isharetit - click_add_marker: Kliko ne hart per me shenu ni isharet. - drag_a_box: Kape ni kuti në hart për me qit te zona e selektume - export: Eksporto - manually_select: Manualisht zgedhe ni zon t'ndryshme - view_larger_map: Shihe Hartën Ma t'Madhe geocoder: description: title: geonames: Lokacioni prej GeoNames - osm_namefinder: "%{types} prej OpenStreetMap Namefinder" osm_nominatim: Lokacioni prej OpenStreetMap Nominatim types: cities: Qytetet places: Places towns: Qytetet - description_osm_namefinder: - prefix: "%{distance} %{direction} e %{type}" direction: east: lindja north: veriu @@ -413,13 +259,9 @@ aln: ca_postcode: Rezultatet prej Geocoder.CA geonames: Rezultatet prej GeoNames latlon: Rezultatet prej Internal - osm_namefinder: Rezultatet prej OpenStreetMap Namefinder osm_nominatim: Rezultatet prej OpenStreetMap Nominatim uk_postcode: Rezultatet prej NPEMap / FreeThe Postcode us_postcode: Rezultatet prej Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} prej %{parentname})" - suffix_place: ", %{distance} %{direction} prej %{placename}" search_osm_nominatim: prefix: amenity: @@ -825,36 +667,20 @@ aln: site: edit_disabled_tooltip: Zoom në hartë për të redaktuar edit_tooltip: Edit Harta - edit_zoom_alert: Ju duhet zoom në të redaktoni hartën - history_disabled_tooltip: Zoom në për të parë redaktimet për këtë zonë - history_tooltip: Shiko redaktimet për këtë zonë - history_zoom_alert: Ju duhet zoom in për të parë redaktimet për këtë zonë layouts: copyright: Copyright & License donate: OpenStreetMap Mbështetja nga %{link} në Fondin Hardware Upgrade. - donate_link_text: dhuruar edit: Ndrysho export: Eksport - export_tooltip: Harta dhënat Eksporti gps_traces: GPS Gjurmët gps_traces_tooltip: Manage gjurmë GPS history: Historia home: shtëpi - home_tooltip: Shkoni në shtëpi vend - inbox: postë (%{count}) - inbox_tooltip: - one: Kutia jote ka 1 mesazh të palexume - other: Kutia jote ka %{count} mesazhe të palexume - zero: Kutia jote nuk ka asnjë mesazh të palexume - intro_1: OpenStreetMap është një hartë e lirë editable e tërë botës. Kjo është bërë nga njerëzit si ju. - license: - title: Të dhënat OpenStreetMap është i liçensuar nën Creative Commons Attribution-Share njësoj License 2,0 Generic log_in: log in log_in_tooltip: Hyni që me një llogari ekzistuese logo: alt_text: logo e OpenStreetMap logout: logout - logout_tooltip: Log out make_a_donation: text: Bëni një donacion title: OpenStreetMap Mbështetje me një donacion monetar @@ -865,19 +691,30 @@ aln: tag_line: Free Harta Wiki Botërore user_diaries: Përdoruesi Diaries user_diaries_tooltip: përdorues ditaret Shiko - view: Kshyr - view_tooltip: Kshyre hartën - welcome_user: Mirë se erdhe, %{user_link} - welcome_user_link_tooltip: përdorues juaj faqe license_page: foreign: english_link: origjinal anglisht text: Në ni ngjarje të ni konflikti me faqen e përkthyme dhe %{english_original_link}, faqja anglisht ka përparsi title: Rreth kti përkthimi - legal_babble: "

    Copyright

    \n

    \n OpenStreetMap është dhënat e hapur , të licencuar sipas Creative\n Commons Attribution-ShareAlike 2,0 (CC BY-SA).\n\n

    \n Ju jeni të lirë ta kopjoni, shpërndani, përcjell dhe përshtatur hartat tona\n dhe të dhënat, për aq kohë sa ju e kreditit OpenStreetMap e saj\n kontribuesve. Nëse ju ndryshoni ose me ndërtimin e hartave tona ose të dhëna, ju\n mund të shpërndani rezultat vetëm në bazë të licencës të njëjtën.\n ligjore\n shpjegon të drejtat tuaja dhe të përgjegjësive.\n\n\n>

    Si të kreditit OpenStreetMap \n Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që\n kreditit tuaj lexon të paktën \"© OpenStreetMap\n kontribuesit, CC BY-SA \". Nëse jeni duke përdorur të dhëna vetëm në hartë,\n ne kerkojme \"Organizimi i të dhënave © kontribuesit OpenStreetMap,\n CC BY-SA \".\n\n

    \n Ku të jetë e mundur, duhet të jetë OpenStreetMap hyperlinked në http://www.openstreetmap.org/ \n dhe CC BY-SA për http://creativecommons.org/licenses/by-sa/2.0/ . Nëse\n ju jeni duke përdorur një të mesme, ku lidhjet nuk janë të mundshme (p.sh. një\n shtypura punë), ne ju sugjerojmë lexuesit tuaj të drejtpërdrejtë të\n www.openstreetmap.org (ndoshta duke zgjeruar\n 'OpenStreetMap' në këtë adresë të plotë) dhe të\n www.creativecommons.org.\n\n\n

    Gjetja \n

    \n Lexo më shumë lidhje me përdorimin e të dhënave tona në Ligjore\n FAQ .\n\n

    \n OSM janë kontribuesit kujtoi kurrë për të shtuar të dhënat nga ndonjë\n Burime copyright (p.sh. Google Maps apo të shtypura harta) pa\n lejen shprehimisht nga mbajtësit të drejtën e autorit.\n\n

    \n Edhe pse OpenStreetMap është e hapur të dhëna, ne nuk mund të sigurojë një\n pa-e-ngarkuar hartë API për zhvilluesit e palëve të treta.\n\n Shiko tonë API Perdorimi Politika ,\n tjegull Perdorimi Politika \n dhe Nominatim Perdorimi Politika .\n\n\n

    kontribuesit tona \n

    \n licencë CC BY-SA jonë kërkon që ju të \"japin origjinal\n Author kredi të arsyeshme për të mesëm ose të thotë Ti je\n shfrytëzuar \". Individuale mappers OSM nuk kërkojnë një\n kreditit mbi dhe më lart që të \"OpenStreetMap\n kontribuesit \", por kur të dhënat nga një hartës kombëtare\n agjenci ose burim kryesor ka qenë i përfshirë në\n OpenStreetMap, ai mund të jetë e arsyeshme për kredi nga ana e tyre direkt\n riprodhimin e kreditit e tyre apo duke i lidhur me të në këtë faqe.\n\n\n\n\nid=\"contributors\"> Australi : Përmban të dhëna të bazuara periferi\n në Zyra Australiane e Statistikave të dhënave. \n

  • Kanada : Përmban të dhëna nga\n GeoBase ®, GeoGratis (© Departamenti i Natyrore\n Burimet Kanada), CanVec (Departamenti i Natyrore ©\n Burimet Kanada), dhe StatCan (Divizioni Gjeografia,\n Statistika Kanada). \n
  • Zelanda e Re : Përmban të dhëna me burim nga\n Zelanda e Re Toka e informacionit. Crown Copyright rezervuara. \n
  • Mbretëria e Bashkuar : Përmban të pajisjeve\n Anketa të dhënat © Crown copyright bazës së të dhënave dhe të drejtë\n 2010. \n Ul\n\n

    \n Përfshirja e të dhënave në OpenStreetMap nuk do të thotë që origjinal\n dhënave miraton ofrues OpenStreetMap, ofron çdo garanci ose\n pranon ndonjë përgjegjësi.\n" + legal_babble: + contributors_ca_html: " Kanada : Përmban të dhëna nga\n GeoBase ®, GeoGratis (© Departamenti i Natyrore\n Burimet Kanada), CanVec (Departamenti i Natyrore ©\n Burimet Kanada), dhe StatCan (Divizioni Gjeografia,\n Statistika Kanada)." + contributors_footer_2_html: " Përfshirja e të dhënave në OpenStreetMap nuk do të thotë që origjinal\n dhënave miraton ofrues OpenStreetMap, ofron çdo garanci ose\n pranon ndonjë përgjegjësi." + contributors_gb_html: " Mbretëria e Bashkuar : Përmban të pajisjeve\n Anketa të dhënat © Crown copyright bazës së të dhënave dhe të drejtë\n 2010." + contributors_intro_html: "licencë CC BY-SA jonë kërkon që ju të \"japin origjinal\n Author kredi të arsyeshme për të mesëm ose të thotë Ti je\n shfrytëzuar \". Individuale mappers OSM nuk kërkojnë një\n kreditit mbi dhe më lart që të \"OpenStreetMap\n kontribuesit \", por kur të dhënat nga një hartës kombëtare\n agjenci ose burim kryesor ka qenë i përfshirë në\n OpenStreetMap, ai mund të jetë e arsyeshme për kredi nga ana e tyre direkt\n riprodhimin e kreditit e tyre apo duke i lidhur me të në këtë faqe." + contributors_nz_html: " Zelanda e Re : Përmban të dhëna me burim nga\n Zelanda e Re Toka e informacionit. Crown Copyright rezervuara." + contributors_title_html: kontribuesit tona + credit_1_html: "Nëse jeni duke përdorur harta imazhe OpenStreetMap, ne kërkojmë që\n kreditit tuaj lexon të paktën \"© OpenStreetMap\n kontribuesit, CC BY-SA \". Nëse jeni duke përdorur të dhëna vetëm në hartë,\n ne kerkojme \"Organizimi i të dhënave © kontribuesit OpenStreetMap,\n CC BY-SA \"." + credit_2_html: "Ku të jetë e mundur, duhet të jetë OpenStreetMap hyperlinked në http://www.openstreetmap.org/ \n dhe CC BY-SA për http://creativecommons.org/licenses/by-sa/2.0/ . Nëse\n ju jeni duke përdorur një të mesme, ku lidhjet nuk janë të mundshme (p.sh. një\n shtypura punë), ne ju sugjerojmë lexuesit tuaj të drejtpërdrejtë të\n www.openstreetmap.org (ndoshta duke zgjeruar\n 'OpenStreetMap' në këtë adresë të plotë) dhe të\n www.creativecommons.org." + credit_title_html: Si të kreditit OpenStreetMap + intro_1_html: "OpenStreetMap is open data, licensed under the Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Ju jeni të lirë ta kopjoni, shpërndani, përcjell dhe përshtatur hartat tona\n dhe të dhënat, për aq kohë sa ju e kreditit OpenStreetMap e saj\n kontribuesve. Nëse ju ndryshoni ose me ndërtimin e hartave tona ose të dhëna, ju\n mund të shpërndani rezultat vetëm në bazë të licencës të njëjtën.\n ligjore\n shpjegon të drejtat tuaja dhe të përgjegjësive." + more_1_html: "Lexo më shumë lidhje me përdorimin e të dhënave tona në Ligjore\n FAQ ." + more_2_html: "OSM janë kontribuesit kujtoi kurrë për të shtuar të dhënat nga ndonjë\n Burime copyright (p.sh. Google Maps apo të shtypura harta) pa\n lejen shprehimisht nga mbajtësit të drejtën e autorit." + more_title_html: Gjetja më shumë + title_html: Copyright native: mapping_link: fillo hartografimin - native_link: THIS_LANGUAGE_NAME_HERE verzion + native_link: Gegë verzion text: Ju jeni tu e kshyr versionin në gjuhën shqipe të faqes së autorit. Ju muni me shku në %{native_link} të kësaj faqe, ose ju muni mos me lexu në lidhje me të drejtën e autorit dhe %{mapping_link} title: Rreth ksaj faqeje message: @@ -924,12 +761,8 @@ aln: title: Dalje to: Te read: - back_to_inbox: Kthehu në postë - back_to_outbox: Kthehu në Dalje date: Data from: Prej - reading_your_messages: Tu i lexu mesazhet e tua - reading_your_sent_messages: Tu i lexue mesazhet e dërgume reply_button: Përgjigju subject: Titulli title: Lexo mesazhin @@ -955,8 +788,6 @@ aln: email_confirm_plain: click_the_link: Nëse ky je ti, ju lutem trusni lidhjen e mëposhtme për me konfirmu ndryshimin. greeting: Tung, - hopefully_you_1: Dikush (shpresojmë se ju), do të doja të ndryshuar adresën e tyre të gjatë në adresën - hopefully_you_2: "%{server_url} në %{new_address}." friend_notification: befriend_them: Ju muni gjithashtu me i shtu ata si shokë tek %{befriendurl}. had_added_you: "%{user} ju ka shtu juve si një shok në OpenStreetMap." @@ -985,42 +816,11 @@ aln: lost_password_plain: click_the_link: Nëse kjo është që ju, ju lutemi klikoni lidhjen më poshtë për të rivendosni fjalëkalimin tuaj. greeting: Tung, - hopefully_you_1: Dikush (ndoshta ju) ka kërkuar për fjalëkalimin që të rishkruhet në këtë - hopefully_you_2: email adresa openstreetmap.org llogari. message_notification: - footer1: Ju gjithashtu mund të lexoni mesazhet në %{readurl} - footer2: dhe ju muni me ju përgjigj tek %{replyurl} header: "%{from_user} ju ka dërgu një mesazh përmes OpenStreetMap me titullin %{subject}:" hi: Tung %{to_user}, signup_confirm: subject: "[OpenStreetMap] Konfirmoje email adresën tonde" - signup_confirm_html: - click_the_link: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu atë llogari dhe lexoni ma shumë informata rreth OpenStreetMap - current_user: "Lista e përdoruesve të tanishëm në kategori, në bazë të në botë ku ata janë, është në dispozicion nga Kategoria: Users_by_geographical_region ." - get_reading: Get lexuar në lidhje me OpenStreetMap në wiki , të arrijë me të rejat e fundit nëpërmjet blog OpenStreetMap ose Twitter , ose të kërkoni nëpër OpenStreetMap themeluesit Steve Bregu OpenGeoData blog për historinë në vazo të projektit, e cila ka podcast për të dëgjuar gjithashtu! - greeting: Hi there! - hopefully_you: Dikush (shpresojmë se ju), do të doja të krijuar një llogari të gjatë në - introductory_video: Ju muni me shiku një %{introductory_video_link}. - more_videos: Ka %{more_videos_link}. - more_videos_here: ma shumë video këtu - user_wiki_page: "Është e rekomanduar që ju të krijoni një përdorues faqe wiki, i cili përfshin tags kategori duke vënë në dukje se ku je, si për shembull [[Category: Users_in_London]] ." - video_to_openstreetmap: video e prezantimit të OpenStreetMap - wiki_signup: Ju mund të dëshironi të regjistroheni në OpenStreetMap wiki. - signup_confirm_plain: - blog_and_twitter: "Njoftohu me lajmet ma të fundit nëpërmjet blogut të OpenStreetMap ose Twitter-it:" - click_the_link_1: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu - click_the_link_2: llogarin tonde dhe lexo ma shumë informata për OpenStreetMap. - current_user_1: Lista e përdoruesve të tanishëm në kategori, në bazë të ku në botë - current_user_2: "ata janë, është i vlefshëm nga:" - greeting: Hi there! - hopefully_you: Dikush (shpresojmë se ju), do të doja të krijuar një llogari të gjatë në - introductory_video: "Këtu ju muni me shiku një video hyrëse për në OpenStreetMap:" - more_videos: "Ma shumë video keni këtu:" - opengeodata: "OpenGeoData.org është blog OpenStreetMap themelues Steve Bregu, dhe ajo ka podcast shumë:" - the_wiki: "Lexo n'wiki rreth OpenStreetMap:" - user_wiki_1: Është e rekomanduar që ju të krijoni një përdorues faqe wiki, i cili përfshin - user_wiki_2: "tags kategori duke vënë në dukje se ku je, si për shembull [[Category: Users_in_London]]." - wiki_signup: "Ti munesh gjithashtu me u regjistru në OpenStreetMap wiki:" oauth: oauthorize: allow_read_gpx: lexoni privat tuaj GPS gjurmë. @@ -1099,15 +899,9 @@ aln: index: js_1: Ju jeni tuj e përdor naj shfletues që nuk e përkrah JavaScript, ose ju e keni ndalu JavaScript. js_2: OpenStreetMap përdor Java skriptet për planet e saj të rrëshqitshëm. - license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: E licencume nëpërmjet %{license_name} licenca prej %{project_name} dhe kontribuuesve të tij. - project_name: Projekti OpenStreetMap permalink: Permalink shortlink: Shortlink key: - map_key: Harta kryesor - map_key_tooltip: Harta kyç për mapnik vizatimin në këtë nivel zoom table: entry: admin: kufitare administrative @@ -1176,7 +970,6 @@ aln: wood: Druri search: search: Kërko - search_help: "shembuj: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', ose 'zyrat e postës pranë Lünen' shembuj më shumë ..." submit_text: Shkoj where_am_i: Ku jom une? where_am_i_title: Përshkruje lokacionin e tanishëm tuj e përdor makinën kërkuese @@ -1253,8 +1046,6 @@ aln: trace_optionals: tags: Etiketat trace_paging_nav: - next: Vazhdo » - previous: « Paraprake showing_page: Duke shfaqun faqen %{page} view: delete_track: Fshij kët gjurm @@ -1319,7 +1110,6 @@ aln: button: Konfirmo heading: Konfirmo nje akount te shfrytezuesit press confirm button: Shtype butonin e konfirmimit ma posht që me mujt me aktivizue akountin e juej - success: Akounti juaj u konfirmua, ju falemnderit për regjistrim! confirm_email: button: Konfirmo failure: Ni email adres tashma osht konfirmue me kët token. @@ -1375,9 +1165,6 @@ aln: display name: "Emni i pamshem:" display name description: Emni jot publik. Ju muni me ndrru ma von në preferencat e tua. email address: "Email Adresa:" - fill_form: Plotsoni formularin dhe na do t'ja dergojm ni email për me aktivizu. - flash create success message: Akounti për shfrytëzim u kriju me sukses. Kontrollo emailin tond për konfirmim, dhe ju do t'filloni të hartoni sa hora :-)

    Po kini parasysh se smuni me u kyç pa e konfirmu.

    Nqofse përdorni sistem për antispam siguroni që jemi në listën e bardh webmaster@openstreetmap.org sepse na nuk mundemi me ju dërgu emaila pa u kan nqat list. - heading: Krijo një akount shfrytëzimi license_agreement: Kur e konfirmoni llogarinë tuaj ju duhet ti pranoni kushtet e kontributit. no_auto_account_create: Për momentin spo mujm me ju kriju akount automatikisht. not displayed publicly: Nuk u shfaq publikisht (kshyre privacy policy) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 8bafb5e888f..881af85ff37 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -4,12 +4,16 @@ # Author: Ali1 # Author: Aude # Author: Bassem JARKAS +# Author: Fahad # Author: Grille chompa # Author: Houcinee1 +# Author: Kuwaity26 # Author: Majid Al-Dharrab # Author: Meno25 # Author: Mutarjem horr # Author: OsamaK +# Author: TTMTT +# Author: Zaher kadour # Author: ترجمان05 ar: activerecord: @@ -40,7 +44,7 @@ ar: user: المستخدم visible: ظاهر user: - active: فعال + active: نشط description: الوصف display_name: الاسم الظاهر email: البريد الإلكتروني @@ -83,87 +87,23 @@ ar: application: require_cookies: cookies_needed: يبدو أن الكوكيز عندك معطلة - يرجى تفعيل الكوكيز في متصفحك قبل المتابعة. + require_moderator: + not_a_moderator: عليك أن تكون وسيط لتنفيذ هذا الإجراء setup_user_auth: blocked: لقد تم عرقلة وصولك إلى الـ API. يرجى تسجيل الدخول من صفحة الموقع لمعرفة المزيد. browse: + anonymous: مجهول changeset: - changeset: "حزمة التغييرات: %{id}" changesetxml: حزمة التغييرات إكس إم أل - download: نزّل %{changeset_xml_link} أو %{osmchange_xml_link} feed: title: حزمة التغييرات %{id} title_comment: حزمة التغييرات %{id} - %{comment} title: حزمة التغييرات - changeset_details: - belongs_to: "ينتمي إلى:" - bounding_box: "مربع الإحاطة:" - box: مربّع - closed_at: "أُغلق في:" - created_at: "أُنشئ في:" - has_nodes: - few: "فيه %{count} عقد التالية:" - one: "فيه العقدة التالية:" - other: "فيه %{count} عقدة التالية:" - two: "فيه العقدتين التاليتين:" - has_relations: - few: "فيه %{count} علاقات التالية:" - one: "فيه العلاقة التالية:" - other: "فيه %{count} علاقة التالية:" - two: "فيه العلاقتين التاليتين:" - has_ways: - one: "فيه الطريق التالي:" - other: "فيه %{count} طرق التالية:" - two: "فيه الطريقين التاليين:" - no_bounding_box: لم يتم تخزين مربع الإحاطة لحزمة التغييرات هذه. - show_area_box: اعرض مربع المنطقة - common_details: - changeset_comment: "التعليق:" - deleted_at: "حذف في:" - edited_at: "عُدّل في:" - edited_by: "عُدّل بواسطة:" - in_changeset: "في حزمة التغييرات:" - version: "النسخة:" containing_relation: entry: العلاقة %{relation_name} entry_role: العلاقة %{relation_name} (كــ %{relation_role}) - map: - deleted: تم الحذف - larger: - area: اعرض المنطقة على خريطة أكبر - node: اعرض العقدة على خريطة أكبر - relation: اعرض العلاقة على خريطة أكبر - way: اعرض الطريق على خريطة أكبر - loading: يُحمّل... - navigation: - all: - next_changeset_tooltip: حزمة التغييرات التالية - next_node_tooltip: العقدة التالية - next_relation_tooltip: العلاقة التالية - next_way_tooltip: الطريق التالي - prev_changeset_tooltip: حزمة التغييرات السابقة - prev_node_tooltip: العقدة السابقة - prev_relation_tooltip: العلاقة السابقة - prev_way_tooltip: الطريق السابق - user: - name_changeset_tooltip: شاهد تغييرات المستخدم %{user} - next_changeset_tooltip: التغيير التالي من المستخدم %{user} - prev_changeset_tooltip: آخر تغيير من قبل المستخدم %{user} - node: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" - download_xml: نزّل إكس إم أل - edit: عدّل - node: عقدة - node_title: "عقدة: %{node_name}" - view_history: اعرض التاريخ - node_details: - coordinates: "إحداثيات:" - part_of: "جزء من:" - node_history: - download: "%{download_xml_link} أو %{view_details_link}" - download_xml: نزّل إكس إم أل - node_history: تاريخ العقدة - node_history_title: "تاريخ العقدة: %{node_name}" - view_details: اعرض التفاصيل + location: "الموقع:" + no_comment: (لا تعليق) not_found: sorry: عفوًا، لم يتم العثور على %{type} بالمعرّف %{id}. type: @@ -171,69 +111,28 @@ ar: node: عقدة relation: علاقة way: طريق - paging_nav: - of: من - showing_page: إظهار الصفحة - relation: - download: "%{download_xml_link} أو %{view_history_link}" - download_xml: نزّل إكس إم إل - relation: العلاقة - relation_title: "العلاقة: %{relation_name}" - view_history: اعرض التاريخ - relation_details: - members: "الأعضاء:" - part_of: "جزء من:" - relation_history: - download: "%{download_xml_link} أو %{view_details_link}" - download_xml: نزّل إكس إم أل - relation_history: تاريخ العلاقة - relation_history_title: "تاريخ العلاقة: %{relation_name}" - view_details: اعرض التفاصيل + note: + closed_title: "ملاحظات محلولة: %{note_name}" + open_title: "ملاحظة لم يتم حلها: %{note_name}" + title: ملاحظة + redacted: + redaction: التنقيح %{id} + type: + node: العقدة + relation: علاقة + way: طريق relation_member: entry_role: "%{type} %{name} كــ %{role}" type: node: عقدة relation: علاقة way: طريق - start: - manually_select: اختر يدويًا منطقة أخرى - view_data: أظهر بيانات عرض الخريطة الحالي start_rjs: - data_frame_title: البيانات - data_layer_name: تصفح بيانات الخريطة - details: التفاصيل - drag_a_box: اسحب مربع على الخريطة لاختيار منطقة - edited_by_user_at_timestamp: عُدّل بواسطة [[user]] في [[timestamp]] - hide_areas: إخفاء المناطق - history_for_feature: تاريخ الــ[[feature]] load_data: تحميل البيانات - loaded_an_area_with_num_features: "لقد قمت بتحميل منطقة تحتوي على [[num_features]] ميّزة. بصفة عامّة، بعض المتصفحات قد لا تتوافق بشكل جيد مع عرض هذه الكمية من البيانات. عمومًا، تعمل المتصفحات بشكل أفضل في عرض أقل من 100 ميّزة في وقت واحد: القيام بأي شيء آخر قد يجعل المتصفح بطيء أو لن يستجيب. إن كنت متأكدًا من أنك ترغب في عرض هذه البيانات، يمكنك القيام بذلك عن طريق النقر على الزر أدناه." - loading: يُحمّل... - manually_select: اختر يدويًا منطقة أخرى - object_list: - api: استرد هذه المنطقة من الأي بي أي - back: اعرض لائحة الكائنات - details: التّفاصيل - heading: قائمة الكائنات - history: - type: - node: عقدة [[id]] - way: طريق [[id]] - selected: - type: - node: عقدة [[id]] - way: طريق [[id]] - type: - node: عقدة - way: طريق - private_user: مستخدم الخاص - show_areas: أظهر المناطق - show_history: أظهر التاريخ - unable_to_load_size: "غير قادر على التحميل: حجم مربع الإحاطة [[bbox_size]] كبير جدًا (يجب أن يكون أصغر من %{max_bbox_size})" - wait: انتظر... - zoom_or_select: قم بالتكبير أو اختر منطقة من الخريطة لعرضها + loading: جاري التحميل... tag_details: tags: "الوسوم:" + wikipedia_link: الـ%{page} مقالة على ويكيبيديا timeout: sorry: عذرًا، بيانات %{type} بالمعرّف %{id} استغرقت وقتًا طويلا للاسترداد. type: @@ -241,59 +140,38 @@ ar: node: العقدة relation: العلاقة way: الطريق - way: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" - download_xml: نزّل إكس إم إل - edit: عدّل - view_history: اعرض التاريخ - way: طريق - way_title: "طريق: %{way_name}" - way_details: - also_part_of: - one: أيضًا جزء من الطريق %{related_ways} - other: أيضًا جزء من الطرق %{related_ways} - two: أيضًا جزء من الطريقين %{related_ways} - nodes: "العُقد:" - part_of: "جزء من:" - way_history: - download: "%{download_xml_link} أو %{view_details_link}" - download_xml: نزّل إكس إم إل - view_details: اعرض التفاصيل - way_history: تاريخ الطريق - way_history_title: "تاريخ الطريق: %{way_name}" + version: الإصدار changeset: changeset: anonymous: مجهول - big_area: (كبير) - no_comment: (لا يوجد) no_edits: (لا تعديلات) - show_area_box: اعرض مربع المنطقة - still_editing: (لا يزال يعدّل) view_changeset_details: اعرض تفاصيل حزمة التغييرات changeset_paging_nav: next: التالي » previous: «السابق - showing_page: إظهار الصفحة %{page} + showing_page: الصفحة %{page} changesets: area: منطقة comment: التعليق - id: المعرّف + id: رقم saved_at: حُفظ في user: المستخدم list: - description: التغييرات الحديثة - description_bbox: حزم التغييرات داخل %{bbox} - description_user: حزم التغييرات بواسطة %{user} - description_user_bbox: حزم التغييرات بواسطة %{user} داخل %{bbox} - heading: حزم التغييرات - heading_bbox: حزم التغييرات - heading_user: حزم التغييرات - heading_user_bbox: حزم التغييرات title: حزم التغييرات - title_bbox: حزم التغييرات داخل %{bbox} + title_friend: حزم التغييرات بواسطة أصدقائك + title_nearby: تغييرات من قبل مستخدمين قريبين title_user: حزم التغييرات بواسطة %{user} - title_user_bbox: حزم التغييرات بواسطة %{user} داخل %{bbox} + timeout: + sorry: عذراً، لقد إستمرت لائحة حزم التغييرات اللتي طلبتها وقتاً طويلاً للسحب. diary_entry: + comments: + ago: "%{ago} سابقاً" + comment: التعليق + has_commented_on: "%{display_name} علّق على مدخلات اليومية التالية" + newer_comments: التعليقات الجديدة + older_comments: التعليقات القديمة + post: إرسال + when: متى diary_comment: comment_from: تعليق من %{link_user} في %{comment_created_at} confirm: أكّد @@ -339,11 +217,13 @@ ar: newer_entries: المدخلات الأحدث no_entries: لا يوجد مدخلات يومية older_entries: المدخلات الأقدم - recent_entries: "المدخلات اليومية الحديثة:" + recent_entries: إدخالات يوميات الحديثة title: يوميات المستخدمين + title_friends: يوميات الأصدقاء + title_nearby: يوميات/مفكرات المستخدمين في المقبرة user_title: يومية %{user} location: - edit: عدّل + edit: تعديل location: "الموقع:" view: اعرض new: @@ -354,12 +234,19 @@ ar: title: مدخلة يومية غير موجودة view: leave_a_comment: اترك تعليقًا - login: سجّل دخول + login: تسجيل الدخول login_to_leave_a_comment: "%{login_link} لترك تعليق" save_button: احفظ title: يوميات %{user} | %{title} user_title: يومية %{user} editor: + default: الغيابي (حالياً %{name}) + potlatch: + description: Potlatch 1 (محرّر ضمن المتصفح) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (محرّر ضمن المتصفح) + name: Potlatch 2 remote: description: تحكم عن بعد (JOSM أو Merkaartor) name: تحكم عن بعد @@ -369,7 +256,7 @@ ar: area_to_export: المنطقة المطلوب تصديرها embeddable_html: HTML مضمن export_button: صدِّر - export_details: بيانات خريطة الشارع المفتوحة مرخصة تحت رخصة المشاع الإبداعي، النسبة، نسخة 2.0. + export_details: بيانات خريطة الشارع المفتوحة مرخصة تحت رخصة قاعدة البيانات المفتوحة المشاعة . format: الهيئة format_to_export: الهيئة المطلوب تصديرها image_size: حجم الصورة @@ -377,6 +264,7 @@ ar: licence: الرخصة longitude: "خط الطول:" manually_select: اختر يدويًا منطقة أخرى + map_image: صورة الخريطة (عرض الطبقة الإفتراضية) max: الأقصى options: خيارات osm_xml_data: معطيات خريطة الطريق المفتوح بنسق إكس أم أل @@ -384,29 +272,22 @@ ar: paste_html: ألصق HTML لتضمينه في موقع ما scale: القياس too_large: - body: هذه المنطقة كبيرة جدًا للتصدير على هيئة بيانات إكس إم إل لخريطة الشارع المفتوحة. يرجى تكبير الخريطة أو استخدام منطقة أصغر. - heading: المنطقة كبيرة جدًا + body: "هذه المنطقة كبيرة جدًا للتصدير على هيئة بيانات إكس إم إل لخريطة الشارع المفتوحة. يرجى تكبير الخريطة أو استخدام منطقة أصغر أو استخدام أحد المصادر التالية لتنزيل البيانات الضخمة:" + geofabrik: + title: تنزيلات موقع جيوفابريك + planet: + description: نسخ محدثة بشكل دوري من قاعدة بيانات خرائط الشوارع المفتوحة OpenStreetMap + title: كوكب OSM zoom: تكبير - start_rjs: - add_marker: أضف علامة على الخريطة - change_marker: غيّر موضع العلامة - click_add_marker: انقر على الخريطة لإضافة علامة - drag_a_box: اسحب مربع على الخريطة لاختيار منطقة - export: صدِّر - manually_select: اختر يدويًا منطقة أخرى - view_larger_map: اعرض خريطة أكبر geocoder: description: title: geonames: موقع من GeoNames - osm_namefinder: "%{types} من OpenStreetMap Namefinder" osm_nominatim: موقع من OpenStreetMap Nominatim types: cities: مدن places: أماكن towns: بلدات - description_osm_namefinder: - prefix: "%{distance} %{direction} من %{type}" direction: east: شرق north: شمال @@ -428,25 +309,43 @@ ar: ca_postcode: نتائج من Geocoder.CA geonames: نتائج من GeoNames latlon: نتائج داخليًا - osm_namefinder: نتائج من OpenStreetMap Namefinder osm_nominatim: نتائج من OpenStreetMap Nominatim uk_postcode: نتائج من NPEMap / FreeThe Postcode us_postcode: نتائج من Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} من %{parentname})" - suffix_place: ، %{distance} %{direction} من %{placename} search_osm_nominatim: + admin_levels: + level10: حدود الضاحية + level2: حدود قطرية + level4: حدود الدولة + level5: حدود المنطقة + level6: حدود قطرية + level8: حدود المدينة + level9: حدود قرية prefix: + aerialway: + station: محطة قطار هوائي + aeroway: + aerodrome: المطار + apron: موقف طائرات + gate: البوابة + helipad: منصة مروحية + runway: مدرج إقلاع + taxiway: مدرج المناورات + terminal: صالة مطار amenity: + WLAN: نقطة إتصال لاسلكية airport: مطار arts_centre: مركز فني/ثقافي + artwork: عمل فني atm: صراف آلي auditorium: قاعة محاضرات bank: مصرف bar: حانة + bbq: مشوى bench: مقعد bicycle_parking: موقف دراجات bicycle_rental: تأجير دراجة + biergarten: حديقة البيرة brothel: بيت دعارة bureau_de_change: مكتب صرافة bus_station: محطة حافلات @@ -455,6 +354,7 @@ ar: car_sharing: مشاركة سيارات car_wash: غسيل سيارات casino: نادي قمار + charging_station: محطة تعبئة cinema: سينما clinic: عيادة club: نادي @@ -473,6 +373,7 @@ ar: ferry_terminal: مرسى عبّارة fire_hydrant: مواد مكافحة حرائق fire_station: فوج إطفاء + food_court: مطعم وجبات سريعة fountain: نافورة fuel: وقود grave_yard: مقبرة @@ -513,9 +414,13 @@ ar: shelter: ملجأ shop: متجر/دكان/حانوت shopping: التسوق + shower: غسيل بالدش + social_centre: مركز إجتماعي social_club: نادي اجتماعي + social_facility: مرفق اجتماعي studio: ستوديو supermarket: سوبرماركت + swimming_pool: مسبح taxi: سيارة أجرة telephone: هاتف عمومي theatre: مسرح @@ -526,12 +431,24 @@ ar: veterinary: جراحة بيطرية village_hall: مبنى/دار القرية waste_basket: سلة نفايات - wifi: نقطة اتصال لاسلكية واي فاي + wifi: نقطة إتصال لاسلكية youth_centre: مركز نشاطات للشباب boundary: administrative: حدود إدارية + census: حدود تعدادية + national_park: محمية وطنية + protected_area: منطقة محمية + bridge: + aqueduct: قنطرة + suspension: جسر معلق + swing: جسر متحرك + viaduct: جسر + "yes": جسر building: "yes": مبنى + emergency: + fire_hydrant: صنبور مياه الإطفاء + phone: هاتف طوارئ highway: bridleway: مسلك خيول bus_guideway: مسار خاص للحافلات @@ -543,6 +460,7 @@ ar: footway: ممر للمشاة ford: مخاضة living_street: شارع سكني + milestone: معلم minor: طريق غير هام motorway: طريق سريع motorway_junction: تقاطع طرقات سريعة @@ -552,16 +470,21 @@ ar: platform: منصة primary: طريق أولي primary_link: طريق أولي + proposed: طريق تحت الإنشاء raceway: حلبة سباق residential: طريق سكني + rest_area: منطقة إستراحة road: طريق secondary: طريق ثانوي secondary_link: طريق ثانوي service: طريق خدمة services: خدمات الطرق السريعة + speed_camera: كاميرا كشف السرعة steps: درج stile: مرقى لعبور جدار + street_lamp: مصباح شارع tertiary: طريق فرعي + tertiary_link: طريق فرعي track: مسار trail: درب trunk: طريق رئيسي @@ -575,14 +498,17 @@ ar: building: مبنى castle: قلعة church: كنيسة + citywalls: أسوار المدينة + fort: حصن house: منزل icon: أيقونة manor: عزبة memorial: نصب تذكاري mine: منجم - monument: ضريح + monument: أثر museum: متحف ruins: أطلال + tomb: قبر tower: برج wayside_cross: صليب تذكاري wayside_shrine: مزار جانب طريق @@ -599,6 +525,7 @@ ar: farmland: أرض زراعية farmyard: فناء مزرعة forest: غابة + garages: مرائب grass: عشب greenfield: حقول خضراء industrial: منطقة صناعية @@ -607,6 +534,7 @@ ar: military: منطقة عسكرية mine: منجم nature_reserve: محمية طبيعية + orchard: بستان park: منتزه piste: منطقة تزحلق quarry: كسّارة @@ -615,14 +543,17 @@ ar: reservoir: خزان residential: منطقة سكنية retail: بيع بالمفرق + road: منطقة الطريق village_green: أرض خضراء vineyard: كرم عنب wetland: أرض رطبة wood: حرج leisure: beach_resort: شاطئ منتجع + bird_hide: مخبئ طيور common: أرض مشاع fishing: منطقة صيد سمك + fitness_station: مركز اللياقة البدنية garden: حديقة golf_course: ملعب غولف ice_rink: حلبة تزلج على الجليد @@ -633,12 +564,19 @@ ar: pitch: ملعب رياضي playground: ملعب recreation_ground: ميدان ألعاب + sauna: حمّام بخاري حار slipway: مزلقة sports_centre: مركز رياضي stadium: مدرج ألعاب رياضية swimming_pool: بركة سباحة track: مضمار سباق water_park: منتزه ألعاب مائية + military: + airfield: منطقة عسكرية + barracks: ثكنات + bunker: دشمة + mountain_pass: + "yes": ممر جبلي natural: bay: خليج beach: شاطئ @@ -647,9 +585,11 @@ ar: channel: قناة cliff: جرف crater: فوهة بركان + dune: كثيب feature: ميزة fell: منحدر fjord: مضيق بحري + forest: غابة geyser: نافورة ماء حار glacier: نهر/بحر جليدي heath: أرض بور @@ -669,6 +609,7 @@ ar: scrub: أشجار منخفضة shoal: مياه ضحلة spring: نبع + stone: حجر strait: مضيق جبلي tree: شجرة valley: وادي @@ -677,6 +618,19 @@ ar: wetland: أرض رطبة wetlands: أراضي رطبة wood: حرج + office: + accountant: محاسب + architect: مهندس معماري + company: شركة + employment_agency: وكالة توظيف + estate_agent: سمسار مباني + government: دائرة حكومية + insurance: مكتب شركة تأمين + lawyer: محامي + ngo: مكتب منظمة غير حكومية + telecommunication: مكتب شركة إتصالات + travel_agent: وكيل سفريات + "yes": مكتب place: airport: مطار city: مدينة @@ -688,9 +642,11 @@ ar: houses: منازل island: جزيرة islet: جزيرة صغيرة + isolated_dwelling: سكن منعزل locality: محلة moor: أرض جرداء - municipality: بلدية + municipality: البلدية + neighbourhood: حي postcode: الرمز البريدي region: المنطقة sea: بحر @@ -704,19 +660,22 @@ ar: abandoned: سكة حديد مهجورة construction: سكة حديدية تحت الإنشاء disused: سكة حديد مهجورة - disused_station: محطة سكة حديد مهجورة + disused_station: محطة سكة حديدية مهجورة funicular: سكة حديدية معلقة halt: موقف قطار historic_station: محطة سكة حديد تاريخية junction: تقاطع سكك حديدية level_crossing: تقاطع سكك حديدية light_rail: قطار خفيف + miniature: مصغرة السكك الحديدية monorail: قطار ذات سكة حديد واحدة narrow_gauge: سكة حديد ضيقة platform: رصيف محطة قطار preserved: سكة حديدية تراثية + proposed: سكك حديدية مقترحة spur: خط تفرع سكة حديدية station: محطة قطار + stop: محطة سكك حديدية subway: محطة مترو الأنفاق subway_entrance: مدخل مترو switch: مبدل السكة الحديدية @@ -725,12 +684,14 @@ ar: yard: فناء سكة حديد shop: alcohol: متجر كحول للبيع الخارجي + antiques: تحف art: متجر فن bakery: مخبز beauty: صالون تجميل beverages: متجر مشروبات bicycle: متجر دراجات books: متجر كتب + boutique: دكان butcher: جزار car: متجر سيارات car_parts: قطع غيار سيارات @@ -744,6 +705,7 @@ ar: convenience: متجر للأغراض اليومية copyshop: محل تصوير مستندات cosmetics: بائع مستحضرات تجميل + deli: دكان أطعمة شهية department_store: متجر متعدد الأقسام discount: محل رخصة doityourself: براعة منزلية @@ -780,17 +742,21 @@ ar: organic: متجر أغذية عضوية outdoor: متجر للنشاطات الخارجية pet: متجر حيوانات أليفة + pharmacy: صيدلية photo: متجر صور salon: صالون + second_hand: متجر أغراض مستعملة shoes: متجر أحذية shopping_centre: مركز التسوق sports: متجر رياضة stationery: محل قرطاسية supermarket: سوبرماركت + tailor: خياط toys: متجر ألعاب travel_agency: وكالة سفر video: متجر فيديو wine: متجر نبيذ للبيع الخارجي + "yes": متجر tourism: alpine_hut: كوخ جبلي artwork: عمل فني @@ -812,7 +778,11 @@ ar: valley: وادي viewpoint: موقع كاشف zoo: حديقة حيوانات + tunnel: + culvert: مجرى مائي + "yes": نفق waterway: + artificial: مجرى ماء إصطناعي boatyard: حوض سفن canal: قناة connector: قناة مائية @@ -839,71 +809,52 @@ ar: map: base: cycle_map: خريطة للدراجات + transport_map: خريطة تنقلات site: edit_disabled_tooltip: قم بالتكبير لتحرير الخريطة edit_tooltip: عدّل الخريطة - edit_zoom_alert: يجب عليك التكبير لتعديل الخريطة - history_disabled_tooltip: قم بالتكبير لعرض التعديلات في هذه المنطقة - history_tooltip: اعرض التعديلات في هذه المنطقة - history_zoom_alert: يجب التكبير لرؤية تاريخ التعديل layouts: community_blogs: مدونات المجتمع community_blogs_title: مدونات لأعضاء من مجتمع خريطة الشارع المفتوحة copyright: حقوق النشر والترخيص - documentation: التوثيق - documentation_title: توثيق المشروع + data: البيانات donate: ادعم خريطة الشارع المفتوحة ب%{link} لتمويل ترقية العتاد. - donate_link_text: التبرع - edit: عدّل الخريطة + edit: تعديل edit_with: حرر بإستعمال %{editor} export: صدِّر - export_tooltip: صدّر بيانات الخريطة + export_data: تصدير البيانات foundation: المؤسسة foundation_title: مؤسسة خريطة الشارع المفتوحة gps_traces: آثار جي بي أس gps_traces_tooltip: عالج آثار جي بي إس help: مساعدة - help_centre: مركز المساعدة - help_title: موقع المساعدة للمشروع history: تاريخ - home: الصفحة الرئيسية - home_tooltip: اذهب إلى الصفحة الرئيسية - inbox: صندوق البريد (%{count}) - inbox_tooltip: - few: صندوق بريدك يحوي %{count} رسائل غير مقروءة - one: صندوق بريدك يحوي رسالة واحدة غير مقروءة - other: صندوق بريدك يحوي %{count} رسالة غير مقروءة - two: صندوق بريدك يحوي رسالتين غير مقروءتين - zero: صندوق بريدك لا يحوي رسائل غير مقروءة - intro_1: خريطة الشارع المفتوحة هي خريطة للعالم كله قابلة للتحرير حرة ومجانية. قام بإنشائها أشخاص مثلك. - license: - title: بيانات خريطة الشارع المفتوحة مرخصة تحت رخصة المشاع الإبداعي، النسبة، نسخة 2.0 - log_in: دخول + home: اذهب إلى الصفحة الرئيسية + intro_2_create_account: أنشئ حساب مستخدم + log_in: تسجيل الدخول log_in_tooltip: سجّل الدخول مع حساب موجود logo: alt_text: شعار خريطة الشارع المفتوحة logout: اخرج - logout_tooltip: خروج make_a_donation: text: تبرع title: ادعم خريطة الشارع المفتوحة بهبة نقدية osm_offline: حاليًا قاعدة بيانات خريطة الشارع المفتوحة مغلقة بينما يتم الانتهاء من أعمال الصيانة الأساسية لقاعدة البيانات. osm_read_only: حاليًا قاعدة بيانات خريطة الشارع المفتوحة في وضع القراءة بينما يتم الانتهاء من أعمال الصيانة الأساسية لقاعدة البيانات. + partners_html: الضيافة مدعومة من %{ucl}, %{ic} و %{bytemark}, و %{partners} آخرون. + partners_ic: كلية امبراطورية لندن + partners_partners: الشركاء sign_up: أنشئ حسابًا sign_up_tooltip: أنشئ حسابًا كي تستطيع المساهمة tag_line: ويكي خريطة العالم الحرة user_diaries: يوميات المستخدمين user_diaries_tooltip: اعرض يوميات المستخدمين - view: اعرض - view_tooltip: اعرض الخريطة - welcome_user: مرحبًا بك، %{user_link} - welcome_user_link_tooltip: صفحة المستخدم الخاصة بك - wiki: الويكي - wiki_title: موقع الويكي للمشروع license_page: foreign: english_link: النص الإنجليزي الأصلي title: حول هذه الترجمة + legal_babble: + title_html: حقوق النشر والترخيص native: mapping_link: إبدأ التخطيط native_link: النسخة العربية @@ -914,6 +865,7 @@ ar: inbox: date: التاريخ from: من + messages: لديك %{new_messages} و %{old_messages} my_inbox: الوارد no_messages_yet: لا يوجد لديك رسائل بعد. لماذا لا تقوم بالاتصال مع بعض %{people_mapping_nearby_link}؟ outbox: الصادر @@ -924,7 +876,7 @@ ar: as_read: عُلّمت الرسالة مقروءة as_unread: عُلّمت الرسالة كغير مقروءة message_summary: - delete_button: احذف + delete_button: حذف read_button: علّم كمقروءة reply_button: رد unread_button: علّم كغير مقروءة @@ -952,12 +904,8 @@ ar: title: صندوق الصادر to: إلى read: - back_to_inbox: العودة إلى صندوق الوارد - back_to_outbox: العودة إلى صندوق الصادر date: التاريخ from: من - reading_your_messages: اقرأ الرسائل المرسلة الخاصة بك - reading_your_sent_messages: قراءة الرسائل المرسلة الخاصة بك reply_button: رد subject: الموضوع title: اقرأ الرسالة @@ -967,7 +915,7 @@ ar: reply: wrong_user: أنت مسجل دخول باسم '%{user}' ولكن الرسالة التي طلبت الرد عليها لم تكن مرسلة لذلك المستخدم. يرجى تسجيل الدخول كمستخدم صحيح للرد. sent_message_summary: - delete_button: احذف + delete_button: حذف notifier: diary_comment_notification: footer: يمكنك أيضًا قراءة التعليق على %{readurl} ويمكنك التعليق على %{commenturl} أو الرد على %{replyurl} @@ -983,8 +931,6 @@ ar: email_confirm_plain: click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لتأكيد التغيير. greeting: تحياتي، - hopefully_you_1: شخص ما (نأمل أنت) يرغب بتغيير عنوان بريده الإلكتروني على - hopefully_you_2: "%{server_url} إلى %{new_address}." friend_notification: befriend_them: يمكنك أيضًا إضافتهم كصديق على %{befriendurl}. had_added_you: "%{user} قام بإضافتك كصديق على خريطة الشارع المفتوحة." @@ -1013,42 +959,11 @@ ar: lost_password_plain: click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لإعادة تعيين كلمة المرور. greeting: تحياتي، - hopefully_you_1: شخص ما (ربما أنت) قد طلب إعادة تعيين كلمة المرور على هذا - hopefully_you_2: عناوين البريد الإلكتروني لحساب openstreetmap.org. message_notification: - footer1: ويمكنك أيضًا قراءة الرسالة على %{readurl} - footer2: ويمكنك الرد على %{replyurl} header: "%{from_user} قام بإرسال رسالة لك عبر خريطة الشارع المفتوحة بالعنوان %{subject}:" hi: مرحبًا %{to_user}، signup_confirm: subject: "[خريطة الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني" - signup_confirm_html: - click_the_link: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد هذا الحساب، واقرأ عن المزيد من المعلومات حول خريطة الشارع المفتوحة - current_user: لائحة بالمستخدمين في تصنيفات، استنادًا على مكانهم في العالم، وهي متاحة من تصنيف:مستخدمين بحسب المنطقة الجغرافية. - get_reading: اقرأ حول خريطة الشارع المفتوحة في الويكي، واكب أحدث الأخبار عبر مدونة خريطة الشارع المفتوحة أو تويتر، أو من خلال مدونة مؤسس خريطة الشارع المفتوحة ستيف كوست OpenGeoData مدونة للذاكرة التاريخية للمشروع والتي تضم أيضًا بودكاست مسموع! - greeting: مرحباَ بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على - introductory_video: يمكنك مشاهدة %{introductory_video_link}. - more_videos: يوجد %{more_videos_link}. - more_videos_here: المزيد من الفيديو هنا - user_wiki_page: من المستحسن أن تقوم بإنشاء صفحة مستخدم ويكي، تتضمن سمات التصنيف التي تشير إلى مكانك، مثل [[Category:Users_in_Egypt]]. - video_to_openstreetmap: فيديو تمهيدية لـخريطة الطريق المفتوحة - wiki_signup: قد تحتاج أيضًا إلى التسجيل في ويكي خريطة الشارع المفتوحة. - signup_confirm_plain: - blog_and_twitter: "واكب أحدث الأخبار عبر مدونة خريطة الشارع المفتوحة أو تويتر:" - click_the_link_1: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد - click_the_link_2: حساب وإقرأ المزيد من المعلومات عن خريطة الطريق المفتوحة. - current_user_1: لائحة للمستخدمين الحاليين في فئات، استنادًا إلى الموقع في العالم - current_user_2: "وهم، متوفر من:" - greeting: مرحبًا بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على - introductory_video: "يمكنك مشاهدة شريط فيديو تمهيدي لخريطة الطريق المفتوحة هنا:" - more_videos: "هناك المزيد من الفيديوهات هنا:" - opengeodata: "OpenGeoData.org هي مدونة مؤسس خريطة الشارع المفتوحة ستيف كوست، وتحوي أيضًا على بودكاست:" - the_wiki: "احصل على بعض المطالعة عن خريطة الطريق المفتوح على الويكي:" - user_wiki_1: من المستحسن أن تقوم بإنشاء صفحة مستخدم ويكي، والتي تتضمن - user_wiki_2: سمات الخريطة التي تشير إلى مكانك، مثل [[Category:Users_in_Egypt]]. - wiki_signup: "قد تحتاج أيضًا إلى التسجيل في ويكي خريطة الشارع المفتوحة على:" oauth: oauthorize: allow_read_gpx: قراءة آثار جي بي أس الخاصة بك. @@ -1067,7 +982,7 @@ ar: destroy: flash: دمّر تسجيل التطبيق edit: - submit: عدّل + submit: تعديل title: عدّل تطبيقك form: allow_read_gpx: قراءة آثاره للجي بي إس الخصوصية. @@ -1107,6 +1022,8 @@ ar: allow_write_gpx: ارفع آثار جي بي إس. allow_write_prefs: تعديل تفضيلاته. authorize_url: "رابط التصريح:" + confirm: هل أنت متأكد؟ + delete: أمحي الزبون edit: عدّل التفاصيل key: "مفتاح المستهلك:" requests: "طلب الصلاحيات التالية من المستخدم:" @@ -1116,6 +1033,17 @@ ar: url: "رابط طلب النموذج:" update: flash: تم تحديث معلومات العميل بنجاح + redaction: + edit: + description: الوصف + new: + description: الوصف + show: + confirm: هل أنت متأكد؟ + description: "الوصف:" + user: "المنشئ:" + update: + flash: تمّ حفظ التغييرات. site: edit: anon_edits_link_text: ابحث عن السبب لماذا هو هذا الحال. @@ -1127,15 +1055,9 @@ ar: index: js_1: أنت إما تستخدم متصفح لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت. js_2: خريطة الشارع المفتوحة تستخدم جافا سكريبت لخريطتها المنزلقة. - license: - license_name: المشاع الإبداعي، النسبة، نسخة 2.0 - notice: مرخص بموجب رخصة %{license_name} بواسطة %{project_name} ومساهميه. - project_name: مشروع خريطة الشارع المفتوحة permalink: وصلة دائمة shortlink: وصلة قصيرة key: - map_key: دليل الخريطة - map_key_tooltip: مفتاح الخريطة table: entry: admin: حدود إدارية @@ -1202,9 +1124,20 @@ ar: unclassified: طريق غير مصنّف unsurfaced: طريق غير معبد wood: غابة + markdown_help: + alt: النص البديل + first: البند الأول + image: الصورة + link: الوصلة + ordered: لائحة مرتبة + second: البند الثاني + text: النص + unordered: لائحة غير مرتبة + richtext_area: + edit: حرّر + preview: شاهد search: - search: ابحث - search_help: "أمثلة: 'الحرية'، 'شارع الحمراء, بيروت'، 'مدرسة, القاهرة' المزيد من الأمثلة..." + search: بحث submit_text: اذهب where_am_i: أين أنا؟ where_am_i_title: صِف الموقع الحالي باستخدام محرك البحث @@ -1223,7 +1156,7 @@ ar: edit: description: "الوصف:" download: نزّل - edit: عدّل + edit: تعديل filename: "اسم الملف:" heading: تعديل الأثر %{name} map: خريطة @@ -1253,7 +1186,7 @@ ar: ago: منذ %{time_in_words_ago} by: بواسطة count_points: "%{count} نقطة" - edit: عدّل + edit: تعديل edit_map: عدّل الخريطة identifiable: محدد الهوية in: في @@ -1267,10 +1200,10 @@ ar: view_map: اعرض الخريطة trace_form: description: "الوصف:" - help: المساعدة + help: مساعدة tags: "الوسوم:" tags_help: محدد بفواصل - upload_button: ارفع + upload_button: رفع upload_gpx: "ارفع ملف GPX:" visibility: "الرؤية:" visibility_help: ماذا يعني هذا؟ @@ -1282,15 +1215,15 @@ ar: trace_optionals: tags: الوسوم trace_paging_nav: - next: التالي » - previous: « السابق + newer: الآثار الحديثة + older: الآثار القديمة showing_page: إظهار الصفحة %{page} view: delete_track: احذف هذا الأثر description: "الوصف:" download: نزّل - edit: عدّل - edit_track: عدّل هذا الأثر + edit: تعديل + edit_track: عدل هذا الأثر filename: "اسم الملف:" heading: عرض الأثر %{name} map: خريطة @@ -1333,6 +1266,10 @@ ar: new email address: "عنوان البريد الإلكتروني الجديد:" new image: أضف صورة no home location: لم تدخل موقع منزلك. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: ما هذا ؟ + openid: "OpenID:" preferred editor: "المحرر المفضل:" preferred languages: "اللغات المفضّلة:" profile description: "وصف الملف الشخصي:" @@ -1355,7 +1292,6 @@ ar: button: أكّد heading: أكّد حساب المستخدم press confirm button: اضغط على زر التأكيد أدناه لتنشيط حسابك. - success: تم تأكيد حسابك، شكرًا للاشتراك! confirm_email: button: أكّد failure: عنوان بريد إلكتروني تم تفعيله مسبقًا بهذا النموذج. @@ -1369,23 +1305,25 @@ ar: list: empty: لا سجلات مطابقة تم العثور عليها! heading: المستخدمون + hide: إخفاء المستخدمين المحددين title: المستخدمون login: auth failure: آسف، لا يمكن الدخول بتلك التفاصيل. create account minute: أنشئ حساباّ. تحتاج فقط إلى دقيقة. email or username: "عنوان البريد الإلكتروني أو اسم المستخدم:" - heading: ولوج - login_button: لُج + heading: تسجيل الدخول + login_button: تسجيل الدخول lost password link: أنسيت كلمة المرور؟ new to osm: جديد لخريطة الشارع المفتوحة ؟ + no account: ليس لديك حسابا ؟ password: "كلمة السر:" register now: تسجل الآن remember: "تذكرني:" - title: ولوج + title: تسجيل الدخول logout: heading: الخروج من خريطة الشارع المفتوحة - logout_button: اخرج - title: اخرج + logout_button: تسجيل الخروج + title: تسجيل الخروج lost_password: email address: "عنوان البريد الإلكتروني:" heading: أنسيت كلمة المرور؟ @@ -1396,19 +1334,17 @@ ar: title: نسيان كلمة المرور make_friend: already_a_friend: حاليًا أنت و %{name} أصدقاء. + button: أضف كصديق failed: عفوًا، تعذر إضافة %{name} كصديق. success: "%{name} الآن صديقك." new: confirm email address: "تأكيد عنوان البريد الإلكتروني:" confirm password: "تأكيد كلمة المرور:" contact_webmaster: يرجى الاتصال بمسؤول الموقع لترتيب الحساب المراد إنشاؤه - وسنحاول التعامل مع هذا الطلب بأسرع وقت ممكن. - continue: استمر + continue: استمرار display name: "اسم المستخدم:" display name description: اسم المستخدم الخاص بك الظاهر علنًا. يمكنك تغيير هذه التفضيلات في وقت لاحق. email address: "عنوان البريد الإلكتروني:" - fill_form: قم بتعبئة النموذج وسوف نرسل لك رسالة بريد إلكتروني سريعة لتنشيط حسابك. - flash create success message: شكرا للتسجيل. لقد أرسلنا ملاحظة تأكيد إلى %{email} وحالما تأكد حسابك سيمكنك التخطيط في أي وقت :-)

    إن كنت تستخدم مكافح السخام الذي يرسل طلبات التأكيد يرجى أن تتأكد من وضع webmaster@openstreetmap.org في القائمة البيضاء لأننا غير قادرين على الرد على أي طلب تأكيد. - heading: أنشئ حساب مستخدم license_agreement: عند تأكيد حسابك ستحتاج إلى الموافقة على شروط المساهم. no_auto_account_create: للأسف نحن غير قادرين في الوقت الحالي على إنشاء حساب لك تلقائيًا. not displayed publicly: لا يعرض علنًا (انظر سياسة الخصوصية) @@ -1422,7 +1358,7 @@ ar: popup: friend: صديق nearby mapper: مخطط بالجوار - your location: موقعك + your location: مكانك remove_friend: not_a_friend: "%{name} ليس من أحد أصدقائك." success: تم إزالة %{name} من قائمة أصدقائك. @@ -1453,6 +1389,7 @@ ar: rest_of_world: بقية العالم legale_select: "الرجاء اختيار بلد الإقامة:" read and accept: يرجى قراءة الاتفاقية أدناه والضغط على زر الموافقة لتأكيد قبول شروط هذا الاتفاق على مشاركاتك الموجودة حاليًا والمستقبلية. + title: "شروط المساهم:" view: activate_user: نشّط هذا المستخدم add as friend: أضف كصديق @@ -1460,27 +1397,38 @@ ar: block_history: اعرض العرقلات الواصلة blocks by me: العرقلات بواسطتي blocks on me: العرقلات علي + comments: التعليقات confirm: أكّد confirm_user: تأكيد هذا المستخدم create_block: امنع هذا المستخدم created from: "أُنشىء من:" + ct accepted: مقبول %{ago} سابقاً + ct declined: مرفوض + ct status: "شروط المساهم:" + ct undecided: متردد deactivate_user: احذف هذا المستخدم delete_user: احذف هذا المستخدم description: الوصف diary: يومية edits: مساهمات email address: "عنوان البريد الإلكتروني:" + friends_changesets: تصفح كل حزم التغييرات من قبل الأصدقاء + friends_diaries: تصفح جميع مدخلات مدونات الأصدقاء hide_user: اخفِ هذا المستخدم if set location: إن قمت بتعيين موقعك، خريطة وأشياء جميلة سوف تظهر أدناه. يمكنك تحديد موقع منزلك من صفحة %{settings_link}. km away: على بعد %{count}كم + latest edit: "آخر تغيير %{ago}:" m away: على بعد %{count}متر mapper since: "مُخطط منذ:" moderator_history: اعرض العرقلات المعطاة + my comments: تعليقاتي my diary: يوميتي my edits: مساهماتي my settings: إعداداتي my traces: آثاري nearby users: "مستخدمين أيضًا بالجوار:" + nearby_changesets: تصفح كل حزم التغييرات من قبل المستخدمين في المقربة + nearby_diaries: تصفح جميع مدخلات مدونات المستخدمين في المقربة new diary entry: مدخلة يومية جديدة no friends: لم تقم بإضافة أي أصدقاء بعد. no nearby users: لا يوجد بعد المزيد من المستخدمين أفصحوا عن تخطيطهم بالجوار. @@ -1555,12 +1503,15 @@ ar: confirm: هل أنت متأكد؟ creator_name: المنشئ display_name: مستخدم مُعرقل - edit: عدّل + edit: تعديل + next: التالي » not_revoked: (لم تلغ) + previous: « السابق reason: السبب العرقلة revoke: ابطل! revoker_name: مُبطل بواسطة show: اعرض + showing_page: جاري عرض الصفحة %{page} status: الحالة period: few: "%{count} ساعات" @@ -1578,7 +1529,7 @@ ar: show: back: اعرض كل العرقلات confirm: هل أنت متأكد؟ - edit: عدّل + edit: تعديل heading: "%{block_on} عُرقل بواسطة %{block_by}" needs_view: المستخدم يحتاج لتسجيل الدخول قبل أن يتم مسح هذه العرقلة. reason: "سبب العرقلة:" diff --git a/config/locales/arz.yml b/config/locales/arz.yml index 40feb731881..998501a43c8 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -78,77 +78,15 @@ arz: blocked: لقد تم عرقله وصولك إلى الـ API. يرجى تسجيل الدخول من صفحه الموقع لمعرفه المزيد. browse: changeset: - changeset: "حزمه التغييرات: %{id}" changesetxml: حزمه التغييرات إكس إم إل - download: نزّل %{changeset_xml_link} أو %{osmchange_xml_link} feed: title: حزمه التغييرات %{id} title_comment: حزمه التغييرات %{id} - %{comment} osmchangexml: osmChange XML title: حزمه التغييرات - changeset_details: - belongs_to: "ينتمى إلى:" - bounding_box: "مربع الإحاطة:" - box: مربّع - closed_at: "أُغلق في:" - created_at: "أُنشئ في:" - has_nodes: - few: "فيه %{count} عقد التالية:" - one: "فيه العقده التالية:" - other: "فيه %{count} عقده التالية:" - two: "فيه العقدتين التاليتين:" - has_relations: - few: "فيه %{count} علاقات التالية:" - one: "فيه العلاقه التالية:" - other: "فيه %{count} علاقه التالية:" - two: "فيه العلاقتين التاليتين:" - has_ways: - one: "فيه الطريق التالي:" - other: "فيه %{count} طرق التالية:" - two: "فيه الطريقين التاليين:" - no_bounding_box: لم يتم تخزين مربع الإحاطه لحزمه التغييرات هذه. - show_area_box: اعرض مربع المنطقة - common_details: - changeset_comment: "التعليق:" - edited_at: "عُدّل في:" - edited_by: "عُدّل بواسطة:" - in_changeset: "فى حزمه التغييرات:" - version: "النسخة:" containing_relation: entry: العلاقه %{relation_name} entry_role: العلاقه %{relation_name} (كــ %{relation_role}) - map: - deleted: تم الحذف - larger: - area: اعرض المنطقه على خريطه أكبر - node: اعرض العقده على خريطه أكبر - relation: اعرض العلاقه على خريطه أكبر - way: اعرض الطريق على خريطه أكبر - loading: جارى التحميل... - navigation: - all: - next_changeset_tooltip: حزمه التغييرات التالية - prev_changeset_tooltip: حزمه التغييرات السابقة - user: - name_changeset_tooltip: اعرض تعديلات %{user} - next_changeset_tooltip: التعديل التالى بواسطه %{user} - prev_changeset_tooltip: عُدّل سابقًا بواسطه %{user} - node: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" - download_xml: نزّل إكس إم أل - edit: عدّل - node: عقدة - node_title: "عقدة: %{node_name}" - view_history: اعرض التاريخ - node_details: - coordinates: "إحداثيات:" - part_of: "جزء من:" - node_history: - download: "%{download_xml_link} أو %{view_details_link}" - download_xml: نزّل إكس إم أل - node_history: تاريخ العقدة - node_history_title: "تاريخ العقدة: %{node_name}" - view_details: اعرض التفاصيل not_found: sorry: عفوًا، لم يتم العثور على %{type} بالمعرّف %{id}. type: @@ -156,95 +94,21 @@ arz: node: عقدة relation: علاقة way: طريق - paging_nav: - of: من - showing_page: إظهار الصفحة - relation: - download: "%{download_xml_link} أو %{view_history_link}" - download_xml: نزّل إكس إم إل - relation: العلاقة - relation_title: "العلاقة: %{relation_name}" - view_history: اعرض التاريخ - relation_details: - members: "الأعضاء:" - part_of: "جزء من:" - relation_history: - download: "%{download_xml_link} أو %{view_details_link}" - download_xml: نزّل إكس إم أل - relation_history: تاريخ العلاقة - relation_history_title: "تاريخ العلاقة: %{relation_name}" - view_details: اعرض التفاصيل relation_member: entry_role: "%{type} %{name} كــ %{role}" type: node: عقدة relation: علاقة way: طريق - start: - manually_select: اختر يدويًا منطقه أخرى - view_data: أظهر بيانات عرض الخريطه الحالي start_rjs: - data_frame_title: البيانات - data_layer_name: البيانات - details: التفاصيل - drag_a_box: اسحب مربع على الخريطه لاختيار منطقة - edited_by_user_at_timestamp: عُدّل بواسطه [[user]] فى [[timestamp]] - history_for_feature: تاريخ الــ[[feature]] load_data: تحميل البيانات - loaded_an_area_with_num_features: "لقد قمت بتحميل منطقه تحتوى على [[num_features]] ميّزه. بصفه عامّه، بعض المتصفحات قد لا تتوافق بشكل جيد مع عرض هذه الكميه من البيانات. عمومًا، تعمل المتصفحات بشكل أفضل فى عرض أقل من 100 ميّزه فى وقت واحد: القيام بأى شيء آخر قد يجعل المتصفح بطيء أو لن يستجيب. إن كنت متأكدًا من أنك ترغب فى عرض هذه البيانات، يمكنك القيام بذلك عن طريق النقر على الزر أدناه." loading: تحميل... - manually_select: اختر يدويًا منطقه أخرى - object_list: - api: استرد هذه المنطقه من الأى بى أي - back: اعرض لائحه الكائنات - details: التّفاصيل - heading: قائمه الكائنات - history: - type: - node: عقده [[id]] - way: طريق [[id]] - selected: - type: - node: عقده [[id]] - way: طريق [[id]] - type: - node: عقدة - way: طريق - private_user: مستخدم الخاص - show_history: أظهر التاريخ - unable_to_load_size: "غير قادر على التحميل: حجم مربع الإحاطه [[bbox_size]] كبير جدًا (يجب أن يكون أصغر من %{max_bbox_size})" - wait: انتظر... - zoom_or_select: قم بالتكبير أو اختر منطقه من الخريطه لعرضها tag_details: tags: "الوسوم:" - way: - download: "%{download_xml_link}، %{view_history_link} أو %{edit_link}" - download_xml: نزّل إكس إم إل - edit: عدّل - view_history: اعرض التاريخ - way: طريق - way_title: "طريق: %{way_name}" - way_details: - also_part_of: - one: أيضًا جزء من الطريق %{related_ways} - other: أيضًا جزء من الطرق %{related_ways} - two: أيضًا جزء من الطريقين %{related_ways} - nodes: "العُقد:" - part_of: "جزء من:" - way_history: - download: "%{download_xml_link} أو %{view_details_link}" - download_xml: نزّل إكس إم إل - view_details: اعرض التفاصيل - way_history: تاريخ الطريق - way_history_title: "تاريخ الطريق: %{way_name}" changeset: changeset: anonymous: مجهول - big_area: (كبير) - no_comment: (لا يوجد) no_edits: (لا تعديلات) - show_area_box: اعرض مربع المنطقة - still_editing: (لا يزال يعدّل) view_changeset_details: اعرض تفاصيل حزمه التغييرات changeset_paging_nav: next: التالى » @@ -257,18 +121,8 @@ arz: saved_at: حُفظ في user: المستخدم list: - description: التغييرات الحديثة - description_bbox: حزم التغييرات داخل %{bbox} - description_user: حزم التغييرات بواسطه %{user} - description_user_bbox: حزم التغييرات بواسطه %{user} داخل %{bbox} - heading: حزم التغييرات - heading_bbox: حزم التغييرات - heading_user: حزم التغييرات - heading_user_bbox: حزم التغييرات title: حزم التغييرات - title_bbox: حزم التغييرات داخل %{bbox} title_user: حزم التغييرات بواسطه %{user} - title_user_bbox: حزم التغييرات بواسطه %{user} داخل %{bbox} diary_entry: diary_comment: comment_from: تعليق من %{link_user} فى %{comment_created_at} @@ -352,26 +206,15 @@ arz: paste_html: ألصق HTML لتضمينه فى موقع ما scale: القياس zoom: تكبير - start_rjs: - add_marker: أضف علامه على الخريطة - change_marker: غيّر موضع العلامة - click_add_marker: انقر على الخريطه لإضافه علامة - drag_a_box: اسحب مربع على الخريطه لاختيار منطقة - export: صدِّر - manually_select: اختر يدويًا منطقه أخرى - view_larger_map: اعرض خريطه أكبر geocoder: description: title: geonames: موقع من GeoNames - osm_namefinder: "%{types} من OpenStreetMap Namefinder" osm_nominatim: موقع من OpenStreetMap Nominatim types: cities: مدن places: أماكن towns: بلدات - description_osm_namefinder: - prefix: "%{distance} %{direction} من %{type}" direction: east: شرق north: شمال @@ -392,13 +235,9 @@ arz: ca_postcode: نتائج من Geocoder.CA geonames: نتائج من GeoNames latlon: نتائج داخليًا - osm_namefinder: نتائج من OpenStreetMap Namefinder osm_nominatim: نتائج من OpenStreetMap Nominatim uk_postcode: نتائج من NPEMap / FreeThe Postcode us_postcode: نتائج من Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} من %{parentname})" - suffix_place: ، %{distance} %{direction} من %{placename} search_osm_nominatim: prefix: amenity: @@ -767,36 +606,19 @@ arz: map: base: cycle_map: خريطه للدراجات - site: - edit_zoom_alert: يجب عليك التكبير لتعديل الخريطة - history_zoom_alert: يجب التكبير لرؤيه تاريخ التعديل layouts: donate: ادعم خريطه الشارع المفتوحه ب%{link} لتمويل ترقيه العتاد. - donate_link_text: التبرع edit: عدّل هذه الخريطة export: صدِّر - export_tooltip: صدّر بيانات الخريطة gps_traces: آثار جى بى أس gps_traces_tooltip: عالج الآثار history: تاريخ home: الصفحه الرئيسية - home_tooltip: اذهب إلى الصفحه الرئيسية - inbox: صندوق البريد (%{count}) - inbox_tooltip: - few: صندوق بريدك يحوى %{count} رسائل غير مقروءة - one: صندوق بريدك يحوى رساله واحده غير مقروءة - other: صندوق بريدك يحوى %{count} رساله غير مقروءة - two: صندوق بريدك يحوى رسالتين غير مقروءتين - zero: صندوق بريدك لا يحوى رسائل غير مقروءة - intro_1: خريطه الشارع المفتوحه هى خريطه للعالم كله قابله للتحرير حره ومجانيه. قام بإنشائها أشخاص مثلك. - license: - title: بيانات خريطه الشارع المفتوحه مرخصه تحت رخصه المشاع الإبداعى، النسبه، نسخه 2.0 log_in: دخول log_in_tooltip: سجّل الدخول مع حساب موجود logo: alt_text: شعار خريطه الشارع المفتوحة logout: اخرج - logout_tooltip: خروج make_a_donation: text: تبرع title: ادعم خريطه الشارع المفتوحه بهبه نقدية @@ -807,10 +629,6 @@ arz: tag_line: ويكى خريطه العالم الحرة user_diaries: يوميات المستخدمين user_diaries_tooltip: اعرض يوميات المستخدمين - view: اعرض - view_tooltip: اعرض الخرائط - welcome_user: مرحبًا بك، %{user_link} - welcome_user_link_tooltip: صفحه المستخدم الخاصه بك message: delete: deleted: حُذفت الرسالة @@ -851,12 +669,8 @@ arz: title: صندوق الصادر to: إلى read: - back_to_inbox: العوده إلى صندوق الوارد - back_to_outbox: العوده إلى صندوق الصادر date: التاريخ from: من - reading_your_messages: اقرأ الرسائل المرسله الخاصه بك - reading_your_sent_messages: قراءه الرسائل المرسله الخاصه بك reply_button: رد subject: الموضوع title: اقرأ الرسالة @@ -879,8 +693,6 @@ arz: email_confirm_plain: click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لتأكيد التغيير. greeting: تحياتى، - hopefully_you_1: شخص ما (نأمل أنت) يرغب بتغيير عنوان بريده الإلكترونى على - hopefully_you_2: "%{server_url} إلى %{new_address}." friend_notification: had_added_you: "%{user} قام بإضافتك كصديق على خريطه الشارع المفتوحه." see_their_profile: يمكنك أن تشاهد ملفه الشخصى على %{userurl} وإضافته كصديق أيضًا إن كنت ترغب فى ذلك. @@ -908,37 +720,11 @@ arz: lost_password_plain: click_the_link: إذا كان هذا هو أنت، يرجى الضغط على الرابط أدناه لإعاده تعيين كلمه المرور. greeting: تحياتى، - hopefully_you_1: شخص ما (ربما أنت) قد طلب إعاده تعيين كلمه المرور على هذا - hopefully_you_2: عناوين البريد الإلكترونى لحساب openstreetmap.org. message_notification: - footer1: ويمكنك أيضًا قراءه الرساله على %{readurl} - footer2: ويمكنك الرد على %{replyurl} header: "%{from_user} قام بإرسال رساله لك عبر خريطه الشارع المفتوحه بالعنوان %{subject}:" hi: مرحبًا %{to_user}، signup_confirm: subject: "[خريطه الشارع المفتوحة] أكّد عنوان بريدك الإلكتروني" - signup_confirm_html: - click_the_link: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد هذا الحساب، واقرأ عن المزيد من المعلومات حول خريطه الشارع المفتوحة - greeting: مرحباَ بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على - introductory_video: يمكنك مشاهده %{introductory_video_link}. - more_videos: يوجد %{more_videos_link}. - more_videos_here: المزيد من الفيديو هنا - video_to_openstreetmap: فيديو تمهيديه لـخريطه الطريق المفتوحة - wiki_signup: قد تحتاج أيضًا إلى التسجيل فى ويكى خريطه الشارع المفتوحه. - signup_confirm_plain: - blog_and_twitter: "واكب أحدث الأخبار عبر مدونه خريطه الشارع المفتوحه أو تويتر:" - click_the_link_1: إذا كان هذا هو أنت، مرحبًا! الرجاء اضغط على الرابط أدناه لتأكيد - click_the_link_2: حساب وإقرأ المزيد من المعلومات عن خريطه الطريق المفتوحه. - current_user_1: لائحه للمستخدمين الحاليين فى فئات، استنادًا إلى الموقع فى العالم - current_user_2: "وهم، متوفر من:" - greeting: مرحبًا بك! - hopefully_you: شخص ما (نأمل أنت) يرغب بإنشاء حساب على - introductory_video: "يمكنك مشاهده شريط فيديو تمهيدى لخريطه الطريق المفتوحه هنا:" - more_videos: "هناك المزيد من الفيديوهات هنا:" - the_wiki: "احصل على بعض المطالعه عن خريطه الطريق المفتوح على الويكي:" - user_wiki_1: من المستحسن أن تقوم بإنشاء صفحه مستخدم ويكى، والتى تتضمن - wiki_signup: "قد تحتاج أيضًا إلى التسجيل فى ويكى خريطه الشارع المفتوحه على:" oauth: oauthorize: allow_read_gpx: قراءه آثار جى بى أس الخاصه بك. @@ -1012,15 +798,9 @@ arz: index: js_1: أنت إما تستخدم متصفح لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت. js_2: خريطه الشارع المفتوحه تستخدم جافا سكريبت لخريطتها المنزلقه. - license: - license_name: المشاع الإبداعى، النسبه، نسخه 2.0 - notice: مرخص بموجب رخصه %{license_name} بواسطه %{project_name} ومساهميه. - project_name: مشروع خريطه الشارع المفتوحة permalink: وصله دائمة shortlink: وصله قصيرة key: - map_key: دليل الخريطة - map_key_tooltip: دليل الخريطه لبيانات mapnik فى هذا المستوى من التكبير table: entry: admin: حدود إدارية @@ -1080,7 +860,6 @@ arz: wood: غابة search: search: ابحث - search_help: "أمثلة: 'الحرية'، 'شارع الحمراء, بيروت'، 'مدرسة, القاهرة' المزيد من الأمثله..." submit_text: اذهب where_am_i: أين أنا؟ where_am_i_title: صِف الموقع الحالى باستخدام محرك البحث @@ -1206,7 +985,6 @@ arz: button: أكّد heading: أكّد حساب المستخدم press confirm button: اضغط على زر التأكيد أدناه لتنشيط حسابك. - success: تم تأكيد حسابك، شكرًا للاشتراك! confirm_email: button: أكّد failure: عنوان بريد إلكترونى تم تفعيله مسبقًا بهذه البيانات. @@ -1245,9 +1023,6 @@ arz: display name: "اسم المستخدم:" display name description: اسم المستخدم الخاص بك الظاهر علنًا. يمكنك تغيير هذه التفضيلات فى وقت لاحق. email address: "عنوان البريد الإلكتروني:" - fill_form: قم بتعبئه النموذج وسوف نرسل لك رساله بريد إلكترونى سريعه لتنشيط حسابك. - flash create success message: لقد تم إنشاء مستخدم جديد بنجاح. تحقق من وجود ملاحظه فى بريدك الإلكترونى، وسيمكنك التخطيط فى أى وقت :-)

    يرجى ملاحظه أنك لن تتمكن من الدخول حتى تستلم وتأكّد عنوان بريدك الإلكترونى.

    إن كنت تستخدم مكافح السخام الذى يرسل طلبات التأكيد يرجى أن تتأكد من وضع webmaster@openstreetmap.org فى القائمه البيضاء لأننا غير قادرين على الرد على أى طلب تأكيد. - heading: أنشئ حساب مستخدم license_agreement: بإنشائك الحساب، أنت توافق على أن تكون جميع المعلومات التى تقدمها إلى مشروع خريطه الشارع المفتوحه مرخصه (بشكل غير حصري) تحت رخصه المشاع الإبداعى، النسبه، نسخه 2.0. 2.0 no_auto_account_create: للأسف نحن غير قادرين فى الوقت الحالى على إنشاء حساب لك تلقائيًا. not displayed publicly: لا يعرض علنًا (انظر سياسه الخصوصية) diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 4c1d832effe..9e6296ef3e3 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -3,6 +3,18 @@ # Export driver: syck-pecl # Author: Xuacu ast: + about_page: + community_driven_html: "La comunidá d'OpenStreetMap ye diversa, apasionada, i crez cada día. Ente los nuesos collaboradores hai cartógrafos entusiastes, profesionales de GIS, inxenieros que xestionen los sirvidores d'OSM, voluntarios que faen mapes de les zones afeutaes por desastres, y muncho más.\nPa saber más tocante a la comunidá, vea los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM." + community_driven_title: Dirixíu pola comunidá + copyright_html: © Collaboradores
    d'OpenStreetMap + lede_text: OpenStreetMap ta construíu por una comunidá de cartógrafos que contribuyen y caltienen datos de carreteres, senderos, cafeteríes, estaciones de ferrocarril, y muncho más, pel mundu enteru. + local_knowledge_html: OpenStreetMap afala'l conocimientu llocal. Los collaboradores usen imaxes aérees, preseos GPS, y mapes de campu de baxa teunoloxía pa comprobar qu'OSM ye precisu y ta anováu. + local_knowledge_title: Conocimientu llocal + next: Siguiente + open_data_html: "OpenStreetMap son datos abiertos: tien llibertá d'usalos pa cualquier propósitu, siempre que-y dea créditu a OpenStreetMap y los sos collaboradores. Si altera o usa como base los datos de ciertes maneres, sólo pue distribuir el resultáu baxo la mesma llicencia. Vea la páxina de copyright y llicencia pa más detalles." + open_data_title: Datos abiertos + partners_title: Asociaos + used_by: "%{name} proporciona datos de mapes a cientos de sitios web, aplicaciones pa móviles, y preseos de hardware" activerecord: attributes: diary_comment: @@ -11,7 +23,7 @@ ast: language: Llingua latitude: Llatitú longitude: Llonxitú - title: Títulu + title: Asuntu user: Usuariu friend: friend: Amigu @@ -20,7 +32,7 @@ ast: body: Cuerpu recipient: Destinatariu sender: Remitente - title: Títulu + title: Asuntu trace: description: Descripción latitude: Llatitú @@ -36,7 +48,7 @@ ast: display_name: Nome a amosar email: Corréu languages: Llingües - pass_crypt: Conseña + pass_crypt: Contraseña models: acl: Llista de Control d'Accesu changeset: Conxuntu de cambios @@ -47,16 +59,16 @@ ast: friend: Amigu language: Llingua message: Mensaxe - node: Nodiu - node_tag: Etiqueta del nodiu + node: Nuedu + node_tag: Etiqueta del nuedu notifier: Avisador - old_node: Nodiu antiguu - old_node_tag: Etiqueta del nodiu antiguu + old_node: Nuedu antiguu + old_node_tag: Etiqueta del nuedu antiguu old_relation: Rellación antigua old_relation_member: Miembru de la rellación antigua old_relation_tag: Etiqueta de la rellación antigua old_way: Vía antigua - old_way_node: Nodiu de via antigua + old_way_node: Nuedu de via antigua old_way_tag: Etiqueta de vía antigua relation: Rellación relation_member: Miembru de la rellación @@ -69,7 +81,7 @@ ast: user_preference: Preferencia d'usuariu user_token: Token d'usuariu way: Vía - way_node: Nodiu de vía + way_node: Nuedu de vía way_tag: Etiqueta de vía application: require_cookies: @@ -80,163 +92,85 @@ ast: blocked: Se bloquió el to accesu a la API. Por favor, coneuta pela interfaz web pa saber más. need_to_see_terms: El to accesu a la API ta torgáu de mou temporal. Por favor, coneuta pela interfaz web pa ver los Términos de Collaboración. Nun fai falta aceutalos, pero debes conocelos. browse: + anonymous: anónimu changeset: - changeset: "Conxuntu de cambeos: %{id}" + belongs_to: Autor changesetxml: Conxuntu de cambeos XML - download: Descargar %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Conxuntu de cambeos %{id} title_comment: Conxuntu de cambeos %{id} - %{comment} + node: Nuedos (%{count}) + node_paginated: Nuedos (%{x}-%{y} de %{count}) osmchangexml: osmChange XML - title: Conxuntu de cambios - changeset_details: - belongs_to: "Pertenez a:" - bounding_box: "Cuadru de llende:" - box: cuadru - closed_at: "Zarráu el:" - created_at: "Creáu el:" - has_nodes: - one: "Tien el nodiu darréu:" - other: "Tien los %{count} nodios darréu:" - has_relations: - one: "Tien la rellación darréu:" - other: "Tien les %{count} rellaciones darréu:" - has_ways: - one: "Tien la vía darréu:" - other: "Tien les %{count} víes darréu:" - no_bounding_box: Nun se guardó un cuadru de llende pal conxuntu de cambeos. - show_area_box: Ver cuadru d'área - common_details: - changeset_comment: "Comentariu:" - deleted_at: "Desaniciáu el:" - deleted_by: "Desaniciáu por:" - edited_at: "Editáu el:" - edited_by: "Editáu por:" - in_changeset: "Nel conxuntu de cambeos:" - version: "Versión:" + relation: Rellaciones (%{count}) + relation_paginated: Rellaciones (%{x}-%{y} de %{count}) + title: "Conxuntu de cambios: %{id}" + way: Víes (%{count}) + way_paginated: Víes (%{x}-%{y} de %{count}) + closed: Zarráu + closed_by_html: Zarráu hai %{time} por %{user} + closed_html: Zarráu hai %{time} containing_relation: entry: Rellación %{relation_name} entry_role: Rellación %{relation_name} (como %{relation_role}) - map: - deleted: Desaniciáu - edit: - area: Editar área - node: Editar nodo - relation: Editar rellación - way: Editar vía - larger: - area: Ver área nun mapa más grande - node: Ver nodiu nún mapa más grande - relation: Ver rellación nun mapa más grande - way: Ver la vía nun mapa más grande - loading: Cargando... - navigation: - all: - next_changeset_tooltip: Conxuntu de cambeos siguiente - next_node_tooltip: Nodiu siguiente - next_relation_tooltip: Rellación siguiente - next_way_tooltip: Vía siguiente - prev_changeset_tooltip: Conxuntu de cambeos anterior - prev_node_tooltip: Nodiu anterior - prev_relation_tooltip: Rellación anterior - prev_way_tooltip: Vía anterior - user: - name_changeset_tooltip: Ver les ediciones de %{user} - next_changeset_tooltip: Siguiente edición de %{user} - prev_changeset_tooltip: Edición anterior de %{user} + created: Creáu + created_by_html: Creáu hai %{time} por %{user} + created_html: Creáu hai %{time} + deleted_by_html: Desaniciáu hai %{time} por %{user} + download_xml: Descargar XML + edited_by_html: Editáu hai %{time} por %{user} + in_changeset: Conxuntu de cambios + location: "Allugamientu:" + no_comment: (nun hai comentarios) node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Descargar XML - edit: editar - node: Nodiu - node_title: "Nodiu: %{node_name}" - view_history: ver historial - node_details: - coordinates: "Coordenaes:" - part_of: "Parte de:" - node_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Descargar XML - node_history: Historial del nodiu - node_history_title: "Historial del nodiu: %{node_name}" - view_details: ver detalles + history_title: "Historial del nuedu: %{name}" + title: "Nuedu: %{name}" not_found: - sorry: Perdón, el/la %{type} con id %{id} nun se pudo alcontrar. + sorry: Sentímoslo, el/la %{type} númberu %{id} nun pudo alcontrase. type: changeset: conxuntu de cambios - node: nodiu + node: nuedu relation: rellación way: vía - paging_nav: - of: de - showing_page: Amosando páxina + note: + closed_by: Resuelto por %{user} hai %{when} + closed_by_anonymous: Resuelto por un anónimu hai %{when} + closed_title: "Nota resuelta #%{note_name}" + commented_by: Comentariu de %{user} hai %{when} + commented_by_anonymous: Comentariu d'un anónimu hai %{when} + hidden_by: Tapecío por %{user} hai %{when} + hidden_title: "Nota tapecida #%{note_name}" + new_note: Nota nueva + open_by: Creáu por %{user} hai %{when} + open_by_anonymous: Creáu por un anónimu hai %{when} + open_title: "Nota ensin resolver #%{note_name}" + reopened_by: Reactivao por %{user} hai %{when} + reopened_by_anonymous: Reactivao por un anónimu hai %{when} + title: "Nota: %{id}" + part_of: Parte de redacted: message_html: La versión %{version} de %{type} nun se pue amosar porque ta redactada. Por favor consulta %{redaction_link} pa más detalles. redaction: Redaición de %{id} type: - node: nodiu + node: nuedu relation: rellación way: vía relation: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Descargar XML - relation: Rellación - relation_title: "Rellación: %{relation_name}" - view_history: ver historial - relation_details: - members: "Miembros:" - part_of: "Parte de:" - relation_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Descargar XML - relation_history: Historial de rellación - relation_history_title: "Historial de rellación: %{relation_name}" - view_details: ver detalles + history_title: "Historial de la rellación: %{name}" + members: Miembros + title: "Rellación: %{name}" relation_member: entry_role: "%{type} %{name} como %{role}" type: - node: Nodiu + node: Nuedu relation: Rellación way: Vía - start: - manually_select: Seleiciona manualmente un área distinta - view_data: Ver datos de la vista actual del mapa start_rjs: - data_frame_title: Datos - data_layer_name: Ver datos del mapa - details: Detalles - drag_a_box: Arrastra un cuadru nel mapa pa seleicionar un área - edited_by_user_at_timestamp: Editao por [[user]] el [[timestamp]] - hide_areas: Anubrir árees - history_for_feature: Historial de [[feature]] + feature_warning: Cargando %{num_features} carauterístiques, que puen facer que'l navegador vaya lentu o nun respuenda. ¿Ta seguru de que quier amosar estos datos? load_data: Cargar datos - loaded_an_area_with_num_features: "Cargasti un área que contién [[num_features]] carauterístiques. Polo xeneral, los restoladores nun pueden amosar bien esta cantidá de datos. Normalmente los restoladores funcionen meyor amosando menos de 100 carauterístiques al tiempu: d'otra miente se tornen lentos/dexen de responder. Si tas seguru d'amosar los datos, pues facelo calcando nel botón d'abaxo." loading: Cargando... - manually_select: Seleiciona manualmente un área distinta - object_list: - api: Recuperar esti área de l'API - back: Amosar llista d'oxetos - details: Detalles - heading: Llista d'oxetos - history: - type: - node: Nodiu [[id]] - way: Vía [[id]] - selected: - type: - node: Nodiu [[id]] - way: Vía [[id]] - type: - node: Nodiu - way: Vía - private_user: usuariu priváu - show_areas: Amosar árees - show_history: Ver historial - unable_to_load_size: "Nun se pue cargar: El tamañu del cuadru de llende [[bbox_size]] ye demasiao grande (tien de ser menor de %{max_bbox_size})" - wait: Espera... - zoom_or_select: Amplía o seleiciona un área del mapa pa velu tag_details: - tags: "Etiquetes:" + tags: Etiquetes wiki_link: key: La páxina wiki de descripción de la etiqueta %{key} tag: La páxina wiki de descripción de la etiqueta %{key}=%{value} @@ -245,41 +179,28 @@ ast: sorry: Perdón, los datos pa %{type} con id %{id}, tardaron demasiao en descargase. type: changeset: conxuntu de cambios - node: nodiu + node: nuedu relation: rellación way: vía + version: Versión + view_details: Ver detalles + view_history: Ver historial way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Descargar XML - edit: editar - view_history: ver historial - way: Vía - way_title: "Vía: %{way_name}" - way_details: also_part_of: - one: tamién ye parte de la vía %{related_ways} - other: tamién ye parte de les víes %{related_ways} - nodes: "Nodos:" - part_of: "Parte de:" - way_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Descargar XML - view_details: ver detalles - way_history: Historial de la vía - way_history_title: "Historial de la vía: %{way_name}" + one: parte de la vía %{related_ways} + other: parte de les víes %{related_ways} + history_title: "Historial de la vía: %{name}" + nodes: Nuedos + title: "Vía: %{name}" changeset: changeset: anonymous: Anónimu - big_area: (grande) - no_comment: (nengún) no_edits: (ensin ediciones) - show_area_box: ver cuadru d'área - still_editing: (editando entá) view_changeset_details: Ver detalles del conxuntu de cambeos changeset_paging_nav: next: Siguiente » previous: « Anterior - showing_page: Tas na páxina %{page} + showing_page: Páxina %{page} changesets: area: Área comment: Comentariu @@ -287,24 +208,17 @@ ast: saved_at: Guardao el user: Usuariu list: - description: Cambios recientes - description_bbox: Conxuntos de cambeos en %{bbox} - description_friend: Conxuntos de cambios de los tos collacios - description_nearby: Conxuntos de cambios d'usuarios cercanos - description_user: Conxuntos de cambeos de %{user} - description_user_bbox: Conxuntos de cambeos de %{user} en %{bbox} - heading: Conxuntos de cambios - heading_bbox: Conxuntos de cambios - heading_friend: Conxuntos de cambios - heading_nearby: Conxuntos de cambios - heading_user: Conxuntos de cambios - heading_user_bbox: Conxuntos de cambios + empty: Nun s'alcontró dengún conxuntu de cambios. + empty_area: Nun hai conxuntos de cambios nesti área. + empty_user: Nun hai conxuntos de cambios d'esti usuariu. + load_more: Cargar más + no_more: Nun s'alcontraron más conxuntos de cambios. + no_more_area: Nun hai más conxuntos de cambios nesti área. + no_more_user: Nun hai más conxuntos de cambios d'esti usuariu. title: Conxuntos de cambios - title_bbox: Conxuntos de cambeos en %{bbox} title_friend: Conxuntos de cambios de los tos collacios title_nearby: Conxuntos de cambios d'usuarios cercanos title_user: Conxuntos de cambeos de %{user} - title_user_bbox: Conxuntos de cambeos de %{user} en %{bbox} timeout: sorry: Llevó demasiao tiempu baxar la llista de conxuntos de cambeos que pidisti. diary_entry: @@ -324,6 +238,7 @@ ast: comment_count: one: 1 comentariu other: "%{count} comentarios" + zero: Ensin comentarios comment_link: Comentar esta entrada confirm: Confirmar edit_link: Editar esta entrada @@ -358,7 +273,7 @@ ast: newer_entries: Entraes más nueves no_entries: Nun hai entraes nel diariu older_entries: Entraes anteriores - recent_entries: "Entraes recientes del diariu:" + recent_entries: Entraes más nueves del diariu title: Diarios d'usuarios title_friends: Diarios de collacios title_nearby: Diarios d'usuarios cercanos @@ -382,6 +297,9 @@ ast: user_title: Diariu de %{user} editor: default: Predetermináu (anguaño %{name}) + id: + description: iD (editor nel navegador) + name: iD potlatch: description: Potlatch 1 (editor nel restolador) name: Potlatch 1 @@ -397,7 +315,7 @@ ast: area_to_export: Área a esportar embeddable_html: HTML empotrable export_button: Esportar - export_details: Los datos d'OpenStreetMap tan llicenciaos embaxo la llicencia Creative Commons Attribution-ShareAlike 2.0. + export_details: Los datos d'OpenStreetMap tan llicenciaos embaxo la llicencia Open Data Commons Open Database (ODbL). format: Formatu format_to_export: Formatu a esportar image_size: Tamañu d'imaxe @@ -413,29 +331,46 @@ ast: paste_html: Pegar el HTML pa empotrar nun sitiu web scale: Escala too_large: - body: Esti área ye abondo grande pa esportase como Datos XML d'OpenStreetMap. Acerca'l mapa o esbilla un área menor. - heading: Área demasiao grande + advice: "Si falla la esportación anterior, por favor, piense n'utilizar una de les fontes de la llista siguiente:" + body: Esti área ye abondo grande pa esportase como Datos XML d'OpenStreetMap. Acerca'l mapa o esbilla un área menor, o usa una de les fontes siguientes pa descargar cantidaes grandes de datos. + geofabrik: + description: Estractos anovaos regularmente de continentes, paises, y una esbilla de ciudaes + title: Descargues de Geofabrik + metro: + description: Estractos de les principales ciudaes del mundu y les árees d'alredor + title: Estractos de Metro + other: + description: Otres fontes más qu'apaecen na wiki d'OpenStreetMap + title: Otres fontes + overpass: + description: Descargar esti cuadru de llendes dende un espeyu de la base de datos d'OpenStreetMap + title: Overpass API + planet: + description: Copies anovaes regularmente de la base de datos completa d'OpenStreetMap + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Amestar un marcador al mapa - change_marker: Camudar la posición del marcador - click_add_marker: Calca nel mapa p'amestar un marcador - drag_a_box: Arrastra un cuadru nel mapa pa seleicionar un área - export: Esportar - manually_select: Seleiciona manualmente un área distinta - view_larger_map: Ver mapa mayor + title: Esportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Namái faiga clic en o nel mesmu iconu na vista del mapa.\nEsto pondrá un marcador nel mapa, que puede mover\nabasnando. Escriba'l so mensaxe, faiga clic en guardar, y otros mapeadores investigarán." + join_the_community: + explanation_html: Si atopó un problema colos datos del nuesu mapa; por exemplu una carretera que falta, o la so direición, lo meyor que pue facer ye xunise a la comunidá d'OpenStreetMap y amestar o reparar los datos vusté mesmu. + title: Xunise a la comunidá + title: Cómo ayudar + other_concerns: + explanation_html: "Si tien dalguna preocupación tocante a cómo tan usándose los nuesos datos o tocante al conteníu, consulte la\npáxina de drechos d'autor pa más información llegal, o comuníquese col grupu de trabayu de la OSMF afayadizu." + title: Otres preocupaciones + title: Informar d'un problema / iguar el mapa geocoder: description: title: geonames: Llugar de GeoNames - osm_namefinder: "%{types} de OpenStreetMap Namefinder" osm_nominatim: Llugar de OpenStreetMap Nominatim types: cities: Ciudaes places: Llugares towns: Villes - description_osm_namefinder: - prefix: "%{distance} al %{direction} de %{type}" direction: east: este north: norte @@ -456,16 +391,26 @@ ast: title: ca_postcode: Resultaos de Geocoder.CA geonames: Resultaos de GeoNames + geonames_reverse: Resultaos de GeoNames latlon: Resultaos internos - osm_namefinder: Resultaos de OpenStreetMap Namefinder osm_nominatim: Resultaos de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultaos de OpenStreetMap Nominatim uk_postcode: Resultaos de NPEMap / FreeThe Postcode us_postcode: Resultaos de Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} al %{direction} de %{placename}" search_osm_nominatim: + admin_levels: + level10: Frontera de barriu + level2: Frontera de país + level4: Frontera d'estáu + level5: Frontera de rexón + level6: Frontera de condáu + level8: Frontera de ciudá + level9: Frontera de villa prefix: + aerialway: + chair_lift: Telesilla + drag_lift: Telesquí + station: Estación de cable aeroway: aerodrome: Aeródromu apron: Aparcaderu d'aviones @@ -559,6 +504,7 @@ ast: shower: Ducha social_centre: Centru social social_club: Club social + social_facility: Instalación social studio: Estudiu supermarket: Supermercáu swimming_pool: Piscina @@ -587,6 +533,9 @@ ast: "yes": Ponte building: "yes": Edificiu + emergency: + fire_hydrant: Boca d'incendios + phone: Teléfonu d'emerxencia highway: bridleway: Caleya bus_guideway: Carril bus con guía @@ -608,6 +557,7 @@ ast: platform: Andén primary: Carretera primaria primary_link: Enllaz de carretera primaria + proposed: Carretera propuesta raceway: Pista de carreres residential: Residencial rest_area: Área de descansu @@ -619,6 +569,7 @@ ast: speed_camera: Radar steps: Escaleres stile: Pasera de muries + street_lamp: Farola tertiary: Carretera terciaria tertiary_link: Carretera terciaria track: Pista @@ -634,6 +585,7 @@ ast: building: Edificiu castle: Castiellu church: Ilesia + citywalls: Muralla fort: Fuerte house: Casa icon: Iconu @@ -643,6 +595,7 @@ ast: monument: Monumentu museum: Muséu ruins: Ruines + tomb: Sepulcru tower: Torre wayside_cross: Cruceru wayside_shrine: Ermita @@ -710,6 +663,8 @@ ast: airfield: Aeródromu militar barracks: Cuartel bunker: Bunker + mountain_pass: + "yes": Puertu de montaña natural: bay: Golfu beach: Playa @@ -779,6 +734,7 @@ ast: locality: Llocalidá moor: Amarradera municipality: Conceyu + neighbourhood: Vecindá postcode: Códigu postal region: Fastera, provincia sea: Mar @@ -804,8 +760,10 @@ ast: narrow_gauge: Ferrocarril de vía estrecha platform: Andén de ferrocarril preserved: Ferrocarril conserváu + proposed: Ferrocarril propuestu spur: Apartaderu industrial station: Estación de tren + stop: Apeaderu subway: Estación de metro subway_entrance: Entrada de metro switch: Aguyes de ferrocarril @@ -821,6 +779,7 @@ ast: beverages: Venta de bébores bicycle: Tienda de bicicletes books: Llibrería + boutique: Boutique butcher: Carnicería car: Automóvil car_parts: Repuestos d'automóvil @@ -834,6 +793,7 @@ ast: convenience: Alimentación copyshop: Copistería cosmetics: Perfumería + deli: Tienda gourmet department_store: Grandes almacenes discount: Productos con descuentu doityourself: Bricolax @@ -870,17 +830,21 @@ ast: organic: Comida ecolóxica outdoor: Aire llibre pet: Paxarería + pharmacy: Farmacia photo: Fotografía salon: Cuidaos corporales + second_hand: Tienda d'oxetos usaos shoes: Zapatería shopping_centre: Centru comercial sports: Deportes stationery: Papelería supermarket: Supermercáu + tailor: Sastrería toys: Xuguetería travel_agency: Axencia de viaxes video: Videu club wine: Venta de bébores + "yes": Tienda tourism: alpine_hut: Refuxu de montaña artwork: Obra d'arte @@ -903,6 +867,7 @@ ast: viewpoint: Mirador zoo: Zoo tunnel: + culvert: Cañu "yes": Túnel waterway: artificial: Vía acuática artificial @@ -926,65 +891,117 @@ ast: water_point: Toma d'agua waterfall: Saltu d'agua weir: Banzáu + help_page: + help: + description: Entrugar o buscar respuestes nel sitiu d'entrugues y respuestes d'OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap tien dellos recursos p'aprender sobro'l proyeutu, entrugar y contestar preguntes, y discutir y documentar en collaboración cuestiones de cartografía. + title: Algamar ayuda + welcome: + description: Principie con esta guía rápida que cubre lo básico d'OpenStreetMap. + title: Bienveníos a OSM + url: /welcome + wiki: + description: Mirar na wiki la documentación d'OSM más a fondu. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Zarrar + edit_help: Mueve'l mapa y amplía al llugar que quies editar, llueu calca equí. + key: + title: Clave del mapa + tooltip: Clave del mapa + tooltip_disabled: Lleenda del Mapa disponible sólo pa la capa estándar map: base: cycle_map: Mapa ciclista + hot: Humanitariu mapquest: MapQuest Open standard: Estándar transport_map: Mapa de tresportes + copyright: © collaboradores d'OpenStreetMap + donate_link_text: + layers: + data: Datos del mapa + header: Capes del mapa + notes: Notes de mapa + overlays: Activar les superposiciones pa diagnosticar el mapa + title: Capes + locate: + popup: Tas a {distance} {unit} d'esti puntu + title: Ver el mio allugamientu + zoom: + in: Ampliar + out: Amenorgar + notes: + new: + add: Amestar nota + intro: P'ameyorar el mapa la información qu'escriba amuesase a otros mapeadores, de mou que seya tolo descriptivu y precisu que pueda cuando mueva el marcador a la posición correuta y escriba la nota abaxo. + show: + anonymous_warning: Esta nota incluye comentarios d'usuarios anónimos que tendríen de comprobase de mou independiente. + comment: Comentar + comment_and_resolve: Comentar y resolver + hide: Anubrir + reactivate: Reactivar + resolve: Resolver + share: + cancel: Encaboxar + center_marker: Centrar el mapa na marca + custom_dimensions: Configurar dimensiones personalizaes + download: Descargar + embed: HTML + format: "Formatu:" + image: Imaxe + image_size: La imaxe amosará la capa estándar a + include_marker: Incluir marcador + link: Enllaz o HTML + long_link: Enllaz + paste_html: Pegar el HTML pa empotrar nun sitiu web + scale: "Escala:" + short_link: Enllaz curtiu + short_url: URL curtia + title: Compartir + view_larger_map: Ver mapa mayor site: + createnote_disabled_tooltip: Ampliar p'amestar una nota al mapa + createnote_tooltip: Amestar una nota al mapa edit_disabled_tooltip: Aumenta pa editar el mapa edit_tooltip: Editar el mapa - edit_zoom_alert: Tienes d'acercate pa editar el mapa - history_disabled_tooltip: Aumenta pa ver les ediciones d'esti área - history_tooltip: Ver ediciones nesti área - history_zoom_alert: Tienes d'aumentar pa ver les ediciones d'esti área + map_data_zoom_in_tooltip: Averar pa ver los datos del mapa + map_notes_zoom_in_tooltip: Averar pa ver les notes del mapa layouts: + about: Tocante a community: Comunidá community_blogs: Blogues de la Comunidá community_blogs_title: Blogues de miembros de la comunidá d'OpenStreetMap - copyright: Drechos d'autor y llicencia - documentation: Documentación - documentation_title: Documentación del proyeutu + copyright: Drechos d'autor + data: Datos donate: Sofita OpenStreetMap %{link} al Fondu pal Anovamientu del Hardware. - donate_link_text: donando edit: Editar edit_with: Editar con %{editor} export: Esportar - export_tooltip: Esportar datos del mapa + export_data: Esportar datos foundation: Fundación foundation_title: La Fundación OpenStreetMap gps_traces: Traces GPS gps_traces_tooltip: Xestionar traces de GPS help: Ayuda - help_centre: Centru d'ayuda - help_title: Sitiu d'ayuda del proyeutu history: Historial - home: entamu - home_tooltip: Dir al llugar d'entamu - inbox: buzón (%{count}) - inbox_tooltip: - one: El to buzón tien 1 mensax ensin lleer - other: El to buzón tien %{count} mensaxes ensin lleer - zero: El to buzón nun tien mensaxes ensin lleer - intro_1: OpenStreetMap ye un mapa editable llibre del mundu enteru. Ta fechu por xente como tu. + home: Dir al llugar d'entamu intro_2_create_account: Crear una cuenta d'usuariu - intro_2_download: descargar - intro_2_html: Los datos son llibres pa %{download} y %{use} baxo la so %{license}. %{create_account} p'ameyorar el mapa. - intro_2_license: llicencia abierta - intro_2_use: usar - license: - title: Los datos d'OpenStreetMap tan llicenciaos baxo la Llicencia Xenérica Creative Commons Attribution-Share Alike 2.0 - log_in: identificase + intro_header: ¡Bienveníos a OpenStreetMap! + intro_text: OpenStreetMap ye un mapa del mundu, creáu por persones como tu y d'usu llibre baxo una llicencia abierta. + learn_more: Más información + log_in: Aniciar sesión log_in_tooltip: Entrar nuna cuenta esistente logo: alt_text: Logo d'OpenStreetMap - logout: colar - logout_tooltip: Colar + logout: Salir make_a_donation: text: Fai un donativu title: Sofita OpenStreetMap con un donativu económicu + more: Más osm_offline: La base de datos d'OpenStreetMap anguaño ta desconectada mentanto se faen trabayos esenciales de mantenimientu de la base de datos. osm_read_only: La base de datos d'OpenStreetMap anguaño ta en mou de sólo llectura mentanto se faen trabayos esenciales de mantenimientu de la base de datos. partners_bytemark: Bytemark Hosting @@ -992,24 +1009,47 @@ ast: partners_ic: Imperial College de Londres partners_partners: asociaos partners_ucl: el Centru de RV de la UCL - sign_up: dase d'alta + sign_up: Dase d'alta sign_up_tooltip: Crear una cuenta pa editar - sotm2011: ¡Ven a la Conferencia OpenStreetMap 2011, The State of the Map, del 9 al 11 de setiembre en Denver! + start_mapping: Principiar col mapéu tag_line: El wikimapamundi llibre user_diaries: Diarios d'usuariu user_diaries_tooltip: Ver los diarios d'usuariu - view: Ver - view_tooltip: Ver el mapa - welcome_user: Bienveníu, %{user_link} - welcome_user_link_tooltip: La to páxina d'usuariu - wiki: Wiki - wiki_title: Sitiu wiki del proyeutu license_page: foreign: english_link: l'orixinal n'inglés text: En casu d'haber un conflictu ente esta páxina traducida y %{english_original_link}, la páxina n'inglés tendrá prioridá title: Tocante a esta traducción - legal_babble: "

    Drechos d'autor y llicencia

    \n

    \n OpenStreetMap son datos abiertos (Open Data), con llicencia Creative Commons Reconocimientu - Compartir igual 2.0 (CC BY-SA).\n

    \n

    \n Pues copiar, distribuir, tresmitir y adautar los nuesos mapes y datos de mou llibre, mentanto des reconocimientu a OpenStreetMap y a los sos collaboradores. Si camudes o creas conteníu sobre los nuesos mapes o datos, podrás distribuir el resultáu baxo la mesma llicencia. El códigu llegal completu t'esplica los tos drechos y obligaciones.\n

    \n\n

    Cómo dar reconocimientu a OpenStreetMap

    \n

    \n Si uses les imaxes de mapes d'OpenStreetMap, te pidimos que'l testu de reconocimientu ponga polo menos “© Collaboradores d'OpenStreetMap, CC BY-SA”. Si sólo vas usar datos del mapa, lo que pidimos ye “Datos del mapa © Collaboradores d'OpenstreetMap, CC BY-SA”.\n

    \n

    \n Onde se pueda, OpenStreetMap tendría d'enllazase a http://www.openstreetmap.org/\n y CC BY-SA a http://creativecommons.org/licenses/by-sa/2.0/. Si tas usando un mediu que nun permita los enllaces (por casu, en trabayos imprentaos), t'encamentamos dirixir a los llectores a www.openstreetmap.org (por exemplu, ampliando ‘OpenStreetMap’ a esta direición completa) y a www.creativecommons.org.\n

    \n\n

    Pa saber más

    \n

    \n Llei más tocante a cómo utilizar los nuesos datos en Entrugues y rempuestes llegales (n'inglés).\n

    \n

    \n Recordamos a los collaboradores d'OSM qu'enxamás amiesten datos que vengan d'una fonte con drechos d'autor acutaos (p. ex. de Google Maps o mapes impresos) ensin el permisu esplícitu de los dueños de los drechos d'autor.\n

    \n

    \n Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros.\n\n Llee la nuesa Política d'usu de la API (n'inglés),\n Política d'usu d'imaxes (n'inglés)\n y Política d'usu de Nominatim (n'inglés tamién).\n

    \n\n

    Los nuesos collaboradores

    \n

    \n La nuesa llicencia CC BY-SA requier “reconocer al autor orixinal, de manera razonable pal mediu o los medios que teas utilizando”. Los mapeadores individuales d'OSM nun piden más créditu que “Collaboradores d'OpenStreetMap”, pero cuando s'incluye n'OpenStreetMap información d'un organismu nacional de cartografía o d'otra fuente importante, ye razonable reproducir el so créditu direutamente o enllazar al mesmu nesta páxina.\n

    \n\n\n\n
      \n
    • Australia: Contien datos de barrios basaos en datos de Australian Bureau of\n Statistics.
    • \n
    • Austria: Contien datos de\n Stadt Wien (baxo\n CC BY),\n Land Vorarlberg y\n Land Tirol (baxo CC-BY AT con enmiendes).
    • \n
    • Canadá: Contien datos de GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), y StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Francia: Contien datos sacaos de Direction Générale des Impôts.
    • \n
    • Holanda: Contien datos © AND, 2007\n (www.and.com)
    • \n
    • Nueva Zelanda: Contien datos sacaos de Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polonia: Contien datos de mapes UMP-pcPL. Copyright collaboradores de\n UMP-pcPL.
    • \n \n Más tocante al usu n'OSM de datos UMP\n
    • Sudáfrica: Contién datos sacaos de\n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved.
    • \n
    • Reinu Xuníu: Contien datos de Ordnance Survey © Crown copyright and database right 2010.
    • \n
    \n\n

    \n La inclusión de datos n'OpenStreetMap nun significa que'l fornidor de los datos orixinales sofite OpenStreetMap, ufra garantía dala o aceute dalguna responsabilidá.\n

    " + legal_babble: + attribution_example: + alt: Exemplu de cómo dar reconocimientu a OpenStreetMap nuna páxina web + title: Exemplu de reconocimientu + contributors_at_html: "Austria: Contien datos de\nStadt Wien (baxo\nCC BY),\nLand Vorarlberg y\nLand Tirol (baxo CC-BY AT con enmiendes)." + contributors_ca_html: "Canadá: Contien datos de GeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), y StatCan (Geography Division,\nStatistics Canada)." + contributors_fi_html: "Finlandia: Contien datos de la base de datos topográfica de la National Land Survey de Finlandia\ny otros conxuntos de datos, baxo la Llicencia NLSFI." + contributors_footer_1_html: "Pa más detalles d'estes, y otres fontes que s'usaron p'ayudar a\nameyorar OpenStreetMap, por favor, llei la Páxina\nde los collaboradores na Wiki d'OpenStreetMap." + contributors_footer_2_html: La inclusión de datos n'OpenStreetMap nun significa que'l fornidor de los datos orixinales sofite OpenStreetMap, ufra garantía dala o aceute dalguna responsabilidá. + contributors_fr_html: "Francia: Contien datos sacaos de Direction Générale des Impôts." + contributors_gb_html: "Reinu Xuníu: Contien datos de Ordnance Survey © Crown copyright and database right 2010-12." + contributors_intro_html: "Los nuesos collaboradores son miles de persones. Incluimos tamién datos con llicencia abierta d'axencies cartográfiques nacionales y d'otres fontes, ente elles:" + contributors_nl_html: "Holanda: Contien datos © AND, 2007\n(www.and.com)" + contributors_nz_html: "Nueva Zelanda: Contien datos sacaos de Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Los nuesos collaboradores + contributors_za_html: "Sudáfrica: Contién datos sacaos de\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: Requerimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”. + credit_2_html: "Tamién debes dexar claro que los datos tan disponibles baxo la llicencia Open Database License (ODbL), y si utilices los nuesos mosaicos de mapa, que la cartografía tien llicencia CC-BY-SA. Pues facelo enllazando a esta páxina de drechos d'autor.\nAlternativamente, y como requisitu si distribúis OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres impreses), te suxerimos dirixir a los llectores a openstreetmap.org (espandiendo «OpenStreetMap» a esta dirección completa, seique), a opendatacommons.org y, si ye'l casu, a creativecommons.org." + credit_3_html: "Nun mapa electrónicu navegable, los créditos tendríen d'apaecer na esquina del mapa.\nPor exemplu:" + credit_title_html: Cómo dar reconocimientu a OpenStreetMap + infringement_1_html: Recordamos a los collaboradores d'OSM qu'enxamás amiesten datos que vengan d'una fonte con drechos d'autor acutaos (p. ex. de Google Maps o mapes impresos) ensin el permisu esplícitu de los dueños de los drechos d'autor. + infringement_2_html: Si crees que s'amestó de mou inapropiáu material con drechos d'autor a la base de datos d'OpenStreetMap o a esti sitiu, consulta'l nuesu procedimientu de retirada de datos o pidilo direutamente nel nuesu formulariu en llinia. + infringement_title_html: Incumplimientu de drechos d'autor + intro_1_html: "OpenStreetMap son datos abiertos, baxo llicencia Open Data\nCommons Open Database License (ODbL)." + intro_2_html: Pues copiar, distribuir, tresmitir y adautar los nuesos datos de mou llibre, mentanto des reconocimientu a OpenStreetMap y a los sos collaboradores. Si camudes o creas conteníu sobre los nuesos datos, namái podrás distribuir el resultáu baxo la mesma llicencia. El códigu llegal completu t'esplica los tos drechos y obligaciones. + intro_3_html: La cartografía de los mosaicos del mapa y la nuesa documentación, tan llicenciaos baxo la llicencia Creative Commons Reconocimientu-CompartirIgual 2.0 (CC-BY-SA). + more_1_html: "Llei más tocante a cómo utilizar los nuesos datos, y cómo acreditanos, en Entrugues y rempuestes llegales (n'inglés)." + more_2_html: "Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros.\nLlei la nuesa Política d'usu de la API (n'inglés),\nPolítica d'usu d'imaxes (n'inglés)\ny Política d'usu de Nominatim (n'inglés tamién)." + more_title_html: Pa saber más + title_html: Drechos d'autor y llicencia native: mapping_link: principiar col mapéu native_link: versión n'asturianu @@ -1069,12 +1109,9 @@ ast: title: Buzón de salida to: Pa read: - back_to_inbox: Tornar al buzón d'entrada - back_to_outbox: Tornar al buzón de salida + back: Anterior date: Data from: De - reading_your_messages: Lleendo los mensaxes - reading_your_sent_messages: Lleendo los mensaxes unviaos reply_button: Contestar subject: Asuntu title: Lleer el mensaxe @@ -1085,6 +1122,37 @@ ast: wrong_user: Tas coneutáu como `%{user}' pero el mensaxe que quies contestar nun s'unvió a esi usuariu. Coneuta col usuariu correchu pa contestar. sent_message_summary: delete_button: Desaniciar + note: + description: + closed_at_by_html: Resuelta hai %{when} por %{user} + closed_at_html: Resuelta hai %{when} + commented_at_by_html: Anovada hai %{when} por %{user} + commented_at_html: Anovada hai %{when} + opened_at_by_html: Creada hai %{when} por %{user} + opened_at_html: Creada hai %{when} + reopened_at_by_html: Reactivada hai %{when} por %{user} + reopened_at_html: Reactivada hai %{when} + entry: + comment: Comentariu + full: Nota completa + mine: + ago_html: hai %{when} + created_at: Creada el + creator: Creador + description: Descripción + heading: notes de %{user} + id: Id + last_changed: Cambéu postreru + subheading: Notes unviaes o comentaes por %{user} + title: Notes unviaes o comentaes por %{user} + rss: + closed: nota zarrada (cerca de %{place}) + commented: comentariu nuevu (cerca de %{place}) + description_area: Llista de notes, escrites, comentaes o zarraes en so área [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Una canal rss pa la nota %{id} + opened: nota nueva (cerca de %{place}) + reopened: nota reactivada (cerca de %{place}) + title: Notes d'OpenStreetMap notifier: diary_comment_notification: footer: Tamién pues lleer el comentariu en %{readurl}, y comentalu en %{commenturl} o contestar en %{replyurl} @@ -1100,8 +1168,7 @@ ast: email_confirm_plain: click_the_link: Si yes tú, calca nel enllaz d'abaxo pa confirmar el cambéu. greeting: Bones, - hopefully_you_1: Dalguién (esperamos que tu) quier camudar la so direición de corréu en - hopefully_you_2: "%{server_url} a %{new_address}." + hopefully_you: Dalguién (esperamos que tu) quier camudar la so direición de corréu en %{server_url} a %{new_address}. friend_notification: befriend_them: Tamién pues amestalos como amigos en %{befriendurl}. had_added_you: "%{user} t'amestó como amigu en OpenStreetMap." @@ -1130,44 +1197,36 @@ ast: lost_password_plain: click_the_link: Si yes tu, calca nel enllaz d'abaxo pa reaniciar la to conseña. greeting: Bones, - hopefully_you_1: Dalguién (esperamos que tu) pidió que se-y reanicie la conseña na - hopefully_you_2: cuenta con estes señes de corréu d'openstreetmap.org. + 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. message_notification: - footer1: Tamién pues lleer el mensax en %{readurl} - footer2: y pues contestar en %{replyurl} + footer_html: Tamién pue lleer el mensaxe en %{readurl} y pue responder en %{replyurl} header: "%{from_user} t'unvió un mensax per OpenStreetMap col asuntu %{subject}:" hi: Bones %{to_user}, + note_comment_notification: + anonymous: Un usuariu anónimu + closed: + commented_note: "%{commenter} solucionó una nota del mapa na que vusté comentó. La nota ta cerca de %{place}." + subject_other: "[OpenStreetMap] %{commenter} solucionó una nota na que ta interesáu" + subject_own: "[OpenStreetMap] %{commenter} solucionó una de les sos notes" + your_note: "%{commenter} solucionó una de les notes del mapa cerca de %{place}." + commented: + commented_note: "%{commenter} dexó un comentariu sobro una nota del mapa na que vusté comentó. La nota ta cerca de %{place}." + subject_other: "[OpenStreetMap] %{commenter} fizo un comentariu sobro una nota na que ta interesáu" + subject_own: "[OpenStreetMap] %{commenter} fizo un comentariu sobro una de les sos notes" + your_note: "%{commenter} dexó un comentariu sobro una de les notes del mapa cerca de %{place}." + details: Pue alcontrar más detalles sobro la nota en %{url}. + greeting: Bones, + reopened: + commented_note: "%{commenter} reactivó una nota del mapa na que vusté comentó. La nota ta cerca de %{place}." + subject_other: "[OpenStreetMap] %{commenter} reactivó una nota na que ta interesáu" + subject_own: "[OpenStreetMap] %{commenter} reactivó una de les sos notes" + your_note: "%{commenter} reactivó una de les notes del mapa cerca de %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirma la to direición de corréu" - signup_confirm_html: - ask_questions: Pues facer toles entrugues que pudieres tener tocante a OpenStreetMap nel sitiu d'entrugues y rempuestes. - click_the_link: Si yer tu, ¡bienllegáu/ada! Calca nel enllaz d'abaxo pa confirmar esa cuenta y sigui lleendo pa más información tocante a OpenStreetMap. - current_user: Hai una llista d'usuarios por categoríes, basada nel llugar del mundu onde tan, que ta disponible enCategory:Users_by_geographical_region. - get_reading: Hai llectura tocante a OpenStreetMap na wiki, sigui les caberes noticies nel blogue d'OpenStreetMap o per Twitter, o visita'l blogue OpenGeoData, del fundador d'OpenStreetMapSteve Coast, pa la hestoria resumida del proyeutu, ¡que tamién tien podcasts pa escuchar! - greeting: ¡Hola! - hopefully_you: Dalguién (esperamos que tu) quier crear una cuenta en - introductory_video: Pues ver un %{introductory_video_link}. - more_videos: Equí hai %{more_videos_link}. - more_videos_here: más videos - user_wiki_page: S'encamienta que crees una páxina wiki d'usuariu, qu'incluya etiquetes de categoría pa marcar ú tas, como [[Category:Users_in_London]]. - video_to_openstreetmap: videu d'introducción a OpenStreetMap - wiki_signup: Tamién pue ser que t'interese rexistrate na wiki d'OpenStreetMap. - signup_confirm_plain: - ask_questions: "Pues facer toles entrugues que pudieres tener tocante a OpenStreetMap nel sitiu d'entrugues y rempuestes:" - blog_and_twitter: "Sigui les caberes noticies nel blogue d'OpenStreetMap o per Twitter:" - click_the_link_1: Si yer tu, ¡bienllegáu/ada! Calca nel enllaz d'abaxo pa confirmar la to - click_the_link_2: cuenta y sigui lleendo pa más información tocante a OpenStreetMap. - current_user_1: Hai una llista d'usuarios por categoríes, basada nel llugar del mundu - current_user_2: "onde tan, ta disponible en:" + confirm: "Antes de facer nada, necesitamos confirmar qu'esta solicitú ye daveres tuya; si ye asina, calca nel enllaz de más abaxo pa confirmar la cuenta:" + created: Dalguién (seique tu) vien de crear una cuenta en %{site_url}. greeting: ¡Hola! - hopefully_you: Dalguién (esperamos que tu) quier crear una cuenta en - introductory_video: "Pues ver un videu d'introducción a OpenStreetMap equí:" - more_videos: "Equí hai más videos:" - opengeodata: "OpenGeoData.org ye'l blogue de Steve Coast, fundador d'OpenStreetMap, que tamién tien podcasts:" - the_wiki: "Hai llectura tocante a OpenStreetMap na wiki:" - user_wiki_1: S'encamienta que crees una páxina wiki d'usuariu, qu'incluya - user_wiki_2: etiquetes de categoría pa marcar ú tas, como [[Category:Users_in_London]]. - wiki_signup: "Tamién pue ser que t'interese rexistrate na wiki d'OpenStreetMap en:" + subject: "[OpenStreetMap] Bienllegáu a OpenStreetMap" + welcome: En confirmando la cuenta, daremoste dalguna información más p'ayudate nos primeros pasos. oauth: oauthorize: allow_read_gpx: lleer les tos traces GPS privaes. @@ -1176,8 +1235,18 @@ ast: allow_write_api: camudar el mapa. allow_write_diary: crear entraes del diariu, comentarios y facer amigos. allow_write_gpx: xubir traces GPS. + allow_write_notes: camudar notes. allow_write_prefs: camudar les preferencies d'usuariu. request_access: L'aplicación %{app_name} ta solicitando accesu a la to cuenta, %{user}. Por favor, revisa si quies que l'aplicación tenga les capacidaes darréu. Puedes esbillar tantes o tan poques como te preste. + title: Autorizar l'accesu a la so cuenta + oauthorize_failure: + denied: Refugó a l'aplicación %{app_name} l'accesu a la so cuenta. + invalid: El pase d'autorización nun ye válidu. + title: Falló la solicitú d'autorización + oauthorize_success: + allowed: Permitió que l'aplicación %{app_name} tenga accesu a la so cuenta. + title: Solicitú d'autorización permitida + verification: El códigu de comprobación ye %{code}. revoke: flash: Refugasti'l token pa %{application} oauth_clients: @@ -1194,6 +1263,7 @@ ast: allow_write_api: camudar el mapa. allow_write_diary: crear entraes del diariu, comentarios y facer amigos. allow_write_gpx: xubir traces GPS. + allow_write_notes: camudar notes. allow_write_prefs: camudar les preferencies d'usuariu. callback_url: URL de retornu name: Nome @@ -1224,6 +1294,7 @@ ast: allow_write_api: camudar el mapa. allow_write_diary: crear entraes del diariu, comentarios y facer amigos. allow_write_gpx: xubir traces GPS. + allow_write_notes: camudar notes. allow_write_prefs: camudar les preferencies d'usuariu. authorize_url: "URL d'autorización:" confirm: ¿Tas seguru? @@ -1232,7 +1303,7 @@ ast: key: "Clave del consumidor:" requests: "Pidir los permisos darréu al usuariu:" secret: "Pregunta secreta del consumidor:" - support_notice: Tenemos sofitu pa HMAC-SHA1 (encamentáu) igual que pa testu planu en mou ssl. + support_notice: Tenemos sofitu pa HMAC-SHA1 (encamentáu) y pa robles RSA-SHA1. title: Detalles d'OAuth pa %{app_name} url: "URL del Token de Solicitú:" update: @@ -1272,6 +1343,7 @@ ast: edit: anon_edits_link_text: Descubri por qué ye'l casu. flash_player_required: 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. + 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. not_public: Nun configurasti les tos ediciones como públiques. not_public_description: Nun puedes siguir editando'l mapa mentanto nun lo faigas. Puedes marcar les tos ediciones como públiques dende la to %{user_page}. @@ -1280,18 +1352,15 @@ ast: 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). user_page_link: páxina d'usuariu index: + createnote: Amestar una nota js_1: O tas usando un restolador ensin sofitu pa JavaScript, o tienes JavaScript desactiváu. js_2: OpenStreetMap usa JavaScript pal so mapa eslizante. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Llicenciao baxo llicencia %{license_name} pol %{project_name} y los sos collaboradores. - project_name: Proyeutu OpenStreetMap + copyright: Copyright OpenStreetMap y collaboradores, baxo una llicencia abierta permalink: Enllaz permanente remote_failed: Falló la edición - asegúrate de tener cargáu JOSM o Merkaartor y de que tea activada la opción de control remotu shortlink: Enllaz curtiu key: - map_key: Lleenda del mapa - map_key_tooltip: Símbolos del mapa table: entry: admin: Llende alministrativa @@ -1377,7 +1446,6 @@ ast: preview: Vista previa search: search: Guetar - search_help: "exemplos: 'Xixón', 'Cai Uría, Uviéu', 'CB2 5AQ', o 'oficines de correos cerca de Llanes' más exemplos..." submit_text: Dir where_am_i: ¿Ú toi? where_am_i_title: Describi el to allugamientu actual usando el motor de gueta @@ -1393,6 +1461,11 @@ ast: upload_trace: Xubir traza GPS delete: scheduled_for_deletion: Traza marcada pa desaniciar + description: + description_with_count: + one: Ficheru GPX con un puntu de %{user} + other: Ficheru GPX con %{count} puntos de %{user} + description_without_count: Ficheru GPX de %{user} edit: description: "Descripción:" download: descargar @@ -1410,7 +1483,11 @@ ast: uploaded_at: "Xubida:" visibility: "Visibilidá:" visibility_help: ¿qué ye esto? + georss: + title: Traces GPS d'OpenStreetMap list: + description: Ver les xubes más nueves de traces GPS + empty_html: Entá nun hai nada equí. Carga una nueva traza o deprendi más tocante a cómo trazar col GPS na página de la wiki. public_traces: Traces GPS públiques public_traces_from: Traces GPS públiques de %{user} tagged_with: " etiquetao con %{tags}" @@ -1450,14 +1527,14 @@ ast: trace_header: see_all_traces: Ver toles traces see_your_traces: Ver toles tos traces - traces_waiting: Tienes %{count} traces esperando pa xubir. Considera esperar a qu'eses terminen enantes de xubir más, col envís de nun bloquiar la cola pa otros usuarios. + traces_waiting: "{PLURAL|one=Tien %{count} traza esperando pa xubir. Considere esperar a qu'esta termine enantes de xubir más, col envís de nun bloquiar la cola pa otros usuarios.|Tien %{count} traces esperando pa xubir. Considere esperar a qu'estes terminen enantes de xubir más, col envís de nun bloquiar la cola pa otros usuarios.}}" upload_trace: Xubir una traza trace_optionals: tags: Etiquetes trace_paging_nav: - next: Siguiente » - previous: « Anterior - showing_page: Tas na páxina %{page} + newer: Traces más nueves + older: Traces más antigües + showing_page: Páxina %{page} view: delete_track: Desaniciar esta traza description: "Descripción:" @@ -1496,6 +1573,10 @@ ast: email never displayed publicly: (nunca s'amuesa en público) flash update success: La información del usuariu s'anovó correutamente. flash update success confirm needed: La información del usuariu s'anovó correutamente. Nel to corréu electrónicu alcontrarás una nota pa confirmar la to nueva direición de corréu. + gravatar: + gravatar: Usar Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: ¿qué ye esto? home location: "Llugar d'orixe:" image: "Imaxe:" image size hint: (les imaxes cuadraes de polo menos 100x100 funcionen meyor) @@ -1531,13 +1612,13 @@ ast: update home location on click: ¿Anovar el llugar d'orixe calcando nel mapa? confirm: already active: Esta cuenta yá se confirmó. - before you start: Sabemos que probablemente tienes priesa por comenzar a facer mapes, pero enantes seique quieras completar la información tocante a tigo mesmu nel formulariu d'abaxo. button: Confirmar - heading: Confirmar una cuenta d'usuariu + heading: ¡Revisa el corréu! + introduction_1: Unviamoste un corréu de confirmación. + introduction_2: Confirma la cuenta calcando nel enllaz del corréu y podrás ponete a editar los mapes. press confirm button: Calca nel botón de confirmación d'abaxo p'activar la to cuenta. - reconfirm: Si yá hai tiempu que te rexistrasti seique necesites unviate un nuevu corréu de confirmación. - success: Cuenta confirmada, ¡gracies por rexistrate! - unknown token: Paez qu'esi token nun esiste. + reconfirm_html: Si necesites que volvamos a unviate'l corréu de confirmación, calca equí. + unknown token: El códigu de confirmación caducó o nun esiste. confirm_email: button: Confirmar failure: Yá se confirmó una direición de corréu electrónicu con esti token. @@ -1557,8 +1638,8 @@ ast: heading: Usuarios hide: Anubrir los usuarios esbillaos showing: - one: Amosando la páxina %{page} (%{first_item} de %{items}) - other: Amosando la páxina %{page} (%{first_item}-%{last_item} de %{items}) + one: Páxina %{page} (%{first_item} de %{items}) + other: Páxina %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} creáu dende %{ip_address} el %{date}" summary_no_ip: "%{name} creáu el %{date}" title: Usuarios @@ -1573,8 +1654,6 @@ ast: lost password link: ¿Perdisti la conseña? new to osm: ¿Yes nuevu con OpenStreetMap? no account: ¿Nun tienes una cuenta? - notice: Saber más tocante al próximu cambiu de llicencia d'OpenStreetMap (traducciones) (alderique) - notice_terms: OpenStreetMap va movese a una llicencia nueva dende'l 1 d'abril de 2012. Ye igual d'abierta que l'actual, pero les partes llegales s'acomoden meyor a la nuesa base de datos del mapa. Gustaría-nos caltener les tos collaboraciones n'OpenStreetMap, pero namái podemos facelo si aceutes que les distribuyamos baxo la nueva llicencia. D'otra miente, tendremos que desaniciales de la base de datos.

    Por favor, entra na to cuenta y toma dellos segundos pa revisar y aceutar los nuevos términos. ¡Gracies! openid: "%{logo} OpenID:" openid invalid: Sentímoslo, la to OpenID paez que ta mal formada openid missing provider: Sentímoslo, nun pudimos ponenos en contautu col to sirvidor d'OpenID @@ -1598,7 +1677,7 @@ ast: yahoo: alt: Coneutar con una OpenID de Yahoo title: Coneutar con Yahoo - password: "Conseña:" + password: "Contraseña:" register now: Rexistrate agora remember: "Recordame:" title: Entrar @@ -1607,8 +1686,8 @@ ast: with username: "¿Yá tienes cuenta n'OpenStreetMap? Por favor, entra col to nome d'usuariu y conseña:" logout: heading: Colar d'OpenStreetMap - logout_button: Colar - title: Colar + logout_button: Salir + title: Salir lost_password: email address: "Direición de corréu electrónicu:" heading: ¿Escaecisti la conseña? @@ -1619,29 +1698,31 @@ ast: title: Conseña perdida make_friend: already_a_friend: Yá yes collaciu de %{name}. + button: Amestar como amigu failed: Lo sentimos, hebo un fallu al amestar a %{name} como collaciu. - success: "%{name} agora ye amigu tuyu." + heading: ¿Amestar a %{user} a los amigos? + success: ¡%{name} agora ye'l to amigu! new: + about: + header: Llibre y editable + html: "

    De mou distintu a otros mapes, OpenStreetMap ta creáu completamente por persones\ncomo tu, y cualquiera tien llibertá pa igualu, anovalu, descargalu y usalu.

    \n

    Date d'alta pa empezar a collaborar. Unviaremoste un corréu pa confirmar la cuenta.

    " confirm email address: "Confirmar direición de corréu:" - confirm password: "Confirma la conseña:" + confirm password: "Confirma la contraseña:" contact_webmaster: Ponte en contautu col webmaster p'arreglar la creación d'una cuenta - procuraremos xestionar la solicitú lo más aína que podamos. - continue: Siguir + continue: Date d'alta display name: "Nome a amosar:" display name description: El nome d'usuariu que s'amuesa en público. Pue camudalo más sero nes preferencies. email address: "Direición de corréu electrónicu:" - fill_form: Rellena'l formulariu y t'unviaremos un mensaxe de corréu rápidamente p'activar la to cuenta. - flash create success message: Gracies por rexistrate. Venimos d'unvia un corréu de confirmación a %{email} y darréu que confirmes la to cuenta tarás preparáu pa mapear.

    Si uses un sistema escontra'l corréu puxarra qu'unvia solicitúes de confirmación, asegúrate d'amestar webmaster@openstreetmap.org na llista blanca de remitentes seguros, porque nós nun podemos responder solicitúes de confirmación. - heading: Crear una cuenta d'usuariu license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los términos de collaboración. no_auto_account_create: Por desgracia anguaño nun podemos crear una cuenta por ti automáticamente. not displayed publicly: Nun s'amuesa en público (ver la política de protección de datos) openid: "%{logo} OpenID:" openid association: "

    La to OpenID nun ta asociada con una cuenta d'OpenStreetMap entá.

    \n
      \n
    • Si yes nuevu n'OpenStreetMap, por favor crea una cuenta nueva col formulariu darréu.
    • \n
    • \n Si yá tienes una cuenta, pues entrar nella col to nome\n d'usuariu y conseña, y entós asociar la cuenta cola OpenID\n nes preferencies d'usuariu.\n
    • \n
    " openid no password: Con OpenID nun fai falta una conseña, pero delles ferramientes estra o sirvidores entá puen necesitala. - password: "Conseña:" + password: "Contraseña:" terms accepted: ¡Gracies por aceutar les condiciones de collaboración! terms declined: Sentimos que decidieres nun aceutar les Condiciones de Collaboración. Pa más información llei esta páxina wiki. - title: Crear una cuenta + title: Date d'alta use openid: Como alternativa, usa %{logo} OpenID pa coneutar no_such_user: body: Lo siento, nun hai dengún usuariu col nome %{user}. Comprueba la escritura o si calcasti nun enllaz enquivocáu, seique. @@ -1652,15 +1733,17 @@ ast: nearby mapper: Mapeador próximu your location: El to allugamientu remove_friend: + button: Desaniciar como amigu + heading: ¿Desaniciar como amigu a %{user}? not_a_friend: "%{name} nun ye un de los tos amigos." success: "%{name} se desanició de los tos amigos." reset_password: - confirm password: "Confirma la conseña:" + confirm password: "Confirma la contraseña:" flash changed: Se camudó la to conseña flash token bad: Nun s'alcontró esi token, ¿tendríes de comprobar la URL, seique? heading: Reaniciar la conseña de %{user} - password: "Conseña:" - reset: Reaniciar conseña + password: "Contraseña:" + reset: Reaniciar contraseña title: Reaniciar conseña set_home: flash success: Llocalización d'aniciu guardada correutamente @@ -1686,12 +1769,12 @@ ast: you need to accept or decline: Por favor, llei y aceuta o refuga les nueves Condiciones de Collaboración pa siguir. view: activate_user: activar esti usuariu - add as friend: amestar como amigu + add as friend: Amestar como amigu ago: (hai %{time_in_words_ago}) - block_history: ver los bloqueos recibíos - blocks by me: bloqueos puestos - blocks on me: bloqueos recibíos - comments: comentarios + block_history: bloqueos recibíos + blocks by me: Bloqueos puestos + blocks on me: Bloqueos recibíos + comments: Comentarios confirm: Confirmar confirm_user: confirmar esti usuariu create_block: bloquiar esti usuariu @@ -1703,31 +1786,35 @@ ast: deactivate_user: desactivar esti usuariu delete_user: desaniciar esti usuariu description: Descripción - diary: diariu - edits: ediciones + diary: Diariu + edits: Ediciones email address: "Direición de corréu electrónicu:" - friends_changesets: Esplorar tolos conxuntos de cambios de los collacios - friends_diaries: Ver toles entraes de diariu de los collacios + friends_changesets: conxuntos de cambios de los amigos + friends_diaries: entraes de diariu de los amigos hide_user: anubrir esti usuariu - if set location: Si defines el to allugamientu, equí apaecerá un guapu mapa. Pues conseñar un llugar d'orixe na to páxina de %{settings_link}. + if set location: Configura'l to allugamientu na páxina de %{settings_link} pa ver los usuarios cercanos. km away: a %{count}km de distancia latest edit: "Cabera edición %{ago}:" m away: a %{count}m de distancia mapper since: "Mapeador dende:" - moderator_history: ver los bloqueos puestos - my comments: los mios comentarios - my diary: el mio diariu - my edits: les mios ediciones - my settings: les mios preferencies - my traces: les mios traces + moderator_history: bloqueos puestos + my comments: Los mios comentarios + my diary: El mio diariu + my edits: Les mios ediciones + my messages: Los mios mensaxes + my notes: Les mios notes + my profile: El mio perfil + my settings: Les mios preferencies + my traces: Les mios traces nearby users: Otros usuarios próximos - nearby_changesets: Ver tolos conxuntos de cambios d'usuarios cercanos - nearby_diaries: Ver toles entraes de diariu d'usuarios cercanos + nearby_changesets: conxuntos de cambios d'usuarios cercanos + nearby_diaries: entraes de diariu d'usuarios cercanos new diary entry: nueva entrada del diariu no friends: Entá nun amestasti dengún amigu. no nearby users: Entá nun hai otros usuarios que tean mapeando cerca de ti. + notes: Notes de mapa oauth settings: configuración OAuth - remove as friend: desaniciar como amigu + remove as friend: Desaniciar como amigu role: administrator: Esti usuariu ye alministrador grant: @@ -1737,11 +1824,11 @@ ast: revoke: administrator: Quitar accesu d'alministrador moderator: Quitar accesu de moderador - send message: unviar mensaxe + send message: Unviar mensaxe settings_link_text: preferencies spam score: "Puntuación de corréu puxarra:" status: "Estáu:" - traces: traces + traces: Traces unhide_user: amosar esti usuariu user location: Allugamientu del usuariu your friends: Los tos amigos @@ -1799,11 +1886,14 @@ ast: creator_name: Creador display_name: Usuariu bloquiáu edit: Editar + next: Siguiente » not_revoked: (non desaniciáu) + previous: « Anterior reason: Motivu del bloquéu revoke: ¡Desaniciar! revoker_name: Desaniciáu por show: Amosar + showing_page: Páxina %{page} status: Estáu period: one: 1 hora @@ -1851,3 +1941,25 @@ ast: fail: Nun pues quita-y el rol "%{role}" al usuariu "%{name}". Comprueba que tanto l'usuariu como'l rol son válidos. heading: Confirmar quitar rol title: Confirmar quitar rol + welcome_page: + add_a_note: + paragraph_1_html: "Si namái quier iguar daqué pequeño y nun tien tiempu pa dase d'alta y deprender cómo editar,\nye fácil amestar una nota." + paragraph_2_html: "Namái entre nel mapa y calque nel iconu nota:\n. Esto amestará un marcador al mapa, que pue mover\nabasnando. Añada'l mensaxe, calque guardar, y otros mapeadores investigarán." + title: ¿Nun tien tiempu pa editar? ¡Amieste una nota! + basic_terms: + editor_html: Un editor ye un programa o sitiu web que pue usar pa editar el mapa. + node_html: Un noyu ye un puntu del mapa, como un únicu restaurante o un árbol. + paragraph_1_html: OpenStreetMap tien cierta xíriga de so. Estes son delles pallabres importantes que puen ser afayadices. + tag_html: "Una etiqueta ye una parte de los datos d'un noyu o vía, como'l\nd'un restaurante o la velocidá máxima d'una carretera." + title: Términos básicos pa facer mapes + way_html: Una vía ye una llinia o área, como una carretera, regueru, llagu o edificiu. + introduction_html: "Bienveníu a OpenStreetMap, el mapa del mundu llibre y editable. Agora\nqu'anició sesión, yá ta preparáu editar mapes. Esta ye una guía rápida\nde les coses más importantes que necesita saber." + questions: + paragraph_1_html: "OpenStreetMap tien dellos recursos p'aprender sobro'l proyeutu, entrugar y contestar preguntes, y discutir y documentar en collaboración cuestiones de cartografía.\nAlgame ayuda equí." + title: ¿Tien alguna entruga? + start_mapping: Principiar col mapéu + title: ¡Bienveníu! + whats_on_the_map: + off_html: "Lo que nun incluye son datos suxetivos como calificaciones, carauterístiques históriques o hipotétiques, y datos de fontes con drechos d'autor. Si nun tien\nun permisu especial, nun copie de mapes en llinia o en papel." + on_html: "OpenStreetMap ye un llugar pa facer mapes de coses que seyan al mesmu tiempu reales y actuales -\nincluye millones d'edificios, carreteres, y otros detalles de llugares. Pue poner nel mapa\ncualquier carauterística del mundu real que-y interese." + title: Qué hai nel Mapa diff --git a/config/locales/az.yml b/config/locales/az.yml new file mode 100644 index 00000000000..27e8a2f1d30 --- /dev/null +++ b/config/locales/az.yml @@ -0,0 +1,1191 @@ +# Messages for Azerbaijani (azərbaycanca) +# Exported from translatewiki.net +# Export driver: syck-pecl +# Author: AZISS +# Author: Cekli829 +# Author: Mushviq Abdulla +# Author: SalihB +# Author: Vugar 1981 +# Author: Wertuose +az: + activerecord: + attributes: + diary_comment: + body: Mətn + diary_entry: + language: Dil + latitude: En dairəsi + longitude: Uzunluq dairəsi + title: Başlıq + user: İstifadəçi + friend: + friend: Dost + user: İstifadəçi + message: + body: Mətn + recipient: Qəbul edən + sender: Göndərən + title: Başlıq + trace: + description: İzah + latitude: En dairəsi + longitude: Uzunluq dairəsi + name: Ad + public: İctimai + size: Ölçüsü + user: İstifadəçi + visible: Görünüş + user: + active: Aktivdir + description: İzah + display_name: "Gorüntülənən ad:" + email: E-poçt + languages: Dillər + pass_crypt: Parol + models: + acl: Giriş Məhdudiyyətləri siyahısı + changeset: Dəyişikliklər Dəsti + changeset_tag: Dəyişikliklər Dəstinin Teqi + country: Ölkə + diary_comment: Gündəliyə şərh + diary_entry: Gündəlikdə Yazı + friend: Dost + language: Dil + message: Mesaj + node: Nöqtə + node_tag: Nöqtənin Teqi + notifier: Bildiriş + old_node: Köhnə Nöqtə + old_node_tag: Köhnə Nöqtənin Teqi + old_relation: Köhnə Əlaqə + old_relation_member: Köhnə Əlaqənin İştirakçısı + old_relation_tag: Köhnə Əlaqənin Teqi + old_way: Köhnə Xətt + old_way_node: Köhnə Xəttin Nöqtəsi + old_way_tag: Köhnə Xəttin Teqi + relation: Əlaqə + relation_member: Əlaqənin İştirakçısı + relation_tag: Əlaqənin Teqi + session: Sessiya + trace: Trek + tracepoint: Trek Nöqtəsi + tracetag: Trek Teqi + user: İstifadəçi + user_preference: İstifadəçi Qurmaları + user_token: İstifadəçi Əlaməti + way: Xətt + way_node: Xəttin Nöqtələri + way_tag: Xəttin Teqi + browse: + changeset: + changesetxml: XML dəyişikliklər dəsti + feed: + title: Dəyişikliklər dəsti %{id} + title_comment: Dəyişikliklər dəsti %{id} - %{comment} + osmchangexml: osmChange XML + title: Dəyişikliklər dəsti + containing_relation: + entry: Əlaqəsi %{relation_name} + entry_role: Əlaqəsi %{relation_name} (%{relation_role} kimi) + not_found: + sorry: Təəsüf ki, %{id} identifikatorlu %{type} tapılmadı. + type: + changeset: dəyişikliklər dəsti + node: nöqtə + relation: əlaqə + way: xətt + redacted: + message_html: "%{type} üçün %{version} versiya redaktə olunduğu üçün göstərilə bilməz. Zəhmət olmasa əlavə məlumat üçün %{redaction_link} baxınız." + redaction: Redaksiya %{id} + type: + node: nöqtə + relation: əlaqə + way: xətt + relation_member: + entry_role: "%{role} kimi %{type} %{name}" + type: + node: Nöqtə + relation: Əlaqə + way: Xətt + start_rjs: + load_data: Məlumatları yüklənməsi + loading: Yüklənir… + tag_details: + tags: "Teqlər:" + wiki_link: + key: "%{key} teqini təsvir edən viki səhifəsi" + tag: "%{key}=%{value} teqini təsvir edən viki səhifəsi" + wikipedia_link: Vikipediyada %{page} məqaləsi + timeout: + sorry: Bağışlayın, %{id} identifikatorlu %{type} üçün məlumatlar çıxarılmaq üçün cox uzundurlar. + type: + changeset: dəyişikliklər dəsti + node: nöqtə + relation: əlaqə + way: xətt + changeset: + changeset: + anonymous: Anonim + no_edits: (redaktə yoxdur) + view_changeset_details: Dəyişikliklər dəstinin ətraflı gorüntüsü + changeset_paging_nav: + next: Növbəti » + previous: « Əvvəlki + showing_page: Səhifə %{page} + changesets: + area: Ərazi + comment: Şərh + id: ID + saved_at: Başa çatdı + user: İstifadəçi + list: + title: Dəyişikliklər dəsti + title_friend: Dostlarınız tərəfindən edilmiş dəyişikliklər dəsti + title_nearby: Yaxınlıqdakı istifadəçilər tərəfindən edilmiş dəyişikliklər dəsti + title_user: "%{user} tərəfindən edilmiş dəyişikliklər dəsti" + timeout: + sorry: Bağışlayın, tələb etdiyiniz dəyişikliklər dəstinin siyahısı, çıxarıla bilmək üçün cox böyükdür. + diary_entry: + comments: + ago: "%{ago} əvvəl" + comment: Şərh + has_commented_on: "%{display_name} indicə gündəliyin növbəti yazılarını şərh etdi" + newer_comments: Yeni şərhlər + older_comments: Köhnə Şərhlər + post: Post + when: Nə vaxt + diary_comment: + comment_from: Şərh %{link_user} tərəfindən %{comment_created_at} + confirm: Təsdiq etmək + hide_link: Bu şərhi gizlət + diary_entry: + comment_count: + one: "%{count} şərh var" + other: "%{count} şərh var" + zero: Şərh yoxdur + comment_link: Bu yazıyı şərh et + confirm: Təsdiq etmək + edit_link: Bu yazıyı redaktə et + hide_link: Bu yazını gizlət + posted_by: "%{link_user} tərəfindən %{created} yazılıb, %{language_link} dilində." + reply_link: Bu yazıya cavab ver + edit: + body: "Mətn:" + language: "Dil:" + latitude: "En dairəsi:" + location: "Yerləşdiyi yer:" + longitude: "Uzunluq dairəsi:" + marker_text: Gundəlik yazısının yazıldığı yer + save_button: Qeyd et + subject: "Mövzu:" + title: Gündəlik yazısıni redaktə etmək + use_map_link: xəritə üzərində göstər + feed: + all: + description: OpenStreetMap istifadəçilərinin axırıncı gündəlik yazıları + title: OpenStreetMap gündəlik yazısı + language: + description: "%{language_name} dilində OpenStreetMap istifadəçilərinin axırıncı gündəlik yazıları" + title: "%{language_name} dilində OpenStreetMap gündəlik yazıları" + user: + description: "%{user} üçün axırıncı OpenStreetMap gündəlik yazıları" + title: "%{user} üçün OpenStreetMap gündəlik yazıları" + list: + in_language_title: "%{language} dilində Gundəlik Yazıları" + new: Yeni Gündəlik Yazısı + new_title: İstifadəçi gündəliyinizə yeni yazı əlavə etmək + newer_entries: Yeni yazılar + no_entries: Gundəlikdə yazı yoxdur + older_entries: Köhnə yazılar + recent_entries: Yaxın müddətdəki gündəlik yazıları + title: İstifadəçi gündəlikləri + title_friends: Dostların gündəlikləri + title_nearby: Yaxınlıqdakı İstifadəçilərin Gündəlikləri + user_title: "%{user}'nin gündəliyi" + location: + edit: Redaktə + location: "Yerləşdiyi yer:" + view: Görünüş + new: + title: Yeni Gündəlik Yazısı + no_such_entry: + heading: "Yazı mövcud deyil id: %{id}" + title: Belə bir gündəlik yazısı mövcud deyil + view: + leave_a_comment: Şərh yaz + login: Özünüzü təqdim edin + login_to_leave_a_comment: Şərh yazmaq üçün %{login_link} + save_button: Qeyd et + title: İstifadəçi %{user} gündəliyi | %{title} + user_title: İstifadəçi %{user} gündəliyi + editor: + default: Susmaya görə (hal-hazırda %{name}) + potlatch: + description: Potlatch 1 (brauzer üzərindən redaktə) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (brauzer üzərindən redaktə) + name: Potlatch 2 + remote: + description: Uzaqdan idarəetmə (JOSM və ya Merkaartor) + name: Uzaqdan idarəetmə + export: + start: + add_marker: Xəritəyə marker əlavə etmək + area_to_export: İxrac üçün Ərazi + embeddable_html: Quraşdırılan HTML + export_button: İxrac etmək + format: Format + format_to_export: İxracın forması + image_size: Şəkil ölçüsü + latitude: "En:" + licence: Lisenziya + longitude: "Uz:" + manually_select: Digər ərazini seçmək + map_image: Xəritənin Şəkili (standart qatı göstərir) + max: maks + options: Nizamlamalar + osm_xml_data: OpenStreetMap XML formasında məlumatlar + output: Nəticə + paste_html: Veb sayta quraşdırmaq üçün HTML kod + scale: Miqyas + zoom: Yaxınlaşdır + geocoder: + description: + title: + geonames: GeoNames -dən yerləşməsi + osm_nominatim: OpenStreetMap Nominatim -dan yerləşməsi + types: + cities: Şəhərlər + places: Yerlər + towns: Şəhər qəsəbələri + direction: + east: şərqə + north: şimala + north_east: şimal-şərqə + north_west: şimal-qərbə + south: cənuba + south_east: cənub-şərqə + south_west: cənub-qərbə + west: qərbə + distance: + one: təqribən %{count}km + other: təqribən %{count}km + zero: 1 km-dən az + results: + more_results: Daha çox nəticə + no_results: Nəticələr tapılmadı + search: + title: + ca_postcode: Geocoder.CA nəticələri + geonames: GeoNames nəticələri + latlon: Daxili nəticələr + osm_nominatim: OpenStreetMap Nominatim nəticələri + uk_postcode: NPEMap / FreeThe Postcode nəticələri + us_postcode: Geocoder.us nəticələri + search_osm_nominatim: + admin_levels: + level10: Məhəllə sərhəddi + level2: Ölkə sərhəddi + level4: Əyalət sərhəddi + level5: Bölgə Sərhəddi + level6: Ölkə sərhəddi + level8: Şəhər sərhəddi + level9: Kənd sərhəddi + prefix: + aeroway: + aerodrome: Aerodrom + apron: Perron + gate: Enmə zonasına çıxış + helipad: Vertalyot meydançası + runway: Uçuş-enmə zolağı + taxiway: Sürmə yolu + terminal: Terminal + amenity: + WLAN: WiFi ərazi + airport: Aeroport + arts_centre: İncəsənət mərkəzi + artwork: İncəsənət əsəri + atm: Bankomat + auditorium: Auditoriya + bank: Bank + bar: Bar + bbq: Manqal + bench: Skameyka + bicycle_parking: Relosiped dayanacağı + bicycle_rental: Relosiped icarəsi + biergarten: Açıq havada Pivəxana + brothel: Bardel + bureau_de_change: Valyuta mübadiləsi + bus_station: Avtobus Stansiyası + cafe: Kafe + car_rental: Avtomobil icarəsi + car_sharing: Karşarinq + car_wash: Avto yuyucu + casino: Kazino + charging_station: Şarj Stansiyası + cinema: Kinoteatr + clinic: Klinika + club: Klub + college: Kollec + community_centre: İctimai mərkəz + courthouse: Məhkəmə yeri + crematorium: Krematoriya + dentist: Diş həkimi + doctors: Həkimlər + dormitory: Yataqxana + drinking_water: İçməli su + driving_school: Sürücülük məktəbi + embassy: Səfirlik + emergency_phone: Fövqəladə hallar üçün telefon + fast_food: Fəst Fud + ferry_terminal: Parom Terminalı + fire_hydrant: Yanğın Hidrantı + fire_station: Yanğın söndürmə Stansiyası + food_court: Açıq havada Yeməkxana + fountain: Fontan + fuel: Yanacaq doldurma + grave_yard: Qəbirsanlıq + gym: Fitnes mərkəzi + hall: Zal + health_centre: Sağlamlıq mərkəzi + hospital: Qospital + hotel: Otel + hunting_stand: Ov stendi + ice_cream: Dondurma + kindergarten: Uşaq bağçası + library: Kitabxana + market: Market + marketplace: Bazar meydanı + mountain_rescue: Dağ Xilasetmə Xidməti + nightclub: Gecə klubu + nursery: Pansionat + nursing_home: Qocalar evi + office: Ofis + park: Park + parking: Dayanacaq + pharmacy: Aptek + place_of_worship: Sitayişgah + police: Polis + post_box: Poçt qutusu + post_office: Poçt + preschool: Məktəbəqədər hazırlıq + prison: Həbsxana + pub: Pivəxana + public_building: İctimai Binalar + public_market: İctimai Bazar + reception_area: Qəbul sahəsi + recycling: Utilizasiya yeri + restaurant: Restoran + retirement_home: Qocalar Evi + sauna: Sauna + school: Məktəb + shelter: Sığınacaq + shop: Mağaza + shopping: Alış-veriş + shower: Duş + social_centre: İctimai Mərkəz + social_club: İctimai Club + studio: Studiya + supermarket: Supermarket + swimming_pool: Üzgüçülük hovuzu + taxi: Taksi + telephone: İctimai Telefon + theatre: Teatr + toilets: Tualet + townhall: Şəhər Administrasiyası + university: Universitet + vending_machine: Ticarət avtomatı + veterinary: Veterenar Klinikası + village_hall: Villa + waste_basket: Zibillik + wifi: WiFi ərazi + youth_centre: Gənclər Mərkəzi + boundary: + administrative: Administrativ sərhəd + census: Siyahıya alma sərhədi + national_park: Milli Park + protected_area: Qorunan ərazi + bridge: + aqueduct: Akveduk + suspension: Asma Körpü + swing: Açılan Körpü + viaduct: Viaduk + "yes": Körpü + building: + "yes": Tikili + highway: + bridleway: Atlı yolu + bus_guideway: Gəzinti Avtobus xətti + bus_stop: Avtobus dayanacağı + byway: Dalan + construction: Yol təmirdədir + cycleway: Velocığır + emergency_access_point: Təcili yardım məntəqəsi + footway: Tratuar (Piyada yolu) + ford: Çay keçidi + living_street: Yaşayış küçəsi + milestone: Məsafə dirəyi + minor: Kiçik yol + motorway: Avtomagistral + motorway_junction: Avtomagistral Kəsişməsi + motorway_link: Avtomagistral yolu + path: Cığır + pedestrian: Piyadalar üçün yol + platform: Platforma + primary: Birinci dərəcəli yol + primary_link: Birinci dərəcəli yol + raceway: Otüş yolu + residential: Küçə + rest_area: Dincəlmə güşəsi + road: Yol + secondary: İkici dərəcəli yol + secondary_link: İkici dərəcəli yol + service: Keçid yolu + services: Yolətrafı Servislər + speed_camera: Sürət kamerası + steps: Pilləkənlər + stile: Turniket + tertiary: Üçüncü dərəcəli yol + tertiary_link: Üçüncü dərəcəli yol + track: Torpaq yol + trail: Cığır + trunk: Baş yol + trunk_link: Baş yol + unclassified: Təsnifatsız yol + unsurfaced: Örtüksüz yol + historic: + archaeological_site: Arxeoloji qazıntılar + battlefield: Döyüş meydanı + boundary_stone: Sərhəd daşı + building: Tikili + castle: Qala + church: Kilsə + fort: Qala + house: Ev + icon: Ikona + manor: Malikanə + memorial: Memorial + mine: Mədən + monument: Abidə + museum: Muzey + ruins: Xarabalıqlar + tower: Qüllə + wayside_cross: Yolkənarı xaç + wayside_shrine: Yolkənarı Ziyarətgah + wreck: Gəmi qalıqları + landuse: + allotments: Bağ-bostanlar + basin: Hovuz + brownfield: Tərk edilmiş ərazi + cemetery: Məzarlıq + commercial: Ticarət sahəsi + conservation: Konservasiya ərazisi + construction: Tikinti + farm: Ferma + farmland: Kənd təsərrüfatı + farmyard: Ferma həyəti + forest: Meşə təsərrüfatı + garages: Qarajlar + grass: Ot + greenfield: Mənimsənməmiş Ərazi + industrial: Sənaye sahəsi + landfill: Zibillik + meadow: Çəmənlik + military: Hərbi ərazi + mine: Mədən + nature_reserve: Təbiət Qoruğu + orchard: Meyvə bağı + park: Park + piste: Xizəkçilik + quarry: Karxana + railway: Dəmir yolu + recreation_ground: Istirahət guşəsi + reservoir: Su anbarı + reservoir_watershed: Suayrıcı su anbarı + residential: Yaşayış sahəsi + retail: Ticarət ərazisi + road: Yol şəbəkəsi ərazisi + village_green: Yaşıllıq kənd + vineyard: Üzümlük + wetland: Bataqlıq + wood: Meşə + leisure: + beach_resort: Əkilili çimərlik + bird_hide: Quşlara gizli müşahidə məntəqəsi + common: Almenda (ümumistifadə ərazi) + fishing: Balıq tutmaq üçün yer + fitness_station: Fitnes zalı + garden: Bağ + golf_course: Qolf meydançası + ice_rink: Katok (sürüşmək üçün buz bağlamış yündürlük) + marina: Liman + miniature_golf: Miniqolf + nature_reserve: Təbiət Qoruğu + park: Park + pitch: İdman qazonu + playground: Uşaq oyun meydançası + recreation_ground: Istirahət guşəsi + sauna: Sauna + slipway: Ellinq (gəmi və havadan yüngül uçan aparatların təmiri üçün anqar) + sports_centre: İdman mərkəzi + stadium: Stadion + swimming_pool: Üzgüçülük hovuzu + track: Qaçış zolagı + water_park: Aquapark + military: + airfield: Hərbi Aerodrom + barracks: Kazarma + bunker: Bunker + natural: + bay: Körfəz + beach: Çimərlik + cape: Burun + cave_entrance: Mağara girişi + channel: Kanal + cliff: Uçurum + crater: Krater + dune: Qum təpəsi + feature: Təbii obyekt + fell: Təpə + fjord: Fiord + forest: Meşə + geyser: Qeyzer + glacier: Buzlaq + heath: Boş yer + hill: Təpə + island: Ada + land: Yer + marsh: Bataqlıq + moor: Torfluq + mud: Palçıqlıq + peak: Pik + point: Burun + reef: Rif + ridge: Dağ silsiləsi + river: Çay + rock: Qaya + scree: Çınqıllıq + scrub: Kolluq + shoal: Dayazlıq + spring: Bulaq + stone: Qaya + strait: Boğaz + tree: Ağac + valley: Vadi + volcano: Vulkan + water: Çarhovuz + wetland: Bataqlıq + wetlands: Bataqlıq ərazi + wood: Meşə + office: + accountant: Mühasib + architect: Arxitektor + company: Şirkət + employment_agency: Məşğulluq agentliyi + estate_agent: Əmlak agenti + government: Dövlət idarəçiliyi + insurance: Sığorta şirkəti + lawyer: Hüquqşünas + ngo: GHT ofisi + telecommunication: Telekommunikasi şirkətinin ofisi + travel_agent: Səyahət Agentliyi + "yes": Ofislər + place: + airport: Aeroport + city: Şəhər + country: Ölkə + county: Ölkə + farm: Ferma + hamlet: Qəsəbə + house: Ev + houses: Evlər + island: Ada + islet: Adacıq + isolated_dwelling: Ayrıca ev-ferma + locality: Təkr edilmiş ərazi + moor: Torfluq + municipality: Bələdiyyə + postcode: Poçt indeksi + region: Bölgə + sea: Dəniz + state: Ştat + subdivision: Bölmə + suburb: Şəhərətrafı + town: Şəhərcik + unincorporated_area: Şəhərkənarı zona + village: Kənd + railway: + abandoned: Sökülmüş dəmiryol xətti + construction: Dəmiryol xətti təmirdədir + disused: İstifadə olunmayan (atılmış) dəmiryol xətti + disused_station: İstifadə olunmayan (atılmış) dəmiryol stansiyası + funicular: Funikulyor + halt: Qatar dayanacağı + historic_station: Tarixi dəmiryol stansiyası + junction: Dəmiryol oxu + level_crossing: Dəmiryol keçidi + light_rail: Yüngül resli dəmiryol xətti + miniature: Mini dəmiryol xətti + monorail: Monorels + narrow_gauge: Dar-ölçülü dəmir yolu + platform: Dəmiryol platforması + preserved: Tarixi dəmiryol + spur: Dəmir yolunun budaqlanması + station: Dəmiryol stansiyası + subway: Metro stansiyası + subway_entrance: Metro girişi + switch: Dəmiryol oxu + tram: Tramvay + tram_stop: Tramvay dayanacağı + yard: Depo + shop: + alcohol: Alkoqol dükanı + antiques: Əntiq əşyalar + art: Bədii salon + bakery: Un məmulatları dükanı + beauty: Gözəllik salonu + beverages: İçkilər dükanı + bicycle: Velosiped dükanı + books: Kitab dükanı + butcher: Qəssab + car: Avtomobil Dükanı + car_parts: Avtomobil ehtiyat hissələri + car_repair: Avtomobil təmiri + carpet: Xalça-palaz dükanı + charity: Xeyriyyə malları dükanı + chemist: Məişət kimyası dükanı + clothes: Geyim Dükanı + computer: Kompyuter Dükanı + confectionery: Şirniyyat dükanı + convenience: Ərzaq dükanı + copyshop: Kserokopiya dükanı + cosmetics: Kosmetika Dükanı + department_store: Universam + discount: Endirimli mallar dükanı + doityourself: Özün düzəlt + dry_cleaning: Quru təmizləmə + electronics: Elektronika dükanı + estate_agent: Əmlak agenti + farm: Kənd təsərrüfatı malları dükanı + fashion: Dəb dükanı + fish: Balıq Dükanı + florist: Gül Dükanı + food: Ərzaq Dükanı + funeral_directors: Dəfn mərasimi bürosu + furniture: Mebel + gallery: Qalereya + garden_centre: Bağçılıq mərkəzi + general: Baş Dükan + gift: Hədiyyələr Dükanı + greengrocer: Meyvə-tərəvəz dükanı + grocery: Baqqal Dükanı + hairdresser: Saç ustası + hardware: Məişət Alətləri Dükanı + hifi: Audio və Video avadanlıqları dükanı + insurance: Sığorta şirkəti + jewelry: Zərgərlik dükanı + kiosk: Kiosk + laundry: Camaşırxana + mall: Mall + market: Bazar + mobile_phone: Mobil telefon dükanı + motorcycle: Motosiklet Dükanı + music: Musiqi dükanı + newsagent: Qəzet kiosku + optician: Optika + organic: Orqanik Ərzaq Dükanı + outdoor: Küçə satışı + pet: Zoomaqazin + photo: Fotomaqazin + salon: Salon + shoes: Ayaqqabı dükanı + shopping_centre: Ticarət Mərkəzi + sports: İdman malları dükanı + stationery: Dəftərxana Ləvazimatı + supermarket: Supermarket + tailor: Dərzi + toys: Oyuncaq dükanı + travel_agency: Səyahət Agentliyi + video: Videoyazılar satışı dükanı + wine: Şərab dükanı + "yes": Mağaza + tourism: + alpine_hut: Alp Evciyi + artwork: İncəsənət əsərləri dükanı + attraction: Attraksion + bed_and_breakfast: Gecələmə və səhər yeməyi yeri + cabin: Daxma + camp_site: Düşərgə + caravan_site: Təkərli evlər üçün dayanacaq + chalet: Kənd evi + guest_house: Qonaq evi + hostel: Xostel + hotel: Hotel + information: Məlumat + lean_to: Meyl + motel: Motel + museum: Muzey + picnic_site: Piknik üçün yer + theme_park: Attraksion + valley: Vadi + viewpoint: Baxış meydançası + zoo: Zoopark + tunnel: + "yes": Tunel + waterway: + artificial: Süni su axını + boatyard: Tərsanə + canal: Kanal + connector: Çayların birləşməsi + dam: Damba + derelict_canal: İstifadəsiz Kanal + ditch: Xəndək + dock: Dok + drain: Axıntı xəndəyi + lock: Şlyuz + lock_gate: Şlyuz qapısı + mineral_spring: Mineral bulaq + mooring: Gəmilərin sahilə bağlama yeri + rapids: Çay kəndarı + river: Çay + riverbank: Çayın sahili + stream: Çay + wadi: Qurumuş cay + water_point: Su təminatı məntəqəsi + waterfall: Şəlalə + weir: Su bəndi + javascripts: + map: + base: + standard: Standart + transport_map: Nəqliyyat Xəritəsi + site: + edit_tooltip: Xəritəni redaktə et + layouts: + community: İcma + community_blogs: İcma bloqları + community_blogs_title: OpenStreetMap icmasının iştirakçılarının bloqları + copyright: Müəllif hüquqları və Lisenziyalar + data: Məlumatlar + edit: Redaktə + edit_with: "%{editor} köməyi ilə dəyişdir" + export: İxrac + export_data: Məlumatların ixracı + foundation: OpenStreetMap Fondu + foundation_title: OpenStreetMap Fondu + gps_traces: GPS cizgilər + gps_traces_tooltip: GPS cizgilər ilə işləmək + help: Kömək + history: Tarix + home: evə + intro_2_create_account: İstifadəçi hesabı yarat + log_in: daxil ol + log_in_tooltip: Mövcud hesab ilə daxil ol + logo: + alt_text: OpenStreetMap loqosu + logout: çıxış + make_a_donation: + text: Maddi yardım et + title: OpenStreetMap-i dəstəkləmək üçün maddi yardım et + partners_bytemark: Bytemark Hosting + partners_ic: London İmperial Kolleci tərəfindən + partners_partners: partnyorlar + sign_up: qeydiyyatdan keç + sign_up_tooltip: Redaktə etmək üçün qeydiyyatdan keç + tag_line: Azad Viki Dünya Xəritəsi + user_diaries: İstifadəçi Gündəlikləri + user_diaries_tooltip: İstifadəçilərin gündəliklərinə baxmaq + license_page: + foreign: + english_link: ingiliscə orijinalına + title: Bu tərcümə haqqında + legal_babble: + attribution_example: + alt: Nümunə üçün, veb-səhifədən OpenStreetMap-ə necə istinad vermək + title: Müəllifin göstərilməsinin nümunəsi + contributors_ca_html: Kanada GeoBase ®, GeoGratis (© Kanadanın Təbii Ehtiyatlar Departamenti), CanVec (© Kanadanın Təbii Ehtiyatlar Departamenti) və StatCan (Kanadanın Statistika şöbəsinin, Coğrafiya bölməsi) tərəfindən məlumatlar. + contributors_fr_html: "Fransa: Baş Vergi İdarəsi tərəfindən məlumatlar." + contributors_gb_html: Böyük Britaniya Krallığı Ordnance Survey © Crown copyright tərəfindən məlumatlar. Verilənlər bazasına icazə 2010-12. + contributors_nz_html: Yeni Zelandiya Yeni Zelandiyanın torpaq resursları haqqında məlumatlardan. Crown Copyright reserved. + contributors_title_html: Kimlər bizim layihəyə töhfə verir + credit_title_html: OpenStreetMap-ə Necə istinad etmək olar + infringement_title_html: Müəllif hüquqlarının pozulması + intro_1_html: "OpenStreetMap Open Data\nCommons Open Database License (ODbL) lisenziyası üzrə istifadə olunan açıq məlumatlardan ibarətdir." + more_title_html: Daha çox öyrən + title_html: Müəllif hüquqları və Lisenziyalar + native: + mapping_link: kartoqrafiyalaşdırmağa başla + native_link: azərbaycan versiyası + title: Bu səhifə haqqında + message: + delete: + deleted: Mesaj silindi + inbox: + date: Tarix + from: Kimdən + messages: "Sizin varınızdır: %{new_messages} və %{old_messages}." + my_inbox: Mənim gələnlər + new_messages: + one: "%{count} yeni mesaj" + other: "%{count} yeni mesaj" + no_messages_yet: Sizin hələdə mesajınız yoxdur. Niyə də ki, %{people_mapping_nearby_link} danışmırsınız? + old_messages: + one: "%{count} köhnə mesaj" + other: "%{count} köhnə mesaj" + outbox: göndərilənlər + people_mapping_nearby: yaxınlıqdakı istifadəçilərlə + subject: Mövzu + title: Gələnlər + mark: + as_read: Mesaj oxunulmuş kimi işarələndi + as_unread: Mesaj oxunulmamış kimi işarələndi + message_summary: + delete_button: Sil + read_button: Oxunulmuş kimi işarələ + reply_button: Geri göndər + unread_button: Oxunulmamış kimi işarələ + new: + back_to_inbox: Gələnlərə geri qayıt + body: "Mətn:" + limit_exceeded: Siz yaxın vaxtlarda çoxlu mesaj göndərmisiniz. Göndərməzdən əvvəl bir az gözləyin. + message_sent: Mesaj göndərildi + send_button: Göndər + send_message_to: "%{name} yeni mesaj göndər" + subject: Mövzu + title: Mesaj göndər + no_such_message: + body: Bağışlayın, amma belə ID ilə mesaj yoxdur. + heading: Belə bir mesaj yoxdur + title: Belə bir mesaj yoxdur + outbox: + date: Tarix + inbox: gələnlər + my_inbox: Mənim %{inbox_link} + outbox: göndərilənlər + people_mapping_nearby: yaxınlıqdakı istifadəçilərlə + subject: Mövzu + title: Göndərilənlər + to: Kimə + read: + date: Tarix + from: Kimdən + reply_button: Geri göndər + subject: Mövzu + title: Mesajı oxu + to: Kimə + unread_button: Oxunulmamış kimi işarələ + sent_message_summary: + delete_button: Sil + notifier: + diary_comment_notification: + hi: Salam %{to_user}, + subject: "[OpenStreetMap] %{user} adlı istifadəçi sənin gündəliy yazına şərh yazıb" + email_confirm_html: + 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. + greeting: Salam, + email_confirm_plain: + greeting: Salam, + gpx_notification: + and_no_tags: və teqlərsiz. + failure: + more_info_2: "nasazlığı, buradan tapmaq olar:" + greeting: Salam, + lost_password: + subject: "[OpenStreetMap] Parolu yeniləmək tələbi" + lost_password_html: + 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. + greeting: Salam, + lost_password_plain: + 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. + greeting: Salam, + message_notification: + hi: Salam %{to_user}, + signup_confirm: + greeting: Salam! + subject: "[OpenStreetMap] OpenStreetMap-ə xoş gəldiniz" + oauth_clients: + form: + name: Ad + index: + revoke: Ləğv et! + show: + confirm: Əminsinizmi? + redaction: + edit: + description: Təsvir + show: + confirm: Əminsinizmi? + user: "Yaradıcısı:" + site: + edit: + user_page_link: istifadəçi səhifəsi + index: + shortlink: Qısa keçid + key: + table: + entry: + admin: Administrativ sərhəd + apron: + 1: terminal + building: Əhəmiyyətli bina + cemetery: Məzarlıq + centre: İdman mərkəzi + commercial: Ticarət sahəsi + common: + 1: çəmənlik + farm: Ferma + footway: Piyada yolu + forest: Meşə + industrial: Sənaye sahəsi + lake: + - Göl + - su anbarı + military: Hərbi ərazi + motorway: Avtomagistral + park: Park + permissive: Açıq giriş + primary: Birinci dərəcəli yol + private: Xüsusi giriş + rail: Dəmir yolu + reserve: Təbiət Qoruğu + resident: Yaşayış sahəsi + retail: Ticarət sahəsi + runway: + - Aeroport uçuş-enmə zolağı + school: + - Məktəb + - universitet + secondary: İkici dərəcəli yol + station: Dəmiryol stansiyası + subway: Metro + summit: + - Zirvə + - pik + tourist: Turist attraksionu + track: Cığır + tram: + 1: tramvay + trunk: Baş yol + unclassified: Təsnifatsız yol + unsurfaced: Torpaq yol + markdown_help: + alt: Alternativ mətn + heading: Başlıq + headings: Başlıqlar + image: Şəkil + link: Keçid + subheading: Alt başlıq + text: Mətn + url: URL + richtext_area: + preview: Sınaq görüntüsü + search: + search: Axtar + submit_text: Keç + where_am_i: Mən haradayam? + sidebar: + close: Bağla + search_results: Axtarış Nəticələri + time: + formats: + friendly: "%e %B %Y %H:%M" + trace: + edit: + description: "İzah:" + download: yüklə + edit: redaktə + filename: "Fayl adı:" + map: xəritə + owner: "Sahibi:" + save_button: Dəyişiklikləri yadda saxla + trace: + edit: redaktə et + edit_map: Xəritəni redaktə et + map: xəritə + private: MƏXFİ + public: İCTİMAİ + view_map: Xəritəyə bax + trace_form: + description: "İzah:" + help: Kömək + view: + description: "İzah:" + download: yüklə + edit: redaktə et + filename: "Fayl adı:" + map: xəritə + owner: "Sahibi:" + start_coordinates: "Başlanğıc koordinatları:" + user: + account: + contributor terms: + link text: bu nədir? + current email address: "Hazırki E-Poçt Ünvanı:" + delete image: Hazırki şəkili sil + gravatar: + link text: bu nədir? + image: "Şəkil:" + latitude: "En dairəsi:" + longitude: "Uzunluq dairəsi:" + new email address: "Yeni E-Poçt Ünvanı:" + new image: Şəkil kimi əlavə et + openid: + link text: bu nədir? + openid: "OpenID:" + public editing: + disabled link text: Niyə mən redaktə edə bilmirəm? + enabled link text: Bu nədir? + replace image: Hazırki şəkili əvəzlə + return to profile: Profilə geri qayıt + save changes button: Dəyişiklikləri yadda saxla + confirm: + button: Təsdiq et + confirm_email: + button: Təsdiq et + confirm_resend: + failure: İstifadəçi %{name} tapılmadı. + list: + heading: İstifadəçilər + hide: Seçilmiş istifadəçiləri gizlət + title: İstifadəçilər + login: + heading: Daxil olun + login_button: Daxil ol + new to osm: OpenStreetMap-də yenisiz? + no account: İstifadəçi hesabınız yoxdur? + openid: "%{logo} OpenID:" + openid_logo_alt: OpenID ilə hesabınıza daxil olun + openid_providers: + aol: + alt: AOL OpenID ilə hesabınıza daxil olun + title: AOL ilə hesaba giriş + google: + alt: Google OpenID ilə hesabınıza daxil olun + title: Google ilə hesaba giriş + myopenid: + alt: myOpenID OpenID ilə hesabınıza daxil olun + title: myOpenID ilə hesaba giriş + openid: + alt: OpenID URL ilə hesabınıza daxil olun + title: OpenID ilə hesaba giriş + wordpress: + alt: Wordpress OpenID ilə hesabınıza daxil olun + title: Wordpress ilə hesaba giriş + yahoo: + alt: Yahoo OpenID ilə hesabınıza daxil olun + title: Yahoo ilə hesaba giriş + password: "Parol:" + register now: İndi qeydiyyatdan keç + remember: Məni xatırla + title: Daxil olun + logout: + heading: OpenStreetMap-dən çıx + logout_button: Sistemdən çıx + title: Sistemdən çıx + lost_password: + email address: "E-poçt ünvanları:" + heading: Parolu unutmusan? + new password button: Parolu yenilə + title: İtirilmiş parol + make_friend: + already_a_friend: Siz artıq %{name} dostsunuz. + button: Dostluğa əlavə et + failed: Bağışlayın, %{name}-i(ı) dostluğa əlavə etmədə xəta yarandı. + heading: "%{user}-i(ı) dostluğa əlavə edək?" + success: "%{name} indi sənin dostundur." + new: + confirm password: "Parolu təkrarla:" + continue: Davam et + display name: "Gorüntülənən ad:" + email address: "E-poçt ünvanları:" + openid: "%{logo} OpenID:" + password: "Parol:" + title: Hesab aç + popup: + friend: Dost + your location: Yerləşdiyin yer + remove_friend: + button: Dostluqdan sil + heading: "%{user} dostluqdan silək?" + reset_password: + confirm password: "Parolu təkrarla:" + flash changed: Parolun indi dəyişildi. + heading: "%{user} üçün parolu yenilə" + password: "Parol:" + reset: Parolu Yenilə + title: Parolu yenilə + terms: + agree: Razıyam + consider_pd_why: bu nədir? + decline: İmtina + legale_names: + france: Fransa + italy: İtaliya + view: + activate_user: Bu istifadəçini aktivləşdir + add as friend: dostluğa əlavə edilmiş + confirm: Təsdiq et + create_block: bu istifadəçini blokla + ct accepted: "%{ago} əvvəl qəbul edilib" + deactivate_user: Bu istifadəçini deaktivləşdir + delete_user: bu istifadəçini sil + diary: gündəlik + email address: "E-poçt ünvanı:" + hide_user: Bu istifadəçini gizlət + latest edit: "Son redaktə %{ago}:" + my comments: mənim şərhlərim + my diary: mənim gündəliyim + my edits: mənim redaktələrim + remove as friend: dostluqdan silinmiş + send message: mesaj göndər + status: "Status:" + your friends: Sənin dostların + user_block: + blocks_by: + title: "%{name} tərəfindən blok edilib" + create: + flash: "%{name} adlı istifadəçiyə blok yaradılıb." + edit: + back: Bütün blokları göstər + show: Bu bloku göstər + submit: Bloku yenilən + helper: + time_past: "%{time} əvvəl sona çatıb." + index: + heading: İstifadəçi blokları siyahısı + title: İstifadəçi blokları + new: + back: Bütün blokları göstər + submit: Blok yarat + partial: + confirm: Əminsinizmi? + creator_name: Yaradıcı + display_name: Bloklanmış İstifadəçilər + edit: Redaktə et + next: Növbəti » + not_revoked: (ləgv edilməyib) + previous: « Əvvəlki + reason: Bloklanma səbəbi + revoke: Ləğv et! + revoker_name: Tərəfindən ləgv edilib + show: Göstər + status: Status + revoke: + flash: Bu blok ləğv edilib. + heading: "%{block_on} adlı istifadəçi üçün blok, %{block_by} tərəfindən ləğv edilib" + revoke: Ləğv et! + title: "%{block_on} adlı istifadəçi üçün blok ləğv edilib" + show: + revoke: Ləğv et! + show: "Göstər:" + status: Status + time_past: "%{time} əvvəl sona çatıb" + title: "%{block_on}, %{block_by} tərəfindən blok edilib" + update: + success: Blok yeniləndi. + user_role: + grant: + confirm: Təsdiq et + revoke: + confirm: Təsdiq et diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 1c48dd89415..2a5ca65abc9 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1,9 +1,10 @@ -# Messages for Belarusian (Taraškievica orthography) (‪беларуская (тарашкевіца)‬) +# Messages for Belarusian (Taraškievica orthography) (беларуская (тарашкевіца)‎) # Exported from translatewiki.net # Export driver: syck-pecl # Author: EugeneZelenko # Author: Jim-by # Author: Red Winged Duck +# Author: Renessaince # Author: Wizardist be-Tarask: activerecord: @@ -82,85 +83,16 @@ be-Tarask: need_to_see_terms: Ваш доступ да API часова прыпынены. Калі ласка, увайдзіце ў ўэб-інтэрфэйс, каб каб паглядзець умовы супрацоўніцтва. Вам не абавязкова пагаджацца зь імі, але неабходна зь імі азнаёміцца. browse: changeset: - changeset: "Набор зьменаў: %{id}" changesetxml: Набор зьменаў у фармаце XML - download: Загрузіць %{changeset_xml_link} ці %{osmchange_xml_link} feed: title: Набор зьменаў %{id} title_comment: Набор зьменаў %{id} - %{comment} osmchangexml: osmChange XML title: Набор зьменаў - changeset_details: - belongs_to: "Належыць да:" - bounding_box: "Межы абшару:" - box: поле - closed_at: "Закрыты:" - created_at: "Створана:" - has_nodes: - one: "Мае наступны %{count} вузел:" - other: "Мае наступныя %{count} вузлы:" - has_relations: - one: "Мае наступную %{count} сувязь:" - other: "Мае наступныя %{count} сувязі:" - has_ways: - one: "Мае наступную %{count} дарогу:" - other: "Мае наступныя %{count} дарогі:" - no_bounding_box: Гэта набор зьменаў быў захаваны без вызначаных межаў. - show_area_box: Паказаць выдзелены абшар - common_details: - changeset_comment: "Камэнтар:" - deleted_at: "Выдалены ў:" - deleted_by: "Выдалены:" - edited_at: "Рэдагавалася:" - edited_by: "Рэдагавалася:" - in_changeset: "У наборы зьменаў:" - version: "Вэрсія:" containing_relation: entry: Адносіны %{relation_name} entry_role: Адносіны %{relation_name} (як %{relation_role}) - map: - deleted: Выдаленая - edit: - area: Рэдагаваць абшар - node: Рэдагаваць вузел - relation: Рэдагаваць адносіны - way: Рэдагаваць дарогу - larger: - area: Паказаць абшар на большай мапе - node: Паказаць пункт на большай мапе - relation: Прагляд адносінаў на большай мапе - way: Паказаць шлях на большай мапе - loading: Загрузка… - navigation: - all: - next_changeset_tooltip: Наступны набор зьменаў - next_node_tooltip: Наступны вузел - next_relation_tooltip: Наступныя адносіны - next_way_tooltip: Наступная дарога - prev_changeset_tooltip: Папярэдні набор зьменаў - prev_node_tooltip: Папярэдні вузел - prev_relation_tooltip: Папярэднія адносіны - prev_way_tooltip: Папярэдняя дарога - user: - name_changeset_tooltip: Прагляд рэдагаваньняў %{user} - next_changeset_tooltip: Наступнае рэдагаваньне %{user} - prev_changeset_tooltip: Папярэдняе рэдагаваньне %{user} - node: - download: "%{download_xml_link}, %{view_history_link} ці %{edit_link}" - download_xml: Загрузіць XML - edit: рэдагаваць - node: Вузел - node_title: "Вузел: %{node_name}" - view_history: паказаць гісторыю - node_details: - coordinates: "Каардынаты:" - part_of: "Частка:" - node_history: - download: "%{download_xml_link} ці %{view_details_link}" - download_xml: Загрузіць XML - node_history: Гісторыя вузла - node_history_title: "Гісторыя пункту: %{node_name}" - view_details: паказаць падрабязнасьці + created: Створана not_found: sorry: Прабачце, %{type} з ідэнтыфікатарам %{id} ня знойдзены. type: @@ -168,67 +100,24 @@ be-Tarask: node: вузел relation: адносіны way: шлях - paging_nav: - of: з - showing_page: Паказ старонкі - relation: - download: "%{download_xml_link} ці %{view_history_link}" - download_xml: Загрузіць XML - relation: Адносіны - relation_title: "Адносіны: %{relation_name}" - view_history: паказаць гісторыю - relation_details: - members: "Элемэнты:" - part_of: "Частка:" - relation_history: - download: "%{download_xml_link} ці %{view_details_link}" - download_xml: Загрузіць XML - relation_history: Гісторыя сувязі - relation_history_title: "Гісторыя сувязі: %{relation_name}" - view_details: паказаць падрабязнасьці + note: + title: Нататка + redacted: + message_html: Вэрсія %{version} гэтага %{type} ня можа быць паказаная, бо яна была адрэдагаваная. Глядзіце %{redaction_link} для падрабязнасьцяў. + redaction: Рэдакцыя %{id} + type: + node: вузел + relation: адносіны + way: дарога relation_member: entry_role: "%{type} %{name} як %{role}" type: node: Вузел relation: Адносіны way: Шлях - start: - manually_select: Выбраць іншы абшар - view_data: Паказаць зьвесткі для цяперашняга выгляду мапы start_rjs: - data_frame_title: Зьвесткі - data_layer_name: Зьвесткі - details: Падрабязнасьці - drag_a_box: Расьцягніце рамку для выбару абшару - edited_by_user_at_timestamp: Рэдагаваны [[user]] у [[timestamp]] - hide_areas: Схаваць вобласьці - history_for_feature: Гісторыя [[feature]] load_data: Загрузіць зьвесткі - loaded_an_area_with_num_features: Вы загрузілі мясцовасьць, якая ўтрымлівае [[num_features]] аб'ектаў. Увогуле, некаторыя браўзэры ня змогуць апрацаваць такую колькасьць зьвестак. Звычайна, найлепшы вынік назіраецца, калі аб'ектаў менш за 100, пры большай колькасьці браўзэр можа страціць хуткасьць. Калі Вы ўпэўненыя, што жадаеце паказаць гэтыя зьвесткі, націсьніце кнопку ніжэй. loading: Загрузка… - manually_select: Выбраць іншы абшар - object_list: - api: Атрымаць гэты абшар з API - back: Паказаць сьпіс аб'ектаў - details: Падрабязнасьці - heading: Сьпіс аб'ектаў - history: - type: - node: Вузел [[id]] - way: Шлях [[id]] - selected: - type: - node: Вузел [[id]] - way: Шлях [[id]] - type: - node: Вузел - way: Шлях - private_user: прыватны карыстальнік - show_areas: Паказаць вобласьці - show_history: Паказаць гісторыю - unable_to_load_size: "Немагчыма загрузіць: памер абшару [[bbox_size]] занадта вялікі (павінен быць меней чым %{max_bbox_size})" - wait: Пачакайце… - zoom_or_select: Павялічце маштаб ці выберыце абшар на мапе для прагляду tag_details: tags: "Меткі:" wiki_link: @@ -242,38 +131,15 @@ be-Tarask: node: вузел relation: адносіны way: дарога - way: - download: "%{download_xml_link}, %{view_history_link} ці %{edit_link}" - download_xml: Загрузіць XML - edit: рэдагаваць - view_history: паказаць гісторыю - way: Шлях - way_title: "Шлях: %{way_name}" - way_details: - also_part_of: - one: таксама частка дарогі %{related_ways} - other: таксама частка дарогаў %{related_ways} - nodes: "Вузлы:" - part_of: "Частка:" - way_history: - download: "%{download_xml_link} ці %{view_details_link}" - download_xml: Загрузіць XML - view_details: паказаць падрабязнасьці - way_history: Гісторыя зьменаў дарогі - way_history_title: "Гісторыя зьменаў шляху: %{way_name}" changeset: changeset: anonymous: Ананім - big_area: (вялікі) - no_comment: (няма) no_edits: (без рэдагаваньняў) - show_area_box: паказаць межы абшару - still_editing: (яшчэ рэдагуецца) view_changeset_details: Паказаць падрабязнасьці набору зьменаў changeset_paging_nav: next: Наступная » previous: « Папярэдняя - showing_page: Паказаная старонка %{page} + showing_page: Старонка %{page} changesets: area: Абшар comment: Камэнтар @@ -281,27 +147,15 @@ be-Tarask: saved_at: Захаваны як user: Карыстальнік list: - description: Апошнія зьмены - description_bbox: Набор зьменаў у %{bbox} - description_friend: Наборы зьменаў Вашых сяброў - description_nearby: Наборы зьменаў для суседніх удзельнікаў - description_user: Наборы зьменаў %{user} - description_user_bbox: Набор зьменаў %{user} у %{bbox} - heading: Наборы зьменаў - heading_bbox: Наборы зьменаў - heading_friend: Наборы зьменаў - heading_nearby: Наборы зьменаў - heading_user: Наборы зьменаў - heading_user_bbox: Наборы зьменаў title: Наборы зьменаў - title_bbox: Набор зьменаў у %{bbox} title_friend: Наборы зьменаў Вашых сяброў title_nearby: Наборы зьменаў для суседніх удзельнікаў title_user: Набор зьменаў %{user} - title_user_bbox: Набор зьменаў %{user} у %{bbox} timeout: sorry: Прабачце, сьпіс набораў зьменаў, які Вы запыталі, занадта вялікі для атрыманьня. diary_entry: + comments: + post: Запіс diary_comment: comment_from: Камэнтар %{link_user} ад %{comment_created_at} confirm: Пацьвердзіць @@ -311,6 +165,7 @@ be-Tarask: few: "%{count} камэнтары" one: "%{count} камэнтар" other: "%{count} камэнтароў" + zero: Няма камэнтароў comment_link: Камэнтаваць гэты запіс confirm: Пацьвердзіць edit_link: Рэдагаваць гэты запіс @@ -345,7 +200,7 @@ be-Tarask: newer_entries: Навейшыя запісы no_entries: У дзёньніку няма запісаў older_entries: Старэйшыя запісы - recent_entries: "Апошнія запісы ў дзёньніку:" + recent_entries: Апошнія запісы ў дзёньніку title: Дзёньнікі карыстальнікаў title_friends: Дзёньнікі сяброў title_nearby: Дзёньнікі суседніх удзельнікаў @@ -369,6 +224,9 @@ be-Tarask: user_title: Дзёньнік %{user} editor: default: Па змоўчваньні (цяпер %{name}) + id: + description: iD (рэдактар у браўзэры) + name: iD potlatch: description: Potlatch 1 (рэдактар у браўзэры) name: Potlatch 1 @@ -384,7 +242,7 @@ be-Tarask: area_to_export: Абшар для экспарту embeddable_html: HTML-код для ўстаўкі export_button: Экспартаваць - export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Creative Commons Attribution-ShareAlike 2.0. + export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Open Data Commons Open Database License (ODbL). format: Фармат format_to_export: Фармат экспарту image_size: "Памер выявы:" @@ -392,6 +250,7 @@ be-Tarask: licence: Ліцэнзія longitude: "Даўгата:" manually_select: Выбраць іншы абшар + map_image: Выява мапы (паказвае стандартны слой) max: максымум options: Устаноўкі osm_xml_data: Зьвесткі OpenStreetMap у фармаце XML @@ -399,29 +258,19 @@ be-Tarask: paste_html: HTML-код для ўстаўкі ў вэб-сайт scale: Маштаб too_large: - body: Гэты абшар занадта вялікі для экспарту ў фармаце XML OpenStreetMap. Калі ласка, зьменшыце маштаб ці выберыце меншы абшар. - heading: Абшар занадта вялікі + body: "Гэты абшар занадта вялікі для экспарту ў фармаце XML OpenStreetMap. Калі ласка, зьменшыце маштаб, выберыце меншы абшар, ці паспрабуйце адну з наступных крыніцаў для пакетнай запампоўкі зьвестак:" + planet: + title: Плянэта OSM zoom: Маштаб - start_rjs: - add_marker: Дадаць маркер на мапу - change_marker: Зьмяніць пазыцыю маркера - click_add_marker: Націсьніце на мапе, каб дадаць маркер - drag_a_box: Расьцягніце рамку для выбару абшару - export: Экспартаваць - manually_select: Выбраць іншы абшар - view_larger_map: Паказаць большую мапу geocoder: description: title: geonames: Месцазнаходжаньне з GeoNames - osm_namefinder: "%{types} з OpenStreetMap Namefinder" osm_nominatim: Месцазнаходжаньне з OpenStreetMap Nominatim types: cities: Гарады places: Месцы towns: Гарады - description_osm_namefinder: - prefix: "%{distance} %{direction} %{type}" direction: east: усход north: поўнач @@ -431,6 +280,12 @@ be-Tarask: south_east: паўднёвы ўсход south_west: паўднёвы захад west: захад + distance: + few: каля %{count} км + many: каля %{count} км + one: каля %{count} км + other: каля %{count} км + zero: меней 1 км results: more_results: Больш вынікаў no_results: Нічога ня знойдзена @@ -439,16 +294,18 @@ be-Tarask: ca_postcode: Вынікі з Geocoder.CA geonames: Вынікі з GeoNames latlon: Вынікі з Internal - osm_namefinder: Вынікі з OpenStreetMap Namefinder osm_nominatim: Вынікі з OpenStreetMap Nominatim uk_postcode: Вынікі з NPEMap / FreeThe Postcode us_postcode: Вынікі з Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} %{parentname})" - suffix_place: ", %{distance} %{direction} %{placename}" search_osm_nominatim: prefix: + aeroway: + gate: Выхад на пасадку + helipad: Верталётная пляцоўка + runway: Узлётна-пасадачная паласа + taxiway: Рулёжная дарога amenity: + WLAN: Доступ да WiFi airport: Аэрапорт arts_centre: Мастацкі цэнтар atm: Банкамат @@ -541,6 +398,8 @@ be-Tarask: youth_centre: Моладзевы цэнтар boundary: administrative: Адміністрацыйная мяжа + national_park: Нацыянальны парк + protected_area: Ахоўная зона highway: bridleway: Дарога для коней bus_guideway: Аўтобусная паласа @@ -584,6 +443,8 @@ be-Tarask: building: Будынак castle: Замак church: Царква + citywalls: Мескія муры + fort: Форт house: Дом icon: Ікона manor: Маёнтак @@ -624,14 +485,17 @@ be-Tarask: reservoir: Вадасховішча residential: Жылы раён retail: Тэрыторыя дробнага гандлю + road: Зона дарожнай сеткі village_green: Гарадзкі парк vineyard: Вінаграднік wetland: Забалочаная зямля wood: Лес leisure: beach_resort: Пляжны курорт + bird_hide: Пункт назіраньня за птушкамі common: Грамадзкая зямля fishing: Месца для рыбнай лоўлі + fitness_station: Фітнэс-станцыя garden: Сад golf_course: Поле для гольфу ice_rink: Коўзанка @@ -656,9 +520,11 @@ be-Tarask: channel: Канал cliff: Абрыў crater: Кратэр + dune: Дзюна feature: Аб’ект fell: Узвышша fjord: Фіёрд + forest: Лес geyser: Гейзэр glacier: Ледавік heath: Пусташ @@ -678,6 +544,7 @@ be-Tarask: scrub: Хмызьняк shoal: Плыткаводзьдзе spring: Крыніца + stone: Камень strait: Пратока tree: Дрэва valley: Даліна @@ -686,6 +553,14 @@ be-Tarask: wetland: Забалочаная зямля wetlands: Забалочаныя землі wood: Лес + office: + accountant: Бугальтар + architect: Архітэктар + company: Кампанія + employment_agency: Служба занятасьці + estate_agent: Агет па продажу нерухомасьці + government: Дзяржаўная ўстанова + insurance: Страхавое бюро place: airport: Аэрапорт city: Горад @@ -697,6 +572,7 @@ be-Tarask: houses: Дамы island: Выспа islet: Выспачка + isolated_dwelling: Ізаляванае жытло locality: Населены пункт moor: Тарфянік municipality: Муніцыпалітэт @@ -720,6 +596,7 @@ be-Tarask: junction: Чыгуначны вузел level_crossing: Чыгуначны пераезд light_rail: Лінія для лёгкага чыгуначнага транспарту + miniature: Мініятурная чыгунка monorail: Манарэльс narrow_gauge: Вузкакалейка platform: Чыгуначная плятформа @@ -734,6 +611,7 @@ be-Tarask: yard: Чыгуначнае дэпо shop: alcohol: Алькагольная крама + antiques: Антыкварыят art: Мастацкі салён bakery: Пякарня beauty: Салён прыгажосьці @@ -821,7 +699,10 @@ be-Tarask: valley: Даліна viewpoint: Аглядальная пляцоўка zoo: Заапарк + tunnel: + "yes": Тунэль waterway: + artificial: Штучны водны шлях boatyard: Майстэрня караблёў canal: Канал connector: Злучэньне водных шляхоў @@ -850,65 +731,63 @@ be-Tarask: site: edit_disabled_tooltip: Павялічыць маштаб мапы для рэдагаваньня edit_tooltip: Рэдагаваць мапу - edit_zoom_alert: Неабходна павялічыць маштаб мапы для яе рэдагаваньня - history_disabled_tooltip: Павялічыць маштаб для прагляду рэдагаваньняў у гэтым абшары - history_tooltip: Прагляд рэдагаваньняў у гэтым абшары - history_zoom_alert: Неабходна павялічыць маштаб мапы, каб праглядзець рэдагаваньні ў гэтым абшары layouts: community_blogs: Блёгі супольнасьці community_blogs_title: Блёгі чальцоў супольнасьці OpenStreetMap copyright: Аўтарскія правы і ліцэнзія - documentation: Дакумэнтацыя - documentation_title: Дакумэнтацыя праекту donate: Падтрымайце OpenStreetMap %{link} у фонд абнаўленьня абсталяваньня. - donate_link_text: ахвяраваньнямі edit: Рэдагаваць edit_with: Рэдагаваць праз %{editor} export: Экспартаваць - export_tooltip: Экспартаваць зьвесткі мапы foundation: Фундацыя foundation_title: Фундацыя OpenStreetMap gps_traces: GPS-шляхі gps_traces_tooltip: Кіраваць GPS-шляхамі help: Дапамога - help_centre: Цэнтар дапамогі - help_title: Сайт дапамогі праекту history: Гісторыя home: дамоў - home_tooltip: Паказаць маё месцазнаходжаньне - inbox: уваходныя (%{count}) - intro_1: OpenStreetMap — вольная мапа ўсяго сьвету, якую магчыма рэдагаваць. Яе ствараюць такія ж людзі, як Вы. - license: - title: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Creative Commons Attribution-Share Alike 2.0 Generic + intro_2_create_account: Стварыце рахунак log_in: увайсьці log_in_tooltip: Увайсьці з існуючым рахункам logo: alt_text: Лягатып OpenStreetMap logout: выйсьці - logout_tooltip: Выйсьці make_a_donation: text: Зрабіць ахвяраваньне title: Падтрымаць OpenStreetMap грашовым ахвяраваньнем osm_offline: База зьвестак OpenStreetMap у цяперашні момант недаступная, таму што праводзяцца неабходныя тэхнічныя работы. osm_read_only: База зьвестак OpenStreetMap у цяперашні момант даступная толькі для чытаньня, таму што праводзяцца неабходныя тэхнічныя работы. + partners_html: Гостынг падтрымліваецца %{ucl}, %{ic} і %{bytemark}, і іншымі %{partners}. + partners_ic: Лёнданскім імпэрскім каледжам + partners_ucl: UCL VR Centre sign_up: зарэгістравацца sign_up_tooltip: Стварыць рахунак для рэдагаваньня - sotm2011: Наведайце канфэрэнцыю OpenStreetMap 2011 «The State of the Map», 9-11 верасьня ў Дэнвэры! tag_line: Вольная Wiki-мапа сьвету user_diaries: Дзёньнікі карыстальнікаў user_diaries_tooltip: Паказаць дзёньнікі карыстальнікаў - view: Прагляд - view_tooltip: Паказаць мапу - welcome_user: Вітаем, %{user_link} - welcome_user_link_tooltip: Ваша старонка ўдзельніка - wiki: Вікі - wiki_title: Вікі-сайт праекту license_page: foreign: english_link: арыгінальная ангельская вэрсія text: У выпадку канфлікту паміж гэтай перакладзенай старонкай і %{english_original_link}, старонка на ангельскай мове павінна мець перавагу title: Пра гэты пераклад - legal_babble: "

    Аўтарскія правы і ліцэнзія

    \n

    \n OpenStreetMap прадстаўляе вольныя зьвесткі, на ўмовах ліцэнзіі Creative\n Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \n Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя мапы\n і зьвесткі, да той пары, пакуль Вы спасылаецеся на OpenStreetMap і яе\n ўдзельнікаў. Калі Вы зьмяняеце ці выкарыстоўваеце нашыя мапы і зьвесткі, Вы можаце \n распаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст ліцэнзіі\n legal\n code растлумачыць Вам правы і адказнасьці.\n

    \n\n

    Як спасылацца на OpenStreetMap

    \n

    \n Калі Вы выкарыстоўваеце выявы мапаў OpenStreetMap, мы патрабуем, каб\n Вы рабілі спасылку хаця б “© удзельнікі OpenStreetMap\n , CC BY-SA”. Калі Вы выкарыстоўваеце толькі картаграфічныя зьвесткі,\n мы патрабуем наяўнасьць “Картаграфічныя зьвесткі © Удзельнікі OpenStreetMap,\n CC BY-SA”.\n

    \n\n

    \n Дзе магчыма, павінна быць гіпэр-спасылка на OpenStreetMap http://www.openstreetmap.org/\n і на CC BY-SA http://creativecommons.org/licenses/by-sa/2.0/. Калі\n Вы выкарыстоўваеце носьбіты, дзе выкарыстаньне спасылак немагчымае (напр. \n друкаваныя працы), мы прапануем накіроўваць Вашым чытачоў на\n www.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу\n ‘OpenStreetMap’) і на\n www.creativecommons.org.\n

    \n\n

    Даведацца болей

    \n

    \n Даведайцеся болей пра выкарыстаньне нашых зьвестак на старонцы адказаў\n і пытаньняў.\n

    \n

    \n Удзельнікі OSM павінны памятаць пра тое, што забаронена дадаваць зьвесткі\n з любых крыніцаў абароненых аўтарскім правам (напрыклад, Google Maps ці друкаваных мапаў)\n без папярэдняга дазволу ўладальнікаў аўтарскіх правоў.\n

    \n

    \n Ня гледзячы на тое, што OpenStreetMap утрымлівае вольныя зьвесткі, мы ня можам\n дазволіць бясплатны API да нашых мапаў для староньніх распрацоўшчыкаў.\n\n Глядзіце нашыя Умовы выкарыстаньня,\n Умовы выкарыстаньня частак мапаў\n і Умовы выкарыстаньня Nominatim.\n

    \n\n

    Нашыя ўдзельнікі

    \n

    \n Нашая ліцэнзія CC BY-SA патрабуе ад Вас “падаць арыгінальнага аўтара \n у адпаведнасьці з асаблівасьцямі носьбітаў інфармацыі ці іншых выкарыстоўваемых сродкаў\n ”. Звычайныя ўдзельнікі OSM не патрабуюць пазначэньня аўтарства\n болей чым “удзельнікі OpenStreetMap\n ”, але ў OpenStreetMap ёсьць зьвесткі з нацыянальных \n картаграфічных агенцтваў ці іншых падобных крыніцаў, \n таму, магчыма, мае сэнс спасылацца непасрэдна на іх\n як на крыніцу, ці дадаць спасылку на гэтую старонку.\n

    \n\n\n\n
      \n
    • Аўстралія: Утрымлівае зьвесткі пра прыгарады ад\n Аўстралійскага бюро статыстыкі.
    • \n
    • Аўстрыя: Утрымлівае зьвесткі\n горада Вены на ўмовах\n CC BY.
    • \n
    • Канада: Утрымлівае зьвесткі\n GeoBase®, GeoGratis (© Дэпартамэнта прыродных рэсурсаў\n Канады), CanVec (© Дэпартамэнта прыродных рэсурсаў\n Канады), і StatCan (Статыстычнага падразьдзяленьня Канады).
    • \n
    • Францыя: Утрымлівае зьвесткі\n Галоўнага падатковага ўпраўленьня.
    • \n
    • Новая Зэляндыя: Утрымлівае зьвесткі пра\n зямельныя рэсурсы Новай Зэляндыі. Crown Copyright reserved.
    • \n
    • Польшча: Утрымлівае зьвесткі з мапы UMP-pcPL. Copyright\n удзельнікі UMP-pcPL.
    • \n
    • Вялікабрытанія: Утрымлівае зьвесткі Ordnance \n Survey © Crown copyright and database right\n 2010.
    • \n
    \n\n

    \n Уключэньне зьвестак у OpenStreetMap не азначае, што пастаўшчыкі пачатковых зьвестак\n якім-небудзь чынам падтрымліваюць OpenStreetMap, прадстаўляюць гарантыі, ці\n прымаюць на сябе якую-небудзь адказнасьць.\n

    " + legal_babble: + contributors_at_html: "Аўстрыя: Утрымлівае зьвесткі\nгорада Вены на ўмовах\nCC BY." + contributors_ca_html: "Канада: Утрымлівае зьвесткі\nGeoBase®, GeoGratis (© Дэпартамэнта прыродных рэсурсаў\nКанады), CanVec (© Дэпартамэнта прыродных рэсурсаў\nКанады), і StatCan (Статыстычнага падразьдзяленьня Канады)." + contributors_footer_2_html: "Уключэньне зьвестак у OpenStreetMap не азначае, што пастаўшчыкі пачатковых зьвестак\nякім-небудзь чынам падтрымліваюць OpenStreetMap, прадстаўляюць гарантыі, ці\nпрымаюць на сябе якую-небудзь адказнасьць." + contributors_fr_html: "Францыя: Утрымлівае зьвесткі\nГалоўнага падатковага ўпраўленьня." + contributors_gb_html: "Вялікабрытанія: Утрымлівае зьвесткі Ordnance\nSurvey © Crown copyright and database right\n2010." + contributors_intro_html: "Нашая ліцэнзія CC BY-SA патрабуе ад Вас “падаць арыгінальнага аўтара\nу адпаведнасьці з асаблівасьцямі носьбітаў інфармацыі ці іншых выкарыстоўваемых сродкаў\n”. Звычайныя ўдзельнікі OSM не патрабуюць пазначэньня аўтарства\nболей чым “удзельнікі OpenStreetMap\n”, але ў OpenStreetMap ёсьць зьвесткі з нацыянальных\nкартаграфічных агенцтваў ці іншых падобных крыніцаў,\nтаму, магчыма, мае сэнс спасылацца непасрэдна на іх\nяк на крыніцу, ці дадаць спасылку на гэтую старонку." + contributors_nz_html: "Новая Зэляндыя: Утрымлівае зьвесткі пра\nзямельныя рэсурсы Новай Зэляндыі. Crown Copyright reserved." + contributors_title_html: Нашыя ўдзельнікі + credit_1_html: "Калі Вы выкарыстоўваеце выявы мапаў OpenStreetMap, мы патрабуем, каб\nВы рабілі спасылку хаця б “© удзельнікі OpenStreetMap\n, CC BY-SA”. Калі Вы выкарыстоўваеце толькі картаграфічныя зьвесткі,\nмы патрабуем наяўнасьць “Картаграфічныя зьвесткі © Удзельнікі OpenStreetMap,\nCC BY-SA”." + credit_2_html: "Дзе магчыма, павінна быць гіпэр-спасылка на OpenStreetMap http://www.openstreetmap.org/\nі на CC BY-SA http://creativecommons.org/licenses/by-sa/2.0/. Калі\nВы выкарыстоўваеце носьбіты, дзе выкарыстаньне спасылак немагчымае (напр.\nдрукаваныя працы), мы прапануем накіроўваць Вашым чытачоў на\nwww.openstreetmap.org (магчымае выкарыстаньне поўнага адрасу\n‘OpenStreetMap’) і на\nwww.creativecommons.org." + credit_title_html: Як спасылацца на OpenStreetMap + intro_1_html: "OpenStreetMap is open data, licensed under the Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Вы можаце капіяваць, распаўсюджваць, перадаваць і зьмяняць нашыя мапы\nі зьвесткі, да той пары, пакуль Вы спасылаецеся на OpenStreetMap і яе\nўдзельнікаў. Калі Вы зьмяняеце ці выкарыстоўваеце нашыя мапы і зьвесткі, Вы можаце\nраспаўсюджваць вынікі толькі на ўмовах такой жа ліцэнзіі. Поўны тэкст ліцэнзіі\nlegal\ncode растлумачыць Вам правы і адказнасьці." + more_1_html: "Даведайцеся болей пра выкарыстаньне нашых зьвестак на старонцы адказаў\nі пытаньняў." + more_2_html: "Удзельнікі OSM павінны памятаць пра тое, што забаронена дадаваць зьвесткі\nз любых крыніцаў абароненых аўтарскім правам (напрыклад, Google Maps ці друкаваных мапаў)\nбез папярэдняга дазволу ўладальнікаў аўтарскіх правоў." + more_title_html: Даведацца болей + title_html: Аўтарскія правы і ліцэнзія native: mapping_link: пачаць стварэньне мапы native_link: беларускай вэрсіі @@ -922,7 +801,17 @@ be-Tarask: from: Ад messages: Вы маеце %{new_messages} і %{old_messages} my_inbox: Мае ўваходзячыя + new_messages: + few: "%{count} новыя паведамленьні" + many: "%{count} новых паведамленьняў" + one: "%{count} новае паведамленьне" + other: "%{count} новых паведамленьняў" no_messages_yet: Вы яшчэ ня маеце паведамленьняў. Чаму б не зьвязацца з %{people_mapping_nearby_link}? + old_messages: + few: "%{count} старыя паведамленьня" + many: "%{count} старых паведамленьняў" + one: "%{count} старое паведамленьне" + other: "%{count} старых паведамленьняў" outbox: зыходзячыя people_mapping_nearby: людзьмі, якія жывуць каля Вас subject: Тэма @@ -951,6 +840,11 @@ be-Tarask: outbox: date: Дата inbox: уваходзячыя + messages: + few: Вы маеце %{count} дасланыя паведамленьня + many: Вы маеце %{count} дасланых паведамленьняў + one: Вы маеце %{count} дасланае паведамленьне + other: Вы маеце %{count} дасланых паведамленьняў my_inbox: Мае %{inbox_link} no_sent_messages: Вы яшчэ не даслалі паведамленьне. Чаму б не зьвязацца з %{people_mapping_nearby_link}? outbox: зыходзячыя @@ -959,12 +853,8 @@ be-Tarask: title: Зыходзячыя to: Да read: - back_to_inbox: Вярнуцца да ўваходных - back_to_outbox: Вярнуцца да выходных date: Дата from: Ад - reading_your_messages: Чытаньне Вашых паведамленьняў - reading_your_sent_messages: Чытаньне Вашых дасланых паведамленьняў reply_button: Адказаць subject: Тэма title: Чытаць паведамленьне @@ -990,8 +880,6 @@ be-Tarask: email_confirm_plain: click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб пацьвердзіць зьмену. greeting: Вітаем, - hopefully_you_1: Нехта (спадзяемся, што Вы) жадае зьмяніць свой адрас электроннай пошты ў - hopefully_you_2: "%{server_url} на %{new_address}." friend_notification: befriend_them: Вы таксама можаце дадаць іх у якасьці сябраў на %{befriendurl}. had_added_you: "%{user} дадаў Вас у сьпіс сяброў на OpenStreetMap." @@ -1020,44 +908,11 @@ be-Tarask: lost_password_plain: click_the_link: Калі гэта Вы, калі ласка, націсьніце на спасылку ніжэй, каб скінуць Ваш пароль. greeting: Вітаем, - hopefully_you_1: Нехта (магчыма Вы), запытаўся на зьмену пароля для гэтага - hopefully_you_2: адрасы электроннай пошты рахункаў openstreetmap.org. message_notification: - footer1: Вы можаце таксама прачытаць паведамленьне %{readurl} - footer2: і Вы можаце адказаць на %{replyurl} header: "%{from_user} даслаў Вам паведамленьне праз OpenStreetMap з тэмай %{subject}:" hi: Вітаем, %{to_user}, signup_confirm: subject: "[OpenStreetMap] Пацьвердзіце Ваш адрас электроннай пошты" - signup_confirm_html: - ask_questions: Вы можаце задаць любыя пытаньні пра OpenStreetMap на нашым сайце пытаньняў і адказаў. - click_the_link: Калі гэта Вы, вітаем! Калі ласка, націсьніце спасылку ніжэй, каб пацьвердзіць гэты рахунак і даведацца болей пра OpenStreetMap - current_user: Сьпіс удзельнікаў паводле іх месцазнаходжаньня, даступны ў Category:Users_by_geographical_region. - get_reading: Пачытайце пра OpenStreetMap на вікі, даведайцеся пра апошнія навіны праз блёг OpenStreetMap ці Twitter, ці даведайцеся пра гісторыю праекта ў блёгу OpenGeoData, аўтарам якога зьяўляецца Сціў Коўст, заснавальнік OpenStreetMap, у гэтым блёгу ёсьць падкасты, якія таксама можна праслухаць! - greeting: Прывітаньне! - hopefully_you: Нехта (спадзяемся, што Вы) жадае стварыць рахунак на - introductory_video: Вы можаце прагледзець %{introductory_video_link}. - more_videos: Маем %{more_videos_link}. - more_videos_here: яшчэ відэа тут - user_wiki_page: Рэкамэндуецца стварыць вікі-старонку ўдзельніка, якая павінна ўключаць тэгі катэгорыяў, якія апісваюць Вашае месцазнаходжаньне, напрыклад [[Category:Users_in_London]]. - video_to_openstreetmap: уступнае відэа пра OpenStreetMap - wiki_signup: Вы можаце стварыць рахунак у вікі OpenStreetMap. - signup_confirm_plain: - ask_questions: "Вы можаце задаць любое пытаньне пра OpenStreetMap на нашым сайце пытаньняў і адказаў:" - blog_and_twitter: "Даведацца пра апошнія навіны праз блёг OpenStreetMap ці Twitter:" - click_the_link_1: Калі гэта сапраўды Вы, вітаем! Калі ласка, націсьніце на спасылку ніжэй каб пацьвердзіць сябе - click_the_link_2: рахунак і прачытаць дадатковую інфармацыю пра OpenStreetMap. - current_user_1: Сьпіс цяперашніх карыстальнікаў у катэгорыях, заснаваны на іх месцазнаходжаньні - current_user_2: "яны даступныя на:" - greeting: Прывітаньне! - hopefully_you: Нехта (спадзяемся, што Вы) жадае стварыць рахунак на - introductory_video: "Вы можаце праглядзець відэа-уводзіны ў OpenStreetMap тут:" - more_videos: "Тут яшчэ відэа:" - opengeodata: "OpenGeoData.org — блёг заснавальніка OpenStreetMap Стыва Коуста, і тут ёсьць падкасты:" - the_wiki: "Прачытаць пра OpenStreetMap на вікі:" - user_wiki_1: Рэкамэндуецца стварыць вікі-старонку ўдзельніка, якая будзе ўтрымліваць - user_wiki_2: тэгі катэгорыяў, якія апісваюць Вашае месцазнаходжаньне, напрыклад [[Category:Users_in_London]]. - wiki_signup: "Вы таксама можаце зарэгістравацца на OpenStreetMap вікі на:" oauth: oauthorize: allow_read_gpx: чытаць Вашыя прыватныя GPS-трэкі. @@ -1139,16 +994,10 @@ be-Tarask: index: js_1: Вы карыстаецеся браўзэрам, які не падтрымлівае ці мае забаронены JavaScript. js_2: OpenStreetMap выкарыстоўвае JavaScript для паказу мапы. - license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Даступна на ўмовах ліцэнзіі %{license_name}, аўтарскія правы належаць %{project_name} і яго ўдзельнікам. - project_name: OpenStreetMap permalink: Сталая спасылка remote_failed: Памылка рэдагаваньня. Упэўніцеся, што JOSM ці Merkaartor загружаныя і дазволеная магчымасьць аддаленага кіраваньня shortlink: Кароткая спасылка key: - map_key: Умоўныя знакі - map_key_tooltip: Умоўныя знакі мапы table: entry: admin: Адміністрацыйная мяжа @@ -1215,9 +1064,19 @@ be-Tarask: unclassified: Дарога раённага значэньня unsurfaced: Дарога без пакрыцьця wood: Пушча + markdown_help: + first: Першы элемэнт + heading: Загаловак + headings: Загалоўкі + ordered: Упарадкаваны сьпіс + subheading: Падзагаловак + title_html: Апрацавана з дапамогай Markdown + unordered: Неўпарадкаваны сьпіс + richtext_area: + edit: Рэдагаваць + preview: Папярэдні прагляд search: search: Пошук - search_help: "прыклады: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', ці 'post offices near Lünen' больш прыкладаў…" submit_text: Перайсьці where_am_i: Дзе я? where_am_i_title: Апішыце цяперашняе месцазнаходжаньне з дапамогай інструмэнту пошуку @@ -1295,8 +1154,6 @@ be-Tarask: trace_optionals: tags: Тэгі trace_paging_nav: - next: Наступная » - previous: « Папярэдняя showing_page: Паказаная старонка %{page} view: delete_track: Выдаліць гэты трэк @@ -1371,12 +1228,9 @@ be-Tarask: update home location on click: Абнаўляць маё месцазнаходжаньне, калі як націскаю на мапу? confirm: already active: Гэты рахунак ужо пацьверджаны. - before you start: Мы ведаем, што Вы жадаеце хутчэй пачаць картаграфаваньне, але перад гэтым, верагодна Вам захочацца падаць некаторыя зьвесткі пра сябе ў форме ніжэй. button: Пацьвердзіць heading: Пацьверджаньне рахунку press confirm button: Націсьніце кнопку «Пацьвердзіць» для актывацыі Вашага рахунку. - reconfirm: Калі ўжо прайшоў некаторы час з моманту Вашай рэгістрацыі, верагодна Вам неабходна даслаць сабе новае пацьверджаньне па электроннай пошце. - success: Ваш рахунак пацьверджаны, дзякуй за рэгістрацыю! unknown token: Выглядае, што гэты ключ не існуе. confirm_email: button: Пацьвердзіць @@ -1412,8 +1266,6 @@ be-Tarask: login_button: Увайсьці lost password link: Забылі пароль? new to osm: Упершыню на OpenStreetMap? - notice: Даведайцеся болей пра плянуемыя зьмены ліцэнзіі OpenStreetMap (пераклады) (абмеркаваньні) - notice_terms: OpenStreetMap перайшоў на новую ліцэнзію з 1 красавіка 2012 году. Яна такая ж адкрытая як папярэдняя, але больш пасуе для нашай базы зьвестак мапы. Мы жадаем, каб Вы засталіся працаваць з OpenStreetMap, але гэта можа адбыцца толькі пасьля таго, калі Вы пагадзіцеся працаваць на ўмовах новай ліцэнзіі. У адваротным выпадку мы выдалім Ваш унёсак з базы зьвестак.

    Калі ласка, увайдзіце ў сыстэму, потым прачытайце і прыміце новыя ўмовы. Дзякуй! openid: "%{logo} OpenID:" openid invalid: Прабачце, здаецца Ваш OpenID уведзены няслушна openid missing provider: Прабачце, немагчыма зьвязацца з Вашым правайдэрам OpenID @@ -1439,7 +1291,7 @@ be-Tarask: title: Увайсьці ў сыстэму з дапамогай Yahoo password: "Пароль:" register now: Зарэгістравацца зараз - remember: "Запамятаць мяне:" + remember: Запомніць мяне title: Увайсьці to make changes: Каб рабіць зьмены ў зьвестках OpenStreetMap, Вам неабходна мець рахунак. with openid: "Для ўваходу можаце выкарыстаць Ваш OpenID:" @@ -1468,9 +1320,6 @@ be-Tarask: display name: "Бачнае імя:" display name description: Вашае імя, якое будзе бачнае ўсім. Вы можаце зьмяніць яго потым ў Вашых наладах. email address: "Адрас электроннай пошты:" - fill_form: Запоўніце форму, і мы дашлем Вам электронны ліст, каб актывізаваць Ваш рахунак. - flash create success message: Дзякуй за рэгістрацыю. Мы даслалі ліст з пацьверджаньнем на адрас %{email} і, як толькі Вы пацьвердзіце Ваш рахунак, Вы зможаце пачаць працу з мапамі.

    Калі Вы карыстаецеся сыстэмай барацьбы са спамам, якая дасылае запыты на пацьверджаньне, калі ласка, упэўніцеся, што адрас webmaster@openstreetmap.org знаходзіцца ў Вашым белым сьпісе, таму што мы ня можам адказваць на такія запыты. - heading: Стварэньне рахунку license_agreement: Калі Вы пацьвердзіце Ваш рахунак, Вам трэба будзе пагадзіцца з умовамі супрацоўніцтва. no_auto_account_create: На жаль, мы зараз ня можам стварыць для Вас рахунак аўтаматычна. not displayed publicly: Не паказваецца публічна (глядзіце правілы адносна прыватнасьці) @@ -1642,6 +1491,11 @@ be-Tarask: revoker_name: Адкліканае show: Паказаць status: Статус + period: + few: "%{count} гадзіны" + many: "%{count} гадзінаў" + one: "%{count} гадзіна" + other: "%{count} гадзінаў" revoke: confirm: Вы ўпэўнены, што жадаеце адклікаць гэтае блякаваньне? flash: Гэтае блякаваньне было адкліканае. diff --git a/config/locales/be.yml b/config/locales/be.yml index 3b08524c020..205fc5c1a75 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -138,10 +138,10 @@ be: data_layer_name: Дадзеныя details: Падрабязней drag_a_box: Расцягніце рамку на карце для выбара іншай мясцовасці - edited_by_user_at_timestamp: Зменена [[user]] у [[timestamp]] - history_for_feature: Гісторыя [[feature]] + edited_by_user_at_timestamp: Зменена %{user} у %{timestamp} + history_for_feature: Гісторыя %{feature} load_data: Загрузіць дадзеныя - loaded_an_area_with_num_features: Вы загрузілі мясцовасць, што змяшчае [[num_features]] элементаў. Увогуле, некаторыя вандроўнікі могуць не здолець апрацаваць гэтакую колькасць дадзеных. Звычайна, найлепшы рэзультат назіраецца, калі элементаў менш за 100, пры большай колькасці вандроўнік можа згубіць хуткасць. Калі вы ўпэўненыя, што хочаце паглядзець на гэтыя дадзеныя, націсніце кнопку ніжэй. + loaded_an_area_with_num_features: Вы загрузілі мясцовасць, што змяшчае %{num_features} элементаў. Увогуле, некаторыя вандроўнікі могуць не здолець апрацаваць гэтакую колькасць дадзеных. Звычайна, найлепшы рэзультат назіраецца, калі элементаў менш за 100, пры большай колькасці вандроўнік можа згубіць хуткасць. Калі вы ўпэўненыя, што хочаце паглядзець на гэтыя дадзеныя, націсніце кнопку ніжэй. loading: Загрузка... manually_select: Выбраць іншую мясцовасць object_list: @@ -151,14 +151,14 @@ be: heading: Спіс аб'ектаў selected: type: - node: Вузел [[id]] - way: Лінія [[id]] + node: Вузел %{id} + way: Лінія %{id} type: node: Вузел way: Лінія private_user: таемны карыстальнік show_history: Паказаць гісторыю - unable_to_load_size: "Нельга загрузіць: парем мяжы [[bbox_size]] занадта вялікі (павінен быць не больш як %{max_bbox_size})" + unable_to_load_size: "Нельга загрузіць: парем мяжы %{bbox_size} занадта вялікі (павінен быць не больш як %{max_bbox_size})" wait: Пачакайце... zoom_or_select: Наблізьцеся ці выберыце іншую мясцовасць для агляду tag_details: diff --git a/config/locales/br.yml b/config/locales/br.yml index 3d46f584b22..0ea04d470c1 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -3,8 +3,21 @@ # Export driver: syck-pecl # Author: Fohanno # Author: Fulup +# Author: Gwenn-Ael +# Author: Nemo bis +# Author: Shirayuki # Author: Y-M D br: + about_page: + community_driven_title: Renet gant ar gumuniezh + copyright_html: ©OpenStreetMap
    kenlabourerien + lede_text: Savet eo OpenStreetMap gant ur gumuniezh gartennerien a-youl vat a genlabour hag a gempenn roadennoù diwar-benn hentoù, gwenodennoù, kafedioù, tiez-gar, ha muioc'h c'hoazh, er bed a-bezh. + local_knowledge_html: OpenStreetMap a laka ar pouez war an anaoudegezh eus an dachenn. Implijout a ra ar genlabourerien skeudennoù tapet diwar nij, mekanikoù GPS ha kartennoù klasel abalamour da wiriañ ez eo reizh ha hizivaet OSM. + local_knowledge_title: Gouiziegezh lec'hel + next: War-lerc'h + open_data_title: Roadennoù digor + partners_title: Kevelerien + used_by: "%{name} a bourchas kartennoù da gantadoù a lec'hiennoù web, da arloadoù hezoug ha da vekanikoù" activerecord: attributes: diary_comment: @@ -13,7 +26,7 @@ br: language: Yezh latitude: Ledred longitude: Hedred - title: Titl + title: Danvez user: Implijer friend: friend: Mignon @@ -82,161 +95,85 @@ br: blocked: Stanket eo bet ho moned d'an API. Kevreit ouzh an etrefas web evit gouzout hiroc'h. need_to_see_terms: Evit ar mare n'oc'h ket aotreet da vont war an API ken. Kevreit d'an etrefas Web da sellet ouzh Termenoù an implijerien. Marteze ne viot ket a-du ganto met ret eo deoc'h bezañ lennet anezho. browse: + anonymous: dizanv changeset: - changeset: "Strollad kemmoù : %{id}" + belongs_to: Aozer changesetxml: Strollad kemmoù XML - download: Pellgargañ %{changeset_xml_link} pe %{osmchange_xml_link} feed: title: Strollad kemmoù %{id} title_comment: Strollad kemmoù %{id} - %{comment} + node: Skoulmoù (%{count}) + node_paginated: Skoulmoù (%{x}-%{y} diwar %{count}) osmchangexml: osmChange XML - title: Strollad kemmoù - changeset_details: - belongs_to: "Zo da :" - bounding_box: "Boest bevenniñ :" - box: boest - closed_at: "Serret d'an :" - created_at: "Krouet d'an :" - has_nodes: - one: "Zo gantañ an %{count} skoulm-mañ :" - other: "Zo gantañ an %{count} skoulm-mañ :" - has_relations: - one: "Zo gantañ an %{count} darempred-mañ :" - other: "Zo gantañ an %{count} darempred-mañ :" - has_ways: - one: "Zo gantañ an %{count} hent-mañ :" - other: "Zo gantañ an %{count} hent-mañ :" - no_bounding_box: N'eus bet stoket boest bevenniñ ebet evit ar strollad kemmoù-mañ. - show_area_box: Diskouez boest an takad - common_details: - changeset_comment: "Addispleg :" - deleted_at: "Diverket d'an :" - deleted_by: "Diverket gant :" - edited_at: "Aozet d'an :" - edited_by: "Aozet gant :" - in_changeset: "Er strollad kemmoù :" - version: "Stumm :" + relation: Darempredoù (%{count}) + relation_paginated: Darempredoù (%{x}-%{y} diwar %{count}) + title: "Strollad kemmoù : %{id}" + way: Hentoù (%{count}) + way_paginated: Hentoù (%{x}-%{y} diwar %{count}) + closed: Serret + closed_by_html: Serret %{time} zo gant %{user} + closed_html: Serret %{time} zo containing_relation: entry: Darempred %{relation_name} entry_role: Darempred %{relation_name} (evel %{relation_role}) - map: - deleted: Dilamet - edit: - area: Aozañ an takad - node: Aozañ ar skoulm - relation: Aozañ an darempred - way: Aozañ an hent - larger: - area: Gwelet an takad war ur gartenn vrasoc'h - node: Gwelet ar skoulm war ur gartenn vrasoc'h - relation: Gwelet an darempred war ur gartenn vrasoc'h - way: Gwelet an hent war ur gartenn vrasoc'h - loading: O kargañ... - navigation: - all: - next_changeset_tooltip: Strollad kemmoù da-heul - next_node_tooltip: Neud da-heul - next_relation_tooltip: Darempred da-heul - next_way_tooltip: Hent da-heul - prev_changeset_tooltip: Strollad kemmoù kent - prev_node_tooltip: Neud kent - prev_relation_tooltip: Darempred kent - prev_way_tooltip: Hent kent - user: - name_changeset_tooltip: Gwelet an aozadennoù gant %{user} - next_changeset_tooltip: Aozadenn da-heul gant %{user} - prev_changeset_tooltip: Aozadenn gent gant %{user} + created: Krouet + created_by_html: Krouet %{time} zo gant %{user} + created_html: Krouet %{time} zo + deleted_by_html: Dilametelet %{time} zo gant %{user} + download_xml: Pellgargañ XML + edited_by_html: Aozet %{time} zo gant %{user} + in_changeset: Strollad kemmoù + location: "Lec'h :" + no_comment: (addispleg ebet) node: - download: "%{download_xml_link}, %{view_history_link} pe %{edit_link}" - download_xml: Pellgargañ XML - edit: aozañ - node: Skoulm - node_title: "Skoulm : %{node_name}" - view_history: gwelet an istor - node_details: - coordinates: "Daveennoù :" - part_of: "Lodenn eus :" - node_history: - download: "%{download_xml_link} pe %{view_details_link}" - download_xml: Pellgargañ XML - node_history: Istor ar skoulmoù - node_history_title: "Istor ar skoulm : %{node_name}" - view_details: gwelet ar munudoù + history_title: "Istor ar skoulm : %{name}" + title: "Skoulm : %{name}" not_found: - sorry: Ho tigarez, an %{type} gant an id %{id} n'eo ket bet kavet. + sorry: "Ho tigarez, an %{type} #%{id} n'eo ket bet kavet." type: changeset: strollad kemmoù node: skoulm relation: darempred way: hent - paging_nav: - of: eus - showing_page: O tiskouez ar bajenn + note: + closed_by: Diskoulmet gant %{user} %{when} zo + closed_by_anonymous: Diskoulmet gant un den dianv %{when} zo + closed_title: "Notenn diskoulmet : %{note_name}" + commented_by: Addispleg gant %{user} %{when} zo + commented_by_anonymous: Addispleg gant un den dianv %{when} zo + hidden_by: Kuzhet gant %{user} %{when} zo + hidden_title: "Notenn kuzhet #%{note_name}" + new_note: Notenn nevez + open_by: Krouet gant %{user} %{when} zo + open_by_anonymous: Krouet gant un den dianav %{when} zo + open_title: "Notenn n'eo ket diskoulmet : %{note_name}" + reopened_by: Adweredekaet gant %{user} %{when} zo + reopened_by_anonymous: Adweredekaet gant un den dianv %{when} zo + title: "Notenn : %{id}" + part_of: Lodenn eus redacted: + message_html: ↓Stumm %{version} eus an %{type}-mañ na c'hall ket bezañ diskouezet evel m"eo bet aozet. Sellit ouzh %{redaction_link} evit gouzout hiroc'h, mar plij. + redaction: ↓Aozañ %{id} type: node: skoulm relation: darempred way: hent relation: - download: "%{download_xml_link} pe %{view_history_link}" - download_xml: Pellgargañ XML - relation: Darempred - relation_title: "Darempred : %{relation_name}" - view_history: gwelet an istor - relation_details: - members: "Izili :" - part_of: "Lodenn eus :" - relation_history: - download: "%{download_xml_link} pe %{view_details_link}" - download_xml: Pellgargañ XML - relation_history: Istor an darempred - relation_history_title: "Istor an darempred : %{relation_name}" - view_details: gwelet ar munudoù + history_title: "Istor an darempred : %{name}" + members: Izili + title: "Darempred : %{name}" relation_member: entry_role: "%{type} %{name} evel %{role}" type: node: Skoulm relation: Darempred way: Hent - start: - manually_select: Diuzañ un takad disheñvel gant an dorn - view_data: Gwelet ar roadennoù evit gwel red ar gartenn start_rjs: - data_frame_title: Roadennoù - data_layer_name: Furchal e roadennoù ar gartenn - details: Munudoù - drag_a_box: Tresit ur voest war ar gartenn evit diuzañ un takad - edited_by_user_at_timestamp: Aozet gant [[user]] da [[timestamp]] - hide_areas: Kuzhat an takadoù - history_for_feature: Istor evit [[feature]] + feature_warning: Kargañ %{num_features} a elfennoù a ray d'ho merdeer bezañ gorrek. Ha sur oc'h e fell deoc'h dikwel ar roadenoù-se ? load_data: Kargañ ar roadennoù - loaded_an_area_with_num_features: Karget hoc'h eus un takad zo ennañ [[num_features]] elfenn. Peurliesañ o devez poan ar merdeerioù o tiskwel kemend-all a roadennoù, ha labourat a reont gwelloc'h pa vez nebeutoc'h a 100 elfenn da ziskwel, a-hend-all e c'hall ho merdeer bezañ gorrek pe chom hep respont. Ma'z oc'h sur hoc'h eus c'hoant da ziskwel ar roadennoù-mañ, e c'hallit ober dre glikañ war ar bouton amañ dindan. loading: O kargañ... - manually_select: Diuzañ un takad disheñvel gant an dorn - object_list: - api: Tapout an takad-mañ diwar an API - back: Diskwel roll an traezoù - details: Munudoù - heading: Roll traezoù - history: - type: - node: Skoulm [[id]] - way: Hent [[id]] - selected: - type: - node: Skoulm [[id]] - way: hent [[id]] - type: - node: Skoulm - way: Hent - private_user: implijer prevez - show_areas: Diskouez an takadoù - show_history: Diskouez an istor - unable_to_load_size: "Ne c'haller ket kargañ : re vras eo ment ar voest bevenniñ ([[bbox_size]]). Ret eo dezhi bezañ bihanoc'h eget %{max_bbox_size})" - wait: Gortozit... - zoom_or_select: Zoumañ pe diuzañ un takad eus ar gartenn da welet tag_details: - tags: "Balizennoù :" + tags: Balizennoù wiki_link: key: Deskrivadur ar balizenn %{key} war ar wiki tag: Deskrivadur ar balizenn %{key}=%{value} war ar wiki @@ -248,38 +185,25 @@ br: node: skoulm relation: darempred way: hent + version: Stumm + view_details: ↓Gwelet ar munudoù + view_history: Gwelet an istor way: - download: "%{download_xml_link}, %{view_history_link} pe %{edit_link}" - download_xml: Pellgargañ XML - edit: aozañ - view_history: gwelet an istor - way: Hent - way_title: "Hent : %{way_name}" - way_details: also_part_of: - one: lodenn ivez eus an hent %{related_ways} - other: lodenn ivez eus an hentoù %{related_ways} - nodes: "Skoulmoù :" - part_of: "Lodenn eus :" - way_history: - download: "%{download_xml_link} pe %{view_details_link}" - download_xml: Pellgargañ XML - view_details: gwelet ar munudoù - way_history: Istor an hent - way_history_title: "Istor an hent : %{way_name}" + one: lodenn eus an hent %{related_ways} + other: lodenn eus an hentoù %{related_ways} + history_title: "Istor an hent : %{name}" + nodes: Skoulmoù + title: "Hent : %{name}" changeset: changeset: anonymous: Dizanv - big_area: (bras) - no_comment: (hini ebet) no_edits: (aozadenn ebet) - show_area_box: diskouez takad ar voest - still_editing: (oc'h aozañ c'hoazh) view_changeset_details: Gwelet munudoù ar strollad kemmoù changeset_paging_nav: next: War-lerc'h » previous: « Kent - showing_page: O tiskouez ar bajenn %{page} + showing_page: Pajenn %{page} changesets: area: Takad comment: Addispleg @@ -287,30 +211,24 @@ br: saved_at: Enrollet da user: Implijer list: - description: Kemmoù diwezhañ - description_bbox: Strolladoù kemmoù e-barzh %{bbox} - description_friend: Hollad ar c'hemmoù degaset gant ho mignoned - description_nearby: Hollad kemmoù deuet gant an implijerien a-dost - description_user: Strolladoù kemmoù gant %{user} - description_user_bbox: Strolladoù kemmoù gant %{user} e-barzh %{bbox} - heading: Hollad kemmoù - heading_bbox: Hollad kemmoù - heading_friend: Hollad ar c'hemmoù - heading_nearby: Hollad kemmoù - heading_user: Hollad kemmoù - heading_user_bbox: Hollad kemmoù + empty: N'eus ket kavet strollad kemmoù ebet. + empty_area: Strollad kemmoù ebet en takad-mañ. + empty_user: Strollad kemmoù ebet gant an implijer-mañ. + load_more: Kargañ muioc'h + no_more: N'eus ket kavet strollad kemmoù all. + no_more_area: Strollad kemmoù ebet ken en takad-mañ. + no_more_user: Strollad kemmoù ebet ken gant an implijer-mañ. title: Hollad kemmoù - title_bbox: Strolladoù kemmoù e-barzh %{bbox} title_friend: Hollad ar c'hemmoù degaset gant ho mignoned title_nearby: Hollad kemmoù deuet gant an implijerien a-dost title_user: Strolladoù kemmoù gant %{user} - title_user_bbox: Strolladoù kemmoù gant %{user} e-barzh %{bbox} timeout: sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet. diary_entry: comments: ago: "%{ago} zo" comment: Evezhiadenn + has_commented_on: ↓%{display_name} en deus graet evezhiadennoù diwar-benn ar pennadoù deizlevr-mañ newer_comments: Evezhiadennoù nevesañ older_comments: Evezhiadennoù koshañ post: Postañ @@ -321,8 +239,9 @@ br: hide_link: Kuzhat an evezhiadenn-mañ diary_entry: comment_count: - one: 1 addispleg - other: "%{count} addispleg" + one: Un evezhiadenn + other: "%{count} evezhiadenn" + zero: Evezhiadenn ebet comment_link: Addisplegañ an enmoned-mañ confirm: Kadarnaat edit_link: Aozañ an enmoned-mañ @@ -381,6 +300,9 @@ br: user_title: Deizlevr %{user} editor: default: Dre ziouer (%{name} er mare-mañ) + id: + description: iD (aozer e-barzh ar merdeer) + name: iD potlatch: description: Potlatch 1 (aozer enframmet er merdeer) name: Potlatch 1 @@ -396,12 +318,12 @@ br: area_to_export: Takad da ezporzhiañ embeddable_html: HTML enkorfadus export_button: Ezporzhiañ - export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout Creative Commons Attribution-ShareAlike 2.0. + export_details: Roadennoù OpenStreetMap zo dindan an aotre-implijout Open Data Commons Open Database License (ODbL). format: Furmad format_to_export: Furmad da ezporzhiañ image_size: Ment ar skeudenn latitude: "Led. :" - licence: Aotre implijout + licence: Aotre-implijout longitude: "Hed. :" manually_select: Diuzañ un takad disheñvel gant an dorn map_image: Skeudenn gartenn (diskouez ur gwiskad boutin) @@ -412,29 +334,39 @@ br: paste_html: Pegañ HTML evit bezañ enkorfet en ul lec'hienn web scale: Skeuliad too_large: + advice: "Ma c'hwit an ezporzhiadur amañ a-us, implijit unan eus an elfennoù amañ dindan :" body: Re vras eo an takad-mañ evit bezañ ezporzhiet evel roadennoù XML OpenStreetMap. Zoumit, mar plij, pe diuzit un takad bihanoc'h. - heading: Zonenn re vras + geofabrik: + description: Eztennadennoù hizivaet ingal a genvandirioù, a broioù , hag a gêrioù diuzet + title: Pellgargañ Geofabrik + metro: + description: Eztennadennoù evit brasañ kêrioù ar bed hag o ardemezioù + title: Eztennadennoù Metro + other: + description: Mamennoù all a gaver o roll er wiki OpenStreetMap + title: Tarzhioù all + planet: + description: Eilennoù hizivaet ingal eus diaz roadennoù klok OpenStreetMap + title: Planedenn OSM zoom: Zoum - start_rjs: - add_marker: Ouzhpennañ ur merker d'ar gartenn - change_marker: Cheñch lec'hiadur ar merker - click_add_marker: Klikit war ar gartenn evit ouzhpennañ ur merker - drag_a_box: Tresañ ur voest war ar gartenn evit diuzañ un takad - export: Ezporzhiañ - manually_select: Diuzañ un takad disheñvel gant an dorn - view_larger_map: Gwelet ur gartenn vrasoc'h + title: Ezporzhiañ + fixthemap: + how_to_help: + join_the_community: + explanation_html: M'ho peus merzet ez eus ur gudenn gant roadennoù hor c'hartennoù, da skouer un hent diank pe ho chomlec'h, an doare d'ober gwellañ eo mont d'ar gumuniezh OpenStreetMap hag ouzhpennañ pe dresañ ar roadennoù hoc'h-unan. + title: Mont er gumuniezh-mañ + title: Penaos sikour + other_concerns: + title: Prederioù all geocoder: description: title: geonames: Lec'hiadur diwar GeoNames - osm_namefinder: "%{types} diwar OpenStreetMap Namefinder" osm_nominatim: Lec'hiadur adalek OpenStreetMap Nominatim types: cities: Keodedoù places: Lec'hioù towns: Kêrioù - description_osm_namefinder: - prefix: "%{distance} %{direction} eus %{type}" direction: east: reter north: norzh @@ -455,18 +387,29 @@ br: title: ca_postcode: Disoc'hoù diwar Geocoder.CA geonames: Disoc'hoù diwar GeoNames + geonames_reverse: Disoc'hoù diwar GeoNames latlon: Disoc'hoù diwar Internal - osm_namefinder: Disoc'hoù diwar OpenStreetMap Namefinder osm_nominatim: Disoc'hoù diwar OpenStreetMap Nominatim + osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap Nominatim uk_postcode: Disoc'hoù diwar NPEMap / FreeThe Postcode us_postcode: Disoc'hoù diwar Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} eus %{parentname})" - suffix_place: " %{distance} %{direction} diouzh %{placename}" search_osm_nominatim: + admin_levels: + level10: Bevenn ar bannlev + level2: Bevenn ar vro + level4: Bevenn ar Stad + level5: Bevenn ar rannvro + level6: Bevenn ar gontelezh + level8: Bevenn kêr + level9: Bevenn ar gêriadenn prefix: + aerialway: + chair_lift: fungador + drag_lift: Teleski + station: Arsav funlogell aeroway: aerodrome: Nijva + apron: ↓Parklec'h nijerezioù gate: Dor helipad: biñsporzh runway: Pistenn @@ -513,6 +456,7 @@ br: ferry_terminal: Porzh karrlistri fire_hydrant: Dour evit an tan fire_station: Kazarn pomperien + food_court: ↓Predva fountain: Feunteun fuel: Trelosk grave_yard: Bered @@ -556,6 +500,7 @@ br: shower: Strinkadenn social_centre: Kreizenn sokial social_club: Klub sokial + social_facility: Servij sokial studio: Studio supermarket: Gourmarc'had swimming_pool: Poull-neuial @@ -573,6 +518,7 @@ br: youth_centre: Kreizenn evit ar re yaouank boundary: administrative: Bevennoù melestradurel + census: ↓Bevenn stadeg national_park: Park broadel protected_area: Takad gwarezet bridge: @@ -583,6 +529,9 @@ br: "yes": Pont building: "yes": Savadur + emergency: + fire_hydrant: Dour evit an tan + phone: Pellgomzer evit an trummadoù highway: bridleway: Hent evit ar varc'hegerien bus_guideway: Roudenn vus heñchet @@ -594,6 +543,7 @@ br: footway: Gwenodenn evit an droadeien ford: Roudour living_street: Straed annez + milestone: ↓Maen-bonn minor: Hent dister motorway: Gourhent motorway_junction: Kengej gourhent @@ -603,6 +553,7 @@ br: platform: Leurenn primary: Hent kentañ renk primary_link: Pennhent + proposed: Hent kinniget raceway: Redva residential: Takad annezet rest_area: Leur diskuizh @@ -614,6 +565,7 @@ br: speed_camera: Radar tizh steps: Diri stile: Skalier + street_lamp: Post lamp tertiary: Hent trede renk tertiary_link: Hent trede renk track: Roudenn @@ -629,6 +581,7 @@ br: building: Savadur castle: Kastell church: Iliz + citywalls: Murioù kêr fort: Kreñv house: Ti icon: Arlun @@ -638,6 +591,7 @@ br: monument: Monumant museum: Mirdi ruins: Dismantroù + tomb: Bez tower: Tour wayside_cross: Kroaz wayside_shrine: Ti-pediñ @@ -670,6 +624,7 @@ br: railway: Hent-houarn recreation_ground: Leur c'hoari reservoir: Mirlenn + reservoir_watershed: ↓Mirlec'h dour residential: Takad annez retail: Kenwerzhioù road: Takad hent @@ -682,6 +637,7 @@ br: bird_hide: Bod evned common: Tachennoù foran fishing: Takad pesketa + fitness_station: ↓Atalier da embreger ar c'horf garden: Liorzh golf_course: Tachenn golf ice_rink: Poull-ruzikat @@ -703,6 +659,8 @@ br: airfield: Nijva milourel barracks: Kazarn bunker: Bunker + mountain_pass: + "yes": Ode menez natural: bay: Bae beach: Traezhenn @@ -772,6 +730,7 @@ br: locality: Kêr moor: Lanneg municipality: Kumun + neighbourhood: Ardremez postcode: Kod post region: Rannvro sea: Mor @@ -797,8 +756,10 @@ br: narrow_gauge: Hent-houarn strizh platform: Savenn hent-houarn preserved: Hent-houarn miret + proposed: Hent-houarn kinniget spur: Hent-houarn kevreañ station: Porzh-houarn + stop: Porzh-houarn subway: Arsav metro subway_entrance: Antre metro switch: Hentoù-houarn heñchañ @@ -814,6 +775,7 @@ br: beverages: Stal evajoù bicycle: Stal marc'hoù-houarn books: Levrdi + boutique: Stal butcher: Kiger car: Stal girri car_parts: Pezhioù evit ar c'hirri @@ -827,6 +789,7 @@ br: convenience: Ispiserezh copyshop: Stal luc'heilañ cosmetics: Stal produioù kened + deli: Tineller department_store: Gourstal discount: Stal discount doityourself: Stal bitellat @@ -840,7 +803,7 @@ br: food: Stal voued funeral_directors: Kañvlidoù furniture: Stal arrebeuri - gallery: Palier + gallery: Skeudennaoueg garden_centre: Stal liorzhañ general: Stal hollek gift: Stal profoù @@ -863,17 +826,21 @@ br: organic: Stal boued bio outdoor: Stal oberiantizoù diavaez pet: Stal loened + pharmacy: Apotikerezh photo: Stal luc'hskeudenniñ salon: Saloñs + second_hand: Stal traoù eildorn shoes: Stal voteier shopping_centre: Kreizenn-genwerzh sports: Stal sport stationery: Paperaerezh supermarket: Gourmarc'had + tailor: Kemener toys: Stal c'hoarielloù travel_agency: Ajañs-veaj video: Stal videoioù wine: Kavour gwin + "yes": Stal tourism: alpine_hut: Bod menez artwork: Oberenn arz @@ -896,6 +863,7 @@ br: viewpoint: Gwelva zoo: Zoo tunnel: + culvert: kan-dour "yes": Riboul waterway: artificial: Gwazh-dour artifisiel @@ -919,88 +887,163 @@ br: water_point: Doureg waterfall: Lamm-dour weir: Stankell + help_page: + help: + description: Ober ur goulenn pe klask respontoù e lec'hienn goulennoù-respontoù OSM + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + title: Tapout sikour + welcome: + description: Krogit gant ar sturlevr-mañ evit deskiñ diazezoù OpenStreetMap + title: Deuet-mat oc'h en OSM + url: /welcome + wiki: + description: Merdeañ er wiki evit gouzout traoù resis diwar-benn OSM. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Serriñ + edit_help: Dilec'hiit ar gartenn ha zoumit war ul lec'h a fell deoc'h aozañ, ha neuze klikit amañ. + key: + title: Alc'hwez ar gartenn + tooltip: Alc'hwez ar gartenn + tooltip_disabled: Alc'hwez kartenn da gaout evit ar gwiskad standart hepken map: base: cycle_map: Kelc'hiad kartenn + hot: Denegour mapquest: MapQuest digor standard: Standard transport_map: Kartenn treuzdougen + copyright: © Kenlabourerien OpenStreetMap + donate_link_text: + layers: + data: Roadennoù ar gartenn + header: Gwiskadoù kartenn + notes: Notennoù kartenn + overlays: Gweredekaat an adwiskadoù evit dresañ ar gartenn + title: Gwiskadoù + locate: + popup: Emaoc'h war-hed {distance} {unit} diouzh ar poent-mañ + title: Diskouez al lec'h m'emaon + zoom: + in: Zoumañ + out: Dizoumañ + notes: + new: + add: Ouzhpennañ un notenn + intro: Evit gwellaat ar gartenn e tiskouezer ar roadennoù a ebarzhit d'ar gartennaouerien all, setu displegit fraezh an traoù ha bezit resis kement ha ma c'hallit, mar plij, pa zilec'hiit ar merker d'ul lec'h mat ha pa ebarzhit ho notenn amañ dindan. + show: + anonymous_warning: En notenn-mañ ez eus evezhiadennoù gant implijerien dianav hag a zlefe bezañ gwiriekaet unan-ha-unan. + comment: Evezhiadenn + comment_and_resolve: Addisplegañ & Diskoulmañ + hide: Kuzhat + reactivate: Adweredekaat + resolve: Diskoulmañ + share: + cancel: Nullañ + center_marker: Kreizañ ar gartenn war ar merker + custom_dimensions: Lakaat mentoù personelaet + download: Pellgargañ + embed: HTML + format: "Furmad :" + image: Skeudenn + image_size: Ar skeudenn a ziskoueza ar gwiskad standart en + include_marker: Lakaat ur merker + link: Liamm pe HTML + long_link: Liamm + paste_html: Pegañ HTML evit bezañ enkorfet en ul lec'hienn web + scale: "Skeuliad :" + short_link: Liamm berr + short_url: URL berr + title: Rannañ + view_larger_map: Gwelet ur gartenn vrasoc'h site: + createnote_disabled_tooltip: Zoumañ da ouzhpennañ un notenn d'ar gartenn + createnote_tooltip: Ouzhpennañ un notenn d'ar gartenn edit_disabled_tooltip: Zoumañ da zegas kemmoù war ar gartenn edit_tooltip: Kemmañ ar gartenn - edit_zoom_alert: Ret eo deoc'h zoumañ evit aozañ ar gartenn - history_disabled_tooltip: Zoumañ evit gwelet ar c'hemmoù degaset d'an takad-mañ - history_tooltip: Gwelet ar c'hemmoù er zonenn-se - history_zoom_alert: Ret eo deoc'h zoumañ evit gwelet istor an aozadennoù + map_data_zoom_in_tooltip: Zoumiñ evit gwelet roadennoù ar gartenn + map_notes_zoom_in_tooltip: Zoumiñ evit gwelet notennoù ar gartenn layouts: + about: Diwar-benn community: Kumuniezh community_blogs: Blogoù ar gumuniezh community_blogs_title: Blogoù izili kumuniezh OpenStreetMap copyright: Copyright & Aotre-implijout - documentation: Teuliadur - documentation_title: Teuliadur ar raktres + data: Roadennoù donate: Skoazellit OpenStreetMap dre %{link} d'an Hardware Upgrade Fund. - donate_link_text: oc'h ober un donezon edit: Aozañ edit_with: Kemmañ gant %{editor} export: Ezporzhiañ - export_tooltip: Ezporzhiañ roadennoù ar gartenn + export_data: Ezporzhiañ roadennoù foundation: Diazezadur foundation_title: Diazezadur OpenStreetMap gps_traces: Roudoù GPS gps_traces_tooltip: Merañ ar roudoù GPS help: Skoazell - help_centre: Kreizenn skoazell - help_title: Lec'hienn skoazell evit ar raktres history: Istor - home: degemer - home_tooltip: Mont da lec'h ar gêr - inbox: boest resev (%{count}) - inbox_tooltip: - one: 1 gemennadenn anlennet zo en ho poest resev - other: E-barzh ho poest resev ez eus %{count} kemennadenn anlennet - zero: N'eus kemennadenn anlennet ebet en ho poest resev - intro_1: OpenStreetMap zo ur gartenn digoust eus ar bed a-bezh, a c'haller kemmañ. Graet eo gant tud eveldoc'h. + home: Mont da lec'h ar gêr intro_2_create_account: Krouiñ ur gont implijer - intro_2_download: pellgargañ - intro_2_license: Aotre digor - intro_2_use: implijout - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - title: OpenStreetMap data zo dindan an aotre-implijout Creative Commons Attribution-Share Alike 2.0 - log_in: kevreañ + intro_header: Donemat en OpenStreetMap ! + intro_text: Ur gartenn eus ar bed eo OprenStreetMap, krouet gant tud eveldoc'h ha frank hec'h implij dindan un aotre-implij digor. + learn_more: Gouzout hiroc'h + log_in: Kevreañ log_in_tooltip: Kevreañ gant ur gont zo anezhi dija logo: alt_text: Logo OpenStreetMap - logout: digevreañ - logout_tooltip: Digevreañ + logout: Digevreañ make_a_donation: text: Ober un donezon title: Skoazellañ OpenStreetMap gant ur road arc'hant + more: Muioc'h osm_offline: Ezlinenn eo diaz roadennoù OpenStreetMap evit bremañ e-pad ma pleder gant ul labour kempenn bras. osm_read_only: Diaz roadennoù OpenStreetMap zo da lenn hepken evit bremañ evit bremañ abalamour da labourioù kempenn bras. + partners_bytemark: ↓Herberc'hiañ Bytemark partners_html: "%{ucl}, %{ic}, %{bytemark}, ha %{partners} all a ra war-dro an herberc'hiañ." partners_ic: Skolaj impalaerel Londrez partners_partners: Kevelourien + partners_ucl: ↓Kreizenn VR an UCL sign_up: En em enskrivañ sign_up_tooltip: Krouiñ ur gont evit aozañ - sotm2011: Kemerit perzh e kendalc'h OpenStreetMap 2011, Stad ar gartenn, d'an 11 a viz Gwengolo e Denver ! + start_mapping: Kregiñ da gartennaouiñ tag_line: Kartenn digoust eus ar bed Wiki user_diaries: Deizlevrioù an implijer user_diaries_tooltip: Gwelet deizlevrioù an implijerien - view: Gwelet - view_tooltip: Gwelet ar gartenn - welcome_user: Degemer mat, %{user_link} - welcome_user_link_tooltip: Ho pajenn implijer - wiki: Wiki - wiki_title: Lec'hienn wiki evit ar raktres license_page: foreign: english_link: orin e Saozneg text: Ma vez digendalc'h etre ar bajenn troet-mañ hag %{english_original_link} e teuio ar bajenn saoznek da gentañ title: Diwar-benn an droidigezh-mañ - legal_babble: "

    Copyright hag aotre-implijout

    \n

    \n OpenStreetMap zo un hollad roadennoù digor, a c'haller kaout dindan an aotre-implijout Creative\n Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \n Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n genlabourerien. Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n destenn reolennoù\n klok e kavot munudoù ho kwirioù hag ho teverioù.\n

    \n\n

    Penaos reiñ kred da OpenStreetMap

    \n

    \n Ma'z implijit skeudennoù OpenStreetMap, e c'houlennomp diganeoc'h\n lakaat en ho kred ar meneg “© kenlabourerien OpenStreetMap\n CC BY-SA”. Ma ne implijit nemet roadennoù ar c'hartennoù,\n e c'houlennomp diganeoc'h lakaat “Roadennoù ar gartenn © kenlabourerien OpenStreetMap,\n CC BY-SA”.\n

    \n

    \n Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du http://www.openstreetmap.org/\n ha CC BY-SA war-du http://creativecommons.org/licenses/by-sa/2.0/.\n Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :\n un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da\n www.openstreetmap.org (marteze en ur astenn\n ‘OpenStreetMap’ ar chomlec'h klok) ha da\n www.creativecommons.org.\n

    \n\n

    Titouroù ouzhpenn

    \n

    \n Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit FAG ar reolennoù.\n

    \n

    \n Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\n eus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre\n ezpleg ar re zo ar gwirioù-azer ganto.\n

    \n

    \n Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas\n un API digoust evit an diorroerien diavaez.\n\n Sellit ouzh hor reolennoù evit implijout an API,\n reolennoù evit implijout ar gartenn\n ha reolennoù evit implijout Nominatim.\n

    \n\n

    Hor c'henlabourerien

    \n

    \n Hervez hon aotre-implijout CC BY-SA e tleit “reiñ kred a-walc'h \n d'an aozer orin diouzh ar media a implijit”.\n Kartennourien hiniennel OSM ne c'houlennont ket\n kred panevet “kenlabourerien OpenStreetMap”,\n met pa vez ebarzhet roadennoù eus un ajañs kartennañ broadel\n pe ur vammenn veur all en OpenStreetMap,\n e c'hall bezañ fur reiñ kred dezho war-eeun\n en doare a c'houlennont pe dre ul liamm war-du ar bajenn-mañ.\n

    \n\n\n\n
      \n
    • Australia: Ennañ ar roadennoù diwar-benn an bannlevioù\n diazezet war roadennoù Australian Bureau of Statistics.
    • \n
    • Aostria: Ennañ roadennoù eus\nStadt Wien (under\nCC BY.
    • \t\nCC BY) \nha Land Vorarlberg.\n
    • Kanada: Ennañ roadennoù eus\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), ha StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Frañs: Ennañ roadennoù eus Renerezh Hollek an Tailhoù.
    • \n
    • Netherlands: Contains © AND data, 2007\n (www.and.com)
    • \n
    • Zeland-Nevez: Ennañ roadennoù eus\n Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polonia: Ennañ roadennoù eus kartennoù UMP-pcPL. Copyright\nUMP-pcPL kenlabourerien.\n\nMuioc'h diwar-benn OSM's use of UMP data
    • \n
    • South Africa: Ennañ roadennoù eus\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved.
    • \n
    • Rouantelezh-Unanet: Ennañ roadennoù eus Ordnance\n Survey data © Crown copyright and database right 2010.
    • \n
    \n\n

    \n Ebarzhiñ roadennoù en OpenStreetMap ne dalvez ket eo aprouet OpenStreetMap gant ar bourchaserien orin na zegasont tamm gwarant, atebegezh pe asant ebet.\n

    " + legal_babble: + attribution_example: + alt: Skouer eus penaos deverkañ OpenStreetMap war ur bajenn web + title: Skouer deverkadur + contributors_at_html: "Aostria : Ennañ roadennoù eus\nStadt Wien (dindan\nCC BY.
  • \t\nCC BY), \nLand Vorarlberg ha\nLand Tirol (dindan CC-BY AT gant enkemmadoù)." + contributors_ca_html: "Kanada : Ennañ roadennoù eus\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), ha StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: "↓Evit muioc'h a vunudoù diwar-benn ar re-se, hag ar mammennoù all a zo bet implijet da sikour da wellaat OpenStreetMap, sellit ouzh ar Bajenn Skoazellerien e Wiki OpenStreetMap." + contributors_footer_2_html: Enlakaat roadennoù e OpenStreetMap ne empleg ket ez aprou ar bourchaserien orin a endalc'had OpenStreetMap, na ne bourchasont, na ne waratomp pe na ne zegemeront ne vern pe atebegezh e vefe. + contributors_fr_html: "Frañs : Ennañ roadennoù eus Renerezh Hollek an Tailhoù." + contributors_gb_html: "Rouantelezh-Unanet : Ennañ roadennoù eus Ordnance\n Survey data © Crown copyright and database right 2010-12." + contributors_intro_html: "Miliadoù a hiniennoù a labour ganimp. Ebarzhiñ a reomp ivez roadennoù digor eus ajañsoù kartennañ hag eus mamennoù all, hag en o zouez :" + contributors_nl_html: "Netherlands : Contains © AND data, 2007\n (www.and.com)" + contributors_nz_html: "Zeland-Nevez : Ennañ roadennoù eus\n Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Hor c'henlabourerien + contributors_za_html: "Afrika ar Su : Ennañ roadennoù eus\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: Goulenn a reomp diganeoc'h lakaat en ho kred ar meneg “© kenlabourerien OpenStreetMap”. + credit_2_html: "Pa vez posupl e tle OpenStreetMap bezañ ur gourliamm war-du http://www.openstreetmap.org/\n ha CC BY-SA war-du http://creativecommons.org/licenses/by-sa/2.0/.\n Ma'z implijit ur skor ma ne c'haller ket krouiñ liammoù (da skouer :\n un destenn moullet), ez aliomp ac'hanoc'h da gas ho lennerien da\n www.openstreetmap.org (marteze en ur astenn\n ‘OpenStreetMap’ ar chomlec'h klok) ha da\n www.creativecommons.org." + credit_3_html: "Evit ur gartenn elektronek a c'haller merdeiñ enni e tlefe ar c'hred dont war wel e korn ar gartenn.\nDa skouer :" + credit_title_html: Penaos reiñ kred da OpenStreetMap + infringement_1_html: "Degas a reomp da soñj da genlabourerien OSM ne zleont morse lakaat roadennoù a zeu\neus mammennoù dindan wirioù (da sk. : Google Maps pe kartennoù moullet) hep aotre\nezpleg ar re zo ar gwirioù-aozer ganto." + infringement_2_html: ma kredit ez eus bet ouzhpennet danvez dindan aotre-implijout e gaou da diaz roadennoù OpenStreetMat pe d'al lec'hienn-mañ, roit an dra-se da c'houzout d'hon argerzh dizober, mar plij, pe skrivit war-eeun war hor furmskrid enlinenn. + infringement_title_html: Terriñ ar gwir-eilañ + intro_1_html: "OpenStreetMap zo dindan un aotre-implijout digor, a c'haller kavout en Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Dieub oc'h da eilañ, da skignañ, da gas ha da azasaat hor c'hartennoù\n hag hor roadennoù, gant ma root kred da OpenStreetMap ha d'e\n genlabourerien. Ma kemmit pe ma implijit hor c'hartennoù pe hor roadennoù e labourioù all,\n ne c'hallit ket skignañ ar re-se dindan un aotre-implijout all. En \n legal\ncode e kavot munudoù ho kwirioù hag ho teverioù." + intro_3_html: "Emañ tammoù hor c'hartennoù hag hon teulioù dindan an aotre-implijout Creative \nCommons Attribution-ShareAlike 2.0 license (CC-BY-SA)." + more_1_html: "Ma fell deoc'h kaout muioc'h a ditouroù diwar-benn adimplij hor roadennoù, lennit FAG ar reolennoù." + more_2_html: "Daoust da OpenStreetMap bezañ un hollad roadennoù digor, n'omp ket evit pourchas\n un API digoust evit an diorroerien diavaez.\n Sellit ouzh hor reolennoù evit implijout an API,\n reolennoù evit implijout ar gartenn\n ha reolennoù evit implijout Nominatim." + more_title_html: Titouroù ouzhpenn + title_html: Copyright hag aotre-implijout native: mapping_link: kregiñ da gemer perzh native_link: Stumm brezhonek @@ -1060,12 +1103,9 @@ br: title: Boest kas to: Da read: - back_to_inbox: Distreiñ d'ar voest resev - back_to_outbox: Distreiñ d'ar voest kas + back: Distreiñ date: Deiziad from: A-berzh - reading_your_messages: O lenn ho kemennadennoù - reading_your_sent_messages: O lenn ho kemennadennoù kaset reply_button: Respont subject: Danvez title: Lenn ar gemennadenn @@ -1076,6 +1116,37 @@ br: wrong_user: Kevreet oc'h evel "%{user}", met ar gemennadenn a fell deoc'h respont outi n'eo ket bet kaset d'an implijer-se. Mar plij kevreit gant ar gont reizh evit gellout respont. sent_message_summary: delete_button: Dilemel + note: + description: + closed_at_by_html: Diskoulmet %{when} zo gant %{user} + closed_at_html: Diskoulmet %{when} zo + commented_at_by_html: Hizivaet %{when} zo gant %{user} + commented_at_html: Hizivaet %{when} zo + opened_at_by_html: Bet krouet %{when} zo gant %{user} + opened_at_html: Bet krouet %{when} zo + reopened_at_by_html: Adweredekaet %{when} zo gant %{user} + reopened_at_html: adweredekaet %{when} zo + entry: + comment: Evezhiadenn + full: Notenn glok + mine: + ago_html: "%{when} zo" + created_at: Krouet e + creator: Krouer + description: Deskrivadur + heading: notennoù %{user} + id: Id + last_changed: Kemm diwezhañ + subheading: Notennoù kaset pe addispleget gant %{user} + title: Notennoù kaset pe addispleget gant %{user} + rss: + closed: notenn serret (tost da %{place}) + commented: evezhiadenn nevez (tost da %{place}) + description_area: Ur roll notennoù, addispleget, gant evezhiadennoù pe serret en ho takad [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Ur froud rss evit an notenn %{id} + opened: notenn nevez (tost da %{place}) + reopened: notenn adweredekaet (tost da %{place}) + title: Notennoù OpenStreetMap notifier: diary_comment_notification: footer: Gallout a rit ivez lenn an addispleg war %{readurl}, lezel addisplegoù war %{commenturl} pe respont war %{replyurl} @@ -1091,8 +1162,7 @@ br: email_confirm_plain: click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan, mar plij, evit kadarnaat ar c'hemm. greeting: Demat, - hopefully_you_1: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel da - hopefully_you_2: "%{server_url} da %{new_address}." + hopefully_you: Unan bennak (c'hwi moarvat) a garfe cheñch e chomlec'h postel eus %{server_url} da %{new_address}. friend_notification: befriend_them: "Tu 'zo deoc'h e ouzhpennañ evel ur mignon amañ : %{befriendurl}." had_added_you: "%{user} en deus hoc'h ouzhpennet evel mignon war OpenStreetMap." @@ -1121,44 +1191,36 @@ br: lost_password_plain: click_the_link: Ma'z eo c'hwi, klikit war al liamm amañ dindan, mar plij, evit adderaouekaat ho ker-tremen. greeting: Demat, - hopefully_you_1: Unan bennak (c'hwi, moarvat) en deus goulennet e vefe adderaouekaet ar ger-tremen - hopefully_you_2: kont openstreetmap.org gant ar chomlec'h postel-mañ. + 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 message_notification: - footer1: Gallout a rit ivez lenn ar gemennadenn war %{readurl} - footer2: ha gallout a rit respont da %{replyurl} + footer_html: Gallout a rit ivez lenn ar gemennadenn e %{readurl} ha respont e %{replyurl} header: "%{from_user} en deus kaset deoc'h ur gemennadenn dre OpenStreetMap gant an danvez %{subject} :" hi: Demat %{to_user}, + note_comment_notification: + anonymous: Un implijer dizanv + closed: + commented_note: "%{commenter} en deus diskoulmet un notenn war ur gartenn hoc'h eus addispleget. Emañ an notenn tost da %{place}." + subject_other: "[OpenStreetMap] %{commenter} en deus diskoulmet un notenn a sell ouzhoc'h" + subject_own: "[OpenStreetMap] %{commenter} en deus diskoulmet unan eus ho notennoù" + your_note: "%{commenter} en deus diskoulmet unan eus ho notennoù kartenn tost da %{place}." + commented: + commented_note: "%{commenter} en deus lezet un addispleg war ur gartenn hoc'h eus addispleget. Emañ an notenn tost da %{place}." + subject_other: "[OpenStreetMap] %{commenter} en deus addispleget un notenn a sell ouzhoc'h" + subject_own: "[OpenStreetMap] %{commenter} en deus addispleget unan eus ho notennoù" + your_note: "%{commenter} en deus lezet un addispleg war unan eus ho notennoù kartenn tost da %{place}." + details: Munudoù ouzhpenn diwar-benn an notenn a c'hall bezañ kavet e %{url}. + greeting: Demat, + reopened: + commented_note: "%{commenter} en deus adweredekaet un notenn war ur gartenn hoc'h eus addispleget. Emañ an notenn tost da %{place}." + subject_other: "[OpenStreetMap] %{commenter} en deus adweredekaet un notenn a sell ouzhoc'h" + subject_own: "[OpenStreetMap] %{commenter} en deus adweredekaet unan eus ho notennoù" + your_note: "%{commenter} en deus adweredekaet unan eus ho notennoù kartenn tost da %{place}." signup_confirm: - subject: "[OpenStreetMap] Kadarnaat ho chomlec'h postel" - signup_confirm_html: - ask_questions: Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war hol lec'hienn goulennoù-respontoù. - click_the_link: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat krouidigezh ho kont ha gouzout hiroc'h diwar-benn OpenStreetMap - current_user: Ur roll eus an implijerien red dre rummadoù, diazezet war al lec'h m'emaint er bed, a c'haller kaout diwar Category:Users_by_geographical_region. - get_reading: Muioc'h a ditouroù diwar-benn OpenStreetMap war ar wiki pe war ar blog opengeodata a ginnig ivez podskignadennoù da selaou ! - greeting: Demat ! - hopefully_you: Unan bennak (c'hwi, moarvat) a garfe krouiñ ur gont war - introductory_video: Gallout a rit sellet ouzh un %{introductory_video_link}. - more_videos: Bez' ez eus %{more_videos_link}. - more_videos_here: muioc'h a videoioù amañ - user_wiki_page: Erbediñ a reomp deoc'h krouiñ ur bajenn implijer war ar wiki, enni balizennoù rummadoù o tiskouez pelec'h emaoc'h, evel [[Category:Users_in_Brest]]. - video_to_openstreetmap: video evit kregiñ gant OpenStreetMap - wiki_signup: Gallout a rit ivez krouiñ ur gont war wiki OpenStreetMap. - signup_confirm_plain: - ask_questions: "Gellout a rit sevel an holl goulennoù ho pefe diwar-benn OpenStreetMap war hol lec'hienn goulennoù-respontoù :" - blog_and_twitter: "Tapout ar c'heleier diwezhañ diwar blog OpenStreetMap pe Twitter :" - click_the_link_1: Ma'z eo c'hwi, degemer mat deoc'h ! Klikit war al liamm amañ dindan evit kadarnaat ho - click_the_link_2: kont ha lenn muioc'h a ditouroù diwar-benn OpenStreetMap. - current_user_1: Ur roll eus an implijerien diazezet war al lec'h m'emaint er bed - current_user_2: "a c'haller kaout diwar :" + confirm: "A-raok ober forzh petra hon eus ezhomm da wiriañ hag-eñ ez eo ganeoc'h-c'hwi ez eo bet kaset ar goulenn-mañ ; m'emañ kont evel-se, klikit war al liamm a-is da gadarnaat ho kont :" + created: Unan bennak (c'hwi, emichañs) a zo o paouez krouiñ ur gont war %{site_url}. greeting: Demat ! - hopefully_you: Unan bennak (c'hwi moarvat) a garfe krouiñ ur gont war - introductory_video: "Gallout a rit sellet ouzh ur video evit kregiñ gant OpenStreetMap amañ :" - more_videos: "Muioc'h a videoioù zo amañ :" - opengeodata: "OpenGeoData.org eo blog OpenStreetMap, ha kinnig a ra podskignadennoù ivez :" - the_wiki: "Lennit traoù diwar-benn OpenStreetMap war ar wiki :" - user_wiki_1: Erbediñ a reomp deoc'h krouiñ ur bajenn implijer wiki, enni - user_wiki_2: rummadoù hag a verk pelec'h emaoc'h, evel [[Category:Users_in_Brest]]. - wiki_signup: "Gallout a rit ivez krouiñ ur gont war wiki OpenStreetMap war :" + subject: "[OpenStreetMap] Degemer mat en OpenStreetMap" + welcome: Goude m'ho po kadarnaet ho kont, e roimp un nebeud titouroù ouzhpenn deoc'h evit kregiñ ganti. oauth: oauthorize: allow_read_gpx: lenn ho roudoù GPS prevez. @@ -1167,8 +1229,18 @@ br: allow_write_api: kemmañ ar gartenn. allow_write_diary: krouiñ enmonedoù en deizlevr, addisplegoù ha kavout mignoned. allow_write_gpx: kas roudoù GPS. + allow_write_notes: kemmañ notennoù allow_write_prefs: kemmañ ho penndibaboù implijer. request_access: Emañ an arload %{app_name} o c'houlenn mont d'ho kont, %{user}. Gwiriit hag-eñ hoc'h eus c'hoant e vefe ar barregezhioù-mañ gant hoc'h arloadoù. Gallout a rit dibab kement ha ma karit. + title: Aotren mont d'ho kont + oauthorize_failure: + denied: Miret ho peus ouzh an arload %{app_name} da vont d'ho kont. + invalid: Ar jedouer aotren n'eo ket reizh. + title: C'hwitet eo ar goulenn aotre + oauthorize_success: + allowed: Aotreet ho peus an arload %{app_name} da vont d'ho kont. + title: Reked aotre roet + verification: Ar c'hod gwiriekaat zo %{code}. revoke: flash: Torret hoc'h eus ar jedouer evit %{application} oauth_clients: @@ -1185,6 +1257,7 @@ br: allow_write_api: kemmañ ar gartenn. allow_write_diary: krouit enmonedoù en deizlevr, addisplegoù, ha kavit mignoned. allow_write_gpx: kas roudoù GPS. + allow_write_notes: kemmañ notennoù allow_write_prefs: kemmañ e benndibaboù implijer. callback_url: URL gervel en-dro name: Anv @@ -1201,7 +1274,7 @@ br: no_apps: Ha bez' hoc'h eus un arload ho pefe c'hoant da varilhañ evit implijout ar standard %{oauth} ganimp ? Ret eo deoc'h marilhañ hoc'h arload web a-raok dezhi ober rekedoù d'ar servij-mañ. register_new: Marilhañ hoc'h arload registered_apps: "Marilhet eo an arloadoù arvalien-mañ ganeoc'h :" - revoke: Terriñ ! + revoke: Disteuler ! title: Ma munudoù OAuth new: submit: Marilhañ @@ -1215,6 +1288,7 @@ br: allow_write_api: kemmañ ar gartenn. allow_write_diary: krouit enmonedoù en deizlevr, addisplegoù ha kavit mignoned. allow_write_gpx: kas roudoù GPS. + allow_write_notes: kemmañ notennoù allow_write_prefs: kemmañ o fenndibaboù implijerien. authorize_url: "URL aotren :" confirm: Ha sur oc'h ? @@ -1223,7 +1297,7 @@ br: key: "Alc'hwez implijer :" requests: "O c'houlenn an aotreoù-mañ digant an implijer :" secret: "Sekred an implijer :" - support_notice: Skorañ a reomp HMAC-SHA1 (erbedet) hag an destenn diaoz er mod ssl. + support_notice: Degemer a reomp ar sinadurioù HMAC-SHA1 (erbedet) ha RSA-SHA1. title: Munudoù OAuth evit %{app_name} url: "URL ar jedouer reked :" update: @@ -1263,6 +1337,7 @@ br: edit: anon_edits_link_text: Kavit perak. flash_player_required: 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 aozañ OpenStreetMap. + 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ñ. not_public: N'hoc'h eus ket lakaet hoc'h aozadennoù da vezañ foran. not_public_description: Ne c'hallit ket ken aozañ ar gartenn nemet e lakafec'h hoc'h aozadennoù da vezañ foran. Gallout a rit lakaat hoc'h aozadennoù da vezañ foran diwar ho %{user_page}. @@ -1271,18 +1346,15 @@ br: 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.) user_page_link: pajenn implijer index: + createnote: Ouzhpennañ un notenn js_1: Pe emaoc'h oc'h implijout ur merdeer ha ne skor ket JavaScript, pe hoc'h eus diweredekaet JavaScript. js_2: OpenStreetMap a implij JavaScript evit e gartenn risklus. license: - license_name: Creative Commons Deroadenn Kenrannañ heñvel 2.0 - notice: Dindan aotre-implijout %{license_name} gant an %{project_name} hag e genobererien. - project_name: raktres OpenStreetMap + copyright: Gwir-eilañ gant OpenStreetMap hag ar genlabourerien, dindan un aotre-implijout digor permalink: Peurliamm remote_failed: C'hwitet eo ar c'hemm - gwiriit hag-eñ eo karget JOSM or Merkaartor ha gweredekaet an dibarzh kontroll a-bell shortlink: Liamm berr key: - map_key: Alc'hwez ar gartenn - map_key_tooltip: Alc'hwez ar gartenn table: entry: admin: Bevenn velestradurel @@ -1368,7 +1440,6 @@ br: preview: Rakwelet search: search: Klask - search_help: "da skouer : 'Kemper', 'Straed Siam, Brest', 'CB2 5AQ', pe 'tiez-post tost da Roazhon' muioc'h a skouerioù..." submit_text: Kas where_am_i: Pelec'h emaon ? where_am_i_title: Deskrivañ al lec'hiadur a-vremañ en ur implijout al lusker enklask @@ -1384,6 +1455,11 @@ br: upload_trace: Kas ar roud GPS delete: scheduled_for_deletion: Roudenn da vezañ dilamet + description: + description_with_count: + one: restr GPX gant %{count} poent digant %{user} + other: restr GPX gant %{count} poent digant {user} + description_without_count: Restr GPX digant %{user} edit: description: "Deskrivadur :" download: pellgargañ @@ -1401,7 +1477,11 @@ br: uploaded_at: "Kaset da :" visibility: "Gwelusted :" visibility_help: Petra a dalvez an dra-mañ ? + georss: + title: Roudoù GPS eus OpenStreetMap list: + description: Furchal ar roud GPS pellgarget nevez zo + empty_html: N'eus netra da welet amañ. Pellgargit ur roudenn nevez evit gouzout hiroc'h diwar-benn an tresañ GPS, sellit ouzh ar href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2i. public_traces: Roudoù GPS foran public_traces_from: Roudoù GPS foran gant %{user} tagged_with: " balizennet gant %{tags}" @@ -1446,9 +1526,9 @@ br: trace_optionals: tags: Balizennoù trace_paging_nav: - next: War-lerc'h » - previous: « Kent - showing_page: O tiskouez ar bajenn %{page} + newer: ↓Roudoù nevez + older: ↓Roudoù kozh + showing_page: Page %{page} view: delete_track: Dilemel ar roudenn-mañ description: "Deskrivadur :" @@ -1459,7 +1539,7 @@ br: heading: O welet ar roud %{name} map: kartenn none: Hini ebet - owner: Perc'henn + owner: "Perc'henn :" pending: WAR C'HORTOZ points: "Poentoù :" start_coordinates: "Daveennoù orin :" @@ -1487,6 +1567,10 @@ br: email never displayed publicly: (n'eo ket diskwelet d'an holl morse) flash update success: Hizivaet eo bet titouroù an implijer. flash update success confirm needed: Hizivaet eo bet titouroù an implijer. Gwiriit ho posteloù evit kadarnaat ho chomlec'h postel nevez. + gravatar: + gravatar: Implijout Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: petra eo se ? home location: "Lec'hiadur ar gêr :" image: "Skeudenn :" image size hint: (ar skeudennoù karrezenneg gant ar stumm 100×100 pixel a zo ar re wellañ) @@ -1522,13 +1606,13 @@ br: update home location on click: Hizivaat lec'hiadur ho kêr pa glikit war ar gartenn ? confirm: already active: Kadarnaet eo bet ar gont-mañ c'hoazh. - before you start: Gouzout a reomp ez eus mall warnoc'h kregiñ da gartennañ moarvat, met a-raok e c'hallfec'h reiñ muioc'h a ditouroù diwar ho penn er furmskrid amañ dindan. button: Kadarnaat - heading: Kadarnaat kont un implijer + heading: Taolit ur sell ouzh ho posteloù ! + introduction_1: Kaset hon eus ur postel gwiriekaat deoc'h. + introduction_2: Kadarnait ho kont o klikañ war al liamm er postel, hag e c'hallit kregiñ da gartennaouiñ. press confirm button: Pouezit war ar bouton kadarnaat amañ dindan evit gweredekaat ho kont. - reconfirm: Ma'z oc'h enskrivet abaoe pell ho pefe kaout ezhomm da gas deoc'h-c'hwi ur postel kadarnaat all. - success: Kadarnaet eo ho kont, trugarez evit bezañ en em enskrivet ! - unknown token: N'eus ket eus ar jedouer-se war a seblant. + reconfirm_html: M'ho peus ezhomm da adkas ar postel kadarnaat, klikit amañ. + unknown token: Diamzeret eo ar c'hod gwiriekaat pe n'eus ket anezhañ. confirm_email: button: Kadarnaat failure: Kadarnaet ez eus bet ur chomlec'h postel dija gant art jedouer-mañ. @@ -1548,8 +1632,8 @@ br: heading: Implijerien hide: Kuzhat an implijerien diuzet showing: - one: Diskwel ar bajenn %{page} (%{first_item} war %{items}) - other: Diskwel ar bajenn %{page} (%{first_item}-%{last_item} war %{items}) + one: Pajenn %{page} (%{first_item} diwar %{items}) + other: Pajenn %{page} (%{first_item}-%{last_item} diwar %{items}) summary: "%{name} krouet eus %{ip_address} d'an %{date}" summary_no_ip: "%{name} krouet d'an %{date}" title: Implijerien @@ -1564,8 +1648,6 @@ br: lost password link: Ankouaet ho ker-tremen ganeoc'h ? new to osm: Nevez war OpenStreetMap ? no account: N'hoc'h eus kont ebet ? - notice: Gouzout hiroc'h diwar-benn ar cheñchamant aotre-implijout da zont gant OpenStreetMap (troidigezhioù) (kendiviz) - notice_terms: Embannet e vo OpenStreetMap dindan un aotre-implijout nevez adalek ar 1añ a viz Ebrel 2012. Ken frank a wirioù e vo hag an hini zo bremañ nemet e tegouezho gwelloc'h an termenoù gwir ouzh hon diaz roadennoù kartennaouel. Plijet e vefemp o virout ho tegasadennoù da OpenStreetMap, met n'hallimp en ober nemet mard embannit bezañ a-du d'hor lezel o skignañ diouzh termenoù an aotre nevez. A-hend-all e rankimp lemel anezho kuit eus an diaz.

    Kevreit evit gwelet an termenoù nevez hag asantiñ dezho. Ne dap nemet un un nebeud eilennoù. Ho trugarekaat ! openid: "%{logo} OpenID :" openid invalid: Ho tigarez, Evit doare eo stummet fall hoc'h OpenID openid missing provider: Ho tigarez, n'eus ket bet gallet mont e darempred gant ho pourvezer OpenID @@ -1610,19 +1692,21 @@ br: title: Ger-tremen kollet make_friend: already_a_friend: Mignon oc'h gant %{name} dija. + button: Ozhpennañ evel mignon failed: Ho tigarez, n'eus ket bet gallet ouzhpennañ %{name} evel mignon. - success: "%{name} zo ho mignon bremañ." + heading: ↓Ouzhpennañ %{user} evel mignon ? + success: "%{name} eo ho mignon bremañ !" new: + about: + header: Digoust hag aozadus + html: "

    E kemm gant kartennoù all, OpenStreetMap zo krouet penn-da-benn gant tud eveldoc'h. Forzh piv a c'hall dresañ, hizivaat, pellgargañ hag implijout anezhi.

    \n

    Lakait hoc'h anv evit kregiñ da genlabourat. Kas a raimp ur postel deoc'h da gadarnaat ho kont.

    " confirm email address: "Kadarnaat ar chomlec'h postel :" confirm password: "Kadarnaat ar ger-tremen :" contact_webmaster: Kit e darempred gant ar mestr-gwiad, mar plij, evit ma krouo ur gont evidoc'h - klask a raimp plediñ gant ho koulenn kerkent ha ma vo tu. - continue: Kenderc'hel + continue: En em enskrivañ display name: "Anv diskwelet :" display name description: Emañ hoc'h anv implijer a-wel d'an holl. Se a c'hallit cheñch diwezhatoc'h en ho penndibaboù. email address: "Chomlec'h postel :" - fill_form: Leugnit ar furmskrid hag e kasimp deoc'h ur postel evit gweredekaat ho kont. - flash create success message: Trugarez deoc'h evit en em enskrivañ ! Kaset hon eus ur postel kadarnaat da %{email}. Kerkent ha kadarnaet ho kont e c'hallot kregiñ da gartennañ.

    Ma implijit ur reizhiad enep-strob hag a gas goulennoù kadarnaat, lakait webmaster@openstreetmap.org en ho listenn wenn, mar plij, rak n'omp ket evit respont d'ar posteloù-se. - heading: Krouiñ ur gont implijer license_agreement: Pa gadarnaot ho kont e tleot asantiñ da ziferadennoù ar c'henlabourer. no_auto_account_create: Siwazh n'omp ket evit krouiñ ur gont evidoc'h ent emgefreek. not displayed publicly: N'eo ket diskwelet d'an holl (gwelet hor c'harta prevezded) @@ -1632,7 +1716,7 @@ br: password: "Ger-tremen :" terms accepted: Trugarez deoc'h evit bezañ asantet da ziferadennoù nevez ar c'henlabourer ! terms declined: Un druez eo deomp gwelet hoc'h eus nac'het degemer Termenoù ar berzhidi nevez. Evit muioc'h a ditouroù, sellit ouzh ar bajenn wiki-mañ. - title: Krouiñ ur gont + title: Kevreañ use openid: Gallout a rit ivez ober gant %{logo} OpenID evit kevreañ no_such_user: body: Ho tigarez, n'eus implijer ebet en anv %{user}. Gwiriit hag-eñ eo skrivet mat, pe marteze hoc'h eus kliket war ul liamm fall. @@ -1643,6 +1727,8 @@ br: nearby mapper: Kartennour en ardremez your location: Ho lec'hiadur remove_friend: + button: Lemel eus ar vignoned + heading: Lemel %{user} eus ar vignoned ? not_a_friend: "%{name} n'eo ket unan eus ho mignoned." success: "%{name} zo bet lamet eus ho mignoned." reset_password: @@ -1677,9 +1763,9 @@ br: you need to accept or decline: Lennit da gentañ Termenoù ar berzhidi nevez ha goude-se nac'hit pe asantit evit gallout kenderc'hel. view: activate_user: gweredekaat an implijer-mañ - add as friend: Ouzhpennañ evel mignon + add as friend: Ouzhpennañ d'ar vignoned ago: (%{time_in_words_ago} zo) - block_history: gwelet ar stankadurioù resevet + block_history: stankadurioù resevet blocks by me: stankadurioù graet ganin blocks on me: Stankadurioù evidon comments: evezhiadennoù @@ -1695,30 +1781,34 @@ br: delete_user: dilemel an implijer-mañ description: Deskrivadur diary: deizlevr - edits: kemmoù + edits: Kemmoù email address: "Chomlec'h postel :" - friends_changesets: Furchal dre an holl gemmoù degaset gant ho mignoned - friends_diaries: Furchal holl enmontoù ar marilh personel gant e vignoned + friends_changesets: Strolladoù kemmoù graet gant mignoned + friends_diaries: Enmonedoù deizlevr ar vignoned hide_user: kuzhat an implijer-mañ - if set location: Ma lakait ho lec'hiadur e teuio ur gartenn vrav war wel dindani. Gallout a rit lakaat ho lec'hiadur war ho pajenn %{settings_link}. + if set location: Lakait ho lec'h-annez war ar bajenn %{settings_link} da welet an implijerien war-dro. km away: war-hed %{count} km latest edit: "Kemm ziwezhañ %{ago} :" m away: war-hed %{count} m mapper since: "Kartennour abaoe :" - moderator_history: gwelet ar stankadurioù roet + moderator_history: stankadurioù roet my comments: ma evezhiadennoù my diary: ma deizlevr my edits: ma aozadennoù + my messages: Ma c'hemennadennoù + my notes: ma notennoù + my profile: Ma frofil my settings: ma arventennoù my traces: ma roudoù nearby users: "Implijerien all tost deoc'h :" - nearby_changesets: Furchal an holl holladoù kemmoù gant an implijerien a-dost - nearby_diaries: Furchal holl enmontoù ar marilh personel gant implijerien a-dost + nearby_changesets: Strolladoù kemmoù an implijer tro-war-dro + nearby_diaries: Enmonedoù deizlevr an implijerien tro-war-dro new diary entry: enmoned nevez en deizlevr no friends: N'hoc'h eus ouzhpennet mignon ebet c'hoazh. no nearby users: N'eus implijer ebet all en ardremez c'hoazh. + notes: Notennoù kartenn oauth settings: arventennoù oauth - remove as friend: Lemel evel mignon + remove as friend: Lemel eus ar vignoned role: administrator: Ur merour eo an implijer-mañ grant: @@ -1726,8 +1816,8 @@ br: moderator: Reiñ ar moned habaskaer moderator: Un habaskaer eo an implijer-mañ revoke: - administrator: Terriñ ar moned merour - moderator: Terriñ ar moned habaskaer + administrator: Disteurel ar moned merour + moderator: Disteurel ar moned habaskaer send message: Kas ur gemennadenn settings_link_text: arventennoù spam score: "Notenn evit ar strob :" @@ -1770,7 +1860,7 @@ br: heading: Roll stankadurioù an implijer title: Stankadurioù an implijer model: - non_moderator_revoke: Ret eo bezañ un habaskaer evit terriñ ur stankadur. + non_moderator_revoke: Ret eo bezañ un habaskaer evit disteurel ur stankadur. non_moderator_update: Ret eo deoc'h bezañ habaskaer evit krouiñ pe hizivaat ur stankadur. new: back: Gwelet an holl stankadurioù @@ -1790,11 +1880,14 @@ br: creator_name: Krouer display_name: Implijer stanket edit: Aozañ + next: ↓War-lerc'h » not_revoked: (n'eo ket torret) + previous: ↓« Kent reason: Abeg evit stankañ - revoke: Terriñ ! + revoke: Disteuler ! revoker_name: Torret gant show: Diskouez + showing_page: Page %{page} status: Statud period: one: 1 eurvezh @@ -1804,9 +1897,9 @@ br: flash: Torret eo bet ar stankadur-mañ. heading: O lemel ur stankadur war %{block_on} gant %{block_by} past: Echu eo ar stankadur-mañ %{time} zo ha ne c'hall ket bezañ torret bremañ. - revoke: Terriñ ! + revoke: Disteuler ! time_future: Echu e vo ar stankadur-mañ a-benn %{time}. - title: O terriñ ur stankadur evit %{block_on} + title: O tisteurel ur stankadur evit %{block_on} show: back: Gwelet an holl stankadurioù confirm: Ha sur oc'h ? @@ -1814,7 +1907,7 @@ br: heading: "%{block_on} stanket gant %{block_by}" needs_view: Ret eo d'an implijer kevreañ a-raok ma vefe diverket ar stankadur-mañ. reason: "Abeg ar stankadur :" - revoke: Terriñ ! + revoke: Disteuler ! revoker: "Torrer :" show: Diskouez status: Statud @@ -1842,3 +1935,25 @@ br: fail: N'eus ket bet gallet lemel ar roll « %{role} » digant an implijer « %{name} ». Gwiriit hag-eñ eo reizh an implijer hag ar roll. heading: Kadarnaat torridigezh ar roll title: Kadarnaat torridigezh ar roll + welcome_page: + add_a_note: + paragraph_1_html: Ma fell deoc'h ober ur reizhadennig hepken ha ma n'ho peus ket amzer da gevreañ ha da zeskiñ penaos aozañ, ez eo aezet lakaat un notenn. + paragraph_2_html: "Kit d'ar gartenn ha klikit war an arlun notenn :\n. Evel-se e vo ouzhpennet ur merker d'ar gartenn a c'halloc'h riklañ. Skrivit ho kemennadenn, ha neuze klikit war enrollañ, ha gallout a ray ar gartennaouerien klask gouzout hiroc'h." + title: N'ho peus ket amzer da aozañ ? Ouzhpennit un notenn ! + basic_terms: + editor_html: Un aozer zo ur programm pe ul lec'hienn web a c'hallit implijout da aozañ ar gartenn. + node_html: Ur skoulm zo ur poent war ar gartenn, evel ur preti pe ur wezenn. + paragraph_1_html: E luc'haj dezhañ e-unan en deus OpenStreetMap. Setu amañ un nebeud gerioù-alc'hwez a c'hallo talvezout deoc'h. + tag_html: Ur valizenn zo ur roadenn diwar-benn ur skoulm pe un hent, evel anv ur preti pe an tizh bevennet war un hent. + title: Geriaoueg diazez ar c'hartennaouiñ + way_html: Ur roud zo ul linenn pe ur gorread, evel un hent, ur wazh-dour, pe ur savadur. + introduction_html: Degemer mat en OpenStreetMap, ar gartenn digoust eus ar bed hag a c'haller aozañ. Kevreet oc'h bremañ ha prest oc'h da gregiñ da gartennaouiñ. Setu amañ un nebeud displegadennoù diwar-benn an traoù pouezusañ da c'houzout. + questions: + paragraph_1_html: Ezhomm ho peus sikour evit kartennaouiñ, pe n'eo ket sklaer penaos implijout ? Tapit respontoù d'ho koulennoù el lec'hienn web sikour. + title: Traoù da c'houlenn ? + start_mapping: Kregiñ da gartennaouiñ + title: Deuet-mat oc'h ! + whats_on_the_map: + off_html: Ar pezh na gaver ket avat eo ar roadennoù evit notennoù roet gant an dud, elfennoù istorel pe martezeüs, hag ar roadennoù a zo dindan gwirioù eilañ. Nemet hag un aotre ispisial ho pefe, na eilit ket kartennoù enlinenn pe war baper. + on_html: "OpenStreetMap zo ul lec'h evit kartennaouiñ traoù gwirion hag a vremañ war un dro\n-\nEnnañ ez eus milionoù a savadurioù, a hentoù, hag a vunudoù all diwar-benn lec'hioù. Gallout a rit kartennaouiñ forzh peseurt tra eus ar bed gwirion hag a zedenn ac'hanoc'h." + title: Petra zo war ar gartenn diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 16306fa4164..857f6e0d16b 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1,17 +1,1714 @@ -# Messages for Bosnian (Bosanski) +# Messages for Bosnian (bosanski) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Alenmahovic # Author: CERminator +# Author: DzWiki +# Author: Edinwiki +# Author: Maxmus bs: + about_page: + next: Slijedeće activerecord: attributes: + diary_comment: + body: Tijelo diary_entry: - title: Naslov + language: Jezik + latitude: Geografska širina (Latitude) + longitude: Geografska dužina (Longitude) + title: Predmet user: Korisnik + friend: + friend: Prijatelj + user: Korisnik + message: + body: Tijelo + recipient: Primalac + sender: Pošiljalac + title: Predmet + trace: + description: Opis + latitude: Geografska širina (Latitude) + longitude: Geografska dužina (Longitude) + name: Ime + public: Javno + size: Veličina + user: Korisnik + visible: Vidljivo + user: + active: Aktivan + description: Opis + display_name: Ime za prikaz + email: E-mail + languages: Jezici + pass_crypt: Lozinka models: + acl: Kontrole pristupa + changeset: Set promjena + changeset_tag: Oznaka seta promjena country: Država + diary_comment: Komentar dnevnika + diary_entry: Unos dnevnika + friend: Prijatelj language: Jezik message: Poruka - relation: Veza - relation_member: Član veze + node: Čvor + node_tag: Oznaka čvora + notifier: Izvjestilac + old_node: Stari čvor + old_node_tag: Oznaka starog čvora + old_relation: Stara relacija + old_relation_member: Stari član relacije + old_relation_tag: Oznaka stare relacije + old_way: Stara putanja + old_way_node: Čvor stare putanje + old_way_tag: Oznaka stare putanje + relation: Relacija + relation_member: Član relacije + relation_tag: Oznaka relacije + session: Sesija + trace: Trasa + tracepoint: Tačka trase + tracetag: Oznaka trase + user: Korisnik + user_preference: Korisničke postavke + user_token: Korisnička značka + way: Putanja + way_node: Čvor putanje + way_tag: Oznaka putanje + application: + require_cookies: + cookies_needed: Čini se da su vam kolačići onemogućeni, molimo omogućite kolačiće u vašem pregledniku prije nastavka. + require_moderator: + not_a_moderator: Trebate biti moderator da bi izvršili tu radnju. + setup_user_auth: + blocked: Vaš pristup API-u je blokiran. Prijavite se na web upravljačku ploču da saznate više. + need_to_see_terms: Vaš pristup API-ju je privremeno suspendovan. Molimo da se prijavite na web upravljačku ploču da pogledate Uslove za doprinosioce. Ne morate se složiti, ali ih morate pogledati. + browse: + anonymous: anonimno + changeset: + belongs_to: Autor + changesetxml: XML seta promjena + feed: + title: Set promjena %{id} + title_comment: Set promjena %{id} - %{comment} + osmchangexml: osmChange XML + title: "Skup promjena: %{id}" + closed: Zatvoreno + containing_relation: + entry: Relacija %{relation_name} + entry_role: Relacija %{relation_name} (kao %{relation_role}) + created: Napravljeno + download_xml: Preuzmi XML + in_changeset: Skup promijena + location: "Lokacija:" + no_comment: (bez komentara) + not_found: + sorry: "Žao nam je, ali %{type} #%{id} se ne može naći." + type: + changeset: Set promjena + node: čvor + relation: relacija + way: putanja + note: + new_note: Nova bilješka + part_of: Dio od + redacted: + message_html: Verzija %{version} ovoga %{type} ne može biti prikazana s obzirom da je u procesu redakcije. Molimo pogledajte %{redaction_link} za detalje. + redaction: Redakcija %{id} + type: + node: čvor + relation: relacija + way: putanja + relation: + members: Članovi + relation_member: + entry_role: "%{type} %{name} kao %{role}" + type: + node: Čvor + relation: Relacija + way: Putanja + start_rjs: + load_data: Učitati podatke + loading: Učitavanje... + tag_details: + tags: "Oznake:" + wiki_link: + key: Wiki stranica opisa za oznaku %{key} (tag) + tag: Wiki stranica opisa za oznaku %{key}=%{value} (tag) + wikipedia_link: Članak o %{page} na Wikipediji + timeout: + sorry: Žao mi je, podacima za %{type} sa id %{id}, je trebalo previše da se preuzmu. + type: + changeset: Set promjena + node: čvor + relation: relacija + way: putanja + version: Verzija + view_details: Prikaži detalje + view_history: Prikaži historiju + way: + nodes: Tačke + changeset: + changeset: + anonymous: Anonimno + no_edits: (nema uređivanja) + view_changeset_details: Pregled detalja o setu promjena + changeset_paging_nav: + next: Sljedeća » + previous: « Prethodna + showing_page: Prikaz stranice %{page} + changesets: + area: Područje + comment: Komentar + id: ID + saved_at: Spremljeno user: Korisnik + list: + load_more: Učitaj više + title: Setovi promjena + title_friend: Setovi promjena vaših prijatelja + title_nearby: Setovi promjena obližnjih korisnika + title_user: Setovi promjena od %{user} + timeout: + sorry: Žao nam je, listi seta promjena koju ste tražili je predugo trajalo za preuzimanje. + diary_entry: + comments: + ago: "%{ago} prije" + comment: Komentar + has_commented_on: "%{display_name} je komentirao/la sljedeće unose u dnevnik" + newer_comments: Noviji komentari + older_comments: Stariji komentari + post: Post + when: Kada + diary_comment: + comment_from: Komentar od %{link_user} u %{comment_created_at} + confirm: Potvrditi + hide_link: Sakriti ovaj komentar + diary_entry: + comment_count: + one: "%{count} komentar" + other: "%{count} komentara" + zero: nema komentara + comment_link: Komentirati ovaj zapis + confirm: Potvrditi + edit_link: Urediti ovaj unos + hide_link: Sakriti ovaj unos + posted_by: "Postavljeno od %{link_user} u %{created} na jeziku: %{language_link}" + reply_link: Odgovoriti na ovaj zapis + edit: + body: "Tijelo:" + language: "Jezik:" + latitude: Geografska širina (Latitude) + location: "Lokacija:" + longitude: Geografska dužina (Longitude) + marker_text: Lokacija unosa u dnevnik + save_button: Spremiti + subject: "Predmet:" + title: Urediti unos u dnevniku + use_map_link: korisititi kartu + feed: + all: + description: Nedavni unosi u dnevnik OpenStreetMap korisnika + title: Unosi u OpenStreetMap dnevniku + language: + description: "Nedavni unosi u dnevnik OpenStreetMap korisnika na jeziku: %{language_name}" + title: "Unosi u OpenStreetMap dnevnik na jeziku: %{language_name}" + user: + description: Nedavni unosi u OpenStreetMap dnevnik od %{user} + title: Unosi u OpenStreetMap dnevnik za korisnika %{user} + list: + in_language_title: "Unosi u dnevnik na jeziku: %{language}" + new: Novi unos u dnevnik + new_title: Napravite novi unos u vaš dnevnik + newer_entries: Noviji unosi + no_entries: Nema unosa u dnevniku + older_entries: Stariji unosi + recent_entries: "Nedavni unosi u dnevnik:" + title: Dnevnici korisnika + title_friends: Dnevnici prijatelja + title_nearby: Dnevnici obližnjih korisnika + user_title: Dnevnik od %{user} + location: + edit: Urediti + location: "Lokacija:" + view: Pogledati + new: + title: Novi unos u dnevnik + no_such_entry: + body: Žao mi je, ne postoji unos u dnevniku ili komentar sa id %{id}. Provjerite ispravnost upisa, ili poveznice na koju ste kliknuli. + heading: "Nema unosa sa id: %{id}" + title: Nema takvog unosa u dnevnik + view: + leave_a_comment: Ostaviti komentar + login: Prijava + login_to_leave_a_comment: "%{login_link} da bi ostavili komentar" + save_button: Spremiti + title: Dnevnik korisnika %{user} | %{title} + user_title: Dnenvnik korisnika %{user} + editor: + default: Zadano (currently %{name}) + id: + description: iD (uređivač u pregledniku) + name: iD + potlatch: + description: Potlatch 1 (uređivač unutar web preglednika) + name: Potlatch 1 + potlatch2: + description: Potlatch 1 (uređivač unutar web preglednika) + name: Potlatch 2 + remote: + description: Udaljena kontrola (JOSM ili Merkaartor) + name: Udaljena kontrola + export: + start: + add_marker: Dodati marker na kartu + area_to_export: Područje za izvoz + embeddable_html: HTML kod sa mogućnošću za umetanje + export_button: Izvoz + export_details: OpenStreetMap podaci je licenciran pod Open Data Commons Open Database License dozvolom (ODbL). + format: Format + format_to_export: Format za izvoz + image_size: Veličina slike + latitude: "Lat:" + licence: Dozvola + longitude: "Lon:" + manually_select: Ručno izabrati drukčije područje + map_image: Slika karte (prikazuje standardni sloj) + max: najviše + options: Opcije + osm_xml_data: OpenStreetMap XML podaci + output: Izlaz + paste_html: Zalijepiti HTML za umetanje na web stranicu + scale: Skala + too_large: + body: Ovo područje je preveliko da bi se izvezlo kao OpenStreetMap XML podaci. Molimo povećajte (zoom) ili odaberite manje područje. + other: + description: Dodatni izvori ponuđeni na OpenStreetMap wiki + title: Drugi izvori + zoom: Uvećanje + title: Izvezi + fixthemap: + how_to_help: + join_the_community: + title: Pridružite se zajednici + title: Kako pomoći + geocoder: + description: + title: + geonames: Lokacija sa GeoNames-a + osm_nominatim: Lokacija sa OpenStreetMap Nominatima + types: + cities: Gradovi + places: Mjesta + towns: Manji gradovi + direction: + east: istočno + north: sjeverno + north_east: sjeveroistočno + north_west: sjeverozapadno + south: južno + south_east: jugoistočno + south_west: jugozapadno + west: zapadno + distance: + one: oko 1km + other: oko %{count}km + zero: manje od 1km + results: + more_results: Više rezultata + no_results: Nema pronađenih rezultata + search: + title: + ca_postcode: Rezultati sa Geocoder.CA + geonames: Rezultati sa GeoNames + geonames_reverse: Rezultati sa GeoNames + latlon: Rezultati sa Internal + osm_nominatim: Rezultati sa OpenStreetMap Nominatim + uk_postcode: Rezultati sa NPEMap / FreeThe Postcode + us_postcode: Rezultati sa Geocoder.us + search_osm_nominatim: + admin_levels: + level10: Granica predgrađa + level2: Granica države + level4: Granice pokrajine + level5: Granica regije + level6: Granica okruga + level8: Granica grada + level9: Granica sela + prefix: + aeroway: + aerodrome: Aerodrom + apron: Dio piste (područje za parking) + gate: Prilaz + helipad: Sletište za helikopter + runway: Pista + taxiway: Rulna staza + terminal: Terminal + amenity: + WLAN: WiFi pristup + airport: Aerodrom + arts_centre: Centar umjetnosti + artwork: Umjetnine + atm: Bankomat + auditorium: Auditorij + bank: Banka + bar: Bar + bbq: Gril + bench: Klupa + bicycle_parking: Biciklistički parking + bicycle_rental: Iznajmljivanje bicikala + biergarten: Beer Garden (serviranje piva) + brothel: Bordel + bureau_de_change: Mjenjačnica + bus_station: Autobuska stanica + cafe: Caffe bar + car_rental: Rent-a-car + car_sharing: Carsharing + car_wash: Autopraonica + casino: Kazino + charging_station: Stanica za punjenje + cinema: Kino + clinic: Klinika + club: Klub + college: Koledž + community_centre: Društveni centar + courthouse: Sud + crematorium: Krematorij + dentist: Zubar + doctors: Doktor + dormitory: Studentski dom + drinking_water: Voda za piće + driving_school: Autoškola + embassy: Ambasada + emergency_phone: S.O.S. Telefon + fast_food: Fast food + ferry_terminal: Trajektni terminal + fire_hydrant: Hidrant + fire_station: Vatrogasna stanica + food_court: Dvorište restorana + fountain: Fontana + fuel: Benzinska pumpa + grave_yard: Groblje + gym: Fitness centar + hall: Dvorana + health_centre: Zdravstveni centar + hospital: Bolnica + hotel: Hotel + hunting_stand: Lovačka čeka + ice_cream: Sladoled + kindergarten: Dječiji vrtić + library: Biblioteka + market: Tržnica + marketplace: Tržnica + mountain_rescue: Gorska služba spašavanja + nightclub: 'Noćni klub' + nursery: Čuvanje djece + nursing_home: Starački dom + office: Kancelarija + park: Park + parking: Parking + pharmacy: Apoteka + place_of_worship: Bogomolja + police: Policija + post_box: Poštanski sandučić + post_office: Pošta + preschool: Predškolska ustanova + prison: Zatvor + pub: Pub + public_building: Ustanova + public_market: Javna tržnica + reception_area: Recepcija + recycling: Reciklažna stanica + restaurant: Restoran + retirement_home: Dom penzionera + sauna: Sauna + school: Škola + shelter: Sklonište + shop: Trgovina + shopping: Trgovački centar + shower: Tuš + social_centre: Društveni centar + social_club: Društveni klub + social_facility: Socialne ustanove + studio: Studio + supermarket: Supermarket + swimming_pool: Bazen + taxi: Taxi + telephone: Telefonska govornica + theatre: Teatar + toilets: WC + townhall: Gradska Vijećnica + university: Univerzitet + vending_machine: Automat + veterinary: Veterinar + village_hall: Seoski Dom + waste_basket: Kanta za otpatke + wifi: WiFi pristup + youth_centre: Centar za omladinu + boundary: + administrative: Administrativna granica + census: Popisna granica + national_park: Nacionalni park + protected_area: Zaštićeno područje + bridge: + aqueduct: Akvadukt + suspension: Viseći most + swing: Obrtni most + viaduct: Vijadukt + "yes": Most + building: + "yes": Građevina + emergency: + fire_hydrant: Hidrant + phone: S.O.S. Telefon + highway: + bridleway: Konjička staza + bus_guideway: Autobuska traka + bus_stop: Autobusko stajalište + byway: Prečica + construction: Autoput u izgradnji + cycleway: Biciklistička staza + emergency_access_point: S.O.S. tačka pristupa + footway: Pješačka staza + ford: Gaz + living_street: Ulica smirenog prometa + milestone: Miljokaz + minor: Drugorazredna cesta + motorway: Autocesta + motorway_junction: Čvor (autoputa) + motorway_link: Autoput (pristupna cesta) + path: Staza + pedestrian: Pješački put + platform: Platforma + primary: Državna cesta + primary_link: Državna cesta + proposed: Predložena cesta + raceway: Trkalište + residential: Ulica + rest_area: Područje za odmor + road: Cesta + secondary: Sekundarna cesta + secondary_link: Sekundarna cesta + service: Servisna cesta + services: Autoput - usluge + speed_camera: Kamera za kontrolu brzine + steps: Stepenice + stile: Prijelaz preko ograde + street_lamp: Ulična svjetiljka + tertiary: Lokalna cesta + tertiary_link: Lokalna cesta + track: Makadam + trail: Staza + trunk: Brza cesta + trunk_link: Prilaz brzoj cesti + unclassified: Neklasificirana cesta + unsurfaced: Neasfaltirana cesta + historic: + archaeological_site: Arheološko nalazište + battlefield: Bojno polje + boundary_stone: Granični kamen + building: Građevina + castle: Dvorac + church: Crkva + citywalls: Gradski zidovi + fort: Utvrđenje + house: Kuća + icon: Ikona + manor: Zamak + memorial: Memorijal + mine: Rudnik + monument: Spomenik + museum: Muzej + ruins: Ruševine + tomb: Grobnica + tower: Toranj + wayside_cross: Krajputaš + wayside_shrine: Usputni hram + wreck: Olupina + landuse: + allotments: Vrtovi + basin: Bazen + brownfield: Zemljište za prenamjenu + cemetery: Groblje + commercial: Poslovno područje + conservation: Zaštićeno područje + construction: Gradilište + farm: Farma + farmland: Polje + farmyard: Farma + forest: Šuma + garages: Garaže + grass: Trava + greenfield: Greenfield zemljište + industrial: Industrijsko područje + landfill: Deponija + meadow: Livada + military: Vojno područje + mine: Rudnik + nature_reserve: Rezervat prirode + orchard: Voćnjak + park: Park + piste: Ski staza + quarry: Kamenolom + railway: Željeznica + recreation_ground: Rekreacijsko područje + reservoir: Rezervoar + reservoir_watershed: Razvodnica rezervoara + residential: Stambeno područje + retail: Trgovina + road: Područje ceste + village_green: Seoski travnjak + vineyard: Vinograd + wetland: Močvara + wood: Šuma + leisure: + beach_resort: Odmaralište - plaža + bird_hide: Posmatračnica ptica + common: Općinsko zemljište + fishing: Ribolovno područje + fitness_station: Fitnes centar + garden: Vrt + golf_course: Golf igralište + ice_rink: Klizalište + marina: Marina + miniature_golf: Minigolf + nature_reserve: Rezervat prirode + park: Park + pitch: Sportski teren + playground: Igralište + recreation_ground: Teren za rekreaciju + sauna: Sauna + slipway: Navoz + sports_centre: Sportski centar + stadium: Stadion + swimming_pool: Bazen + track: Staza za trčanje + water_park: Vodeni park + military: + airfield: Vojni aerodrom + barracks: Kasarna + bunker: Bunker + mountain_pass: + "yes": Planinski prolaz + natural: + bay: Zaljev + beach: Plaža + cape: Rt + cave_entrance: Pećina (ulaz) + channel: Kanal + cliff: Litica + crater: Krater + dune: Dina + feature: Značajka + fell: Brdo + fjord: Fjord + forest: Šuma + geyser: Gejzir + glacier: Glečer + heath: Stepa + hill: Brdo + island: Ostrvo + land: Zemlja + marsh: Močvara + moor: Močvarno tlo + mud: Blato + peak: Vrh + point: Tačka + reef: Greben + ridge: Greben + river: Rijeka + rock: Stijena + scree: Krš + scrub: Šikara + shoal: Sprud + spring: Izvor + stone: Kamen + strait: Tjesnac + tree: Drvo + valley: Dolina + volcano: Vulkan + water: Voda + wetland: Močvara + wetlands: Močvare + wood: Šuma + office: + accountant: Računovođa + architect: Arhitekta + company: Kompanija + employment_agency: Agencija za zapošljavanje + estate_agent: Agent za nekretnine + government: Vladin ured + insurance: Ured za osiguranje + lawyer: Advokat + ngo: Ured NVO + telecommunication: Ured telekomunikacija + travel_agent: Putnička agencija + "yes": Kancelarija + place: + airport: Aerodrom + city: Grad + country: Država + county: Kanton + farm: Farma + hamlet: Zaselak + house: Objekat + houses: Kuće + island: Ostrvo + islet: Ostrvce + isolated_dwelling: Izolirano stanovanje + locality: Lokalitet + moor: Močvarno tlo + municipality: Općina + postcode: Poštanski broj + region: Regija + sea: More + state: Pokrajina/ Entitet + subdivision: Podgrupa + suburb: Predgrađe/ Gradsko naselje + town: Grad + unincorporated_area: Slobodna zemlja + village: Selo + railway: + abandoned: Napuštena pruga + construction: Pruga u izgradnji + disused: Napuštena pruga + disused_station: Željeznička stanica (nije u upotrebi) + funicular: Uspinjača + halt: Željeznička stanica + historic_station: Historijska željeznička stanica + junction: Željeznički čvor + level_crossing: Pružni prelaz + light_rail: Lahka željeznica + miniature: Minijaturna željeznica + monorail: Jednotračna pruga + narrow_gauge: Uskotračna pruga + platform: Željeznička platforma + preserved: Sačuvana pruga + spur: Pruga + station: Željeznička stanica + subway: Stanica podzemne željeznice + subway_entrance: Ulaz u podzemnu željezničku stanicu + switch: Skretnica + tram: Tramvaj + tram_stop: Tramvajska stanica + yard: Ranžirni kolodvor + shop: + alcohol: Trgovina pićem + antiques: Antikviteti + art: Atelje + bakery: Pekara + beauty: Parfumerija + beverages: Trgovina pićem + bicycle: Trgovina biciklima + books: Knjižara + butcher: Mesnica + car: Autokuća + car_parts: Autodijelovi + car_repair: Autoservis + carpet: Trgovina tepisima + charity: Dobrotvorna trgovina + chemist: Apoteka + clothes: Butik + computer: Trgovina kompjutera + confectionery: Delikatesa + convenience: Prodavnica + copyshop: Kopirnica + cosmetics: Parfumerija + department_store: Robna kuća + discount: Diskont + doityourself: Uradi sam + dry_cleaning: Hemijska čistionica + electronics: Trgovina elektronikom + estate_agent: Agent za nekretnine + farm: Poljo-apoteka + fashion: Modna trgovina + fish: Ribarnica + florist: Cvjećara + food: Trgovina prehranom + funeral_directors: Pogrebno preduzeće + furniture: Namještaj + gallery: Galerija + garden_centre: Vrtni centar + general: Trgovina mješovitom robom + gift: Poklon trgovina + greengrocer: Voćarnica + grocery: Trgovina prehranom + hairdresser: Frizer + hardware: Željezarija + hifi: Hi-Fi + insurance: Osiguranje + jewelry: Trgovina nakitom + kiosk: Kiosk + laundry: Praonica rublja + mall: Trgovački centar + market: Tržnica + mobile_phone: Trgovina mobitelima + motorcycle: Moto Shop + music: Trgovina muzikom + newsagent: Novinar + optician: Optičar + organic: Trgovina zdrave hrane + outdoor: Trgovina za slobodno vrijeme + pet: Trgovina za kućne ljubimce + photo: Fotograf + salon: Salon + shoes: Trgovina obućom + shopping_centre: Trgovački centar + sports: Trgovina sportskom opremom + stationery: Papirnica + supermarket: Supermarket + toys: Trgovina igračkama + travel_agency: Putnička agencija + video: Videoteka + wine: Vinoteka + "yes": Prodavnica + tourism: + alpine_hut: Alpska kuća + artwork: Umjetnine + attraction: Atrakcija + bed_and_breakfast: 'Noćenje i doručak' + cabin: Koliba + camp_site: Kamp + caravan_site: Kamp-kućice (mjesto) + chalet: Planinska kuća + guest_house: Apartman + hostel: Hostel + hotel: Hotel + information: Informacije + lean_to: Nadstrešnica + motel: Motel + museum: Muzej + picnic_site: Piknik-mjesto + theme_park: Tematski park + valley: Dolina + viewpoint: Vidikovac + zoo: Zoološki vrt + tunnel: + "yes": Tunel + waterway: + artificial: Vještački vodotok + boatyard: Brodogradilište + canal: Kanal + connector: Spoj vodnih puteva + dam: Brana + derelict_canal: Zanemaren kanal + ditch: Jarak + dock: Dok + drain: Odvod + lock: Ustava + lock_gate: Ustava (vrata) + mineral_spring: Mineralni izvor + mooring: Sidrište + rapids: Brzaci + river: Rijeka + riverbank: Riječna obala + stream: Potok + wadi: Suho korito rijeke + water_point: Tačka vodotoka + waterfall: Vodopad + weir: Brana + help_page: + welcome: + url: /dobrodošlica + javascripts: + map: + base: + cycle_map: Biciklistička karta + standard: Standardni/a + transport_map: Transportna karta + site: + edit_disabled_tooltip: Uvećati za uređivanje karte + edit_tooltip: Urediti kartu + layouts: + about: O nama + community: Zajednica + community_blogs: Blogovi zajednice + community_blogs_title: Blogovi članova OpenStreetMap zajednice + copyright: Autorska prava i dozvola + data: Podaci + donate: Podržite OpenStreetMap sa %{link} Hardware Upgrade Fond-om. + edit: Urediti + edit_with: Uredi sa %{editor} + export: Izvoz + export_data: Izvoz podataka + foundation: Fondacija + foundation_title: OpenStreetMap Fondacija + gps_traces: GPS trase + gps_traces_tooltip: Upravljanje GPS trasama + help: Pomoć + history: Historija + home: Početna + intro_2_create_account: Napravite korisnički račun + intro_header: Dobordošli na OpenStreetMap stranicu! + intro_text: OpenStreetMap predstavlja mapu svijeta, kreiranu od strane ljudi kao što ste vi i može se besplatno koristiti. + learn_more: Saznaj više + log_in: Prijava + log_in_tooltip: Prijavite se sa postojećim korisničkim računom + logo: + alt_text: OpenStreetMap logotip + logout: Odjava + make_a_donation: + text: Donirajte + title: Podržite Openstreetmap novčanom donacijom + osm_offline: OpenStreetMap baza podataka je trenutno nedostupna dok se ne završe važni radovi na održavanju. + osm_read_only: OpenStreetMap baza podataka je trenutno samo u modu čitanja, dok se ne sprovedu važni radovi na održavanju baze podataka. + partners_bytemark: Bytemark Hosting + partners_html: Hosting je podržan od strane %{ucl}, %{ic} i %{bytemark}, i drugih %{partners}. + partners_ic: Imperial College London + partners_partners: partnera + partners_ucl: UCL VR Centar + sign_up: Otvorite račun + sign_up_tooltip: Otvorite korisnički račun za uređivanje + tag_line: Slobodna wiki karta Svijeta + user_diaries: Dnevnici korisnika + user_diaries_tooltip: Prikazati dnevnike korisnika + license_page: + foreign: + english_link: Engleski original + text: U slučaju konflikta između ove prevedene stranice i %{english_original_link}, Engleska stranica ima prednost + title: O ovom prevodu + legal_babble: + attribution_example: + alt: Primjer kako se navodi zasluga projekta OpenStreetMap na web stranici + title: Primjer navođenja zasluge + contributors_at_html: "Austrija: Sadrži podatke sa Stadt Wien (under\nCC BY),\nLand Vorarlberg i\nLand Tirol (under CC-BY AT sa amandmanima)." + contributors_ca_html: "Kanada: Sadrži podatke iz GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), i StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: "Za dalje detalje o ovome, i drugim izvorima koji su korišteni da bi poboljšali OpenStreetMap, molimo pogledajte Stranica doprinosilaca na Wiki OpenStreetMap." + contributors_footer_2_html: " Uvrštenje podataka u OpenStreetMap ne podrazumjeva da se izvorni davatelj podataka podržava OpenStreetMap, pruža bilo kakvu garanciju, ili prihvata bilo kakve obaveze." + contributors_fr_html: "Francuska: Sadrži podatke sa Direction Générale des Impôts." + contributors_gb_html: "Velika Britanija: Sadrži podatke Ordnance\n Survey data © Crown copyright and database right\n 2010." + contributors_intro_html: "Naši doprinosioci su hiljade osoba. Mi takođe uključujemo podatke sa otvorenom dozvolom iz nacionalnih kartografskih agencija i drugih izvora, među njima:" + contributors_nl_html: "Holandija: Sadrži © AND data, 2007\n(www.and.com)" + contributors_nz_html: "Novi Zeland: Sadrži podatke izvorno iz\n Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Naši korisnici - doprinosioci + contributors_za_html: "Južna Afrika: Sadrži podatke sa Chief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: "Tražimo da koristite navedete zasluge “© OpenStreetMap\ncontributors”." + credit_2_html: Gdje je moguće, OpenStreetMap treba biti kao hyperlink na http://www.openstreetmap.org/and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. Ako koristite medij gdje linkovi nisu mogući (npr. tiskane karte), predlažemo da uputite vaše čitatelje na www.openstreetmap.org (proširenjem na ‘OpenStreetMap’ za ovo punu adresu) i na www.creativecommons.org. + credit_3_html: "Za pretraživu elektronsku kartu, navođenje zasluge se treba pojaviti u uglu karte. Naprimjer:" + credit_title_html: Kako navesti zasluge OpenStreetMap projekta kao izvora + infringement_1_html: OSM doprinosioci se podsjećaju da nikada ne dodaju podatke sa bilo kojeg izvora koji zadržava autorska prava (npr. Google Maps ili printane karte) bez eksplicitne dozvole od strane autora. + infringement_2_html: Ukoliko vjerujete da je zaštićeni materijal bio dodan bazi podataka OpenStreetMap ili ovom web sajtu, molimo da pogledate našu proceduru skidanja ili uložite prigovor direktno na našu online stranicu. + infringement_title_html: Kršenje autorskih prava + intro_1_html: " OpenStreetMap su otvoreni podaci, licencirani pod Open Data\nCommons Open Database License dozvolom (ODbL)." + intro_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati naše podatke, sve dok navodite OpenStreetMap i njegove doprinositelje kao izvor. Ukoliko izmijenite ili nadogradite naše podatke, možete distribuirati rezultate samo pod istom licencom. Puni pravni tekst objašnjava vaša prava i odgovornosti. + intro_3_html: "Kartografija u našim dijelovima karte, i naša dokumentacija, su licencirani pod Creative\nCommons Attribution-ShareAlike 2.0 licencom (CC-BY-SA)." + more_1_html: Čitajte više o korištenju naših podataka na Legal FAQ. + more_2_html: "Iako su OpenStreetMap podaci otvoreni, mi ne možemo ponuditi besplatni API karte za druge developere (third party).\nVidjeti naše Politika korištenja API,\nPolitika korištenja dijelova karte\ni Politika korištenja usluge Nominatim." + more_title_html: Više o + title_html: Autorska prava i dozvola + native: + mapping_link: počnite sa ucrtavanjem + native_link: BOSANSKI verzija + text: Vi gledate englesku verziju stranice o autorskim pravima. Možete se vratiti na %{native_link} ove stranice ili možete prestati čitati o autorskim pravima i %{mapping_link}. + title: O ovoj stranici + message: + delete: + deleted: Poruka izbrisana + inbox: + date: Datum + from: Od + messages: Imate %{new_messages} i %{old_messages} + my_inbox: Moja dolazna pošta + new_messages: + one: "%{count} nova poruka" + other: "%{count} nove/ih poruke/a" + no_messages_yet: Još uvijek nemate poruka. Zašto nebi stupili u kontakt s nekim ljudima iz okoline %{people_mapping_nearby_link}? + old_messages: + one: "%{count} stara poruka" + other: "%{count} stare poruke" + outbox: odlazna pošta + people_mapping_nearby: osobe koje uređuju kartu blizu Vas + subject: Predmet + title: Dolazna pošta + mark: + as_read: Poruka označena kao pročitana + as_unread: Poruka označena kao nepročitana + message_summary: + delete_button: Izbrisati + read_button: Označiti kao pročitano + reply_button: Odgovoriti + unread_button: Označiti kao nepročitano + new: + back_to_inbox: Nazad u dolaznu poštu + body: Tijelo + limit_exceeded: Nedavno ste poslali puno poruke. Pričekajte prije nego pokušate poslati još. + message_sent: Poruka poslana + send_button: Poslati + send_message_to: Poslati novu poruku za %{name} + subject: Predmet + title: Poslati poruku + no_such_message: + body: Žao nam je nema poruke s tim id. + heading: Nema takve poruke + title: Nema takve poruke + outbox: + date: Datum + inbox: dolazna pošta + messages: + one: Poslali ste %{count} poruku + other: Poslali ste %{count} poruke/a + my_inbox: Moj %{inbox_link} + no_sent_messages: Još uvijek nemate poslanih poruka. Zašto nebi stupili u kontakt s nekim ljudima iz okoline %{people_mapping_nearby_link}? + outbox: odlazna pošta + people_mapping_nearby: osobe koje uređuju kartu blizu Vas + subject: Predmet + title: Odlazna pošta + to: Za + read: + back: Nazad + date: Datum + from: Od + reply_button: Odgovoriti + subject: Predmet + title: Pročitati poruku + to: Za + unread_button: Označiti kao nepročitano + wrong_user: "Prijavljeni ste kao: `%{user}', ali poruka za koju ste tražili da pročitate nije poslana od strane ili tom korisniku. Molimo, prijavite se kao ispravan korisnik kako bi ste je pročitali." + reply: + wrong_user: "Prijavljeni ste kao: `%{user}', ali poruka za koju ste zamoljeni da odgovorite nije poslana tom korisniku. Molimo, prijavite se kao ispravan korisnik kako bi odgovorili." + sent_message_summary: + delete_button: Izbrisati + notifier: + diary_comment_notification: + footer: Možete pročitati komentare na %{readurl} i komentirati na %{commenturl} ili odgovoriti na %{replyurl} + header: "%{from_user} je komentirao tvoj nedavni OpenStreetMap unos u dnevnik sa predmetom %{subject}:" + hi: Zdravo %{to_user}, + subject: "[OpenStreetMap] %{user} je komentirao tvoj unos u dnevnik" + email_confirm: + subject: "[OpenStreetMap] Potvrdite Vašu e-mail adresu" + email_confirm_html: + click_the_link: Ako ste ovo Vi, kliknite na link naveden ispod za potvrdu promjene + greeting: Zdravo, + hopefully_you: Netko (nadamo se Vi) bi želio promjeniti svoju e-mail adresu sa %{server_url} na %{new_address}. + email_confirm_plain: + click_the_link: Ako ste ovo Vi, molimo klinknite na poveznicu ispod da potvrdite promjene. + greeting: Zdravo, + friend_notification: + befriend_them: Takođe, možete ih dodati kao prijatelja na %{befriendurl}. + had_added_you: "%{user} Vas je dodao kao prijatelja na OpenStreetMap-u." + see_their_profile: Možete vidjeti njihov profil na %{userurl}. + subject: "[OpenStreetMap] %{user} Vas je dodao kao prijatelja" + gpx_notification: + and_no_tags: i bez oznaka + and_the_tags: "i sa sljedećim oznakama:" + failure: + failed_to_import: "Import nije uspio. Evo greške:" + more_info_1: Više o neuspjelom GPX importu i kako isto izbjeći + more_info_2: "može se naći na:" + subject: "[OpenStreetMap] GPX Import nije uspio" + greeting: Zdravo, + success: + loaded_successfully: "uspješno učitano sa %{trace_points} od mogućih\n%{possible_points} tačaka." + subject: "[OpenStreetMap] GPX Import uspješan" + with_description: sa opisom + your_gpx_file: Liči na vašu GPX datoteku + lost_password: + subject: "[OpenStreetMap] Zahtjev za ponovnim postavljanjem lozinke" + lost_password_html: + click_the_link: Ukoliko ste ovo Vi, kliknite na link ispod za ponovno postavljanje lozinke. + greeting: Zdravo, + hopefully_you: Neko (moguće, Vi) je pitao za ponovno postavljanje lozinke na njihovim e-mail adresama openstreetmap.org računa. + lost_password_plain: + click_the_link: Ukoliko ste ovo Vi, kliknite na link ispod za ponovno postavljanje lozinke. + greeting: Zdravo, + message_notification: + header: "%{from_user} Vam je poslao poruku preko OpenStreetMap sa predmetom %{subject}:" + hi: Zdravo %{to_user}, + signup_confirm: + confirm: "Prije nego uradimo bilo šta drugo, moramo potvrditi da je ovaj zahtjev došao od Vas, ako je to istina, molimo Vas da kliknete poveznicu ispod da potvrdite Vaš račun:" + created: Neko (nadamo se Vi) upravo je kreirao račun na %{site_url}. + greeting: Zdravo! + subject: "[OpenStreetMap] Dobrodošli na OpenStreetMap" + welcome: Želimo Vam dobrodošlicu i takođe želimo Vam dati neke dodatne informacije kako bi ste počeli. + oauth: + oauthorize: + allow_read_gpx: Pročitajte Vaše privatne GPS trase. + allow_read_prefs: Pročitajte Vaše korisničke postavke. + allow_to: "Dozvoliti klijentskoj aplikaciji da:" + allow_write_api: Izmijenite kartu. + allow_write_diary: Zapište u dnevnik, komentirajte i sklopite prijateljstva. + allow_write_gpx: Postaviti GPS trase. + allow_write_prefs: Izmjenite Vaše korisničke postavke. + request_access: "Aplikacija %{app_name} zahtjeva pristup Vašem korisničkom računu: %{user}. Provjerite želite li da aplikacija ima sljedeće mogućnosti. Možete odabrati koliko joj pristupa želite dopustiti." + revoke: + flash: Opozvali ste značku za %{application} + oauth_clients: + create: + flash: Informacije su uspješno registrirane + destroy: + flash: Uništena registracija klijent aplikacije + edit: + submit: Urediti + title: Uredite Vašu aplikaciju + form: + allow_read_gpx: Pročitajte njihove privatne GPS trase. + allow_read_prefs: Pročitajte njihove korisničke postavke. + allow_write_api: Izmijenite kartu. + allow_write_diary: Zapište u dnevnik, komentirajte i sklopite prijateljstva. + allow_write_gpx: Postaviti GPS trase. + allow_write_prefs: Izmjenite njhove korisničke postavke. + callback_url: URL za povratni poziv + name: Ime + requests: "Zahtjevamo sljedeće dozvole od korisnika:" + required: Obavezno + support_url: URL podrške + url: URL glavne aplikacije + index: + application: Ime aplikacije + issued_at: Izdano u + list_tokens: "Sljedeće značke su izdane aplikacijama na vaše ime:" + my_apps: Moje klijentske aplikacije + my_tokens: Moje ovlaštene aplikacije + no_apps: Imate li aplikaciju koju želite registrirati za korištenje sa %{oauth} standardom? Morate registrirati Vašu web aplikaciju prije nego ona može slati OAuth zahtjeve za ovu uslugu + register_new: Registrirajte Vašu aplikaciju + registered_apps: "Imate registrirane slijedeće klijentske aplikacije:" + revoke: Opozvati! + title: Moji OAuth detalji + new: + submit: Registrirati + title: Registrirajte novu aplikaciju + not_found: + sorry: Žao mi je, taj se %{type} ne može naći. + show: + access_url: "URL pristupa znački:" + allow_read_gpx: Pročitajte njihove privatne GPS trase. + allow_read_prefs: Pročitajte njihove korisničke postavke. + allow_write_api: Izmijenite kartu. + allow_write_diary: Zapište u dnevnik, komentirajte i sklopite prijateljstva. + allow_write_gpx: Postaviti GPS trase. + allow_write_prefs: Izmjenite njhove korisničke postavke. + authorize_url: "URL ovlaštenja:" + confirm: Da li ste sigurni? + delete: Izbrisati klijenta + edit: Urediti detalje + key: "Ključ korisnika:" + requests: "Zahtjevamo sljedeće dozvole od korisnika:" + secret: "Tajna korisnika:" + support_notice: Podržavamo HMAC-SHA1 (preporučeno) kao i obični tekst u ssl modu. + title: OAuth detalji za %{app_name} + url: "URL za zahtjev značke:" + update: + flash: Informacije o klijentu uspješno osvježene + redaction: + create: + flash: Redakcija napravljena. + destroy: + error: Pojavila se greška tokom uništavanja ove redakcije. + flash: Redakcija uništena. + not_empty: Redakcija nije prazna. Molimo poništite sve verzije koje ne pripadaju ovoj redakciji prije nego je uništite. + edit: + description: Opis + heading: Urediti redakciju + submit: Spremiti redakciju + title: Urediti redakciju + index: + empty: Nema redakcija za prikaz. + heading: Spisak redakcija + title: Spisak redakcija + new: + description: Opis + heading: Unijeti informacije za novu redakciju + submit: Napraviti redakciju + title: Pravljenje nove redakcije + show: + confirm: Da li ste sigurni? + description: "Opis:" + destroy: Ukloniti ovu redakciju + edit: Urediti ovu redakciju + heading: Prikaz redakcije "%{title}" + title: Prikaz redakcije + user: "Kreator:" + update: + flash: Promjene sačuvane. + site: + edit: + anon_edits_link_text: Otkrijte zašto je to tako. + flash_player_required: 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. + no_iframe_support: Vaš preglednik ne podržava HTML iframes, koji su potrebni za ovu značajku. + not_public: Niste postavili Vaše promjene tako da budu javne. + not_public_description: Ne možete više uređivati kartu dok to ne napravite. Možete promjeniti Vaše promjene u javne sa %{user_page}. + potlatch2_not_configured: Potlatch 2 nije konfiguriran - molimo pogledajte http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 za više informacija + potlatch2_unsaved_changes: Imate nespremljene promjene. (Da bi ste spremili u Potlatch 2, trebali bi kliknuti Spremiti.) + 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.) + user_page_link: korisnička stranica + index: + createnote: Dodaj bilješku + js_1: Koristite internet preglednik koji ne podržava JavaScript, ili ste onemogućili JavaScript. + js_2: OpenStreetMap koristi JavaScript za slippy kartu. + license: + copyright: Autorska prava OpenStreetMap i doprinosioci, pod otvorenom dozvolom + permalink: Trajni link + remote_failed: Uređivanje nije uspjelo - provjerite da li je JOSM ili Merkaartor učitan i da je opcija udaljenog pristupa omogućena + shortlink: Kratki link + key: + table: + entry: + admin: Administrativna granica + allotments: Vrtovi + apron: + - Parking za avione + - terminal + bridge: Crni rubovi = most + bridleway: Konjička staza + brownfield: Gradilište + building: Značajna zgrada + byway: Prečica + cable: + - Kabinska žičara + - Uspinjača sa naslonjačem + cemetery: Groblje + centre: Sportski centar + commercial: Poslovno područje + common: + - Travnjaci + - Livada + construction: Ceste u izgradnji + cycleway: Biciklistička staza + destination: Pristup odredištu + farm: Polja, farme, njive + footway: Pješačka staza + forest: Šume (održavane, od šumarije) + golf: Golf teren + heathland: Stepa + industrial: Industrijsko područje + lake: + - Jezero + - Rezervoar + military: Vojno područje + motorway: Autoput + park: Park + permissive: Pristup uz dozvolu + pitch: Sportski teren + primary: Državna cesta + private: Privatni pristup + rail: Željeznica + reserve: Rezervat prirode + resident: Stambeno područje + retail: Maloprodajno područje + runway: + - Aerodromska pista + - Aerodromska rulna staza + school: + - Škola + - Univerzitet + secondary: Sekundarna cesta + station: Željeznička stanica + subway: Podzemna željeznica + summit: + - Vrh + - Kota + tourist: Turistička atrakcija + track: Staza + tram: + - Lahka željeznica + - tramvaj + trunk: Brza cesta + tunnel: Iscrtkani rubovi = tunel + unclassified: Neklasificirana cesta + unsurfaced: Neasfaltirana cesta + wood: Šume (prirodne, neodržavane) + markdown_help: + alt: Alt tekst + first: Prvi objekat + heading: Naslov + headings: Naslovi + image: Slika + link: Poveznica + ordered: Uređeni popis + second: Drugi objekat + subheading: Podnaslov + text: Tekst + title_html: Analizirano sa Markdown + unordered: Neuređeni popis + url: URL + richtext_area: + edit: Urediti + preview: Pregledati + search: + search: Pretraga + submit_text: Idi + where_am_i: Gdje sam? + where_am_i_title: Opišite trenutnu lokaciju koristeći pretraživač + sidebar: + close: Zatvoriti + search_results: Rezultati pretrage + time: + formats: + friendly: "%e %B %Y u %H:%M" + trace: + create: + trace_uploaded: Vaša GPS datoteka je spremljena na server i čeka ubacivanje u bazu. Ovo se obično dogodi za pola sata i prije, a e-mail-om će te dobiti obavijest o završetku. + upload_trace: Postaviti GPS trasu + delete: + scheduled_for_deletion: Trasa raspoređena za brisanje + edit: + description: "Opis:" + download: preuzimanje + edit: urediti + filename: "Ime datoteke:" + heading: Uređivanje trase %{name} + map: karta + owner: "Vlasnik:" + points: "Tačaka:" + save_button: Sačuvati promjene + start_coord: "Početna koordinata:" + tags: "Oznake:" + tags_help: odvojeno zarezima + title: Uređivanje trase %{name} + uploaded_at: "Postavljeno:" + visibility: "Vidljivost:" + visibility_help: Šta ovo znači? + list: + empty_html: JNoš uvijek nema ništa ovdje. Postavite novu trasu ili naučite više o GPS trasiranju na wiki stranici. + public_traces: Javne GPS trase + public_traces_from: Javne GPS trase korisnika %{user} + tagged_with: " označeno sa %{tags}" + your_traces: Vaše GPS trase + make_public: + made_public: Trasa za javnost + offline: + heading: GPX spremište je offline + message: Sistem za GPX spremanje i postavljanje trenutno nije u funkciji. + offline_warning: + message: Sistem za GPX upload trenutno nije u funkciji. + trace: + ago: prije %{time_in_words_ago} + by: od + count_points: "%{count} tačaka" + edit: urediti + edit_map: Urediti kartu + identifiable: MOŽE SE IDENTIFICIRATI + in: u + map: karta + more: više + pending: NA ČEKANJU + private: PRIVATNO + public: JAVNO + trace_details: Pogledati detalje trase + trackable: MOŽE SE PRATITI + view_map: Pogledati kartu + trace_form: + description: "Opis:" + help: Pomoć + tags: "Oznake:" + tags_help: odvojeno zarezima + upload_button: Postaviti + upload_gpx: Poslati GPX datoteku + visibility: "Vidljivost:" + visibility_help: Šta ovo znači? + trace_header: + see_all_traces: Pogledati sve trase + see_your_traces: Pogledati vlastite trase + traces_waiting: Imate %{count} trasu/e/a na čekanju za slanje. Uzmite ovo u obzir, i pričekajte da se završe prije slanja novih trasa, da ne blokirate ostale korisnike. + upload_trace: Poslati GPS trasu + trace_optionals: + tags: Oznake + trace_paging_nav: + newer: Novije trase + older: Starije trase + showing_page: Prikaz stranice %{page} + view: + delete_track: Izbrišite ovu trasu + description: "Opis:" + download: preuzimanje + edit: urediti + edit_track: Uredite ovu trasu + filename: "Ime datoteke:" + heading: Prikaz trase %{name} + map: karta + none: Ništa + owner: "Vlasnik:" + pending: U TOKU + points: "Tačaka:" + start_coordinates: "Početna koordinata:" + tags: "Oznake:" + title: Prikaz trase %{name} + trace_not_found: Trasa nije pronađena! + uploaded: "Postavljeno:" + visibility: "Vidljivost:" + visibility: + identifiable: Može se identificirati (prikazan u listi trasa kao onaj koji se može identificirati, uređene tačke sa vremenskom oznakom) + private: Privatni (prikazuje se kao anoniman, neuređene tačke) + public: Javni (prikazan u listi trasa i kao anoniman, neuređene tačke) + trackable: Može se pratiti (prikazuje se kao anoniman, uređene tačke sa vremenskom oznakom) + user: + account: + contributor terms: + agreed: Prihvatili ste nove uslove za doprinosioce. + agreed_with_pd: Takođe ste proglasili da će vaše izmjene biti u javnom vlasništvu. + heading: "Uslovi za doprinosioce:" + link text: Šta je ovo? + not yet agreed: Niste još uvijek prihvatili nove uslove za doprinosioce. + review link text: Molimo Vas da slijedite ovaj link kada vam bude prikladno da pregledate i prihvatite nove uslove za doprinosioce. + current email address: "Trenutna e-mail adresa:" + delete image: Ukloniti trenutnu sliku + email never displayed publicly: (nikada se ne prikazuje javno) + flash update success: Korisničke informacije su uspješno osvježene. + flash update success confirm needed: Korisničke informacije su uspješno osvježene. Provjerite e-mail za porukom za potvrdu nove e-mail adrese. + gravatar: + gravatar: Koristiti Gravatar + link text: Šta je ovo? + home location: "Matična lokacija:" + image: "Slika:" + image size hint: (kvadratne slike od barem 100x100 piksela su najbolje) + keep image: Zadržati trenutnu sliku + latitude: Geografska širina (Latitude) + longitude: Geografska dužina (Longitude) + make edits public button: Napraviti sve moje promjene javnim + my settings: Moja podešavanja + new email address: "Nova e-mail adresa:" + new image: Dodati sliku + no home location: Niste unijeli Vašu matičnu lokaciju. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: Šta je ovo? + openid: OtvoreniID + preferred editor: "Preferirani uređivač:" + preferred languages: "Preferirani jezici:" + profile description: "Opis profila:" + public editing: + disabled: Onemogućno i ne mogu se uređivati podaci, sva prethodna uređivanja su anonimna. + disabled link text: Zašto ja ne mogu uređivati? + enabled: Omogućeno. Nije anonimno i mogu se uređivati podaci. + enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link text: Šta je ovo? + heading: "Javno uređivanje:" + public editing note: + heading: "Javno uređivanje:" + text: Trenutno su vaša uređivanja anonimna i ljudi vam ne mogu poslati poruke ili vidjeti vašu lokaciju. Da bi pokazali vaša uređivanja i dozvolili ljudima da vas kontaktiraju preko website-a, kliknite na dugme ispod Od promjene 0.6 API-a, samo javni korisnici mogu uređivati karte. (saznajte zašto).
    • Vaša e-mail adrea neće biti otkrivena ako postanete javni.
    • Ova akcija se ne može poništiti i svi novi korisnici su postavljeni kao javni.
    + replace image: Zamijeniti trenutnu sliku + return to profile: Vratiti se na profil + save changes button: Sačuvati promjene + title: Urediti korisnički račun + update home location on click: Osvježiti matičnu lokaciju kada kliknem na kartu? + confirm: + already active: Ovaj račun je već potvrđen. + button: Potvrditi + heading: Potvrditi korisnički račun + press confirm button: Pritisnuti potvrditi da bi aktivirali Vaš korisnički račun. + unknown token: Izgleda da ta značka ne postoji. + confirm_email: + button: Potvrditi + failure: E-mail adresa je već potvrđena sa ovom značkom. + heading: Potvrditi promjenu e-mail adrese. + press confirm button: Pritsnite potvrdno dugme ispod da bi ste potvrdili novu e-mail adresu. + success: Vaša e-mail adresa je potvrđena, hvala na uključenju! + confirm_resend: + failure: Korisnik %{name} nije pronađen. + success: Poslali smo novu potvrdu na e-mail %{email} a čim potvrdite svoj račun, moći ćete početi mapirati.

    Ako koristite antispam sistem koji šalje potvrdu zahtjeva, molimo Vas da provjerite jeli webmaster@openstreetmap.org na tzv. "bijeloj listi", jer nismo u mogućnosti odgovarati na potvrde zahtjeva. + filter: + not_an_administrator: Trebate biti moderator da bi izvršili tu radnju. + go_public: + flash success: Sva Vaša uređivanja su sada javna i sada vam je dozvoljeno uređivanje. + list: + confirm: Potvrditi odabrane korisnike + empty: Nisu pronađeni odgovarajući korisnici. + heading: Korisnici + hide: Sakriti odabrane korisnike + showing: + one: Prikaz stranice %{page} (%{first_item} od %{items}) + other: Prikaz stranice %{page} (%{first_item}-%{last_item} od %{items}) + summary: "%{name} napravljeno sa %{ip_address} dana %{date}" + summary_no_ip: "%{name} napravljeno %{date}" + title: Korisnici + login: + account is suspended: Žao nam je, Vaš račun je suspendovan zbog sumnjive aktivnosti.
    Molimo kontaktirajte webmastera uoliko želite da diskutujete o ovome. + account not active: Žao nam je, Vaš korisnički račun još nije aktivan.
    Molimo vas da koristite poveznicu u e-mailu potvrde da bi ste aktivirali svoj račun, ili zatražiti novi e-mail potvrde . + auth failure: Žao mi je, ne možemo Vas prijaviti sa ovim detaljima. + create account minute: Otvorite korisnički račun. To traje samo minutu. + email or username: "E-mail adresa ili korisničko ime:" + heading: Prijava + login_button: Prijava + lost password link: Izgubili ste lozinku? + new to osm: Novi na OpenStreetMap? + no account: Nemate korisničko ime? + openid: "%{logo} OtvoreniID:" + openid invalid: Žao nam je, čini se da je Vaš OpenID zlonamjeran + openid missing provider: Žao nam je, ne možemo kontaktirati Vaš provider za OtvoreniID + openid_logo_alt: Prijavite se sa OtvorenimID + openid_providers: + aol: + alt: Prijavite se sa AOL OtvorenimID + title: Prijavite se sa AOL računom + google: + alt: Prijavite se sa Google OtvorenimID + title: Prijavite se sa Google računom + myopenid: + alt: Prijavite se sa MojOtvoreniID OtvorenimID + title: Prijavite se sa MojOtvoreniID + openid: + alt: Prijavite se sa URL OtvorenogID + title: Prijavite se sa otvorenimID + wordpress: + alt: Prijavite se sa Wordpress OtvorenimID + title: Prijavite se sa Wordpress računom + yahoo: + alt: Prijavite se sa Yahoo OtvorenimID + title: Prijavite se sa Yahoo računom + password: "Lozinka:" + register now: Registrirajte se sada + remember: Zapamti me + title: Prijava + to make changes: Da bi ste mijenjali OpenStreetMap podatke, morate imati korisnički račun. + with openid: "Alternativno molimo koristite Vaš OtvoreniID da se prijavite:" + with username: "Već imate račun OpenStreetMap? Molimo prijavite se sa Vašim korisničkim imenom i lozinkom:" + logout: + heading: Odjava iz OpenStreetMap + logout_button: Odjava + title: Odjava + lost_password: + email address: "E-mail adresa:" + heading: Zaboravljena lozinka? + help_text: Unesite e-mail adresu koju ste koristili za otvaranje računa i poslaćemo Vam link kojim možete ponovo postaviti lozinku. + new password button: Ponovno postavljanje lozinke + notice email cannot find: Ne možemo pronaći tu e-mail adresu, žao nam je. + notice email on way: Žao mi je što ste je izgubili :-( ali e-mail je na putu tako da je možete pononvo postaviti uskoro. + title: Izgubljena lozinka + make_friend: + already_a_friend: Već ste prijatelj sa %{name}. + button: Dodati kao prijatelja + failed: Žao mi je, nije uspjelo dodavanje %{name} kao prijatelja. + heading: Dodati %{user} kao prijatelja? + success: "%{name} je sada Vaš prijatelj." + new: + confirm email address: "Potvrditi e-mail adresu:" + confirm password: "Potvrditi lozinku:" + contact_webmaster: Molimo kontaktirajte webmastera da omogući stvaranje korisničkog računa - pokušaćemo se pozabaviti sa ovim u najkraćem mogućem vremenu. + continue: Nastaviti + display name: "Ime za prikaz:" + display name description: Vaše javno prikazano korisničko ime. Možete ga promjeniti kasnije u postavkama. + email address: "E-mail adresa:" + license_agreement: Kada potvrdite Vaš račun moraćete pristati na Uslove doprinosioca . + no_auto_account_create: Nažalost nismo u mogućnosti automatski otvarati korisničke račune. + not displayed publicly: Nije javno prikazano (vidi politiku privatnosti) + openid: "%{logo} OtvoreniID:" + openid association: "

    Vaš OtvoreniID još nije povezan sa OpenStreetMap računom.

    \n
      \n
    • Ukoliko ste novi na projektu OpenStreetMap, molimo napravite novi račun korištenjem formulara ispod.
    • \n
    • \n Ukoliko već imate račun, možete se prijaviti na Vaš račun korištenjem Vašeg korisničkog imena i lozinke i onda uvezati račun sa Vašim OtvorenimID u Vašim korisničkim podešavanjima.\n
    • \n
    " + openid no password: Lozinka nije potrebna sa OtvorenimID, ali neki ekstra alati ili server je još uvijek mogu trebati. + password: "Lozinka:" + terms accepted: Hvala za prihvatanje novih uslova za doprinosioce! + terms declined: Žao nam je da ste odlučili ne prihvatiti nove Uslove za doprinosioce. Za više informacije, molimo pogledajte ovu wiki stranicu. + title: Napravite račun + use openid: Kao alternativu, koristite %{logo} OtvoreniID za prijavu + no_such_user: + body: Žao mi je, ne postoji korisnik sa imenom %{user}. Molimo provjerite Vaš unos ili da je poveznica na koju ste kliknuli ispravana. + heading: Korisnik %{user} ne postoji + title: Taj korisnik ne postoji. + popup: + friend: Prijatelj + nearby mapper: Obližnji maper + your location: Vaša lokacija + remove_friend: + button: Ukloniti kao prijatelja + heading: Ukloniti %{user} kao prijatelja? + not_a_friend: "%{name} nije jedan od Vaših prijatelja." + success: "%{name} je uklonjen iz prijatelja." + reset_password: + confirm password: "Potvrditi lozinku:" + flash changed: Vaša lozinka je promjenjena. + flash token bad: Niste pronašli tz značku, možda da provjerite URL? + heading: Ponovno postavljanje lozinke za %{user} + password: "Lozinka:" + reset: Ponovno postavljanje lozinke + title: Ponovno postavljanje lozinke + set_home: + flash success: Matična lokacija uspješno snimljena. + suspended: + body: "

    \n Žao nam je, Vaš je račun automatski suspendiran zbog \n sumnjive aktivnosti. \n

    \n

    \n Ova odluka će biti pregledana od strane administratora uskoro, ili \nse možete obratiti %{webmaster}, ako želite razgovarati o tome. \n

    " + heading: Račun suspendiran + title: Račun suspendiran + webmaster: webmaster + terms: + agree: Slažem se + consider_pd: Osim gore navedenog ugovora, smatram da su moji doprinosi u javnom vlasništvu (Public Domain) + consider_pd_why: Šta je ovo? + decline: Odbiti + guidance: "Informacija da bi se pomoglo u shvatanju ovih uslova: Čitljiv sažetak i neki neformalni prijevodi" + heading: Uslovi za doprinosioce + legale_names: + france: Francuska + italy: Italija + rest_of_world: Ostatak svijeta + legale_select: "Molimo odaberite Vašu zemlju prebivališta:" + read and accept: Molimo Vas da pročitate ugovor ispod i dapritisnete dugme za potvrdu da prihvatate uslove ovog sporazuma za Vaše postojeće i buduće doprinose. + title: Uslovi za doprinosioce + you need to accept or decline: Molimo pročitajte i onda ili prihvatite ili odbijte nove Uslove za doprinosioce da bi ste nastavili. + view: + activate_user: aktivirati ovog korisnika + add as friend: dodati kao prijatelja + ago: (%{time_in_words_ago} prije) + block_history: prikazati dobivene blokade + blocks by me: Blokade koje sam postavio/la + blocks on me: Blokade na mene + comments: komentari + confirm: Potvrditi + confirm_user: potvrditi ovog korisnika + create_block: blokirati ovog korisnika + created from: "Napravljeno iz:" + ct accepted: Prihvaćeno prije %{ago} + ct declined: Odbijeno + ct status: "Uslovi za doprinosioce:" + ct undecided: Neodlučen + deactivate_user: deaktivirati ovog korisnika + delete_user: izbrisati ovog korisnika + description: Opis + diary: dnevnik + edits: uređivanja + email address: "E-mail adresa:" + friends_changesets: Pretražiti sve setove promjena prijatelja + friends_diaries: Pretražiti sve unose u dnevnik od prijatelja + hide_user: sakriti ovog korisnika + if set location: Ako namjestite Vašu lokaciju, zgodna karta i stvari će se pojaviti ovdje. Možete namjestiti lokaciju Vašeg boravišta na %{settings_link} stranici. + km away: korisnik udaljen %{count}km + latest edit: "Najnovija izmjena %{ago}:" + m away: "%{count}m daleko" + mapper since: "Maper od:" + moderator_history: prikazati date blokade + my comments: Moji komentari + my diary: Moj dnevnik + my edits: Moje promjene + my settings: Moja podešavanja + my traces: Moje trase + nearby users: Drugi obližnji korisnici + nearby_changesets: Pretražiti sve setove promjena obližnjih korisnika + nearby_diaries: Pretražiti sve unnose u dnevnik od obližnjih korisnika + new diary entry: Novi unos u dnevnik + no friends: Niste dodali nijednog prijatelja. + no nearby users: Još uvijek nema drugih korisnika koji ucrtavaju na kartu u blizini. + oauth settings: Oauth podešavanja + remove as friend: ukloniti kao prijatelja + role: + administrator: Ovaj korisnik je administrator + grant: + administrator: Dodjeliti pristup za administratora + moderator: Dodjeliti pristup za moderatora + moderator: Ovaj korisnik je moderator + revoke: + administrator: Opozvati pristup za administatora + moderator: Opozvati pristup za moderatora + send message: Poslati poruku + settings_link_text: postavke + spam score: "Spam ocjena:" + status: "Stanje:" + traces: trase + unhide_user: otkriti ovog korisnika + user location: Lokacija boravišta korisnika + your friends: Vaši prijatelji + user_block: + blocks_by: + empty: "%{name} nije napravio/la još nijednu blokadu." + heading: Lista blokada od %{name} + title: Blokade od %{name} + blocks_on: + empty: "%{name} nije još bio blokiran." + heading: Lista blokada na %{name} + title: Blokade na %{name} + create: + flash: Napraviti blokadu na korisnika %{name}. + try_contacting: Molimo da pokušate kontaktirati korisnika prije blokiranja i dati mu razumno vrijeme za odgovor. + try_waiting: Molimo da date korisniku razumno vrijeme da odgovori prije nego ga blokirate. + edit: + back: Pogledati sve blokade + heading: Uređivanje blokade na %{name} + needs_view: Da li se korisnik mora prijaviti prije nego se očisti blokada? + period: Koliko dugo, od sada, će korisnik biti blokiran od strane API. + reason: Razlog zašto je %{name} blokiran. Molimo da budete mirni i razumni što je više je moguće, dajući što više detalja o situaciji. Imajte na umu da svi korisnici ne razumiju žargon u zajednici, pa im objasnite jednostavnim jezikom. + show: Pogledati ovu blokadu + submit: Osvježiti blokadu + title: Uređivanje blokade na %{name} + filter: + block_expired: Blokada je već istekla i ne može se uređivati. + block_period: Period blokade mora biti jedna od vrijednosti iz drop-down liste. + helper: + time_future: Završava u %{time}. + time_past: Završeno prije %{time}. + until_login: Aktivno dok se korsnik ne prijavi. + index: + empty: Blokade još nisu napravljene + heading: Lista blokada korisnika + title: Blokade korisnika + model: + non_moderator_revoke: Morate biti moderator da opozovete blokadu. + non_moderator_update: Morate biti moderator da napravite ili osvježite blokadu. + new: + back: Pogledati sve blokade + heading: Pravljenjen blokade na %{name} + needs_view: Korisnik se mora prijaviti da bi se blokada očistila + period: Koliko dugo, od sada, će korisnik biti blokiran od strane API. + reason: Razlog zašto je %{name} blokiran. Molim da budete mirni i razumni što je više je moguće, dajući što više detalja o situaciji, s time da će poruka biti javno vidljiva. Imajte na umu da svi korisnici ne razumiju žargon u zajednici, pa im objasnite jednostavnim jezikom. + submit: Napraviti blokadu + title: Pravljenje blokade na %{name} + tried_contacting: Kontaktirao sam korisnika i pitao da prestane. + tried_waiting: Dao sam dovoljno razumnog vremena korisniku da odgovori. + not_found: + back: Nazad na index + sorry: Žao mi je, korinička blokada sa ID %{id} se ne može naći. + partial: + confirm: Da li ste sigurni? + creator_name: Kreator + display_name: Blokirani korisnik + edit: Urediti + next: Sljedeća » + not_revoked: (nije opozvano) + previous: « Prethodna + reason: Razlog za blokadu + revoke: Opozvati! + revoker_name: Opozvano od strane + show: Pokazati + showing_page: Prikaz stranice %{page} + status: Stanje + period: + one: 1 sat + other: "%{count} sata/i" + revoke: + confirm: Jeste li sgurni da želite opozvati ovu blokadu? + flash: Ova blokada je opozvana. + heading: Opoziv blokade na %{block_on} od %{block_by} + past: Blokada je završila prije %{time} i ne može se opozvati sada. + revoke: Opozvati! + time_future: Blokada će završiti za %{time}. + title: Opoziv blokade na %{block_on} + show: + back: Pogledati sve blokade + confirm: Da li ste sigurni? + edit: Urediti + heading: "%{block_on} blokiran od strane %{block_by}" + needs_view: Korisnik se mora prijaviti prije nego se blokada očisti. + reason: Razlog za blokadu + revoke: Opozvati! + revoker: "Opozivalac:" + show: Pokazati + status: Stanje + time_future: Završava u %{time} + time_past: Završeno prije %{time} + title: "%{block_on} blokiran od strane %{block_by}" + update: + only_creator_can_edit: Samo moderator koji je napravio blokadu ovo može urediti. + success: Blokada osvježena + user_role: + filter: + already_has_role: Korisnik već ima ulogu %{role}. + doesnt_have_role: Korisnik nema ulogu %{role}. + not_a_role: String `%{role}' nije valjana uloga. + not_an_administrator: Samo administratori mogu upravljati ulogama korisnika, a vi niste administrator. + grant: + are_you_sure: Jeste li sigurni da želite dodjeliti ulogu `%{role}' korisniku `%{name}'? + confirm: Potvrditi + fail: Ne možemo dodjeliti ulogu `%{role}' korisniku `%{name}'. Molimo provjeriti ispravnost i korisnika i uloge. + heading: Potvrditi dodjelu uloge + title: Potvrditi dodjelu uloge + revoke: + are_you_sure: Jeste li sigurni da želite opozvati ulogu `%{role}' korisnika `%{name}'? + confirm: Potvrditi + fail: Ne možemo opozvati ulogu `%{role}' korisniku `%{name}'. Molimo provjeriti ispravnost i korisnika i uloge. + heading: Potvrditi opoziv uloge + title: Potvrditi opoziv uloge + welcome_page: + basic_terms: + title: Osnovni pojmovi za mapiranje + questions: + title: Pitanja? + title: Dobrodošli! + whats_on_the_map: + on_html: OpenStreetMap je mjesto za mapiranje stvari koje su i stvarne i trenutne - uključuje milione građevina, cesta, i ostalih detalja vezanih za mjesta. Vi možete mapirati bilo koji stvarni oblik koji vas interesuje. diff --git a/config/locales/ca.yml b/config/locales/ca.yml index ddacd175365..a3070757795 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -2,28 +2,49 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Aleator +# Author: Alvaro Vidal-Abarca # Author: El libre +# Author: Fitoschido # Author: Gemmaa +# Author: Grondin # Author: Jconstanti # Author: Jmontane # Author: Martorell # Author: McDutchie +# Author: Micru +# Author: Mlforcada +# Author: Nemo bis # Author: PerroVerd +# Author: Pitort # Author: SMP # Author: Sim6 # Author: Solde # Author: Ssola # Author: Toniher +# Author: XVEC +# Author: 아라 ca: + about_page: + community_driven_html: "La comunitat d'OpenStreetMap és diversa, apassionada, i creix cada dia. Entre els nostres contribuïdors hi ha cartògrafs entusiastes, professionals de GIS, enginyers que posen en funcionament els servidors d'OSM, voluntaris que cartografien les zones afectades per desastres, i molt més.\nSi voleu conèixer més sobre la comunitat, vegeu els diaris d'usuari, els blogs de la comunitat, i la pàgina web de la Fundació OSM." + community_driven_title: Dirigit per la comunitat + copyright_html: Col·laboradors de
    ©OpenStreetMap + lede_text: OpenStreetMap està construït per una comunitats de catògrafs que contibueixen i mantenen dades sobre carreteres, senders, cafeteries, estacions de ferrocarril, i molt més, per tot el món. + local_knowledge_html: OpenStreetMap potencia el coneixement local. Els contribuïdors usen imatges aèries, dispositius GPS, i mapes de baixa tecnologia per tal de verificar que OSM és precís i està actualitzat. + local_knowledge_title: Coneixement local + next: Següent + open_data_html: "OpenStreetMap són dades lliures: sou lliures d'usar-lo per a qualsevol propòsit, sempre que doneu crèdit a OpenStreetMap i els seus contribuïdors. Si modifiqueu o construïu sobre les dades en alguna manera concreta, podeu distribuir el resultat només sota la mateixa llicència. Vegeu la pàgina de copyright i llicència per a més detalls." + open_data_title: Dades obertes + partners_title: Socis + used_by: "%{name} integra dades de mapes en centenars de llocs web, aplicacions per a mòbils i dispositius de maquinari" activerecord: attributes: diary_comment: body: Cos diary_entry: - language: Llengua + language: Idioma latitude: Latitud longitude: Longitud - title: Títol + title: Tema user: Usuari friend: friend: Amic @@ -32,7 +53,7 @@ ca: body: Cos recipient: Destinatari sender: Remitent - title: Títol + title: Tema trace: description: Descripció latitude: Latitud @@ -47,7 +68,7 @@ ca: description: Descripció display_name: Nom en pantalla email: Adreça electrònica - languages: Llengües + languages: Idiomes pass_crypt: Contrasenya models: acl: Llista de control d'accés @@ -67,179 +88,110 @@ ca: old_relation: Relació antiga old_relation_member: Membre de la relació antiga old_relation_tag: Etiqueta de relació antiga - old_way: Camí antic - old_way_node: Node del camí antic - old_way_tag: Etiqueta del camí antic + old_way: Via antiga + old_way_node: Node de la via antiga + old_way_tag: Etiqueta de la via antiga relation: Relació relation_member: Membre de la relació relation_tag: Etiqueta de la relació session: Sessió - trace: Traç - tracepoint: Punt de traç - tracetag: Etiqueta del traç + trace: Traça + tracepoint: Punt de la traça + tracetag: Etiqueta de la traça user: Usuari - user_preference: Preferències d'usuari + user_preference: Preferència d'usuari user_token: Testimoni d'usuari - way: Camí - way_node: Node del camí - way_tag: Etiqueta del camí + way: Via + way_node: Node de la via + way_tag: Etiqueta de la via application: require_cookies: cookies_needed: Sembla que teniu les galetes inhabilitades - habiliteu les galetes al navegador abans de continuar. + require_moderator: + not_a_moderator: Heu de ser un moderador per dur a terme aquesta acció setup_user_auth: - blocked: S'ha blocat l'accés a l'API. Si us plau, log-in a la interfície de web per obtenir més informació. + blocked: El vostre accés a l'API ha estat blocat. Si us plau, connecteu-vos a la interfície web per obtenir més informació. need_to_see_terms: L'accés a l'API és temporalment suspeses. Si us plau, log-in a la interfície de web per veure els termes de col. laborador. Vostè no necessita estar d'acord, però cal veure-les. browse: + anonymous: anònim changeset: - changeset: "Conjunt de canvis: %{id}" + belongs_to: Autor changesetxml: XML del conjunt de canvis - download: Baixa %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Conjunt de canvis %{id} title_comment: Conjunt de canvis %{id} - %{comment} + node: Nodes (%{count}) + node_paginated: Nodes (%{x}-%{y} de %{count}) osmchangexml: XML en format osmChange - title: Conjunt de canvis - changeset_details: - belongs_to: "Pertany a:" - bounding_box: "Caixa contenidora:" - box: caixa - closed_at: "Tancat el:" - created_at: "Creat el:" - has_nodes: - one: "Té el següent %{count} node:" - other: "Té els següents %{count} nodes:" - has_relations: - one: "Té la següent %{count} relació:" - other: "Té les següents %{count} relacions:" - has_ways: - one: "Té la següent via:" - other: "Té les següents %{count} vies:" - no_bounding_box: No hi ha bounding box s'ha emmagatzemat per a aquest el conjunt de canvis. - show_area_box: Mostra caixa de l'àrea - common_details: - changeset_comment: "Comentari:" - deleted_at: "Eliminat a:" - deleted_by: "Eliminat per:" - edited_at: "Editat:" - edited_by: "Editat per:" - in_changeset: "Al conjunt de canvis:" - version: Versió + relation: Relacions (%{count}) + relation_paginated: Relacions (%{x}-%{y} de %{count}) + title: "Conjunt de canvis: %{id}" + way: Vies (%{count}) + way_paginated: Vies (%{x}-%{y} de %{count}) + closed: Tancat + closed_by_html: Tancat fa %{time} per %{user} + closed_html: Tancat fa %{time} containing_relation: entry: Relació %{relation_name} entry_role: Relació %{relation_name} (com a %{relation_role}) - map: - deleted: Esborrat - edit: - area: Modifica l'àrea - node: Modifica el node - relation: Modifica la relació - way: Modifica la via - larger: - area: Visualitza l'àrea en un mapa més gran - node: Visualitza el node en un mapa més gran - relation: Visualitza la relació en un mapa més gran - way: Visualitza la via en un mapa més gran - loading: S'està carregant... - navigation: - all: - next_changeset_tooltip: Conjunt de canvis següent - next_node_tooltip: Node següent - next_relation_tooltip: Relació següent - next_way_tooltip: Via següent - prev_changeset_tooltip: Conjunt de canvis anterior - prev_node_tooltip: Node anterior - prev_relation_tooltip: Relació anterior - prev_way_tooltip: Via anterior - user: - name_changeset_tooltip: Visualitza les edicions de %{user} - next_changeset_tooltip: Propera edició de %{user} - prev_changeset_tooltip: Edició anterior de %{user} + created: Creat + created_by_html: Creat fa %{time} per %{user} + created_html: Creat fa %{time} + deleted_by_html: Eliminat fa %{time} per %{user} + download_xml: Descarregar l'XML + edited_by_html: Editat fa %{time} per %{user} + in_changeset: Conjunt de canvis + location: "Ubicació:" + no_comment: (sense comentaris) node: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Baixa l'XML - edit: modificació - node: Node - node_title: "Node: %{node_name}" - view_history: visualitza l'historial - node_details: - coordinates: "Coordenades:" - part_of: "Part de:" - node_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Baixa l'XML - node_history: Historial del node - node_history_title: "Historial del node: %{node_name}" - view_details: visualitza els detalls + history_title: "Historial del node: %{name}" + title: "Node: %{name}" not_found: - sorry: Ho sentim, no s'ha trobat el %{type} amb l'id %{id}. + sorry: "Ho sentim, no s'ha trobat el %{type} amb l'id #%{id}." type: changeset: conjunt de canvis node: node relation: relació way: via - paging_nav: - of: de - showing_page: S'està mostrant pàgina + note: + closed_by: Resolt per %{user} fa %{when} + closed_by_anonymous: Resolt per un anònim fa %{when} + closed_title: "Nota resolta #%{note_name}" + commented_by: Comentari de %{user} fa %{when} + commented_by_anonymous: Comentari d'un anònim fa %{when} + hidden_by: Ocultat per %{user} fa %{when} + hidden_title: "Nota oculta #%{note_name}" + new_note: Nova nota + open_by: Creat per %{user} fa %{when} + open_by_anonymous: Creat per un anònim fa %{when} + open_title: "nota no resolta: #%{note_name}" + reopened_by: Reactivat per %{user} fa %{when} + reopened_by_anonymous: Reactivat per un anònim fa %{when} + title: "Nota: %{id}" + part_of: Part de + redacted: + message_html: La versió %{version} d'aquest %{type} no pot ser mostrada com ha estat redactada. Si us plau, vegeu %{redaction_link} per més detalls. + redaction: Redacció %{id} + type: + node: node + relation: relació + way: via relation: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Baixa l'XML - relation: Relació - relation_title: "Relació: %{relation_name}" - view_history: visualitza l'historial - relation_details: - members: "Membres:" - part_of: "Part de:" - relation_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Baixa l'XML - relation_history: Historial de la relació - relation_history_title: "Historial de la relació: %{relation_name}" - view_details: mostra els detalls + history_title: "Historial de la relació: %{name}" + members: Membres + title: "Relació: %{name}" relation_member: entry_role: "%{type} %{name} com %{role}" type: node: Node relation: Relació way: Via - start: - manually_select: Sel·leccioneu una altra àrea manualment - view_data: Visualitza la informació per a la vista del mapa actual start_rjs: - data_frame_title: Informació - data_layer_name: Informació - details: Detalls - drag_a_box: Marqueu un rectangle al mapa per a seleccionar una àrea - edited_by_user_at_timestamp: Editat per [[user]] el [[timestamp]] - hide_areas: Oculta les zones - history_for_feature: Historial per a [[feature]] + feature_warning: Carregant %{num_features} característiques, que poden fer que el vostre navegador funcioni més lent, o que no respongui. Esteu segur que voleu mostrar aquestes dades? load_data: Carrega dades - loaded_an_area_with_num_features: "Heu carregat una àrea que conté [[num_features]] característiques. En general, alguns navegadors no poden fer front a mostrar aquesta quantitat de dades. En general, els navegadors funcionen millor mostrant menys de 100 característiques a la vegada: fer una altre cosa pot fer que el seu navegador esdevingui lent o que no respongui. Si esteu segurs que voleu visualitzar aquestes dades, pot fer-ho fent clic al botó de sota." loading: S'està carregant... - manually_select: Selecciona manualment una àrea diferent - object_list: - api: Obté aquesta àrea mitjançant l'API - back: Mostra llista d'objectes - details: Detalls - heading: Llista d'objectes - history: - type: - node: Node [[id]] - way: Via [[id]] - selected: - type: - node: Node [[id]] - way: Via [[id]] - type: - node: Node - way: Camí - private_user: usuari privat - show_areas: Mostra les zones - show_history: Mostra l'historial - unable_to_load_size: "No es pot carregar: Bounding mida de caixa de [[bbox_size]] és massa gran (ha de ser més petita que %{max_bbox_size})" - wait: Espereu... - zoom_or_select: Amplia o selecciona una àrea del mapa per mostrar tag_details: - tags: "Etiquetes:" + tags: Etiquetes wiki_link: key: La pàgina de descripció del wiki per l'etiqueta %{key} tag: La pàgina de descripció del wiki per l'etiqueta %{key}=%{value} @@ -251,38 +203,25 @@ ca: node: node relation: relació way: via + version: Versió + view_details: Mostrar els detalls + view_history: Mostrar l'historial way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Descarrega XML - edit: modificació - view_history: visualitza l'històric - way: Via - way_title: "Via: %{way_name}" - way_details: also_part_of: - one: també part de la via %{related_ways} - other: també part de les vies %{related_ways} - nodes: "Nodes:" - part_of: "Part de:" - way_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Descarrega XML - view_details: visualitza els detalls - way_history: Historial de la via - way_history_title: "Historial de la via: %{way_name}" + one: part de la via %{related_ways} + other: part de les vies %{related_ways} + history_title: "Historial de la via: %{name}" + nodes: Nodes + title: "Via: %{name}" changeset: changeset: anonymous: Anònim - big_area: (gran) - no_comment: (cap) - no_edits: (Sense edicions) - show_area_box: Mostra capsa de l'àrea - still_editing: (Encara en edició) + no_edits: (sense edicions) view_changeset_details: Mostra els detalls del conjunt de canvis changeset_paging_nav: - next: Següent » - previous: « Anterior - showing_page: Mostrant pàgina %{page} + next: Endavant » + previous: « Enrere + showing_page: Pàgina %{page} changesets: area: Àrea comment: Comentari @@ -290,37 +229,37 @@ ca: saved_at: Desat a user: Usuari list: - description: Canvis recents - description_bbox: Conjunt de canvis dins de %{bbox} - description_friend: Conjunts de canvis dels vostres amics - description_nearby: Conjunts de canvis d'usuaris propers - description_user: Conjunt de canvis fets per %{user} - description_user_bbox: Conjunt de canvis de %{user} dins de %{bbox} - heading: Conjunt de canvis - heading_bbox: Conjunt de canvis - heading_friend: Conjunts de canvis - heading_nearby: Conjunts de canvis - heading_user: Conjunt de canvis - heading_user_bbox: Conjunt de canvis + empty: No s'han trobat conjunts de canvis + empty_area: No hi han conjunts de canvis en aquesta àrea + empty_user: No hi han conjunts de canvis fets per aquest usuari. + load_more: Carregar-ne més + no_more: No s'han trobat més conjunts de canvis. + no_more_area: No hi han més conjunts de canvis en aquesta àrea. + no_more_user: No hi han més conjunts de canvis fets per aquest usuari. title: Conjunt de canvis - title_bbox: Conjunt de canvis dins de %{bbox} title_friend: Conjunts de canvis dels vostres amics title_nearby: Conjunts de canvis d'usuaris propers title_user: Conjunt de canvis de %{user} - title_user_bbox: Conjunt de canvis de %{user} dins de %{bbox} timeout: sorry: La llista de conjunt de canvis que heu sol·licitat ha trigat massa a recuperar-se. diary_entry: comments: ago: fa %{ago} + comment: Comentari + has_commented_on: "%{display_name} ha comentat les següents entrades del diari" + newer_comments: Comentaris recents + older_comments: Comentaris antics + post: Publica + when: Quan diary_comment: comment_from: Comentari de %{link_user} el %{comment_created_at} confirm: Confirma hide_link: Amaga aquest comentari diary_entry: comment_count: - one: 1 comentari + one: "%{count} comentari" other: "%{count} comentaris" + zero: Sense comentaris comment_link: Comenta aquesta entrada confirm: Confirma edit_link: Edita aquesta entrada @@ -352,10 +291,10 @@ ca: in_language_title: Entrades de diari en %{language} new: Nova Entrada de Diari new_title: Redacta una nova entrada al teu diari d'usuari/a - newer_entries: Entrades més Recents + newer_entries: Entrades més recents no_entries: No hi ha entrades al diari - older_entries: Entrades més Antigues - recent_entries: "Entrades Recents al diari:" + older_entries: Entrades més antigues + recent_entries: "Entrades recents al diari:" title: Diaris d'usuari/a title_friends: Diaris dels amics title_nearby: Diaris d'amics propers @@ -379,6 +318,9 @@ ca: user_title: Diari de %{user} editor: default: Predeterminat (actualment %{name}) + id: + description: iD (editor al navegador) + name: iD potlatch: description: Potlatch 1 (editor al navegador) name: Potlatch 1 @@ -386,7 +328,7 @@ ca: description: Potlatch 2 (editor al navegador) name: Potlatch 2 remote: - description: Comandament a distància (JOSM o Merkaartor) + description: Control remot (JOSM o Merkaartor) name: Control Remot export: start: @@ -394,7 +336,7 @@ ca: area_to_export: Àrea a exportar embeddable_html: HTML que es pot incloure export_button: Exporta - export_details: Les dades l'OpenStreetMap són publicades sota el termes de la llicència Creative Commons Attribution-ShareAlike 2.0. + export_details: Les dades d'OpenStreetMap són publicades sota el termes de la llicència Creative Commons Attribution-ShareAlike 2.0. format: Format format_to_export: Format d'exportació image_size: Mida de la imatge @@ -402,6 +344,7 @@ ca: licence: Llicència longitude: "Lon:" manually_select: Selecciona manualment una àrea diferent + map_image: Imatge de mapa (mostra una capa estàndard) max: màx options: Opcions osm_xml_data: OpenStreetMap XML Data @@ -409,29 +352,40 @@ ca: paste_html: Enganxa HTML per incloure'l al lloc web scale: Escala too_large: - body: Aquesta zona és massa gran per exportar com a dades XML de OpenStreetMap. Si us plau entrar ràpidament o seleccioneu una àrea més petita. - heading: L'àrea és massa gran + advice: "Si falla l'exportació anterior, si us plau, penseu a utilitzar una de les fonts llistades a continuació:" + body: Aquesta zona és massa gran per ser exportada com a dades XML de OpenStreetMap. Si us plau seleccioneu una àrea més petita o bé una de les següents fonts per descarregar quantitats grans de dades. + geofabrik: + description: Extractes actualitzats regularment de continents, països i de les ciutats seleccionades + title: Descàrregues de Geofabrik + metro: + description: Extractes per a les ciutats més grans del món i les seves àrees metropolitanes + title: Extractes de Metro + other: + description: Fonts addicionals llistades al wiki d'OpenStreetMap + title: Altres fonts + planet: + description: Còpies actualitzades regularment de la base de dades d'OpenStreetMap al complet + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Afegeix un marcador al mapa - change_marker: Canvia la posició del marcador - click_add_marker: Fes clic al mapa per afegir un marcador - drag_a_box: Marca un rectangle al mapa per a seleccionar una àrea - export: Exporta - manually_select: Selecciona manualment una àrea diferent - view_larger_map: Mostra un mapa més gran + title: Exportar + fixthemap: + how_to_help: + join_the_community: + explanation_html: Si heu trobat un problema amb les nostres dades del mapa, com per exemple l'omissió d'una carretera o bé de la vostra adreça, la millor forma d'arreglar-ho és unint-se a la comunitat d'OpenStreetMap i afegir o bé corregir les dades vós mateix. + title: Afegiu-vos a la comunitat + title: Com contribuir + other_concerns: + title: Altres aspectes + title: Informeu d'un problema / Corregiu el mapa geocoder: description: title: geonames: Localització des de GeoNames - osm_namefinder: "%{types} de OpenStreetMap Namefinder" osm_nominatim: Localització des de OpenStreetMap Nominatim types: cities: Ciutats places: Llocs towns: Municipis - description_osm_namefinder: - prefix: "%{distance} %{direction} de %{type}" direction: east: est north: nord @@ -452,26 +406,48 @@ ca: title: ca_postcode: Resultats de Geocoder.CA geonames: Resultats des de GeoNames + geonames_reverse: Resultats procedents de GeoNames latlon: Resultats propis - osm_namefinder: Resultats de OpenStreetMap Namefinder osm_nominatim: Resultats de OpenStreetMap nominatim + osm_nominatim_reverse: Resultats procedents de OpenStreetMap nominatim uk_postcode: Resultats de NPEMap / FreeThe Postcode us_postcode: Resultats de Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: + admin_levels: + level10: Límit de suburbi + level2: Frontera + level4: Límit d'estat + level5: Límit de regió + level6: Frontera + level8: Límit de municipi + level9: Límit de poble prefix: + aerialway: + chair_lift: Telecadira + drag_lift: Teleesquí + station: Estació de telefèric + aeroway: + aerodrome: Aeròdrom + apron: Autobús de pista + gate: Porta + helipad: Helisuperfície + runway: Pista d'aterratge + taxiway: Carrer de rodada + terminal: Terminal amenity: + WLAN: Punt d'accés WiFi airport: Aeroport arts_centre: Centre d'Art + artwork: Obra d'art atm: Caixer automàtic auditorium: Auditori bank: Banc bar: Bar + bbq: barbacoa bench: Banc bicycle_parking: Aparcament de bicicletes bicycle_rental: Lloguer de bicicletes + biergarten: Cervesseria a l'aire lliure brothel: Prostíbul bureau_de_change: Oficina de canvi bus_station: Estació d'autobusos @@ -480,6 +456,7 @@ ca: car_sharing: Compartició de cotxes car_wash: Rentat de cotxes casino: Casino + charging_station: Estació de recàrrega cinema: Cinema clinic: Clínica club: Club @@ -498,6 +475,7 @@ ca: ferry_terminal: Terminal de Ferry fire_hydrant: Boca d'incendi fire_station: Parc de bombers + food_court: Àrea de restauració fountain: Font fuel: Benzinera grave_yard: Cementiri @@ -538,9 +516,13 @@ ca: shelter: Refugi shop: Botiga shopping: Botigues + shower: Dutxa + social_centre: Centre social social_club: Club social + social_facility: Equipament social studio: Estudi supermarket: Supermercat + swimming_pool: Piscina taxi: Taxi telephone: Telèfon públic theatre: Teatre @@ -554,12 +536,21 @@ ca: wifi: Punt d'accés WiFi youth_centre: Centre juvenil boundary: - administrative: Administració de Fronteres + administrative: Límit administratiu + census: Límit censal + national_park: Parc Nacional + protected_area: Zona protegida bridge: + aqueduct: Aqüeducte + suspension: Pont suspès + swing: Pont giratori viaduct: Viaducte "yes": Pont building: "yes": Edifici + emergency: + fire_hydrant: Boca d'incendis + phone: Telèfon per a emergències highway: bridleway: Ferradura bus_guideway: Carril Bus @@ -571,27 +562,33 @@ ca: footway: Sendera ford: Fiord living_street: Carrer habitat - minor: Camí secundari - motorway: L'autopista - motorway_junction: L'autopista - motorway_link: L'autopista Road + milestone: Fita + minor: Via secundària + motorway: Autopista + motorway_junction: Unió d'autopista + motorway_link: Carretera d'autopista path: Camí pedestrian: Via Peatonal platform: Perron primary: Carretera Principal primary_link: Carretera principal + proposed: Carretera proposada raceway: Vial Ràpid residential: Residencial + rest_area: Àrea de descans road: Carretera secondary: Carretera secundària secondary_link: Carretera secundària service: Carretera de Servei services: Serveis en ruta + speed_camera: Radar steps: Graons stile: Escala per a travessar reixats + street_lamp: Fanal tertiary: Carretera terciària + tertiary_link: Carretera terciària track: Pista - trail: Sendera + trail: Sendera o corriol trunk: Autovia de trunk_link: Autovia de unclassified: Sense classificar Road @@ -603,6 +600,8 @@ ca: building: Edifici castle: Castell church: Església + citywalls: Muralles + fort: Fortí house: Casa icon: Icona manor: Manor @@ -611,6 +610,7 @@ ca: monument: Monument museum: Museu ruins: Ruïnes + tomb: Tomba tower: Torre wayside_cross: Camí de la creu wayside_shrine: Santuari de carreteres @@ -627,6 +627,7 @@ ca: farmland: Terres de conreu farmyard: Corral forest: Bosc + garages: Garatges grass: Herba greenfield: Greenfield terra industrial: Zona industrial @@ -635,22 +636,27 @@ ca: military: Zona Militar mine: Mina nature_reserve: Reserva Natural + orchard: Verger park: Parc piste: Pista d'aterratge quarry: Pedrera railway: Ferrocarril recreation_ground: Zona d'Esbarjo reservoir: Embassament + reservoir_watershed: Embassament de conca residential: Àrea residencial retail: Al detall - village_green: Village Green + road: Zona de carretera + village_green: Zona verda vineyard: Vinya wetland: Aiguamoll wood: Fusta leisure: beach_resort: Beach Resort + bird_hide: Aguait common: Terra comú fishing: Àrea de pesca + fitness_station: Centre de fitness garden: Jardí golf_course: Camp de golf ice_rink: Pista de patinatge sobre gel @@ -661,12 +667,19 @@ ca: pitch: Camp d'esports playground: Parc infantil recreation_ground: Terra de recreació + sauna: Sauna slipway: Slipway sports_centre: Centre esportiu stadium: Estadi swimming_pool: Piscina track: Pista water_park: Parc aquàtic + military: + airfield: Aeroport militar + barracks: Caserna + bunker: Búnquer + mountain_pass: + "yes": Coll natural: bay: Badia beach: Platja @@ -675,9 +688,11 @@ ca: channel: Canal cliff: Cingle crater: Cràter + dune: Duna feature: Característica fell: Forest fjord: Fiord + forest: Bosc geyser: Guèiser glacier: Glacera heath: Bruguerar @@ -697,6 +712,7 @@ ca: scrub: Scrub shoal: Banc spring: Deu + stone: Pedra strait: Estret tree: Arbre valley: Vall @@ -705,6 +721,19 @@ ca: wetland: Aiguamoll wetlands: Aiguamolls wood: Bosc + office: + accountant: Comptable + architect: Arquitecte + company: Empresa + employment_agency: Agència d'ocupació + estate_agent: Immobiliària + government: Oficina governamental + insurance: Oficina d'assegurances + lawyer: Advocat + ngo: Oficina d'una ONG + telecommunication: Oficina de telecomunicacions + travel_agent: Agència de viatges + "yes": Oficina place: airport: Aeroport city: Ciutat @@ -716,9 +745,11 @@ ca: houses: Cases island: Illa islet: Illot + isolated_dwelling: Habitatge aïllat locality: Localitat moor: Amarrador municipality: Municipi + neighbourhood: Barri postcode: Codi postal region: Regió sea: Mar @@ -739,12 +770,15 @@ ca: junction: Cruïlla de tren level_crossing: Pas a nivell light_rail: Tren lleuger + miniature: Ferrocarril en miniatura monorail: Monorail narrow_gauge: Ample ferroviari mètric platform: Andana preserved: Conservat ferrocarril + proposed: Ferrocarril proposat spur: Esperó de ferrocarril station: Estació de tren + stop: Parada de Ferrocarril subway: Estació de metro subway_entrance: Accés al Metro switch: Punts de ferrocarril @@ -753,12 +787,14 @@ ca: yard: Pati de ferrocarril shop: alcohol: De llicència + antiques: Antiquari art: Galeria d'Art bakery: Fleca beauty: Saló de bellesa beverages: Botiga de begudes bicycle: Tenda de bicicletes books: Llibreria + boutique: Boutique butcher: Carnisseria car: Venda de Cotxes car_parts: Peces de cotxes @@ -772,6 +808,7 @@ ca: convenience: Botiga de conveniència copyshop: Copisteria cosmetics: Botiga Cosmètica + deli: Botiga de comestibles department_store: Department Store discount: Botiga d'articles de descompte doityourself: Bricolatge @@ -808,22 +845,26 @@ ca: organic: Botiga d'aliments orgànics outdoor: Botiga exterior pet: Botiga d'animals + pharmacy: Farmàcia photo: Botiga de foto salon: Sala d'estar + second_hand: Botiga de segona mà shoes: Sabateria shopping_centre: Centre comercial sports: Botiga d'esports stationery: Botiga de papereria supermarket: Supermercat + tailor: Sastreria toys: Botiga de joguines travel_agency: Agència de viatges video: Video de la botiga wine: De llicència + "yes": Botiga tourism: alpine_hut: Cabanya alpina artwork: Il·lustració attraction: Atracció - bed_and_breakfast: Llist i esmorzar (B&B) + bed_and_breakfast: Llit i esmorzar (B&B) cabin: Cabanya camp_site: Campament caravan_site: Càmping per a caravanes @@ -841,8 +882,10 @@ ca: viewpoint: Mirador zoo: Zoològic tunnel: + culvert: Canonada "yes": Túnel waterway: + artificial: Curs d'aigua artificial boatyard: Drassana canal: Canal connector: Connector de Waterway @@ -863,90 +906,176 @@ ca: water_point: Punt d'aigua waterfall: Cascada weir: Weir + help_page: + help: + description: Feu una pregunta o busqueu respostes a la pàgina de preguntes i respostes d'OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap té multitud de recursos per conèixer aquest projecte, per plantejar i respondre preguntes, i per participar en discussions col·laboratives i documentar temes de cartografia. + title: Obtenir ajuda + welcome: + description: Començar amb aquesta guia ràpida sobre els aspectes bàsics de OpenStreetMap. + title: Benvinguts a l'OSM + url: /welcome + wiki: + description: Navegueu per la wiki per aprofundir en la documentació d'OSM. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Tanca + edit_help: Moveu el mapa i feu zoom sobre una ubicació que vulgueu editar, i a continuació, feu clic aquí. + key: + title: Llegenda + tooltip: Llegenda + tooltip_disabled: La llegenda només està disponible per a la capa estàndard map: base: cycle_map: Cycle Map + hot: Humanitarian mapquest: MapQuest Open standard: Estàndard transport_map: Mapa de transports + copyright: © Col·laboradors d'OpenStreetMap + donate_link_text: + layers: + data: Dades del mapa + header: Capes del mapa + notes: Notes de mapa + overlays: Activar capes extra per als problemes del mapa + title: Capes del mapa + locate: + popup: Esteu a {distance} {unit} d'aquest punt + title: Mostra la meva ubicació + zoom: + in: Apropar-se + out: Allunyar-se + notes: + new: + add: Afegeix una nota + intro: Per tal de millorar el mapa, la informació que envieu és mostrada a altres «mapadors», per tant, sigueu tan descriptius i precisos com pugueu en moure el marcador a la posició correcta i en escriure la nota a continuació. + show: + anonymous_warning: Aquesta nota inclou comentaris d'usuaris anònims que haurien de ser verificats independentment. + comment: Comenta + comment_and_resolve: Comenta i resol + hide: Amaga + reactivate: Reactivar + resolve: Resol + share: + cancel: Cancel·la + center_marker: Centra el mapa al marcador + custom_dimensions: Estableix dimensions personalitzades + download: Descàrrega + embed: HTML + format: "Format:" + image: Imatge + image_size: La imatge es mostrarà a la capa estàndard amb una mida de + include_marker: Inclou el marcador + link: Enllaç o HTML + long_link: Enllaç + paste_html: Engnaxa l'HTML per inserir-ho a un lloc web + scale: "Escala:" + short_link: Enllaç curt + short_url: URL curta + title: Comparteix + view_larger_map: Mostra un mapa més gran site: + createnote_disabled_tooltip: Fes zoom per afegir una nota al mapa + createnote_tooltip: Afegiu una nota al mapa edit_disabled_tooltip: Augmenteu el zoom per modificar el mapa edit_tooltip: Modifica el mapa - edit_zoom_alert: Heu d'ampliar el zoom per editar el mapa - history_disabled_tooltip: Amplia per visualitzar les modificacions de l'àrea - history_tooltip: Mostra les modificacions de l'àrea - history_zoom_alert: Heu d'ampliar el zoom per veure les modificacions de l'àrea + map_data_zoom_in_tooltip: Feu zoom per veure les dades del mapa + map_notes_zoom_in_tooltip: Feu zoom per veure les notes del mapa layouts: + about: Informació community: Comunitat community_blogs: Blocs de comunitat community_blogs_title: Blocs dels membres de la comunitat OpenStreetMap - copyright: Drets d'autor i llicència - documentation: Documentació - documentation_title: Documentació del projecte + copyright: Drets d'autor + data: Dades donate: Suport OpenStreetMap %{link} el fons de rampa de maquinari. - donate_link_text: donatius edit: Modificació edit_with: Modifica amb %{editor} export: Exporta - export_tooltip: Exporta les dades del mapa + export_data: Exporta les dades foundation: Fundació foundation_title: La Fundació OpenStreetMap gps_traces: Traces de GPS - gps_traces_tooltip: Gestiona registres GPS + gps_traces_tooltip: Gestiona les traces GPS help: Ajuda - help_centre: Centre d'ajuda - help_title: Lloc d'ajuda per al projecte history: Historial - home: Inici - home_tooltip: Vés a la posició inicial - inbox: safata d'entrada (%{count}) - inbox_tooltip: - one: Teniu 1 missatge sense llegir - other: Teniu %{count} missatges sense llegir - zero: No teniu cap missatge sense llegir - intro_1: L'OpenStreetMap és un mapa editable i lliure de tot el món. Està fet per gent com vós. + home: Anar a la localització de casa intro_2_create_account: Crea un compte d'usuari - intro_2_download: baixada - license: - title: Les dades de l'OpenStreetMap es troben sota la llicència Creative Commons Reconeixement-Compartir Igual 2.0 genèrica - log_in: inicia una sessió + intro_header: Benvinguts a l'OpenStreetMap! + intro_text: L'OpenStreetMap és un mapa del món, creat per persones com tu i d'ús lliure sota una llicència oberta. + learn_more: Aprèn-ne més + log_in: Inicia sessió log_in_tooltip: Inicia una sessió amb un compte existent logo: alt_text: logotip de l'OpenStreetMap - logout: surt - logout_tooltip: Sortir + logout: Tancar sessió make_a_donation: text: Feu una donació title: Ajudeu l'OpenStreetMap amb una donació econòmica + more: Més osm_offline: La base de dades OpenStreetMap és fora de línia, mentre es fan actuacions de manteniment necessàries. osm_read_only: La base de dades OpenStreetMap actualment és en el mode read-only mentre que les actuacions de manteniment essencials de base de dades es porta a terme. - sign_up: registre + partners_bytemark: Allotjament Bytemark + partners_html: L'allotjament és a càrrec de %{ucl}, %{ic}, %{bytemark} i d'altres %{partners}. + partners_ic: Imperial College Londres + partners_partners: socis + partners_ucl: el Centre UCL VR + project_name: + h1: OpenStreetMap + title: OpenStreetMap + sign_up: Registre sign_up_tooltip: Crea un usuari per editar - sotm2011: Veniu a la conferència de OpenStreetMap de 2011, L'estat del mapa, 9-11 de setembre a Denver! + start_mapping: Començar a cartografiar tag_line: El mapa wiki lliure mundial - user_diaries: DIaris de usuari + user_diaries: Diaris de usuari user_diaries_tooltip: Mostra els diaris d'usuari - view: Mostra - view_tooltip: Mostra el mapa - welcome_user: Benvingut/da, %{user_link} - welcome_user_link_tooltip: La teva pàgina d'usuari - wiki: Wikia - wiki_title: Lloc web de wiki per al projecte license_page: foreign: english_link: l'original en anglès - text: En cas de conflicte entre aquesta pàgina traduïda i %{english_original_link}, la pàgina en anglès tindrà prioritat + text: En cas de conflicte entre aquesta pàgina traduïda i %{english_original_link}, la pàgina en anglès té prioritat title: Quant a la traducció - legal_babble: "

    Drets d'autor i llicència

    \n

    \n OpenStreetMap és obrir dades, concedeix una llicència sota el Creative\n Llicència Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \n Vostè és lliure de copiar, distribuir, transmetre i adaptar-se a nostres mapes\n i les dades, sempre que li doni crèdit OpenStreetMap i la seva\n col. laboradors. Si alterar o construir sobre els nostres mapes o dades, vostè\n distribuir el resultat només sota la mateixa llicència. La\n Full legal\n codi explica els seus drets i responsabilitats.\n

    \n\n

    Com a crèdit OpenStreetMap

    \n

    \n Si està utilitzant imatges de mapa de OpenStreetMap, us preguem que\n el seu crèdit llegeix com a mínim \"© OpenStreetMap\n col. laboradors, CC BY-SA\". Si està utilitzant les dades de mapa només\n demanem \"mapa dades © OpenStreetMap col·laboradors\n CC BY-SA\".\n

    \n

    \n Sempre que sigui possible, OpenStreetMap ha de ser un hipervincle a http://www.openstreetmap.org/\n i CC BY-SA a http://creativecommons.org/licenses/by-sa/2.0/. Si\n està utilitzant un mitjà on enllaços no són possibles (per exemple, un\n treball impresa), us suggerim que directa als seus lectors a\n www.OpenStreetMap.org (potser per l'ampliació\n 'OpenStreetMap' a aquesta adreça completa) i a\n www.creativecommons.org.\n

    \n\n

    Saber-ne més

    \n

    \n Llegiu més informació sobre com utilitzar les nostres dades a les Legal\n PREGUNTES MÉS FREQÜENTS.\n

    \n

    \n Col. laboradors OSM se li va recordar mai per afegir les dades des de qualsevol\n drets d'autor fonts (p. ex. Google Maps o mapes impreses) sense\n permís explícit dels titulars del copyright.\n

    \n

    \n Encara que OpenStreetMap és oberts les dades, no podem oferir un\n mapa de Free-of-charge API per a desenvolupadors de tercera festa.\n\n Consulti la nostra Política d'ús de l'API\n Política d'ús de rajoles\n i política d'ús de Nominatim.\n

    \n\n

    Nostres col. laboradors

    \n

    \n La nostra llicència CC BY-SA requereix que \"doni l'Original\n Autor de crèdit raonable per al suport i mitjà que ets\n utilització\". No tornis a sol·licitar individuals dibuixants de mapes de OSM un\n de crèdit més enllà de que a \"OpenStreetMap\n col. laboradors\", però on les dades des d'un mapatge Nacional\n Agència o l'altra font important ha estat inclòs en\n OpenStreetMap, pot ser raonable per crèdit per directament\n reproduir el seu crèdit o per vincular-hi d'aquesta pàgina.\n

    \n\n\n\n
      \n
    • Austràlia: conté dades suburbi basats\n en les dades d'Austràlia Oficina d'estadístiques.
    • \n
    • Àustria: conté dades de\n Stadt Wien sota\n CC BY.
    • \n
    • Canadà: conté dades de\n GeoBase ®, GeoGratis (© Departament de Natural\n Recursos Canadà), CanVec (© Departament de Natural\n Recursos Canadà) i StatCan (Divisió de Geografia,\n Canadà de Estadístiques).
    • \n
    • França: conté dades d'origen de\n Direcció Générale des Impôts.
    • \n
    • Nova Zelanda: conté dades d'origen de\n Informació Nova Zelanda de la terra. Corona de drets d'autor reservat.
    • \n
    • Polònia: conté dades de mapes de UMP-pcPL. Drets d'autor\n Col. laboradors de la UMP-pcPL.
    • \n
    • Regne Unit: conté cartografia\n Enquesta dades © Crown copyright i base de dades correcte\n 2010.
    • \n
    \n\n

    \n Inclusió de dades en OpenStreetMap no implica que l'original\n el proveïdor de dades recolza OpenStreetMap, proporciona cap garantia, o\n accepta qualsevol responsabilitat.\n

    " + legal_babble: + attribution_example: + alt: Exemple de com atribuir OpenStreetMap a una pàgina web + title: Exemple d'atribució + contributors_at_html: "Àustria: conté dades de\n Stadt Wien sota\n CC BY." + contributors_ca_html: "Canadà: conté dades de\n GeoBase ®, GeoGratis (© Departament de Natural\n Recursos Canadà), CanVec (© Departament de Natural\n Recursos Canadà) i StatCan (Divisió de Geografia,\n Canadà de Estadístiques)." + contributors_fi_html: "Finlàndia: Conté dades de la base de dades topogràfica del National Land Survey of Finland i d'altres bases de dades, sota la llicència NLSFI." + contributors_footer_1_html: "Per a més detalls sobre aquesta i d'altres fonts que han estat utilitzades per millorar els mapes d'OpenStreetMap, si us plau, vegeu al wiki d'OSM la pàgina dedicada als Col·laboradors" + contributors_footer_2_html: "Inclusió de dades en OpenStreetMap no implica que l'original\n el proveïdor de dades recolza OpenStreetMap, proporciona cap garantia, o\n accepta qualsevol responsabilitat." + contributors_fr_html: "França: conté dades d'origen de\n Direcció Générale des Impôts." + contributors_gb_html: "Regne Unit: conté dades del\nOrdnance Survey © Drets d'autor de la Corona i de la base de dades\n2010-12." + contributors_intro_html: "Els nostres col·laboradors són milers de persones. També incloem dades amb llicència oberta de les agències públiques de cartografia i d'altres fonts, entre elles:" + contributors_nl_html: "Països Baixos: Conté © dades d'Automotive Navigation Data (AND), 2007 (www.and.com)" + contributors_nz_html: "Nova Zelanda: conté dades d'origen de\n Informació Nova Zelanda de la terra. Corona de drets d'autor reservat." + contributors_title_html: Nostres col. laboradors + contributors_za_html: "Sud-àfrica: conté dades del\nChief Directorate:\nNational Geo-Spatial Information, drets d'autor reservat per l'estat." + credit_1_html: "Exigim que l'atribució de drets d'autor sigui “© Col·laboradors d'OpenStreetMap\n”." + credit_2_html: També heu de deixar clar que les dades són disponibles sota llicència obereta, i si s'utilitzen les nostres tessel·les de mapes, que la cartografia és llicenciada com CC-BY-SA. Podeu fer això enllaçant a aquest pàgina de copyright. D'altra banda, i com a requisit obligatori si voleu distribuir OSM en forma de dades en brut, podeu citar i enllaçar directament a la llicència. En el cas d'utilitzar suports on els enllaços d'hipertext no són possibles (per exemple, obres impreses), us suggerim d'adreçar els lectors a openstreetmap.org (potser indicant l'adreça completa d'OpenStreetMap), a opendatacommons.org i si s'escau, a creativecommons.org. + credit_3_html: "En el cas d'un mapa electrònic navegable, els crèdits han d'aparèixer a la cantonada del mapa.\nPer exemple:" + credit_title_html: Com a crèdit OpenStreetMap + infringement_1_html: Recordem als col·laboradors de l'OSM que mai no s'han d'afegir dades de cap font amb drets d'autor registrats (com Google Maps o mapes impresos per exemple) sense tenir una autorització explícita dels titulars dels drets d'autor. + infringement_2_html: Si penseu que hi ha material protegit per drets d'autor que ha estat afegit a la base de dades d'OpenStreetMap o a aquest web, si us plau aneu a la pàgina web dedicada al Procediment per eliminar dades protegides pels drets d'autor o empleneu aquest formulari en línia.. + infringement_title_html: Violació dels drets d'autor + intro_1_html: "Les dades d'OpenStreetMap són un conjunt de dades obertes publicades sota una llicència de base de dades oberta (ODbL)." + intro_2_html: "Sou lliure de copiar, distribuir, comunicar públicament i fer-ne obres \nderivades de les nostres dades, sempre que atribuïu els crèdits a \nOpenStreetMap i els seus col·laboradors. Si modifiqueu o utilitzeu les\nnostres dades fer fer obres derivades, només podreu distribuir l'obra \nresultant amb la mateixa llicència. Aquest \ntext legal\ncode sencer que explica detalladament els vostres drets i responsabbilitats." + intro_3_html: "La cartografia de les nostres tessel·les i la nostra documentació són ofertes\nsota llicència Text de la llicència de Creative Commons Reconeixement-Compartir Igual 2.0(CC-BY-SA)." + more_1_html: "Llegiu més informació sobre com utilitzar les nostres dades a les Preguntes\nFreqüents sobre legalitat." + more_2_html: Encara que les dades d'OpenStreetMap són dades obertes, no podem oferir una API gratuïta per als desenvolupadors de terceres parts. Vegeu la Política d'ús de l'API, la Política d'ús de les tessel·les i la Política d'ús de Nominatim. + more_title_html: Saber-ne més + title_html: Drets d'autor i llicència native: - mapping_link: Inici d'assignació - native_link: versió THIS_LANGUAGE_NAME_HERE + mapping_link: Inicia el mapatge + native_link: versió català text: Esteu veient la versió anglesa de la pàgina de drets d'autor. Podeu tornar a la %{native_link} d'aquesta pàgina o podeu deixar de llegir sobre el copyright i anar a %{mapping_link}. title: Sobre aquesta pàgina message: delete: - deleted: Missatge esborrat + deleted: Missatge suprimit inbox: date: Data from: De @@ -993,55 +1122,82 @@ ca: my_inbox: El meu %{inbox_link} no_sent_messages: Encara no has enviat cap missatge. Per què no entrar en contacte amb alguns dels %{people_mapping_nearby_link}? outbox: sortida - people_mapping_nearby: Cartografia de prop la gent + people_mapping_nearby: gent propera que cartografia subject: Assumpte title: Sortida to: A read: - back_to_inbox: Torna a la safata d'entrada - back_to_outbox: Torna a la safata de sortida + back: Enrere date: Data from: De - reading_your_messages: S'estan llegint els missatges - reading_your_sent_messages: S'estan llegint els missatges enviats reply_button: Respon subject: Assumpte title: Llegeix el missatge to: Per a unread_button: Marca com a no llegit - wrong_user: Heu iniciat la sessió com "%{user}", però el missatge que han demanat a llegir a no va ser enviat o dirigit a aquest usuari. Si us plau connecti's com l'usuari correcte per a llegir-lo. + wrong_user: Heu iniciat la sessió com a "%{user}", però el missatge que proveu de llegir a no va ser enviat o adreçat a aquest usuari. Si us plau connecteu-vos com l'usuari correcte per poder llegir-ho. reply: wrong_user: Heu iniciat la sessió com "%{user}", però el missatge que han demanat de respondre a no s'ha enviat a aquest usuari. Si us plau connecti's com l'usuari correcte per a respondre. sent_message_summary: delete_button: Suprimeix + note: + description: + closed_at_by_html: Resolt fa %{when} per %{user} + closed_at_html: Resolt fa %{when} + commented_at_by_html: Actualitzat fa %{when} per %{user} + commented_at_html: Actualitzat fa %{when} + opened_at_by_html: Creat fa %{when} per %{user} + opened_at_html: Creat fa %{when} + reopened_at_by_html: Reactivat fa %{when} per %{user} + reopened_at_html: Reactivat fa %{when} + entry: + comment: Comentari + full: Nota sencera + mine: + ago_html: fa %{when} + created_at: Creat a + creator: Creador + description: Descripció + heading: notes de %{user} + id: Id + last_changed: Últim canvi + subheading: Notes enviades o comentades per %{user} + title: Notes enviades o comentades per %{user} + rss: + closed: nota tancada (aprop de %{place}) + commented: nou comentari (prop de %{place}) + description_area: Una llista de notes, reportades, comentades o bé tancades a la vostra àrea [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Un canal rss per la nota %{id} + opened: Nota nova (a prop %{place}) + reopened: Nota reactivada (prop de %{place}) + title: Notes de OpenStreetMap notifier: diary_comment_notification: footer: També podeu llegir el comentari a les %{readurl} i es pot comentar als %{commenturl} o respondre a les %{replyurl} - header: "%{from_user} ha comentat en el seu recent entrada del diari OpenStreetMap amb el tema %{subject}:" + header: "%{from_user} ha comentat en la vostra recent entrada del diari OpenStreetMap amb el tema %{subject}:" hi: Hola %{to_user}, - subject: "[OpenStreetMap] %{user}, va comentar sobre la seva entrada del diari" + subject: "[OpenStreetMap] %{user}, va comentar sobre la vostra entrada del diari" email_confirm: subject: "[OpenStreetMap] Confirmeu l'adreça de correu" email_confirm_html: click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç sota per confirmar el canvi. greeting: Hola, - hopefully_you: Algú (esperem que vostè) vol canviar la seva adreça d'e-mail a %{server_url} per %{new_address}. + hopefully_you: Algú (esperem que vostè) vol canviar la vostra adreça electrònica a %{server_url} per %{new_address}. email_confirm_plain: - click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç sota per confirmar el canvi. + click_the_link: Si sou vós mateix, feu clic a l'enllaç inferior per confirmar el canvi. greeting: Hola, - hopefully_you_1: Algú (esperem que vós mateix) vol canviar l'adreça de correu a - hopefully_you_2: "%{server_url} a %{new_address}." + hopefully_you: Algú (esperem que vostè) vol canviar la vostra adreça electrònica a %{server_url} per %{new_address}. friend_notification: befriend_them: També el podeu afegir com a amic a %{befriendurl}. - had_added_you: "%{user} t'ha afegit com a amic a OpenStreetMap." + had_added_you: "%{user} us ha afegit com a amic a l'OpenStreetMap." see_their_profile: Podeu veure el seu perfil a %{userurl}. - subject: "[OpenStreetMap] %{user} t'ha afegit a la llista d'amics" + subject: "[OpenStreetMap] %{user} us ha afegit a la llista d'amics" gpx_notification: and_no_tags: i cap etiqueta. and_the_tags: "i les etiquetes següents:" failure: failed_to_import: "no es pot importar. Aquí està l'error:" - more_info_1: Més informació en relació a GPX d'importació fracassos i com evitar + more_info_1: Més informació en relació a errades d'importació GPX i com evitar-les more_info_2: "ells es pot trobar a:" subject: "[OpenStreetMap] Error d'importació de GPX" greeting: Hola, @@ -1053,76 +1209,79 @@ ca: lost_password: subject: "[OpenStreetMap] Sol·licitud de reinicialització de contrasenya" lost_password_html: - click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç de sota per restaurar la seva contrasenya. + click_the_link: Si sou vós, feu clic a l'enllaç de sota per restaurar la vostra contrasenya. greeting: Hola, hopefully_you: Algú (possiblement vostè) ha demanat per a la contrasenya restaurar el compte de openstreetmap.org d'aquesta adreça de correu electrònic. lost_password_plain: click_the_link: Si això és vostè, si us plau, feu clic a l'enllaç de sota per restaurar la seva contrasenya. greeting: Hola, - hopefully_you_1: Algú (possiblement vostè) ha demanat per a la contrasenya restaurar en això - hopefully_you_2: adreces d'e-mail openstreetmap.org compte. + hopefully_you: Algú (possiblement vostè) ha demanat que la contrasenya d'aquest compte d'openstreetmap.org li siga reiniciada a la vostra adreça de correu electrònic. message_notification: - footer1: També podeu llegir el missatge a %{readurl} - footer2: i el pots replicar a %{replyurl} + footer_html: També podeu llegir el missatge a %{readurl} i podeu respondre'l a %{replyurl} header: "%{from_user} ha enviat un missatge a través de OpenStreetMap amb el tema %{subject}:" hi: Hola %{to_user}, + note_comment_notification: + anonymous: Un usuari anònim + closed: + commented_note: "%{commenter} ha resolt una nota de mapa en la qual has comentat. Aquesta nota és aprop de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha solucionat una nota que t'interessa" + subject_own: "[OpenStreetMap] %{commenter} ha solucionat una de les teves notes" + your_note: "%{commenter} ha resolt una de les notes de mapa a prop %{place}." + commented: + commented_note: "%{commenter} ha fet un comentari en una nota de mapa a la qual has comentat. Aquesta nota és aprop de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha comentat en una nota la qual teniu interès" + subject_own: "[OpenStreetMap] %{commenter} ha comentat en una de les teves notes" + your_note: "%{commenter} ha fet un comentari en una de les teves notes del mapa aprop de %{place}." + details: Podeu trobar més detalls de la nota a %{url}. + greeting: Hola, + reopened: + commented_note: "%{commenter} ha reactivat una nota de mapa en la qual hi heu comentat. La nota és a prop de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha reactivat una nota en que vostè està interessat" + subject_own: "[OpenStreetMap] %{commenter} ha reactivat una de les vostres notes" + your_note: "%{commenter} ha reactivat una de les notes de mapa a prop %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirmeu la vostra adreça electrònica" - signup_confirm_html: - ask_questions: Podeu fer qualsevol pregunta que tingueu sobre l'OpenStreetMap al nostre lloc de preguntes i respostes. - click_the_link: Si això és vostè, Benvingut! Si us plau, feu clic a l'enllaç de sota per confirmar que compte i seguiu llegint per obtenir més informació sobre OpenStreetMap - current_user: "Una llista d'usuaris actuals en categories, basades en on en el món que són, està disponible des de Categoria: Users_by_geographical_region." - get_reading: Obtenir de lectura sobre OpenStreetMap al wiki, posarà al dia amb les últimes notícies via OpenStreetMap bloc o Twittero navegar a través de OpenStreetMap fundador Steve Costa OpenGeoData blog per a la breu història del projecte, que disposa de podcasts d'escoltar ! - greeting: Hola, què tal? - hopefully_you: Algú (esperem que vostè) would com crear un compte per a les - introductory_video: Podeu veure un %{introductory_video_link}. - more_videos: Hi ha %{more_videos_link}. - more_videos_here: més de vídeos aquí - user_wiki_page: "Es recomana que es crea una pàgina de wiki de l'usuari, que inclou Etiquetes de categoria assenyalant on estàs, com [[Categoria: Users_in_London]]." - video_to_openstreetmap: vídeo d'introducció a OpenStreetMap - wiki_signup: Vostè també pot inscriure s a la wiki OpenStreetMap. - signup_confirm_plain: - ask_questions: "Pot fer qualsevol pregunta que tingui sobre OpenStreetMap a les nostres preguntes i lloc de resposta:" - blog_and_twitter: "Posarà al dia amb les últimes notícies via el blog de OpenStreetMap o Twitter:" - click_the_link_1: Si això és vostè, Benvingut! Si us plau, feu clic a l'enllaç sota per confirmar el seu - click_the_link_2: compte i seguiu llegint per obtenir més informació sobre OpenStreetMap. - current_user_1: Una llista d'usuaris actuals en categories, basades en on en el món - current_user_2: "ells són, està disponible des de:" - greeting: Hola, què tal? - hopefully_you: Algú (creiem que vós mateix) vol crear un compte per a les - introductory_video: "Podeu veure un vídeo d'introducció a OpenStreetMap aquí:" - more_videos: "Hi ha més videos aquí:" - opengeodata: "OpenGeoData.org és blog fundador OpenStreetMap Steve Costa, i té podcasts també:" - the_wiki: "Obtenir llegint sobre OpenStreetMap al wiki:" - user_wiki_1: Es recomana que es crea una pàgina de wiki de l'usuari, que inclou - user_wiki_2: "Categoria Etiquetes assenyalant on es troba, com [[Categoria: Users_in_London]]." - wiki_signup: "Vostè també pot inscriure s a la wiki OpenStreetMap a:" + confirm: "Primer de tot hem de confirmar que aquesta petició ha estat feta per vostè, si ha estat així, si us plau, premeu sobre el següent enllaç per tal confirmar la vostra petició de creació del compte d'usuari:" + created: Algú (suposem que vós mateix) acaba de crear un compte a %{site_url}. + greeting: Hola! + subject: "[OpenStreetMap] Benvinguts a OpenStreetMap" + welcome: Després que confirmis el teu compte, et donarem més informació per tal que puguis començar amb els coneixements bàsics. oauth: oauthorize: - allow_read_gpx: llegir el seu privats traces GPS. + allow_read_gpx: llegir les vostres traces GPS privades. allow_read_prefs: llegiu les vostres preferències d'usuari. allow_to: "Permet la sol·licitud de client per:" allow_write_api: modificar el mapa. allow_write_diary: crear entrades de diari, comentaris i fer amics. allow_write_gpx: carregar traces GPS. - allow_write_prefs: modificar les seves preferències d'usuari. - request_access: L'aplicació %{app_name} sol·licita accés al seu compte, %{user}. Si us plau marqui si vostè would com l'aplicació té les següents capacitats. Vostè pot triar tantes o tan poc com vulgui. + allow_write_notes: modificar les notes. + allow_write_prefs: modificar les preferències d'usuari. + request_access: L'aplicació %{app_name} sol·licita accés al vostre compte, %{user}. Marqueu si voleu autoritzar l'aplicació amb les següents funcions. Podeu triar les que vulgueu. + title: Autoritzar l'accés al vostre compte + oauthorize_failure: + denied: Heu denegat que l'aplicació %{app_name} accedeixi al vostre compte. + invalid: El testimoni d’autorització no és vàlid. + title: Sol·licitud d'autorització errònia + oauthorize_success: + allowed: Heu permès que l'aplicació %{app_name} accedeixi al vostre compte. + title: Sol·licitud d'autorització permesa + verification: El codi de verificació és %{code}. revoke: flash: He estat revocat el testimoni per %{application} oauth_clients: create: - flash: Registrar la informació amb èxit + flash: La informació s'ha enregistrat correctament destroy: - flash: Destruït la matrícula d'aplicació de client + flash: S'ha destruït el registre de l'aplicació client edit: submit: Modificació - title: Editar la seva aplicació + title: Editar la vostra aplicació form: allow_read_gpx: llegir les seves traces GPS privats. allow_read_prefs: llegir les seves preferències d'usuari. allow_write_api: modificar el mapa. allow_write_diary: crear entrades de diari, comentaris i fer amics. allow_write_gpx: carregar traces GPS. + allow_write_notes: modifcar les notes. allow_write_prefs: modificar les seves preferències d'usuari. callback_url: Resposta d'URL name: Nom @@ -1133,61 +1292,95 @@ ca: index: application: Nom d'aplicació issued_at: Emès A - list_tokens: "Les fitxes següents s'han emès per aplicacions en el seu nom:" + list_tokens: "Les fitxes següents s'han emès per aplicacions en el vostre nom:" my_apps: Meves aplicacions de Client my_tokens: Meves aplicacions autoritzada - no_apps: Té una aplicació que li agradaria inscriure's per al seu ús amb nosaltres utilitzant l'estàndard %{oauth}? Heu de registrar la seva aplicació web abans que pugui fer peticions OAuth a aquest servei. - register_new: Registrar-se l'aplicació + no_apps: ¿Teniu cap aplicació que voldríeu inscriure per usar amb nosaltres utilitzant l'estàndard %{oauth}? Heu de registrar la vostra aplicació web abans que pugui fer peticions OAuth a aquest servei. + register_new: Registreu l'aplicació registered_apps: "Teniu les següents aplicacions client registrades:" revoke: Revoca! title: Les meves dades OAuth new: - submit: Registrar-se + submit: Registre title: Registrar-se una nova aplicació not_found: sorry: Ho sento, no s'ha pogut trobar el %{type}. show: access_url: "Accés Fitxa URL:" allow_read_gpx: llegir les seves traces GPS privats. - allow_read_prefs: llegir les seves preferències d'usuari. + allow_read_prefs: llegir les vostres preferències d'usuari. allow_write_api: modificar el mapa. allow_write_diary: crear entrades de diari, comentaris i fer amics. allow_write_gpx: carregar traces GPS. - allow_write_prefs: modificar les seves preferències d'usuari. + allow_write_notes: modificar les notes + allow_write_prefs: modificar les vostres preferències d'usuari. authorize_url: "Autoritza URL:" + confirm: N'esteu segur? + delete: Suprimeix el client edit: Edita els detalls key: "Clau de consum:" requests: "Sol·licitar els permisos següents des de l'usuari:" secret: "Secret de consum:" - support_notice: Donem suport a HMAC-SHA1 (recomanat), així com text sense format en el mode de ssl. + support_notice: Suportem les signatures de tipus HMAC-SHA1 (recomanat) i RSA-SHA1. title: OAuth detalls per %{app_name} - url: "Sol. licitud Token URL:" + url: "Sol·licitud Token URL:" update: flash: La informació de client ha actualitzat correctament + printable_name: + with_version: "%{id}, v%{version}" + redaction: + create: + flash: Redacció creada + destroy: + error: Ha hagut un error en suprimir aquesta redacció. + flash: Redacció suprimida + not_empty: La redacció no és buida. Si us plau, desfeu totes les versions que pertanyen a aquesta redacció abans de destruir-la. + edit: + description: Descripció + heading: Modifica la redacció + submit: Desa la redacció + title: Modifica la redacció + index: + empty: No hi ha redaccions a mostrar. + heading: Llista de redaccions + title: Llista de redaccions + new: + description: Descripció + heading: Introduïu informació per una nova redacció + submit: Crea una redacció + title: Creant una nova redacció + show: + confirm: N'esteu segur? + description: "Descripció:" + destroy: Suprimeix aquesta redacció + edit: Modifica aquesta redacció + heading: Mostrant la redacció "%{title}" + title: Mostrant la redacció + user: "Autor:" + update: + flash: Modificacions desades site: edit: anon_edits_link_text: Esbrina perquè aquest és el cas. flash_player_required: Necessiteu intèrpret de Flash per utilitzar el Potlatch, l'editor de l'OpenStreetMap. Podeu baixar el pluguin de Flash des del web Adobe.com. També hi ha altres opcions per editar l'OpenStreetMap. + id_not_configured: iD no s'ha configurat no_iframe_support: El navegador no suporta iframes HTML, que són necessàries per a aquesta funcionalitat. - not_public: No ha posat les modificacions per ser públic. - not_public_description: Ja no es pot editar el mapa a menys que vostè fer-ho. Pot configurar les modificacions com a públic del seu %{user_page}. + not_public: No heu fet les configuracions necessàries per tal que les vostres modificacions siguin públiques. + not_public_description: Ja no podeu modificar el mapa a menys que feu públics els vostres canvis. Podeu configurar les modificacions com a públiques a la vostra %{user_page}. potlatch2_not_configured: No s'ha configurat el Potlatch 2 - vegeu 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, heu de fer clic a "desa".) potlatch_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al Potlatch, heu de desseleccionar la via o el punt actual, si esteu en l'edicó en viu, o fer clic a "desa", si teniu un botó "desa".) user_page_link: pàgina d'usuari index: + createnote: Afegiu una nota js_1: Tampoc està utilitzant un navegador que no suporta JavaScript o té deshabilitat JavaScript. - js_2: L'OpenStreetMap utilitza JavaScript per al mapa slippy. + js_2: L'OpenStreetMap utilitza JavaScript per al mapa lliscant. license: - license_name: Creative Commons Reconeixement-Compartir Igual 2.0 - notice: Llicenciat sota la llicència %{license_name} per %{project_name} i els seus contribuents. - project_name: projecte OpenStreetMap + copyright: Copyright d'OpenStreetMap i els seus col·laboradors sota llicència oberta permalink: Enllaç permanent - remote_failed: Edició ha fallat - assegureu-vos que JOSM o Merkaartor es carrega i l'opció de comandament a distància és habilitat + remote_failed: L'edició ha fallat - assegureu-vos que el JOSM, o el Merkaartor, esta executant-se i que l'opció de comandament a distància està habilitatada shortlink: Enllaç curt key: - map_key: Llegenda - map_key_tooltip: Llegenda del mapa table: entry: admin: Límits administratius @@ -1196,7 +1389,7 @@ ca: - Davantal de l'Aeroport - terminal bridge: Embolcall negre = bridge - bridleway: Bridleway + bridleway: Camí de ferradura brownfield: Lloc Brownfield building: Edifici significatiu byway: Byway @@ -1242,7 +1435,7 @@ ca: station: Estació de tren subway: Metro summit: - - Cimera + - Cim - pic tourist: Atracció turística track: Pista @@ -1254,9 +1447,25 @@ ca: unclassified: Carretera sense classificar unsurfaced: Unsurfaced road wood: Fusta + markdown_help: + alt: Text alternatiu + first: Primer element + heading: Encapçalament + headings: Encapçalaments + image: Imatge + link: Enllaç + ordered: Llista ordenada + second: Segon element + subheading: Subencapçalament + text: Text + title_html: Analitzat amb Markdown + unordered: Llista sense ordenar + url: URL + richtext_area: + edit: Modifica + preview: Previsualització search: search: Cerca - search_help: "exemples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' o 'oficines de correus a prop Lünen' més exemples..." submit_text: Vés-hi where_am_i: On sóc? where_am_i_title: Descriu la localització actual fent servir el motor de cerca @@ -1268,10 +1477,15 @@ ca: friendly: "%e %B %Y a les %H.%M" trace: create: - trace_uploaded: El seu arxiu GPX s'ha pujat i està pendent d'inserció a la base de dades. Això passarà en general dins d'una mitja hora, i s'enviarà un correu electrònic a vostè en finalitzar. + trace_uploaded: El fitxer GPX s'ha pujat i està pendent d'inserció a la base de dades. Això passarà en general dins d'una mitja hora, i se us enviarà un correu electrònic en finalitzar. upload_trace: Pujar traça de GPS delete: - scheduled_for_deletion: Water programat per a la supressió + scheduled_for_deletion: Track programat per a ser suprimit + description: + description_with_count: + one: fitxer GPX amb %{count} punt de %{user} + other: fitxer GPX amb %{count} punts de %{user} + description_without_count: Fitxer GPX de %{user} edit: description: "Descripció:" download: descàrrega @@ -1281,24 +1495,28 @@ ca: map: mapa owner: "Propietari:" points: "Punts:" - save_button: Guardar canvis + save_button: Desa els canvis start_coord: "Coordenada d'inici:" tags: "Etiquetes:" - tags_help: separat per comas + tags_help: separat per comes title: Editant traça %{name} uploaded_at: "Pujat a:" visibility: "Visibilitat:" visibility_help: Què vol dir això? + georss: + title: Traces GPS d'OpenStreetMap list: + description: Navega pels tracks pujats recentment + empty_html: Aquí encara no hi ha res. Pujeu un nou track o apreneu més sobre els tracks GPS a la pàgina wiki. public_traces: Traces GPS públiques - public_traces_from: Públics traces GPS de %{user} + public_traces_from: Tracks GPS públics de %{user} tagged_with: " etiquetat amb %{tags}" - your_traces: Les vosres traces GPS + your_traces: Les vostres traces GPS make_public: - made_public: Water fet públic + made_public: Traça feta pública offline: heading: GPX emmagatzematge fora de línia - message: Al GPX d'emmagatzematge i carregar sistema d'arxiu no està disponible actualment. + message: L'emmagatzematge i el sistema de pujada de fitxers GPX no són operatius actualment. offline_warning: message: El sistema de càrrega de fitxers GPX no està disponible actualment trace: @@ -1310,12 +1528,12 @@ ca: identifiable: IDENTIFICABLE in: a map: mapa - more: mes + more: més pending: PENDENT private: PRIVAT - public: PUBLIC + public: PÚBLIC trace_details: Mostra els detalls de la traça - trackable: RASTREABLE + trackable: RASTREJABLE view_map: Visualitza el mapa trace_form: description: "Descripció:" @@ -1329,16 +1547,18 @@ ca: trace_header: see_all_traces: Mostra totes les traces see_your_traces: Mostra totes les vostres traces - traces_waiting: Teniu %{count} traces esperant en cua per a pujar. Considereu esperar a que aquestes traces acabin abans de pujar-ne més, així no blocareu la cua per a altres usuaris. + traces_waiting: + one: Teniu %{count} traça esperant en cua per a pujar. Considereu esperar a que aquesta traça acabi abans de pujar-ne més, així no blocareu la cua per a altres usuaris. + other: Teniu %{count} traces esperant en cua per a pujar. Considereu esperar a que aquestes traces acabin abans de pujar-ne més, així no blocareu la cua per a altres usuaris. upload_trace: Puja una traça trace_optionals: tags: Etiquetes trace_paging_nav: - next: Següent » - previous: « Anterior - showing_page: S'està mostrant pàgina %{page} + newer: Tracks més recents + older: Traces més antigues + showing_page: Pàgina %{page} view: - delete_track: Elimina aquesta traça + delete_track: Suprimeix aquesta traça description: "Descripció:" download: baixada edit: modificació @@ -1350,7 +1570,7 @@ ca: owner: "Propietari:" pending: PENDENT points: "Punts:" - start_coordinates: "coordenada de inici:" + start_coordinates: "coordenada d'inici:" tags: "Etiquetes:" title: S'està mostrant la traça %{name} trace_not_found: No s'ha trobat la traça! @@ -1358,7 +1578,7 @@ ca: visibility: "Visibilitat:" visibility: identifiable: Identifiable (mostrat en llista de traça i com a punts d'identificació, ordenades amb timestamps) - private: Privat (només compartit com anònims, desordenada punts) + private: Privat (només compartit com anònim, el punts són desordenats) public: Públic (mostrat en llista de traça i com anònims, desordenada punts) trackable: Seguiments (només compartit com punts anònims, ordenades amb timestamps) user: @@ -1369,12 +1589,16 @@ ca: heading: "Termes de col·laboració:" link text: què és això? not yet agreed: Que han no encara s'ha accedit a les noves condicions de col. laborador. - review link text: Si us plau, seguiu aquest enllaç a la seva conveniència de revisar i acceptar els termes de col. laborador nou. + review link text: Seguiu aquest enllaç pel vostre interès per revisar i acceptar els termes de col·laborador nou. current email address: "Adreça de correu electrònic actual:" delete image: Suprimeix la imatge actual email never displayed publicly: (no es mostrarà mai en públic) flash update success: Informació de l'usuari ha actualitzat correctament. - flash update success confirm needed: Informació de l'usuari ha actualitzat correctament. Comprovi el seu e-mail per a una nota per confirmar la seva adreça de correu electrònic nou. + flash update success confirm needed: Informació de l'usuari ha actualitzat correctament. Comproveu el vostre correu per confirmar la vostra adreça de correu electrònic nova. + gravatar: + gravatar: Usa Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: què és això? home location: "Ubicació inicial:" image: "Imatge:" image size hint: (Plaça imatges com a mínim 100 x 100 treball millor) @@ -1410,13 +1634,13 @@ ca: update home location on click: Localització de casa d'actualització quan faig clic al mapa? confirm: already active: Aquest compte ja ha estat confirmat. - before you start: Sabem que vostè està probablement en una pressa per començar a mapatge, però abans de fer que t'agradaria omplir una mica més informació sobre si mateix en el formulari a continuació. button: Confirma - heading: Confirmar un compte d'usuari - press confirm button: Premeu el botó de confirmar sota per activar el seu compte. - reconfirm: Si ha estat una estona ja que s'inscrivia podria necessitar enviar-se un nou correu electrònic de confirmació. - success: Confirmar el seu compte, gràcies per registrar-te! - unknown token: Aquesta mostra no sembla que hi ha. + heading: Comprova el teu correu electrònic + introduction_1: T'hem enviat un correu de confirmació. + introduction_2: Confirma el teu compte clicant a l'enllaç que es troba al correu que t'hem enviat i ja podràs començar a editar el mapa. + press confirm button: Premeu el botó de confirmar sota per activar el compte. + reconfirm_html: Si necessites que et reenviem el correu de confirmació, clica aquí. + unknown token: Aquest codi de confirmació ha expirat o no existeix. confirm_email: button: Confirma failure: Una adreça de correu electrònic ja ha estat confirmat amb aquesta fitxa. @@ -1425,25 +1649,25 @@ ca: success: S'ha confirmat l'adreça electrònica, gràcies per registrar-vos-hi! confirm_resend: failure: L'usuari %{name} no s'ha trobat. - success: Hem enviat un bitllet de confirmació nou per %{email} i tan aviat com vostè confirmar el seu compte es podrà aconseguir d'assignació.

    Si utilitzeu un sistema que envia les sol·licituds de confirmació llavors si us plau fer segur whitelist webmaster@openstreetmap.org com som capaços de respondre a qualsevol sol·licituds de confirmació. + success: Hem enviat un bitllet de confirmació nou per %{email} i tan aviat com confirmeu el vostre compte podreu cartografiar.

    Si utilitzeu un sistema contra el correu brossa que envia les sol·licituds de confirmació, llavors autoritzeu webmaster@openstreetmap.org ja que no som capaços de respondre les sol·licituds de confirmació. filter: not_an_administrator: Cal que sigueu administrador per dur a terme aquesta acció. go_public: - flash success: Ara totes les teves edicions són públiques i ja estàs autoritzat per a editar + flash success: Ara totes les vostres edicions són públiques i ja teniu autorització per editar list: confirm: Confirmar usuaris seleccionats empty: No hi ha usuaris que coincideixin s'ha trobat heading: Usuaris hide: Amaga els usuaris seleccionats showing: - one: "mostrant pàgina %{page} (%{first_item} de %{items}) " - other: Mostrant pàgina %{page} (%{first_item}-%{last_item} de %{items}) + one: Pàgina %{page} (%{first_item} de %{items}) + other: Pàgina %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} creat a partir de %{ip_address} el %{date}" summary_no_ip: "%{name} creat el %{date}" title: Usuaris login: account is suspended: Ho sentim, s'ha suspès el vostre compte per presentar una activitat sospitosa.
    Contacteu amb el webmestre si voleu parlar-ne. - account not active: Ho sentim, el teu compte encara no està actiu.
    Si us plau utilitzi l'enllaç a l'e-mail de confirmació de compte d'activar el seu compte, o demanar un nou correu electrònic de confirmació. + account not active: Ho sentim, el vostre compte encara no és actiu.
    Utilitzeu l'enllaç al correu de confirmació per activar el vostre compte, o demanar un nou correu electrònic de confirmació. auth failure: Ho sentim, no podeu registrar-vos amb aquesta informació. create account minute: Crear un compte. Només es triga un minut. email or username: "Adreça de correu o usuari:" @@ -1452,75 +1676,75 @@ ca: lost password link: Heu perdut la contrasenya? new to osm: Nou a OpenStreetMap? no account: No teniu cap compte? - notice: Esbrinar més sobre el canvi de llicència futura de OpenStreetMap (traduccions) (discussió) - notice_terms: "L'OpenStreetMap farà servir una altra llicència a partir de l'1 d'abril de 2012. És tan oberta com l'actual, però els seus detalls legals s'adeqüen millor a la nostra base de dades de mapes.\nEns agradaria conservar les vostres contribucions a l'OpenStreetMap, però només podem fer-ho si esteu d'acord en distribuir-les sota la llicència nova. Sinó, no podem fer altra cosa que suprimir-les de la base de dades.

    Inicieu una sessió i dediqueu uns pocs segons a revisar-ho i acceptar els nous termes. Moltes gràcies!" openid: "%{logo} OpenID:" - openid invalid: Ho sentim, el seu OpenID sembla ser no vàlida - openid missing provider: Ho sento, podria no en contacte amb el seu proveïdor d'OpenID + openid invalid: Ho sentim, la vostra OpenID sembla ser no vàlida + openid missing provider: Ho sento, no podem contactar amb el vostre proveïdor d'OpenID openid_logo_alt: Inicia sessió amb un compte OpenID openid_providers: aol: - alt: Connecti's amb un AOL OpenID - title: Connecti's amb AOL + alt: Inicia sessió amb un AOL OpenID + title: Inicia sessió amb AOL google: - alt: Connecti's amb un OpenID de Google - title: Connecti's amb Google + alt: Inicia sessió amb un OpenID de Google + title: Inicia sessió amb Google myopenid: - alt: Connecti's amb un myOpenID OpenID - title: Connecti's amb myOpenID + alt: Inicia sessió amb un myOpenID OpenID + title: Inicia sessió amb myOpenID openid: - alt: Connecti's amb un URL d'OpenID - title: Connecti's amb OpenID + alt: Inicia sessió amb un URL d'OpenID + title: Inicia sessió amb OpenID wordpress: - alt: Connecti's amb un Wordpress OpenID - title: Connecti's amb Wordpress + alt: Inicia sessió amb un Wordpress OpenID + title: Inicia sessió amb Wordpress yahoo: - alt: Connecti's amb un OpenID Yahoo - title: Connecti's amb Yahoo + alt: Inicia sessió amb un OpenID Yahoo + title: Inicia sessió amb Yahoo password: "Contrasenya:" register now: Registreu-vos-hi ara remember: "Recorda'm:" title: Accés to make changes: Per fer canvis a les dades de OpenStreetMap, ha de tenir un compte. - with openid: "Alternativament, si us plau utilitzi el seu OpenID per connectar-se:" + with openid: "Alternativament, utilitzeu el vostre OpenID per iniciar sessió:" with username: "Ja teniu un compte de l'OpenStreetMap? Incieu sessió amb el nom d'usuari i contrasenya:" logout: - heading: Finalitza la sessió d'OpenStreetMap - logout_button: Finalitza la sessió - title: Finalitza la sessió + heading: Tanca la sessió d'OpenStreetMap + logout_button: Tanca la sessió + title: Tanca la sessió lost_password: email address: "Adreça de correu electrònic:" heading: Heu oblidat la contrasenya? help_text: Introduïu l'adreça de correu electrònic que va utilitzar per registrar-se, us enviarem un enllaç a ella que pot utilitzar per restablir la contrasenya. new password button: Restableix la contrasenya - notice email cannot find: Podria no trobar que l'e-mail adreçar, ho sento. - notice email on way: Trist que perdia:-(però un correu electrònic està en camí així pot restaurar això aviat. + notice email cannot find: Podria no trobar aquesta adreça de correu. + notice email on way: Lamentem que l'hàgiu perdut :-( però us hem enviat un correu, així podreu restaurar-la ràpidament. title: contrasenya perduda make_friend: - already_a_friend: Que ja són amics amb %{name}. + already_a_friend: Que ja sou amics amb %{name}. + button: Afegeix als amics failed: Ho sentim, no afegir %{name} com un amic. - success: "%{name} ara és el vostre amic." + heading: Voleu afegir %{user} com un amic? + success: "%{name} és ara el vostre amic!" new: + about: + header: Lliure i editable + html: "

    A diferència d'altres mapes, OpenStreetMap ha estat completament creat per gent com vostè\n i està obert a qualsevol modificació, actualització, descàrrega i utilització.

    \n

    Registreu-vos i començeu a contribuir. Us enviarem un e-mail per confirmar el vostre compte.

    " confirm email address: "Confirmeu l'adreça de correu electrònic:" confirm password: "Confirmeu la contrasenya:" contact_webmaster: Contacteu amb el webmestre per gestionar la creació d'un compte - intentarem tractar la sol·licitud tan aviat com sigui possible. - continue: Continua + continue: Crear un compte display name: "Nom visible:" display name description: El nom d'usuari que es motrarà públicament. El podeu canviar més endavant a les preferències. email address: "Adreça de correu:" - fill_form: Ompliu el formulari i us enviarem un correu electrònic per activar el vostre compte. - flash create success message: Gràcies per registrar-se. Hem enviat un bitllet de confirmació a %{email} i tan aviat com vostè confirmar el seu compte es podrà aconseguir d'assignació.

    Si utilitzeu un sistema que envia les sol·licituds de confirmació llavors si us plau fer segur whitelist webmaster@openstreetmap.org com som capaços de respondre a qualsevol sol·licituds de confirmació. - heading: Crea un compte d'usuari license_agreement: Quan confirmeu el compte, heu d'acceptar els termes de col·laboracio. no_auto_account_create: No us podem crear automàticament un compte. not displayed publicly: No es mostrarà públicament (vegeu la política de privacitat) openid: "%{logo} OpenID:" - openid association: "

    El seu OpenID encara no està associat a un compte de OpenStreetMap.

    \n
      \n
    • Si sou nou a l'OpenStreetMap, creeu un compte utilitzant el formulari següent.
    • \n
    • \n Si ja teniu un compte, podeu iniciar sessió amb el vostre compte\n utilitzant el nom d'usuari i contrasenya i aleshores associeu el compte\n amb el vostre compte OpenID a les preferències d'usuari.\n
    • \n
    " + openid association: "

    El vostre OpenID encara no està associat a un compte de OpenStreetMap.

    \n
      \n
    • Si sou nou a l'OpenStreetMap, creeu un compte utilitzant el formulari següent.
    • \n
    • \n Si ja teniu un compte, podeu iniciar sessió amb el vostre compte\n utilitzant el nom d'usuari i contrasenya i aleshores associeu el compte\n amb el vostre compte OpenID a les preferències d'usuari.\n
    • \n
    " openid no password: Amb l'OpenID no es requereix contrasenya, però algunes eines extres o el servidor encara poden necessitar-la. password: "Contrasenya:" terms accepted: Gràcies per a l'acceptació de les condicions de col. laborador nou! terms declined: Lamentem que vostè ha decidit no acceptar els nous termes de col. laborador. Per a més informació, si us plau vegi aquesta pàgina de wiki. - title: Crea un compte + title: Crear un compte use openid: Alternativament, utilitzeu %{logo} OpenID per iniciar sessió no_such_user: body: No hi ha cap usuari amb el nom %{user}. Comproveu l'ortografia, o potser l'enllaç on heu fet clic és incorrecte. @@ -1528,23 +1752,25 @@ ca: title: Aquest usuari no existeix popup: friend: Amic - nearby mapper: L'Assignador proper + nearby mapper: «Mapador» proper your location: La vostra ubicació remove_friend: + button: Suprimeix dels amics + heading: Voleu suprimir %{user} dels amics? not_a_friend: "%{name} no és un dels seus amics." success: "%{name} s'ha suprimit dels teus amics." reset_password: confirm password: "Confirmeu la contrasenya:" flash changed: S'ha canviat la contrasenya. flash token bad: No ha trobat que comproven token, l'URL potser? - heading: Restablir la contrasenya per %{user} + heading: Restableix la contrasenya per %{user} password: "Contrasenya:" reset: Restableix la contrasenya - title: Restablir la contrasenya + title: Restableix la contrasenya set_home: flash success: Localització de casa desat correctament suspended: - body: "

    \n Ho sentim, el seu compte ha estat automàticament suspès a causa de\n l'activitat sospitosa.\n

    \n

    \n Aquesta decisió serà revisat per un administrador en breu, o\n es pot contactar amb el %{webmaster} si vostè desitja discutir això.\n

    " + body: "

    \n El vostre compte ha estat automàticament suspès a causa de\n l'activitat sospitosa.\n

    \n

    \n Aquesta decisió serà revisat per un administrador en breu, o\n es pot contactar amb el %{webmaster} si desitgeu discutir això.\n

    " heading: Compte suspès title: Compte suspès webmaster: per a administradors web @@ -1565,12 +1791,12 @@ ca: you need to accept or decline: Llegiu i després accepteu o rebutgeu els termes per a nous col·laboradors per continuar. view: activate_user: activa aquest usuari - add as friend: afegeix com a amic + add as friend: Afegeix com a amic ago: (fa %{time_in_words_ago}) - block_history: mostra els blocs rebuts - blocks by me: blocs per mi - blocks on me: blocs en mi - comments: comentaris + block_history: blocs rebuts + blocks by me: Blocs fets per mi + blocks on me: Blocs sobre mi + comments: Comentaris confirm: Confirma confirm_user: confirma aquest usuari create_block: bloca aquest usuari @@ -1582,30 +1808,35 @@ ca: deactivate_user: desactiva aquest usuari delete_user: Suprimeix aquest usuari description: Descripció - diary: diari - edits: modificacions + diary: Diari + edits: Modificacions email address: "Adreça de correu:" - friends_changesets: Navega per tots els conjunts de canvis dels vostres amics - friends_diaries: Navega totes les entrades de diari dels amics + friends_changesets: conjunts de canvis dels vostres amics + friends_diaries: entrades de diari dels amics hide_user: amagar aquest usuari - if set location: Si establiu la vostra ubicació, un mapa força i matèria es mostrarà aquí. Podeu configurar la vostra ubicació de casa a la seva pàgina %{settings_link}. + if set location: Podeu configurar la vostra ubicació a la pàgina %{settings_link} per veure els usuaris propers a vostè. km away: "%{count}km de distància" latest edit: "Última edició %{ago}:" m away: "%{count}m de distància" - mapper since: "Mapejant des de:" - moderator_history: mostra els blocs donats - my diary: el meu diari - my edits: les meves edicions - my settings: les meves preferències - my traces: les meves traces + mapper since: "Cartografiant des de:" + moderator_history: blocs donats + my comments: Els meus comentaris + my diary: El meu diari + my edits: Les meves edicions + my messages: Els meus missatges + my notes: Les meves notes de mapa + my profile: El meu perfil + my settings: Les meves preferències + my traces: Les meves traces nearby users: Altres usuaris propers - nearby_changesets: Navega tots els conjunts de canvis dels usuaris propers - nearby_diaries: Navega totes les entrades de diari dels usuaris propers + nearby_changesets: conjunts de canvis dels usuaris propers + nearby_diaries: entrades de diari dels usuaris propers new diary entry: Nova entrada del diari no friends: No has afegit cap amics encara. - no nearby users: Hi ha altres usuaris que admetre a Cartografia prop encara. + no nearby users: Encra no hi ha cap altre usuari reconegui cartografiar prop. + notes: Notes de mapa oauth settings: configuració OAuth - remove as friend: elimina com a amic + remove as friend: Deixa l'amistat role: administrator: Aquest usuari és administrador grant: @@ -1615,11 +1846,11 @@ ca: revoke: administrator: Revocar l'accés d'administrador moderator: Revocar l'accés de moderador - send message: envia el missatge + send message: Envia el missatge settings_link_text: preferències spam score: "Spam Puntuació:" status: "Estat:" - traces: traces + traces: Traces unhide_user: Inamagui's d'aquest usuari user location: Ubicació de l'usuari your friends: Els vostres amics @@ -1629,7 +1860,7 @@ ca: heading: Llista de blocs %{name} title: Blocs %{name} blocks_on: - empty: "%{name} no ha estat bloquejat encara." + empty: "%{name} no ha estat blocat encara." heading: Llista de quadres a %{name} title: Blocs en %{name} create: @@ -1660,14 +1891,14 @@ ca: non_moderator_revoke: Ha de ser un moderador per crear o un bloc d'actualització. non_moderator_update: Ha de ser un moderador per crear o un bloc d'actualització. new: - back: Veure tots els blocs + back: Mostra tots els blocs heading: Creació de bloc %{name} needs_view: L'usuari necessita connectar-se abans que aquest bloqueig es suprimeixi - period: Quant de temps, a partir d'ara, l'usuari es bloqueja des de l'API. - reason: La raó per què està sent bloquejat %{name}. Si us plau, estigui tan tranquil i tan raonable com sigui possible, donant tant detall com sigui possible sobre la situació, recordant que el missatge serà visible públicament. Tingueu en compte que no tots els usuaris comprenen l'argot de la comunitat, així que si us plau, intenti utilitzar termes de comuns. + period: Quant de temps, a partir d'ara, l'usuari es bloca des de l'API. + reason: La raó per què està sent blocat %{name}. Manteniu la tranquil·litat i sigueu raonable com sigui possible, donant tants detalls com sigui possible sobre la situació, recordeu que el missatge serà visible públicament. Tingueu en compte que no tots els usuaris comprenen l'argot de la comunitat, així que intenteu utilitzar termes de comuns. submit: Crear bloc title: Creació de bloc %{name} - tried_contacting: Em vaig posar en contacte amb l'usuari i li vaig demanar que s'atures. + tried_contacting: Em vaig posar en contacte amb l'usuari i li vaig demanar que s'aturés. tried_waiting: Li he donat una quantitat raonable de temps a l'usuari per a respondre a aquestes comunicacions. not_found: back: Torna a l'índex @@ -1677,11 +1908,14 @@ ca: creator_name: Creador display_name: S'ha blocat l'usuari edit: Modifica + next: Endavant » not_revoked: (no revocat) + previous: « Enrere reason: Motiu del blocatge revoke: Revoca! revoker_name: Revocat per show: Mostra + showing_page: Pàgina %{page} status: Estat period: one: 1 hora @@ -1690,7 +1924,7 @@ ca: confirm: Esteu segur que voleu revocar aquest bloc? flash: Aquest bloc ha estat revocat. heading: Revocació de bloc en %{block_on} %{block_by} - past: Aquest bloc va acabar fa %{time} i no pot ser revocat ara. + past: Aquest blocatge va acabar fa %{time} i no pot ser revocat ara. revoke: Revoca! time_future: Aquest bloc va a acabar en %{time}. title: Revocació de bloc en %{block_on} @@ -1706,7 +1940,7 @@ ca: show: Mostra status: Estat time_future: Finalitza en %{time} - time_past: Va acabar %{time} fa + time_past: Va acabar fa %{time} title: "%{block_on} bloquejat per %{block_by}" update: only_creator_can_edit: Només el moderador que ha creat aquest bloc pot editar-lo. @@ -1729,3 +1963,25 @@ ca: fail: No s'ha pogut revocar el paper "%{role}" des de l'usuari "%{name}". Si us plau, comproveu que l'usuari i el paper són vàlids. heading: Confirmar revocació de rol title: Confirmar revocació de rol + welcome_page: + add_a_note: + paragraph_1_html: Si només voleu fer una petita modificació però no disposeu del temps per registrar-vos i aprendre com editar, deixeu una nota al mapa. + paragraph_2_html: "Només cal que us dirigiu almapa i cliqueu l'icona de la nota: . Això afegirà un marcador al mapa que podeu moure arrossegant-lo. Afegiu el vostre missatge, cliqueu el botó de desat, i altres usuaris ho investigaran." + title: No tens temps per editar? Afegeix una nota! + basic_terms: + editor_html: Un editor és un programa o pàgina web que pots utilitzar per editar el mapa. + node_html: Un node és un punt al mapa, com ara un restaurant o un arbre. + paragraph_1_html: l'OpenStreetMap té algunes paraules del seu propi argot. Aquí hi han unes quantes paraules clau que et poden venir bé. + tag_html: Una etiqueta és un recull de dades sobre un node o una via, com ara el nom d'un restaurant o la velocitat màxima d'una carretera. + title: Condicions bàsiques per editar el mapa + way_html: Una via és una línia o àrea, com ara una carretera, sèquia, llac o edifici. + introduction_html: Us donem la benvinguda a l'OpenStreetMap, el mapa lliure i editable del món. Ara que ja us heu registrat, ja ho teniu tot a punt per començar a editar el mapa. Aquí hi ha una guia ràpida amb les coses més importants que cal saber + questions: + paragraph_1_html: OpenStreetMap té multitud de recursos per conèixer aquest projecte, per plantejar i respondre preguntes, i per participar en discussions col·laboratives i documentar temes de cartografia. Visiteu l'ajuda. + title: Alguna pregunta més? + start_mapping: Comença a editar el mapa + title: Benvingut! + whats_on_the_map: + off_html: El que no inclou són dades subjectives com ara puntuacions, característiques històriques o hipotètiques i dades de fonts subjectes a copyright. A no ser que posseeixis un permís especial no copiïs res de mapes de paper o en línia. + on_html: L'OpenStreetMap és un lloc per incloure al mapa coses que són reals i normals- això inclou milions d'edificis, carreteres, i altres detalls sobre llocs. Pots cartografiar totes les característiques del món real que et semblin interessants. + title: Què hi ha al mapa diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f726c51073e..057f75f47e2 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1,18 +1,37 @@ -# Messages for Czech (česky) +# Messages for Czech (čeština) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Bilbo +# Author: Chmee2 +# Author: DemonioCZ +# Author: JAn Dudík # Author: Jezevec # Author: Jkjk # Author: Kuvaly # Author: Luk # Author: Masox +# Author: Matěj Grabovský +# Author: Michaelbrabec # Author: Mormegil # Author: Mr. Richard Bolla +# Author: Nemo bis +# Author: Paxt # Author: Reaperman # Author: Tchoř # Author: Veritaslibero cs: + about_page: + community_driven_html: "Komunita OpenStreetMap je různorodá, vášnivá a každý den se rozrůstá. Mezi našimi přispěvateli najdete amatérské kreslíře map, profesionály z oblasti GIS, techniky spravující servery OSM, humanitární pracovníky mapující oblasti zasažené neštěstím a mnohé další.\nPokud se chcete o komunitě dozvědět více, prohlédněte si uživatelské deníčky, komunitní blogy a webovou stránku nadace OSM Foundation." + community_driven_title: Řízeno komunitou + copyright_html: ©přispěvatelé
    OpenStreetMap + lede_text: OpenStreetMap tvoří komunita uživatelů, kteří přidávají a udržují data o silnicích, cestách, kavárnách, železničních stanicích a mnohém dalším po celém světě. + local_knowledge_html: OpenStreetMap klade důraz na místní znalost. Přispěvatelé využívají letecké snímky, GPS přístroje a klasické mapy, aby ověřili, že OSM je přesné a aktuální. + local_knowledge_title: Místní znalost + next: Další + open_data_html: "OpenStreetMap tvoří otevřená data: smíte je užívat pro libovolný účel, pokud uvádíte autorství OpenStreetMap a jeho přispěvatelů. Pokud data měníte nebo rozšiřujete jistými způsoby, smíte výsledek šířit jen pod stejnou licencí. Podrobnosti najdete na stránce Autorská práva a licence." + open_data_title: Otevřená data + partners_title: Partneři + used_by: Díky %{name} fungují mapová data na stovkách webových stránek, mobilních aplikací a hardwarových zařízení activerecord: attributes: diary_comment: @@ -39,7 +58,7 @@ cs: public: Veřejná size: Velikost user: Uživatel - visible: Viditelnost + visible: Viditelný user: active: Aktivní description: Popis @@ -63,10 +82,10 @@ cs: old_node: Starý uzel old_node_tag: Starý tag uzlu old_relation: Stará relace - old_relation_member: Starý člen relace - old_relation_tag: Starý tag relace + old_relation_member: Člen staré relace + old_relation_tag: Tag staré relace old_way: Stará cesta - old_way_node: Starý uzel cesty + old_way_node: Uzel staré cesty old_way_tag: Starý tag cesty relation: Relace relation_member: Člen relace @@ -90,164 +109,85 @@ cs: blocked: Váš přístup k API byl zablokován. Další informace zjistíte přihlášením do webového rozhraní. need_to_see_terms: Váš přístup k API byl dočasně zablokován. Přihlašte se prosím do webového rozhraní a přečtěte si Podmínky pro přispěvatele. Nemusíte je odsouhlasit, musíte si je ale zobrazit. browse: + anonymous: anonym changeset: - changeset: "Sada změn: %{id}" + belongs_to: Autor changesetxml: Soubor změn XML - download: Stáhnout %{changeset_xml_link} nebo %{osmchange_xml_link} feed: title: Sada změn %{id} title_comment: "Sada změn: %{id} - %{comment}" + node: Uzly (%{count}) + node_paginated: Uzly (%{x}–%{y} z %{count}) osmchangexml: osmChange XML - title: Sada změn - changeset_details: - belongs_to: "Patří uživateli:" - bounding_box: "Rozsah:" - box: rám - closed_at: "Uzavřeno v:" - created_at: "Vytvořeno v:" - has_nodes: - few: "Obsahuje následující %{count} uzly:" - one: "Obsahuje následující uzel:" - other: "Obsahuje následujících %{count} uzlů:" - has_relations: - few: "Obsahuje následující %{count} relace:" - one: "Obsahuje následující relaci:" - other: "Obsahuje následujících %{count} relací:" - has_ways: - few: "Obsahuje následující %{count} cesty:" - one: "Obsahuje následující cestu:" - other: "Obsahuje následujících %{count} cest:" - no_bounding_box: K této sadě změn nebyl uložen rozsah. - show_area_box: Zobrazit ohraničení oblasti - common_details: - changeset_comment: "Komentář:" - deleted_at: "Smazáno:" - deleted_by: "Smazal:" - edited_at: "Upraveno v:" - edited_by: "Upravil:" - in_changeset: "V sadě změn:" - version: "Verze:" + relation: Relace (%{count}) + relation_paginated: Relace (%{x}–%{y} z %{count}) + title: "Sada změn: %{id}" + way: Cesty (%{count}) + way_paginated: Cesty (%{x}–%{y} z %{count}) + closed: Uzavřeno + closed_by_html: Uzavřel před %{time} uživatel %{user} + closed_html: Uzavřeno před %{time} containing_relation: entry: Relace %{relation_name} entry_role: Relace %{relation_name} (jako %{relation_role}) - map: - deleted: Smazáno - edit: - area: Upravit oblast - node: Upravit uzel - relation: Upravit relaci - way: Upravit cestu - larger: - area: Zobrazit oblast na větší mapě - node: Zobrazit uzel na větší mapě - relation: Zobrazit relaci na větší mapě - way: Zobrazit cestu na větší mapě - loading: Načítá se… - navigation: - all: - next_changeset_tooltip: Další sada změn - next_node_tooltip: Následující uzel - next_relation_tooltip: Následující relace - next_way_tooltip: Následující cesta - prev_changeset_tooltip: Předchozí sada změn - prev_node_tooltip: Předchozí uzel - prev_relation_tooltip: Předchozí relace - prev_way_tooltip: Předchozí cesta - user: - name_changeset_tooltip: Zobrazit úpravy od %{user} - next_changeset_tooltip: Další úprava od %{user} - prev_changeset_tooltip: Předešlá úprava od %{user} + created: Vytvořeno + created_by_html: Vytvořil před %{time} %{user} + created_html: Vytvořeno před %{time} + deleted_by_html: Smazáno před %{time} uživatelem %{user} + download_xml: Stáhnout XML + edited_by_html: Upraveno před %{time} uživatelem %{user} + in_changeset: Sada změn + location: "Pozice:" + no_comment: (bez komentáře) node: - download: "%{download_xml_link}, %{view_history_link} nebo %{edit_link}" - download_xml: Stáhnout XML - edit: upravit - node: Uzel - node_title: "Uzel: %{node_name}" - view_history: zobrazit historii - node_details: - coordinates: "Souřadnice:" - part_of: "Součást:" - node_history: - download: "%{download_xml_link} nebo %{view_details_link}" - download_xml: Stáhnout XML - node_history: Historie uzlu - node_history_title: "Historie uzlu: %{node_name}" - view_details: zobrazit detaily + history_title: "Historie uzlu: %{name}" + title: "Uzel: %{name}" not_found: - sorry: Promiňte, ale %{type} s id %{id} nebylo možné nalézt. + sorry: "Promiňte, ale %{type} #%{id} nebylo možné nalézt." type: changeset: sada změn node: uzel relation: relace way: cesta - paging_nav: - of: z - showing_page: Zobrazuji stranu + note: + closed_by: Vyřešil před %{when} %{user} + closed_by_anonymous: Vyřešil před %{when} anonym + closed_title: "Vyřešená poznámka #%{note_name}" + commented_by: Před %{when} okomentoval %{user} + commented_by_anonymous: Před %{when} okomentoval anonym + hidden_by: Skryl před %{when} %{user} + hidden_title: "Skrytá poznámka #%{note_name}" + new_note: Nová poznámka + open_by: Vytvořil %{user} před %{when} + open_by_anonymous: Vytvořil anonym před %{when} + open_title: "Nevyřešená poznámka #%{note_name}" + reopened_by: Reaktivoval před %{when} %{user} + reopened_by_anonymous: Reaktivoval před %{when} anonym + title: "Poznámka: %{id}" + part_of: Součást redacted: + message_html: Verzi %{version} tohoto objektu %{type} nelze zobrazit, protože byla skryta. Více informací uvádí stránka %{redaction_link}. + redaction: Redakce %{id} type: node: uzel relation: relace way: cesta relation: - download: "%{download_xml_link} nebo %{view_history_link}" - download_xml: Stáhnout XML - relation: Relace - relation_title: "Relace: %{relation_name}" - view_history: zobrazit historii - relation_details: - members: "Členové:" - part_of: "Součást:" - relation_history: - download: "%{download_xml_link} nebo %{view_details_link}" - download_xml: Stáhnout XML - relation_history: Historie relace - relation_history_title: "Historie relace: %{relation_name}" - view_details: zobrazit detaily + history_title: "Historie relace: %{name}" + members: Prvky + title: "Relace: %{name}" relation_member: entry_role: "%{type} %{name} jako %{role}" type: node: Uzel relation: Relace way: Cesta - start: - manually_select: Ručně vybrat jinou oblast - view_data: Ukázat data k zobrazené mapě start_rjs: - data_frame_title: Data - data_layer_name: Procházet mapová data - details: Detaily - drag_a_box: Myší na mapě označte zvolenou oblast - edited_by_user_at_timestamp: Upravil [[user]] dne [[timestamp]] - hide_areas: Schovat oblasti - history_for_feature: Historie pro [[feature]] + feature_warning: Načítá se %{num_features} prvků, což může váš prohlížeč zpomalit či zablokovat. Určitě chcete tato data zobrazit? load_data: Nahrát data - loaded_an_area_with_num_features: Máte načtenu oblast, která obsahuje [[num_features]] prvků. Některé prohlížeče mohou mít potíže při zobrazování takového množství dat. Obecně fungují prohlížeče nejlépe při zobrazování ne více než sta prvků současně – větší množství může způsobit, že bude prohlížeč reagovat pomalu či vůbec. Pokud jste si jisti, že chcete tato data zobrazit, klikněte na tlačítko níže. loading: Načítá se… - manually_select: Ručně vybrat jinou oblast - object_list: - api: Získat tuto oblast pomocí API - back: Zobrazit seznam objektů - details: Detaily - heading: Seznam objektů - history: - type: - node: Uzel [[id]] - way: Cesta [[id]] - selected: - type: - node: Uzel [[id]] - way: Cesta [[id]] - type: - node: Uzel - way: Cesta - private_user: anonym - show_areas: Zobrazit oblasti - show_history: Zobrazit historii - unable_to_load_size: "Nelze načíst: Rozměr [[bbox_size]] je příliš velký (maximum je %{max_bbox_size})" - wait: Čekejte... - zoom_or_select: Zvolte větší měřítko nebo vyberte nějakou oblast mapy tag_details: - tags: "Tagy:" + tags: Tagy wiki_link: key: Stránka s popisem značky %{key} na wiki tag: Stránka s popisem značky %{key}=%{value} na wiki @@ -259,38 +199,25 @@ cs: node: uzlu relation: relace way: cesty + version: Verze + view_details: Zobrazit detaily + view_history: Zobrazit historii way: - download: "%{download_xml_link}, %{view_history_link} nebo %{edit_link}" - download_xml: Stáhnout XML - edit: upravit - view_history: zobrazit historii - way: Cesta - way_title: "Cesta: %{way_name}" - way_details: also_part_of: - one: patří také do cesty %{related_ways} - other: patří také do cest %{related_ways} - nodes: "Uzly:" - part_of: "Součást:" - way_history: - download: "%{download_xml_link} nebo %{view_details_link}" - download_xml: Stáhnout XML - view_details: zobrazit detaily - way_history: Historie cesty - way_history_title: "Historie cesty: %{way_name}" + one: patří do cesty %{related_ways} + other: patří do cest %{related_ways} + history_title: "Historie cesty: %{name}" + nodes: Uzly + title: "Cesta: %{name}" changeset: changeset: anonymous: Anonymní - big_area: (velká) - no_comment: (žádný) no_edits: (žádné změny) - show_area_box: zobrazit ohraničení oblasti - still_editing: (stále se upravuje) view_changeset_details: Zobrazit detaily sady změn changeset_paging_nav: next: Následující » previous: « Předchozí - showing_page: Zobrazuji stranu %{page} + showing_page: Stránka %{page} changesets: area: Oblast comment: Komentář @@ -298,24 +225,17 @@ cs: saved_at: Uloženo v user: Uživatel list: - description: Poslední změny - description_bbox: Sady změn v %{bbox} - description_friend: Sady změn vašich přátel - description_nearby: Sady změn uživatelů poblíž - description_user: Sady změn uživatele %{user} - description_user_bbox: Sady změn uživatele %{user} v %{bbox} - heading: Sady změn - heading_bbox: Sady změn - heading_friend: Sady změn - heading_nearby: Sady změn - heading_user: Sady změn - heading_user_bbox: Sady změn + empty: Nebyly nalezeny žádné sady změn. + empty_area: Pro tuto oblast neexistují žádné sady změn. + empty_user: Tento uživatel nemá žádné sady změn. + load_more: Načíst další + no_more: Nebyly nalezeny žádné další sady změn. + no_more_area: Nebyly nalezeny žádné další sady změn pro tuto oblast. + no_more_user: Nebyly nalezeny žádné další sady změn tohoto uživatele. title: Sady změn - title_bbox: Sady změn v %{bbox} title_friend: Sady změn vašich přátel title_nearby: Sady změn uživatelů poblíž title_user: Sady změn uživatele %{user} - title_user_bbox: Sady změn uživatele %{user} v %{bbox} timeout: sorry: Omlouváme se, ale vámi požadovaný seznam sad změn se načítal příliš dlouho. diary_entry: @@ -336,6 +256,7 @@ cs: few: "%{count} komentáře" one: 1 komentář other: "%{count} komentářů" + zero: Bez komentářů comment_link: Okomentovat tento zápis confirm: Potvrdit edit_link: Upravit tento záznam @@ -366,11 +287,11 @@ cs: list: in_language_title: Deníčkové záznamy v jazyce %{language} new: Nový záznam do deníčku - new_title: Sepsat nový záznam do vašeho uživatelského deníčku + new_title: Vložit nový záznam do vašeho uživatelského deníčku newer_entries: Novější záznamy no_entries: Žádné záznamy v deníčku older_entries: Starší záznamy - recent_entries: "Aktuální deníčkové záznamy:" + recent_entries: Aktuální deníčkové záznamy title: Deníčky uživatelů title_friends: Deníčky přátel title_nearby: Deníčky uživatelů poblíž @@ -393,7 +314,10 @@ cs: title: Deníček uživatele %{user} | %{title} user_title: Deníček uživatele %{user} editor: - default: Výchozí (v současné době %{name}) + default: Výchozí (aktuálně %{name}) + id: + description: iD (editor v prohlížeči) + name: iD potlatch: description: Potlatch 1 (editor v prohlížeči) name: Potlatch 1 @@ -409,7 +333,7 @@ cs: area_to_export: Oblast k exportu embeddable_html: Vkládatelné HTML export_button: Export - export_details: Data OpenStreetMap jsou k dispozici pod licencí Creative Commons Uveďte autora-Zachovejte licenci 2.0. + export_details: Data OpenStreetMap jsou k dispozici pod licencí Open Data Commons Open Database License (ODbL). format: Formát format_to_export: Formát exportu image_size: Velikost obrázku @@ -425,29 +349,46 @@ cs: paste_html: Ke vložení na stránku použijte toto HTML scale: Měřítko too_large: - body: Tato oblast je pro export do XML formátu OpenStreetMap příliš velká. Přejděte na větší měřítko nebo zvolte menší oblast. - heading: Příliš velká oblast + advice: "Pokud se tento export nezdaří, zvažte použití jednoho z následujících zdrojů:" + body: "Tato oblast je pro export do XML formátu OpenStreetMap příliš velká. Přejděte na větší měřítko, zvolte menší oblast nebo použijte jeden z následujících zdrojů pro stahování velkého množství dat:" + geofabrik: + description: Pravidelně aktualizované extrakty kontinentů zemí a vybraných měst + title: Soubory Geofabrik + metro: + description: Extrakty pro hlavní světová města a jejich okolí + title: Extrakty Metro + other: + description: Další zdroje uvedené ve wiki OpenStreetMap + title: Další zdroje + overpass: + description: Stažení této oblasti z databázového zrcadla OpenStreetMap + title: Overpass API + planet: + description: Pravidelně aktualizované kopie kompletní databáze OpenStreetMap + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Přidat do mapy značku - change_marker: Změnit umístění značky - click_add_marker: Kliknutím do mapy vložíte značku - drag_a_box: Myší na mapě označte zvolenou oblast - export: Export - manually_select: Ručně vybrat jinou oblast - view_larger_map: Zobrazit větší mapu + title: Export + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Stačí kliknout na nebo na stejnou ikonku na zobrazené mapě.\nTím do mapy přidáte značku, kterou můžete přesunout tažením myší. Přidejte svou zprávu a klikněte na uložit a ostatní uživatelé se na to podívají." + join_the_community: + explanation_html: Pokud jste si všimli nějakého nedostatku našich mapových dat, např. chybějící silnice nebo vaše adresa, nejlepším řešením je připojit se ke komunitě OpenStreetMap a přidat nebo opravit data vlastnoručně. + title: Přidejte se ke komunitě + title: Jak pomoci + other_concerns: + explanation_html: "Pokud máte pochyby o používání našich dat nebo jejich obsahu, na naší\nstránce o autorských právech naleznete více právních informací, případně kontaktujte\npříslušnou pracovní skupinu OSMF." + title: Jiné problémy + title: Nahlásit problém / opravit mapu geocoder: description: title: geonames: Poloha podle GeoNames - osm_namefinder: "%{types} podle OpenStreetMap Namefinder" osm_nominatim: Poloha podle OpenStreetMap Nominatim types: cities: Velkoměsta places: Místa towns: Města - description_osm_namefinder: - prefix: "%{distance} na %{direction} od %{type}" direction: east: východ north: sever @@ -468,17 +409,26 @@ cs: title: ca_postcode: Výsledky z Geocoder.CA geonames: Výsledky z GeoNames + geonames_reverse: Výsledky z GeoNames latlon: Výsledky z interní databáze - osm_namefinder: Výsledky z OpenStreetMap Namefinder osm_nominatim: Výsledky z OpenStreetMap Nominatim + osm_nominatim_reverse: Výsledky z OpenStreetMap Nominatim uk_postcode: Výsledky z NPEMap / FreeThe Postcode us_postcode: Výsledky z Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} na %{parentdirection} od %{parentname})" - suffix_place: ", %{distance} na %{direction} od %{placename}" - suffix_suburb: "%{parentname} - %{suffix}" search_osm_nominatim: + admin_levels: + level10: Hranice čtvrti + level2: Státní hranice + level4: Hranice státu + level5: Hranice regionu + level6: Hranice okresu + level8: Hranice obce + level9: Hranice vesnice prefix: + aerialway: + chair_lift: Sedačková lanovka + drag_lift: Vlek + station: Stanice lanovky aeroway: aerodrome: Letiště apron: Odbavovací plocha @@ -496,6 +446,7 @@ cs: auditorium: Posluchárna bank: Banka bar: Bar + bbq: Místo na grilování bench: Lavička bicycle_parking: Parkoviště pro kola bicycle_rental: Půjčovna kol @@ -527,6 +478,7 @@ cs: ferry_terminal: Přístaviště přívozu fire_hydrant: Požární hydrant fire_station: Hasičská stanice + food_court: Občerstvení fountain: Fontána fuel: Čerpací stanice grave_yard: Hřbitov @@ -568,7 +520,9 @@ cs: shop: Obchod shopping: Nákupní centrum shower: Sprchy + social_centre: Společenské centrum social_club: Společenský klub + social_facility: Zařízení sociálních služeb studio: Studio supermarket: Supermarket swimming_pool: Bazén @@ -586,6 +540,7 @@ cs: youth_centre: Centrum pro mládež boundary: administrative: Administrativní hranice + census: Hranice pro potřeby sčítání national_park: Národní park protected_area: Chráněná oblast bridge: @@ -596,6 +551,9 @@ cs: "yes": Most building: "yes": Budova + emergency: + fire_hydrant: Požární hydrant + phone: Nouzový telefon highway: bridleway: Koňská stezka bus_guideway: Autobusová dráha @@ -617,8 +575,10 @@ cs: platform: Nástupiště primary: Silnice první třídy primary_link: Silnice první třídy + proposed: Navrhovaná silnice raceway: Závodní dráha residential: Ulice + rest_area: Odpočívadlo road: Cesta secondary: Silnice druhé třídy secondary_link: Silnice druhé třídy @@ -627,6 +587,7 @@ cs: speed_camera: Radar steps: Schody stile: Schůdky přes ohradu + street_lamp: Pouliční lampa tertiary: Silnice třetí třídy tertiary_link: Silnice třetí třídy track: Cesta @@ -642,6 +603,7 @@ cs: building: Budova castle: Hrad church: Kostel + citywalls: Městské hradby fort: Pevnost house: Dům icon: Ikona @@ -651,6 +613,7 @@ cs: monument: Pomník museum: Muzeum ruins: Zřícenina + tomb: Náhrobek tower: Věž wayside_cross: Boží muka wayside_shrine: Boží muka @@ -686,6 +649,7 @@ cs: reservoir_watershed: Povodí nádrže residential: Rezidenční oblast retail: Maloobchody + road: Cesty village_green: Náves vineyard: Vinice wetland: Mokřad @@ -695,6 +659,7 @@ cs: bird_hide: Ptačí pozorovatelna common: Obecní půda fishing: Rybářská oblast + fitness_station: Fitness garden: Zahrada golf_course: Golfové hřiště ice_rink: Kluziště @@ -716,6 +681,8 @@ cs: airfield: Vojenské letiště barracks: Kasárna bunker: Bunkr + mountain_pass: + "yes": Průsmyk natural: bay: Záliv beach: Pláž @@ -726,7 +693,7 @@ cs: crater: Kráter dune: Duna feature: Prvek - fell: See http://wiki.openstreetmap.org/wiki/Tag:natural=fell + fell: Fjell fjord: Fjord forest: Les geyser: Gejzír @@ -759,10 +726,15 @@ cs: wood: Neudržovaný les office: accountant: Účetní + architect: Architekt + company: Firma + employment_agency: Pracovní agentura estate_agent: Realitní kancelář government: Vládní úřad insurance: Pojišťovna lawyer: Právnická kancelář + ngo: Úřad nevládní organizace + telecommunication: Telekomunikační úřad travel_agent: Cestovní kancelář "yes": Kancelář place: @@ -780,6 +752,7 @@ cs: locality: Oblast moor: Bažina municipality: Obecní úřad + neighbourhood: Čtvrť postcode: PSČ region: Region sea: Moře @@ -805,8 +778,10 @@ cs: narrow_gauge: Úzkorozchodná dráha platform: Železniční nástupiště preserved: Historická železnice + proposed: Navrhovaná železnice spur: Železniční vlečka station: Železniční stanice + stop: Železniční zastávka subway: Stanice metra subway_entrance: Vstup do metra switch: Výhybka @@ -822,6 +797,7 @@ cs: beverages: Prodej nápojů bicycle: Cykloobchod books: Knihkupectví + boutique: Butik butcher: Řeznictví car: Prodej automobilů car_parts: Prodej autodílů @@ -835,6 +811,7 @@ cs: convenience: Smíšené zboží copyshop: Copycentrum cosmetics: Parfumerie + deli: Lahůdkářství department_store: Obchodní dům discount: Diskontní prodejna doityourself: Obchod pro kutily @@ -871,17 +848,21 @@ cs: organic: Prodej biopotravin outdoor: Outdoorový obchod pet: Prodejna pro chovatele + pharmacy: Lékárna photo: Prodejna foto salon: Salón + second_hand: Bazar shoes: Obuvnictví shopping_centre: Nákupní centrum sports: Prodejna pro sportovce stationery: Papírnictví supermarket: Supermarket + tailor: Krejčí toys: Hračkářství travel_agency: Cestovní kancelář video: Videopůjčovna, prodej DVD wine: Vinárna + "yes": Obchod tourism: alpine_hut: Vysokohorská chata artwork: Umělecké dílo @@ -904,6 +885,7 @@ cs: viewpoint: Místo s dobrým výhledem zoo: Zoo tunnel: + culvert: Propustek "yes": Tunel waterway: artificial: Umělý vodní kanál/průplav @@ -927,66 +909,117 @@ cs: water_point: Vodní bod waterfall: Vodopád weir: Jez + help_page: + help: + description: Položte dotaz nebo vyhledejte odpovědi na stránce otázek a odpovědí týkajících se OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap nabízí několik zdrojů pro informace o projektu, otázky a odpovědi a kolaborativní diskuse a dokumentace mapových témat. + title: Nápověda + welcome: + description: Začněte tímto rychlým průvodcem zahrnujícím základy OpenStreetMap. + title: Vítejte v OSM + url: /welcome + wiki: + description: Podrobnou dokumentaci OSM najdete na wiki. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs javascripts: + close: Zavřít + edit_help: Posuňte si mapu a zvětšete si místo, které chcete editovat, a klikněte zde. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda je dostupná pouze pro vrstvu Standardní map: base: cycle_map: Cyklomapa + hot: Humanitární mapquest: MapQuest Open standard: Standardní transport_map: Dopravní mapa + copyright: © přispěvatelé OpenStreetMap + donate_link_text: + layers: + data: Mapová data + header: Mapové vrstvy + notes: Poznámky k mapě + overlays: Zapnout vrstvy pro ladění mapy + title: Vrstvy + locate: + popup: Jste do {distance} {unit} od tohoto bodu + title: Ukázat moji polohu + zoom: + in: Přiblížit + out: Oddálit + notes: + new: + add: Přidat poznámku + intro: Abychom vylepšili mapu, zobrazí se vámi zadané informace ostatním tvůrcům, takže buďte při umisťování značky a zadávání poznámky co nejvíce podrobní a přesní. + show: + anonymous_warning: Tato poznámka zahrnuje komentáře anonymních uživatelů, které by se měly nezávisle ověřit. + comment: Okomentovat + comment_and_resolve: Okomentovat a vyřešit + hide: Skrýt + reactivate: Reaktivovat + resolve: Vyřešit + share: + cancel: Storno + center_marker: Vycentrovat mapu na značku + custom_dimensions: Nastavit vlastní rozměry + download: Stáhnout + embed: HTML + format: "Formát:" + image: Obrázek + image_size: Na obrázku bude standardní vrstva v + include_marker: Vložit značku + link: Odkaz nebo HTML + long_link: Odkaz + paste_html: HTML ke vložení na webovou stránku + scale: "Měřítko:" + short_link: Krátký odkaz + short_url: Krátké URL + title: Sdílet + view_larger_map: Zobrazit větší mapu site: + createnote_disabled_tooltip: Pro přidání poznámky přejděte na větší měřítko + createnote_tooltip: Přidat do mapy poznámku edit_disabled_tooltip: Pro editaci mapy přejděte na větší měřítko edit_tooltip: Upravit mapu - edit_zoom_alert: Upravovat mapu můžete jen ve větším přiblížení - history_disabled_tooltip: Pro zobrazení editací této oblasti přejděte na větší měřítko - history_tooltip: Zobrazit editace této oblasti - history_zoom_alert: Zobrazit editace této oblasti můžete jen ve větším přiblížení + map_data_zoom_in_tooltip: Pro zobrazení mapových dat přejděte na větší měřítko. + map_notes_zoom_in_tooltip: Pro zobrazení poznámek k mapě přejděte na větší měřítko. layouts: + about: O projektu community: Komunita community_blogs: Komunitní blogy community_blogs_title: Blogy členů komunity OpenStreetMap - copyright: Copyright & licence - documentation: Dokumentace - documentation_title: Dokumentace k projektu + copyright: Copyright + data: Data donate: Podpořte OpenStreetMap %{link} Fondu na upgrady hardwaru - donate_link_text: příspěvkem edit: Upravit edit_with: Upravit pomocí %{editor} export: Export - export_tooltip: Exportovat mapová data + export_data: Export dat foundation: Nadace foundation_title: Nadace OpenStreetMap Foundation gps_traces: GPS stopy gps_traces_tooltip: Spravovat GPS stopy help: Nápověda - help_centre: Centrum nápovědy - help_title: Stránky s nápovědou k tomuto projektu history: Historie - home: domů - home_tooltip: Přejít na polohu domova - inbox: zprávy (%{count}) - inbox_tooltip: - few: Ve schránce máte %{count} nepřečtené zprávy - one: Ve schránce máte 1 nepřečtenou zprávu - other: Ve schránce máte %{count} nepřečtených zpráv - zero: Nemáte žádné nepřečtené zprávy - intro_1: OpenStreetMap je svobodná editovatelná mapa celého světa. Tvoří ji lidé jako vy. + home: Přejít domů intro_2_create_account: si založíte uživatelský účet - intro_2_download: stáhnout - intro_2_html: Data si můžete volně %{download} a %{use} pod %{license}. Mapu můžete vylepšit, pokud %{create_account}. - intro_2_license: svobodnou licencí - intro_2_use: používat - license: - title: Data OpenStreetMap jsou k dispozici pod licencí Creative Commons Uveďte autora-Zachovejte licenci 2.0 Generic - log_in: přihlásit se + intro_header: Vítejte v OpenStreetMap! + intro_text: OpenStreetMap je mapa světa, vytvořená lidmi jako vy a volně využitelná pod otevřenou licencí. + learn_more: Více informací + log_in: Přihlásit se log_in_tooltip: Přihlásit se k existujícímu účtu logo: alt_text: Logo OpenStreetMap - logout: odhlásit - logout_tooltip: Odhlásit + logout: Odhlásit se make_a_donation: text: Pošlete příspěvek title: Podpořte OpenStreetMap finančním příspěvkem + more: Další osm_offline: Databáze OpenStreetMap je momentálně kvůli probíhající neodkladné údržbě mimo provoz. osm_read_only: Databáze OpenStreetMap je momentálně kvůli probíhající neodkladné údržbě pouze pro čtení. partners_bytemark: Bytemark Hosting @@ -994,25 +1027,48 @@ cs: partners_ic: Imperial College London partners_partners: partneři partners_ucl: středisko VR UCL - sign_up: zaregistrovat se + partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=cs + sign_up: Zaregistrovat se sign_up_tooltip: Vytvořit si uživatelský účet pro editaci - sotm2011: Navštivte konferenci OpenStreetMap 2011 „The State of the Map“ (Stav mapy) od 9. do 11. září v Denveru! + start_mapping: Začít mapovat tag_line: Otevřená wiki-mapa světa user_diaries: Deníčky user_diaries_tooltip: Zobrazit deníčky uživatelů - view: Zobrazit - view_tooltip: Zobrazit mapu - welcome_user: Vítejte, %{user_link} - welcome_user_link_tooltip: Vaše uživatelská stránka - wiki: wiki - wiki_title: Wiki k tomuto projektu - wiki_url: http://wiki.openstreetmap.org/wiki/CS:Main_Page?uselang=cs license_page: foreign: english_link: anglickým originálem text: V případě rozporů mezi touto přeloženou verzí a %{english_original_link} má přednost anglická stránka. title: O tomto překladu - legal_babble: "

    Autorská práva a licence

    \n

    \n OpenStreetMap jsou svobodná data, nabízená za podmínek licence Creative Commons Uveďte autora-Zachovejte licenci 2.0 (CC BY-SA).\n

    \n

    \n Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat naše mapy i data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud naše mapy nebo data budete upravovat nebo je použijete ve svém díle, musíte výsledek šířit pod stejnou licencí. Vaše práva a povinnosti jsou vysvětleny v plném licenčním ujednání.\n

    \n\n

    Jak uvádět OpenStreetMap

    \n

    \n Pokud používáte obrázky z mapy OpenStreetMap, žádáme, abyste uváděli přinejmenším „© Přispěvatelé OpenStreetMap, CC BY-SA“. Pokud používáte pouze mapová data, požadujeme „Mapová data © Přispěvatelé OpenStreetMap, CC BY-SA“.\n

    \n

    \n Pokud je to možné, OpenStreetMap by měl být hypertextový odkaz na http://www.openstreetmap.org/ a CC BY-SA na http://creativecommons.org/licenses/by-sa/2.0/deed.cs. Pokud používáte médium, které odkazy neumožňuje (např. v tištěném díle), navrhujeme, abyste své čtenáře nasměrovali na www.openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy) a www.creativecommons.org.\n

    \n\n

    Další informace

    \n

    \n O používání našich dat se můžete dočíst více v našem Právním FAQ.\n

    \n

    \n Přispěvatelům OSM připomínáme, že by nikdy neměli přidávat data ze zdrojů chráněných autorským právem (např. Google Maps či tištěné mapy) bez výslovného svolení držitelů práv.\n

    \n

    \n Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API.\n\n Vizte naše Pravidla použití API, Pravidla použití dlaždic a Pravidla použití Nominatimu.\n

    \n\n

    Naši přispěvatelé

    \n

    \n Naše licence CC BY-SA vyžaduje, abyste „způsobem odpovídajícím danému nosiči a v přiměřené formě uváděli autora“. Jednotliví přispěvatelé nevyžadují uvádění svého autorství nad ono „Přispěvatelé OpenStreetMap“, ale tam, kde byla do OpenStreetMap zahrnuta data národních zeměměřických úřadů či jiných velkých zdrojů, může být přiměřené uznat jejich autorství uvedením jejich označení nebo odkázáním na tuto stránku.\n

    \n\n
      \n
    • Austrálie: Obsahuje data předměstí založená na datech Australského statistického úřadu.
    • \n
    • Francie: Obsahuje data pocházející z Direction Générale des Impôts.
    • \n
    • Jihoafrická republika: Obsahuje data pocházející z Chief Directorate: National Geo-Spatial Information, State copyright reserved.
    • \n
    • Kanada: Obsahuje data z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada).
    • \n
    • Nizozemsko: Obsahuje © AND data, 2007 (www.and.com)
    • \n
    • Nový Zéland: Obsahuje data pocházející z Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polsko: Obsahuje data z map UMP-pcPL. Copyright přispěvatelé UMP-pcPL. Více o využití dat UMP na OSM
    • \n
    • Rakousko: Obsahuje data od města Vídně pod CC BY), země Vorarlbersko a země Tyrolsko (pod CC BY AT s dodatky).
    • \n
    • Spojené království: Obsahuje data Ordnance Survey © Crown copyright a právo k databázi 2010.
    • \n
    \n\n

    \n Zahrnutí dat do OpenStreetMap neznamená, že původní poskytovatel dat podporuje OpenStreetMap, nabízí jakoukoli záruku nebo přijímá jakoukoli zodpovědnost.\n

    " + legal_babble: + attribution_example: + alt: Příklad, jak uvádět autorství OpenStreetMap na webové stránce + title: Příklad uvedení autorství + contributors_at_html: "Rakousko: Obsahuje data od města Vídně pod CC BY), země Vorarlbersko a země Tyrolsko (pod CC BY AT s dodatky)." + contributors_ca_html: "Kanada: Obsahuje data z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada)." + contributors_fi_html: "Finsko: Obsahuje data z topografické databáze a dalších zdrojů finského národního zeměměřického úřadu (Maanmittauslaitos) dostupná pod licencí NLSFI." + contributors_footer_1_html: "Další podrobnosti o těchto a dalších zdrojích, které se používaly pro vylepšení OpenStreetMap, najdete na stránce Contributors na wiki OpenStreetMap." + contributors_footer_2_html: Zahrnutí dat do OpenStreetMap neznamená, že původní poskytovatel dat podporuje OpenStreetMap, nabízí jakoukoli záruku nebo přijímá jakoukoli zodpovědnost. + contributors_fr_html: "Francie: Obsahuje data pocházející z Direction Générale des Impôts." + contributors_gb_html: "Spojené království: Obsahuje data Ordnance Survey © Crown copyright a právo k databázi 2010–12." + contributors_intro_html: "Našimi přispěvateli jsou tisíce jednotlivců. Také zahrnujeme svobodně licencovaná data z národních zeměměřických úřadů a dalších zdrojů, mimo jiné:" + contributors_nl_html: "Nizozemsko: Obsahuje © AND data, 2007 (www.and.com)" + contributors_nz_html: "Nový Zéland: Obsahuje data pocházející z Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Naši přispěvatelé + contributors_za_html: "Jihoafrická republika: Obsahuje data pocházející z Chief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: Vyžadujeme uvádění autorství „© Přispěvatelé OpenStreetMap“. + credit_2_html: "Také musíte jasně uvést, že data jsou dostupná za podmínek Open Database License, a pokud používáte naše mapové dlaždice, že jejich kartografický obsah je licencován pod CC-BY-SA. To můžete splnit odkázáním na tuto stránku.\n\nNebo můžete (a pokud šíříte OSM jako data, tak musíte) uvést název licence a odkaz na ni přímo. Pokud používáte médium, které odkazy neumožňuje (např. v tištěném díle), navrhujeme, abyste své čtenáře nasměrovali na openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy), na opendatacommons.org a, pokud se vás to týká, na creativecommons.org." + credit_3_html: "U interaktivní elektronické mapy by autorství mělo být uvedeno v rohu mapy.\nPříklad:" + credit_title_html: Jak uvádět OpenStreetMap + infringement_1_html: Přispěvatelům OSM připomínáme, že by nikdy neměli přidávat data ze zdrojů chráněných autorským právem (např. Google Maps či tištěné mapy) bez výslovného svolení držitelů práv. + infringement_2_html: Pokud si myslíte, že byl do databáze OpenStreetMap nebo na tento server neoprávněně vložen autorskoprávně chráněný obsah, postupujte podle našeho postupu pro odstranění nebo přímo podejte výzvu pomocí on-line formuláře. + infringement_title_html: Porušení autorských práv + intro_1_html: OpenStreetMap jsou svobodná data, nabízená za podmínek Open Data Commons Open Database License (ODbL). + intro_2_html: Smíte kopírovat, distribuovat, sdělovat veřejnosti a upravovat naše data, pokud jako zdroj uvedete OpenStreetMap a jeho přispěvatele. Pokud naše data budete upravovat nebo je použijete ve svém díle, musíte výsledek šířit pod stejnou licencí. Vaše práva a povinnosti jsou vysvětleny v plném licenčním ujednání. + intro_3_html: Kartografická díla v našich mapových dlaždicích a naše dokumentace jsou k dispozici pod licencí Creative Commons Uveďte autora-Zachovejte licenci 2.0 (CC-BY-SA). + more_1_html: O používání našich dat a způsobu uvádění autorství se můžete dočíst více v našem Právním FAQ. + more_2_html: "Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API.\nVizte naše Pravidla použití API, Pravidla použití dlaždic a Pravidla použití Nominatimu." + more_title_html: Další informace + title_html: Autorská práva a licence native: mapping_link: začít mapovat native_link: českou verzi @@ -1075,12 +1131,9 @@ cs: title: Odeslaná pošta to: Komu read: - back_to_inbox: Zpět do přijatých zpráv - back_to_outbox: Zpět do odeslaných zpráv + back: Zpět date: Datum from: Od - reading_your_messages: Čtení zpráv - reading_your_sent_messages: Čtení odeslaných zpráv reply_button: Odpovědět subject: Předmět title: Čtení zprávy @@ -1091,6 +1144,37 @@ cs: wrong_user: Jste přihlášeni jako „%{user}“, ale zpráva, na kterou chcete odpovědět, nebyla poslána tomuto uživateli. Pokud na ni chcete odpovědět, přihlaste se pod správným účtem. sent_message_summary: delete_button: Smazat + note: + description: + closed_at_by_html: Vyřešeno před %{when} uživatelem %{user} + closed_at_html: Vyřešeno před %{when} + commented_at_by_html: Aktualizováno před %{when} uživatelem %{user} + commented_at_html: Aktualizováno před %{when} + opened_at_by_html: Vytvořeno před %{when} uživatelem %{user} + opened_at_html: Vytvořeno před %{when} + reopened_at_by_html: Reaktivováno před %{when} uživatelem %{user} + reopened_at_html: Reaktivováno před %{when} + entry: + comment: Komentář + full: Celá poznámka + mine: + ago_html: před %{when} + created_at: Vytvořeno + creator: Tvůrce + description: Popis + heading: Poznámky uživatele %{user} + id: ID + last_changed: Poslední změna + subheading: Poznámky vytvořené nebo okomentované uživatelem %{user} + title: Poznámky vytvořené nebo okomentované uživatelem %{user} + rss: + closed: poznámka uzavřena (poblíž %{place}) + commented: nový komentář (poblíž %{place}) + description_area: Seznam poznámek hlášených, komentovaných nebo uzavřených ve vaší oblasti [(%{min_lat}|%{min_lon}) – (%{max_lat}|%{max_lon})] + description_item: RSS kanál k poznámce %{id} + opened: nová poznámka (poblíž %{place}) + reopened: reaktivovaná poznámka (poblíž %{place}) + title: Poznámky OpenStreetMap notifier: diary_comment_notification: footer: Také si můžete komentář přečíst na %{readurl}, komentovat na %{commenturl} nebo odpovědět na %{replyurl} @@ -1106,8 +1190,7 @@ cs: email_confirm_plain: click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující odkaz. greeting: Ahoj, - hopefully_you_1: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru - hopefully_you_2: "%{server_url} na %{new_address}." + hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url} na %{new_address}. friend_notification: befriend_them: Můžete si ho/ji také přidat jako přítele na %{befriendurl}. had_added_you: "%{user} si vás na OpenStreetMap přidal(a) jako přítele." @@ -1118,6 +1201,7 @@ cs: and_the_tags: "a následujícími štítky:" failure: failed_to_import: "se nepodařilo nahrát. Chybové hlášení následuje:" + import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=cs more_info_1: Další informace o chybách při importu GPX a rady, jak se more_info_2: "jim vyhnout, naleznete na:" subject: "[OpenStreetMap] Neúspěšný import GPX" @@ -1136,46 +1220,36 @@ cs: lost_password_plain: click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové heslo. greeting: Ahoj, - hopefully_you_1: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele - hopefully_you_2: serveru openstreetmap.org s touto e-mailovou adresou. + 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. message_notification: - footer1: Také si můžete zprávu přečíst na %{readurl} - footer2: a můžete odpovědět na %{replyurl} + footer_html: Zprávu si také můžete přečíst na %{readurl} a odpovědět můžete na %{replyurl} header: "%{from_user} vám poslal(a) prostřednictvím OpenStreetMap zprávu s předmětem %{subject}:" hi: Dobrý den, uživateli %{to_user}, + note_comment_notification: + anonymous: Anonymní uživatel + closed: + commented_note: "%{commenter} vyřešil poznámku k mapě, kterou jste komentovali. Poznámka je umístěna poblíž %{place}." + subject_other: "[OpenStreetMap] %{commenter} vyřešil jednu z poznámek, která vás zajímá" + subject_own: "[OpenStreetMap] %{commenter} vyřešil jednu z vašich poznámek" + your_note: "%{commenter} vyřešil jednu z vašich poznámek k mapě nedaleko %{place}." + commented: + commented_note: "%{commenter} okomentoval poznámku k mapě, kterou jste také komentovali. Poznámka je umístěna poblíž %{place}." + subject_other: "[OpenStreetMap] %{commenter} okomentoval jednu z poznámek, která vás zajímá" + subject_own: "[OpenStreetMap] %{commenter} okomentoval jednu z vašich poznámek" + your_note: "%{commenter} okomentoval jednu z vašich poznámek k mapě nedaleko %{place}." + details: Podrobnosti k poznámce můžete najít na %{url}. + greeting: Ahoj, + reopened: + commented_note: "%{commenter} reaktivoval poznámku k mapě, kterou jste komentovali. Poznámka je umístěna poblíž %{place}." + subject_other: "[OpenStreetMap] %{commenter} reaktivoval jednu z poznámek, která vás zajímá" + subject_own: "[OpenStreetMap] %{commenter} reaktivoval jednu z vašich poznámek" + your_note: "%{commenter} reaktivoval jednu z vašich poznámek k mapě nedaleko %{place}." signup_confirm: - subject: "[OpenStreetMap] Potvrzení vaší e-mailové adresy" - signup_confirm_html: - ask_questions: Libovolné otázky k OpenStreetMap můžete klást na našem webu otázek a odpovědí. - click_the_link: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte svůj účet, níže se dozvíte další informace o OpenStreetMap. - current_user: Seznam existujících uživatelů v kategoriích podle místa bydliště je dostupný v kategorii Users by geographical region. - get_reading: Přečtěte si něco o OpenStreetMap na wiki, sledujte aktuální dění na našem blogu či Twitteru nebo si projděte blog zakladatele OpenStreetMap Steva Coasta OpenGeoData se stručnou historií projektu i ve formě podcastů! - greeting: Ahoj! - hopefully_you: Někdo (snad vy) si chce založit účet na - introductory_video: Můžete si prohlédnout %{introductory_video_link}. - more_videos: Máme i %{more_videos_link}. - more_videos_here: další videa - user_wiki_page: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které kategoriemi označíte, odkud pocházíte, například [[Category:Users in Praha]]. - video_to_openstreetmap: úvodní video k OpenStreetMap - wiki_signup: Také se můžete chtít zaregistrovat na OpenStreetMap wiki. - signup_confirm_plain: - ask_questions: "Libovolné otázky k OpenStreetMap můžete klást na našem webu otázek a odpovědí:" - blog_and_twitter: "Sledujte aktuální dění na našem blogu či Twitteru:" - click_the_link_1: Pokud jste to vy, vítejte! Kliknutím na následující odkaz potvrdíte - click_the_link_2: svůj účet, níže se dozvíte další informace o OpenStreetMap. - current_user_1: Seznam existujících uživatelů v kategoriích podle místa bydliště - current_user_2: "je dostupný na:" + confirm: "Než budeme pokračovat, potřebujeme potvrdit, že tento požadavek přišel od vás, takže pokud jste to byli vy, klikněte prosím na odkaz níže, abyste svůj účet potvrdili:" + created: Někdo (doufáme, že vy) si právě založil účet na %{site_url}. greeting: Ahoj! - hopefully_you: Někdo (snad vy) si chce založit účet na - introductory_video: "Můžete si prohlédnout úvodní video k OpenStreetMap:" - more_videos: "Další videa najdete na:" - opengeodata: "OpenGeoData.org je blog zakladatele OpenStreetMap Steva Coasta, nabízí i podcasty:" - the_wiki: "Přečtěte si něco o OpenStreetMap na wiki:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/CS:Beginners_Guide?uselang=cs - user_wiki_1: Doporučujeme, abyste si na wiki založili uživatelskou stránku, na které - user_wiki_2: kategoriemi označíte, odkud pocházíte, například [[Category:Users in Praha]]. - wiki_signup: "Také se můžete chtít zaregistrovat na OpenStreetMap wiki:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=CS:Main_Page&uselang=cs + subject: "[OpenStreetMap] Vítejte v OpenStreetMap" + welcome: Jakmile potvrdíte svůj účet, poskytneme vám do začátku trochu dalších informací. oauth: oauthorize: allow_read_gpx: číst vaše soukromé GPS stopy. @@ -1184,8 +1258,18 @@ cs: allow_write_api: upravovat mapu. allow_write_diary: vytvářet deníčkové záznamy, komentovat a navazovat přátelství. allow_write_gpx: nahrávat GPS stopy. + allow_write_notes: měnit poznámky. allow_write_prefs: měnit vaše uživatelské nastavení. request_access: Aplikace %{app_name} žádá o přístup k vašemu účtu %{user}. Vyberte si, zda si přejete, aby aplikace měla následující oprávnění. Můžete jich zvolit libovolný počet. + title: Autorizovat přístup k vašemu účtu + oauthorize_failure: + denied: Odepřeli jste aplikaci %{app_name} přístup k vašemu účtu. + invalid: Autorizační token je neplatný. + title: Požadavek na autorizaci se nezdařil + oauthorize_success: + allowed: Udělili jste aplikaci %{app_name} přístup k vašemu účtu. + title: Požadavek na autorizaci povolen + verification: Ověřovací kód je %{code}. revoke: flash: Přístup pro aplikaci %{application} byl odvolán. oauth_clients: @@ -1202,6 +1286,7 @@ cs: allow_write_api: upravovat mapu. allow_write_diary: vytvářet deníčkové záznamy, komentovat a navazovat přátelství. allow_write_gpx: nahrávat GPS stopy. + allow_write_notes: měnit poznámky. allow_write_prefs: měnit jejich uživatelské nastavení. callback_url: URL pro zpětné volání name: Název @@ -1232,6 +1317,7 @@ cs: allow_write_api: upravovat mapu. allow_write_diary: vytvářet deníčkové záznamy, komentovat a navazovat přátelství. allow_write_gpx: nahrávat GPS stopy. + allow_write_notes: měnit poznámky. allow_write_prefs: měnit jejich uživatelské nastavení. authorize_url: "Autorizační URL:" confirm: Opravdu? @@ -1240,19 +1326,39 @@ cs: key: "Uživatelský klíč:" requests: "Uživatelé se žádají o následující oprávnění:" secret: "Tajný klíč uživatele:" - support_notice: Podporujeme HMAC-SHA1 (doporučeno) i prostý text v režimu SSL. + support_notice: Podporujeme HMAC-SHA1 (doporučeno) a podpisy RSA-SHA1. title: Podrobnosti OAuth pro %{app_name} url: "URL tokenu požadavku:" update: flash: Klientské informace úspěšně aktualizovány redaction: + create: + flash: Redakce vytvořena. + destroy: + error: Došlo k chybě při ničení této redakce. + flash: Redakce zničena. + not_empty: Redakce není prázdná. Před zrušením této redakce zrušte skrytí všech verzí patřících do této redakce. edit: description: Popis + heading: Upravit redakci + submit: Uložit redakci + title: Upravit redakci + index: + empty: Žádné opravy k ukázání. + heading: Seznam oprav + title: Seznam oprav new: description: Popis + heading: Zadejte informace k nové redakci + submit: Vytvořit redakci + title: Tvorba nové redakce show: confirm: Opravdu? description: "Popis:" + destroy: Odstranit tuto redakci + edit: Upravit tuto redakci + heading: Zobrazení redakce „%{title}“ + title: Zobrazení redakce user: "Autor:" update: flash: Změny uloženy. @@ -1260,6 +1366,7 @@ cs: edit: anon_edits_link_text: Proč to tak je? flash_player_required: 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í. + 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é. not_public: Nenastavili jste své editace jako veřejné. not_public_description: Dokud tak neučiníte, nemůžete editovat mapu. Své editace můžete zveřejnit na %{user_page}. @@ -1268,18 +1375,15 @@ cs: 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.) user_page_link: uživatelské stránce index: + createnote: Přidat poznámku js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript zakázaný. js_2: OpenStreetMap používá pro svou interaktivní mapu JavaScript. license: - license_name: Creative Commons Uveďte autora-Zachovejte licenci 2.0 Generic - notice: Nabízeno pod licencí %{license_name}, vytvořeno přispěvateli %{project_name}. - project_name: projektu OpenStreetMap + copyright: Copyright OpenStreetMap a přispěvatelé, pod svobodnou licencí permalink: Trvalý odkaz remote_failed: Editace se nezdařila – ujistěte se, že JOSM nebo Merkaartor běží a je zapnuto dálkové ovládání shortlink: Krátký odkaz key: - map_key: Legenda - map_key_tooltip: Legenda k mapě table: entry: admin: Administrativní hranice @@ -1365,7 +1469,6 @@ cs: preview: Náhled search: search: Hledat - search_help: "příklady: „Příbram“, „Havlíčkova, Plzeň“, „CB2 5AQ“, nebo „post offices near Mělník“ další příklady…" submit_text: Hledat where_am_i: Kde se nacházím? where_am_i_title: Popsat právě zobrazované místo pomocí vyhledávače @@ -1374,6 +1477,7 @@ cs: search_results: Výsledky vyhledávání time: formats: + blog: "%e. %L. %Y" friendly: "%e. %m. %Y v %H:%M" trace: create: @@ -1381,6 +1485,11 @@ cs: upload_trace: Nahrát GPS stopu delete: scheduled_for_deletion: Stopa označena ke smazání + description: + description_with_count: + one: GPX soubor s %{count} bodem od uživatele %{user} + other: GPX soubor s %{count} body od uživatele %{user} + description_without_count: GPX soubor od uživatele %{user} edit: description: "Popis:" download: stáhnout @@ -1398,7 +1507,12 @@ cs: uploaded_at: "Nahráno v:" visibility: "Viditelnost:" visibility_help: co tohle znamená? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=cs + georss: + title: GPS stopy z OpenStreetMap list: + description: Procházení nedávno nahraných GPS stop + empty_html: Nic tu ještě není. Nahrajte novou stopu nebo si něco o GPS stopách přečtěte na wiki. public_traces: Veřejné GPS stopy public_traces_from: Veřejné GPS stopy uživatele %{user} tagged_with: " oštítkované jako %{tags}" @@ -1429,23 +1543,28 @@ cs: trace_form: description: "Popis:" help: Nápověda + help_url: http://wiki.openstreetmap.org/wiki/Upload?uselang=cs tags: "Štítky:" tags_help: oddělené čárkou upload_button: Nahrát upload_gpx: "Nahrát GPX soubor:" visibility: "Viditelnost:" visibility_help: co tohle znamená? + visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=cs trace_header: see_all_traces: Zobrazit všechny stopy - see_your_traces: Zobrazit všechny vaše stopy - traces_waiting: Na zpracování čeká %{count} vašich stop. Zvažte, zda by nebylo před nahráním dalších lepší počkat, dokud nebudou zpracovány, abyste neblokovali frontu dalším uživatelům. + see_your_traces: Zobrazit vaše stopy + traces_waiting: + few: Na zpracování čekají %{count} vaše stopy. Zvažte, zda by nebylo před nahráním dalších lepší počkat, dokud nebudou zpracovány, abyste neblokovali frontu dalším uživatelům. + one: Na zpracování čeká %{count} vaše stopa. Zvažte, zda by nebylo před nahráním dalších lepší počkat, dokud nebude zpracována, abyste neblokovali frontu dalším uživatelům. + other: Na zpracování čeká %{count} vašich stop. Zvažte, zda by nebylo před nahráním dalších lepší počkat, dokud nebudou zpracovány, abyste neblokovali frontu dalším uživatelům. upload_trace: Nahrát stopu trace_optionals: tags: Štítky trace_paging_nav: - next: Následující » - previous: « Předchozí - showing_page: Zobrazuji stranu %{page} + newer: Novější stopy + older: Starší stopy + showing_page: Stránka %{page} view: delete_track: Smazat tuto stopu description: "Popis:" @@ -1485,6 +1604,10 @@ cs: email never displayed publicly: (nikde se veřejně nezobrazuje) flash update success: Uživatelské údaje byly úspěšně aktualizovány. flash update success confirm needed: Uživatelské údaje byly úspěšně aktualizovány. Zkontrolujte si e-mail, měla by vám přijít výzva k potvrzení nové e-mailové adresy. + gravatar: + gravatar: Používat Gravatar + link: http://wiki.openstreetmap.org/wiki/CS:Gravatar + link text: co to znamená? home location: "Poloha domova:" image: "Obrázek:" image size hint: (nejlépe fungují čtvercové obrázky velikosti nejméně 100×100) @@ -1508,7 +1631,7 @@ cs: disabled link text: proč nemůžu editovat? enabled: Aktivní. Není anonym, smí editovat data. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: co tohle je? + enabled link text: co to znamená? heading: "Veřejné editace:" public editing note: heading: Veřejné editace @@ -1520,13 +1643,13 @@ cs: update home location on click: Upravit pozici domova při kliknutí na mapu? confirm: already active: Tento uživatelský účet už byl potvrzen. - before you start: Víme, že se asi nemůžete dočkat, až začnete mapovat, ale předtím byste mohli chtít v následujícím formuláři vyplnit několik informaci o sobě. button: Potvrdit - heading: Potvrzení uživatelského účtu + heading: Zkontrolujte si e-mail! + introduction_1: Poslali jsme vám potvrzovací e-mail. + introduction_2: Potvrďte svůj účet kliknutím na odkaz v e-mailu a budete moci začít mapovat. press confirm button: Svůj účet aktivujte stisknutím níže zobrazeného tlačítka. - reconfirm: Pokud již od registrace uběhl nějaký čas, možná si budete muset nechat poslat nový potvrzovací e-mail. - success: Účet potvrzen, děkujeme za registraci! - unknown token: Zadaný potvrzovací kód neexistuje. + reconfirm_html: Pokud potřebujete, abychom vám poslali potvrzovací e-mail znovu, klikněte zde. + unknown token: Zadaný potvrzovací kód vypršel nebo neexistuje. confirm_email: button: Potvrdit failure: Tento kód byl už pro potvrzení e-mailové adresy použit. @@ -1546,8 +1669,8 @@ cs: heading: Uživatelé hide: Skrýt vybrané uživatele showing: - one: Zobrazuje se stránka %{page} (%{first_item} z %{items}) - other: Zobrazuje se stránka %{page} (%{first_item}–%{last_item} z %{items}) + one: Stránka %{page} (%{first_item} z %{items}) + other: Stránka %{page} (%{first_item}–%{last_item} z %{items}) summary: "%{name} vytvořeno %{date} z %{ip_address}" summary_no_ip: "%{name} vytvořen %{date}" title: Uživatelé @@ -1562,8 +1685,6 @@ cs: lost password link: Ztratili jste heslo? new to osm: Jste na OpenStreetMap noví? no account: Nemáte účet? - notice: Zjistěte více o nadcházející změně licence OpenStreetMap (překlady) (diskuse) - notice_terms: OpenStreetMap přechází 1. dubna 2012 na novou licenci. Je stejně otevřená jako ta stávající, ale právní řešení je pro naší mapovou databázi mnohem vhodnější. Velice rádi bychom v OpenStreetMap zachovali vaše příspěvky, to ale můžeme jen v případě, že svolíte k jejich šíření pod novou licencí. V opačném případě je budeme muset z databáze odstranit.

    Prosíme, přihlaste se a věnujte chvilku k přečtení a odsouhlasení nových podmínek. Děkujeme! openid: "%{logo} OpenID:" openid invalid: Je nám líto, ale vaše OpenID vypadá chybně openid missing provider: Je nám líto, ale nepodařilo se kontaktovat vašeho poskytovatele OpenID @@ -1608,19 +1729,21 @@ cs: title: Ztracené heslo make_friend: already_a_friend: Již jste přátelé s %{name}. + button: Přidat jako přítele failed: Je mi líto, nepodařilo se přidat %{name} jako přítele. - success: "%{name} je nyní váš přítel." + heading: Přidat uživatele %{user} jako přítele? + success: "%{name} je nyní váš přítel!" new: + about: + header: Svobodná a editovatelná + html: "

    Na rozdíl od ostatních map je OpenStreetMap vytvořena lidmi jako vy a kdokoli ji může volně opravovat, aktualizovat, stáhnout a používat.

    \n

    Zaregistrujte se, abyste mohli začít přispívat. K potvrzení vašeho účtu vám pošleme e-mail.

    " confirm email address: "Potvrdit e-mailovou adresu:" confirm password: "Potvrdit heslo:" contact_webmaster: Pokud chcete zařídit založení účtu, kontaktujte webmastera – pokusíme se vaši žádost vyřídit co možná nejrychleji. - continue: Pokračovat + continue: Zaregistrovat se display name: "Zobrazované jméno:" display name description: Vaše veřejně zobrazované uživatelské jméno. Můžete si ho později změnit ve svém nastavení. email address: "E-mailová adresa:" - fill_form: Vyplňte následující formulář a my vám pošleme stručný e-mail, jak si účet aktivovat. - flash create success message: Děkujeme za registraci. Na %{email} jsme poslali potvrzovací zprávu, jakmile potvrdíte svůj účet, budete moci začít tvořit mapy.

    Pokud používáte nějaký protispamový systém, který vyžaduje potvrzení, nezapomeňte zařídit výjimku pro webmaster@openstreetmap.org, neboť na žádosti o potvrzení nejsme schopni reagovat. - heading: Vytvořit uživatelský účet license_agreement: Při potvrzení účtu budete muset souhlasit s podmínkami pro přispěvatele. no_auto_account_create: Bohužel za vás momentálně nejsme schopni vytvořit účet automaticky. not displayed publicly: Nezobrazuje se veřejně (vizte pravidla ochrany osobních údajů) @@ -1631,7 +1754,7 @@ cs: terms accepted: Děkujeme za odsouhlasení nových podmínek pro přispěvatele! terms declined: Je nám líto, že jste se rozhodli nepřijmout nové Podmínky pro přispěvatele. Podrobnější informace najdete na této wikistránce. terms declined url: http://wiki.openstreetmap.org/wiki/CS:Contributor_Terms_Declined?uselang=cs - title: Vytvořit účet + title: Zaregistrovat se use openid: Případně se můžete přihlásit pomocí %{logo} OpenID no_such_user: body: Je mi líto, ale uživatel %{user} neexistuje. Zkontrolujte překlepy nebo jste možná klikli na chybný odkaz. @@ -1642,6 +1765,8 @@ cs: nearby mapper: Nedaleký uživatel your location: Vaše poloha remove_friend: + button: Odebrat z přátel + heading: Odebrat uživatele %{user} z přátel? not_a_friend: "%{name} není mezi vašimi přáteli." success: "%{name} byl odstraněn z vašich přátel." reset_password: @@ -1677,12 +1802,12 @@ cs: you need to accept or decline: Pro pokračování si prosím přečtěte a přijměte nebo odmítněte nové Podmínky pro přispěvatele. view: activate_user: aktivovat tohoto uživatele - add as friend: přidat jako přítele + add as friend: Přidat do přátel ago: (před %{time_in_words_ago}) - block_history: zobrazit zablokování - blocks by me: zablokování mnou - blocks on me: moje zablokování - comments: komentáře + block_history: zablokování + blocks by me: Zablokování mnou + blocks on me: Moje zablokování + comments: Komentáře confirm: Potvrdit confirm_user: potvrdit tohoto uživatele create_block: blokovat tohoto uživatele @@ -1694,31 +1819,35 @@ cs: deactivate_user: deaktivovat tohoto uživatele delete_user: odstranit tohoto uživatele description: Popis - diary: deníček - edits: editace + diary: Deníček + edits: Editace email address: "E-mailová adresa:" - friends_changesets: Procházet všechny sady změn mých přátel - friends_diaries: Procházet všechny záznamy v deníčcích přátel + friends_changesets: sady změn přátel + friends_diaries: záznamy v deníčcích přátel hide_user: skrýt tohoto uživatele - if set location: Když si nastavíte svou polohu, objeví se níže hezká mapka atp. Polohu domova si můžete nastavit na stránce %{settings_link}. + if set location: Pokud chcete vidět blízké uživatele, nastavte si na stránce %{settings_link} domácí souřadnice. km away: "%{count} km" latest edit: "Poslední editace %{ago}:" m away: "%{count} m" mapper since: "Účastník projektu od:" - moderator_history: zobrazit udělená zablokování - my comments: moje komentáře - my diary: můj deníček - my edits: moje editace - my settings: moje nastavení - my traces: moje stopy + moderator_history: udělená zablokování + my comments: Moje komentáře + my diary: Můj deníček + my edits: Moje editace + my messages: Moje zprávy + my notes: Moje poznámky k mapě + my profile: Můj profil + my settings: Moje nastavení + my traces: Moje stopy nearby users: Další uživatelé poblíž - nearby_changesets: Procházet všechny sady změn uživatelů poblíž - nearby_diaries: Procházet všechny záznamy v deníčcích uživatelů poblíž + nearby_changesets: sady změn uživatelů poblíž + nearby_diaries: záznamy v deníčcích uživatelů poblíž new diary entry: nový záznam do deníčku no friends: Zatím jste nepřidali žádné přátele. no nearby users: Nejsou známi žádní uživatelé, kteří by uvedli domov blízko vás. + notes: Poznámky k mapě oauth settings: nastavení oauth - remove as friend: odstranit jako přítele + remove as friend: Odebrat z přátel role: administrator: Tento uživatel je správce grant: @@ -1728,11 +1857,11 @@ cs: revoke: administrator: Odebrat práva správce moderator: Odebrat práva moderátora - send message: poslat zprávu + send message: Poslat zprávu settings_link_text: nastavení spam score: "Spam skóre:" status: "Stav:" - traces: stopy + traces: Stopy unhide_user: zobrazit tohoto uživatele user location: Pozice uživatele your friends: Vaši přátelé @@ -1790,11 +1919,14 @@ cs: creator_name: Autor display_name: Zablokovaný uživatel edit: Upravit + next: Následující » not_revoked: (nezrušeno) + previous: « Předchozí reason: Důvod pro blok revoke: Zrušit ! revoker_name: Zrušno show: Zobrazit + showing_page: Stránka %{page} status: Stav period: one: 1 hodina @@ -1842,3 +1974,25 @@ cs: fail: Nelze odebrat roli `%{role}' uživateli `%{name}'. Zkontrolujte prosím, zda jsou uživatel i role platnými údaji. heading: Potvrdit odebrání role title: Potvrdit odebrání role + welcome_page: + add_a_note: + paragraph_1_html: Pokud chcete jen opravit nějakou drobnost a nemáte čas se registrovat a učit se editovat, můžete jednoduše přidat poznámku. + paragraph_2_html: "Stačí jít na mapu a kliknout na ikonku poznámky:\n. Tím do mapy přidáte značku, kterou můžete přetáhnout.\nNapište svou zprávu, klikněte na Přidat a ostatní tvůrci mapy se na to podívají." + title: Nemáte čas editovat? Přidejte poznámku! + basic_terms: + editor_html: Editor je program nebo webová stránka, pomocí které editujete mapu. + node_html: Uzel je bod na mapě jako např. jedna restaurace či strom. + paragraph_1_html: OpenStreetMap používá trochu vlastního žargonu. Tady je několik klíčových slov, která se vám budou hodit. + tag_html: Tag je troška dat o uzlu nebo cestě jako např. název restaurace nebo maximální povolená rychlost na silnici. + title: Základní pojmy pro mapování + way_html: Cesta je linie nebo plocha jako např. silnice, potok, jezero nebo budova. + introduction_html: Vítejte v OpenStreetMap, svobodné a editovatelné mapě světa. Teď, když jste se zaregistrovali, můžete začít mapovat. Tady je rychlý přehled nejdůležitějších věcí, které budete potřebovat znát. + questions: + paragraph_1_html: "OpenStreetMap nabízí několik zdrojů pro informace o projektu, otázky a odpovědi a kolaborativní diskuse a dokumentace mapových témat.\nZde můžete získat pomoc." + title: Nějaké dotazy? + start_mapping: Začít mapovat + title: Vítejte! + whats_on_the_map: + off_html: Co nezahrnuje jsou názory jako hodnocení, dřívější či hypotetické objekty a data ze zdrojů chráněných autorským právem. Pokud nemáte speciální svolení, nekopírujte z online nebo papírových map. + on_html: OpenStreetMap je místem pro mapování věcí, které jsou zároveň skutečné a aktuální – zahrnuje miliony budov, silnic a dalších podrobností o místech. Můžete mapovat jakékoli skutečné objekty, které vás zajímají. + title: Co patří do mapy diff --git a/config/locales/da.yml b/config/locales/da.yml index e131f403464..2162be19459 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1,16 +1,35 @@ # Messages for Danish (dansk) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Brufnus # Author: Christian List # Author: Ebbe +# Author: Fenrisdk # Author: Freek # Author: Gnonthgol # Author: Gorbi +# Author: Hein0170 # Author: Hylle +# Author: Kaare +# Author: Luckas +# Author: Nemo bis # Author: OleLaursen +# Author: Peter Alberti # Author: The real emj # Author: Winbladh da: + about_page: + community_driven_html: "OpenStreetMap-fællesskabet er alsidigt, passioneret, og vokser hver dag.\nVores bidragsydere omfatter entusiastiske kortlæggere, GIS-fagfolk, ingeniører der\nkører OSM-servere, humanitære arbejdere der kortlægger katastroferamte områder,\nog mange flere.\nFor at læs mere om fællesskabet, se brugerdagbøger,\nfællesskabsblogs, og\n OSM Foundations hjemmeside." + community_driven_title: Drevet af fællesskabet + copyright_html: ©OpenStreetMap
    bidragsydere + lede_text: OpenStreetMap er bygget af et fællesskab af kortlæggere, der bidrager og vedligeholder data om veje, stier, caféer, jernbanestationer og meget mere, over hele verden. + local_knowledge_html: OpenStreetMap lægger vægt på lokal viden. Bidragsydere bruger luftfotografier, GPS-enheder og lavteknologiske feltkort til at kontrollere at OSM er præcis og ajourført. + local_knowledge_title: Lokal viden + next: Næste + open_data_html: "OpenStreetMap er åbne data: du må bruge dem til ethvert formål,\nså længe du nævner OpenStreetMap og dets bidragsydere. Hvis du ændrer eller\nbygger oven på data på bestemte måder, må du kun distribuere resultatet under\nden samme licens. Se siden om ophavsret og licens for detaljer." + open_data_title: Åbne Data + partners_title: Partnere + used_by: "%{name} stiller kortdata til rådighed for hundredvis af websteder, mobile apps og hardware-enheder" activerecord: attributes: diary_comment: @@ -19,7 +38,7 @@ da: language: Sprog latitude: Breddegrad longitude: Længdegrad - title: Titel + title: Emne user: Bruger friend: friend: Ven @@ -28,7 +47,7 @@ da: body: Brødtekst recipient: Modtager sender: Afsender - title: Titel + title: Emne trace: description: Beskrivelse latitude: Breddegrad @@ -47,15 +66,15 @@ da: pass_crypt: Adgangskode models: acl: Adgangskontrolliste - changeset: Ændring - changeset_tag: Ændringsegenskab + changeset: Ændringssæt + changeset_tag: Egenskab for ændringssæt country: Land diary_comment: Blogkommentar diary_entry: Blogindlæg friend: Ven language: Sprog message: Meddelelse - node: Punk + node: Punkt node_tag: Punktegenskab notifier: Underret old_node: Tidligere punkt @@ -82,163 +101,94 @@ da: application: require_cookies: cookies_needed: Du har tilsyneladende deaktiveret cookies i din browser. Aktivér cookies før du fortsætter. + require_moderator: + not_a_moderator: Du skal være moderator for at udføre denne handling. setup_user_auth: blocked: Din adgang til API'et er blokeret. Log ind på webinterfacet for a finde ud mere. need_to_see_terms: Din adgang til API-et er midlertidig stoppet. Log ind på netsiden for at læse bidragsydervilkårene. Du behøver ikke at godkende vilkårene, men du skal læse dem. browse: + anonymous: anonym changeset: - changeset: "Ændringssæt: %{id}" + belongs_to: Forfatter changesetxml: XML for ændringssæt - download: Hent %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Ændringssæt %{id} title_comment: Ændringssæt %{id} - %{comment} - osmchangexml: osmChange XML - title: Ændringssæt - changeset_details: - belongs_to: "Tilhører:" - bounding_box: "Grænse:" - box: kasse - closed_at: "Lukket:" - created_at: "Oprettet:" - has_nodes: - one: "Har følgende punkt:" - other: "Har følgende %{count} punkter:" - has_relations: - one: "Har følgende relation:" - other: "Har følgende %{count} relationer:" - has_ways: - one: "Har følgende vej:" - other: "Har følgende %{count} veje:" - no_bounding_box: Ingen grænse er lagret for dette ændringssæt. - show_area_box: Vis kasse på et stort kort - common_details: - changeset_comment: "Kommentar:" - deleted_at: "Slettet:" - deleted_by: "Slettet af:" - edited_at: "Redigeret:" - edited_by: "Redigeret af:" - in_changeset: "I ændringssæt:" - version: "Version:" + node: Punkter (%{count}) + node_paginated: Punkter (%{x}-%{y} af %{count}) + osmchangexml: XML for osmChange + relation: Relationer (%{count}) + relation_paginated: Relationer (%{x}-%{y} af %{count}) + title: "Ændringssæt: %{id}" + way: Veje (%{count}) + way_paginated: Veje (%{x}-%{y} af %{count}) + closed: Lukket + closed_by_html: Lukket for %{time} siden af %{user} + closed_html: Lukket for %{time} siden containing_relation: entry: Relation %{relation_name} entry_role: Relation %{relation_name} (som %{relation_role}) - map: - deleted: Slettet - edit: - area: Rediger område - node: Rediger punkt - relation: Rediger relation - way: Rediger vej - larger: - area: Vis område på større kort - node: Vis punkt på større kort - relation: Vis relation på større kort - way: Vis vej på større kort - loading: Indlæsning... - navigation: - all: - next_changeset_tooltip: Næste ændringssæt - next_node_tooltip: Næste punkt - next_relation_tooltip: Næste relation - next_way_tooltip: Næste vej - prev_changeset_tooltip: Forrige ændringssæt - prev_node_tooltip: Forrige punkt - prev_relation_tooltip: Forrige relation - prev_way_tooltip: Forrige vej - user: - name_changeset_tooltip: Vis redigeringer af %{user} - next_changeset_tooltip: Næste ændring af %{user} - prev_changeset_tooltip: Forrige ændring af %{user} + created: Oprettet + created_by_html: Oprettet for %{time} siden af %{user} + created_html: Oprettet for %{time} siden + deleted_by_html: Slettet for %{time} siden af %{user} + download_xml: Hent XML + edited_by_html: Redigeret for %{time} siden af %{user} + in_changeset: Ændringssæt + location: "Sted:" + no_comment: (ingen kommentar) node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Hent XML - edit: redigér - node: Punkt - node_title: "Punkt: %{node_name}" - view_history: vis historik - node_details: - coordinates: "Koordinater:" - part_of: "Del af:" - node_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Hent XML - node_history: Punkthistorik - node_history_title: "Punkthistorik: %{node_name}" - view_details: vis detaljer + history_title: "Punkthistorik: %{name}" + title: "Punkt: %{name}" not_found: - sorry: Unskyld, %{type}'en med id %{id} kan ikke findes. + sorry: Beklager, %{type} med id %{id} blev ikke fundet. type: changeset: ændringssæt node: punkt relation: relation way: vej - paging_nav: - of: af - showing_page: Viser side + note: + closed_by: Løst af %{user} for %{when} siden + closed_by_anonymous: Løst af en anonym for %{when} siden + closed_title: "Løst bemærkning #%{note_name}" + commented_by: Kommentar fra %{user} for %{when} siden + commented_by_anonymous: Kommentar fra en anonym for %{when} siden + hidden_by: Skjult af %{user} for %{when} siden + hidden_title: "Skjult bemærkning #%{note_name}" + new_note: Ny bemærkning + open_by: Oprettet af %{user} for %{when} siden + open_by_anonymous: Oprettet af en anonym for %{when} siden + open_title: "Uløst bemærkning #%{note_name}" + reopened_by: Genaktiveret af %{user} for %{when} siden + reopened_by_anonymous: Genaktiveret af en anonym for %{when} siden + title: "Bemærkning: %{id}" + part_of: Del af + redacted: + message_html: Version %{version} af %{type} kan ikke vises, da den er omarbejdet. Se venligst %{redaction_link} for detaljer. + redaction: Omarbejdelse %{id} + type: + node: punkt + relation: relation + way: vej relation: - download: "%{download_xml_link} eller %{view_history_link}" - download_xml: Hent ned XML - relation: Relation - relation_title: "Relation: %{relation_name}" - view_history: vis historik - relation_details: - members: "Medlemmer:" - part_of: "Del af:" - relation_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Hent XML - relation_history: Relationshistorik - relation_history_title: "Relationshistorik: %{relation_name}" - view_details: vis detaljer + history_title: "Relationshistorik: %{name}" + members: Medlemmer + title: "Relation: %{name}" relation_member: entry_role: "%{type} %{name} som %{role}" type: node: Punkt relation: Relation way: Vej - start: - manually_select: Vælg et andet område manuelt - view_data: Vis data for nuværende kortvisning start_rjs: - data_frame_title: Data - data_layer_name: Data - details: Detaljer - drag_a_box: Træk en kasse på kortet for at vælge et område - edited_by_user_at_timestamp: Redigeret af [[user]], [[timestamp]] - hide_areas: Skjul områder - history_for_feature: Historik for [[feature]] + feature_warning: Henter %{num_features} funktioner, som kan gøre din browser langsom eller få den til at ikke at svare. Er du sikker på du ønsker at få vist disse data? load_data: Indlæs data - loaded_an_area_with_num_features: "Du har indlæst et område som indeholder [[num_features]] objekter. Nogle browsere kan have problemer ved håndtering af så meget data. Browsere fungerer generelt bedst med mindre end 100 objekter ad gangen: flere objekter kan gøre at din browser bliver langsom. Hvis du er sikker på, at du vil se alle disse data, så klik på knappen nedenfor." - loading: Indlæsning... - manually_select: Vælg et andet område manuelt - object_list: - api: Hent dette område fra API'et - back: Vis objektliste - details: Detaljer - heading: Objektliste - history: - type: - node: Punkt [[id]] - way: Vej [[id]] - selected: - type: - node: Punkt [[id]] - way: Vej [[id]] - type: - node: Punkt - way: Vej - private_user: privat bruger - show_areas: Vis områder - show_history: Vis historik - unable_to_load_size: "Kunne ikke indlæse: området [[bbox_size]] er for stort (skal være mindre end %{max_bbox_size})" - wait: Vent... - zoom_or_select: Zoom ind eller vælg et område af kortet for visning + loading: Indlæser... tag_details: - tags: "Egenskaber:" + tags: Egenskaber wiki_link: - key: Wikisiden med beskrivelsen af %{key} - tag: Wikisiden med beskrivelsen af %{key}=%{value} + key: Wikisiden med beskrivelse af egenskaben %{key} + tag: Wikisiden med beskrivelse af egenskaben %{key}=%{value} wikipedia_link: Artiklen %{page} på Wikipedia timeout: sorry: Beklager, data for %{type} med id %{id} tog for lang tid at hente @@ -247,38 +197,25 @@ da: node: punkt relation: relation way: vej + version: Version + view_details: Se detaljer + view_history: Se historik way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Hent XML - edit: redigér - view_history: vis historik - way: Vej - way_title: "Vej: %{way_name}" - way_details: also_part_of: - one: også del af vej %{related_ways} - other: også del af veje %{related_ways} - nodes: "Punkter:" - part_of: "Del af:" - way_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Hent XML - view_details: vis detaljer - way_history: Vejhistorik - way_history_title: "Vejhistorik: %{way_name}" + one: del af vejen %{related_ways} + other: del af vejene %{related_ways} + history_title: "Vejhistorik: %{name}" + nodes: Punkter + title: "Vej: %{name}" changeset: changeset: anonymous: Anonym - big_area: (stor) - no_comment: (ingen) no_edits: (ingen ændringer) - show_area_box: vis område - still_editing: (redigerer stadig) view_changeset_details: Vis detaljer for ændringssæt changeset_paging_nav: next: Næste » previous: « Forrige - showing_page: Viser side %{page} + showing_page: Side %{page} changesets: area: Område comment: Kommentar @@ -286,37 +223,42 @@ da: saved_at: Gemt user: Bruger list: - description: Seneste ændringer - description_bbox: Ændringer inden for %{bbox} - description_friend: Changesets af dine venner - description_user: Ændringssæt af %{user} - description_user_bbox: Ændringssæt af %{user} inden for %{bbox} - heading: Ændringssæt - heading_bbox: Ændringssæt - heading_friend: Changesets - heading_user: Ændringssæt - heading_user_bbox: Ændringssæt + empty: Ingen ændringssæt er fundet. + empty_area: Ingen ændringssæt i dette område. + empty_user: Ingen ændringssæt af denne bruger. + load_more: Indlæs mere + no_more: Ikke fundet flere ændringssæt. + no_more_area: Ikke flere ændringssæt i dette område. + no_more_user: Ikke flere ændringssæt af denne bruger. title: Ændringssæt - title_bbox: Ændringssæt inden for %{bbox} - title_friend: Changesets af dine venner + title_friend: Ændringssæt af dine venner + title_nearby: Ændringssæt af nærliggende brugere title_user: Ændringssæt af %{user} - title_user_bbox: Ændringssæt af %{user} inden for %{bbox} timeout: - sorry: Desværre tog det for lang tid for at hente den ændringssætliste du har bedt om. + sorry: Desværre tog det for lang tid for at hente den liste af ændringssæt du har bedt om. diary_entry: + comments: + ago: "%{ago} siden" + comment: Kommentar + has_commented_on: "%{display_name} har kommenteret følgende blogindlæg" + newer_comments: Nyere kommentarer + older_comments: Ældre kommentarer + post: Skriv + when: Hvornår diary_comment: - comment_from: Kommentar fra %{link_user} %{comment_created_at} + comment_from: Kommentar fra %{link_user}, %{comment_created_at} confirm: Bekræft hide_link: Skjul denne kommentar diary_entry: comment_count: - one: 1 kommentar + one: "%{count} kommentar" other: "%{count} kommentarer" - comment_link: Kommentér på dette indlæg + zero: Ingen kommentarer + comment_link: Kommentér dette indlæg confirm: Bekræft edit_link: Vis dette indlæg hide_link: Skjul dette indlæg - posted_by: Skrevet af %{link_user} %{created} på %{language_link} + posted_by: Skrevet af %{link_user} den %{created} på %{language_link} reply_link: Svar på dette indlæg edit: body: "Indhold:" @@ -324,7 +266,7 @@ da: latitude: "Breddegrad:" location: "Position:" longitude: "Længdegrad:" - marker_text: Position for blogindlæg + marker_text: Placering for blogindlæg save_button: Gem subject: "Emne:" title: Ret blogindlæg @@ -338,7 +280,7 @@ da: title: OpenStreetMap-blogindlæg på %{language_name} user: description: Seneste OpenStreetMap-blogindlæg fra %{user} - title: OpenStreetMap-blogindlæg for %{user} + title: OpenStreetMap-blogindlæg fra %{user} list: in_language_title: Blogindlæg på %{language} new: Nyt blogindlæg @@ -346,8 +288,10 @@ da: newer_entries: Nyere indlæg no_entries: Ingen blogindlæg older_entries: Ældre indlæg - recent_entries: "Seneste blogindlæg:" + recent_entries: Seneste blogindlæg title: Brugerblogs + title_friends: Venners blogs + title_nearby: Blogs fra brugere i nærheden user_title: Blog for %{user} location: edit: Ret @@ -368,6 +312,9 @@ da: user_title: "%{user}'s blog" editor: default: Foretrukket (i øjeblikket %{name}) + id: + description: iD (redigér i browseren) + name: iD potlatch: description: Potlatch 1 (redigér i browseren) name: Potlatch 1 @@ -380,47 +327,65 @@ da: export: start: add_marker: Tilføj en markør på kortet - area_to_export: Område at eksportere - embeddable_html: HTML-kode + area_to_export: Område som skal eksporteres + embeddable_html: HTML der kan indlejres export_button: Eksportér - export_details: OpenStreetMaps data er licenseret under Creative Commons Attribution-ShareAlike 2.0-licensen. - format: "Format:" + export_details: OpenStreetMaps data er licenseret under Open Data Commons Open Database License (ODbL). + format: Format format_to_export: Format for eksport image_size: "Billedestørrelse:" latitude: "Bredde:" licence: Licens longitude: "Længde:" manually_select: Vælg et andet område manuelt + map_image: Kort billede (viser standard lag) max: maks options: Indstillinger osm_xml_data: OpenStreetMap XML-data output: Output - paste_html: Indsæt HTML som skal ind i siden + paste_html: Indsæt HTML som skal indlejres i siden scale: Skala too_large: - body: Dette område er for stor for at blive eksporteret som OpenStreetMap XML data. Zoom ind eller vælg et mindre område. - heading: Område for stort + advice: "Hvis ovenstående eksport mislykkes, kan du overveje at bruge en af de kilder, der er anført nedenfor:" + body: "Dette område er for stort til at blive eksporteret som OpenStreetMap XML-data. Zoom ind eller vælg et mindre område, eller brug en af de følgende kilder til bulk data-downloads:" + geofabrik: + description: Regelmæssigt opdateret uddrag af kontinenter, lande og udvalgte byer + title: Geofabrik Downloads + metro: + description: Uddrag af verdens største byer og de omkringliggende områder + title: Metro uddrag + other: + description: Yderligere kilder der er anført på OpenStreetMap wiki + title: Andre kilder + overpass: + description: Download denne afgrænsede ramme fra et spejl af OpenStreetMap databasen + title: OverføringsAPI + planet: + description: Regelmæssigt opdaterede kopier af den komplette OpenStreetMap database + title: Planet OSM zoom: Zoom - start_rjs: - add_marker: Tilføj en markør på kortet - change_marker: Skrift markørposition - click_add_marker: Klik på kortet for at tilføje en markør - drag_a_box: Træk en boks på kortet for at vælge et område - export: Eksportér - manually_select: Vælg et andet område manuelt - view_larger_map: Vis større kort + title: Eksportér + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Bare klik på eller det samme ikon på kortvisningen.\nDette vil tilføje en markør til kort, som du kan flytte\nved at trække. Tilføj din besked, klik så på gem, og andre kortlæggere vil undersøge." + join_the_community: + explanation_html: Hvis du har opdaget et problem med vores kortdata, for eksempel en vej der mangler eller din adresse, er den bedste måde at gøre noget ved det, at deltage i OpenStreetMap-fællesskabet, og tilføje eller reparere data selv. + title: Deltag i fællesskabet + title: Hvordan man kan hjælpe + other_concerns: + explanation_html: "Hvis du har bekymringer om, hvordan vores data bruges, eller om indholdet, kan du se vores\nside om ophavsret for flere juridiske oplysninger, eller kontakte den relevante\nOSMF arbejdsgruppe." + title: Andre bekymringer + title: Rapportér et problem / Ret kortet geocoder: description: title: geonames: Position fra GeoNames - osm_namefinder: "%{types} fra OpenStreetMap Namefinder" osm_nominatim: Position fra OpenStreetMap Nominatim types: cities: Storbyer places: Steder towns: Byer - description_osm_namefinder: - prefix: "%{distance} %{direction} for %{type}" direction: east: øst north: nord @@ -432,7 +397,7 @@ da: west: vest distance: one: omkring 1 km - other: omkring %{count}km + other: omkring %{count} km zero: mindre end 1 km results: more_results: Flere resultater @@ -441,26 +406,48 @@ da: title: ca_postcode: Resultater fra Geocoder.CA geonames: Resultater fra GeoNames - latlon: Resultater for koordinater - osm_namefinder: Resultater fra OpenStreetMap Namefinder + geonames_reverse: Resultater fra GeoNames + latlon: Resultater fra interne osm_nominatim: Resultater fra OpenStreetMap Nominatim + osm_nominatim_reverse: Resultater fra OpenStreetMap Nominatim uk_postcode: Resultater fra NPEMap / FreeThe Postcode us_postcode: Resultater fra Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} for %{parentname})" - suffix_place: ", %{distance} %{direction} for %{placename}" search_osm_nominatim: + admin_levels: + level10: Forstadsgrænse + level2: Landegrænse + level4: Statsgrænse + level5: Regionsgrænse + level6: Kommunegrænse + level8: Bygrænse + level9: Landsbygrænse prefix: + aerialway: + chair_lift: Stolelift + drag_lift: Træklift + station: Svævebanestation + aeroway: + aerodrome: Flyveplads + apron: Forstykke + gate: Gate + helipad: Helikopterplads + runway: Landingsbane + taxiway: Rullevej + terminal: Terminal amenity: + WLAN: WiFi-adgangspunkt airport: Lufthavn arts_centre: Kunstcenter + artwork: Kunst atm: Pengeautomat auditorium: Auditorium bank: Bank bar: Bar + bbq: Grill bench: Bænk bicycle_parking: Cykelparkering bicycle_rental: Cykeludlejning + biergarten: Udendørs øludskænkning brothel: Bordel bureau_de_change: Vekselkontor bus_station: Busstation @@ -469,11 +456,12 @@ da: car_sharing: Delebiler car_wash: Bilvask casino: Kasino + charging_station: Ladestation cinema: Biograf clinic: Klinik club: Klub - college: College - community_centre: Fællesskabscenter + college: Videregående uddanelsesinstitution + community_centre: Forsamlingshus / lokalcenter courthouse: Retsbygning crematorium: Krematorium dentist: Tandlæge @@ -487,6 +475,7 @@ da: ferry_terminal: Færgeterminal fire_hydrant: Brandhane fire_station: Brandstation + food_court: Food Court fountain: Springvand fuel: Benzinstation grave_yard: Kirkegård @@ -503,17 +492,17 @@ da: marketplace: Markedsplads mountain_rescue: Bjergredning nightclub: Natklub - nursery: Børnehaveklasse + nursery: Førskole nursing_home: Plejehjem office: Kontor park: Park parking: Parkering pharmacy: Apotek - place_of_worship: Kultsted + place_of_worship: Sted for gudstjenester police: Politi post_box: Postkasse post_office: Postkontor - preschool: Børnehaveklasse + preschool: Før-børnehaveklasse prison: Fængsel pub: Pub public_building: Offentlig bygning @@ -527,9 +516,13 @@ da: shelter: Shelter shop: Forretning shopping: Indkøb + shower: Brusebad + social_centre: Socialcenter social_club: Social klub + social_facility: Socialforsogsfacilitet studio: Studie supermarket: Supermarked + swimming_pool: Swimmingpool taxi: Taxa telephone: Offentlig telefon theatre: Teater @@ -544,8 +537,20 @@ da: youth_centre: Ungdomscenter boundary: administrative: Administrativ grænse + census: Folketællingsgrænse + national_park: Nationalpark + protected_area: Beskyttet område + bridge: + aqueduct: Akvædukt + suspension: Hængebro + swing: Drejebro + viaduct: Viadukt + "yes": Bro building: "yes": Bygning + emergency: + fire_hydrant: Brandhane + phone: Nødtelefon highway: bridleway: Ridesti bus_guideway: Styret busspor @@ -557,6 +562,7 @@ da: footway: Gangsti ford: Vadested living_street: Vej med legende børn + milestone: Milepæl minor: Mindre vej motorway: Motorvej motorway_junction: Motorvejsafkørsel @@ -566,16 +572,21 @@ da: platform: Perron primary: Hovedvej (primærrute) primary_link: Hovedvej (primærrute) + proposed: Foreslået vej raceway: Racerbane residential: Vej i byområder + rest_area: Rasteplads road: Vej secondary: Hovedvej (sekundærrute) secondary_link: Hovedvej (sekundærrute) service: Adgangsvej services: Motorvejsserviceområde + speed_camera: Fartkamera steps: Trappe stile: Fåretrappe + street_lamp: Gadelygte tertiary: Hovedvej + tertiary_link: Hovedvej track: Hjulspor trail: Spor trunk: Motortrafikvej @@ -589,6 +600,8 @@ da: building: Bygning castle: Slot church: Kirke + citywalls: Bymure + fort: Skanse house: Hus icon: Ikon manor: Herregård @@ -597,6 +610,7 @@ da: monument: Monument museum: Museum ruins: Ruin + tomb: Grav tower: Tårn wayside_cross: Vejkors wayside_shrine: Vejside helligdom @@ -613,6 +627,7 @@ da: farmland: Landbrugsjord farmyard: Gårdsplads forest: Skov + garages: Garager grass: Græs greenfield: Ikke-udviklet område industrial: Industriområde @@ -621,22 +636,27 @@ da: military: Militært område mine: Mine nature_reserve: Naturreservat + orchard: Plantage park: Park piste: Piste quarry: Stenbrud/grusgrav railway: Jernbane recreation_ground: Idrætsplads reservoir: Reservoir + reservoir_watershed: Vandreservoir residential: Boligområde retail: Detailhandel + road: Vejområde village_green: Forte vineyard: Vingård wetland: Vådområde wood: Skov leisure: beach_resort: Badestrand + bird_hide: Fugleskjul common: Fælles arealer fishing: Fiskeområde + fitness_station: Udendørs fitness udstyr garden: Have golf_course: Golfbane ice_rink: Skøjtebane @@ -647,12 +667,19 @@ da: pitch: Sportsarena playground: Legeplads recreation_ground: Idrætsplads + sauna: Sauna slipway: Bedding sports_centre: Sportscenter stadium: Stadion swimming_pool: Svømmebasin track: Løbebane water_park: Vandland + military: + airfield: Militær flyveplads + barracks: Kaserne + bunker: Bunker + mountain_pass: + "yes": Bjergpas natural: bay: Bugt beach: Strand @@ -661,9 +688,11 @@ da: channel: Kanal cliff: Forbjerg crater: Krater + dune: Klit feature: Landskabsdetalje fell: Fjeld fjord: Fjord + forest: Skov geyser: Gejser glacier: Gletsjer heath: Hede @@ -683,6 +712,7 @@ da: scrub: Krat shoal: Sandbanke spring: Kilde + stone: Sten strait: Sund tree: Træ valley: Dal @@ -691,6 +721,19 @@ da: wetland: Vådområde wetlands: Vådområder wood: Skov + office: + accountant: Revisor + architect: Arkitekt + company: Firma + employment_agency: Arbejdsløshedskontor + estate_agent: Ejendomsmægler + government: Statligt kontor + insurance: Forsikringskontor + lawyer: Advokat + ngo: ikkestatsligt kontor (NGO) + telecommunication: Telekommunikationskontor + travel_agent: Rejsebureau + "yes": Kontor place: airport: Lufthavn city: Storby @@ -702,20 +745,22 @@ da: houses: Huse island: Ø islet: Holm + isolated_dwelling: Enlig bolig locality: Sted moor: Hede municipality: Kommune + neighbourhood: Kvarter postcode: Postnummer region: Region sea: Hav state: Stat - subdivision: Underafdeling + subdivision: Bydel suburb: Forstad town: By unincorporated_area: Kommunefrit område village: Landsby railway: - abandoned: Forladt jernbane + abandoned: Nedlagt jernbane construction: Jernbane under konstruktion disused: Nedlagt jernbane disused_station: Nedlagt jernbanestation @@ -725,12 +770,15 @@ da: junction: Jernbaneovergang level_crossing: Jernbaneoverskæring light_rail: Bybane + miniature: Miniature jernbane monorail: Monorail - narrow_gauge: Smalsporjernbane + narrow_gauge: Smalsporsjernbane platform: Jernbaneperron preserved: Bevaret jernbane + proposed: Foreslået jernbane spur: Jernbanesidespor station: Jernbanestation + stop: Jernbanestation subway: Undergrundsstation subway_entrance: Undergrundsindgang switch: Sporskifte @@ -739,12 +787,14 @@ da: yard: Jernbaneterræn shop: alcohol: Spiritusforretning + antiques: Antikviteter art: Kunstbutik bakery: Bager beauty: Skønhedssalon beverages: Drikkevareforretning bicycle: Cykelhandel books: Boghandel + boutique: Boutique butcher: Slagter car: Bilforhandler car_parts: Bilreservedele @@ -758,6 +808,7 @@ da: convenience: Kiosk copyshop: Kopibutik cosmetics: Kosmetikforretning + deli: Delikatessebutik department_store: Varehus discount: Tilbudsbutik doityourself: Gør-det-selv @@ -794,17 +845,21 @@ da: organic: Økologisk fødevarebutik outdoor: Udendørs butik pet: Dyrehandel + pharmacy: Apotek photo: Fotobutik salon: Salon + second_hand: Genbrugsbutik shoes: Skobutik shopping_centre: Indkøbscenter sports: Sportsforretning stationery: Papirvarehandel supermarket: Supermarked + tailor: Skrædder toys: Legetøjsbutik travel_agency: Rejsebureau video: Videoforretning wine: Vinforretning + "yes": Forretning tourism: alpine_hut: Bjerghytte artwork: Kunst @@ -826,7 +881,11 @@ da: valley: Dal viewpoint: Udsigtspunkt zoo: Zoologisk have + tunnel: + culvert: Stenkiste + "yes": Tunnel waterway: + artificial: Kunstig vandvej boatyard: Bådeværft canal: Kanal connector: Vandvejsforbindelse @@ -847,77 +906,164 @@ da: water_point: Vandpunkt waterfall: Vandfald weir: Overløbsdæmning + help_page: + help: + description: Stil et spørgsmål eller find et svar på OSMs spørgsmål og svar side. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap har flere ressourcer til at lære om projektet, stille og besvare spørgsmål og i fællesskab diskutere og dokumentere emner omkring kortlægning. + title: Få hjælp + welcome: + description: Start med denne hurtige guide der dækker det grundlæggende i OpenStreetMap. + title: Velkommen til OSM + url: /welcome + wiki: + description: Gennemse wikien for dybdegående OSM dokumentation. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Luk + edit_help: Flyt kortet og zoom ind på et sted, du vil redigere, og klik så her. + key: + title: Kortsymboler + tooltip: Kortsymboler + tooltip_disabled: Kortnøgle findes kun til standard lag map: base: cycle_map: Cykelkort + hot: Humanitær + standard: Standard transport_map: Transportkort + copyright: © OpenStreetMap-bidragsydere + donate_link_text: + layers: + data: Kortdata + header: Kortlag + notes: Kortbemærkninger + overlays: Aktiver overlejringer til fejlfinding af kortet + title: Lag + locate: + popup: Du er inden for {distance} {unit} af dette punkt + title: Vis min placering + zoom: + in: Zoom ind + out: Zoom ud + notes: + new: + add: Tilføj bemærkning + intro: For at forbedre kortet, vil de oplysninger du indtaster, blive vist til andre kortlæggere, så vær så beskrivende og præcis som muligt, når du flytter markøren til den korrekte position og indtaster din bemærkning nedenfor. + show: + anonymous_warning: Denne bemærkning indeholder kommentarer fra anonyme brugere som bør undergå en uafhængig kontrol af oplysningerne. + comment: Kommenter + comment_and_resolve: Kommentere på og løse + hide: Skjul + reactivate: Genaktiver + resolve: Løs + share: + cancel: Annuller + center_marker: Centrér kortet på markøren + custom_dimensions: Angiv brugerdefinerede dimensioner + download: Hent + embed: HTML + format: "Format:" + image: Billede + image_size: Billedet vil vise standard lag ved + include_marker: Tilføj markør + link: Link eller HTML + long_link: Link + paste_html: Indsæt HTML som skal indlejres i websiden + scale: "Skala:" + short_link: Kort link + short_url: Kort URL + title: Del + view_larger_map: Vis større kort site: - edit_disabled_tooltip: Zoom ind for at rette kortet - edit_tooltip: Ret kortet - edit_zoom_alert: Du skal zoome ind for at rette kortet - history_disabled_tooltip: Zoom ind for at se ændringer for dette område - history_tooltip: Vis ændringer for dette område - history_zoom_alert: Du skal zoome ind for at se ændringer for dette område + createnote_disabled_tooltip: Zoom ind for at tilføje en bemærkning til kortet + createnote_tooltip: Tilføj en bemærkning på kortet + edit_disabled_tooltip: Zoom ind for at redigere kortet + edit_tooltip: Rediger kortet + map_data_zoom_in_tooltip: Zoom ind for at se kortdata + map_notes_zoom_in_tooltip: Zoom ind for at se kort kommentarer layouts: - community_blogs: Blogs fra bidragydere + about: Om + community: Fællesskabet + community_blogs: Blogs fra bidragsydere community_blogs_title: Blogs fra medlemmer af OpenStreetMap-fællesskabet - copyright: Ophavsret & licens - documentation: Dokumentation - documentation_title: Dokumentation for projektet + copyright: Ophavsret + data: Data donate: Støt OpenStreetMap med en %{link} til Hardware-upgradefonden. - donate_link_text: donation edit: Redigér edit_with: Redigér med %{editor} - export: Eksporter - export_tooltip: Eksportér kortdata + export: Eksportér + export_data: Eksporter data foundation: Fond foundation_title: OpenStreetMap-fonden gps_traces: GPS-spor gps_traces_tooltip: Håndtér GPS-spor help: Hjælp - help_centre: Hjælpecenter - help_title: Hjælpesite for projektet history: Historik - home: hjem - home_tooltip: Gå til hjemmeposition - inbox: indbakke (%{count}) - inbox_tooltip: - one: Din indbakke indeholder 1 ulæst besked - other: Din indbakke indeholder %{count} ulæste beskeder - zero: Din indbakke indeholder ingen ulæste beskeder - intro_1: OpenStreetMap er et frit, redigerbart kort over hele verden. Det er lavet af folk som dig. - license: - title: OpenStreetMap data er licenseret under en Creative Commons Navngivelse-Del på samme vilkår 2.0 Generisk Licens - log_in: log på + home: Gå til hjemmeposition + intro_2_create_account: Opret en brugerkonto + intro_header: Velkommen til OpenStreetMap! + intro_text: OpenStreetMap er et kort over verden, skabt af folk som dig og gratis at bruge under en åben licens. + learn_more: Lær mere + log_in: Log på log_in_tooltip: Log på med en eksisterende konto logo: alt_text: OpenStreetMap-logo - logout: log af - logout_tooltip: Log af + logout: Log af make_a_donation: text: Donér title: Støt OpenStreetMap med en donation + more: Mere osm_offline: OpenStreetMap-databasen er for øjeblikket offline på grund af nødvendig databasevedligeholdelse. osm_read_only: OpenStreetMap databasen er for øjeblikket ikke redigerbar på grund af database vedligeholdelse. - sign_up: opret konto + partners_bytemark: Bytemark Hosting + partners_html: Hosting understøttes af %{ucl}, %{ic} og %{bytemark} og andre %{partners}. + partners_ic: Imperial College London + partners_partners: partnere + partners_ucl: UCL VR centret + sign_up: Opret konto sign_up_tooltip: Opret en konto for at kunne redigere - sotm2011: Kom til 2011 OpenStreetMap-konferencen, Kortets tilstand, 11.-9. september i Denver! + start_mapping: Begynd kortlægningen tag_line: Det frie Wiki-verdenskort - user_diaries: Brugerdagbøger - user_diaries_tooltip: Vis brugerdagbøger - view: Kort - view_tooltip: Vis kortet - welcome_user: Velkommen, %{user_link} - welcome_user_link_tooltip: Din brugerside - wiki: Wiki - wiki_title: Wikisite for projektet + user_diaries: Brugerblogs + user_diaries_tooltip: Vis brugerblogs license_page: foreign: english_link: den engelske originaltekst text: I tilfælde af en konflikt mellem denne oversatte side og %{english_original_link} har den engelske tekst forrang title: Om denne oversættelse - legal_babble: "

    Ophavsret og licens

    \n

    OpenStreetMap er åben data, licenseret under Creative\nCommons Attribution-ShareAlike 2.0-licensen (CC BY-SA).

    \n\n

    Du kan frit kopiere, distribuere, overføre og tilpasse vores kort\nog data, så længe du angiver OpenStreetMap og dets\nbidragydere som kilde. Hvis du ændrer eller bygger på vores kort\neller data, må du kun distribuere resultatet under den samme licens. Den\nfulde juridiske tekst\nforklarer dine rettigheder og pligter.

    \n\n

    Kildeangivelse og OpenStreetMap

    \n

    Hvis du bruger OpenStreetMaps kortbilleder, anmoder vi om at\ndin kildeangivelse mindst består af “© OpenStreetMap-bidragydere,\nCC BY-SA”. Hvis du kun bruger kortdata, anmoder vi om “Kortdata\n© OpenStreetMap-bidragydere, CC BY-SA”.

    \n\n

    Så vidt muligt bør OpenStreetMap være et hyperlink til\nhttp://www.openstreetmap.org/\nog CC BY-SA til \nhttp://creativecommons.org/licenses/by-sa/2.0/.\nHvis du bruger et medium hvor hyperlinks ikke er mulige (f.eks. en tryksag), foreslår\nvi at du sender dine læsere til www.openstreetmap.org (måske ved at ændre\n'OpenStreetMap' til denne fulde adresse) og til www.creativecommons.org.

    \n\n

    Læs mere

    \n

    Læs mere om brug af vores data på den\nJuridiske FAQ.

    \n\n

    OSM-bidragydere bliver mindet om aldrig at tilføje data fra nogen\nophavsretligt beskyttede kilder (f.eks.. Google Maps eller trykte kort) uden\neksplicit tilladelse fra ophavsret-indehaverne.

    \n\n

    Selvom OpenStreetMap er åbne data, kan vi ikke levere en\ngratis kort-API til tredjeparts-udviklere.\n\nSe vores politik for API-brug,\npolitik for brug af kortbilleder\nog politik for brug af Nominatim.

    \n\n

    Vores bidragydere

    \n\n

    \nVores CC BY-SA licens kræver at du “giver den oprindelige\nforfatter kredit i rimeligt omfang i forhold til mediet eller de midler\ndu anvender”. Individuelle OSM-kortlæggere anmoder ikke om\nkildeangivelse ud over \"OpenStreetMap-bidragydere\", men hvor data\nfra et national kortlægningsagentur eller anden stor kilde er medtaget i\nOpenStreetMap, kan det være rimeligt at kreditere dem ved direkte\nkildeangivelse eller ved at linke til den på denne side.\n

    \n\n
      \n
    • Australien: indeholder forstadsdata baseret\npå data fra Australian Bureau of Statistics.
    • \n
    • Canada: indeholder data fra\nGeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada) og StatCan (Geography Division,\n Statistics Canada).
    • \n
    • New Zealand: indeholder data fra Land Information New Zealand. Crown Copyright reserveret.
    • \n
    • Polen: indeholder data fra UMP-pcPL-kort. Ophavsret\n UMP-pcPL-bidragydere.
    • \n
    • Storbritannien: indeholder Ordnance\n Survey data © Crown copyright and database right\n 2010.
    • \n
    \n\n

    \nOptagelse af data i OpenStreetMap indebærer ikke at den oprindelige\ndataudbyder siger god for OpenStreetMap, giver nogen garanti eller\naccepterer nogen form for erstatningspligt.\n

    " + legal_babble: + attribution_example: + alt: Eksempel på hvordan man angiver OpenStreetMap som kilde for en webside + title: Eksempel på kildeangivelse + contributors_at_html: "Østrig: Indeholder data fra\nStadt Wien (under\nCC BY),\nDelstaten Vorarlberg og\nDelstaten Tyrol (under CC-BY AT med tilføjelser)." + contributors_ca_html: "Canada: Indeholder data fra\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) og StatCan (Geography Division,\nStatistics Canada)." + contributors_fi_html: "Finland: Indeholder data fra National Land Survey af Finlands topografiske database og andre datasæt under NLSFI licensen." + contributors_footer_1_html: "For yderligere oplysninger om disse og andre kilder, der er blevet brugt for at hjælpe med at forbedre OpenStreetMap, se venligst siden med bidragsydere på OpenStreetMap Wiki." + contributors_footer_2_html: "Optagelse af data i OpenStreetMap indebærer ikke at den oprindelige\ndataudbyder siger god for OpenStreetMap, giver nogen garanti eller\naccepterer nogen form for erstatningspligt." + contributors_fr_html: "Frankrig: Indeholder data fra\nDirection Générale des Impôts." + contributors_gb_html: "Storbritannien: indeholder Ordnance\nSurvey data © Crown copyright and database right\n2010-12." + contributors_intro_html: "Vores bidragsydere er tusinder af individer. Vi medtager også\nåbent licenseret data fra nationale kortlægningsagenturer\nog andre kilder, blandt dem:" + contributors_nl_html: "Holland: Indeholder © AND data, 2007\n(www.and.com)" + contributors_nz_html: "New Zealand: Indeholder data fra \nLand Information New Zealand. Crown Copyright reserveret." + contributors_title_html: Vores bidragsydere + contributors_za_html: "Syd Afrika: Indeholder data fra\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserveret." + credit_1_html: Vi kræver at din kildeangivelse mindst består af “© OpenStreetMap-bidragsydere”.. + credit_2_html: "Du skal også gøre det klart, at dataene er tilgængelige under Open \nDatabase License, og hvis du bruger vores kort fliser, at kartografi er\n licenseret som CC-BY-SA. Du kan gøre dette ved at linke til\ndenne side om ophavsret. \nAlternativt, og som et krav, hvis du distribuerer OSM i en\n dataform, kan du navngive og oprette et hyperlink direkte til licenserne. I medier\n hvor hyperlinks ikke er mulig (f.eks. trykte værker), foreslår vi, at du\n henviser dine læsere til openstreetmap.org (måske ved at udvide\n'OpenStreetMap' til denne fuld adresse), til opendatacommons.org, og\n hvis relevant, til creativecommons.org." + credit_3_html: "For et navigerbart elektronisk kort, skal kildeangivelsen være i hjørnet af kortet.\nFor eksempel:" + credit_title_html: Kildeangivelse og OpenStreetMap + infringement_1_html: "OSM-bidragsydere bliver mindet om aldrig at tilføje data fra nogen\nophavsretligt beskyttede kilder (f.eks. Google Maps eller trykte kort) uden\neksplicit tilladelse fra ophavsret-indehaverne." + infringement_2_html: "Hvis du mener, at ophavsretligt beskyttet materiale uberettiget er\n føjet til OpenStreetMap databasen eller dette websted, bedes du følge\n vores procedure til fjernelse a materiale eller udfyld formular direkte på vores\non-line side." + infringement_title_html: Krænkelse af ophavsretten + intro_1_html: "OpenStreetMap er åbne data, licenseret under Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Du kan frit kopiere, distribuere, overføre og tilpasse vores data, \nså længe du angiver OpenStreetMap og dets\nbidragsydere som kilde. Hvis du ændrer eller bygger på vores\ndata, må du kun distribuere resultatet under den samme licens. Den\nfulde juridiske tekst\nforklarer dine rettigheder og pligter." + intro_3_html: Kartografi i vores kort, og vores dokumentation er licenseret under Creative Commons Navngivelse-DelPåSammeVilkår 2.0 (CC BY-SA). + more_1_html: "Læs mere om brug af vores data, og hvordan du kreditere os, på den juridiske\nFAQ." + more_2_html: "Selvom OpenStreetMap er åbne data, kan vi ikke levere en\ngratis kort-API til tredjeparts-udviklere.\n\nSe vores politik for API-brug,\npolitik for brug af kortbilleder\nog politik for brug af Nominatim." + more_title_html: Læs mere + title_html: Ophavsret og licens native: mapping_link: begynde kortlægningen native_link: den danske udgave @@ -929,8 +1075,15 @@ da: inbox: date: Dato from: Fra + messages: Du har %{new_messages} og %{old_messages} my_inbox: Min indbakke + new_messages: + one: "%{count} nye besked" + other: "%{count} nye beskeder" no_messages_yet: Du har ingen beskeder endnu. Hvorfor ikke komme i kontakt med nogle af de %{people_mapping_nearby_link}? + old_messages: + one: "%{count} gammel besked" + other: "%{count} gamle beskeder" outbox: udbakke people_mapping_nearby: folk som kortlægger i nærheden subject: Emne @@ -959,6 +1112,9 @@ da: outbox: date: Dato inbox: indbakke + messages: + one: Du har %{count} sendt besked + other: Du har %{count} sendte beskeder my_inbox: Min %{inbox_link} no_sent_messages: Du har ingen sendte beskeder endnu. Hvorfor ikke komme i kontakt med nogle af de %{people_mapping_nearby_link}? outbox: udbakke @@ -967,19 +1123,50 @@ da: title: Udbakke to: Til read: - back_to_inbox: Tilbage til indbakke - back_to_outbox: Tilbage til udbakke + back: Tilbage date: Dato from: Fra - reading_your_messages: Læser dine beskeder - reading_your_sent_messages: Læser dine sendte beskeder reply_button: Svar subject: Emne title: Læs besked to: Til unread_button: Marker som ulæst + wrong_user: Du er logget på som '%{user}', men den besked du har bedt om at læse er ikke sendt af eller til den pågældende bruger. Log venligst på som den korrekte bruger for at svare. + reply: + wrong_user: Du er logget på som '%{user}', men den besked du har bedt om at svare på blev ikke sendt til den bruger. Log venligst på som den korrekte bruger for at svare. sent_message_summary: delete_button: Slet + note: + description: + closed_at_by_html: Løst for %{when} siden af %{user} + closed_at_html: Løst for %{when} siden + commented_at_by_html: Opdateret for %{when} siden af %{user} + commented_at_html: Opdateret for %{when} siden + opened_at_by_html: Oprettet for %{when} siden af %{user} + opened_at_html: Oprettet for %{when} siden + reopened_at_by_html: Genaktiveret for %{when} siden af %{user} + reopened_at_html: Genaktiveret for %{when} siden + entry: + comment: Kommentar + full: Fuld bemærkning + mine: + ago_html: "%{when} siden" + created_at: Oprettet den + creator: Oprettet af + description: Beskrivelse + heading: "%{user}s bemærkninger" + id: Id + last_changed: Sidst ændret + subheading: Bemærkninger indsendt eller kommenteret af %{user} + title: Bemærkninger indsendt eller kommenteret af %{user} + rss: + closed: lukket bemærkning (nær %{place}) + commented: ny kommentar (nær %{place}) + description_area: En liste over bemærkninger, rapporteret, kommenteret på eller lukket i dit område [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Et RSS-feed for bemærkninger %{id} + opened: ny bemærkning (nær %{place}) + reopened: genaktiveret bemærkning (nær %{place}) + title: OpenStreetMap-bemærkninger notifier: diary_comment_notification: footer: Du kan også læse kommentaren på %{readurl}, og du kan kommentere på %{commenturl} eller svare på %{replyurl} @@ -987,24 +1174,23 @@ da: hi: Hej %{to_user}, subject: "[OpenStreetMap] %{user} kommenterede på dit blogindlæg" email_confirm: - subject: "[OpenStreetMap] Bekræft din emailadresse" + subject: "[OpenStreetMap] Bekræft din e-mailadresse" email_confirm_html: click_the_link: Hvis det er dig, skal du klikke på linket nedenfor for at bekræfte ændringen. greeting: Hej, - hopefully_you: En eller anden (forhåbentlig dig) ønsker at ændre sin emailadresse på %{server_url} til %{new_address}. + hopefully_you: En eller anden (forhåbentlig dig) ønsker at ændre sin e-mailadresse på %{server_url} til %{new_address}. email_confirm_plain: click_the_link: Hvis det er dig, skal du klikke på linket nedenfor for at bekræfte ændringen. greeting: Hej, - hopefully_you_1: En eller anden (forhåbentlig dig) vil gerne ændre sin emailadresse på - hopefully_you_2: "%{server_url} til %{new_address}." + hopefully_you: En eller anden (forhåbentlig dig) ønsker at ændre sin e-mailadresse på %{server_url} til %{new_address}. friend_notification: - befriend_them: Du kan tilføje dem som ven også på %{befriendurl}. + befriend_them: Du kan også tilføje dem som ven på %{befriendurl}. had_added_you: "%{user} har tilføjet dig som ven på OpenStreetMap." see_their_profile: Du kan se deres profil på %{userurl}. subject: "[OpenStreetMap] %{user} tilføjede dig som ven" gpx_notification: - and_no_tags: og ingen tags. - and_the_tags: "og de følgende tags:" + and_no_tags: og ingen egenskaber. + and_the_tags: "og de følgende egenskaber:" failure: failed_to_import: "kunne ikke importeres. Her er fejlen:" more_info_1: Flere oplysninger om GPX-importeringsfejl og hvordan man undgår @@ -1025,93 +1211,170 @@ da: lost_password_plain: click_the_link: Hvis dette er dig, så klik på linket nedenfor for at nulstille din adgangskode. greeting: Hej, - hopefully_you_1: En eller anden (muligvis dig) har bedt om at adgangskoden skal nulstilles for denne - hopefully_you_2: email-adresse for openstreetmap.org-konto. + hopefully_you: En eller anden (forhåbentlig dig) har bedt om at få adgangskoden nulstillet på denne e-mailadresses openstreetmap.org-konto. message_notification: - footer1: Du kan også læse beskeden på %{readurl} - footer2: og du kan svare på %{replyurl} + footer_html: Du kan også læse beskeden på %{readurl} og du kan svare på %{replyurl} header: "%{from_user} har sendt dig en besked gennem OpenStreetMap med emnet %{subject}:" hi: Hej %{to_user}, + note_comment_notification: + anonymous: En anonym bruger + closed: + commented_note: "%{commenter} har løst en kortbemærkning du har kommenteret på. Bemærkningen er i nærheden af %{place}." + subject_other: "[OpenStreetMap] %{commenter} har løst en bemærkning, du er interesseret i" + subject_own: "[OpenStreetMap] %{commenter} har løst en af dine bemærkninger" + your_note: "%{commenter} har løst en af dine kortbemærkninger nær %{place}." + commented: + commented_note: "%{commenter} har efterladt en kommentar til en kortbemærkning du har kommenteret. Bemærkningen er i nærheden af %{place}." + subject_other: "[OpenStreetMap] %{commenter} har kommenteret på en bemærkning, du er interesseret i" + subject_own: "[OpenStreetMap] %{commenter} har kommenteret på en af dine bemærkninger" + your_note: "%{commenter} har efterladt en kommentar på en af dine kortbemærkninger nær %{place}." + details: Flere oplysninger om bemærkningen kan findes på %{url}. + greeting: Hej, + reopened: + commented_note: "%{commenter} har genaktiveret en kortbemærkning du har kommenteret. Bemærkningen er i nærheden af %{place}." + subject_other: "[OpenStreetMap] %{commenter} har genaktiveret en bemærkning, du er interesseret i" + subject_own: "[OpenStreetMap] %{commenter} har genaktiveret en af dine bemærkninger" + your_note: "%{commenter} har genaktiveret en af dine kortbemærkninger nær %{place}." signup_confirm: - subject: "[OpenStreetMap] Bekræft din emailadresse" - signup_confirm_html: - ask_questions: Du kan stille alle spørgsmål du måtte have om OpenStreetMap på vores spørgsmål og svar-site. - click_the_link: Hvis dette er dig, velkommen! Klik på linket nedenfor for at bekræfte kontoen og læs videre for flere oplysninger om OpenStreetMap - current_user: En liste over nuværende brugere i kategorier baseret på hvor i verden de er, kan ses på Category:Users_by_geographical_region. - get_reading: Du kan læse om OpenStreetMap på wikien, følge de seneste nyheder via OpenStreetMap-bloggen eller Twitter, eller se OpenStreetMap-stifteren Steve Coasts OpenGeoData-blog for en hurtig udgave af projektets historie, endda med podcasts du kan lytte til! - greeting: Hejsa! - hopefully_you: En eller anden (forhåbentlig dig) vil gerne oprette en konto på - introductory_video: Du kan se en %{introductory_video_link}. - more_videos: Der er %{more_videos_link}. - more_videos_here: flere videoer her - user_wiki_page: Der anbefales du opretter en bruger-wikiside med kategoritags for hvor du er, f.eks. [[Category:Users_in_Denmark]]. - video_to_openstreetmap: introduktionsvideo til OpenStreetMap - wiki_signup: Du har muligvis også lyst til at tilmelde dig OpenStreetMap-wikien. - signup_confirm_plain: - ask_questions: "Du kan stille spørgsmål du måtte have om OpenStreetMap på vores spørgsmål og svar-side:" - blog_and_twitter: "Hold dig opdateret med de seneste nyheder via OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Hvis det er dig, velkommen! Klik på linket nedenfor for at bekræfte din - click_the_link_2: konto og læs videre for flere oplysninger om OpenStreetMap. - current_user_1: En liste over nuværende brugere i kategorier baseret på hvor i verden - current_user_2: "de er, er tilgængelig fra:" + confirm: "Før vi gør mere, har vi brug at bekræfte, at denne anmodning kommer fra dig, så hvis det er tilfældet bedes du venligst klikke på nedenstående link for at bekræfte din konto:" + created: En person (forhåbentlig dig) har lige oprettet en konto på %{site_url}. greeting: Halløj! - hopefully_you: En eller anden (forhåbentlig dig) vil gerne oprette en konto på - introductory_video: "Du kan se en introduktionsvideo til OpenStreetMap her:" - more_videos: "Der er flere videoer her:" - opengeodata: "OpenGeoData.org er OpenStreetMap-stifteren Steve Coasts blog, og der er også podcasts:" - the_wiki: "Læs mere om OpenStreetMap på wikien:" - user_wiki_1: Det anbefales at du opretter en bruger-wikiside som indeholder - user_wiki_2: kategorielementer der forklarer hvor du er, såsom [[Category:Users_in_Denmark]] - wiki_signup: "Du kan også tilmelde dig til OpenStreetMap-wikien på:" + subject: "[OpenStreetMap] Velkommen til OpenStreetMap" + welcome: Når du har bekræftet din konto, vil vi give dig nogle yderligere oplysninger så du kan komme godt i gang. oauth: oauthorize: allow_read_gpx: læse dine private GPS-spor. allow_read_prefs: læse dine brugerindstillinger. allow_to: "Tillad klient-applikationen at:" allow_write_api: tilpas kortet. - allow_write_diary: oprette dagbogssider, kommentarer og lave venskaber. + allow_write_diary: oprette blogsider, kommentarer og lave venskaber. allow_write_gpx: Upload GPS-spor. + allow_write_notes: ændre bemærkninger. allow_write_prefs: ændre dine brugerindstillinger. + request_access: Programmet %{app_name} anmoder om adgang til din konto, %{user}. Kontroller, om du vil tillade adgang til følgende funktioner. Du kan vælge lige så mange eller så få, som du ønsker. + title: Tillad adgang til din konto + oauthorize_failure: + denied: Du har nægtet programmet %{app_name} adgang til din konto. + invalid: Godkendelse token er ikke gyldigt. + title: Anmodning om tilladelse mislykkedes + oauthorize_success: + allowed: Du har givet programmet %{app_name} adgang til din konto. + title: Anmodning om tilladelse godkendt + verification: Bekræftelseskoden er %{code}. + revoke: + flash: Du har tilbagekaldt adgang for %{application} oauth_clients: + create: + flash: Registrering af informationen lykkedes + destroy: + flash: Annulerede klient programmets registrering edit: submit: Redigér - title: Rediger din applikation + title: Redigere din applikation form: + allow_read_gpx: læs deres private GPS-spor. + allow_read_prefs: læs deres brugerindstillinger. allow_write_api: ændre kortet. + allow_write_diary: oprette blogindlæg, kommentarer og lave venskaber. + allow_write_gpx: upload GPS-spor. + allow_write_notes: ændre bemærkninger. + allow_write_prefs: ændre deres brugerindstillinger. + callback_url: Callback URL name: Navn + requests: "Anmod brugeren om følgende tilladelser:" required: Påkrævet + support_url: Support URL + url: Programmets hovedadresse + index: + application: Programnavn + issued_at: Udstedt + list_tokens: "De følgende nøgler er blevet udstedt til programmer i dit navn:" + my_apps: Mine klientprogrammer + my_tokens: Mine godkendte programmer + no_apps: Har du et program, du gerne vil registrere til brug med os ved hjælp af %{oauth} standarden? Du skal registrere dit Webprogram, før det kan foretage OAuth anmodninger til denne tjeneste. + register_new: Registrer dit program + registered_apps: "Du har registreret følgende klientprogrammer:" + revoke: Tilbagekald! + title: Mine OAuth detaljer new: submit: Registrér - title: Registrer en ny applikation + title: Registrere en ny applikation + not_found: + sorry: Beklager, men %{type} kunne ikke findes. show: + access_url: "Access Token URL:" + allow_read_gpx: læse deres private GPS-spor. allow_read_prefs: læs deres brugerindstillinger. allow_write_api: tilpas kortet. + allow_write_diary: oprette blogindlæg, kommentarer og lave venskaber. allow_write_gpx: upload GPS-spor. + allow_write_notes: ændre bemærkninger. allow_write_prefs: ændre deres brugerindstillinger. authorize_url: "Godkend URL:" + confirm: Er du sikker? + delete: Slet klient edit: Redigér detaljer + key: "Forbrugernøgle:" + requests: "Anmoder brugeren om følgende tilladelser:" + secret: "Forbrugerhemmelighed:" + support_notice: Vi understøtter HMAC-SHA1- (anbefales) og RSA-SHA1-signaturer. + title: OAuth detaljer for %{app_name} + url: "Request Token URL:" + update: + flash: Opdateret klientoplysninger + redaction: + create: + flash: Omarbejdelse oprettet. + destroy: + error: Der opstod en fejl under sletning af denne omarbejdelse. + flash: Omarbejdelse slettet. + not_empty: Omarbejdelse er ikke tom. Venligst fjern omarbejdelsen af alle versioner der tilhører denne omarbejdelse, før du sletter den. + edit: + description: Beskrivelse + heading: Rediger omarbejdelse + submit: Gem omarbejdelse + title: Rediger omarbejdelse + index: + empty: Ingen omarbejdelser at vise. + heading: Liste over omarbejdelser + title: Liste over omarbejdelser + new: + description: Beskrivelse + heading: Angiv oplysninger om ny omarbejdelse + submit: Opret omarbejdelse + title: Opretter ny omarbejdelse + show: + confirm: Er du sikker? + description: "Beskrivelse:" + destroy: Fjern denne omarbejdelse + edit: Rediger denne omarbejdelse + heading: Viser omarbejdelse "%{title}" + title: Viser omarbejdelse + user: "Oprettet af:" + update: + flash: Ændringer gemt. site: edit: anon_edits_link_text: Find ud af hvorfor. + flash_player_required: Du har brug for en Flash afspiller for at bruge Potlatch, OpenStreetMap Flash editoren. Du kan hente Flash Player fra Adobe.com. Flere andre indstillinger er også tilgængelige til redigering af OpenStreetMap. + id_not_configured: iD er ikke blevet konfigureret no_iframe_support: Din browser understøtter ikke HTML-iframes som er nødvendige for denne funktion. not_public: Du har ikke angivet af dine ændringer skal være offentlige. not_public_description: Du kan ikke længere redigere kortet medmindre du gør dette. Du kan gøre dine ændringer offentlige fra din %{user_page}. + potlatch2_not_configured: Potlatch 2 er ikke blevet konfigureret - se venligst http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for flere oplysninger potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch 2 skal du trykke på gem-knappen). 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). user_page_link: brugerside index: + createnote: Tilføj en bemærkning js_1: Du bruger enten en browser som ikke understøtter Javascript, eller du har deaktiveret Javascript. js_2: OpenStreetMap bruger JavaScript til det interaktive kort. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Licenseret under %{license_name}-licensen af %{project_name} og dets bidragydere. - project_name: OpenStreetMap-projektet + copyright: Ophavsret tilhører OpenStreetMap og bidragsydere, under en open license permalink: Permalink remote_failed: Redigering mislykkede - tjek at JOSM eller Merkaartor er startet og fjernbetjening er aktiveret shortlink: Kort link key: - map_key: Signaturforklaring - map_key_tooltip: Signaturforklaring for kortet table: entry: admin: Administrativ grænse @@ -1178,12 +1441,28 @@ da: unclassified: Anden vej unsurfaced: Uasfalteret vej wood: Skov + markdown_help: + alt: Alt-tekst + first: Første objekt + heading: Overskrift + headings: Overskrifter + image: Billede + link: Link + ordered: Sorteret liste + second: Andet objekt + subheading: Underoverskrift + text: Tekst + title_html: Parset med Markdown + unordered: Usorteret liste + url: URL + richtext_area: + edit: Redigér + preview: Forhåndsvisning search: search: Søg - search_help: "eksempler: 'Alkmaar', 'Rådhuspladsen, København', 'CB2 5AQ' eller 'post offices near Lünen' flere eksempler..." submit_text: Søg where_am_i: Hvor er jeg? - where_am_i_title: Beskriv den nuværende position med søgemaskinen + where_am_i_title: Beskriv den nuværende position ved hjælp af søgemaskinen sidebar: close: Luk search_results: Søgeresultater @@ -1196,6 +1475,11 @@ da: upload_trace: Upload GPS-spor delete: scheduled_for_deletion: Spor planlagt til at blive slettet + description: + description_with_count: + one: GPX fil med %{count} punkt fra %{user} + other: GPX fil med %{count} punkter fra %{user} + description_without_count: GPX fil fra %{user} edit: description: "Beskrivelse:" download: hent @@ -1213,7 +1497,11 @@ da: uploaded_at: "Indsendt:" visibility: "Synlighed:" visibility_help: hvad betyder det her? + georss: + title: OpenStreetMap GPS spor list: + description: Gennemse de seneste GPS track uploads + empty_html: Der er ingenting her endnu. Upload et nyt spor eller lær mere om GPS sporing på wiki siden. public_traces: Offentlige GPS-spor public_traces_from: Offentlige GPS-spor fra %{user} tagged_with: " med egenskaberne %{tags}" @@ -1244,7 +1532,7 @@ da: trace_form: description: "Beskrivelse:" help: Hjælp - tags: "Mærker:" + tags: "Egenskaber:" tags_help: kommasepareret upload_button: Upload upload_gpx: "Upload GPX-fil:" @@ -1253,14 +1541,16 @@ da: trace_header: see_all_traces: Vis alle spor see_your_traces: Vis alle dine spor - traces_waiting: Du har allerede %{count} GPS-spor i køen. Overvej at vente på disse før du uploader flere spor for ikke at blokkere køen for andre brugere. + traces_waiting: + one: Du har allerede et GPS-spor i køen. Overvej at vente på dette før du uploader flere spor for ikke at blokere køen for andre brugere. + other: Du har allerede %{count} GPS-spor i køen. Overvej at vente på disse før du uploader flere spor for ikke at blokere køen for andre brugere. upload_trace: Upload et spor trace_optionals: tags: Egenskaber trace_paging_nav: - next: Næste » - previous: « Forrige - showing_page: Viser side %{page} + newer: Nyere spor + older: Ældre spor + showing_page: Side %{page} view: delete_track: Slet dette spor description: "Beskrivelse:" @@ -1288,17 +1578,21 @@ da: user: account: contributor terms: - agreed: Du har accepteret de nye bidragyder-betingelser. + agreed: Du har accepteret de nye vilkår for bidragsydere. agreed_with_pd: Du har også erklæret at du anser dine ændringer for at være fælleseje/uden ophavsret. - heading: "Bidragyder-betingelser:" + heading: "Vilkår for bidragsydere:" link text: hvad er dette? - not yet agreed: Du har endnu ikke accepteret de nye bidragyder-betingelser. - review link text: Følg dette link når det er bekvemt for dig for at gennemse og acceptere de nye bidragyder-betingelser. - current email address: "Nuværende emailadresse:" + not yet agreed: Du har endnu ikke accepteret de nye vilkår for bidragsydere. + review link text: Følg dette link når det er bekvemt for dig for at gennemse og acceptere de nye vilkår for bidragsydere. + current email address: "Nuværende e-mailadresse:" delete image: Fjern det nuværende billede email never displayed publicly: (vises aldrig offentligt) flash update success: Brugerinformation opdateret. - flash update success confirm needed: Brugeroplysninger blev opdateret. Tjek din email for en nøgle til at bekræfte din nye emailadresse. + flash update success confirm needed: Brugeroplysningerne blev opdateret. Tjek din e-mail for en nøgle til at bekræfte din nye e-mailadresse. + gravatar: + gravatar: Brug Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: hvad er dette? home location: "Hjemmeposition:" image: "Billede:" image size hint: (kvadratiske billeder på mindst 100x100 fungerer bedst) @@ -1307,7 +1601,7 @@ da: longitude: "Længdegrad:" make edits public button: Gør alle mine rettelser offentlige my settings: Mine indstillinger - new email address: "Ny e-mail-adresse:" + new email address: "Ny e-mailadresse:" new image: Tilføj et billede no home location: Du har ikke angivet din hjemmeposition. openid: @@ -1326,79 +1620,82 @@ da: heading: "Offentlig redigering:" public editing note: heading: Offentlig redigering - text: I øjeblikket er dine ændringer anonyme og andre kan ikke sende dig beskeder eller se hvor du er. Klik på knappen nedenfor for at vise hvad du har ændret og lade folk kontakte dig gennem siden. Siden 0.6 API blev sat i drift kan kun offentlige brugere rette i kortdata. (se hvorfor).
    • Din emailadresse bliver ikke afsløret ved at skifte til offentlig.
    • Den handling kan ikke omgøres, og alle nye brugere er nu offentlige som standard.
    + text: I øjeblikket er dine ændringer anonyme og andre kan ikke sende dig beskeder eller se hvor du er. Klik på knappen nedenfor for at vise hvad du har ændret og lade folk kontakte dig gennem siden. Siden 0.6 API blev sat i drift kan kun offentlige brugere rette i kortdata. (se hvorfor).
    • Din e-mailadresse bliver ikke afsløret ved at skifte til offentlig.
    • Den handling kan ikke omgøres, og alle nye brugere er nu offentlige som standard.
    replace image: Erstat det aktuelle billede - return to profile: Tilbage til pofil + return to profile: Tilbage til profil save changes button: Gem ændringer title: Rediger konto update home location on click: Opdater hjemmeposition når jeg klikker på kortet? confirm: already active: Denne konto er allerede blevet bekræftet. - before you start: Vi ved at du sandsynligvis gerne snart vil i gang med kortlægningen, men før det har du måske lyst til at udfylde nogle oplysninger om dig selv nedenfor. button: Bekræft - heading: Bekræft en konto. + heading: Tjek din e-mail! + introduction_1: Vi har sendt dig en bekræftelse via e-mail. + introduction_2: Bekræft din konto ved at klikke på linket i e-mailen, og du vil kunne starte kortlægningen. press confirm button: Tryk på "Bekræft"-knappen nedenfor for at aktivere din konto. - reconfirm: Hvis det er et stykke tid siden du tilmeldte dig bliver du muligvis nødt til at sende dig selv en ny bekræftelses-email. - success: Din konto er bekræftet, tak for din registrering! - unknown token: Denne nøgle blev ikke fundet. + reconfirm_html: Hvis du har brug for at vi gensender bekræftelsesmailen, så klik her. + unknown token: Den bekræftelseskode er udløbet eller eksisterer ikke. confirm_email: button: Bekræft - failure: En emailadresse er allerede blevet bekræftet med denne nøgle. - heading: Bekræft ændring af e-mail adresse - press confirm button: Tryk på bekræft-knappen nedenfor for at bekræfte din nye emailadresse. - success: Bekræftede din emailadresse, tak fordi du tilmeldte dig! + failure: En e-mailadresse er allerede blevet bekræftet med denne nøgle. + heading: Bekræft ændring af e-mailadresse + press confirm button: Tryk på bekræft-knappen nedenfor for at bekræfte din nye e-mailadresse. + success: Din e-mailadresse er bekræftet, tak fordi du tilmeldte dig! confirm_resend: failure: Bruger %{name} ikke fundet. - success: Vi har sendt en bekræftelses-email til %{email}, og så snart du har bekræftet din konto, kan du gå i gang med kortlægningen.

    Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler, så sørg for at du har hvidlistet webmaster@openstreetmap.org da vi ikke kan svare på den slags forespørgsler. + success: Vi har sendt en ny e-mail bekræftelse til %{email}, og så snart du har bekræftet din konto, kan du gå i gang med kortlægningen.

    Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler, så sørg for at du har hvidlistet webmaster@openstreetmap.org da vi ikke kan svare på den slags forespørgsler. filter: not_an_administrator: Du skal være administrator for at gøre dette. go_public: - flash success: Alle dine rettelser er nu offentlige, og du har lov til at rette. + flash success: Alle dine redigeringer er nu offentlige, og du har lov til at redigere. list: confirm: Bekræft valgte brugere empty: Ingen brugere fundet heading: Brugere hide: Skjul valgte brugere showing: - one: Viser side %{page} (%{first_item} af %{items}) - other: Viser side %{page} (%{first_item}-%{last_item} af %{items}) + one: Side %{page} (%{first_item} af %{items}) + other: Side %{page} (%{first_item}-%{last_item} af %{items}) summary: "%{name} oprettet fra %{ip_address} på %{date}" summary_no_ip: "%{name} oprettet på %{date}" title: Brugere login: + account is suspended: Beklager, din konto er suspenderet på grund af mistænkelig aktivitet.
    Kontakt webmasteren , hvis du ønsker at drøfte dette. account not active: Din konto er ikke aktiveret endnu.
    Klik på linket i bekræftelsesemailen for at aktivere din konto eller få sendt en ny bekræftelsesemail. auth failure: Kunne ikke logge på med disse oplysninger. create account minute: Opret en konto. Det tager kun et minut. - email or username: "E-mail-adresse eller brugernavn:" + email or username: "E-mailadresse eller brugernavn:" heading: Log på login_button: Log på - lost password link: Glemt adgangskode? + lost password link: Glemt din adgangskode? new to osm: Ny på OpenStreetMap? - notice: Læs mere om OpenStreetMaps kommende licensændring (oversættelser) (diskussion) + no account: Har du ingen konto? openid: "%{logo} OpenID:" - openid_logo_alt: Log i med et OpenID + openid invalid: Beklager, din OpenID synes at være forkert formateret + openid missing provider: Kunne ikke kontakte din OpenID-leverandør + openid_logo_alt: Log på med et OpenID openid_providers: aol: - alt: Log ind med et AOL OpenID - title: Log ind med AOL + alt: Log på med et AOL OpenID + title: Log på med AOL google: - alt: Log ind med et Google OpenID - title: Log ind med Google + alt: Log på med et Google OpenID + title: Log på med Google myopenid: - alt: Log ind med et myOpenID OpenID - title: Log ind med OpenID + alt: Log på med et myOpenID OpenID + title: Log på med myOpenID openid: - alt: Log ind med et OpenID - title: Log ind med OpenID + alt: Log på med en OpenID-URL + title: Log på med OpenID wordpress: - alt: Log ind med et Wordpress OpenID - title: Log ind med Wordpress + alt: Log på med et Wordpress OpenID + title: Log på med Wordpress yahoo: - alt: Log ind med et Yahoo OpenID - title: Log ind med Yahoo + alt: Log på med et Yahoo OpenID + title: Log på med Yahoo password: "Adgangskode:" register now: Opret nu - remember: "Husk mig:" + remember: Husk mig title: Log på to make changes: For at ændre i OpenStreetMaps data skal du have en konto. with openid: "Alternativt kan du bruge din OpenID til at logge ind:" @@ -1408,37 +1705,41 @@ da: logout_button: Log af title: Log af lost_password: - email address: "Emailadresse:" + email address: "E-mailadresse:" heading: Glemt adgangskode? - help_text: Indtast e-mail-adressen du brugte da du oprettede kontoen. Vi sender et link til den som du kan bruge til at nulstille din adgangskode. + help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender et link til den som du kan bruge til at nulstille din adgangskode. new password button: Nulstil adgangskode - notice email cannot find: Kunne ikke finde din e-mail. Beklager. + notice email cannot find: Kunne ikke finde den e-mailadresse, beklager. notice email on way: Synd du har glemt den, men en e-mail er på vej så du kan snart indstille en ny. title: Glemt adgangskode make_friend: already_a_friend: Du er allerede ven med %{name}. + button: Tilføj som en ven failed: Desværre, kunne ikke tilføje %{name} som din ven. - success: "%{name} er nu din ven." + heading: Tilføj %{user} som en ven? + success: "%{name} er nu din ven!" new: - confirm email address: "Bekræft e-mail-adresse:" + about: + header: Gratis og kan redigeres + html: "

    I modsætning til andre kort, er OpenStreetMap helt lavet af folk som dig, og det er gratis for alle at rette, opdatere, downloade og bruge.

    \n

    Tilmeld dig for at komme i gang med at bidrage. Vi vil sende en e-mail for at bekræfte din konto.

    " + confirm email address: "Bekræft e-mailadresse:" confirm password: "Bekræft adgangskode:" contact_webmaster: Kontakt venligst webmaster for at få oprettet en konto - vi vil forsøge at håndtere forespørgslen så hurtigt som muligt. - continue: Fortsæt + continue: Opret konto display name: "Vist navn:" display name description: Dit offentligt synlige brugernavn. Du kan ændre dette senere i indstillingerne. - email address: "E-mail-adresse:" - fill_form: Udfyld felterne, og vi sender dig en hurtig email til at aktivere din konto. - flash create success message: Tak for din tilmelding. Vi har sendt en bekræftelses-email til %{email}, og så snart du har bekræftet din konto, kan du gå i gang med kortlægningen.

    Hvis du bruger et antispam-system som sender bekræftelsesforespørgsler, så sørg for at du har hvidlistet webmaster@openstreetmap.org da vi ikke kan svare på den slags forespørgsler. - heading: Opret konto - license_agreement: Når du bekræfter din konto, skal du acceptere bidragyder-betingelserne. + email address: "E-mailadresse:" + license_agreement: Når du bekræfter din konto, skal du acceptere vilkårene for bidragsydere. no_auto_account_create: Vi kan desværre ikke oprette en konto automatisk for dig pt. - not displayed publicly: Vises ikke offentligt (se privatlivspolitik) + not displayed publicly: Vises ikke offentligt (se privatlivspolitik) openid: "%{logo} OpenID:" - openid no password: Med OpenID kræves ikke en adgangskode, men nogle ekstraværktøjer eller en server kan der stadig være brug for. + openid association: "

    Din OpenID er endnu ikke tilknyttet en OpenStreetMap konto.

    \n
      \n
    • Hvis du er ny på OpenStreetMap, skal du oprette en ny konto ved hjælp af formularen nedenfor.
    • \n
    • \n Hvis du allerede har en konto, kan du logge ind på din konto\n ved hjælp af dit brugernavn og adgangskode og derefter knytte kontoen\n med din OpenID i dine brugerindstillinger.\n
    • \n
    " + openid no password: Med OpenID kræves ikke en adgangskode, men nogle ekstraværktøjer eller en server kan muligvis stadig have brug for en. password: "Adgangskode:" - terms accepted: Tak for at du accepterer de nye bidragyder-betingelser! + terms accepted: Tak for at du accepterede de nye vilkår for bidragsydere! + terms declined: Vi er kede af at du har besluttet at du ikke kan acceptere de nye vilkår for bidragsydere. For yderligere oplysninger, se venligst denne wikiside. title: Opret konto - use openid: Alternativt kan du bruge %{logo} OpenID til at logge ind + use openid: Alternativt kan du bruge %{logo} OpenID til at logge på no_such_user: body: Der findes desværre ingen bruger ved navn %{user}. Tjek venligst stavningen, ellers kan linket du trykkede på være forkert. heading: Brugeren %{user} findes ikke @@ -1448,6 +1749,8 @@ da: nearby mapper: Bruger i nærheden your location: Din position remove_friend: + button: Fjern som ven + heading: Fjern %{user} som ven? not_a_friend: "%{name} er ikke en af dine venner." success: "%{name} blev fjernet fra din liste af venner." reset_password: @@ -1470,54 +1773,64 @@ da: consider_pd: I tillæg til ovennævnte aftale anser jeg mit bidrag for at være fælleseje/frit for ophavsret consider_pd_why: hvad er dette? decline: Afslå - heading: Vilkår for bidragydere + guidance: "Oplysninger til at hjælpe med at forstå disse udtryk: et menneskeligt læsbart sammendrag og nogle uformelle oversættelser" + heading: Vilkår for bidragsydere legale_names: france: Frankrig italy: Italien rest_of_world: Resten af verden legale_select: "Vælg dit bopælsland:" read and accept: Læs aftalen nedenfor og tryk på "Accepter" for at bekræfte at du accepterer betingelserne i denne aftale for dine eksisterende og fremtidige bidrag. - title: Vilkår for bidragydere - you need to accept or decline: Læs og godkend eller afvis de nye bidragyder-betingelser for at fortsætte. + title: Vilkår for bidragsydere + you need to accept or decline: Læs og godkend eller afvis de nye vilkår for bidragsydere for at fortsætte. view: activate_user: aktiver denne bruger - add as friend: tilføj som ven + add as friend: Tilføj som ven ago: (%{time_in_words_ago} siden) - block_history: vis tildelte blokeringer - blocks by me: blokeringer udført af mig - blocks on me: mine blokeringer + block_history: tildelte blokeringer + blocks by me: Blokeringer udført af mig + blocks on me: Mine blokeringer + comments: Kommentarer confirm: Bekræft confirm_user: bekræft denne bruger create_block: bloker denne bruger created from: "Oprettet fra:" ct accepted: Accepteret for %{ago} siden ct declined: Afslået - ct status: Vilkår for bidragydere + ct status: "Vilkår for bidragsydere:" ct undecided: Uafklaret deactivate_user: deaktiver denne bruger delete_user: slet denne bruger description: Beskrivelse - diary: blog - edits: ændringer - email address: "E-mail-adresse:" - friends_changesets: Gennemse alle changesets af venner + diary: Blog + edits: Redigeringer + email address: "E-mailadresse:" + friends_changesets: venners ændringssæt + friends_diaries: venners blogindlæg hide_user: skjul denne bruger - if set location: Hvis du indstiller din position, viser der sig et pænt kort her. Du kan indstille din hjemmeposition på din %{settings_link}-side. + if set location: Indstil din hjemmeposition på siden %{settings_link} for at se andre brugere i nærheden. km away: "%{count}km væk" latest edit: "Seneste ændring %{ago}:" - m away: "%{count} m væk" + m away: "%{count}m væk" mapper since: "Kortlægger siden:" - moderator_history: vis uddelte blokeringer - my diary: min blog - my edits: mine redigeringer - my settings: mine indstillinger - my traces: mine GPS-spor + moderator_history: uddelte blokeringer + my comments: Mine kommentarer + my diary: Min blog + my edits: Mine redigeringer + my messages: Mine meddelelser + my notes: Mine bemærkninger + my profile: Min profil + my settings: Mine indstillinger + my traces: Mine GPS-spor nearby users: "Andre brugere i nærheden:" + nearby_changesets: ændringssæt af brugere i nærheden + nearby_diaries: blogindlæg af brugere i nærheden new diary entry: nyt blogindlæg no friends: Du har ikke tilføjet nogle venner endnu. no nearby users: Der er ingen andre brugere der har angivet at de kortlægger i nærheden. + notes: Kortbemærkninger oauth settings: oauth-indstillinger - remove as friend: fjern som ven + remove as friend: Fjern som ven role: administrator: Denne bruger er en administrator grant: @@ -1527,7 +1840,7 @@ da: revoke: administrator: Fjern administrator-adgang moderator: Fjern moderator-adgang - send message: send besked + send message: Send besked settings_link_text: indstillinger spam score: "Spambedømmelse:" status: "Status:" @@ -1536,43 +1849,93 @@ da: user location: Brugerposition your friends: Dine venner user_block: + blocks_by: + empty: "%{name} har ikke foretaget nogen blokeringer endnu." + heading: Liste over blokeringer af %{name} + title: Blokeringer af %{name} + blocks_on: + empty: "%{name} er endnu ikke blevet blokeret." + heading: Liste over blokeringer af %{name} + title: Blokeringer af %{name} + create: + flash: Oprettet en blokering af brugeren %{name}. + try_contacting: Prøv at kontakte brugeren før blokering og giv dem en rimelig frist til at reagere. + try_waiting: Prøv at give brugeren en rimelig tid til at besvare før du blokere dem. edit: - back: Vis alle blokke - show: Vis denne blok + back: Vis alle blokeringer + heading: Redigerer blokering af %{name} + needs_view: Skal brugeren logge på, før denne blokering vil blive fjernet? + period: Hvor længe, fra og med nu, brugeren vil blive blokeret fra API. + reason: Årsagen hvorfor %{name} er blokeret. Vær venligst så rolig og så fornuftig som muligt, giv så mange detaljer, som kan du om situationen. Tænk på, at ikke alle brugerer forstår fællesskabsjargonen, så prøv at bruge hverdags udtryk. + show: Vis denne blokering submit: Opdater blokering + title: Redigerer blokering af %{name} + filter: + block_expired: Blokeringen er allerede udløbet og kan ikke redigeres. + block_period: Blokeringsperioden skal være en af de værdier der er valgbar i listen over værdier. helper: time_future: Slutter om %{time}. time_past: Sluttede %{time} siden. + until_login: Aktiv, indtil brugeren logger på. index: empty: Ingen blokeringer er blevet udført endnu. heading: Liste over brugerblokeringer title: Brugerblokeringer + model: + non_moderator_revoke: Skal være moderator for at tilbagekalde en blokering. + non_moderator_update: Skal være en moderator for at oprette eller opdatere en blokering. new: - back: Vis alle blokke + back: Vis alle blokeringer heading: Opretter blokering af %{name} - submit: Opret blok + needs_view: Brugeren skal logge på, før denne blokering vil blive fjernet + period: Hvor længe, fra og med nu, brugeren vil blive blokeret fra API. + reason: Årsagen hvorfor %{name} er blokeret. Vær venligst så rolig og så fornuftig som muligt, giv så mange detaljer, som kan du om situationen. Husk på, at meddelelsen bliver offentligt synlig. Tænk på, at ikke alle brugerer forstår fællesskabsjargonen, så prøv at bruge hverdags udtryk. + submit: Opret blokering title: Opretter blokering af %{name} + tried_contacting: Jeg har kontaktet brugeren og bedt dem stoppe. + tried_waiting: Jeg har givet en rimelig tidsfrist for brugeren til at reagere på disse meddelelser. not_found: back: Tilbage til indeks + sorry: Beklager, brugerblokeringen med ID %{id} kunne ikke findes. partial: confirm: Er du sikker? creator_name: Oprettet af display_name: Blokkeret bruger edit: Redigér + next: Næste » + not_revoked: (ikke tilbagekaldt) + previous: « Forrige reason: Årsag til blokering revoke: Tilbagekald! + revoker_name: Tilbagekaldt af show: Vis + showing_page: Side %{page} status: Status + period: + one: 1 time + other: "%{count} timer" + revoke: + confirm: Er du sikker på du vil tilbagekalde denne blokering? + flash: Denne blokering er blevet tilbagekaldt. + heading: Tilbagekalder blokering på %{block_on} af %{block_by} + past: Denne blokering endte for %{time} siden og kan ikke tilbagekaldes nu. + revoke: Tilbagekald! + time_future: Denne blokering vil ende om %{time}. + title: Tilbagekalder blokering af %{block_on} show: back: Vis alle blokeringer confirm: Er du sikker? edit: Redigér + heading: "%{block_on} blokeret af %{block_by}" + needs_view: Brugeren skal logge på, før denne blokering vil blive fjernet reason: "Årsag til blokering:" revoke: Tilbagekald! + revoker: "Tilbagekalder:" show: Vis status: Status time_future: Slutter om %{time} time_past: Sluttede %{time} siden + title: "%{block_on} blokeret af %{block_by}" update: only_creator_can_edit: Kun moderatoren som oprettede denne blokering kan ændre den. success: Blokering opdateret. @@ -1580,12 +1943,12 @@ da: filter: already_has_role: Brugeren har allerede rollen %{role}. doesnt_have_role: Brugeren har ikke rollen %{role}. - not_a_role: String'en "%{role}" er ikke en gyldig rolle. + not_a_role: Strengen "%{role}" er ikke en gyldig rolle. not_an_administrator: Kun administratorer kan forvalte brugerroller, og du er ikke en administrator. grant: - are_you_sure: Er du sikker på du vil tildele rollen "%{role}" til brugeren "%{name}"? + are_you_sure: Er du sikker på du vil tildele rollen '%{role}' til brugeren '%{name}'? confirm: Bekræft - fail: Kunne ikke give rollen %{role} til brugeren %{name}. Kontroller at brugeren og rollen begge er gyldige. + fail: Kunne ikke give rollen '%{role}' til brugeren '%{name}'. Kontroller at brugeren og rollen begge er gyldige. heading: Bekræft rolletildeling title: Bekræft rolletildeling revoke: @@ -1594,3 +1957,25 @@ da: fail: Kunne ikke fratage rollen %{role} fra brugeren %{name}. Kontroller at brugeren og rollen begge er gyldige. heading: Bekræft fratagelse af rolle title: Bekræft fratagelse af rolle + welcome_page: + add_a_note: + paragraph_1_html: Hvis du bare vil have en lille detalje rettet, men ikke har tid til at gøre det selv, så kan du tilføje en note. + paragraph_2_html: "Bare gå ind på kortet og klik på note-ikonet:\n. Dette vil tilføje et symbol som du kan trække rundt på kortet. Tilføj din besked,\nklik på gem og lad andre brugere undersøge sagen." + title: Har du ikke tid til at kortlægge selv? Tilføj en note! + basic_terms: + editor_html: En editor er et program eller en hjemmeside der kan bruges til at redigere kortet. + node_html: Et "punkt" er et sted på kortet, f.eks. en enkelt restaurant eller et træ. + paragraph_1_html: Her er nogen få begreber som er nyttige at forstå for at bidrage til OpenStreetMap. + tag_html: En egenskab er en lille bid information om et "punkt" eller en "vej", f.eks. navnet på en restaurant eller hastighedsbegrænsningen på en vej. + title: Grundlæggende begreber + way_html: En "vej" er en linje eller et areal, f.eks. en vej, en å eller en bygning. + introduction_html: Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort. Nu hvor du er oprettet som bruger er du klar til at tilføje og ændre kortinformationer. Her er en guide med de vigtigste informationer til at komme hurtigt i gang. + questions: + paragraph_1_html: "Behøver du hjælp til at kortlægge eller er du usikker på hvordan OpenStreetMap bruges? Få svar på dine spørgsmål på\nOpenStreetMaps hjælpeside." + title: Spørgsmål? + start_mapping: Editér kortet + title: Velkommen! + whats_on_the_map: + off_html: "Kortet indeholder ikke subjektive informationer (f.eks. anmeldelser), ting\nder ikke længere eksisterer, fiktive ting og ophavsretsligt beskyttede data fra andre\nkort. Kopier aldrig nogen som helst information fra andre online- eller papirkort\nmed mindre der forelægger en særlig tilladelse." + on_html: "OpenStreetMap indeholder elementer, der konkret og aktuelt findes -\nf.eks. millioner af bygninger, veje og andre detaljer om steder. Du kan kortlægge\nenhver detalje fra den virkelige verden som du interesserer dig for." + title: Hvad kortet indholder diff --git a/config/locales/de.yml b/config/locales/de.yml index 690997045dd..798105ee0df 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1,6 +1,7 @@ # Messages for German (Deutsch) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Al # Author: Als-Holder # Author: Apmon # Author: Avatar @@ -9,22 +10,43 @@ # Author: ChrisiPK # Author: CygnusOlor # Author: Daswaldhorn +# Author: Diebuche +# Author: Dieterdreist +# Author: Drolbr # Author: Fujnky # Author: Grille chompa # Author: Holger # Author: John07 +# Author: Jupiter # Author: Katpatuka # Author: Kghbln # Author: Markobr # Author: McDutchie +# Author: Metalhead64 # Author: Michi +# Author: Mormegil # Author: Pill # Author: Purodha # Author: Raymond +# Author: Reneman +# Author: SimonPoole +# Author: Snocker15 # Author: Str4nd # Author: The Evil IP address # Author: Umherirrender de: + about_page: + community_driven_html: "Die OpenStreetMap-Gemeinschaft ist vielfältig, leidenschaftlich und wächst täglich.\nUnsere Mitwirkenden sind begeisterte Mapper, GIS-Profis, Ingenieure, die die OSM-Server\nbetreiben und viele mehr.\nUm mehr über die Gemeinschaft zu erfahren, lies unsere\nBenutzertagebücher,\nCommunity-Blogs und die Website der\nOSM-Foundation." + community_driven_title: Community Driven + copyright_html: ©OpenStreetMap
    Mitwirkende + lede_text: "OpenStreetMap wird von einer Vielzahl von Mappern erstellt, die Daten zu\nWegen, Gebäuden und allerlei Weiterem weltweit erfassen und pflegen." + local_knowledge_html: "OpenStreetMap legt Wert auf lokales Wissen. Autoren benutzen\nLuftbilder, GPS-Geräte und Feldkarten zur Verifizierung, sodass OSM\nkorrekt und aktuell ist." + local_knowledge_title: Lokales Wissen + next: Nächste + open_data_html: "OpenStreetMap ist „Open Data“: Du kannst es für jeden Zweck verwenden,\nsolange du OpenStreetMap und seine Mitwirkenden erwähnst. Falls du die Daten\nabänderst oder auf bestimmte Art einbaust, darfst du das Ergebnis nur unter\nder gleichen Lizenz verbreiten. Siehe die\nUrheberrechts- und Lizenzseite für Einzelheiten." + open_data_title: Open Data + partners_title: Partner + used_by: "%{name} stellt Kartendaten für hunderte von Webseiten, Apps und andere Geräte zur Verfügung" activerecord: attributes: diary_comment: @@ -33,7 +55,7 @@ de: language: Sprache latitude: Breitengrad longitude: Längengrad - title: Titel + title: Betreff user: Benutzer friend: friend: Freund @@ -41,8 +63,8 @@ de: message: body: Text recipient: Empfänger - sender: Sender - title: Titel + sender: Absender + title: Betreff trace: description: Beschreibung latitude: Breitengrad @@ -60,7 +82,7 @@ de: languages: Sprachen pass_crypt: Passwort models: - acl: Liste für Zugangskontrolle + acl: Zugangskontrollliste changeset: Änderungssatz changeset_tag: Änderungssatz-Tag country: Staat @@ -89,214 +111,123 @@ de: tracetag: Track-Tag user: Benutzer user_preference: Benutzer-Einstellungen - user_token: Benutzer-Kürzel + user_token: Benutzer-Token way: Weg way_node: Weg-Knoten way_tag: Weg-Tag application: require_cookies: - cookies_needed: Es scheint als hättest du Cookies ausgeschaltet. Bitte aktiviere Cookies bevor du weiter gehst. + cookies_needed: Es scheint als hättest du Cookies ausgeschaltet. Bitte aktiviere Cookies, bevor du fortfährst. require_moderator: not_a_moderator: Du musst Moderator sein, um diese Aktion durchführen zu können. setup_user_auth: blocked: Dein Zugriff auf die API wurde gesperrt. Bitte melde dich auf der Web-Oberfläche an, um mehr zu erfahren. - need_to_see_terms: Dein Zugriff auf die API wurde vorübergehend ausgesetzt. Bitte melde Dich in Deinem Benutzerkonto an, um die „Bedingungen für Mitwirkende“ einzusehen. Du musst nicht einverstanden sein, aber Du musst sie gesehen haben. + need_to_see_terms: Dein Zugriff auf die API wurde vorübergehend ausgesetzt. Bitte melde dich mit deinem Benutzerkonto an, um die „Bedingungen für Mitwirkende“ einzusehen. Du musst nicht einverstanden sein, aber du musst sie gesehen haben. browse: + anonymous: anonym changeset: - changeset: "Änderungssatz: %{id}" + belongs_to: Autor changesetxml: Änderungssatz-XML - download: Als %{changeset_xml_link} oder %{osmchange_xml_link} herunterladen. feed: title: "Änderungssatz: %{id}" title_comment: Änderungssatz %{id} - %{comment} + node: Knoten (%{count}) + node_paginated: Knoten (%{x}–%{y} von %{count}) osmchangexml: osmChange XML - title: Änderungssatz - changeset_details: - belongs_to: "Erstellt von:" - bounding_box: "Bereich:" - box: Bereichsgrenze - closed_at: "Geschlossen am:" - created_at: "Erstellt am:" - has_nodes: - one: "Enthält folgenden Knoten:" - other: "Enthält folgende %{count} Knoten:" - has_relations: - one: "Enthält folgende Relation:" - other: "Enthält folgende %{count} Relationen:" - has_ways: - one: "Enthält folgenden Weg:" - other: "Enthält folgende %{count} Wege:" - no_bounding_box: Für diesen Änderungssatz wurde kein Bereich gespeichert. - show_area_box: Bereichsgrenze anzeigen - common_details: - changeset_comment: "Kommentar:" - deleted_at: "Gelöscht am:" - deleted_by: "Gelöscht von:" - edited_at: "Bearbeitet am:" - edited_by: "Bearbeitet von:" - in_changeset: "Im Änderungssatz:" - version: "Version:" + relation: Relationen (%{count}) + relation_paginated: Relationen (%{x}–%{y} von %{count}) + title: "Änderungssatz: %{id}" + way: Wege (%{count}) + way_paginated: Wege (%{x}–%{y} von %{count}) + closed: Geschlossen + closed_by_html: Geschlossen vor %{time} von %{user} + closed_html: Geschlossen vor %{time} containing_relation: entry: Relation %{relation_name} entry_role: Relation %{relation_name} (als %{relation_role}) - map: - deleted: Gelöscht - edit: - area: Bereich bearbeiten - node: Knoten bearbeiten - relation: Relation bearbeiten - way: Weg bearbeiten - larger: - area: Bereich auf größerer Karte - node: Knoten auf größerer Karte - relation: Relation auf größerer Karte - way: Weg auf größerer Karte - loading: Lade … - navigation: - all: - next_changeset_tooltip: Nächster Änderungssatz - next_node_tooltip: Nächster Knoten - next_relation_tooltip: Nächste Relation - next_way_tooltip: Nächster Weg - prev_changeset_tooltip: Vorheriger Änderungssatz - prev_node_tooltip: Vorheriger Knoten - prev_relation_tooltip: Vorherige Relation - prev_way_tooltip: Vorheriger Weg - user: - name_changeset_tooltip: Änderungen von %{user} anzeigen - next_changeset_tooltip: Nächste Änderung von %{user} - prev_changeset_tooltip: Vorherige Änderung von %{user} + created: Erstellt + created_by_html: Erstellt vor %{time} von %{user} + created_html: Erstellt vor %{time} + deleted_by_html: Gelöscht vor %{time} von %{user} + download_xml: XML herunterladen + edited_by_html: Bearbeitet vor %{time} von %{user} + in_changeset: Änderungssatz + location: "Standort:" + no_comment: (kein Kommentar) node: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" - download_xml: XML herunterladen - edit: Bearbeiten - node: Knoten - node_title: "Knoten: %{node_name}" - view_history: Chronik anzeigen - node_details: - coordinates: "Koordinaten:" - part_of: "Teil von:" - node_history: - download: "%{download_xml_link} oder %{view_details_link}" - download_xml: XML herunterladen - node_history: Knoten-Chronik - node_history_title: "Knoten-Chronik: %{node_name}" - view_details: Detailseite anzeigen + history_title: "Knotenchronik: %{name}" + title: "Knoten: %{name}" not_found: - sorry: "%{type} mit der Nummer %{id} konnte leider nicht gefunden werden. Du hast dich möglicherweise vertippt oder bist einem ungültigem Link gefolgt." + sorry: "%{type} mit der Nummer %{id} konnte leider nicht gefunden werden." type: changeset: Der Änderungssatz node: Der Knoten relation: Die Relation way: Der Weg - paging_nav: - of: von - showing_page: Zeige Seite + note: + closed_by: Erledigt von %{user} vor %{when} + closed_by_anonymous: Erledigt von anonym vor %{when} + closed_title: Erledigter Kartenfehler Nr. %{note_name} + commented_by: Kommentar von %{user} vor %{when} + commented_by_anonymous: Kommentar von anonym vor %{when} + hidden_by: Versteckt von %{user} vor %{when} + hidden_title: Versteckter Kartenfehler Nr. %{note_name} + new_note: Neuer Kartenfehler + open_by: Erstellt von %{user} vor %{when} + open_by_anonymous: Erstellt von anonym vor %{when} + open_title: Unerledigter Kartenfehler Nr. %{note_name} + reopened_by: Reaktiviert von %{user} vor %{when} + reopened_by_anonymous: Reaktiviert von anonym vor %{when} + title: "Kartenfehler: %{id}" + part_of: Teil von redacted: - message_html: "Version %{version} dieses %{type}s kann nicht angezeigt werden. Weitere Informationen sind hier angegeben: %{redaction_link}." - redaction: Ausgabe %{id} + message_html: "Version %{version} diese%{type} kann nicht angezeigt werden. Weitere Informationen sind hier angegeben: %{redaction_link}." + redaction: Ausblendung %{id} type: - node: Knoten - relation: Relation - way: Weg + node: s Knotens + relation: r Relation + way: s Wegs relation: - download: "%{download_xml_link} oder %{view_history_link}" - download_xml: XML herunterladen - relation: Relation - relation_title: "Relation: %{relation_name}" - view_history: Chronik anzeigen - relation_details: - members: "Mitglieder:" - part_of: "Mitglied von:" - relation_history: - download: "%{download_xml_link} oder %{view_details_link}" - download_xml: XML herunterladen - relation_history: Relations-Chronik - relation_history_title: "Relations-Chronik: %{relation_name}" - view_details: Details anzeigen + history_title: "Relationschronik: %{name}" + members: Mitglieder + title: "Relation: %{name}" relation_member: entry_role: "%{type} %{name} als %{role}" type: node: Knoten relation: Relation way: Weg - start: - manually_select: Einen anderen Kartenausschnitt manuell auswählen - view_data: Daten des aktuellen Kartenausschnitts anzeigen start_rjs: - data_frame_title: Daten - data_layer_name: Kartendaten durchsuchen - details: Details - drag_a_box: Einen Rahmen über die Karte aufziehen, um einen Bereich auszuwählen - edited_by_user_at_timestamp: Bearbeitet von [[user]] am [[timestamp]] - hide_areas: Gebiete ausblenden - history_for_feature: Chronik für [[feature]] + feature_warning: Laden von %{num_features} Funktionen, was deinen Browser langsam machen kann. Willst du diese Daten wirklich anzeigen? load_data: Daten laden - loaded_an_area_with_num_features: Du hast einen Bereich geladen, der [[num_features]] Elemente enthält. Manche Browser haben Probleme bei der Darstellung einer so großen Datenmenge. Normalerweise ist es am besten, nur weniger als 100 Elemente zu betrachten; alles andere macht deinen Browser langsam bzw. lässt ihn nicht mehr auf Eingaben reagieren. Wenn du sicher bist, dass du diese Daten darstellen willst, klicke auf „Daten laden“ unten. loading: Lade … - manually_select: Einen anderen Kartenausschnitt manuell auswählen - object_list: - api: Diesen Bereich von der API abfragen - back: Objektliste anzeigen - details: Details - heading: Objektliste - history: - type: - node: Knoten [[id]] - way: Weg [[id]] - selected: - type: - node: Knoten [[id]] - way: Weg [[id]] - type: - node: Knoten - way: Weg - private_user: Anonymer Benutzer - show_areas: Gebiete einblenden - show_history: Chronik - unable_to_load_size: "Konnte nicht geladen werden: Bereich der Größe [[bbox_size]] ist zu groß (soll kleiner als %{max_bbox_size} sein)" - wait: Verarbeiten … - zoom_or_select: Karte vergrößern oder einen Bereich auf der Karte auswählen tag_details: - tags: "Tags:" + tags: Tags wiki_link: key: Erläuterungsseite für das %{key}-Tag tag: Erläuterungsseite für das %{key}=%{value}-Tag wikipedia_link: Artikel zu %{page} in der Wikipedia timeout: - sorry: Entschuldigung, es dauerte zu lange die Daten für %{type} mit der ID %{id} abzurufen. + sorry: Entschuldigung, es dauerte zu lange, die Daten für %{type} mit der ID %{id} abzurufen. type: changeset: den Änderungssatz node: den Knoten relation: die Relation way: den Weg + version: Version + view_details: Einzelheiten ansehen + view_history: Chronik ansehen way: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" - download_xml: Als XML herunterladen - edit: Bearbeiten - view_history: Chronik anzeigen - way: Weg - way_title: "Weg: %{way_name}" - way_details: also_part_of: - one: Auch Teil des Wegs %{related_ways} - other: Auch Teil der Wege %{related_ways} - nodes: "Knoten:" - part_of: "Teil von:" - way_history: - download: "%{download_xml_link} oder %{view_details_link}" - download_xml: Als XML herunterladen - view_details: Detailseite anzeigen - way_history: Wege-Chronik - way_history_title: "Chronik des Wegs: %{way_name}" + one: Teil des Weges %{related_ways} + other: Teil der Wege %{related_ways} + history_title: "Wegechronik: %{name}" + nodes: Knoten + title: "Weg: %{name}" changeset: changeset: anonymous: Anonym - big_area: (groß) - no_comment: (kein Kommentar) no_edits: (keine Bearbeitung) - show_area_box: Bereich anzeigen - still_editing: (in Bearbeitung) view_changeset_details: Details des Änderungssatzes changeset_paging_nav: next: Nächste » @@ -309,24 +240,17 @@ de: saved_at: Gespeichert am user: Benutzer list: - description: Letzte Änderungen - description_bbox: Letzte Änderungen in %{bbox} - description_friend: Änderungssätze deiner Freunde - description_nearby: Änderungssätze von Benutzern in der Nähe - description_user: Letzte Änderungen von %{user} - description_user_bbox: Letzte Änderungen von %{user} in %{bbox} - heading: Änderungssätze - heading_bbox: Änderungssätze - heading_friend: Änderungssätze - heading_nearby: Änderungssätze - heading_user: Änderungssätze - heading_user_bbox: Änderungssätze + empty: Keine Änderungssätze gefunden. + empty_area: Keine Änderungssätze in diesem Bereich. + empty_user: Keine Änderungssätze von diesem Benutzer. + load_more: Mehr laden + no_more: Keine weiteren Änderungssätze gefunden. + no_more_area: Keine weiteren Änderungssätze in diesem Bereich. + no_more_user: Keine weiteren Änderungssätze von diesem Benutzer. title: Änderungssätze - title_bbox: Änderungssätze in %{bbox} title_friend: Änderungssätze deiner Freunde title_nearby: Änderungssätze von Benutzern in der Nähe title_user: Änderungssätze von %{user} - title_user_bbox: Änderungssätze von %{user} in %{bbox} timeout: sorry: Es hat leider zu lange gedauert, die von dir angeforderten Änderungssätze abzurufen. diary_entry: @@ -344,8 +268,9 @@ de: hide_link: Diesen Kommentar verbergen diary_entry: comment_count: - one: 1 Kommentar + one: "%{count} Kommentar" other: "%{count} Kommentare" + zero: Keine Kommentare comment_link: Kommentar zu diesem Eintrag confirm: Bestätigen edit_link: Diesen Eintrag bearbeiten @@ -358,15 +283,15 @@ de: latitude: "Breitengrad:" location: "Ort:" longitude: "Längengrad:" - marker_text: Ort des Eintrags + marker_text: Ort des Blogeintrags save_button: Speichern subject: "Betreff:" title: Eintrag bearbeiten - use_map_link: Karte anzeigen + use_map_link: Ort auf Karte auswählen feed: all: description: Neueste Blogeinträge von OpenStreetMap-Nutzern - title: OpenStreetMap-Blogbeiträge + title: OpenStreetMap Blogbeiträge language: description: Letzte Blogeinträge von Benutzern von OpenStreetMap in %{language_name} title: OpenStreetMap Blogeinträge in %{language_name} @@ -374,17 +299,17 @@ de: description: Letzte OpenStreetMap Blogeinträge von %{user} title: OpenStreetMap Blogeinträge von %{user} list: - in_language_title: Blogeintrag in %{language} + in_language_title: Blogeinträge in %{language} new: Selbst Bloggen new_title: Blogeintrag erstellen newer_entries: Neuere no_entries: Dieser Benutzer hat noch kein Blog older_entries: Ältere - recent_entries: "Neuste Einträge:" + recent_entries: Neueste Einträge title: Blogs - title_friends: Tagebücher meiner Freunde - title_nearby: Tagebücher von Nutzern in der Nähe - user_title: "%{user}s Blog" + title_friends: Blogs meiner Freunde + title_nearby: Blogs von Nutzern in der Nähe + user_title: Blog von %{user} location: edit: Bearbeiten location: "Ort:" @@ -400,10 +325,13 @@ de: login: Anmelden login_to_leave_a_comment: "%{login_link}, um einen Kommentar zu schreiben" save_button: Speichern - title: "%{user}s Blog | %{title}" - user_title: "%{user}s Blog" + title: Blog von %{user} | %{title} + user_title: Blog von %{user} editor: default: Standard (derzeit %{name}) + id: + description: iD (im Browser eingebetteter Editor) + name: iD potlatch: description: Potlatch 1 (im Browser eingebetteter Editor) name: Potlatch 1 @@ -411,15 +339,15 @@ de: description: Potlatch 2 (im Browser eingebetteter Editor) name: Potlatch 2 remote: - description: Remote Control (JOSM oder Merkaartor) - name: Remote Control + description: externem Editor (JOSM oder Merkaartor) + name: externem Editor export: start: add_marker: Markierung zur Karte hinzufügen area_to_export: Bereich für den Export embeddable_html: HTML zum Einbinden export_button: Export - export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter der Creative Commons Attribution-ShareAlike 2.0 Lizenz lizenziert. + export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter der Open Data Commons Open Database Lizenz (ODbL) lizenziert. format: "Format:" format_to_export: Format für den Export image_size: "Bildgröße:" @@ -432,32 +360,49 @@ de: options: Optionen osm_xml_data: OpenStreetMap-XML-Daten output: Ausgabe - paste_html: HTML-Code kopieren, um ihn in eine Website einzufügen. + paste_html: HTML-Code kopieren, um ihn in eine Website einzufügen scale: Maßstab too_large: - body: Dieser Bereich ist zu groß, um als OpenStreetMap XML-Daten exportiert werden. Bitte heranzoomen oder einen kleineren Bereich wählen. - heading: Bereich zu groß + advice: "Falls der obenstehende Export fehlschlägt, erwäge bitte, eine der unten aufgelisteten Quellen zu verwenden:" + body: Dieser Bereich ist zu groß, um als OpenStreetMap-XML-Daten exportiert werden. Bitte heranzoomen, einen kleineren Bereich wählen oder eine der folgenden Quellen für Massendatendownloads nutzen. + geofabrik: + description: Regelmäßig aktualisierte Auszüge von Kontinenten, Ländern und ausgewählten Städten. + title: Geofabrik Downloads + metro: + description: Auszüge für bedeutende Weltstädte und ihre Umgebungen + title: Metro Extracts + other: + description: Zusätzliche Quellen sind im OpenStreetMap-Wiki gelistet + title: Andere Quellen + overpass: + description: Diese Bounding Box von einem Mirror der OpenStreetMap-Datenbank herunterladen + title: Overpass API + planet: + description: Regelmäßig aktualisierte Kopien der kompletten OpenStreetMap-Datenbank + title: Planet OSM zoom: Zoom - start_rjs: - add_marker: Markierung zur Karte hinzufügen - change_marker: Position der Markierung ändern - click_add_marker: Auf die Karte klicken, um eine Markierung hinzuzufügen - drag_a_box: Einen Rahmen über der Karte aufziehen, um einen Bereich auszuwählen - export: Export - manually_select: Einen anderen Kartenausschnitt manuell auswählen - view_larger_map: Größere Karte anzeigen + title: Exportieren + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Klicke einfach auf oder auf das gleiche Symbol in der Kartenanzeige.\nDies fügt eine Markierung der Karte hinzu, die du durch Ziehen verschieben kannst.\nSchreibe deine Nachricht, klicke auf „Speichern“ und andere Mapper werden den Fehler untersuchen." + join_the_community: + explanation_html: "Falls du bei unseren Kartendaten ein Problem bemerkt hast wie das Fehlen einer Straße oder deiner Adresse,\nist der beste Weg zum Weitermachen der Beitritt zur OpenStreetMap-Gemeinschaft und das Beheben der Daten durch dich selbst." + title: Der Gemeinschaft beitreten + title: Wie man helfen kann + other_concerns: + explanation_html: "Falls du Bedenken über die Verwendung unserer Daten oder über die Inhalte hast, lies bitte unsere\nCopyright-Seite für mehr rechtliche Informationen oder kontaktiere die entsprechende\nOSMF-Arbeitsgruppe." + title: Andere Anliegen + title: Ein Problem melden / Die Karte korrigieren geocoder: description: title: - geonames: Ort von GeoNames - osm_namefinder: "%{types} vom OpenStreetMap Namefinder" - osm_nominatim: Position von OpenStreetMap Nominatim + geonames: Lage von GeoNames + osm_nominatim: Lage von OpenStreetMap Nominatim types: cities: Großstädte places: Orte towns: Städte - description_osm_namefinder: - prefix: "%{distance} %{direction} von %{type}" direction: east: östlich north: nördlich @@ -478,16 +423,26 @@ de: title: ca_postcode: Suchergebnisse von Geocoder.CA geonames: Suchergebnisse von GeoNames + geonames_reverse: Ergebnisse von GeoNames latlon: Suchergebnisse von Internal - osm_namefinder: Suchergebnisse von OpenStreetMap Namefinder osm_nominatim: Ergebnisse von OpenStreetMap Nominatim + osm_nominatim_reverse: Ergebnisse von OpenStreetMap Nominatim uk_postcode: Suchergebnisse von NPEMap / FreeThe Postcode us_postcode: Suchergebnisse von Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} von %{parentname})" - suffix_place: ", %{distance} %{direction} von %{placename}" search_osm_nominatim: + admin_levels: + level10: Nachbarschaftsgrenze + level2: Staatsgrenze + level4: Landesgrenze + level5: Regionsgrenze + level6: Kreis-/Bezirksgrenze + level8: Gemeinde-/Stadtgrenze + level9: Stadtteilgrenze prefix: + aerialway: + chair_lift: Sessellift + drag_lift: Schlepplift + station: Gondelstation aeroway: aerodrome: Flugplatz apron: Flugvorfeld @@ -499,7 +454,7 @@ de: amenity: WLAN: WLAN-Zugangspunkt airport: Flughafen - arts_centre: Kunstcenter + arts_centre: Kulturzentrum artwork: Kunstwerk atm: Geldautomat auditorium: Hörsaal @@ -541,7 +496,7 @@ de: fountain: Springbrunnen fuel: Tankstelle grave_yard: Friedhof - gym: Fitness-Zentrum + gym: Fitnessstudio hall: Halle health_centre: Gesundheitszentrum hospital: Krankenhaus @@ -566,7 +521,7 @@ de: post_office: Postamt preschool: Vorschule prison: Gefängnis - pub: Kneipe + pub: Pub public_building: Öffentliches Gebäude public_market: Öffentlicher Markt reception_area: Empfangsbereich @@ -575,15 +530,16 @@ de: retirement_home: Altersheim sauna: Sauna school: Schule - shelter: Unterkunft + shelter: Unterstand shop: Geschäft shopping: Einkaufszentrum shower: Dusche social_centre: Sozialzentrum - social_club: Geselligkeitsverein + social_club: Social Club + social_facility: Soziale Einrichtung studio: Studio supermarket: Supermarkt - swimming_pool: Schwimmbad + swimming_pool: Schwimmbecken taxi: Taxi telephone: Telefonzelle theatre: Theater @@ -592,10 +548,10 @@ de: university: Universität vending_machine: Selbstbedienungsautomat veterinary: Tierarzt - village_hall: Gemeindezentrum + village_hall: Gemeindeamt waste_basket: Mülleimer wifi: WLAN-Zugangspunkt - youth_centre: Jugendhaus + youth_centre: Jugendzentrum boundary: administrative: Verwaltungsgrenze census: Grenze des Volkszählungsgebiets @@ -609,45 +565,50 @@ de: "yes": Brücke building: "yes": Gebäude + emergency: + fire_hydrant: Hydrant + phone: Notrufsäule highway: bridleway: Reitweg bus_guideway: Busspur bus_stop: Bushaltestelle - byway: Seitenweg + byway: Seitenweg (brit.) construction: Straße im Bau cycleway: Radweg emergency_access_point: Notrufpunkt footway: Fußweg ford: Furt - living_street: Spielstraße - milestone: Meilenstein + living_street: Spiel-/Wohnstraße + milestone: Kilometerstein minor: Nebenstraße motorway: Autobahn - motorway_junction: Autobahnkreuz + motorway_junction: Autobahnausfahrt/-kreuz motorway_link: Autobahnauffahrt - path: Pfad - pedestrian: Fußgängerweg - platform: Plattform - primary: Primärstraße - primary_link: Primärauffahrt - raceway: Rennweg - residential: Wohnstraße + path: Pfad (Wanderweg) + pedestrian: Fußgängerzone + platform: Bahnsteig + primary: Bundesstraße + primary_link: Bundesstraße-Auffahrt + proposed: Geplante Straße + raceway: Rennstrecke + residential: Straße rest_area: Rastplatz road: Straße - secondary: Landstraße - secondary_link: Landstraße - service: Anliegerstraße + secondary: Landesstraße + secondary_link: Landesstraße-Auffahrt + service: Zufahrtsstraße services: Autobahnraststätte speed_camera: Blitzer steps: Treppe stile: Zaunübertritt - tertiary: Tertiärstraße - tertiary_link: Tertiärstraße + street_lamp: Straßenlaterne + tertiary: Gemeindestraße + tertiary_link: Tertiärstraße-Auffahrt track: Feldweg trail: Pfad - trunk: Fernverkehrsstraße - trunk_link: Fernstraßenauffahrt - unclassified: Landstraße + trunk: Schnellstraße + trunk_link: Schnellstraßenauffahrt + unclassified: Straße unsurfaced: Nichtasphaltierte Straße historic: archaeological_site: Ausgrabungsstätte @@ -656,36 +617,38 @@ de: building: Historisches Gebäude castle: Schloss church: Kirche + citywalls: Stadtmauern fort: Fort house: Historisches Haus - icon: Zeichen - manor: Gut - memorial: Gedenkstätte + icon: Symbol + manor: Gutshaus + memorial: Denkmal mine: Mine monument: Monument museum: Museum ruins: Ruine - tower: Turm + tomb: Grabstätte + tower: Historischer Turm wayside_cross: Wegkreuz - wayside_shrine: Schrein + wayside_shrine: Bildstock wreck: Schiffswrack landuse: - allotments: Schrebergärten + allotments: Kleingärten basin: Becken - brownfield: Bebautes Land + brownfield: Brache cemetery: Friedhof commercial: Gewerbegebiet conservation: Naturschutzgebiet construction: Baustelle farm: Bauernhof - farmland: Ackerland - farmyard: Hof + farmland: Acker + farmyard: Bauernhof forest: Wald - garages: Autoreparaturwerkstatt + garages: Garagen grass: Wiese - greenfield: unbebaute Fläche + greenfield: unerschlossene Fläche industrial: Industriegebiet - landfill: Müllhalde + landfill: Deponie meadow: Wiese military: Militärgebiet mine: Mine @@ -694,44 +657,46 @@ de: park: Park piste: Piste quarry: Steinbruch - railway: Eisenbahn - recreation_ground: Freizeitgebiet + railway: Bahnkörper + recreation_ground: Erholungsgebiet reservoir: Reservoir - reservoir_watershed: Reservoir-Einzugsgebiet + reservoir_watershed: Wassereinzugsgebiet residential: Siedlung retail: Einzelhandel - road: Straßengebiet - village_green: Dorfwiese + road: Straßenfläche + village_green: Dorfwiese (brit.) vineyard: Weingut wetland: Feuchtgebiet wood: Wald leisure: - beach_resort: Badeort - bird_hide: Vogelversteck - common: Gemeindeland + beach_resort: Strandbad + bird_hide: Vogelbeobachtungshütte + common: öffentliche Grünfläche (brit.) fishing: Fischereigrund fitness_station: Fitnessstudio garden: Garten golf_course: Golfplatz ice_rink: Eislaufplatz - marina: Yachthafen + marina: Sporthafen miniature_golf: Minigolf nature_reserve: Naturschutzgebiet park: Park pitch: Sportplatz playground: Spielplatz - recreation_ground: Freizeitbereich + recreation_ground: Erholungsgebiet sauna: Sauna - slipway: Gleitbahn + slipway: Slipanlage sports_centre: Sportzentrum stadium: Stadion - swimming_pool: Schwimmbad - track: Rennstrecke + swimming_pool: Schwimmbecken + track: Laufbahn water_park: Wasserpark military: airfield: Militärflugplatz barracks: Kaserne bunker: Bunker + mountain_pass: + "yes": Gebirgspass natural: bay: Bucht beach: Strand @@ -741,19 +706,19 @@ de: cliff: Klippe crater: Krater dune: Düne - feature: Merkmal - fell: Kahler Berg + feature: Feature + fell: Weide fjord: Fjord forest: Wald geyser: Geysir glacier: Gletscher heath: Heide - hill: Erhebung + hill: Hügel island: Insel land: Land - marsh: Moor + marsh: Marsch moor: Moor - mud: Schlamm + mud: Schlick peak: Gipfel point: Punkt reef: Riff @@ -761,7 +726,7 @@ de: river: Fluss rock: Steine scree: Geröll - scrub: Busch + scrub: Buschland shoal: Untiefe spring: Quelle stone: Findling @@ -775,14 +740,14 @@ de: wood: Wald office: accountant: Buchhaltungsbüro - architect: Architekturbüro + architect: Architekt company: Unternehmen employment_agency: Arbeitsamt - estate_agent: Imobilienhändler + estate_agent: Immobilienhändler government: Amt insurance: Krankenversicherungsbüro - lawyer: Rechtsanwaltsbüro - ngo: NGO-Büro + lawyer: Rechtsanwalt + ngo: NGO telecommunication: Postamt travel_agent: Reisebüro "yes": Büro @@ -791,48 +756,51 @@ de: city: Stadt country: Staat county: Bezirk - farm: Gehöft + farm: Bauernhof hamlet: Weiler house: Haus houses: Häuser island: Insel - islet: Inselchen - isolated_dwelling: Einzeln stehende Behausung - locality: Ortschaft + islet: Eiland + isolated_dwelling: Einzelgehöft + locality: Flur moor: Moor municipality: Gemeinde + neighbourhood: Wohngegend postcode: Postleitzahl region: Region - sea: See + sea: Meer state: Bundesland/-staat - subdivision: Untergruppe + subdivision: Vorort suburb: Stadtteil town: Stadt - unincorporated_area: Freiland + unincorporated_area: Gemeindefreies Gebiet village: Dorf railway: - abandoned: Verlassene Bahnstrecke + abandoned: Aufgelassene Bahnstrecke construction: Eisenbahn im Bau disused: Aufgelassene Bahnstrecke disused_station: Aufgelassener Bahnhof - funicular: Seilbahn + funicular: Standseilbahn halt: Haltepunkt historic_station: Ehemaliger Bahnhof - junction: Bahnknotenpunkt + junction: Bahnknoten level_crossing: Eisenbahnkreuzung - light_rail: Straßenbahn - miniature: Miniatureisenbahn + light_rail: Stadtbahn + miniature: Miniaturbahn monorail: Einschienenbahn narrow_gauge: Schmalspurbahn platform: Bahnsteig - preserved: Erhaltene Bahnspur - spur: Bahnspur + preserved: Museumsbahn + proposed: Geplante Bahnstrecke + spur: Anschlussgleis station: Bahnhof + stop: Haltepunkt subway: U-Bahn-Station - subway_entrance: U-Bahn-Zugang + subway_entrance: U-Bahn-Eingang switch: Weiche tram: Straßenbahn - tram_stop: Straßenbahn-Haltestelle + tram_stop: Haltestelle yard: Rangierbahnhof shop: alcohol: Spirituosenladen @@ -843,39 +811,41 @@ de: beverages: Getränkemarkt bicycle: Fahrradgeschäft books: Buchgeschäft + boutique: Boutique butcher: Metzgerei car: Autohaus car_parts: Autoteilehändler car_repair: Autowerkstatt carpet: Teppichladen charity: Wohltätigkeitsladen - chemist: Apotheke + chemist: Drogerie clothes: Bekleidungsgeschäft computer: Computergeschäft confectionery: Konditorei - convenience: Minimarkt + convenience: Tante-Emma-Laden copyshop: Copyshop cosmetics: Parfümerie + deli: Feinkostladen department_store: Kaufhaus discount: Diskontladen doityourself: Baumarkt dry_cleaning: Textilreinigung electronics: Elektronikgeschäft - estate_agent: Imobilienhändler + estate_agent: Immobilienhändler farm: Hofladen fashion: Modegeschäft fish: Fischereiladen - florist: Blumenladen + florist: Blumengeschäft food: Lebensmittelladen funeral_directors: Bestattungsunternehmen furniture: Möbelgeschäft gallery: Galerie - garden_centre: Gärtnerei + garden_centre: Garten-Center general: Gemischtwarenladen gift: Geschenkeladen greengrocer: Obst- und Gemüsehändler grocery: Lebensmittelladen - hairdresser: Frisörsalon + hairdresser: Frisör hardware: Eisenwarenhändler hifi: Elektroshop insurance: Versicherungsbüro @@ -889,42 +859,47 @@ de: music: Musikladen newsagent: Zeitschriftenladen optician: Optiker - organic: Biokostladen - outdoor: Freizeit-Shop + organic: Bio-Laden + outdoor: Außenbekleidungsladen pet: Tierhandlung - photo: Fotoshop + pharmacy: Apotheke + photo: Fotoladen salon: Salon + second_hand: Second-Hand-Geschäft shoes: Schuhgeschäft shopping_centre: Einkaufszentrum sports: Sportgeschäft - stationery: Papierwarenladen + stationery: Schreibwarenladen supermarket: Supermarkt + tailor: Schneiderei toys: Spielwarengeschäft travel_agency: Reisebüro - video: Videoshop - wine: Weinkost + video: Videothek + wine: Vinothek + "yes": Geschäft tourism: alpine_hut: Berghütte artwork: Kunstwerk - attraction: Attraktion + attraction: Sehenswürdigkeit bed_and_breakfast: Bed and Breakfast cabin: Hütte camp_site: Campingplatz - caravan_site: Wohnwagen-Stellplatz - chalet: Almhütte - guest_house: Gasthaus + caravan_site: Wohnmobile-Stellplatz + chalet: Chalet + guest_house: Pension hostel: Jugendherberge hotel: Hotel - information: Touristen-Information - lean_to: Anbau + information: Information + lean_to: Unterstand motel: Motel museum: Museum picnic_site: Piknikplatz - theme_park: Vergnügungspark + theme_park: Freizeitpark valley: Tal viewpoint: Aussichtspunkt zoo: Zoo tunnel: + culvert: Durchlass "yes": Tunnel waterway: artificial: Künstliche Wasserstraße @@ -935,8 +910,8 @@ de: derelict_canal: Aufgelassener Kanal ditch: Wassergraben dock: Dock - drain: Abfluss - lock: Lock + drain: Abwassergraben + lock: Schleuse lock_gate: Schleusentor mineral_spring: Mineralquelle mooring: Anlegeplatz @@ -945,69 +920,154 @@ de: riverbank: Flussufer stream: Bach wadi: Trockental - water_point: Wasserpunkt + water_point: Trinkwassernachfüllstation waterfall: Wasserfall weir: Wehr + help_page: + help: + description: Stelle eine Frage oder suche nach Antworten auf der OSM-Fragen-und-Antworten-Seite. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: "OpenStreetMap hat mehrere Quellen zum Lernen, Stellen und Beantworten von Fragen über das Projekt\nund zum gemeinsamen Diskutieren und Dokumentieren von Kartierungsthemen." + title: Hilfe erhalten + welcome: + description: Beginne mit dieser Schnellanleitung, die die OpenStreetMap-Grundlagen abdeckt. + title: Willkommen bei OSM + url: /welcome + wiki: + description: Durchsuche das Wiki für eine ausführliche OSM-Dokumentation. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Schließen + edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort, den du bearbeiten möchtest, und klicke hier. + directions: + directions: "Fahranweisungen: " + engines: + graphhopper_bicycle: "Fahrrad (GraphHopper)" + graphhopper_foot: "Fuss (GraphHopper)" + mapquest_bicycle: "Fahrrad (MapQuest)" + mapquest_foot: "Fuss (MapQuest)" + mapquest_car: "Auto (MapQuest)" + osrm_car: "Auto (OSRM)" + distance: "Distanz:" + time: "Zeit:" + errors: + no_route: "Wir konnten keine Strecke zwischen diesen beiden Orten berechnen." + no_place: "Wir konnten den Ort nicht finden." + instructions: + continue_on: "Weiter auf " + slight_right: "Rechts halten auf " + turn_right: "Rechts abbiegen auf " + sharp_right: "Hart rechts auf " + uturn: "U-turn along " + sharp_left: "Hart links auf " + turn_left: "Links abbiegen auf " + slight_left: "Links halten auf " + via_point: "(via point) " + follow: "Folge " + roundabout: "Im Kreisverkehr nehme " + leave_roundabout: "Verlasse den Kreisverkehr - " + stay_roundabout: "Stay on roundabout - " + start: "Start at end of " + destination: "Ziel erreicht" + against_oneway: "Go against one-way on " + end_oneway: "Ende der Einbahnstrasse " + unnamed: "(unbekannt)" + courtesy: "Fahranweisungen stammen von %{link}" + key: + title: Legende + tooltip: Legende + tooltip_disabled: Die Legende ist nur für die Standardebene verfügbar map: base: cycle_map: Radfahrerkarte + hot: Humanitarian mapquest: MapQuest Open standard: Standard transport_map: Verkehrskarte + copyright: © OpenStreetMap-Mitwirkende + donate_link_text: + layers: + data: Kartendaten + header: Kartenebenen + notes: Hinweise/Fehlermeldungen + overlays: Overlays zur Fehlersuche aktivieren + title: Ebenen + locate: + popup: Du bist innerhalb von {distance} {unit} um diesen Punkt + title: Aktuellen Standort anzeigen + zoom: + in: Vergrößern + out: Verkleinern + notes: + new: + add: Hinweis/Fehler melden + intro: Bitte verschiebe den Marker auf die exakte Position und gib genaue Hinweise/Informationen bzw. beschreibe den Fehler in der Karte möglichst präzise. Andere Mapper werden sich dann um die Erledigung kümmern. + show: + anonymous_warning: Dieser Hinweis enthält Kommentare von anonymen Benutzern, die unabhängig geprüft werden sollten. + comment: Kommentar + comment_and_resolve: Kommentieren & Erledigen + hide: Verstecken + reactivate: Reaktivieren + resolve: Erledigt + share: + cancel: Abbrechen + center_marker: Karte am Marker zentrieren + custom_dimensions: Ausschnitt festlegen + download: Herunterladen + embed: HTML + format: "Format:" + image: Bild + image_size: Bild zeigt Standardebene bei + include_marker: Kartenmarker setzen + link: Link oder HTML + long_link: Link + paste_html: HTML zur Einbettung in Webseiten kopieren + scale: "Maßstab:" + short_link: Kurz-URL + short_url: Kurz-URL + title: Teilen + view_larger_map: Größere Karte anzeigen site: - edit_disabled_tooltip: Reinzoomen zum Editieren der Karte + createnote_disabled_tooltip: Zum Erstellen von Hinweisen muss eine höhere Zoomstufe gewählt werden + createnote_tooltip: Einen Hinweis/Fehler zu den Kartendaten melden + edit_disabled_tooltip: Zum Editieren muss eine höhere Zoomstufe gewählt werden edit_tooltip: Karte bearbeiten - edit_zoom_alert: Du musst näher heranzoomen, um die Karte zu bearbeiten - history_disabled_tooltip: Reinzoomen um Änderungen für diesen Bereich anzuzeigen - history_tooltip: Änderungen für diesen Bereich anzeigen - history_zoom_alert: Du musst näher heranzoomen, um die Chronik zu sehen + map_data_zoom_in_tooltip: Vergrößere die Karte, um die Daten zu sehen. + map_notes_zoom_in_tooltip: Vergrößere die Karte, um die Fehler zu sehen. layouts: + about: Über community: Gemeinschaft community_blogs: Blogs community_blogs_title: Blogs von Mitwirkenden bei OpenStreetMap - copyright: Urheberrecht + Lizenz - documentation: Dokumentation - documentation_title: Projektdokumentation + copyright: Urheberrecht + data: Daten donate: Unterstütze die OpenStreetMap-Hardwarespendenaktion durch eine eigene %{link}. - donate_link_text: Spende edit: Bearbeiten edit_with: Bearbeiten mit %{editor} export: Export - export_tooltip: Kartendaten exportieren + export_data: Daten exportieren foundation: Stiftung foundation_title: Die „OpenStreetMap Foundation“ gps_traces: GPS-Tracks gps_traces_tooltip: GPS-Tracks verwalten help: Hilfe - help_centre: Hilfezentrale - help_title: Hilfesite des Projekts history: Chronik - home: Standort - home_tooltip: Eigener Standort - inbox: Posteingang (%{count}) - inbox_tooltip: - one: Dein Posteingang enthält 1 ungelesene Nachricht - other: Dein Posteingang enthält %{count} ungelesene Nachrichten - zero: Dein Posteingang enthält keine ungelesenen Nachrichten - intro_1: OpenStreetMap ist eine freie, editierbare Karte der gesamten Welt, die von Menschen wie dir erstellt wird. + home: Gehe zum Heimatstandort intro_2_create_account: Erstelle ein Benutzerkonto - intro_2_download: heruntergeladen - intro_2_html: Die Daten können gemäß der entsprechenden %{license} frei %{download} und %{use} werden. %{create_account}, um die Karte zu verbessern. - intro_2_license: Freien Lizenz - intro_2_use: genutzt - intro_2_use_url: http://wiki.openstreetmap.org/wiki/DE:Using_OpenStreetMap - license: - title: Daten von OpenStreetMap stehen unter der „Creative Commons Attribution-Share Alike 2.0 Generic“-Lizenz + intro_header: Willkommen bei OpenStreetMap! + intro_text: OpenStreetMap ist eine Karte der Welt, erstellt von Menschen wie dir und frei verwendbar unter einer offenen Lizenz. + learn_more: Mehr erfahren log_in: Anmelden - log_in_tooltip: Für dein Benutzerkonto anmelden + log_in_tooltip: Mit einem vorhandenen Konto anmelden logo: alt_text: OpenStreetMap Logo logout: Abmelden - logout_tooltip: Abmelden make_a_donation: text: Spenden title: Unterstütze OpenStreetMap mit einer Geldspende + more: Mehr osm_offline: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten nicht verfügbar. osm_read_only: Die OpenStreetMap-Datenbank ist im Moment wegen wichtiger Wartungsarbeiten im „Nur-Lesen-Modus“. partners_bytemark: Bytemark Hosting @@ -1017,24 +1077,46 @@ de: partners_ucl: vom UCL VR Centre partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: Registrieren - sign_up_tooltip: Ein Benutzerkonto zum Daten bearbeiten erstellen - sotm2011: Besuche die OpenStreetMap-Konferenz 201 „The State of the Map“ vom 9. bis 11. September in Denver! + sign_up_tooltip: Ein Konto erstellen, um Daten bearbeiten zu können + start_mapping: Mit dem Kartieren anfangen tag_line: Die freie Wiki-Weltkarte user_diaries: Benutzer-Blogs user_diaries_tooltip: Benutzer-Blogs lesen - view: Karte - view_tooltip: Karte anzeigen - welcome_user: Willkommen, %{user_link} - welcome_user_link_tooltip: Eigene Benutzerseite - wiki: Wiki - wiki_title: Wiki des Projekts - wiki_url: http://wiki.openstreetmap.org/wiki/DE:Main_Page license_page: foreign: english_link: dem englischsprachigen Original text: Für den Fall einer Abweichung zwischen der vorliegenden Übersetzung und %{english_original_link}, ist die englischsprachige Seite maßgebend. title: Über diese Übersetzung - legal_babble: "

    Urheberrecht und Lizenz

    \n\n

    \nOpenStreetMap ist „Open Data“, die gemäß der Lizenz Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA) verfügbar sind.\n

    \n

    \n Es steht dir frei unsere Daten und Karten zu kopieren, weiterzugeben, zu übermittelt sowie anzupassen, sofern du OpenStreetMap und die Mitwirkenden als Quelle angibst. Für den Fall, dass du auf Basis unserer Daten und Karten Anpassungen vornimmst, oder sie als Basis für weitere Bearbeitungen verwendest, kannst du das Ergebnis auch nur gemäß der selben Lizenz weitergeben. Der vollständige Lizenztext ist unter Lizenz einsehbar und erläutert deine Rechte und Pflichten.\n

    \n\n

    So ist auf die Urheberschaft von OpenStreetMap hinzuweisen

    \n

    \n Sofern du Bilder von OpenStreetMap verwendest, so ist mindestens „© OpenStreetMap und Mitwirkende, CC BY-SA“ als Quelle anzugeben. Werden hingegen ausschließlich Geodaten genutzt, so ist mindestens „Geodaten © OpenStreetMap und Mitwirkende, CC BY-SA“ anzugeben.\n

    \n

    \n Wo möglich, muss ein Hyperlink auf OpenStreetMap http://www.openstreetmap.org/ und die Lizenz CC BY-SA http://creativecommons.org/licenses/by-sa/2.0/ gesetzt werden. Für den Fall, dass du ein Medium einsetzt, bei dem keine derartigen Verweise möglich sind (z. B. ein gedrucktes Buch), schlagen wir vor, dass du deine Leser auf www.openstreetmap.org und www.creativecommons.org hinweist.\n

    \n\n

    Mehr hierzu in Erfahrung bringen

    \n

    \n Mehr dazu, wie unsere Daten verwendet werden können, ist unter Häufige rechtliche Fragen nachzulesen.\n

    \n

    \n Die Mitwirkenden von OpenStreetMap weisen wir darauf hin, dass du keinesfalls Daten aus urheberrechtlich geschützten Quellen verwenden darfst (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben.\n

    \n

    \n Obwohl OpenStreetMap aus freien Daten besteht, können wir Dritten keine kostenfreie Programmierschnittstelle (API) für Karten bereitstellen.\n \n Siehe hierzu die Richtlinie zur Nutzung einer API, die Richtlinie zur Nutzung von Kachelgrafiken und die Nutzungsrichtlinie bezüglich Daten von Nominatim.\n

    \n\n

    Unsere Mitwirkenden

    \n

    \n Die von uns verwendete Lizenz CC BY-SA verlangt, dass du „für das betreffende Medium oder Mittel in angemessener Weise, auf die ursprünglichen Bearbeiter hinweist.“ Einige an OpenStreetMap Mitwirkende verlangen keine über den Vermerk „OpenStreetMap und Mitwirkende“ hinausgehende Hinweise. Wo allerdings Daten von nationalen Kartografierungsinstitutionen oder aus anderen umfangreichen Quellen einbezogen wurden, ist es sinnvoll, deren Lizenzhinweise direkt wiederzugeben oder auf diese auf dieser Website zu verlinken.\n

    \n\n
      \n
    • Australien: Enthält Daten zu Siedlungen, die auf Daten des Australian Bureau of Statistics basieren.
    • \n
    • Frankreich: Enthält Daten der Direction Générale des Impôts.
    • \n
    • Kanada: Enthält Daten von GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) und StatCan (Geography Division, Statistics Canada).
    • \n
    • Neuseeland: Enthält Daten aus Land Information New Zealand. Urheberrecht vorbehalten.
    • \n
    • Österreich: Enthält Daten der Stadt Wien, lizenziert gemäß CC BY AT, des Lands Vorarlberg und des Lands Tirol (lizenziert gemäß CC BY AT mit Anpassungen zur Lizenz).
    • \n
    • Polen: Enthält Daten aus UMP-pcPL Karten. Urheberrechtlich geschützt, UMP-pcPL und Mitwirkende. Mehr zur Nutzung der UMP-Daten durch OSM
    • \n
    • Südafrika: Enthält Daten von Chief Directorate: National Geo-Spatial Information, Staatliches Urheberrecht vorbehalten.
    • \n
    • Vereinigtes Königreich: Enthält Daten des Ordnance Survey © Urheber- und Datenbankrecht 2010.
    • \n
    \n\n

    \n Die Einbeziehung von Daten bei OpenStreetMap impliziert nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt, Gewährleistung gibt, noch Haftung übernimmt.\n

    " + legal_babble: + attribution_example: + alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist + title: Namensnennungs-Beispiel auf einer Website mit elektronischer Karte + contributors_at_html: "Österreich: Enthält Daten der Stadt Wien (lizenziert gemäß CC BY AT), des Landes Vorarlberg und des Landes Tirol (lizenziert gemäß CC BY AT samt Erweiterungen zur Lizenz)." + contributors_ca_html: "Kanada: Enthält Daten von GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) und StatCan (Geography Division, Statistics Canada)." + contributors_fi_html: "Finnland: Enthält Daten von der\ntopografischen Datenbank der National Land Survey of Finland\nund andere Datensätze, unter der\nNLSFI-Lizenz." + contributors_footer_1_html: Weitere Informationen sowie andere Datenquellen, die zur Verbesserung von OpenStreetMap genutzt wurden, sind auf der Seite über die Mitwirkenden im Wiki von OpenStreetMap zu finden. + contributors_footer_2_html: Die Einbeziehung von Daten bei OpenStreetMap bedeutet nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt, Gewährleistung dafür gibt oder die Haftung dafür übernimmt. + contributors_fr_html: "Frankreich: Enthält Daten der Direction Générale des Impôts." + contributors_gb_html: "Vereinigtes Königreich: Enthält Daten des Ordnance Survey © Urheber- und Datenbankrecht 2010-12." + contributors_intro_html: "Unsere Mitwirkenden sind tausende einzelne Menschen. Wir beziehen auch offen lizenzierte Daten von nationalen Kartenagenturen und anderen Quellen ein, darunter:" + contributors_nl_html: "Niederlande: Enthält, © AND-Daten, 2007 (www.and.com)" + contributors_nz_html: "Neuseeland: Enthält Daten aus Land Information New Zealand. Urheberrecht vorbehalten." + contributors_title_html: Unsere Mitwirkenden + contributors_za_html: "Südafrika: Enthält Daten von Chief Directorate: National Geo-Spatial Information, Staatliches Urheberrecht vorbehalten." + credit_1_html: Wir verlangen die Verwendung des Hinweises „© OpenStreetMap-Mitwirkende“. + credit_2_html: "Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz\nverfügbar sind, und sofern du unsere Kartenkacheln verwendest, dass die\nKartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf\nwww.openstretmap.org/copyright verlinkst.\nErsatzweise, und als Erfordernis, falls du OSM in Datenform weitergibst,\nkannst du die Lizenz(en) direkt verlinken und benennen. In Medien, in denen\nkeine Links möglich sind (z. B. gedruckten Werken), empfehlen wir dir,\ndeine Leser direkt auf openstreetmap.org zu verweisen (möglicherweise mit\ndem Erweitern von „OpenStreetMap“ zur vollen Adresse), auf opendatacommons.org,\nund, sofern zutreffend, auf creativecommons.org." + credit_3_html: "Der Hinweis sollte für eine durchsuchbare elektronische Karte in der Ecke der Karte stehen.\nZum Beispiel:" + credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen ist + infringement_1_html: Die Mitwirkenden von OpenStreetMap weisen wir darauf hin, dass keinesfalls Daten aus urheberrechtlich geschützten Quellen verwendet werden dürfen (z. B. Google Maps oder gedruckte Kartenwerke), ohne vorher die ausdrückliche Erlaubnis des Rechteinhabers erhalten zu haben. + infringement_2_html: "Sofern du denkst, dass urheberrechtlich geschütztes Material unerlaubterweise zur\nOpenStreetMap-Datenbank oder auf dieser Website hinzugefügt wurde, informiere dich\nbitte über unser Verfahren\nzum Entfernen von Inhalten oder melde dies direkt mit unserem\nOnlineformular." + infringement_title_html: Urheberrechtsverletzung + intro_1_html: OpenStreetMap sind „Open Data“, die gemäß der Open Data Commons Open Database Lizenz (ODbL) verfügbar sind. + intro_2_html: "Es steht dir frei unsere Daten zu kopieren, weiterzugeben,\nzu übermitteln sowie anzupassen, sofern du OpenStreetMap\nund die Mitwirkenden als Quelle angibst. Für den Fall, dass\ndu auf Basis unserer Daten Anpassungen vornimmst, oder sie\nals Grundlage für weitere Bearbeitungen verwendest, kannst\ndu das Ergebnis auch nur gemäß der selben Lizenz weitergeben.\nDer vollständige Lizenztext ist unter\nLizenz\neinsehbar und erläutert deine Rechte und Pflichten." + intro_3_html: "Die Kartografie in unseren Kartenkacheln und unsere Dokumentation sind unter der Lizenz Creative \nCommons „Namensnennung, Weitergabe unter gleichen Bedingungen“ 2.0 (CC BY-SA) verfügbar." + more_1_html: Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist, kann man unter Häufige rechtliche Fragen (Legal FAQ) nachlesen. + more_2_html: "Obwohl OpenStreetMap „Open Data“ ist, können wir keine \nunentgeltliche Karten-API für Drittparteienentwickler bereitstellen.\nSiehe unsere API-Verwendungsrichtlinie,\nKachelverwendungsrichtlinie\nund Nominatim-Verwendungsrichtlinie." + more_title_html: Weitere Informationen + title_html: Urheberrecht und Lizenz native: mapping_link: mit dem Kartieren anfangen native_link: deutschen Sprachversion @@ -1049,12 +1131,12 @@ de: messages: Du hast %{new_messages} und %{old_messages} my_inbox: Posteingang new_messages: - one: eine neue Nachricht - other: "%{count} neue Nachrichten" - no_messages_yet: Du hast noch keine Nachrichten. Trete doch mit %{people_mapping_nearby_link} in Kontakt. + one: "%{count} ungelesene Nachricht" + other: "%{count} ungelesene Nachrichten" + no_messages_yet: Du hast noch keine Nachrichten. Möchtest du mit %{people_mapping_nearby_link} Kontakt aufnehmen? old_messages: - one: eine alte Nachricht - other: "%{count} alte Nachrichten" + one: "%{count} gelesene Nachricht" + other: "%{count} gelesene Nachrichten" outbox: Gesendet people_mapping_nearby: Mappern in deiner Nähe subject: Betreff @@ -1070,7 +1152,7 @@ de: new: back_to_inbox: Zurück zum Posteingang body: Text - limit_exceeded: Du hast kürzlich sehr viele Nachrichten versendet. Bitte warte etwas bevor du weitere versendest. + limit_exceeded: Du hast kürzlich sehr viele Nachrichten versendet. Bitte warte etwas, bevor du weitere versendest. message_sent: Nachricht gesendet send_button: Senden send_message_to: Eine Nachricht an %{name} senden @@ -1084,32 +1166,60 @@ de: date: Datum inbox: Posteingang messages: - one: Du hast eine Nachricht gesendet + one: Du hast %{count} Nachricht gesendet other: Du hast %{count} Nachrichten gesendet my_inbox: "%{inbox_link}" - no_sent_messages: Du hast noch keine Nachrichten versendet. Trete doch mit %{people_mapping_nearby_link} in Kontakt. + no_sent_messages: Du hast noch keine Nachrichten versendet. Möchtest du mit %{people_mapping_nearby_link} Kontakt aufnehmen? outbox: Gesendet people_mapping_nearby: Mappern in deiner Nähe subject: Betreff title: Gesendet to: An read: - back_to_inbox: Zurück zum Posteingang - back_to_outbox: Zurück zu Gesendete Nachrichten + back: Zurück date: Datum from: Absender - reading_your_messages: Eigene Nachrichten - reading_your_sent_messages: Deine versendeten Nachrichten lesen reply_button: Antworten subject: Betreff title: Nachricht lesen to: An unread_button: Als ungelesen markieren - wrong_user: Sie sind angemeldet als '%{user}', aber die Nachricht die Sie lesen wollten wurde an einen anderen Benutzer geschickt. Bitte melden Sie sich zum Lesen mit dem korrekten Benutzer an. + wrong_user: Du bist angemeldet als '%{user}', aber die Nachricht, die du lesen wolltest, wurde an einen anderen Benutzer geschickt. Bitte melde dich zum Lesen mit dem richtigen Benutzer an. reply: - wrong_user: Sie sind angemeldet als '%{user}', aber die Nachricht auf die Sie antworten wollten wurde an einen anderen Benutzer geschickt. Bitte melden Sie sich zum Beantworten mit dem korrekten Benutzer an. + wrong_user: Du bist angemeldet als '%{user}', aber die Nachricht, auf die du antworten wolltest, wurde an einen anderen Benutzer geschickt. Bitte melde dich zum Beantworten mit dem richtigen Benutzer an. sent_message_summary: delete_button: Löschen + note: + description: + closed_at_by_html: vor %{when} von %{user} gelöst + closed_at_html: vor %{when} gelöst + commented_at_by_html: vor %{when} von %{user} aktualisiert + commented_at_html: vor %{when} aktualisiert + opened_at_by_html: vor %{when} von %{user} erstellt + opened_at_html: vor %{when} erstellt + reopened_at_by_html: vor %{when} von %{user} reaktiviert + reopened_at_html: vor %{when} reaktiviert + entry: + comment: Kommentieren + full: Vollständiger Hinweis + mine: + ago_html: vor %{when} + created_at: Erstellt am + creator: Ersteller + description: Hinweis + heading: Hinweise von %{user} + id: ID + last_changed: Zuletzt geändert + subheading: Hinweise/Fehler erstellt oder kommentiert von %{user} + title: Hinweise/Fehler erstellt oder kommentiert von %{user} + rss: + closed: geschlossener Hinweis/Fehler (in der Nähe von %{place}) + commented: neuer Kommentar (in der Nähe von %{place}) + description_area: Übersicht der gemeldeten, kommentierten oder geschlossen Hinweise/Fehler im Bereich [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]. + description_item: Ein RSS-Feed für Hinweis/Fehler %{id} + opened: neuer Hinweis/Fehler (in der Nähe von %{place}) + reopened: reaktivierter Hinweis/Fehler (in der Nähe von %{place}) + title: OpenStreetMap Hinweise notifier: diary_comment_notification: footer: Hier gehts zum Eintrag %{readurl}, du kannst ihn kommentieren %{commenturl} oder direkt beantworten %{replyurl}. @@ -1125,8 +1235,7 @@ de: email_confirm_plain: click_the_link: Wenn du das bist, bestätige bitte deine E-Mail-Adresse mit dem Link unten. greeting: Hallo, - hopefully_you_1: Jemand (hoffentlich du) möchte seine E-Mail-Adresse bei - hopefully_you_2: "%{server_url} zu %{new_address} ändern." + hopefully_you: Jemand (hoffentlich du) will seine E-Mail-Adresse auf %{server_url} zu „%{new_address}“ ändern. friend_notification: befriend_them: Du kannst sie/ihn unter %{befriendurl} ebenfalls als Freund hinzufügen. had_added_you: "%{user} hat dich als Freund hinzugefügt." @@ -1136,7 +1245,7 @@ de: and_no_tags: und ohne Tags. and_the_tags: "und folgenden Tags:" failure: - failed_to_import: "konnte nicht importiert werden. Fehlermeldung:" + failed_to_import: "konnte nicht importiert werden, die Fehlermeldung:" more_info_1: Mehr Informationen über GPX-Import Fehler und wie diese vermieden werden können more_info_2: "finden sich hier:" subject: "[OpenStreetMap] GPX-Import Fehler" @@ -1155,58 +1264,58 @@ de: lost_password_plain: click_the_link: Wenn du das bist, klicke bitte auf den Link unten, um dein Passwort zurückzusetzen. greeting: Hallo, - hopefully_you_1: Jemand (hoffentlich du) hat darum gebeten sein Passwort für das - hopefully_you_2: OpenStreetMap-Benutzerkonto mit dieser E-Mail-Adresse zurückzusetzen. + hopefully_you: Jemand (wahrscheinlich du) hat eine Zurücksetzung des Passworts für das openstreetmap.org-Konto an diese E-Mail-Adresse angefordert. message_notification: - footer1: Du kannst diese Nachricht auch hier %{readurl} lesen - footer2: und hier %{replyurl} antworten + footer_html: Du kannst auch die Nachricht unter %{readurl} lesen und unter %{replyurl} antworten header: "%{from_user} hat dir eine Nachricht über OpenStreetMap mit dem Betreff %{subject} gesendet:" hi: Hallo %{to_user}, + note_comment_notification: + anonymous: Ein anonymer Benutzer + closed: + commented_note: "%{commenter} hat Problem gelöst, das du kommentiert hattest. Der Hinweis war in der Nähe von %{place}." + subject_other: "[OpenStreetMap] %{commenter} hat ein gemeldetes Problem gelöst, an dem du interessiert bist" + subject_own: "[OpenStreetMap] %{commenter} hat ein von dir gemeldetes Problem gelöst" + your_note: "%{commenter} hat ein von dir gemeldetes Problem in der Nähe von %{place} gelöst." + commented: + commented_note: "%{commenter} hat zu einem Hinweis, den du kommentiert hattest, einen weiteren Kommentar hinterlegt. Der Hinweis ist in der Nähe von %{place}." + subject_other: "[OpenStreetMap] %{commenter} hat einen Hinweis kommentiert, an dem du interessiert bist" + subject_own: "[OpenStreetMap] %{commenter} hat einen von dir gemeldeten Hinweis kommentiert" + your_note: "%{commenter} hat einen von dir gemeldeten Hinweis in der Nähe von %{place} kommentiert." + details: Weitere Details über den Hinweis findest du unter %{url}. + greeting: Hallo, + reopened: + commented_note: "%{commenter} hat einen Hinweis in der Nähe von %{place}, den du kommentiert hattest, reaktivert." + subject_other: "[OpenStreetMap] %{commenter} hat einen Hinweis, an dem du interessiert bist, reaktiviert" + subject_own: "[OpenStreetMap] %{commenter} hat einen Hinweis von dir reaktiviert" + your_note: "%{commenter} hat einen Hinweis von dir in der Nähe von %{place} reaktiviert." signup_confirm: - subject: "[OpenStreetMap] Deine E-Mail-Adresse bestätigen" - signup_confirm_html: - ask_questions: Du kannst jegliche Fragen zu OpenStreetMap auf unserer Website mit Fragen und Antworten stellen. - click_the_link: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile um dein Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM. - current_user: Ebenso ist eine Liste mit allen Benutzern in einer Kategorie, die anzeigt wo diese auf der Welt sind, verfügbar. - get_reading: Auf dieser Seite findest du einige nützliche Links und Informationen, die dir den Einstieg erleichtern werden. + confirm: "Bevor wir etwas unternehmen, benötigen wir eine Bestätigung, dass diese Anfrage von dir stammt. Falls ja, klicke bitte auf den unten stehenden Link, um dein Konto zu bestätigen:" + created: Jemand (hoffentlich du) erstellte gerade bei %{site_url} ein Benutzerkonto. greeting: Hallo! - hopefully_you: Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für - introductory_video: Du kannst dir das %{introductory_video_link} anschauen. - more_videos: Darüber hinaus gibt es noch viele weitere %{more_videos_link}. - more_videos_here: Videos über OpenStreetMap - user_wiki_page: Es wird begrüßt, wenn du eine Wiki-Benutzerseite erstellst. Bitte füge auch ein Kategorie-Tag ein, das deinen Standort anzeigt, zum Beispiel [[Category:Users_in_Berlin]]. - video_to_openstreetmap: Einführungsvideo zu OpenStreetMap - wiki_signup: Im Wiki von OpenStreetMap kannst du dich ebenfalls registrieren. - signup_confirm_plain: - ask_questions: "Du kannst jegliche Fragen zu OpenStreetMap auf unserer Website mit Fragen und Antworten stellen:" - blog_and_twitter: "Immer auf dem neuesten Stand dank dem OpenStreetMap-Blog oder Twitter:" - click_the_link_1: Wenn du das bist, Herzlich Willkommen! Bitte klicke auf den folgenden Link unter dieser Zeile, um dein - click_the_link_2: Benutzerkonto zu bestätigen. Lies danach weiter, denn es folgen mehr Informationen über OSM. - current_user_1: Eine Liste mit allen Benutzern in einer Kategorie, - current_user_2: "die anzeigt wo sie auf der Welt sind, ist hier verfügbar:" - greeting: Hallo! - hopefully_you: Jemand (hoffentlich du) möchte ein Benutzerkonto erstellen für - introductory_video: "Ein Einführungsvideo zu OpenStreetMap kannst du dir hier anschauen:" - more_videos: "Weitere Videos gibt es hier:" - opengeodata: "OpenGeoData.org ist das Blog von OpenStreetMap-Gründer Steve Coast; dort gibt es auch einen Podcast:" - the_wiki: "Weitere Informationen über OSM findest du in unserem Wiki:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/DE:Beginners_Guide - user_wiki_1: Es wird begrüßt wenn du dort eine Benutzerseite erstellst, welche - user_wiki_2: einen Kategorie-Tag enthält der auf deinen Standort hinweist, zum Beispiel [[Category:Users_in_München]]. - wiki_signup: "Im Wiki von OpenStreetMap kannst du dich ebenfalls registrieren:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Hauptseite + subject: "[OpenStreetMap] Willkommen bei OpenStreetMap" + welcome: Nach der Bestätigung deines Benutzerkontos geben wir dir zusätzliche Informationen, um anzufangen. oauth: oauthorize: - allow_read_gpx: Deine privaten GPS-Tracks auslesen + allow_read_gpx: Deine privaten GPS-Tracks auszulesen allow_read_prefs: Deine Benutzereinstellungen zu lesen allow_to: "Erlaube der Anwendung:" allow_write_api: Die OSM-Datenbank zu ändern allow_write_diary: Blogeinträge und Kommentare zu schreiben und Freunde einzutragen - allow_write_gpx: GPS-Tracks hochladen + allow_write_gpx: GPS-Tracks hochzuladen + allow_write_notes: Hinweise zu geben/Fehler zu melden allow_write_prefs: Deine Benutzereinstellungen zu verändern request_access: "Die Anwendung %{app_name} möchte auf dein OpenStreetMap-Konto %{user} zugreifen. Bitte entscheide, ob du der Anwendung die folgenden Berechtigungen gewähren möchtest. Du kannst ihr entweder alle oder einige der folgenden Berechtigungen gewähren:" + title: Zugriff auf dein Benutzerkonto autorisieren + oauthorize_failure: + denied: Du hast den Benutzerkontenzugriff für die Anwendung %{app_name} abgelehnt. + invalid: Der Autorisierungstoken ist nicht gültig. + title: Autorisierungsanfrage fehlgeschlagen + oauthorize_success: + allowed: Du hast den Benutzerkontenzugriff für die Anwendung %{app_name} gewährt. + title: Autorisierungsanfrage genehmigt + verification: Der Verifizierungscode ist %{code}. revoke: - flash: Du hast den Berechtigungsschlüssel für %{application} zurückgezogen + flash: Du hast die Berechtigung für %{application} zurückgezogen oauth_clients: create: flash: Daten erfolgreich registriert @@ -1217,14 +1326,15 @@ de: title: Anwendung bearbeiten form: allow_read_gpx: Zugriff auf ihre privaten GPS-Tracks. - allow_read_prefs: Ihre Einstellungen auslesen. - allow_write_api: Kartendaten verändern. - allow_write_diary: Tagebucheinträge und -kommentare schreiben und Freunde hinzufügen. - allow_write_gpx: GPS-Spuren hochladen - allow_write_prefs: Ihre Einstellungen verändern. + allow_read_prefs: Ihre Benutzereinstellungen auszulesen. + allow_write_api: Die Karte zu ändern. + allow_write_diary: Blogeinträge und Kommentare zu schreiben und Freunde einzutragen. + allow_write_gpx: GPS-Tracks hochzuladen. + allow_write_notes: Hinweise zu geben/Fehler zu melden. + allow_write_prefs: Ihre Einstellungen zu verändern. callback_url: Callback-URL name: Name - requests: "Die Benutzer um die folgenden Dinge um Erlaubnis bitten:" + requests: "Vom Benutzer die folgenden Genehmigungen anfordern:" required: erforderlich support_url: Support-URL url: Applikations-URL @@ -1234,7 +1344,7 @@ de: list_tokens: "Die folgenden Token wurde an Anwendungen in Ihrem Namen vergeben:" my_apps: Meine Client-Anwendungen my_tokens: Meine autorisierten Anwendungen - no_apps: Wenn du mit einer Anwendung gerne den %{oauth}-Standard verwenden würdest, musst du sie hier registrieren. + no_apps: Wenn du mit einer Anwendung den %{oauth}-Standard verwenden möchtest, musst du sie hier registrieren. register_new: Anwendung registrieren registered_apps: "Du hast die folgenden Client-Anwendungen registriert:" revoke: Widerrufen! @@ -1243,82 +1353,81 @@ de: submit: Registrieren title: Eine neue Anwendung registrieren not_found: - sorry: Es tut mir leid, aber %{type} wurde nicht gefunden. + sorry: "%{type} konnte leider nicht gefunden werden." show: access_url: "Zugriffstoken-URL:" allow_read_gpx: Zugriff auf ihre privaten GPS-Tracks. - allow_read_prefs: Ihre Einstellungen auslesen. - allow_write_api: Karte ändern - allow_write_diary: Tagebucheinträge und -kommentare schreiben und Freunde hinzufügen. - allow_write_gpx: GPS-Spuren hochladen - allow_write_prefs: Nutzereinstellungen verändern. + allow_read_prefs: Ihre Benutzereinstellungen auszulesen. + allow_write_api: Die Karte zu ändern. + allow_write_diary: Ihre Blogeinträge und Kommentare zu bearbeiten und Freunde einzutragen. + allow_write_gpx: GPS-Tracks hochzuladen + allow_write_notes: Hinweise zu geben/Fehler zu melden. + allow_write_prefs: Ihre Benutzereinstellungen zu verändern. authorize_url: "Berechtigungs-URL:" confirm: Bist du sicher? delete: Client löschen - edit: Einzelheiten bearbeiten + edit: Details bearbeiten key: "Schlüssel:" - requests: "Die Benutzer werden um Folgendes um Erlaubnis gebeten:" + requests: "Vom Benutzer folgende Genehmigungen anfordern:" secret: "Geheimnis:" - support_notice: Wir unterstützen HMAC-SHA1 (empfolen) und Reintext im SSL-Modus. + support_notice: Wir unterstützen HMAC-SHA1 (empfohlen) und RSA-SHA1-Signaturen. title: OAuth-Details für %{app_name} url: "Tokenanfrage-URL:" update: flash: Client-Informationen erfolgreich aktualisiert redaction: create: - flash: Ausgabe wurde erstellt. + flash: Redaction wurde erstellt. destroy: - error: Beim Löschen dieser Ausgabe ist ein Fehler aufgetreten. - flash: Ausgabe wurde gelöscht. - not_empty: Die Ausgabe ist nicht leer. Bitte entferne alle Versionen dieser Ausgabe, bevor du sie löschst. + error: Beim Löschen dieser Redaction ist ein Fehler aufgetreten. + flash: Redaction wurde gelöscht. + not_empty: Die Redaction ist nicht leer. Bitte nimm die Redaction aus allen zugehörigen Versionen zurück, bevor du die Redaction löschst. edit: description: Beschreibung - heading: Ausgabe bearbeiten - submit: Ausgabe speichern - title: Ausgabe bearbeiten + heading: Redaction bearbeiten + submit: Redaction speichern + title: Redaction bearbeiten index: - empty: Es ist nichts zum Ausgeben vorhanden. - heading: Liste der Ausgaben - title: Liste der Ausgaben + empty: Keine Redactions. + heading: Liste der Redactions + title: Liste der Redaktionen new: description: Beschreibung - heading: Informationenen für eine neue Ausgabe eingeben - submit: Ausgabe erstellen - title: Eine neue Ausgabe erstellen + heading: Informationenen für eine neue Redaction eingeben + submit: Redaction erstellen + title: Neue Redaction erstellen show: confirm: Bist du sicher? description: "Beschreibung:" - destroy: Diese Ausgabe löschen - edit: Diese Ausgabe bearbeiten - heading: Ausgabe „%{title}“ wird angezeigt - title: Eine Ausgabe anzeigen + destroy: Diese Redaction löschen + edit: Diese Redaction bearbeiten + heading: Redaction „%{title}“ + title: Redaction user: "Urheber:" update: flash: Änderungen wurden gespeichert. site: edit: anon_edits_link_text: Hier findest du mehr Infos dazu. - flash_player_required: 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. - no_iframe_support: Der Browser unterstützt keine HTML-Inlineframes (iframes), die zur Nutzung dieser Funktion unabdingbar sind. + flash_player_required: 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. + 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. not_public: Deine Einstellungen sind auf anonymes Bearbeiten gestellt. - not_public_description: Du musst deine Einstellungen auf öffentliches Bearbeiten umstellen. Dies kannst du auf deiner %{user_page} tun. + not_public_description: Du musst, um die Karte bearbeiten zu können, deine Einstellungen auf öffentliches Bearbeiten umstellen. Dies kannst du auf deiner %{user_page} tun. potlatch2_not_configured: Potlatch 2 wurde nicht konfiguriert - Bitte besuche http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 für weitere Informationen - potlatch2_unsaved_changes: Es gibt ungesicherte Änderungen. (Du musst in Potlatch 2 „speichern“ klicken.) + potlatch2_unsaved_changes: Es gibt ungesicherte Änderungen. (Du solltest in Potlatch 2 „speichern“ klicken.) potlatch_unsaved_changes: Du hast deine Arbeit noch nicht gespeichert. (Um sie in Potlach zu speichern, klicke auf eine leere Fläche bzw. deselektiere den Weg oder Punkt, wenn du im Live-Modus editierst oder klicke auf Speichern, wenn ein Speicherbutton vorhanden ist.) - user_page_link: Benutzerseite + user_page_link: Einstellungsseite index: + createnote: Hinweis geben/Fehler melden js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert. js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung. license: - license_name: Creative Commons „Namensnennung, Weitergabe unter gleichen Bedingungen 2.0“ - notice: Lizenziert unter %{license_name} Lizenz durch das %{project_name} und seine Mitwirkenden. - project_name: OpenStreetMap Projekt + copyright: Copyright OpenStreetMap und Mitwirkende, unter einer offenen Lizenz permalink: Permanentlink - remote_failed: Das Bearbeiten ist fehlgeschlagen. Stelle sicher, dass JOSM oder Merkaartor gestartet ist und die Remote-Control-Option aktiviert ist. + remote_failed: Der Aufruf des Editors ist fehlgeschlagen. Stelle sicher, dass JOSM oder Merkaartor gestartet ist und die Remote-Control-Option aktiviert ist. shortlink: Shortlink key: - map_key: Legende - map_key_tooltip: Legende zur Karte table: entry: admin: Landesgrenzen, sonstige Grenzen @@ -1328,35 +1437,35 @@ de: - Terminal bridge: Dicker Rand = Brücke bridleway: Reitweg - brownfield: Industriebrachfläche - building: Besonderes Gebäude - byway: Nebenweg + brownfield: Brachfläche + building: Gebäude + byway: Seitenweg (brit.) cable: - Seilbahn - - Sitzlift + - Sessellift cemetery: Friedhof - centre: Sportzentum + centre: Sportplatz commercial: Gewerbegebiet common: - - öffentliche Grünfläche + - öffentliche Grünfläche (brit.) - Wiese construction: Straße im Bau - cycleway: Fahrradweg + cycleway: Radweg destination: Nur für Anrainer farm: Landwirtschaft footway: Fußweg - forest: Forst + forest: Wald golf: Golfplatz heathland: Heide industrial: Industriegebiet lake: - See - - Speichersee + - Stausee military: Militärgebiet motorway: Autobahn park: Park permissive: Eingeschänkter Zugang - pitch: Sportfeld + pitch: Spielfeld primary: Bundesstraße private: Privater Zugang rail: Eisenbahn @@ -1375,36 +1484,41 @@ de: summit: - Gipfel - Bergspitze - tourist: Touristenattraktion + tourist: Sehenswürdigkeit track: Wald-, Feldweg tram: - - Kleinbahn + - Stadtbahn - Straßenbahn trunk: Schnellstraße - tunnel: Gestrichelter Rand = Tunnel + tunnel: Strichlierter Rand = Tunnel unclassified: Straße unsurfaced: Unbefestigte Straße - wood: Naturwald + wood: Wald markdown_help: - alt: Alternativer Text + alt: Alt-Text first: Erstes Element - heading: Überschrift + heading: Hauptüberschrift headings: Überschriften image: Bild link: Link ordered: Nummerierte Liste second: Zweites Element - subheading: Untergeordnete Überschrift + subheading: Überschrift text: Text - title_html: Analysiert mit Markdown - unordered: Aufgezählte Liste + title_html: Interpretiert mit Markdown + unordered: Aufzählung url: URL richtext_area: edit: Bearbeiten preview: Vorschau search: search: Suchen - search_help: "Beispiele: „München“, „Heinestraße, Würzburg“, „CB2 5AQ“, oder „post offices near Lünen“ mehr Beispiele …" + get_directions: "Route berechnen" + get_directions_title: "Routenberechnung zwischen zwei Orten" + close_directions: "Schliessen der Route" + close_directions_title: "Schliessen des Routenmenus" + from: "Von" + to: "Nach" submit_text: Los where_am_i: Wo bin ich? where_am_i_title: Die momentane Position mit der Suchmaschine anzeigen @@ -1416,10 +1530,15 @@ de: friendly: "%e. %B %Y um %H:%M" trace: create: - trace_uploaded: Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme in die Datenbank. Dies geschieht normalerweise innerhalb einer halben Stunde, anschließend wird dir eine Bestätigungs-E-Mail gesendet. + trace_uploaded: Deine GPX-Datei wurde hochgeladen und wartet auf die Aufnahme in die Datenbank. Dies geschieht normalerweise innerhalb einer halben Stunde, anschließend wird dir eine Bestätigungs-E-Mail zugesandt. upload_trace: Lade einen GPS-Track hoch delete: - scheduled_for_deletion: Für Löschung vorgesehener Track + scheduled_for_deletion: Für die Löschung vorgesehener Track + description: + description_with_count: + one: GPX-Datei mit einem Punkt von %{user} + other: GPX-Datei mit %{count} Punkten von %{user} + description_without_count: GPX-Datei von %{user} edit: description: "Beschreibung:" download: herunterladen @@ -1429,23 +1548,27 @@ de: map: Karte owner: "Besitzer:" points: "Punkte:" - save_button: Speichere Änderungen + save_button: Speichern start_coord: "Startkoordinate:" tags: "Tags:" - tags_help: Trennung durch Komma + tags_help: durch Komma getrennt title: Track %{name} bearbeiten uploaded_at: "Hochgeladen am:" visibility: "Sichtbarkeit:" visibility_help: Was heißt das? + georss: + title: OpenStreetMap-GPS-Tracks list: + description: Letzte GPS-Track-Uploads durchsuchen + empty_html: Noch keine GPS-Tracks vorhanden. Lade einen neuen Track hoch oder informiere dich auf folgender Wikiseite über das Aufzeichnen von GPS-Tracks. public_traces: Öffentliche GPS-Tracks public_traces_from: Öffentliche GPS-Tracks von %{user} tagged_with: " gekennzeichnet mit %{tags}" your_traces: Eigene GPS-Tracks make_public: - made_public: veröffentlichter Track + made_public: Track (öffentlich) offline: - heading: GPX Speicher Offline + heading: Speicher für GPX-Dateien ist Offline message: Das Upload-System und der Speicher für GPX-Dateien ist derzeit nicht verfügbar offline_warning: message: Das Upload-System für GPX-Dateien ist derzeit nicht verfügbar @@ -1458,11 +1581,11 @@ de: identifiable: IDENTIFIZIERBAR in: in map: Karte - more: mehr - pending: AUSSTEHEND + more: Details + pending: WARTEND private: PRIVAT public: ÖFFENTLICH - trace_details: Track-Details + trace_details: Details des GPS-Tracks anzeigen trackable: VERFOLGBAR view_map: Karte anzeigen trace_form: @@ -1470,7 +1593,7 @@ de: help: Hilfe help_url: http://wiki.openstreetmap.org/wiki/DE:Upload tags: "Tags:" - tags_help: Trennung durch Komma + tags_help: durch Komma ( , ) getrennt upload_button: Hochladen upload_gpx: "GPX-Datei hochladen:" visibility: "Sichtbarkeit:" @@ -1478,22 +1601,24 @@ de: trace_header: see_all_traces: Alle GPS-Tracks see_your_traces: Eigene GPS-Tracks - traces_waiting: "%{count} deiner Tracks sind momentan in der Warteschlange. Bitte warte bis diese fertig sind, um die Verarbeitung nicht für andere Nutzer zu blockieren." + traces_waiting: + one: Du hast momentan %{count} Track in der Warteschlange. Bitte warte, bis er fertig ist, um die Verarbeitung nicht für andere Nutzer zu blockieren. + other: Du hast momentan %{count} Tracks in der Warteschlange. Bitte warte, bis diese fertig sind, um die Verarbeitung nicht für andere Nutzer zu blockieren. upload_trace: Lade einen GPS-Track hoch trace_optionals: tags: Tags trace_paging_nav: - next: nächste - previous: vorherige + newer: Neuere Tracks + older: Ältere Tracks showing_page: Seite %{page} view: delete_track: Diesen Track löschen description: "Beschreibung:" download: herunterladen edit: bearbeiten - edit_track: Diese Spur bearbeiten + edit_track: Diesen Track bearbeiten filename: "Dateiname:" - heading: Track %{name} betrachten + heading: Track %{name} ansehen map: Karte none: Keine owner: "Besitzer:" @@ -1501,33 +1626,37 @@ de: points: "Punkte:" start_coordinates: "Startkoordinate:" tags: "Tags:" - title: Track %{name} betrachten + title: Track %{name} ansehen trace_not_found: Track nicht gefunden! uploaded: "Hochgeladen am:" visibility: "Sichtbarkeit:" visibility: - identifiable: Identifizierbar (wird in der Trackliste als sortierte Punktfolge mit Zeitstempel angezeigt) - private: Privat (werden nur als anonyme, unsortierte Punkte ohne Zeitangaben gezeigt) - public: Öffentlich (wird in der Trackliste angezeigt, jedoch nur als anonyme, unsortierte Punktfolge ohne Zeitstempel) - trackable: Track (wird in der Trackliste als anonyme, sortierte Punktfolge mit Zeitstempel angezeigt) + identifiable: IDENTIFIZIERBAR (wird in der Trackliste als identifizierbare, sortierte Punktfolge mit Zeitstempel angezeigt) + private: PRIVAT (werden nur als anonyme, unsortierte Punkte ohne Zeitangaben gezeigt) + public: ÖFFENTLICH (wird in der Trackliste angezeigt, jedoch nur als anonyme, unsortierte Punktfolge ohne Zeitstempel) + trackable: VERFOLGBAR (wird in der Trackliste als anonyme, sortierte Punktfolge mit Zeitstempel angezeigt) user: account: contributor terms: - agreed: Du hast der neuen Vereinbarung für Mitwirkende zugestimmt. - agreed_with_pd: Du hast zudem erklärt, dass du deine Beiträge als gemeinfrei betrachtest. - heading: "Vereinbarung für Mitwirkende:" + agreed: Du hast den neuen Bedingungen für Mitwirkende zugestimmt. + agreed_with_pd: Du hast zudem erklärt, dass du deine Beiträge gemeinfrei veröffentlichst (unter Public Domain stellst). + heading: "Bedingungen für Mitwirkende:" link text: Worum handelt es sich? - not yet agreed: Du hast der neuen Vereinbarung für Mitwirkende bislang noch nicht zugestimmt. - review link text: Bitte folge diesem Link, um die neue Vereinbarung für Mitwirkende durchzulesen sowie zu akzeptieren. + not yet agreed: Du hast der neuen Bedingungen für Mitwirkende bislang noch nicht zugestimmt. + review link text: Bitte folge diesem Link, um die neuen Bedingungen für Mitwirkende durchzulesen sowie zu akzeptieren. current email address: "Aktuelle E-Mail-Adresse:" - delete image: Aktuelles Bild löschen + delete image: Bild löschen email never displayed publicly: (nicht öffentlich sichtbar) flash update success: Benutzerinformationen erfolgreich aktualisiert. - flash update success confirm needed: Benutzerinformationen erfolgreich aktualisiert. Du erhältst eine E-Mail, um deine neue E-Mail-Adresse zu bestätigen. + flash update success confirm needed: Deine Änderungen wurden gespeichert. Du erhältst nun eine E-Mail, um deine neue E-Mail-Adresse zu bestätigen. + gravatar: + gravatar: Gravatar verwenden + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: Was ist das? home location: "Standort:" image: "Bild:" image size hint: (quadratische Bilder mit zumindest 100x100 Pixel funktionieren am besten) - keep image: Aktuelles Bild beibehalten + keep image: Bild unverändert beibehalten latitude: "Breitengrad:" longitude: "Längengrad:" make edits public button: Alle meine Bearbeitungen öffentlich machen @@ -1537,46 +1666,46 @@ de: no home location: Du hast noch keinen Standort angegeben. openid: link: http://wiki.openstreetmap.org/wiki/OpenID - link text: Worum handelt es sich? + link text: Was ist das? openid: "OpenID:" preferred editor: "Bevorzugter Editor:" preferred languages: "Bevorzugte Sprachen:" profile description: "Profil-Beschreibung:" public editing: - disabled: Deaktiviert, bearbeiten von Daten nicht möglich, alle bisherigen Bearbeitungen sind anonym. + disabled: Deaktiviert. Das Bearbeiten von Kartendaten NICHT möglich, alle bisherigen Bearbeitungen sind anonym. disabled link text: Warum kann ich nichts bearbeiten? - enabled: Aktiviert. Nicht anonym, bearbeiten der Kartendaten möglich. + enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: Was bedeutet dies? - heading: "Öffentliches Bearbeiten:" + enabled link text: Was bedeutet das? + heading: "Karte bearbeiten (public editing):" public editing note: heading: Öffentliches Bearbeiten text: Im Moment sind deine Beiträge anonym und man kann dir weder Nachrichten senden noch deinen Wohnort sehen. Um sichtbar zu machen, welche Arbeit von dir stammt, und um kontaktierbar zu werden, klicke auf den Button unten. Seit Version 0.6 der API aktiv ist, können unangemeldete Benutzer die Karte nicht mehr bearbeiten (Warum?).
    • Deine E-Mail-Adresse wird bei Verlassen des anonymen Status nicht veröffentlicht.
    • Die Aktion kann nicht rückgängig gemacht werden. Für neu registrierte Benutzer besteht die Möglichkeit des anonymen Benutzerkontos nicht mehr.
    - replace image: Aktuelles Bild austauschen + replace image: Bild austauschen return to profile: Zurück zum Profil save changes button: Änderungen speichern title: Benutzerkonto bearbeiten - update home location on click: Standort bei Klick auf die Karte aktualisieren? + update home location on click: Standort beim Klick auf die Karte aktualisieren confirm: already active: Dieses Benutzerkonto wurde bereits bestätigt. - before you start: Wir wissen, dass du es kaum erwarten kannst mit dem Kartieren anzufangen, allerdings solltest du vorher noch ein paar Informationen zu dir im unten folgenden Formular angeben. button: Bestätigen - heading: Benutzerkonto bestätigen - press confirm button: Benutzerkonto aktivieren, indem du auf den Bestätigungsbutton klickst. - reconfirm: Sofern seit deiner Registrierung schon etwas Zeit vergangen ist, musst du gegebenenfalls selber eine neue Bestätigungs-E-Mail senden. - success: "Dein Benutzerkonto wurde bestätigt, danke fürs Registrieren!\n

    \nAuf dieser Seite findest du nützliche Links und Informationen, die dir den Einstieg erleichtern." - unknown token: Dieser Token scheint nicht zu existieren. + heading: Bitte überprüfe deine E-Mails! + introduction_1: Wir haben dir eine Bestätigungs-E-Mail zugesandt. + introduction_2: Bitte bestätige dein Benutzerkonto, indem du den Link in der Bestätigungs-E-Mail anklickst. Dann kannst Du beginnen, bei OpenStreetMap mitzuarbeiten. + press confirm button: Zur Aktivierung Deines Benutzerkontos klicke bitte unten auf „Bestätigen“. + reconfirm_html: Um die Bestätigungs-E-Mail erneut zuzusenden, klicke hier. + unknown token: Dieser Bestätigungscode ist abgelaufen oder nicht vorhanden. confirm_email: button: Bestätigen failure: Eine E-Mail-Adresse wurde bereits mit diesem Link bestätigt. heading: Änderung der E-Mail-Adresse bestätigen - press confirm button: Neue E-Mail-Adresse bestätigen, indem du auf den Bestätigungsbutton klickst. + press confirm button: Zur Bestätigung der neuen E-Mail-Adresse klicke bitte unten auf „Bestätigen“. success: Deine E-Mail-Adresse wurde bestätigt, danke fürs Registrieren! confirm_resend: failure: Benutzer %{name} konnte nicht gefunden werden. - success: Wir haben eine neue Bestätigungsnachricht an %{email} gesendet. Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren anfangen.

    Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert, musst du auf dessen Positivliste setzten, da wir auf keine Bestätigungsanfragen reagieren können. + success: Wir haben eine neue Bestätigungsnachricht an %{email} gesendet. Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren beginnen.

    Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert, musst du auf dessen Positivliste setzten, da wir auf keine Bestätigungsanfragen reagieren können. filter: - not_an_administrator: Du must ein Administrator sein um das machen zu dürfen + not_an_administrator: Du musst ein Administrator sein um diese Aktion auszuführen. go_public: flash success: Alle deine Bearbeitungen sind nun öffentlich und du kannst nun die Kartendaten bearbeiten. list: @@ -1585,15 +1714,15 @@ de: heading: Benutzer hide: Ausgewählte Benutzer ausblenden showing: - one: Anzeige von Seite %{page} (%{first_item} von %{items}) - other: Anzeige von Seite %{page} (%{first_item}-%{last_item} von %{items}) + one: Seite %{page} (%{first_item} von %{items}) + other: Seite %{page} (%{first_item}–%{last_item} von %{items}) summary: "%{name} erstellt von %{ip_address} am %{date}" summary_no_ip: "%{name} erstellt am %{date}" title: Benutzer login: - account is suspended: Dein Benutzerkonto wurde aufgrund verdächtiger Aktivitäten gesperrt.
    Bitte kontaktiere den Webmaster, sofern du dies klären möchtest. + account is suspended: Dein Benutzerkonto wurde aufgrund verdächtiger Aktivitäten gesperrt.
    Bitte kontaktiere den Webmaster, falls du dies klären möchtest. account not active: Leider wurde dein Benutzerkonto bislang noch nicht aktiviert.
    Bitte aktiviere dein Benutzerkonto, indem du auf den Link in deiner Bestätigungs-E-Mail klickst oder eine neue Bestätigungs-E-Mail anforderst. - auth failure: Sorry, Anmelden mit diesen Daten nicht möglich. + auth failure: Mit diesen Daten leider keine Anmeldung möglich. create account minute: Erstelle ein Benutzerkonto. Es dauert nur eine Minute. email or username: "E-Mail-Adresse oder Benutzername:" heading: Anmelden @@ -1601,8 +1730,6 @@ de: lost password link: Passwort vergessen? new to osm: Neu bei OpenStreetMap? no account: Du hast noch kein Benutzerkonto? - notice: Informiere dich über den bevorstehenden Lizenzwechsel bei OpenStreetMap (Übersetzungen) (Diskussion) - notice_terms: OpenStreetMap stellt am 1. April 2012 auf eine neuen Lizenz um. Es handelt sich bei der neuen Lizenz um eine ebenso freie Lizenz, wie es die aktuelle ist, allerdings sind deren rechtliche Rahmenbedingungen besser auf die Bedürfnisse unserer Kartendatenbank abgestimmt. Wir würden es sehr begrüßen, sofern wir deine Beiträge zu OpenStreetMap weiterhin speichern und zugänglich machen könnten. Dies ist allerdings nur dann möglich, sofern du zustimmst, dass wir dies gemäß den Bedingungen der neuen Lizenz auch tun dürfen. Anderenfalls müssen wir deine Beiträge aus der Datenbank löschen.

    Bitte melde dich an, um die neuen Bedingungen zu lesen und zu akzeptieren. Vielen Dank. openid: "%{logo} OpenID:" openid invalid: Deine OpenID scheint leider fehlerhaft zu sein. openid missing provider: Wir konnten leider keine Verbindung zu deinem OpenID-Dienst herstellen. @@ -1628,7 +1755,7 @@ de: title: Mit Yahoo! anmelden password: "Passwort:" register now: Jetzt registrieren - remember: "Anmeldedaten merken:" + remember: Anmeldedaten merken title: Anmelden to make changes: Um Datenänderungen bei OpenStreetMap vornehmen zu können, musst Du ein Benutzerkonto haben. with openid: "Alternativ kannst du deine OpenID zum Anmelden nutzen:" @@ -1640,26 +1767,28 @@ de: lost_password: email address: "E-Mail-Adresse:" heading: Passwort vergessen? - help_text: Bitte gib deine E-Mail-Adresse ein, mit der du dich angemeldet hast. Wir werden dir dann einen Link schicken, mit dem du dein Passwort zurück setzen kannst. + help_text: Bitte gib deine E-Mail-Adresse ein, mit der du dich angemeldet hast. Wir werden dir dann einen Link schicken, mit dem du dein Passwort zurücksetzen kannst. new password button: Passwort zurücksetzen notice email cannot find: Wir konnten die E-Mail-Adresse nicht finden. Du hast dich möglicherweise vertippt oder mit einer anderen E-Mail-Adresse angemeldet. notice email on way: Eine E-Mail mit Hinweisen zum Zurücksetzen des Passworts wurde an dich versandt. title: Passwort vergessen make_friend: already_a_friend: Du bist bereits mit %{name} befreundet. + button: Als Freund hinzufügen failed: Sorry, %{name} konnte nicht als dein Freund hinzugefügt werden. - success: "%{name} ist nun dein Freund." + heading: "%{user} als Freund hinzufügen?" + success: "%{name} ist nun dein Freund!" new: - confirm email address: "Bestätige deine E-Mail-Adresse:" + about: + header: Frei und editierbar + html: "

    Im Gegensatz zu anderen Karten wurde OpenStreetMap komplett von Leuten wie dir erstellt.\nJeder kann sie verbessern, aktualisieren und erweitern, sowie für jeden Zweck verwenden.

    \n

    Melde dich an und mache mit. Zur Bestätigung wird eine E-Mail an die angegebene Adresse geschickt werden, bitte gehe wie darin beschrieben vor.

    " + confirm email address: "Bitte wiederhole die E-Mail-Adresse:" confirm password: "Passwort bestätigen:" - contact_webmaster: Bitte kontaktiere den Webmaster um ein Benutzerkonto erstellt zu bekommen - wir werden die Anfrage so schnell wie möglich bearbeiten. - continue: Weiter + contact_webmaster: Bitte kontaktiere den Webmaster, um ein Benutzerkonto zu bekommen. - Wir werden die Anfrage möglichst schnell bearbeiten. + continue: Registrieren display name: "Benutzername:" display name description: Dein öffentlich angezeigter Benutzername. Er kann später in den Einstellungen geändert werden. email address: "E-Mail-Adresse:" - fill_form: Fülle das Formular aus und dir wird eine kurze E-Mail zur Aktivierung deines Benutzerkontos geschickt. - flash create success message: "\nVielen Dank für deine Registrierung. Wir haben eine Bestätigungsnachricht an %{email} gesendet. Sobald du dein Benutzerkonto bestätigt hast, kannst du mit dem Kartieren anfangen.

    Sofern du ein Antispamsystem nutzt, das selbst Bestätigungen anfordert, musst du auf dessen Positivliste setzten, da wir auf keine Bestätigungsanfragen reagieren können." - heading: Ein Benutzerkonto erstellen license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den Bedingungen für Mitwirkende zustimmen. no_auto_account_create: Im Moment ist das automatische Erstellen eines Benutzerkontos leider nicht möglich. not displayed publicly: Nicht öffentlich sichtbar (Datenschutzrichtlinie) @@ -1668,11 +1797,11 @@ de: openid no password: Für OpenID wird kein Passwort benötigt. Allerdings könnten dennoch einige zusätzlich Hilfsprogramme oder Server ein Passwort benötigen. password: "Passwort:" terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt hast! - terms declined: Wir bedauern es, dass du dich dazu entschieden hast den neuen Bedingungen für Mitwirkende nicht zuzustimmen. Weitere Informationen findest du auf dieser Wikiseite. - title: Benutzerkonto erstellen + terms declined: Wir bedauern es, dass du dich dazu entschieden hast, den neuen Bedingungen für Mitwirkende nicht zuzustimmen. Weitere Informationen findest du auf dieser Wikiseite. + title: Registrieren use openid: "Alternativ kannst du eine OpenID von %{logo} zum Anmelden nutzen:" no_such_user: - body: Es gibt leider keinen Benutzer mit dem Namen %{user}. Bitte überprüfe deine Schreibweise oder der Link war beschädigt. + body: Es gibt leider keinen Benutzer mit dem Namen %{user}. Du hast dich möglicherweise vertippt oder bist einem ungültigem Link gefolgt. heading: Der Benutzer %{user} existiert nicht title: Benutzer nicht gefunden popup: @@ -1680,6 +1809,8 @@ de: nearby mapper: Mapper in der Nähe your location: Eigener Standort remove_friend: + button: Freund entfernen + heading: Freund %{user} entfernen? not_a_friend: "%{name} ist nicht dein Freund." success: "%{name} wurde als Freund entfernt." reset_password: @@ -1693,40 +1824,40 @@ de: set_home: flash success: Standort erfolgreich gespeichert suspended: - body: "

    \n Dein Benutzerkonto wurde aufgrund verdächtiger Aktivitäten auto-\n matisch gesperrt, um potentiellen Schaden von OpenStreetMap abzu-\n wenden.\n

    \n

    \n Diese Entscheidung wird in Kürze von einem der Administratoren\n überprüft. Du kannst dich aber auch direkt an den %{webmaster}\n wenden, sofern du diese Angelegenheit klären möchtest.\n

    " + body: "

    Dein Benutzerkonto wurde aufgrund verdächtiger Aktivitäten automatisch gesperrt, um potentiellen Schaden von OpenStreetMap abzuwenden.

    \n

    Diese Entscheidung wird in Kürze von einem der Administratoren überprüft. Du kannst dich aber auch direkt an den %{webmaster} wenden, sofern du diese Angelegenheit klären möchtest.

    " heading: Benutzerkonto gesperrt title: Benutzerkonto gesperrt webmaster: Webmaster terms: agree: Akzeptieren - consider_pd: Zusätzlich zur oben genannten Vereinbarung, betrachte ich meine Beiträge als gemeinfrei (Public Domain) + consider_pd: Zusätzlich zu den oben genannten Bedingungen betrachte ich meine Beiträge als gemeinfrei (Public Domain) consider_pd_why: Was bedeutet dies? decline: Ablehnen guidance: "Informationen die dabei helfen, diese Bedingungen zu verstehen: eine verständliche Zusammenfassung sowie einige inoffizielle Übersetzungen" - heading: Vereinbarung für Mitwirkende + heading: Bedingungen für Mitwirkende legale_names: france: Frankreich italy: Italien rest_of_world: Rest der Welt legale_select: "Bitte wähle das Land deines Wohnsitzes:" - read and accept: Bitte lese die unten angezeigte Vereinbarung und klicke dann auf die Schaltfläche „Akzeptieren“, um zu bestätigen, dass du den Bedingungen dieser Vereinbarung für deine bisherigen sowie zukünftigen Beiträge zustimmst. - title: Vereinbarung für Mitwirkende - you need to accept or decline: Bitte lese die neuen Bedingungen für Mitwirkende und nehme sie an oder lehne sie ab, bevor du weitermachst. + read and accept: Bitte lies die unten angezeigten Bedingungen und klicke dann auf die Schaltfläche „Akzeptieren“, um zu bestätigen, dass du den Bedingungen für deine bisherigen sowie zukünftigen Beiträge zustimmst. + title: Bedingungen für Mitwirkende + you need to accept or decline: Bitte lies die neuen Bedingungen für Mitwirkende und nimm sie an oder lehne sie ab, bevor du weitermachst. view: activate_user: Benutzer aktivieren - add as friend: Als Freund hinzufügen + add as friend: Freund hinzufügen ago: (%{time_in_words_ago} her) - block_history: Erhaltene Sperren anzeigen - blocks by me: Selbst vergebene Sperren + block_history: Erhaltene Sperren + blocks by me: Vergebene Sperren blocks on me: Erhaltene Sperren comments: Kommentare confirm: Bestätigen - confirm_user: Bestätige den Benutzer - create_block: Diesen Nutzer sperren + confirm_user: Benutzer bestätigen + create_block: Benutzer sperren created from: "erstellt aus:" ct accepted: Vor %{ago} akzeptiert ct declined: Abgelehnt - ct status: "Vereinbarung für Mitwirkende:" + ct status: "Bedingungen für Mitwirkende:" ct undecided: Unentschlossen deactivate_user: Benutzer deaktivieren delete_user: Benutzer löschen @@ -1734,28 +1865,32 @@ de: diary: Blog edits: Bearbeitungen email address: "E-Mail-Adresse:" - friends_changesets: Alle Änderungssätze deiner Freunde durchsuchen - friends_diaries: Alle Tagebucheinträge von Freunden durchsuchen + friends_changesets: Änderungssätze deiner Freunde + friends_diaries: Tagebucheinträge deiner Freunde hide_user: Benutzer verstecken - if set location: Wenn du deinen Standort angegeben hast, erscheint eine Karte am Seitenende. Du kannst deinen Standort in deinen %{settings_link} ändern. + if set location: Lege in den %{settings_link} deinen Standort fest, um Benutzer in der Nähe anzeigen zu können. km away: "%{count} km entfernt" latest edit: "Letzte Änderung %{ago}:" m away: "%{count} m entfernt" mapper since: "Mapper seit:" - moderator_history: Vergebene Sperren anzeigen + moderator_history: Vergebene Sperren my comments: Eigene Kommentare my diary: Eigener Blog - my edits: Eigene Bearbeitungen + my edits: Eigene Änderungen + my messages: Meine Nachrichten + my notes: Eigene Fehler-Hinweise + my profile: Eigenes Profil my settings: Eigene Einstellungen my traces: Eigene Tracks - nearby users: Anwender in der Nähe - nearby_changesets: Alle Änderungssätze von Benutzern in der Nähe durchsuchen - nearby_diaries: Alle Tagebucheinträge von Benutzern in der Nähe durchsuchen + nearby users: Mapper in der Nähe + nearby_changesets: Änderungssätze von Benutzern in der Nähe + nearby_diaries: Tagebucheinträge von Benutzern in der Nähe new diary entry: Neuer Blogeintrag - no friends: Du hast bis jetzt keine Freunde hinzugefügt. + no friends: Du hast noch keine Freunde hinzugefügt. no nearby users: Es gibt bisher keine Benutzer, die einen Standort in deiner Nähe angegeben haben. + notes: Fehler-Hinweise oauth settings: OAuth-Einstellungen - remove as friend: Als Freund entfernen + remove as friend: Freund entfernen role: administrator: Dieser Benutzer ist ein Administrator grant: @@ -1827,11 +1962,14 @@ de: creator_name: Urheber display_name: Gesperrter Benutzer edit: Bearbeiten + next: Nächste » not_revoked: (nicht aufgehoben) + previous: « Vorige reason: Grund der Sperre revoke: Aufheben! revoker_name: Aufgehoben von show: Anzeigen + showing_page: Seite %{page} status: Status period: one: 1 Stunde @@ -1860,7 +1998,7 @@ de: title: "%{block_on} gesperrt durch %{block_by}" update: only_creator_can_edit: Nur der Moderator, der die Sperre eingerichtet hat, kann sie ändern. - success: Block aktualisiert. + success: Sperre aktualisiert. user_role: filter: already_has_role: Der Nutzer gehört bereits der Rolle %{role} an. @@ -1879,3 +2017,25 @@ de: fail: Konnte die Zuordnung von Benutzer „%{name}“ zu Rolle „%{role}“ nicht aufheben. Bitte überprüfe, ob es sich um einen gültigen Benutzer und eine gültige Rolle handelt. heading: Bestätige Aufhebung der Rollenzuordnung title: Bestätige Aufhebung der Rollenzuordnung + welcome_page: + add_a_note: + paragraph_1_html: Falls du nur eine Kleinigkeit korrigieren möchtest und dir die Zeit fehlt, dich einzuarbeiten, wie man in OSM Daten editiert, so gib einfach einen Hinweis/melde einen Fehler, dann kann sich ein anderer Mapper darum kümmern. + paragraph_2_html: "Gehe einfach auf die Karte und klicke auf das Sprechblasen-Symbol:\n. Dies fügt einen Marker auf der Karte hinzu, diesen verschiebe bitte möglichst genau auf die Problemstelle und schreibe einen Hinweis. Der Hinweis sollte den Sachverhalt möglichst genau beschreiben, damit ein anderer Mapper die Erklärung dann verwenden kann, um den Fehler zu beheben." + title: Keine Zeit zum editieren? Dann füge einen Hinweis ein/melde einen Fehler! + basic_terms: + editor_html: Ein Editor ist ein Programm oder eine Webseite, mit der man die Karte bearbeiten kann. + node_html: Ein Node (Knoten) in OSM ist ein Punkt auf der Karte, z.B. ein Restaurant oder ein Baum. + paragraph_1_html: OpenStreetMap nutzt ein paar spezifische Begriffe. Hier sind ein paar davon, die nützlich sein dürften. + tag_html: "Ein tag ist eine Eigenschaft, die man einem Objekt zuweist. Z.B. der Name eines Restaurants\noder die maximal erlaubte Geschwindigkeit auf einer Straße." + title: Grundbegriffe fürs Mapping + way_html: Ein Way ("Weg") in OSM ist eine Linie oder Fläche wie z.B. eine Straße, ein Weg, ein Fluss oder ein Gebäude. + introduction_html: "Willkommen bei OpenStreetMap, der weltweiten freien und editierbaren Karte. Mit deiner Anmeldung ist alles so weit, dass du anfangen kannst die Karte zu bearbeiten.\nHier sind noch eine paar nützliche zusätzliche Informationen." + questions: + paragraph_1_html: "OpenStreetMap hat mehrere Quellen zum Lernen, Stellen und Beantworten von Fragen über das Projekt\nund zum gemeinsamen Diskutieren und Dokumentieren von Kartierungsthemen.\nErhalte hier Hilfe." + title: Fragen? + start_mapping: Beginne mit dem Bearbeiten der Karte + title: Willkommen! + whats_on_the_map: + off_html: "Was nicht in die Datenbank gehört sind subjektive Daten wie Bewertungen, nicht mehr aktuelle\nhistorische Fakten oder nicht real existierende Dinge. Ausserdem ist es wichtig, nichts von\nanderen Quellen (auch nicht aus Papierkarten) zu kopieren, da OpenStreetMap das Urheberrecht sehr ernst nimmt." + on_html: "OpenStreetMap ist eine Datenbank, in der man alles erfassen kann, was derzeit real existiert. -\nDies beinhaltet sowohl Straßen, Gebäude und Plätze mit ihren Eigenschaften, als auch z.B. Geschäfte, Briefkästen oder Hydranten. Eigentlich eben alles, was man so dauerhaft in der Umgebung finden kann und einen interessiert." + title: Was gehört in die Karte? diff --git a/config/locales/diq.yml b/config/locales/diq.yml new file mode 100644 index 00000000000..c354ca888da --- /dev/null +++ b/config/locales/diq.yml @@ -0,0 +1,865 @@ +# Messages for Zazaki (Zazaki) +# Exported from translatewiki.net +# Export driver: syck-pecl +# Author: Erdemaslancan +# Author: Gorizon +# Author: Marmase +# Author: Mirzali +diq: + activerecord: + attributes: + diary_comment: + body: Vêrey mesaci + diary_entry: + language: Zıwan + latitude: Heralem + longitude: Lemen + title: Sername + user: Karber + friend: + friend: Embaz + user: Karber + message: + body: Mesac + recipient: Grotker + sender: Rıster + title: Sername + trace: + description: Şınasnayış + latitude: Heralem + longitude: Lemen + name: Name + public: Şar + size: Gırdiye + user: Karber + visible: Aseno + user: + active: Aktiv + description: Sılasnayış + display_name: Nameyo ke Aseno + email: E-posta + languages: Zıwani + pass_crypt: Parola + models: + acl: Qontrol Listeyê Resayışi + changeset: Qeydê Vurnayışan + changeset_tag: Vurnayışê Etiketan + country: Dewlet + diary_comment: Vatışê Rocan + diary_entry: Deqewtışê Rocan + friend: Embaz + language: Zıwan + message: Mesac + node: Qedyin + node_tag: Etiket Qedyin + notifier: Xeber ke + old_node: Verên Qedya + old_node_tag: Etiletê Qedyina Verên + old_relation: Eleqeyo Verên + old_relation_member: Eleqeyê Ezayan dê Verênan + old_relation_tag: Etiketê Eleqeyê Verêni + old_way: Raya Verên + old_way_node: Raya Verên Qedyin + old_way_tag: Etiketê Rayda Verên + relation: Eleqe + relation_member: Ezay ronışey + relation_tag: Etikete ronışey + session: Ronışey + trace: Şop + tracepoint: Dawtey şopi + tracetag: Etikete şopi + user: Karber + user_preference: Tercihê Karberi + user_token: Moriya Karberi + way: Ray + way_node: Ray Qedyin + way_tag: Etikete ray + browse: + changeset: + title: Seta vurnayışan + containing_relation: + entry: Eleqe %{relation_name} + entry_role: Eleqe %{relation_name} (%{relation_role} deye) + not_found: + type: + changeset: Qeydê Vurnayışan + node: qedyin + relation: eleqe + way: ray + redacted: + redaction: Temamey %{id} + type: + node: qedyin + relation: eleqe + way: ray + relation_member: + type: + node: Qedyin + relation: Eleqe + way: Ray + start_rjs: + load_data: Malumat Barke + loading: Bar beno... + tag_details: + tags: "Etiketi:" + timeout: + type: + changeset: Qeydê Vurnayışan + node: qedyin + relation: eleqe + way: ray + changeset: + changeset: + no_edits: (vurnayış çıniyo) + changeset_paging_nav: + next: Peyên » + previous: « Verên + showing_page: Pele %{page} + changesets: + area: Erz + comment: Vatış + id: ID + saved_at: Deme qeydi + user: Karber + list: + title: Seta vurnayışan + diary_entry: + comments: + ago: Verdê %{ago} + comment: Vatış + newer_comments: Vatışê Tewr Newey + older_comments: Vatışo Tewr Kehan + post: Nusne + when: Key + diary_comment: + confirm: Testiq ke + diary_entry: + confirm: Testiq ke + edit_link: Nê dekewti bıvurne + hide_link: Nê dekewti bınımne + edit: + body: "Vêrey mesaci:" + language: "Zıwan:" + latitude: "Heralem:" + location: Lokasyon + longitude: "Lemen:" + save_button: Qeyd ke + subject: "Mersel:" + location: + edit: Timar ke + location: "Herun:" + view: Bıvin + view: + login: Cıkewtış + save_button: Qeyd ke + editor: + default: Hesıbyaye (%{name} yo ke karêno) + potlatch: + name: Potlatch 1 + potlatch2: + name: Potlatch 1 + export: + start: + add_marker: Xeriter rê yew nışan berz + area_to_export: Cayo ke cıra bıvciyo + export_button: Teber de + format: Format + image_size: Gırdiya Resimi + latitude: "Heralem:" + licence: Lisans + longitude: "Lemen:" + max: maks + options: Weçinegi + output: Vıcyaen + scale: Senceg + zoom: Nezdı fi + geocoder: + description: + types: + cities: Suki + places: Cayi + towns: Bacari + direction: + east: Akewten + north: Zıme + north_east: Zıme-Akewten + north_west: Zıme-perayen + south: Veroc + south_east: Veroci-akewten + south_west: Veroc-perayen + west: Perayen + search: + title: + ca_postcode: Geocoder.CA ra neticey + geonames: GeoNames.org ra neticey + latlon: OSM ra neticey + osm_nominatim: OSM Nominatim ra neticey + uk_postcode: FreeThe Postcode ra neticey + us_postcode: Geocoder.us ra neticey + search_osm_nominatim: + prefix: + aeroway: + aerodrome: Hewaherun + apron: Apron + gate: Keyber + helipad: Hruna Helikopteri + runway: Pista teyera + taxiway: Raya Texsiyan + terminal: Terminal + amenity: + WLAN: Heruna WiFi + airport: Havaherun + arts_centre: Merkeze Zagoni + artwork: Zagonkar + atm: ATM + auditorium: Oditoryum + bank: Banka + bar: Bar + bbq: BBQ + bench: Bank + bicycle_parking: Perka Bisiklet + bicycle_rental: Bisiklet İcar kerden + biergarten: Hegay Bira + brothel: Kerxane + bureau_de_change: Buroye Dovizan + bus_station: Otogar + cafe: Cafe + car_rental: Wesayıt İcar kerden + car_sharing: Wesayıt Heserekerden + car_wash: Wesayıt Şuwayış + casino: Kasino + charging_station: İstasyona Pırkerden + cinema: Sinema + clinic: Klinik + club: Klub + college: Lise + community_centre: Merkezê Cemeati + courthouse: Adliye + crematorium: Krematoryum + dentist: Dındandar + doctors: Dıxtori + dormitory: Ware + drinking_water: Awa Şımıtışi + driving_school: Kursa Ramenan + emergency_phone: Vistren Telefon + fast_food: Fast Food + ferry_terminal: Terminala Feriboter + fire_hydrant: Mıslıxa Şewati + fire_station: Itfaiye + food_court: Kerwanseray + fountain: Fıskiye + fuel: Petrol + grave_yard: Mezla ser + gym: Merkeza Fitnessi / Salona Spori + hall: Cuwên + health_centre: Merkeza Weşiney + hospital: Nêweşxane + hotel: Hotel + hunting_stand: Standê Seydwanan + ice_cream: Dondırme + kindergarten: Kreş + library: Kıtıbxane + market: Market + marketplace: Heruna bazari + mountain_rescue: Kora rReynayen + nightclub: Kluba Şewer + nursery: Kreş + nursing_home: Rehatxane + office: Ofis + park: Perk + parking: Otopark + pharmacy: Eczaxane + place_of_worship: Bawerxane + police: Pulis + post_box: Dora Postay + post_office: Postexane + preschool: Ver-Wendxane + prison: Hepısxane + pub: Biraxane + public_building: Binaya Şaran + public_market: Bazarê Şaran + reception_area: Heruna Resepsiyoni + recycling: Heruna peyd amayışi + restaurant: Restaurant + retirement_home: Weynexane + sauna: Hemam + school: Wendxane + shelter: Starek + shop: Dukan + shopping: Merkezê dayışgrotışi + shower: Çımecek + social_centre: Merkezo Sosyal + social_club: Kluba Sosyal + studio: Studyo + supermarket: Supermarket + swimming_pool: Dola Asnawkerdışi + taxi: Taksi + telephone: Telafun + theatre: Tiyatro + toilets: Tuwalet + townhall: Binay Beledi + university: Uniwersita + vending_machine: Makineya Roten + veterinary: Veteriner + village_hall: Wedey Dewer + waste_basket: Tenkey Sıloy + wifi: Heruna WiFi + youth_centre: Merkezê Gencan + boundary: + administrative: Sinorê İdari + national_park: Perka Milli + bridge: + swing: Pırde Asnawi + "yes": Pırd + building: + "yes": Bina + highway: + bridleway: Raya Estoran + bus_stop: İstasyonê Otobozan + byway: Raya Bınêk + cycleway: Raya Bisikleter + emergency_access_point: Cayê vistra resnayışi + footway: Raya geyrayışi + ford: Balan + living_street: Kuçey Cıwiyayışi + minor: Raya Werkek + motorway: Otoray + motorway_junction: Kewşaxa Otorayer + motorway_link: Raya Otoray + path: Petiqe + pedestrian: Raya ke wesayıti rê racnayiya + platform: Platform + primary: Raya Dewlet + primary_link: Raya Dewlet + raceway: Raya Vestışi + residential: Kuçe + rest_area: Cay solıxgrotışi + road: Ray + speed_camera: Kemeraya Vıstrın + steps: Merwani + stile: Gamena Çitan + tertiary: Raya Dewan + track: Raya Herın + trail: Şop + historic: + castle: Qela + church: Kılise + fort: Qula + house: Keye + icon: Ikon + manor: Kosk + memorial: Qub + mine: Mahden + monument: Ziyarık + museum: Muza + ruins: Pagi + tower: Kule + landuse: + conservation: Qısekerdış + farm: Cıtinin + forest: Mêşe + garages: Garac + grass: Çim + greenfield: Cayo Awi u khoyi + industrial: Endustri + landfill: Pag + meadow: Çayır + military: Eskeri Mıntıqa + mine: Mahden + nature_reserve: Cayê Gem Starkerden + orchard: Hêga + park: Perk + piste: Pist + railway: Rayatiran + reservoir: Dola Beraci + leisure: + garden: Hega + marina: Marina + park: Perk + stadium: Stadyum + military: + bunker: Stare + natural: + beach: Plac + channel: Kenal + crater: Krater + dune: Kımıl + feature: Weçinaye + fell: Gedugo wışk + forest: Mêşe + geyser: Gayzer + glacier: Cemeden + hill: Gedug + island: Ade + land: Wer + peak: Gıl /sersıq + reef: Resif + river: Ro + scree: Heyelan + shoal: Wesin + spring: Ênêk + stone: Kemere + strait: Balan + tree: Dar + valley: Dere + volcano: Wolkan + water: Aw + wetland: awe + wetlands: Awi + wood: Meşe + office: + accountant: Muhasebedar + architect: Mimar + company: Şirket + lawyer: Abuqat + place: + city: Suk + farm: Erdo Bec + hamlet: Mezra + house: Keye + houses: Keyey + island: Ada + islet: Adeqeq + locality: Wereyin + region: Mıntıqa + state: wılayet + town: bacar + village: Dew + railway: + halt: İstasyonaTiran + shop: + butcher: Kesab + florist: Çiçekdar + furniture: Mobilya + gallery: Galeri + garden_centre: Merkeza Hêgay + gift: Çiyo Hediye + salon: Kuafor + tourism: + hostel: Hostel + hotel: Hotel + tunnel: + "yes": Tûnêl + waterway: + canal: Kenal + dam: Berac + lock: İskele + javascripts: + map: + base: + cycle_map: Xeritay Topoğrafiki + standard: Standard + transport_map: Xeritay Resnayışi + site: + edit_tooltip: Xeriti timar ke + layouts: + community: Cemaet + community_blogs: Blogê Cemaeti + edit: Timar ke + export: Tebergroten + help: Peşti + history: Ravêrden + log_in: cı kewe + logout: veciyayış + sign_up: qeyd be + message: + inbox: + date: Deme + from: Kêra + my_inbox: Amayenê mı + outbox: Rışteyan + subject: Mersel + title: Ameyan + message_summary: + delete_button: Bestere + reply_button: Cewab bıde + new: + body: Vêrey mesaci + send_button: Bırşê + subject: Mersel + outbox: + date: Deme + inbox: Ameyan + outbox: Rışteyan + subject: Mersel + title: Şıyenan + to: Kêrê + read: + date: Deme + reply_button: Cewab bıde + subject: Mersel + to: Kêrê + sent_message_summary: + delete_button: Bestere + notifier: + diary_comment_notification: + hi: Merheba %{to_user}, + email_confirm_html: + greeting: Merheba, + email_confirm_plain: + greeting: Merheba, + gpx_notification: + greeting: Merheba, + lost_password_html: + greeting: Merheba, + lost_password_plain: + greeting: Merheba, + message_notification: + hi: Merheba %{to_user}, + oauth_clients: + edit: + submit: Bıvurne + form: + name: Name + required: Mecburiyo + index: + issued_at: Mersela + revoke: Terkne! + new: + submit: Qeyd Be + show: + confirm: Vac welay? + edit: Detaya Timar ke + redaction: + edit: + description: Şınasnayış + new: + description: Sılasnayış + show: + confirm: Vac welay? + description: "Şınasiyen:" + user: Vıraştoğ + site: + key: + table: + entry: + allotments: Bostan + apron: + 1: terminal + bridleway: Raya Ancınıştan + byway: Raya Bınêk + cemetery: Mezlaser + common: + - Çimen + cycleway: Raya Bisiklet + farm: Cıtinin + forest: Mêşe + golf: Saxay Golfi + lake: + - Dol + park: Perk + school: + - Wendxane + - Uniwersita + summit: + - Sersıq + - Ko + track: Raya Herın + wood: Meşe + markdown_help: + first: Çiyo sıfteyên + heading: Sername + headings: Sernamey + image: Resim + link: Gıre + second: Çiyo Bahdoyên + text: Metın + url: GRE + richtext_area: + edit: Timar ke + preview: Verqayt + search: + search: Cı geyre + submit_text: Şo + where_am_i: Edo kotideya? + sidebar: + close: Racnê + search_results: Neticeya geyrayışi + time: + formats: + friendly: "%e %B %Y seate %H:%M" + trace: + edit: + description: "Şınasiyen:" + download: ron + edit: bıvurne + filename: "Nameyê dosya:" + map: xerite + owner: "Wayir:" + points: "Dawte:" + tags: "Etiketi:" + uploaded_at: "Bar biyo:" + visibility: Vinayîşî + list: + public_traces: Pêron rê akerde rêçê GPS + public_traces_from: "%{user} ra pêron rê akerde rêçê GPS" + tagged_with: "%{tags} ya etiketyayo" + trace: + ago: "%{time_in_words_ago} veror" + by: kerden + count_points: "%{count} puan" + edit: bıvurne + edit_map: Xeriti Timar ke + identifiable: ŞINASKERDENEN + in: te de + map: xerite + more: dehana vêşi + pending: PAWEDEYO + private: XAS + public: ŞARE + trace_details: Teferruatanê rêça bıvin + trackable: SEYRKERDENEN + view_map: Xeriti Bımocnê + trace_form: + help: Peşti + tags: "Etiketi:" + upload_button: Bar ke + visibility: Vinayîşî + trace_optionals: + tags: Etiketan + trace_paging_nav: + showing_page: Pele %{page} + view: + description: "Şınasiyen:" + download: ron + edit: bıvurne + filename: "Nameyê dosya:" + heading: Rêça %{name} mocnêyêna + map: xerite + none: Çıniyo + owner: "Wayir:" + pending: PAWEDEYO + points: "Dawte:" + start_coordinates: "Pêkerden koordinat:" + tags: "Etiketi:" + title: Rêça %{name} mocnêyêna + uploaded: "Bar biyo:" + user: + account: + contributor terms: + link text: no çıko? + current email address: "E-postay şımaya newki:" + home location: "Herun:" + image: "Resim:" + latitude: "Heralem:" + longitude: "Lemen:" + my settings: Sazê mı + new email address: "E-postay adresiyo newe:" + new image: Resim deke + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: no çıko? + openid: "OpenID:" + preferred editor: "Editorê ke tercih kerê:" + preferred languages: "Zıwanê ke tercih kerê:" + public editing: + disabled link text: Ezo çı nêşena bıvurna? + enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link text: no çıko? + heading: "Pêron rê akerde vurnayış:" + public editing note: + heading: "Pêron rê akerde vurnayış:" + return to profile: Peyd şo profile + save changes button: Vurnayîşa qeyd ke + title: Hesabi timar ke + confirm: + button: Testiq ke + confirm_email: + button: Testiq ke + list: + confirm: Karberê ke weçineyayê ena tesdiq ke + heading: Karberi + hide: Karbera weçinayışi bınımnê + showing: + one: Pela %{page} (%{first_item} - toplam %{items}) + other: Pela %{page} (%{first_item}-%{last_item} - pêro %{items}) + summary: "%{name} %{ip_address} ra %{date} dı vıraşt" + summary_no_ip: "%{name} %{date} dı vıraşt" + title: Karberi + login: + email or username: "Adresê e-posta yana namey karberi:" + heading: Cıkewtış + login_button: Cıkewtış + lost password link: Şıma parolay xo ke xo vira? + no account: Hesabê şıma çıniyo? + openid: "%{logo} OpenID:" + openid_logo_alt: OpenID ya dekewê de + openid_providers: + aol: + alt: AOL OpenID ya dekewê de + title: AOL ya dekewê de + google: + alt: Google OpenID ya dekewê de + title: Google ya dekewê de + myopenid: + alt: myOpenID OpenID ya dekewê de + title: myOpenID ya dekewê de + openid: + alt: OpenID URL ya dekewê de + title: OpenID ya dekewê de + wordpress: + alt: Wordpress OpenID ya dekewê de + title: Wordpress ya dekewê de + yahoo: + alt: Yahoo OpenID ya dekewê de + title: Yahoo ya dekewê de + password: "Parola:" + register now: Enewkê qeyd bê + remember: Mı biya xo viri + title: Cıkewtış + logout: + heading: OpenStreetMap ra vıcyayış + logout_button: Veciyayış + title: Veciyayış + lost_password: + email address: "Adresa e-postey:" + heading: To parola ke xo vira? + new password button: Parola reset ke + title: Parolaya vınibyayi + make_friend: + button: Xo rê embaz ke + new: + confirm email address: "Adresê E-posta tesdiq ke:" + confirm password: "Parolay tesdiq ke:" + continue: Dewam ke + display name: "Nameyo ke Aseno:" + email address: "Adresa e-postey:" + openid: "%{logo} OpenID:" + password: "Parola:" + use openid: ALternativey, %{logo} OpenID ra karfiye + no_such_user: + heading: "%{user} name dı karber çıniyo" + title: Karbero do wuna çıniyo + popup: + friend: Embaz + nearby mapper: Xeritoğo emıryan + your location: Heruna mı + remove_friend: + button: Embazan ra vec + reset_password: + confirm password: "Parola tesdiq ke:" + heading: Parolay %{user} reset ke + password: "Parola:" + reset: Parola reset ke + title: Parola reset ke + suspended: + heading: Hesab Darideyo + title: Hesab Darideyo + webmaster: idaroğê sita + terms: + agree: Qebul kena + consider_pd_why: no çıko? + decline: Red kerê + legale_names: + france: Fransa + italy: İtalya + view: + activate_user: Nê karberi aktiv ke + add as friend: Xo rê embaz ke + ago: (%{time_in_words_ago} veror) + block_history: kılitkerdışê gırewtey + blocks by me: Bloqe kerdışê mı + blocks on me: bloqeyê mı + comments: vatışi + confirm: Testiq ke + confirm_user: nê karberi tesdiq ke + create_block: Ena karber blok bike + created from: "Vıraşten ra:" + ct accepted: Verdê %{ago} qebul ke + ct declined: Red kerd + ct undecided: Darıdeyo + deactivate_user: Nê karberi aktiv meke + delete_user: nê karberi esternê + description: Şınasnayış + diary: rocek + edits: vurnayışi + email address: "Adresa e-postey:" + hide_user: nê karberi bınımnê + km away: "%{count} km duriyo" + latest edit: "vurnayışê peyênê %{ago}:" + m away: "%{count} metre nezdiyo" + mapper since: "Demê Xeritoğiney:" + moderator_history: Bloqanê cı bıgi re + my comments: vatışê mı + my diary: rocekê mı + my edits: pêştenê mı + my settings: sazê mı + my traces: GPS rêçê mı + new diary entry: Roceko newe defi + oauth settings: sazê OAuthi + remove as friend: Embazan ra vec + role: + administrator: "Na karber administratora
    \nNo karber administratoro" + grant: + administrator: Hesabê adminisrator de gırdi + moderator: Hesabê moderator de gırdi + moderator: "Na karber Moderatora
    \nNo karber Moderatoro" + revoke: + administrator: Hesabê adminisratori terkne + moderator: Hesabê moderatori terkne + send message: mesac bırışê + settings_link_text: eyari + status: "Weziyet:" + traces: rêçi + unhide_user: nê karberi menımnê + user location: Heruna karberi + your friends: Embazê to + user_block: + blocks_by: + heading: Blokeyê ke %{name} kerdê listey ênan + title: Blokeyê ke %{name} kerdê + blocks_on: + heading: Blokeyê ke %{name} kerdê listey ênan + title: Blokeyê ke %{name} kerdê + edit: + back: Bloqan pêron bıvin + heading: "%{name} bloqe vurna" + show: Nê bloqi bıvin + submit: Bloqi noroc resn + title: "%{name} bloqe vurna" + helper: + time_future: "%{time} dı bıqediyo" + time_past: Verdê %{time} qedya + index: + title: Bloqeyê karberi + new: + back: Bloqan pêron bıvin + heading: "%{name} i bloqe vırazeno" + submit: Bloqe vırazê + title: "%{name} i bloqe vırazeno" + partial: + confirm: Vac welay? + creator_name: Vıraştoğ + display_name: Karberê kılitbiyayey + edit: Timar ke + next: Peyên » + not_revoked: (nê terkiyayo) + previous: « Verên + revoke: Terkne! + revoker_name: Terknoğ + show: Bımocne + showing_page: Pele %{page} + status: Weziyet + period: + one: 1 seate + other: "%{count} seati" + revoke: + revoke: Terkne! + show: + confirm: Vac welay? + edit: Bıvurne + heading: Karber %{block_by} karber %{block_on} ke bloqe + revoke: Terkne! + revoker: "Terkner:" + show: Bımocne + status: Weziyet + time_future: "%{time} dı bıqediyo" + time_past: Verdê %{time} qedya + title: Karber %{block_by} karber %{block_on} ke bloqe + update: + success: Bloqe noroc resneya. + user_role: + grant: + confirm: Testiq ke + revoke: + confirm: Testiq ke diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index 4b78ebc8595..1fe2b329135 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -1,8 +1,22 @@ # Messages for Lower Sorbian (dolnoserbski) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Derbeth # Author: Michawiki +# Author: Shirayuki dsb: + about_page: + community_driven_html: "Zgromaźeństwo OpenStreetMap jo wjelerake, zagórity a rosćo kuždy źeń.\nNaše sobustatkujuce su zagórite kartěrowarjo, GIS-profije, inženjery, kótarež gónje OSM-serwery, pomogarje, kótarež kartěruju strona katastrofo a wjele wěcej.\nAby wěcej wó zgromaźeństwje zgónił, glej wužywarske dnjowniki, blogi zgromaźeństwa a websedło załožby OSM Foundation" + community_driven_title: Wót zgromaźeństwa spěchowany + copyright_html: © sobustatkujuce
    OpenStreetMap + lede_text: OpenStreetMap twóri se wót zgromaźeństwa kartěrowarjow, kótarež pśinosuju a woplěwaju daty wó drogach, puśach, kafejownjach, dwórnišćach a wjele wěcej na cełem swěśe. + local_knowledge_html: Za OpenStreetMap jo wažna lokalna wěda. Sobustatkujuce wužywaju wobraze z powětša, GPS-graty a pólne kórty, aby pśeglědali, aby OSM dokładny a aktualny był. + local_knowledge_title: Lokalna wěda + next: Pśiducy + open_data_html: "OpenStreetMap wopśimujo zjawne daty: Móžoš je za kuždy zaměr wužywaś, joli až naspomnjejoš OpenStreetMap a jogo sobustatkujuce. Jolic změnijoš daty na wěsty nałog abo napórajoš, móžoš wuslědk jano pód teju samskeju licencu rozdźěliś. Glej bok awtorskego pšawa a licence za drobnosći." + open_data_title: Zjawne daty + partners_title: Partnarje + used_by: "%{name} staja kórtowe daty za sta websedłow, mobilne nałoženja a rědy k dispoziciji" activerecord: attributes: diary_comment: @@ -11,7 +25,7 @@ dsb: language: Rěc latitude: Šyrina longitude: Dlinina - title: Titel + title: Tema user: Wužywaŕ friend: friend: Pśijaśel @@ -20,7 +34,7 @@ dsb: body: Tekst recipient: Dostawaŕ sender: Wótpósłaŕ - title: Titel + title: Tema trace: description: Wopisanje latitude: Šyrina @@ -80,102 +94,62 @@ dsb: blocked: Twój pśistup k API jo se zablokěrował. Pšosym pśizjaw se do webpówjercha, aby wěcej zgónił. need_to_see_terms: Twój pśistup na API jo nachylu wusajźony. Pšosym pśizjaw se k webpówjerchoju, aby se wužywarske wuměnjenja woglědał. Njetrjebaš zwóliś do nich, musyš se je jano woglědaś. browse: + anonymous: anonymny changeset: - changeset: "Sajźba změnow: %{id}" + belongs_to: Awtor changesetxml: Sajźbu změnow XML - download: "%{changeset_xml_link} abo %{osmchange_xml_link} ześěgnuś" feed: title: Sajźba změnow %{id} title_comment: Sajźba změnow %{id} - %{comment} + node: Suki (%{count}) + node_paginated: Suki (%{x}-%{y} z %{count}) osmchangexml: osmChange XML - title: Sajźba změnow - changeset_details: - belongs_to: "Słuša k:" - bounding_box: "Wobłuk:" - box: kašćik - closed_at: "Zacynjony:" - created_at: "Napórany:" - has_nodes: - few: "Ma slědujuce %{count} suki:" - one: "Ma slědujucy suk:" - other: "Ma slědujucych %{count} sukow:" - two: "Ma slědujucej %{count} suka:" - has_relations: - few: "Ma slědujuce %{count} relacije:" - one: "Ma slědujucu relaciju:" - other: "Ma slědujucych %{count} relacijow:" - two: "Ma slědujucej %{count} relaciji:" - has_ways: - few: "Ma slědujuce %{count} puśe:" - one: "Ma slědujucy puś:" - other: "Ma slědujucych %{count} puśow:" - two: "Ma slědujucej %{count} puśa:" - no_bounding_box: Za toś tu sajźbu změnow njejo se žeden wobłuk składł. - show_area_box: Wobłukowy kašćik pokazaś - common_details: - changeset_comment: "Komentar:" - deleted_at: "Wulašowany:" - deleted_by: "Wulašowany wót:" - edited_at: "Wobźěłany:" - edited_by: "Wobźěłany wót:" - in_changeset: "W sajźbje změnow:" - version: "Wersija:" + relation: Relacije (%{count}) + relation_paginated: Relacije (%{x}-%{y} z %{count}) + title: "Sajźba změnow: %{id}" + way: Puśe (%{count}) + way_paginated: Puśe (%{x}-%{y} z %{count}) + closed: Zacynjony + closed_by_html: Zacynjony pśed %{time} wót %{user} + closed_html: Zacynjony pśed %{time} containing_relation: entry: Relacija %{relation_name} entry_role: Relacija %{relation_name} (ako %{relation_role}) - map: - deleted: Wulašowany - edit: - area: Wobcerk wobźěłaś - node: Suk wobźěłaś - relation: Relaciju wobźěłaś - way: Puś wobźěłaś - larger: - area: Wurězk na wětšej kórśe pokazaś - node: Suk na wětšej kórśe pokazaś - relation: Relaciju na wětšej kórśe pokazaś - way: Puś na wětšej kórśe pokazaś - loading: Zacytujo se... - navigation: - all: - next_changeset_tooltip: Pśiduca sajźba změnow - next_node_tooltip: Pśiducy suk - next_relation_tooltip: Pśiduca relacija - next_way_tooltip: Pśiducy puś - prev_changeset_tooltip: Pjerwjejšna sajźba změnow - prev_node_tooltip: Pśiducy suk - prev_relation_tooltip: Pjerwjejšna relacija - prev_way_tooltip: Pjerwjejšny puś - user: - name_changeset_tooltip: Změny wužywarja %{user} pokazaś - next_changeset_tooltip: Pśiduca změna wót %{user} - prev_changeset_tooltip: Pjerwjejšna změna wót %{user} + created: Napórany + created_by_html: Napórany pśed %{time} wót %{user} + created_html: Napórany pśed %{time} + deleted_by_html: Wulašowany pśed %{time} wót %{user} + download_xml: XML ześěgnuś + edited_by_html: Wobźěłany pśed %{time} wót %{user} + in_changeset: Sajźba změnow + location: "Městno:" + no_comment: (žeden komentar) node: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" - download_xml: XML ześěgnuś - edit: wobźěłaś - node: Nuk - node_title: "Suk: %{node_name}" - view_history: historiju pokazaś - node_details: - coordinates: "Koordinaty:" - part_of: "Źěl wót:" - node_history: - download: "%{download_xml_link} abo %{view_details_link}" - download_xml: XML ześěgnuś - node_history: Historija suka - node_history_title: "Historija suka: %{node_name}" - view_details: drobnostki pokazaś + history_title: "Sukowa historija: %{name}" + title: "Suk: %{name}" not_found: - sorry: Bóžko %{type} z ID %{id} njejo se dał namakaś. + sorry: "Bóžko %{type} #%{id} njejo se dał namakaś." type: changeset: sajźba změnow node: suk relation: relacija way: puś - paging_nav: - of: z - showing_page: Pokazujo se bok + note: + closed_by: Docynjony wót %{user} pśed %{when} + closed_by_anonymous: Docynjony wót anonymnego pśed %{when} + closed_title: "Docynjona pokazka #%{note_name}" + commented_by: Komentar wót %{user} pśed %{when} + commented_by_anonymous: Komentar wót anonymnego pśed %{when} + hidden_by: Schowany wót %{user} pśed %{when} + hidden_title: "Schowana pokazka #%{note_name}" + new_note: Nowa notica + open_by: Napórany wót %{user} pśed %{when} + open_by_anonymous: Napórany wót anonymnego pśed %{when} + open_title: "Njedocynjona pokazka #%{note_name}" + reopened_by: Reaktiwěrowany wót %{user} pśed %{when} + reopened_by_anonymous: Reaktiwěrowany wót anonymnego pśed %{when} + title: "Suk: %{id}" + part_of: Źěl wót redacted: message_html: Wersija %{version} toś togo %{type}a njedajo se pokazaś, dokulaž jo se južo redigěrowała. Pšosym, glědaj %{redaction_link} za drobnostki. redaction: Redakcija %{id} @@ -184,65 +158,21 @@ dsb: relation: relacija way: puś relation: - download: "%{download_xml_link} abo %{view_history_link}" - download_xml: XML ześěgnuś - relation: Relacija - relation_title: "Relacija: %{relation_name}" - view_history: historiju pokazaś - relation_details: - members: "Cłonki:" - part_of: "Źěl wót:" - relation_history: - download: "%{download_xml_link} abo %{view_details_link}" - download_xml: XML ześěgnuś - relation_history: Historija relacije - relation_history_title: "Historija relacije: %{relation_name}" - view_details: drobnostki pokazaś + history_title: "Historija relacije: %{name}" + members: Cłonki + title: "Relacija: %{name}" relation_member: entry_role: "%{type} %{name} ako %{role}" type: node: Suk relation: Relacija way: Puś - start: - manually_select: Drugi wurězk manuelnje wubraś - view_data: Daty aktualnego kórtowego wurězka zwobrazniś start_rjs: - data_frame_title: Daty - data_layer_name: Kórtowe daty pśepytaś - details: Drobnostki - drag_a_box: Wobłuk nad kórtu rozćěgnuś, aby se wurězk wubrał - edited_by_user_at_timestamp: Wobźěłany wót [[user]] [[timestamp]] - hide_areas: Wobcerki schowaś - history_for_feature: Historija za [[feature]] + feature_warning: Zacytowanje funkcijow %{num_features}, což móžo twój wobglědowak spomałšyś abo zawinowaś, až twój wobglědowak wěcej njereagěrujo. Coš toś te daty napšawdu zwobrazniś? load_data: Daty zacytaś - loaded_an_area_with_num_features: "Sy zacytał wurězk, kótaryž wopśimujo [[num_features]] elementow. Někotare wobglědowaki maju śěžkosći pśi zwobraznjowanju takeje kopice datow. Zwětšego wobglědowaki źěłaju nejlěpjej pśi zwobraznjowanju mjenjej ako 100 elementow naraz: howac twój wobglědowak spomałšujo se abo samo wěcej njereagěrujo. Jolic sy se wěsty, až coš toś te daty zwobrazniś, móžoš dołojce na tłocašk kliknuś." loading: Zacytujo se... - manually_select: Drugi wurězk wubraś - object_list: - api: Toś ten wurězk z API wótwółaś - back: Lisćinu objektow zwobrazniś - details: Drobnostki - heading: Lisćina objektow - history: - type: - node: Suk [[id]] - way: Puś [[id]] - selected: - type: - node: Suk [[id]] - way: Puś [[id]] - type: - node: Suk - way: Puś - private_user: priwatny wužywaŕ - show_areas: Wobcerki pokazaś - show_history: Historiju pokazaś - unable_to_load_size: "Njejo móžno zacytaś: Wjelikosć wobłuka [[bbox_size]] jo pśewjelika (musy mjeńša ako %{max_bbox_size} byś)" - wait: Cakaś... - zoom_or_select: Kórtu powětšyś abo kórtowy wurězk wubraś tag_details: - tags: "Atributy:" + tags: Atributy wiki_link: key: Wikijowy wopisański bok za atribut %{key} tag: Wikijowy wopisański bok za atribut %{key}=%{value} @@ -254,40 +184,27 @@ dsb: node: suk relation: relacija way: puś + version: Wersija + view_details: Drobnostki pokazaś + view_history: Historiju pokazaś way: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" - download_xml: XML ześěgnuś - edit: wobźěłaś - view_history: Historiju pokazaś - way: Puś - way_title: "Puś: %{way_name}" - way_details: also_part_of: - few: teke źěl puśow %{related_ways} - one: teke źěl puśa %{related_ways} - other: teke źěl puśow %{related_ways} - two: teke źěl puśowu %{related_ways} - nodes: "Suki:" - part_of: "Źěl wót:" - way_history: - download: "%{download_xml_link} abo %{view_details_link}" - download_xml: XML ześěgnuś - view_details: drobnostki pokazaś - way_history: Historija puśa - way_history_title: "Historija puśa: %{way_name}" + few: źěl puśow %{related_ways} + one: źěl puśa %{related_ways} + other: źěl puśow %{related_ways} + two: źěl puśowu %{related_ways} + history_title: "Historija puśa: %{name}" + nodes: Suki + title: "Puś: %{name}" changeset: changeset: anonymous: Anonymny - big_area: (wjeliki) - no_comment: (žeden) no_edits: (žedne změny) - show_area_box: wobłuk pokazaś - still_editing: (wobźěłujo se) view_changeset_details: Drobnostki sajźbow změnow pokazaś changeset_paging_nav: next: Pśiducy » previous: « Pjerwjejšny - showing_page: Pokazujo se bok %{page} + showing_page: Bok %{page} changesets: area: Wurězk comment: Komentar @@ -295,24 +212,17 @@ dsb: saved_at: Datum składowanja user: Wužywaŕ list: - description: Aktualne změny - description_bbox: Sajźby změnow w %{bbox} - description_friend: Změny twójich pśijaśelow - description_nearby: Sajźby změnow wužywarjow w bliskosći - description_user: Sajźby změnow wót %{user} - description_user_bbox: Sajźby změnow wót %{user} w %{bbox} - heading: Sajźby změnow - heading_bbox: Sajźby změnow - heading_friend: Sajźby změnow - heading_nearby: Sajźby změnow - heading_user: Sajźby změnow - heading_user_bbox: Sajźby změnow + empty: Žedne sajźby změnow namakane. + empty_area: Žedne sajźby změnow w toś tom wobcerku. + empty_user: Žedne sajźby změnow wót toś togo wužywarja. + load_more: Wěcej zacytaś + no_more: Žedne dalšne sajźby změnow namakane. + no_more_area: Žedne dalšne sajźby změnow w toś tom wobcerku. + no_more_user: Žedne dalšne sajźby změnow wót toś togo wužywarja. title: Sajźby změnow - title_bbox: Sajźby změnow w %{bbox} title_friend: Změny twójich pśijaśelow title_nearby: Sajźby změnow wužywarjow w bliskosći title_user: Sajźby změnow wót %{user} - title_user_bbox: Sajźby změnow wót %{user} w %{bbox} timeout: sorry: Bóžko jo pśedłujko trało, kupki změnow, kótarež sy póžedał, wótwołaś. diary_entry: @@ -332,8 +242,9 @@ dsb: comment_count: few: "%{count} komentary" one: 1 komentar - other: "%{count} komentarow" + other: "%{count} komentary" two: "%{count} komentara" + zero: Žedne komentary%{count} komentarow comment_link: Komentar k toś tomu zapiskoju confirm: Wobkšuśiś edit_link: Toś ten zapisk wobźěłaś @@ -368,7 +279,7 @@ dsb: newer_entries: Nowše zapiski no_entries: Žedne zapiski dnjownika older_entries: Starše zapiski - recent_entries: "Nejnowše zapiski dnjownika:" + recent_entries: Nejnowše zapiski dnjownika title: Dnjowniki wužywarjow title_friends: Dnjowniki pśijaśelow title_nearby: Dnjowniki wužywarjow w bliskosći @@ -392,6 +303,9 @@ dsb: user_title: dnjownik wužywarja %{user} editor: default: Standard (tuchylu %{name}) + id: + description: iD (we wobglědowaku zasajźony editor) + name: iD potlatch: description: Potlatch 1 (editor za wobźěłowanje we wobglědowaku) name: Potlatch 1 @@ -407,7 +321,7 @@ dsb: area_to_export: Wurězk za eksport embeddable_html: Zasajźujobny HTML export_button: Eksport - export_details: Daty OpenStreetMap licencěruju se pód licencu Creative Commons Attribution-ShareAlike 2.0. + export_details: Daty OpenStreetMap licencěruju se pód licencu Licenca Data Commons Open Database (ODbL). format: "Format:" format_to_export: Format za eksport image_size: "Wobrazowa wjelikosć:" @@ -423,29 +337,42 @@ dsb: paste_html: HTML kopěrowaś, aby se zasajźił do websedła scale: Měritko too_large: - body: Toś ten wobcerk jo pśewjeliki za eksportěrowanje ako XML-daty OpenStreetMap. Pšosym pówětš abo wubjeŕ mjeńšy wobcerk. - heading: Wobłuk pśewjeliki + advice: "Jolic górni eksport se njeraźi, pšosym rozwaž, lěc wužywaš jadnu ze slědujucych lisćinow:" + body: "Toś ten wobcerk jo pśewjeliki za eksportěrowanje ako XML-daty OpenStreetMap. Pšosym pówětš abo wubjeŕ mjeńšy wobcerk abo wužyj jadno ze slědujucych žrědłow za ześěgnjenje wjelikich kopicow datow:" + geofabrik: + description: Pšawidłownje zaktualizěrowane wuśěgi kontinentow, krajow a wubranych městow + title: Geofabrik Downloads + metro: + description: Wuśěgi za nejwětše swětowe města a jich wokolinu + title: Metro Extracts + other: + description: Pśidatne žrědła nalicone wikiju OpenStreetMap + title: Druge žrědła + overpass: + description: Toś ten wobłuk z glědałkowego serwera datoweje banki OpenStreetMap ześěgnuś + title: Overpass API + planet: + description: Pšawidłownje zaktualizěrowane kopije dopołneje datoweje banki OpenStreetMap + title: Planet OSM zoom: Skalěrowanje - start_rjs: - add_marker: Kórśe marku pśidaś - change_marker: Poziciju marki změniś - click_add_marker: Klikni na kórtu, aby pśidał marku - drag_a_box: Rozćěgni wobłuk nad kórtu, aby wubrał wurězk - export: Eksport - manually_select: Drugi wurězk manuelnje wubraś - view_larger_map: Wětšu kórtu zwobrazniś + title: Eksportěrowaś + fixthemap: + how_to_help: + join_the_community: + title: Zgromaźeństwu pśistupiś + title: Kak móžoš pomagaś + other_concerns: + title: Druge nastupnosći + title: Problem k wěsći daś / Kórtu pópšawiś geocoder: description: title: geonames: Městno z GeoNames - osm_namefinder: "%{types} z OpenStreetMap Namefinder" osm_nominatim: Městno z OpenStreetMap Nominatim types: cities: Wjelike města places: Městna towns: Města - description_osm_namefinder: - prefix: "%{distance} %{direction} wót %{type}" direction: east: pódzajtšo north: pódpołnoc @@ -468,16 +395,26 @@ dsb: title: ca_postcode: Wuslědki z Geocoder.CA geonames: Wuslědki z GeoNames + geonames_reverse: Wuslědki z GeoNames latlon: Wuslědki z Internal - osm_namefinder: Wuslědki z OpenStreetMap Namefinder osm_nominatim: Wuslědki z OpenStreetMap Nominatim + osm_nominatim_reverse: Wuslědki z OpenStreetMap Nominatim uk_postcode: Wuslědki z NPEMap / FreeThe Postcode us_postcode: Wuslědki z Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} wót %{parentname})" - suffix_place: ", %{distance} %{direction} wót %{placename}" search_osm_nominatim: + admin_levels: + level10: Pśedměsćańska granica + level2: Statna granica + level4: Krajna granica + level5: Regionowa granica + level6: Wokrejsna granica + level8: Měsćańska granica + level9: Granica měsćańskego źěla prefix: + aerialway: + chair_lift: Sedłowy lift + drag_lift: Wlaceński lift + station: Gondlowa stacija aeroway: aerodrome: Lětanišćo apron: Lětańske pśedpólo @@ -571,6 +508,7 @@ dsb: shower: Duša social_centre: Socialny centrum social_club: Towarišliwostny klub + social_facility: Socialna institucija studio: Studijo supermarket: Supermark swimming_pool: Plěwarnja @@ -599,6 +537,9 @@ dsb: "yes": Móst building: "yes": Twarjenje + emergency: + fire_hydrant: Hydrant + phone: Słup za nuzowe zawołanje highway: bridleway: Rejtarska drožka bus_guideway: Jězdna kólej kólejowego busa @@ -620,6 +561,7 @@ dsb: platform: Platforma primary: Droga prědnego rěda primary_link: Droga prědnego rěda + proposed: Naraźona droga raceway: Wuběgowanišćo residential: Bydleńska droga rest_area: Wótpócywanišćo @@ -631,6 +573,7 @@ dsb: speed_camera: Błyskowak steps: Stupy stile: Płotowy pśestup + street_lamp: Pśidrožna latarnja tertiary: Droga tśeśego rěda tertiary_link: Droga tśeśego rěda track: Pólna drožka @@ -646,6 +589,7 @@ dsb: building: Twarjenje castle: Grod church: Cerkwja + citywalls: Měsćańske murje fort: Fort house: Dom icon: Ikona @@ -655,6 +599,7 @@ dsb: monument: Pomnik museum: Muzeum ruins: Ruiny + tomb: Row tower: Torm wayside_cross: Kśica drogi wayside_shrine: Lodka drogi @@ -722,6 +667,8 @@ dsb: airfield: Wójarske lětanišćo barracks: Kazerna bunker: Bunker + mountain_pass: + "yes": Górski pas natural: bay: Zalew beach: Pśibrjog @@ -791,6 +738,7 @@ dsb: locality: Sedlišćo moor: Bagno municipality: Gmejna + neighbourhood: Bydleński wobcerk postcode: Postowa licba region: Region sea: Mórjo @@ -816,8 +764,10 @@ dsb: narrow_gauge: Wuskokólejata zeleznica platform: Pśistupnišćo preserved: Wuchowana zeleznica + proposed: Naraźona zeleznicowa cera spur: Kólejowy wótstawk station: Dwórnišćo + stop: Zeleznicowe zastanišćo subway: Zastanišćo pódzemskeje subway_entrance: Zachod k pódzemskej switch: Pśestajadło @@ -833,6 +783,7 @@ dsb: beverages: Piśowy mark bicycle: Wobchod za kólasa books: Knigłarnja + boutique: Butika butcher: Rěznik car: Awtownja car_parts: Awtowe narownanki @@ -846,6 +797,7 @@ dsb: convenience: Kšamarska loda copyshop: Kopěrowański wobchod cosmetics: Kosmetikowy wobchod + deli: Wobchod za delikatese department_store: Kupnica discount: Discounter doityourself: Wobchod za baslarsku pótrjebu @@ -882,17 +834,21 @@ dsb: organic: Wobchod za biocarobu outdoor: Pśekupnica pód gołym njebjom pet: Coologiska pśedawarnja + pharmacy: Aptejka photo: Fotograf salon: Salon + second_hand: Nakupowarnja shoes: Wobchod za crjeje shopping_centre: Kupowański centrum sports: Sportowy wobchod stationery: Pśedawarnja za pisańskich wórow supermarket: Supermark + tailor: Šlodarnja toys: Wobchod za grajki travel_agency: Drogowański běrow video: Wideowobchod wine: Wobchod za spirituoze + "yes": Wobchod tourism: alpine_hut: Górski chromcyk artwork: Wuměłska twórba @@ -915,6 +871,7 @@ dsb: viewpoint: Rozglědanišćo zoo: Coo tunnel: + culvert: Wótwódowy kanal "yes": Tunel waterway: artificial: Kumštna wódna droga @@ -938,67 +895,117 @@ dsb: water_point: Wódne městno waterfall: Wódopad weir: Gaśeńska murja + help_page: + help: + description: Pšašaj se něcogo abo pytaj za wótegronami na boku pšašanjow a wótegronow OpenStreetMap. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap ma wšake resurse za zeznaśe projekta, pšašanja a wótegrona wó něcom a zgromadnu diskusiju a dokumentěrowanje kartěrowańskich temow. + title: Pomoc + welcome: + description: Zachop z toś tym spěšnym rozpokazanim, kótarež wopsímujo zakłady OpenStreetMap. + title: Witaj k OSM + url: /welcome + wiki: + description: Pśepytaj wiki za nadrobneju OSM-dokumentaciju + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Zacyniś + edit_help: Pśesuń kórtu do městna, kótarež coš wobźěłaś, powětš tam a klikni pótom how. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda stoj jano za standardnu rowninu k dispoziciji map: base: cycle_map: Kórta za kolesowarjow + hot: Sobustatkowace humanitarneje pomocy mapquest: MapQuest Open standard: Standard transport_map: Wobchadowa kórta + copyright: © Sobustatkujuce OpenStreetMap + donate_link_text: + layers: + data: Kórtowe daty + header: Kórtowe rowniny + notes: Pokazki kórty + overlays: Waršty za pytanje za zmólkami na kórśe zmóžniś + title: Rowniny + locate: + popup: Sy w {distance} {unit} wokoło toś togo dypka + title: Aktualne městno pokazaś + zoom: + in: Pówětšyś + out: Pómjeńšyś + notes: + new: + add: Pokazku pśidaś + intro: Aby se kórta pólěpšyła, se informacije, kótarež zapódawaš, drugim kartěrowarjam pokazuju, pódaj je pótakem pšosym tak wugroniwje a dokradnje ako móžno, gaž pśesuwaš marku ku korektnej poziciji a zapódawaš swóju pokazku dołojce. + show: + anonymous_warning: Toś ta pokazka wopśimujo komentary wót anonymnych wužywarjow, kótarež by měli se njewótwisnje pśeglědaś. + comment: Komentar + comment_and_resolve: Komentěrowaś a cyniś + hide: Schowaś + reactivate: Znowego aktiwěrowaś + resolve: Wótbyty + share: + cancel: Pśetergnuś + center_marker: Kórtu pó marce centrěrowaś + custom_dimensions: Swójske pśiměrjenja stajiś + download: Ześěgnuś + embed: HTML + format: "Format:" + image: Wobraz + image_size: Wobraz pokažo standardnu rowninu pla + include_marker: Kórtowu marku stajiś + link: Wótkaz abo HTML + long_link: Wótkaz + paste_html: HTML-kod kopěrowaś, aby se do websedła zasajźił + scale: "Měritko:" + short_link: Krotki wótkaz + short_url: Krotki URL + title: Źěliś + view_larger_map: Wětšu kórtu pokazaś site: + createnote_disabled_tooltip: Powětšyś, aby kórśe pokazku pśidało + createnote_tooltip: Kórśe pokazku pśidaś edit_disabled_tooltip: Za wobźěłowanje kórty powětšyś edit_tooltip: Kórtu wobźěłaś - edit_zoom_alert: Musyš powětšyś, aby wobźěłał kórtu - history_disabled_tooltip: Powětšyś, aby se woglědał změny za toś ten wobcerk - history_tooltip: Změny za toś ten wobcerk pokazaś - history_zoom_alert: Musyš powětšyś, aby wiźeł wobźěłowańsku historiju + map_data_zoom_in_tooltip: Powětš kórtu, aby daty wiźeł + map_notes_zoom_in_tooltip: Powětš kórtu, aby pokazki wiźeł layouts: + about: Wó community: Zgromaźeństwo community_blogs: Blogi zgromaźeństwa community_blogs_title: Blogi cłonkow zgromaźeństwa OpenStreetMap - copyright: Awtorske pšawo a licenca - documentation: Dokumentacija - documentation_title: Dokumentacija za projekt + copyright: Awtorske pšawo + data: Daty donate: Pódprěj OpenStreetMap pśez %{link} do fondsa aktualizacije hardware - donate_link_text: dar edit: Wobźěłaś edit_with: Z %{editor} wobźěłaś export: Eksport - export_tooltip: Kórtowe daty eksportěrowaś + export_data: Daty eksportěrowaś foundation: Załožba foundation_title: Załožba OpenStreetMap gps_traces: GPS-slědy gps_traces_tooltip: GPS-slědy zastojaś help: Pomoc - help_centre: Centrum pomocy - help_title: Sedło pomocy za projekt history: Historija - home: domoj - home_tooltip: K stojnišćoju - inbox: post (%{count}) - inbox_tooltip: - few: Twój postowy kašćik wopśimujo %{count} njepśecytane powěsći - one: Twój postowy kašćik wopśimujo 1 njepśecytanu powěsć - other: Twój postowy kašćik wopśimujo %{count} njepśecytanych powěsćow - two: Twój postowy kašćik wopśimujo %{count} njepśecytanej powěsći - zero: Twój postowy kašćik njewopśimujo žedne njepśecytane powěsći - intro_1: OpenStreetMap jo licho wobźěłujobna kórta cełego swěta. Jo se za luźi ako ty napórała. + home: K domacnemu městnoju intro_2_create_account: Załož wužywarske konto - intro_2_download: ześěgnuś - intro_2_html: Móžoš daty dermo %{download} a pód %{license} %{use}. %{create_account}, aby kórtu pólěpšył. - intro_2_license: zjawneju licencu - intro_2_use: wužywaś - license: - title: Daty OpenStreetMap licencěruju se pód licencu Creative Commons Attribution-Share Alike 2.0 Generic - log_in: pśizjawiś + intro_header: Witaj k OpenStreetMap! + intro_text: OpenStreetMap jó kórta swěta, napórana wót luźi ako ty a dajo se licho pód wótwórjoneju licencu wužywaś. + learn_more: Dalšne informacije + log_in: Pśizjawiś log_in_tooltip: Do eksistěrowacego konta se pśizjawiś logo: alt_text: Logo OpenStreetMap - logout: wótzjawiś - logout_tooltip: Wótzjawiś + logout: Wótzjawiś make_a_donation: text: Pósćiś title: Pódprěj OpenStreetMap z pjenjezneju pósćiwanku + more: Wěcej osm_offline: Datowa banka OpenStreetMap jo tuchylu offline, dokulaž se wažne źěło za wótglědowanje datoweje banki pśewjedujo. osm_read_only: Datowa banka OpenStreetMap jo tuchylu w modusu "Jano cytaś", dokulaž se wažne źěło za wótglědowanje datoweje banki pśewjedujo. partners_bytemark: Bytemark Hosting @@ -1006,24 +1013,47 @@ dsb: partners_ic: Imperial College London partners_partners: partnerow partners_ucl: z UCL VR Centre - sign_up: registrěrowaś + sign_up: Registrěrowaś sign_up_tooltip: Konto za wobźěłowanje załožyś - sotm2011: Dojź ku konference OpenStreetMap 2011, "the State of the Map", 9 - 11. septembra w Denverje! + start_mapping: Kartěrowanje zachopiś tag_line: Licha wikikórta swěta user_diaries: Dnjowniki user_diaries_tooltip: Wužywarske dnjowniki cytaś - view: Kórta - view_tooltip: Kórtu se woglědaś - welcome_user: Witaj, %{user_link} - welcome_user_link_tooltip: Twój wužywarski bok - wiki: Wiki - wiki_title: Wikisedło za projekt license_page: foreign: english_link: engelskim originalom text: W paźe konflikta mjazy pśełožonym bokom a %{english_original_link}, engelski bok ma prědnosć měś title: Wó toś tom pśełožku - legal_babble: "

    Awtorske pšawo a licenca

    \n

    \nOpenStreetMap wobstoj ze zjawnych datow, licencěrowanych pód licencu Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA).

    Móžoš naše kórty a daty kopěrowaś, rozdźěliś, pśenjasć a pśiměriś, tak dłujko ako naspomnjejoš OpenStreetMap a jich sobustatkujucych. Jolic změnijoš naše kórty abo daty abo zepěraš se na nje, móžoš wuslědk jano pód teju sameju licencu rozdźěliś. Dopołny pšawniski code wujasnjujo twóje pšawa a zagronitosći.

    \n\n

    Kak naspomnjeś awtorstwo OpenStreetMap

    \n

    Jolic wužywaš kórtowe wobraze z OpenStreetMap, pominamy se, až nanejmjenjej pódawaš “© OpenStreetMap a sobustatkujucych, CC BY-SA”. Jolic wužywaš jano kórtowe daty, musyš “kórtowe daty © OpenStreetMap a sobustatkujucych, CC BY-SA” pódaś.

    Źož jo móžno, OpenStreetMap by měł wótkaz do http://www.openstreetmap.org/ a CC BY-SA do http://creativecommons.org/licenses/by-sa/2.0/ měś. Jolic wužywaš medij, źož wótkaze njejsu móžno (na pś. wuśišćane źěło), naraźujomy, až pokazujoš swójich cytarjow na www.openstreetmap.org a na www.creativecommons.org.

    \n\n

    Dalšne informacije

    \n

    Cytaj wěcej wó wužywanju našych datow Ceste pšawniske pšašenja.

    Sobustatkujucych OSM napominamy, až njedodawaju nigda daty ze žrědłow, kótarež su pśez awtorske pšawo šćitane (na pś. z Google Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow.

    Lěcrownož OpenStreetMap wobstoj ze zjawnych datow, njamóžomy dermotny kórtowy API za wuwiwarjow třeśich póbitowaś. \n\nGlědaj naše pšawidła za wužywanje API, Pšawidła za wužywanje pólow a Pšawidła za wužywanje Nominatim.

    \n\n

    Naše sobustatkujuce

    \n

    Naša licenca CC BY-SA pomina se, až “dajoš spócetnemu awtoroju źěk pśiměrjonemu medijoju abo srědkoju, kótaryž wužywaš”. Jadnotliwe kartěrowarje OSM njepominaju se pśidatne źěkowanje k “sobustatkujucym OpenStreetMap”, ale gaž se daty z narodnego kartěrowańskego předewześa abo z drugego wuznamnego žrědła w OpenStreetMap zapśimuju, jo pśiměrjone, jim pśez direktne pśewzeće jich źěkowanja abo pśez wótkazowanje na njo na toś tom boku wuźěkowaś.

    \n\n \n
    • Awstralska: Wopśimujo pśedměsćańske daty na zakłaźe datow awstralskego amta za statistiku (Australian Bureau of Statistics).
    • \n
    • Awstriska: Wopśimujo daty z Stadt Wien (pód CC BY), Land Vorarlberg a Land Tirol (pod CC-BY AT ze změnami).
    • \n
    • Francojska: Wopśimujo daty z Direction Générale des Impôts.
    • \n
    • Kanada: Wopśimujo daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada).
    • \n
    • Nižozemska: Wopsimujo daty © AND, 2007\n (www.and.com)
    • \n
    • Nowoseelandska: Wopśimujo daty ze žrědłow wót Land Information New Zealand. Awtorske pšawo wuměnjone.
    • \n
    • Pódpołdnjowa Afrika: Wopśimujo daty z Chief Directorate:\n National Geo-Spatial Information, Statne awtorske pšawo wuměnjone.
    • \n
    • Pólska: Wopśimujo daty z UMP-pcPL maps. Awtorske pšawo sobustatkujucych UMP-pcPL.\n\n Wěcej wó wužywanju UMP-datow w OSM
    • \n
    • Zjadnośone kralojstwo: Wopśimujo daty z Ordnance Survey (Amtske rozměrjenje kraja) © Awtorske pšawo a pšawo za datowe banki 2010.
    \n\n

    Zapśimowanje datow do OpenStreetMap njegroni, až póbitowaŕ originalnych datow pśipóznawa OpenStreetMap, dawa někaku garantiju abo pśewzejo rukowanje.

    " + legal_babble: + attribution_example: + alt: Pśikład, kak pokazujo se na webboku na OpenStreetMap + title: Pśipokazański pśikład + contributors_at_html: "Awstriska: Wopśimujo daty z Stadt Wien (pód CC BY), Land Vorarlberg a Land Tirol (pod CC-BY AT ze změnami)." + contributors_ca_html: "Kanada: Wopśimujo daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada)." + contributors_fi_html: "Finska: Wopśimujo daty z topografiskeje datoweje banki National Land Survey of Finland a drugich datowych sajźbow, pód NLSFI-licencubok sobustatkujucych na wikiju OpenStreetMap. + contributors_footer_2_html: Zapśimowanje datow do OpenStreetMap njegroni, až póbitowaŕ originalnych datow pśipóznawa OpenStreetMap, dawa někaku garantiju abo pśewzejo rukowanje. + contributors_fr_html: "Francojska: Wopśimujo daty z Direction Générale des Impôts." + contributors_gb_html: "Zjadnośone kralojstwo: Wopśimujo daty z Ordnance Survey (Amtske rozměrjenje kraja) © Awtorske pšawo a pšawo za datowe banki 2010-2012." + contributors_intro_html: "Naše sobustatkujuce su towzynty wósobow. Zapśimujomy teke daty wótwórjoneje licence z narodnych kartěrowańskich pśedewześow a drugich žrědłow, mjaz nimi:" + contributors_nl_html: "Nižozemska: Wopsimujo daty © AND, 2007 (www.and.com)" + contributors_nz_html: "Nowoseelandska: Wopśimujo daty ze žrědłow wót Land Information New Zealand. Awtorske pšawo wuměnjone." + contributors_title_html: Naše sobustatkujuce + contributors_za_html: "Pódpołdnjowa Afrika: Wopśimujo daty z Chief Directorate: National Geo-Spatial Information, Statne awtorske pšawo wuměnjone." + credit_1_html: Pominamy se, až pódawaš sobustatkujucych “© OpenStreetMap”. + credit_2_html: Musyš teke wujasniś, až daty stoje pód licencu Open Database, a, jolic naše kórtowe kachle se wužywaju, až kartografija licencěrujo se pód CC-BY-SA. Móžoš to cyniś, z tym až wótkazujoš do toś togo boka awtorskego pšawa. Alternatiwnje, a ako pótrěbnosć, jolic rozdźělujoš OSM w datowem formje, móžoš direktnje k licencam pomjenjowaś a wótkazaś. W medijach, źož wótkaze njejsu móžno (na pś. wuśišćane źěła), naraźujomy śi, twójich cytarjow na openstreetmap.org (snaź z tym až rozšyrjujoš 'OpenStreetMap' k toś tej połnej adresy), na opendatacommons.org a, jolic to jo relewantne, na creativecommons.org dopomnjeś. + credit_3_html: "Za pśepytujobnu elektronisku kórtu by měło se źěkowanje w rožku kórty pokazaś. Na pśikład:" + credit_title_html: Kak naspomnjeś awtorstwo OpenStreetMap + infringement_1_html: Sobustatkujucych OSM napominamy, až njedodawaju nigda daty ze žrědłow, kótarež su pśez awtorske pšawo šćitane (na pś. z Google Maps abo z wuśišćanych kórtow) bźez wurazneje dowólnosći awtorow. + infringement_2_html: Joli měniš, aý awtorskopšawniski šćitany material jo se datowej bance OpenStreetMap abo toś tomu sedłoju bźez dowólnosći pśidał, póśěguj se pšosym na našo póstupowanje za wótwónoźowanje wopśimjeśaabo daj to direktnje na našom formularnem boku k wěsći. + infringement_title_html: Pśejźenje stwóriśelskego pšawa + intro_1_html: "OpenStreetMap su zjawne daty, licencěrowane pód licencu Open Data\nCommons Open Database (ODbL)." + intro_2_html: Móžoš naše daty kopěrowaś, rozdźěliś, pśenjasć a pśiměriś, tak dłujko ako naspomnjejoš OpenStreetMap a jich sobustatkujucych. Jolic změnijoš naše kórty abo daty abo zepěraš se na nje, móžoš wuslědk jano pód teju sameju licencu rozdźěliś. Dopołny pšawniski code wujasnjujo twóje pšawa a zagronitosći. + intro_3_html: Kartografija w našych kórtowych kachlach a naša dokumentacija stej pód licencu Creative Commons Attribution-ShareAlike 2.0 (CC-BY-SA) licencěrowanej. + more_1_html: Cytaj wěcej wó wužywanju našych datow a kak dajo se nas pśipóznaś pód Ceste pšawniske pšašenja. + more_2_html: "Lěcrownož OpenStreetMap wobstoj ze zjawnych datow, njamóžomy dermotny kórtowy API za wuwijarjow tśeśich póbitowaś. \nGlědaj naše pšawidła za wužywanje API, Pšawidła za wužywanje kachlow a Pšawidła za wužywanje Nominatim." + more_title_html: Dalšne informacije + title_html: Awtorske pšawo a licenca native: mapping_link: kartěrowanje zachopiś native_link: dolnoserbskej wersiji @@ -1089,12 +1119,9 @@ dsb: title: Pósłany to: Komu read: - back_to_inbox: Slědk k postoju - back_to_outbox: Slědk k pósłanym powěsćam + back: Slědk date: Datum from: Wót - reading_your_messages: Swójske powěsći - reading_your_sent_messages: Twóje rozpósłane powěsći cytaś reply_button: Wótegroniś subject: Temowe nadpismo title: Powěsć cytaś @@ -1105,6 +1132,37 @@ dsb: wrong_user: "Sy ako `%{user}' pśizjawjony, ale powěsć, na kótaruž sy kśěł wótegroniś, njejo se pósłała k tomu wužywarjeju.\nPšosym pśizjaw se ako korektny wužywaŕ, aby wótegronił." sent_message_summary: delete_button: Lašowaś + note: + description: + closed_at_by_html: Pśed %{when} wót %{user} rozwězany + closed_at_html: Pśed %{when} rozwězany + commented_at_by_html: Pśed %{when} wót %{user} zaktualizěrowany + commented_at_html: Pśed %{when} zaktualizěrowany + opened_at_by_html: Pśed %{when} wót %{user} napórany + opened_at_html: Pśed %{when} napórany + reopened_at_by_html: Pśed %{when} wót %{user} reaktiwěrowany + reopened_at_html: Pśed %{when} reaktiwěrowany + entry: + comment: Komentar + full: Dopołna pokazka + mine: + ago_html: pśed %{when} + created_at: Napórany + creator: Stwóriśel + description: Wopis + heading: Pokazki wužywarja %{user} + id: ID + last_changed: Slědny raz změnjony + subheading: Pokazki, kótarež su se wót %{user} dali abo komentěrowali + title: Pokazki, kótarež su se wót %{user} dali abo komentěrowali + rss: + closed: zacynjona pokazka (blisko %{place}) + commented: nowy komentar (blisko %{place}) + description_area: Lisćina pokazkow, kótarež su se za twój wobcerk [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] k wěsći dali, komentěrowali abo docynili + description_item: RSS-kanal za pokazku %{id} + opened: nowa pokazka (blisko %{place}) + reopened: reaktiwěrowana pokazka (blisko %{place}) + title: Pokazki OpenStreetMap notifier: diary_comment_notification: footer: Móžoš komentar na %{readurl} cytaś, komentar na %{commenturl} pisaś abo na %{replyurl} wótegroniś @@ -1120,8 +1178,7 @@ dsb: email_confirm_plain: click_the_link: Jolic ty to sy, klikni pšosym dołojce na wótkaz, aby wobkšuśił změnu. greeting: Witaj, - hopefully_you_1: Něchten (naźejucy ty) co swóju e-mailowu adresu pla - hopefully_you_2: "%{server_url} do %{new_address} změniś." + hopefully_you: Něchten (naźejucy ty) co swóju e-mailowu adresu pla %{server_url} do %{new_address} změniś. friend_notification: befriend_them: Móžoš někogo na %{befriendurl} ako pśijaśela pśidaś. had_added_you: "%{user} jo śi na OpenStreetMap ako pśijaśela pśidał." @@ -1150,44 +1207,36 @@ dsb: lost_password_plain: click_the_link: Jolic ty to sy, klikni pšosym dołojce na wótkaz, aby swójo gronidło slědk stajił. greeting: Witaj, - hopefully_you_1: Něchten (snaź ty) jo pominał gronidło za - hopefully_you_2: konto OpenStreetMap z toś teju e-mailoweju adresu slědk stajiś. + hopefully_you: Něchten (snaź ty) jo pominał gronidło za konto OpenStreetMap z toś teju e-majloweju adresu slědk stajiś. message_notification: - footer1: Móžoš powěsć teke how na %{readurl} cytaś - footer2: a na %{replyurl} wótegroniś + footer_html: Móžoš powěsć pód %{readurl} cytaś a móžoš pód %{replyurl} wótegroniś header: "%{from_user} jo śi pósłał powěsć pśez OpenStreetMap z temowym nadpismom %{subject}:" hi: Witaj %{to_user}, + note_comment_notification: + anonymous: Anonymny wužywaŕ + closed: + commented_note: "%{commenter} jo kórtowu pokazku docynił, kótaruž sy komentěrował. Pokazka jo blisko %{place}." + subject_other: "[OpenStreetMap] %{commenter} jo pokazku docynił, za kótaruž se zajmujoš" + subject_own: "[OpenStreetMap] %{commenter} jo jadnu z twójich pokazkow docynił" + your_note: "%{commenter} jo jadnu z twójich kórtowych pokazkow blisko %{place} docynił." + commented: + commented_note: "%{commenter} jo komentar wó kórtowej pokazce zawóstajił, kótaruž sy komentěrował. Pokazka jo blisko %{place}." + subject_other: "[OpenStreetMap] %{commenter} jo pokazku komentěrował, za kótaruž se zajmujoš" + subject_own: "[OpenStreetMap] %{commenter} jo jadnu z twójich pokazkow komentěrował" + your_note: "%{commenter} jo komentar wó jadnej z twojich pokazkow blisko %{place} zawóstajił." + details: Dalšne drobnosći wó pokazce móžoš pód %{url} namakaś. + greeting: Witaj, + reopened: + commented_note: "%{commenter} jo kórtowu pokazku reaktiwěrował, kótaruž sy komentěrował. Pokazka jo blisko %{place}." + subject_other: "[OpenStreetMap] %{commenter} jo pokazku reaktiwěrował, za kótaruž se zajmujoš" + subject_own: "[OpenStreetMap] %{commenter} jo jadnu z twójich pokazkow reaktiwěrował" + your_note: "%{commenter} jo jadnu z twójich kórtowych pokazkow blisko %{place} reaktiwěrował." signup_confirm: - subject: "[OpenStreetMap] Twóju e-mailowu adresu wobkšuśiś" - signup_confirm_html: - ask_questions: Móžoš se za něcym wó OpenStreetMap na našom sedle Pšašanja a wótegrona pšašaś. - click_the_link: Jolic ty to sy, witaj! Klikni pšosym dołojce na wótkaz, aby wobkšuśił toś to konto a cytaj dalej za dalšne informacije wo OpenStreetMap - current_user: Lisćina aktualnych wužywarjow w kategorijach pó jich městnje w swěśe stoj pód Category:Users_by_geographical_region k dispoziciji. - get_reading: Dalšne informacije wó OpenStreetMap namakajoš na wikiju, zastaraj se z nejnowšymi powěsćami pśez blog OpenStreetMap abo Twitter, abo pśecytaj blog 0penGeoData załožarja OpenStreetMap Steve Coast za historiju projekta, kótaryž ma teke podkasty! - greeting: Witaj! - hopefully_you: Něchten (naźejucy to) co konto załožyś za - introductory_video: Móžoš se %{introductory_video_link} woglědaś. - more_videos: Su %{more_videos_link}. - more_videos_here: how dalšne wideo - user_wiki_page: Pórucujo se, až napórajoš wužywarski wikibok, kótaryž wopśimujo kategorijowe atributy, kótarež wobznamjenjuju, źož sy, na pśikład [[Category:Users_in_Chóśebuz]]. - video_to_openstreetmap: zapokazańske wideo wó OpenStreetMap - wiki_signup: Móžoš se teke na wikiju OpenStreetMap registrěrowaś. - signup_confirm_plain: - ask_questions: "Móžoš se za něcym wó OpenStreetMap na našom sedle Pšašanja a wótegrona pšašaś:" - blog_and_twitter: "Zastaraj se z nejnowšymi powěsćami pśez blog OpenStreetMap abo Twitter:" - click_the_link_1: Jolic ty to sy, witaj! Pšosym klikni dołojce na wótkaz, aby wobkšuśił swójo - click_the_link_2: konto a cytaj dalej za dalšne informacije wo OpenStreetMap. - current_user_1: Lisćina aktualnych wužywarjow w kategorijach pó jich městnje w swěśe - current_user_2: "stoj how k dispoziciji:" + confirm: "Nježli až cynimy něco, musymy wobkšuśiś, až toś to napšašowanje pśiźo wóte tebje, jolic tomu tak jo, klikni pšosym na slědujucy wótkaz, aby swójo konto wobkšuśił:" + created: Něchten (naźejamy se ty) jo rowno konto na %{site_url} załožył. greeting: Witaj! - hopefully_you: Něchten (naźejucy ty) co konto załožyś za - introductory_video: "Móžoš se zapokazańske wideo wó OpenStreetMap how woglědaś:" - more_videos: "Dalšne wideo su how:" - opengeodata: "OpenGeoData.org jo blog załožarja OpenStreetMap Steve Coast a ma teke podkasty:" - the_wiki: "Dalšne informacije namakajoš na wikiju OpenStreetMap:" - user_wiki_1: Pórucujo se, až napórajoš wužywarski wikibok, kótaryž wopśimujo - user_wiki_2: kategorijowe atributy, źož sy, na přikład [[Category:Users_in_Chóśebuz]]. - wiki_signup: "Móžoš se teke za wiki OpenStreetMap registrěrowaś:" + subject: "[OpenStreetMap] Witaj do OpenStreetMap" + welcome: Za tym až sy swójo konto wobkšuśił, buźomy tebi pśidatne informacije za prědne kšacei daś. oauth: oauthorize: allow_read_gpx: twóje priwatne GPS-slědy cytaś. @@ -1196,8 +1245,18 @@ dsb: allow_write_api: kórtu změniś. allow_write_diary: zapiski dnjownika a komentary spisaś a pśijaśelow zapisaś allow_write_gpx: GPS-slědy nagraś. + allow_write_notes: pokazki změniś. allow_write_prefs: twóje wužywarske nastajenja změniś request_access: Aplikacija %{app_name} pšosy wó pśistup na twójo konto, %{user}. Pšosym pśeglědaj, lěc aplikacija móžo slědujuce pšawa měś. Móžoš ze slědujucych pšawow jadne pšawo abo teke někotare z nich wubraś. + title: Pśistup na twójo konto awtorizěrowaś + oauthorize_failure: + denied: Sy pśistup nałoženja %{app_name} na twójo konto wótpokazał. + invalid: Awtorizěrowański token njejo płaśiwy. + title: Awtorizěrowańske napšašowanje njejo se raźiło + oauthorize_success: + allowed: Sy pśistup nałoženja %{app_name} na twójo konto dowólił. + title: Awtorizěrowańske napšašowanje dowólone + verification: Pśeglědowański kode jo %{code} revoke: flash: Sy token za %{application} anulěrował. oauth_clients: @@ -1214,6 +1273,7 @@ dsb: allow_write_api: kórtu změniś. allow_write_diary: zapiski dnjownika a komentary spisaś a pśijaśelow zapisaś. allow_write_gpx: GPS-slědy nagraś. + allow_write_notes: pokazki změniś. allow_write_prefs: wužywarske nastajenja změniś. callback_url: URL slědkwołanja name: Mě @@ -1244,6 +1304,7 @@ dsb: allow_write_api: kórtu změniś. allow_write_diary: zapiski dnjownika a komentary spisaś a pśijaśelow zapisaś. allow_write_gpx: GPS-slědy nagraś. + allow_write_notes: změnjenje pokazkow. allow_write_prefs: wužywarske nastajenja změniś. authorize_url: "URL awtorizěrowaś:" confirm: Sy se wěsty? @@ -1252,7 +1313,7 @@ dsb: key: "Kluc pśetrjebowarja:" requests: "Pominaju se slědujuce pšawa wót wužywarja:" secret: "Pótajmnosć pśetrjebowarja:" - support_notice: Pódpěramy HMAC-SHA1 (pórucujo se) a lutny tekst w modusu SSL. + support_notice: Pódpěramy HMAC-SHA1 (pórucujo se) a signatury RSA_SH1. title: OAuth-drobnostki za %{app_name} url: "URL za napšašowański token:" update: @@ -1292,6 +1353,7 @@ dsb: edit: anon_edits_link_text: Wuslěź, cogodla tomu tak jo. flash_player_required: 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. + 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. not_public: Njejsy swóje změny ako zjawne markěrował. not_public_description: Njamóžoš wěcej kórtu wobzěłaś, snaźkuli cyniś to rowno. Móžoš swóje změny na swójom %{user_page} ako zjawne markěrowaś. @@ -1300,18 +1362,15 @@ dsb: 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ś.) user_page_link: wužywarskem boku index: + createnote: Pokaz pśidaś js_1: Pak wužywaš wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił JavaScript. js_2: OpenStreetMap wužywa JavaScript za suwatu kórtu. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Licencěrowany pód licencu %{license_name} pśez %{project_name} a jogo sobustatkujucych. - project_name: Projekt OpenStreetMap + copyright: Copyright OpenStreetMap a sobustatkujuce, pód wótewrjoneju licencu permalink: Trajny wótkaz - remote_failed: Wobźěłowanje jo se njeraźiło - pśeznań se, lěc JOSM jo zacytany a opcija zdalokawóźenje jo zmóžnjona + remote_failed: Wobźěłowanje njejo se raźiło - pśeznań se, lěc JOSM jo zacytany a opcija zdalokawóźenje jo zmóžnjona shortlink: Krotki wótkaz key: - map_key: Legenda - map_key_tooltip: Legenda za kórtu table: entry: admin: Zastojnstwowa granica @@ -1397,7 +1456,6 @@ dsb: preview: Pśeglěd search: search: Pytaś - search_help: "pśikłady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', abo 'post offices near Lünen' dalšne pśikłady..." submit_text: Źi where_am_i: Źo som? where_am_i_title: Aktualne městno z pomocu pytawy wopisaś @@ -1413,6 +1471,13 @@ dsb: upload_trace: GPS-slěd nagraś delete: scheduled_for_deletion: Za wulašowanje pśedwiźona cera + description: + description_with_count: + few: GPX-dataja z %{count} dypkami wót %{user} + one: GPX-dataja z %{count} dypkom wót %{user} + other: GPX-dataja z %{count} dypkami wót %{user} + two: GPX-dataja z %{count} dypkoma wót %{user} + description_without_count: GPX-dataja wót %{user} edit: description: "Wopisanje:" download: ześěgnuś @@ -1430,7 +1495,11 @@ dsb: uploaded_at: "Nagraty:" visibility: "Widobnosć:" visibility_help: Co to groni? + georss: + title: OpenStreetMap GPS-slědy list: + description: Nejnowše nagraśa GPS-cerow pśepytaś + empty_html: How njejo nic. Nagraj nowy slěd abo wukni wěcej wó GPS-slědowanju na wikijowem boku. public_traces: Zjawne GPS-slědy public_traces_from: Zjawne GPS-slědy wót %{user} tagged_with: " wobznamjenjony pśez %{tags}" @@ -1470,14 +1539,16 @@ dsb: trace_header: see_all_traces: Wšykne slědy pokazaś see_your_traces: Wšykne swójske slědy pokazaś - traces_waiting: Maš %{count} slědow, kótarež cakaju na nagraśe. Pšosym cakaj, až njejsu nagrate, nježli až nagrajoš dalšne, až njeby cakański rěd blokěrował za drugich wužywarjow. + traces_waiting: + one: Maš %{count} slědow, kótarež cakaju na nagraśe. Pšosym cakaj, až njejsu nagrate, nježli až nagrajoš dalšne, až njeby cakański rěd blokěrował za drugich wužywarjow. + other: Maš %{count} slědow, kótarež cakaju na nagraśe. Pšosym cakaj, až njejsu nagrate, nježli až nagrajoš dalšne, až njeby cakański rěd blokěrował za drugich wužywarjow. upload_trace: Slěd nagraś trace_optionals: tags: Atributy trace_paging_nav: - next: Pśiducy » - previous: « Pjerwjejšny - showing_page: Pokazujo se bok %{page} + newer: Nowše slědy + older: Starše slědy + showing_page: Bok %{page} view: delete_track: Toś tu ceru wulašowaś description: "Wopisanje:" @@ -1516,6 +1587,9 @@ dsb: email never displayed publicly: (njejo nigda widobna) flash update success: Wužywarske informacije wuspěšnje zaktualizěrowane. flash update success confirm needed: Wužywarske informacije wuspěšnje zaktualizěrowane. Dostanjoš e-mail z napominanim, twóju e-mailowu adresu wobkšuśiś. + gravatar: + gravatar: Gravatar wužywaś + link text: Co to jo? home location: "Bydlišćo:" image: "Wobraz:" image size hint: (kwadratiske wobraze z nanejmjenjej 100x100 funkcioněruju nejlěpjej) @@ -1551,13 +1625,13 @@ dsb: update home location on click: Bydlišćo pśi kliknjenju na kórtu aktualizěrowaś? confirm: already active: Toś te konto jo se južo wobkšuśiło. - before you start: Wěmy, až nejskerjej njamóžoš docakaś kartěrowanje zachopiś, ale ty by měł nejpjerwjej někotare informacije wó sebje w slědujucem formularje pódaś. button: Wobkšuśiś - heading: Wužywarske konto wobkšuśiś + heading: Pśeglědaj swóju e-mail! + introduction_1: Smy śi wobkšuśeńsku e-mail pósłali. + introduction_2: Wobkšuś swójo konto, z tym až kliknjoš na wótkaz w e-mailce a móžoš kartěrowanje zachopiś. press confirm button: Klikni dołojce na wobkšuśeński tłocašk, aby aktiwěrował swójo konto. - reconfirm: Jolic jo se južo něco casa minuło, wót togo casa ako sy se zregistrěrował, musyš ewentuelnje sam nowu wobkšuśeńsku e-mail pósłaś. - success: Twójo konto jo se wobkšuśiło, źěkujomy se za registrěrowanje! - unknown token: Zda se, až token njeeksistěrujo. + reconfirm_html: Jolic musyš nam wobkšuśeńsku e-mailku znowego pósłaś, klikni how. + unknown token: Wobkšuśeński kod jo pśepadnjony abo njeeksistěrujo. confirm_email: button: Wobkšuśiś failure: E-mailowa adresa jo se južo wobkšuśiła pśez toś ten wótkaz. @@ -1577,8 +1651,8 @@ dsb: heading: Wužywarje hide: Wubranych wužywarjow schowaś showing: - one: Pokazujo se bok %{page} (%{first_item} z %{items}) - other: Pokazujo se bok %{page} (%{first_item}-%{last_item} z %{items}) + one: Bok %{page} (%{first_item} z %{items}) + other: Bok %{page} (%{first_item}-%{last_item} z %{items}) summary: "%{name} wót %{ip_address} dnja %{date} napórany" summary_no_ip: "%{name} dnja %{date} napórany" title: Wužywarje @@ -1593,8 +1667,6 @@ dsb: lost password link: Sy swójo gronidło zabył? new to osm: Nowy w OpenStreetMap? no account: Njamaš wužywarske konto? - notice: Wěcej wó pśichodnej licencnej změnje OpenStreetMap (pśełožki) (diskusija) - notice_terms: OpenStreetMap pśejźo 1. apryla 2012 k nowej licency. Jo teke licha ako aktualna, ale pšawniske wuměnjenja góźe se lěpjej k našej kórtowej datowej bance. My by rady twóje pśinoski w OpenStreetMap wobchowali, ale móžomy to jano cyniś, jolic sy wobjadny, až rozšyrjomy twóje pśinoski pód nowej licencu. Howac musymy je z datoweje banki wótpóraś.

    Pšosym wózjaw se, bjeŕ se pótom někotare sekundy casa, aby nowe wuměnjenja pśeglědał a akceptěrował. Wjeliki źěk! openid: "%{logo} OpenID:" openid invalid: Bóžko zda se, až twój OpenID jo njepłaśiwy openid missing provider: Bóžko njejsmy mógli z twójim OpenID-póbitowarjom zwězaś @@ -1639,19 +1711,21 @@ dsb: title: Zabyte gronidło make_friend: already_a_friend: Sy južo z %{name} spśijaśelony. + button: Ako pśijaśela pśidaś failed: Bóžko njejo se raźiło, %{name} ako twójogo pśijaśela pśidaś. - success: "%{name} jo něnto twój pśijaśel." + heading: "%{user} ako pśijaśela pśidaś?" + success: "%{name} jo něnto twój pśijaśel!" new: + about: + header: Lichy a wobźěłujobny + html: "

    Na rozdźěl wót drugich kórtow, twóri se dopołnje OpenStreetMap dospołnje wót luźi ako ty, a kuždy móžo ju korigěrowaś, aktualizěrowaś, ześěgnuś a wužywaś.

    \n

    Zregistrěruj se a cyń sobu. Buźomy śi e-mailku słaś, aby my twójo konto wobkšuśili." confirm email address: "E-mailowu adresu wobkšuśiś:" confirm password: "Gronidło wobkšuśiś:" contact_webmaster: Pšosym staj so z webmasterom do zwiska, aby se śi konto załožyło - buźomy napšašowanje tak spěšnje ako móžno wobźěłowaś. - continue: Dalej + continue: Registrěrowaś display name: "Wužywarske mě:" display name description: Sy wužywarske mě zjawnje pokazał. Móžoš to pózdźej w nastajenjach změniś. email address: "E-mailowa adresa:" - fill_form: Wupołni formular a pósćelomy śi krotku e-mail za aktiwěrowanje twójogo konta. - flash create success message: Źěkujomy se za registrěrowanje. Smy wobkšuśeński e-mail na %{email} póslali a gaž wobkšuśijoš swójo konto, móžoš kartěrowanje zachopiś.

    Jolic wužywaš pśeśiwospamowy system, kótaryž sćelo wobkšuśeńske napšašowanja, pśewzij adresu webmaster@openstreetmap.org do swójeje běłeje lisćiny, dokulaž njamóžomy na wobkšuśeńske napšašowanja wótegroniś. - heading: Wužywarske konto załožyś license_agreement: Z wobkšuśenim twójogo konta dejš wuměnjenjam pśinosowarjow pśigłosowaś. no_auto_account_create: Bóžko njamóžomy tuchylu za tebje konto awtomatiski załožyś. not displayed publicly: Njejo zjawnje widobny (glědaj pšawidła priwatnosći) @@ -1661,7 +1735,7 @@ dsb: password: "Gronidło:" terms accepted: Źěkujomy se, až sy nowe wuměnjenja za sobuskutkajucuch akceptěrował! terms declined: Woblutujomy, až sy se rozsuźił, nowe wužywarske wuměnjenja njeakceptěrowaś. Za dalšne informacije glědaj pšosym toś ten wikibok. - title: Konto załožyś + title: Registrěrowaś use openid: Alternatiwnje móžoš OpenID %{logo} za pśizjawjenje wužywaś no_such_user: body: Bóžko njejo wužywaŕ z mjenim %{user}. Pšosym pśekontrolěruj swój pšawopis, abo wótkaz, na kótaryž sy kliknuł, jo njepłaśiwy. @@ -1672,6 +1746,8 @@ dsb: nearby mapper: Kartěrowaŕ w bliskosći your location: Twójo městno remove_friend: + button: Pśijaśela wótpóraś + heading: "%{user} ako pśijaśela wótpóraś?" not_a_friend: "%{name} njejo twój pśijaśel." success: "%{name} jo se z twójich pśijaśelow wótpórał." reset_password: @@ -1706,12 +1782,12 @@ dsb: you need to accept or decline: Pšosym pśecytaj nowe wužywarske wuměnjenja a akceptěruj abo wótpokaž je, nježli až dalej cyniš. view: activate_user: toś togo wužywarja aktiwěrowaś - add as friend: ako pśijaśela pśidaś + add as friend: Pśijaśela pśidaś ago: (pśed %{time_in_words_ago}) - block_history: Dostane blokěrowanja pokazaś - blocks by me: blokěrowanja wóte mnjo - blocks on me: blokěrowanja pśeśiwo mě - comments: komentary + block_history: dostane blokěrowanja + blocks by me: Dane blokěrowanja + blocks on me: Dostane blokowanja + comments: Komentary confirm: Wobkšuśiś confirm_user: toś togo wužywarja wobkšuśiś create_block: toś togo wužywarja blokěrowaś @@ -1723,31 +1799,35 @@ dsb: deactivate_user: toś togo wužywarja znjemóžniś delete_user: toś togo wužywarja lašowaś description: Wopisanje - diary: dnjownik - edits: změny + diary: Dnjownik + edits: Změny email address: "E-mailowa adresa:" - friends_changesets: Sajźby změnow twójich pśijaśelow pśepytaś - friends_diaries: Wšykne dnjownikowe zapiski pśijaśelow pśepytaś + friends_changesets: Sajźby změnow twójich pśijaśelow + friends_diaries: dnjownikowe zapiski pśijaśelow hide_user: toś togo wužywarja schowaś - if set location: Jolic sy swójo městno nastajił, rědna kórta a někotare informacije pokažu se dołojce. Móžoś swójo stojnišćo na boku %{settings_link} nastajiś. + if set location: Pódaj swójo stojnišćo na boku %{settings_link}, a by wiźeł wužywarjow w swójej bliskosći. km away: "%{count} km zdalony" latest edit: "Nejnowša změna %{ago}:" m away: "%{count} m zdalony" mapper since: "Kartěrowaŕ wót:" - moderator_history: Rozdane blokěrowanja pokazaś - my comments: móje komentary - my diary: mój dnjownik - my edits: móje změny - my settings: móje nastajenja - my traces: móje slědy + moderator_history: Rozdane blokěrowanja + my comments: Móje komentary + my diary: Mój dnjownik + my edits: Móje změny + my messages: Móje powěsći + my notes: Móje pokazki + my profile: Mój profil + my settings: Móje nastajenja + my traces: Móje ceri nearby users: Druge wužywarje w bliskosći - nearby_changesets: Wšykne sajźby změnow wužywarjow w bliskosći pśepytaś - nearby_diaries: Wšykne dnjownikowe zapiski wužywarjow w bliskosći pśepytaś + nearby_changesets: sajźby změnow wužywarjow w bliskosći + nearby_diaries: dnjownikowe zapiski wužywarjow w bliskosći new diary entry: nowy dnjownikowy zapisk no friends: Hyšći njejsy žednych pśijaśelow pśidał. no nearby users: Hyšći njejsu žedne wužywarje, kótarež kartěruju w bliskosći. + notes: Pokazki kórty oauth settings: OAUTH-nastajenja - remove as friend: ako pśijaśela wótpóraś + remove as friend: Ako pśijaśela wótpóraś role: administrator: Toś ten wužywaŕ jo administrator grant: @@ -1757,11 +1837,11 @@ dsb: revoke: administrator: Pšawo administratora zajmjeś moderator: Pšawo moderatora zajmjeś - send message: powěsć pósłaś + send message: Powěsć pósłaś settings_link_text: nastajenja spam score: "Spamowe gódnośenje:" status: "Status:" - traces: slědy + traces: Slědy unhide_user: toś togo wužiwarja pokazaś user location: Wužywarske městno your friends: Twóje pśijaśele @@ -1819,11 +1899,14 @@ dsb: creator_name: Blokěrowaŕ display_name: Zablokěrowany wužywaŕ edit: Wobźěłaś + next: Pśiducy » not_revoked: (nic wótpórany) + previous: « Pjerwjejšny reason: Pśicyna za blokěrowanje revoke: Wótpóraś! revoker_name: Wótpórany wót show: Pokazaś + showing_page: Bok %{page} status: Status period: few: "%{count} góźiny" @@ -1873,3 +1956,25 @@ dsb: fail: Njejo móžno było wužwyarjeju "%{name}" rolu "%{role}" zajmjeś. Pšosym pśeglědaj, lěc wužywaŕ a rola stej płaśiwej. heading: Zajmjeśe role wobkšuśiś title: Zajmjeśe role wobkšuśiś + welcome_page: + add_a_note: + paragraph_1_html: Jolic coš jano drobnosć korigěrowaś a njamaš chyle, aby se zregistrěrował a wuknuł, kak se wobźěłujo, móžoš jadnorje pokazku pśidaś. + paragraph_2_html: "Źi jadnorje na kórtu a klikni na symbol pokazki:\n. Ten pśida kórśe marku, kótaruž móžoš pśesunuś. Pśidaj swóju powěźeńku, klikni pótom na Składowaś a druge kartěrowarje budu se wěcy wěnowaś." + title: Njamaš chyle za wobźěłowanje? Pśidaj pokazku! + basic_terms: + editor_html: Editor jo program abo websedło, kótarež móžoš wužywaś, aby kórtu wobźěłał. + node_html: Suk jo dypk na kórśe, na pś. gósćeńc abo bom. + paragraph_1_html: OpenStreetMap wužywa někotare wósebne zapśimjeśa. How su někotare z nich, kótarež by mógli śi wužytne byś. + tag_html: Atribut jo datowa kakosć wó suku abo puśu, na pśikład mě gósćeńca abo nejwuša spěšnosć na droze. + title: Zakładne zapśimjeśa za kartěrowanje + way_html: Puś jo linija abo płonina, na pś. droga, rěka, jazor abo twarjenje. + introduction_html: Witaj k OpenstreetMap, lichej a wobźěłujobnej kórśe swěta. Něnto, za tym až sy se zregistrěrował, móžoš se do kartěrowanja pušćiś. How jo krotke zapokazanje z nejwažnjejšymi informacijami, kótarež musyš wěźeś. + questions: + paragraph_1_html: "OpenStreetMap ma wšake resurse za zeznaśe projekta, pšašanja a wótegrona wó něcom a zgromadnu diskusiju a dokumentěrowanje kartěrowańske temy.\nPomoc." + title: Maš hyšći pšašanja? + start_mapping: Kartěrowanje zachopiś + title: Witaj! + whats_on_the_map: + off_html: Což njama wopśimjeś, su subjektiwne daty kaž pogódnośenja, historiske abo hypotetiske funkcije a daty z pśez awtorske pšawo šćitanych žrědłow. Njekopěruj z online- abo papjernych kórtow, snaźkuli maš wósebnu dowólnosć. + on_html: OpenStreetMap jo městno za kartěrowanje wěcow, kótarež su realne a aktualne - wopśimujo miliony twarjenjow, puśow a druge drobnostki wó městnach. Móžoš kartěrowaś, cožkuli zajmujo śi we napšawdnem swěśe. + title: Což na kórtu słuša diff --git a/config/locales/el.yml b/config/locales/el.yml index 294fd930be8..fffbf043df9 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -5,12 +5,25 @@ # Author: Consta # Author: Crazymadlover # Author: Evropi +# Author: FocalPoint +# Author: Geraki +# Author: Glavkos # Author: Kiriakos +# Author: Kongr43gpen # Author: Logictheo # Author: Omnipaedista # Author: Protnet +# Author: Shirayuki # Author: Zserdx +# Author: 아라 el: + about_page: + community_driven_title: Βασίζεται Στην Κοινότητα + copyright_html: ©Συνεισφέροντες
    του OpenStreetMap + local_knowledge_title: Τοπική Γνώση + next: Επόμενη + open_data_title: Ανοικτά Δεδομένα + partners_title: Συνεργάτες activerecord: attributes: diary_comment: @@ -19,7 +32,7 @@ el: language: Γλώσσα latitude: Γεωγραφικό πλάτος longitude: Γεωγραφικό μήκος - title: Τίτλος + title: Θέμα user: Χρήστης friend: friend: Φίλος @@ -28,255 +41,173 @@ el: body: Σώμα recipient: Παραλήπτης sender: Αποστολέας - title: Τίτλος + title: Θέμα trace: description: Περιγραφή latitude: Γεωγραφικό πλάτος longitude: Γεωγραφικό μήκος name: Όνομα - public: Κοινό + public: Δημόσιο size: Μέγεθος user: Χρήστης visible: Ορατό user: active: Ενεργό description: Περιγραφή - display_name: Εμφανιζόμενο όνομα - email: Ηλεκτρονικό ταχυδρομείο + display_name: Εμφανιζόμενο Όνομα + email: Διεύθυνση Ηλ. Ταχυδρομείου languages: Γλώσσες pass_crypt: Κωδικός models: - acl: Πρόσβαση στη λίστα ελέγχου - changeset: Ομάδα αλλαγών - changeset_tag: Ετικέτα ομάδας αλλαγών + acl: Πρόσβαση στη Λίστα Ελέγχου + changeset: Ομάδα Αλλαγών + changeset_tag: Χαρακτηριστικό Ομάδας Αλλαγών country: Χώρα - diary_comment: Σχόλιο στο blog - diary_entry: Καταχώρηση blog + diary_comment: Σχόλιο Ημερολογίου + diary_entry: Καταχώρηση Ημερολογίου friend: Φίλος language: Γλώσσα message: Μήνυμα node: Κόμβος - node_tag: Ετικέτα Κόμβου + node_tag: Χαρακτηριστικό Κόμβου notifier: Ειδοποιητής old_node: Παλιός Κόμβος - old_node_tag: Παλιά Ετικέτα Κόμβου + old_node_tag: Παλιά Χαρακτηριστικό Κόμβου old_relation: Παλιά Σχέση - old_relation_member: Παλιό μέλος της σχέσης - old_relation_tag: Παλιά ετικέτα της σχέσης + old_relation_member: Παλιό Μέλος της Σχέσης + old_relation_tag: Παλιό Χαρακτηριστικό Σχέσης old_way: Παλιά Διαδρομή old_way_node: Κόμβος Παλιάς Διαδρομής - old_way_tag: Ετικέτα Παλιάς Διαδρομής + old_way_tag: Χαρακτηριστικό Παλιάς Διαδρομής relation: Σχέση - relation_member: Μέλος της σχέσης - relation_tag: Ετικέτα σχέσης + relation_member: Μέλος της Σχέσης + relation_tag: Χαρακτηριστικό Σχέσης session: Συνεδρία trace: Ίχνος - tracepoint: Σημείο ίχνους - tracetag: Ετικέτα ίχνους + tracepoint: Σημείο Ίχνους + tracetag: Χαρακτηριστικό Ίχνους user: Χρήστης - user_preference: Προτιμήσεις χρήστη - user_token: Τεκμήριο χρήστη + user_preference: Προτιμήσεις Χρήστη + user_token: Διακριτικό Χρήστη way: Διαδρομή way_node: Κόμβος Διαδρομής - way_tag: Ετικέτα Διαδρομής + way_tag: Χαρακτηριστικό Διαδρομής application: require_cookies: cookies_needed: Φαίνεται ότι έχετε τα cookies απενεργοποιημένα - παρακαλούμε ενεργοποιήστε τα cookies στο πρόγραμμα περιήγησής σας πριν συνεχίσετε. + require_moderator: + not_a_moderator: Θα πρέπει να είστε συντονιστής για να εκτελέσετε αυτήν την ενέργεια. browse: + anonymous: ανώνυμος changeset: - changeset: "Ομάδα αλλαγών: %{id}" + belongs_to: Δημιουργός changesetxml: Ομάδας αλλαγών XML - download: Λήψη %{changeset_xml_link} ή %{osmchange_xml_link} feed: title: Ομάδα αλλαγών %{id} title_comment: Ομάδα αλλαγών %{id} - %{comment} + node: Kόμβοι (%{count}) + node_paginated: Κόμβοι (%{x}-%{y} από %{count}) osmchangexml: osmChange XML - title: Ομάδα αλλαγών - changeset_details: - belongs_to: "Ανήκει στον/στην:" - bounding_box: "Πλαίσιο οριοθέτησης:" - box: κουτί - closed_at: "Έκλεισε στις:" - created_at: "Δημιουργήθηκε στις:" - has_nodes: - one: "Έχει τον επόμενο %{count} κόμβο:" - other: "Έχει τους επόμενους %{count} κόμβους:" - has_relations: "Έχει τις επόμενες %{count} σχέσεις:" - has_ways: "Έχει τις επόμενες %{count} διαδρομές:" - no_bounding_box: Δεν αποθηκεύτηκε πλαίσιο οριοθέτησης για αυτή την ομάδα αλλαγών. - show_area_box: Δείξε κουτί περιοχής - common_details: - changeset_comment: "Σχόλιο:" - deleted_at: "Διαγράφηκε στις:" - deleted_by: "Διαγράφηκε από:" - edited_at: "Επεξεργάστηκε στις:" - edited_by: "Επεξεργάστηκε από:" - in_changeset: "Στην ομάδα αλλαγών:" - version: "Εκδοχή:" + relation: Σχέσεις (%{count}) + relation_paginated: Σχέσεις (%{x}-%{y} από %{count}) + title: "Ομάδα αλλαγών: %{id}" + way: Διαδρομές (%{count}) + way_paginated: Διαδρομές (%{x}-%{y} από %{count}) + closed: Έκλεισε + closed_by_html: Κλείστηκε πριν από %{time} από τον %{user} + closed_html: Κλείστηκε πριν από %{time} containing_relation: entry: Σχέση %{relation_name} entry_role: Σχέση %{relation_name} (ως %{relation_role}) - map: - deleted: Διαγραμμένο - edit: - area: Επεξεργασία περιοχής - node: Επεξεργασία κόμβου - relation: Επεξεργασία σχέσης - way: Επεξεργασία διαδρομής - larger: - area: Δες την περιοχή σε μεγαλύτερο χάρτη. - node: Προβολή του κόμβου σε μεγαλύτερο χάρτη - relation: Δες την σχέση σε μεγαλύτερο χάρτη - way: Δες την διαδρομή σε μεγαλύτερο χάρτη. - loading: Φόρτωση... - navigation: - all: - next_changeset_tooltip: Επόμενη ομάδα αλλαγών - next_node_tooltip: Επόμενος κόμβος - next_relation_tooltip: Επόμενη σχέση - next_way_tooltip: Επόμενη διαδρομή - prev_changeset_tooltip: Προηγούμενη ομάδα αλλαγών - prev_node_tooltip: Προηγούμενος κόμβος - prev_relation_tooltip: Προηγούμενη σχέση - prev_way_tooltip: Προηγούμενη διαδρομή - user: - name_changeset_tooltip: Προβολή αλλαγών από %{user} - next_changeset_tooltip: Επόμενη επεξεργασία από τον %{user} - prev_changeset_tooltip: Προηγούμενη επεξεργασία από τον %{user} + created: Δημιουργήθηκε + created_by_html: Δημιουργήθηκε πριν από %{time} από τον %{user} + created_html: Δημιουργήθηκε πριν από %{time} + deleted_by_html: Διεγράφη πριν από %{time} από τον %{user} + download_xml: Λήψη XML + edited_by_html: Επεξεργάστηκε πριν από %{time} από τον %{user} + in_changeset: Ομάδα αλλαγών + location: "Τοποθεσία:" + no_comment: (χωρίς σχόλιο) node: - download: "%{download_xml_link}, %{view_history_link} ή %{edit_link}" - download_xml: Λήψη XML - edit: επεξεργασία - node: Κόμβος - node_title: "Κόμβος: %{node_name}" - view_history: δες ιστορία - node_details: - coordinates: "Συντεταγμένες:" - part_of: "Κομμάτι του:" - node_history: - download: "%{download_xml_link} ή %{view_details_link}" - download_xml: Λήψη XML - node_history: Ιστορικό Κόμβου - node_history_title: "Ιστορικό Κόμβου: %{node_name}" - view_details: Δες λεπτομέρειες + history_title: "Ιστορικό Κόμβου: %{name}" + title: "Κόμβος: %{name}" not_found: - sorry: Λυπάμαι, ο/η %{type} με την ταυτότητα %{id}, δε μπορεί να βρεθεί. + sorry: "Λυπάμαι, ο/η/το %{type} #%{id} δε μπορούσε να βρεθεί." type: changeset: ομάδα αλλαγών - node: Κόμβος + node: κόμβος relation: σχέση way: διαδρομή - paging_nav: - of: από - showing_page: Εμφάνιση σελίδας + note: + closed_by: Επιλύθηκε από τον %{user} πριν από %{when} + closed_by_anonymous: Επιλύθηκε από ανώνυμο χρήστη πριν από %{when} + closed_title: "Επιλυμένη σημείωση: #%{note_name}" + commented_by: Σχόλιο από τον %{user} πριν από %{when} + commented_by_anonymous: Σχόλιο από ανώνυμο χρήστη πριν από %{when} + hidden_by: Έγινε κρυφή από τον %{user} πριν από %{when} + hidden_title: "Κρυφή σημείωση #%{note_name}" + new_note: Νέα Σημείωση + open_by: Δημιουργήθηκε από τον %{user} πριν από %{when} + open_by_anonymous: Δημιουργήθηκε από ανώνυμο χρήστη πριν από %{when} + open_title: "Ανοικτή σημείωση #%{note_name}" + reopened_by: Επανενεργοποιήθηκε από τον %{user} πριν από %{when} + reopened_by_anonymous: Επανενεργοποιήθηκε από ανώνυμο χρήστη πριν από %{when} + title: "Σημείωση: %{id}" + part_of: Μέρος του redacted: + message_html: Η έκδοση %{version} του %{type} δε μπορεί να εμφανιστεί, δεδομένου ότι έχει αναθεωρηθεί. Παρακαλώ δείτε %{redaction_link} για λεπτομέρειες. + redaction: Αναθεώρηση %{id} type: - node: Κόμβος + node: κόμβος relation: σχέση way: διαδρομή relation: - download: "%{download_xml_link} ή %{view_history_link}" - download_xml: Λήψη XML - relation: Σχέση - relation_title: "Σχέση: %{relation_name}" - view_history: δες ιστορικό - relation_details: - members: "Μέλη:" - part_of: "Μέρος του:" - relation_history: - download: "%{download_xml_link} ή %{view_details_link}" - download_xml: Λήψη XML - relation_history: Ιστορικό Σχέσης - relation_history_title: "Ιστορικό σχέσης: %{relation_name}" - view_details: προβολή λεπτομερειών + history_title: "Ιστορικό Σχέσης: %{name}" + members: Μέλη + title: "Σχέση: %{name}" relation_member: + entry: "%{type} %{name}" entry_role: "%{type} %{name} ως %{role}" type: node: Κόμβος relation: Σχέση way: Διαδρομή - start: - manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής - view_data: Προβολή δεδομένων για την τρέχουσα προβολή χάρτη start_rjs: - data_frame_title: Δεδομένα - data_layer_name: Δεδομένα - details: Λεπτομέρειες - drag_a_box: Σύρε ένα πλαίσιο στο χάρτη για να επιλέξεις μια περιοχή - edited_by_user_at_timestamp: Επεξεργάστηκε από τον [[user]] στις [[timestamp]] - hide_areas: Απόκρυψη περιοχών - history_for_feature: Ιστορικό για [[feature]] - load_data: Φόρτωση δεδομένων - loaded_an_area_with_num_features: "Έχεις φορτώσει μια περιοχή που περιέχει [[num_features]] χαρακτηριστικά. Γενικά, μερικοί browsers μπορεί να μην αντέχουν να δείξουν τόσα πολλά στοιχεία. Γενικά, οι browsers δουλεύουν καλύτερα δείχνοντας λιγότερα από 100 χαρακτηριστικά τη φορά: με οτιδήποτε άλλο ο browser μπορεί να γίνει αργός ή να μην αντιδρά. Αν είσαι σίγουρος ότι θες να δεις αυτά τα δεδομένα, κάνε κλικ στο επόμενο κουμπί." - loading: Φόρτωση... - manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής - object_list: - api: Ανάκτηση περιοχής από το API - back: Εμφάνιση λίστας αντικειμένων - details: Λεπτομέρειες - heading: Λίστα αντικειμένων - history: - type: - node: Κόμβος [[id]] - way: Διαδρομή [[id]] - selected: - type: - node: Κόμβος [[id]] - way: Διαδρομή [[id]] - type: - node: Κόμβος - way: Διαδρομή - private_user: ιδιωτικός χρήστης - show_areas: Εμφάνιση περιοχών - show_history: Προβολή ιστορικού - unable_to_load_size: "Δεν είναι δυνατή η φόρτωση: το μέγεθος [[bbox_size]] του πλαισίου οριοθέτησης είναι πολύ μεγάλο (πρέπει να είναι μικρότερο από %{max_bbox_size})" - wait: Αναμονή... - zoom_or_select: Μεγέθυνση ή επιλογή περιοχής του χάρτη προς εμφάνιση + feature_warning: Φορτώνουν %{num_features} χαρακτηριστικά. Αυτή η ενέργεια ενδέχεται να προκαλέσει τον περιηγητή σας να γίνει αργός ή να μην αντιδρά. Σίγουρα θέλετε να εμφανίσετε αυτά τα δεδομένα; + load_data: Φόρτωση Δεδομένων + loading: Φόρτωση σε εξέλιξη... tag_details: - tags: "Ετικέτες:" + tags: Χαρακτηριστικά wiki_link: - key: Η wiki σελίδα περιγραφής για την ετικέτα %{key} - tag: Η wiki σελίδα περιγραφής για την ετικέτα %{key}=%{value} + key: Η σελίδα περιγραφής για το χαρακτηριστικό %{key} + tag: Η σελίδα περιγραφής για το χαρακτηριστικό %{key}=%{value} wikipedia_link: Το άρθρο %{page} στη Βικιπαίδεια timeout: sorry: Λυπάμαι, τα δεδομένα για το/τη %{type} με αναγνωριστικό %{id}, χρειάστηκε πολύ χρόνο για να ανακτηθεί. type: changeset: ομάδα αλλαγών - node: Κόμβος + node: κόμβος relation: σχέση - way: Διαδρομή + way: διαδρομή + version: Έκδοση + view_details: Προβολή Λεπτομερειών + view_history: Προβολή Ιστορικού way: - download: "%{download_xml_link}, %{view_history_link} ή %{edit_link}" - download_xml: Λήψη XML - edit: επεξεργασία - view_history: Προβολή ιστορικού - way: Διαδρομή - way_title: "Διαδρομή: %{way_name}" - way_details: also_part_of: - one: επίσης μέρος της διαδρομής %{related_ways} - other: επίσης μέρος των διαδρομών %{related_ways} - nodes: "Κόμβοι:" - part_of: "Μέρος του:" - way_history: - download: "%{download_xml_link} ή %{view_details_link}" - download_xml: Λήψη XML - view_details: Προβολή λεπτομερειών - way_history: Ιστορικό Διαδρομής - way_history_title: "Ιστορικό Διαδρομής: %{way_name}" + one: τμήμα της διαδρομής %{related_ways} + other: τμήμα των διαδρομών %{related_ways} + history_title: "Ιστορικό Διαδρομής: %{name}" + nodes: Κόμβοι + title: "Διαδρομή: %{name}" changeset: changeset: anonymous: Ανώνυμος - big_area: (μεγάλο) - no_comment: (κανένα) no_edits: (χωρίς επεξεργασίες) - show_area_box: δείξε κουτί περιοχής - still_editing: (ακόμη σε επεξεργασία) view_changeset_details: Προβολή λεπτομερειών ομάδας αλλαγών changeset_paging_nav: - next: Επόμενο » - previous: « Προηγούμενο - showing_page: Εμφάνιση σελίδας %{page} + next: Επόμενη » + previous: « Προηγούμενη + showing_page: Σελίδα %{page} changesets: area: Περιοχή comment: Σχόλιο @@ -284,30 +215,24 @@ el: saved_at: Αποθήκευση στις user: Χρήστης list: - description: Πρόσφατες αλλαγές - description_bbox: Ομάδες αλλαγών μεταξύ %{bbox} - description_friend: Ομάδες αλλαγών από τους φίλους σας - description_nearby: Ομάδες αλλαγών από κοντινούς χρήστες - description_user: Ομάδες αλλαγών από %{user} - description_user_bbox: Ομάδες αλλαγών από %{user} μεταξύ %{bbox} - heading: Ομάδες αλλαγών - heading_bbox: Ομάδες αλλαγών - heading_friend: Ομάδες αλλαγών - heading_nearby: Ομάδες αλλαγών - heading_user: Ομάδες αλλαγών - heading_user_bbox: Ομάδες αλλαγών + empty: Δεν βρέθηκαν ομάδες αλλαγών. + empty_area: Δεν βρέθηκαν αλλαγές σε αυτήν την περιοχή. + empty_user: Δεν υπάρχουν αλλαγές από αυτόν τον χρήστη. + load_more: Εμφάνιση περισσότερων + no_more: Δεν βρέθηκαν άλλες ομάδες αλλαγών. + no_more_area: Δεν υπάρχουν άλλες ομάδες αλλαγών για αυτήν την περιοχή. + no_more_user: Δεν υπάρχουν άλλες ομάδες αλλαγών από αυτόν τον χρήστη. title: Ομάδες αλλαγών - title_bbox: Ομάδες αλλαγών μεταξύ %{bbox} title_friend: Ομάδες αλλαγών από τους φίλους σου title_nearby: Ομάδες αλλαγών από κοντινούς χρήστες title_user: Ομάδες αλλαγών από τον %{user} - title_user_bbox: Ομάδες αλλαγών από τον %{user} μεταξύ %{bbox} timeout: sorry: Λυπάμαι, ο κατάλογος των ομάδων αλλαγών που ζήτησες χρειάστηκε πολύ χρόνο για να ανακτηθεί. diary_entry: comments: - ago: "%{ago} πριν" + ago: πριν από %{ago} comment: Σχόλιο + has_commented_on: Ο %{display_name} έχει σχολιάσει στις ακόλουθες καταχωρήσεις στο ημερολόγιο newer_comments: Νεότερα Σχόλια older_comments: Παλαιότερα Σχόλια post: Καταχώρηση @@ -318,8 +243,9 @@ el: hide_link: Απόκρυψη αυτού του σχολίου diary_entry: comment_count: - one: 1 σχόλιο + one: "%{count} σχόλιο" other: "%{count} σχόλια" + zero: Κανένα σχόλιο comment_link: Σχόλιο για τη καταχώρηση confirm: Επιβεβαίωση edit_link: Επεξεργασία καταχώρησης @@ -336,7 +262,7 @@ el: save_button: Αποθήκευση subject: "Θέμα:" title: Επεξεργασία καταχώρησης ημερολογίου - use_map_link: χρήση του χάρτη + use_map_link: χρησιμοποιήστε τον χάρτη feed: all: description: Πρόσφατες καταχωρήσεις ημερολογίου από χρήστες του OpenStreetMap @@ -345,16 +271,16 @@ el: description: Πρόσφατες καταχωρήσεις ημερολογίου από χρήστες του OpenStreetMap στα %{language_name} title: Καταχωρήσεις ημερολογίου OpenStreetMap στα %{language_name} user: - description: Πρόσφατες καταχωρίσεις ημερολογίου OpenStreetMap από %{user} - title: Καταχωρίσεις ημερολογίου OpenStreetMap για %{user} + description: Πρόσφατες καταχωρίσεις ημερολογίου OpenStreetMap από τον %{user} + title: Καταχωρίσεις ημερολογίου OpenStreetMap για τον %{user} list: in_language_title: Καταχωρήσεις Ημερολογίων στα %{language} new: Νέα Καταχώρηση Ημερολογίου new_title: Συνθέστε μια νέα καταχώρηση στο ημερολόγιο χρήστη σας newer_entries: Νεότερες Καταχωρήσεις - no_entries: Καμία καταχώρηση ημερολογίου + no_entries: Δεν βρέθηκαν καταχωρήσεις στο ημερολόγιο older_entries: Παλιότερες Καταχωρήσεις - recent_entries: "Πρόσφατες καταχωρήσεις ημερολογίου:" + recent_entries: Πρόσφατες καταχωρίσεις ημερολογίου title: Ημερολόγια χρηστών title_friends: Ημερολόγια φίλων title_nearby: Ημερολόγια Κοντινών Χρηστών @@ -378,53 +304,63 @@ el: user_title: ημερολόγιο του %{user} editor: default: Προεπιλογή (τώρα είναι %{name}) + id: + description: iD (επεξεργαστής μέσα στον περιηγητή) + name: iD potlatch: - description: Potlatch 1 (επεξεργαστής μέσα στο περιηγητή ιστού) + description: Potlatch 1 (επεξεργαστής μέσα στον περιηγητή) name: Potlatch 1 potlatch2: - description: Potlatch 2 (επεξεργαστής μέσα στο περιηγητή ιστού) + description: Potlatch 2 (επεξεργαστής μέσα στο περιηγητή) name: Potlatch 2 remote: - description: Τηλεχειρισμός (JOSM ή Merkaartor) - name: Τηλεχειρισμός + description: εξωτερικό πρόγραμμα (JOSM ή Merkaartor) + name: Εξωτερικό πρόγραμμα export: start: add_marker: Προσθέστε ένα δείκτη στο χάρτη - area_to_export: Περιοχή προς εξαγωγή + area_to_export: Περιοχή προς Εξαγωγή embeddable_html: Ενσωματούμενη HTML export_button: Εξαγωγή - export_details: Τα δεδομένα OpenStreetMap είναι αδειοδοτημένα κάτω από την άδεια Creative Commons Attribution-ShareAlike 2.0. + export_details: Τα δεδομένα του OpenStreetMap είναι αδειοδοτημένα υπό την Open Data Commons Open Database License (ODbL). format: Μορφοποίηση - format_to_export: Μορφή προς εξαγωγή + format_to_export: Μορφή προς Εξαγωγή image_size: Μέγεθος Εικόνας latitude: "Γεω. Πλ:" licence: Άδεια longitude: "Γεω. Μη.:" manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής + map_image: Εικόνα Χάρτη (δείχνει τυπικό στρώμα) max: μεγ options: Επιλογές - osm_xml_data: Δεδομένα OpenStreetMap XML + osm_xml_data: Δεδομένα OpenStreetMap σε μορφή XML output: Απόδοση paste_html: Επικόλληση HTML για ενσωμάτωση στην ιστοσελίδα scale: Κλίμακα too_large: - body: Αυτή η περιοχή είναι πολύ μεγάλη για να εξαχθεί ως δεδομένα OpenStreetMap XML. Παρακαλώ κάνετε μεγέθυνση ή επιλέξτε μικρότερη περιοχή. - heading: Πολύ Μεγάλη Περιοχή + advice: "Αν η εξαγωγή αποτυγχάνει, παρακαλώ δοκιμάστε μία από τις πηγές που αναφέρονται παρακάτω:" + body: "Αυτή η περιοχή είναι πολύ μεγάλη για να εξαχθεί ως δεδομένα OpenStreetMap XML. Παρακαλώ κάνετε μεγέθυνση, επιλέξτε μικρότερη περιοχή, ή χρησιμοποιήστε μία από της ακόλουθες πηγές για μαζικές λήψεις δεδομένων:" + geofabrik: + description: Τακτικά-ενημερωμένες εξαγωγές ηπείρων, χωρών και επιλεγμένων πόλεων + title: Λήψεις Geofabrik + metro: + description: Χάρτες για τις μεγάλες πόλεις του κόσμου και της γύρω περιοχές + title: Εξαγωγές Metro + other: + description: Επιπλέον πηγές απαριθμούνται στο βίκι του OpenStreetMap + title: Άλλες Πηγές + overpass: + title: Overpass API + planet: + description: Τακτικά-ενημερωμένα αντίγραφα της πλήρης βάσης δεδομένων του OpenStreetMap + title: Πλανήτης OSM zoom: Εστίαση - start_rjs: - add_marker: Προσθέστε ένα δείκτη στο χάρτη - change_marker: Αλλαγή θέσης δείκτη - click_add_marker: Κάντε κλικ στο χάρτη για να προσθέσετε ένα δείκτη - drag_a_box: Σύρετε ένα πλαίσιο στο χάρτη για να επιλέξετε μια περιοχή - export: Εξαγωγή - manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής - view_larger_map: Προβολή Μεγαλύτερου Χάρτη + title: Εξαγωγή geocoder: description: title: geonames: Τοποθεσία από το GeoNames - osm_namefinder: "%{types} από OpenStreetMap Namefinder" - osm_nominatim: Τοποθεσία από OpenStreetMap Nominatim + osm_nominatim: Τοποθεσία από το OpenStreetMap Nominatim types: cities: Πόλεις places: Μέρη @@ -448,22 +384,39 @@ el: search: title: ca_postcode: Αποτελέσματα από Geocoder.CA - geonames: Αποτελέσματα από GeoNames - latlon: Εσωτερικά αποτελέσματα - osm_namefinder: Αποτελέσματα από OpenStreetMap Namefinder - osm_nominatim: Αποτελέσματα από OpenStreetMap Nominatim + geonames: Αποτελέσματα από το GeoNames + geonames_reverse: Αποτελέσματα από το GeoNames + latlon: Αποτελέσματα από την εσωτερική βάση δεδομένων + osm_nominatim: Αποτελέσματα από το OpenStreetMap Nominatim + osm_nominatim_reverse: Αποτελέσματα από το OpenStreetMap Nominatim uk_postcode: Αποτέλεσμα από NPEMap / FreeThe Postcode us_postcode: Αποτελέσματα από Geocoder.us - search_osm_namefinder: - prefix: "%{type}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} από %{parentname})" - suffix_place: ", %{distance} %{direction} από %{placename}" search_osm_nominatim: + admin_levels: + level10: Σύνορο Προαστίου + level2: Σύνορο Χώρας + level4: Σύνορο Πολιτείας + level5: Σύνορο Περιοχής + level6: Σύνορο Κομητείας + level8: Σύνορο Πόλης + level9: Σύνορο Χωριού prefix: + aerialway: + chair_lift: τελεφερίκ με καθίσματα + aeroway: + aerodrome: Αεροδρόμιο + apron: Χώρος Ελιγμών + gate: Πύλη + helipad: Ελικοδρόμιο + runway: Διάδρομος + taxiway: Τροχιόδρομος + terminal: Τερματικός Σταθμός amenity: + WLAN: Πρόσβαση WiFi airport: Αεροδρόμιο arts_centre: Κέντρο Τεχνών - atm: ATM + artwork: Έργο Τέχνης + atm: ΑΤΜ auditorium: Αμφιθέατρο bank: Τράπεζα bar: Μπαρ @@ -471,12 +424,13 @@ el: bench: Πάγκος bicycle_parking: Στάθμευση Ποδηλάτων bicycle_rental: Ενοικίαση Ποδηλάτων - brothel: Οίκος ανοχής + biergarten: Υπαίθρια Μπυραρία + brothel: Οίκος Ανοχής bureau_de_change: Ανταλλακτήριο Συναλλάγματος bus_station: Σταθμός Λεωφορείου cafe: Καφετέρια - car_rental: Ενοικίαση αυτοκινήτου - car_sharing: Κοινή χρήση αυτοκινήτων + car_rental: Ενοικίαση Αυτοκινήτου + car_sharing: Κοινή Χρήση Αυτοκινήτων car_wash: Πλύσιμο Αυτοκινήτων casino: Καζίνο charging_station: Σταθμός Φόρτισης @@ -496,36 +450,40 @@ el: emergency_phone: Τηλέφωνο Έκτακτης Ανάγκης fast_food: Ταχυφαγείο ferry_terminal: Σταθμός Πορθμείων - fire_hydrant: Κρουνός πυροσβεστικής - fire_station: Πυροσβεστικός σταθμός + fire_hydrant: Κρουνός Πυροσβεστικής + fire_station: Πυροσβεστικός Σταθμός + food_court: Προαύλιο Φαγητού fountain: Συντριβάνι fuel: Καύσιμα grave_yard: Νεκροταφείο gym: Γυμναστήριο + hall: Αίθουσα health_centre: Κέντρο Υγείας hospital: Νοσοκομείο hotel: Ξενοδοχείο + hunting_stand: Κυνηγητικό Κιόσκι ice_cream: Παγωτό kindergarten: Νηπιαγωγείο library: Βιβλιοθήκη market: Αγορά marketplace: Αγορά + mountain_rescue: Ορεινή Διάσωση nightclub: Νυχτερινό Κέντρο - nursery: Παιδικός σταθμός + nursery: Παιδικός Σταθμός nursing_home: Οίκος Ευγηρίας office: Γραφείο park: Πάρκο - parking: Χώρος στάθμευσης + parking: Χώρος Στάθμευσης pharmacy: Φαρμακείο - place_of_worship: Τόπος λατρείας + place_of_worship: Τόπος Λατρείας police: Αστυνομία post_box: Ταχυδρομική Θυρίδα post_office: Ταχυδρομείο preschool: Προσχολική Εκπαίδευση prison: Φυλακή pub: Παμπ - public_building: Δημόσιο κτίριο - public_market: Δημόσια αγορά + public_building: Δημόσιο Κτίριο + public_market: Δημόσια Αγορά reception_area: Χώρος Υποδοχής recycling: Σημείο Ανακύκλωσης restaurant: Εστιατόριο @@ -535,6 +493,9 @@ el: shelter: Καταφύγιο shop: Κατάστημα shopping: Αγορές + shower: Ντους + social_centre: Κοινωνικό Κέντρο + social_club: Κοινωνική Λέσχη studio: Στούντιο supermarket: Σουπερμάρκετ swimming_pool: Πισίνα @@ -546,24 +507,39 @@ el: university: Πανεπιστήμιο vending_machine: Μηχάνημα Αυτόματης Πώλησης veterinary: Κτηνιατρική Χειρουργική + village_hall: Αίθουσα Χωριού waste_basket: Καλάθι Απορριμμάτων wifi: Πρόσβαση WiFi youth_centre: Κέντρο Νεολαίας boundary: administrative: Διοικητικό Όριο - national_park: Εθνικό πάρκο + census: Όριο Απογραφής + national_park: Εθνικό Πάρκο protected_area: Προστατευόμενη Περιοχή bridge: + aqueduct: Υδραγωγείο + suspension: Κρεμαστή Γέφυρα + swing: Αιωρούμενη Γέφυρα + viaduct: Κοιλαδογέφυρα "yes": Γέφυρα building: "yes": Κτίριο + emergency: + fire_hydrant: Πυροσβεστικός Κρουνός + phone: Τηλέφωνο Έκτακτης Ανάγκης highway: bridleway: Μονοπάτι για άλογα + bus_guideway: Καθορισμένη Λωρίδα Λεωφορείου bus_stop: Στάση Λεωφορείου - construction: Δρόμος υπό κατασκευή + byway: Παράδρομος + construction: Δρόμος υπό Κατασκευή + cycleway: Ποδηλατόδρομος emergency_access_point: Σημείο Πρόσβασης Έκτακτης Ανάγκης footway: Μονοπάτι ford: Κοιτόστρωση + living_street: Μεικτός Δρόμος + milestone: Ορόσημο + minor: Επαρχιακός Δρόμος motorway: Αυτοκινητόδρομος motorway_junction: Διασταύρωση Αυτοκινητόδρομου motorway_link: Αυτοκινητόδρομος @@ -572,44 +548,63 @@ el: platform: Πλατφόρμα primary: Κύρια Οδός primary_link: Κύρια Οδός + proposed: Προτεινόμενος Δρόμος raceway: Αυτοκινητοδρόμιο - residential: Κατοικίες + residential: Οικιστική Οδός + rest_area: Περιοχή Ανάπαυσης road: Δρόμος secondary: Δευτερεύουσα Οδός secondary_link: Δευτερεύουσα Οδός + service: Δρόμος Εξυπηρέτησης services: Υπηρεσίες Αυτοκινητοδρόμου - speed_camera: Κάμερα ταχύτητας + speed_camera: Κάμερα Ταχύτητας steps: Σκαλοπάτια + stile: Στήλη + street_lamp: Λάμπα του Δρόμου + tertiary: Τριτεύων Δρόμος + tertiary_link: Τριτεύων Δρόμος track: Χωματόδρομος - trail: Διαδρομή + trail: Μονοπάτι + trunk: Εθνική Οδός + trunk_link: Εθνική Οδός unclassified: Αταξινόμητη Οδός unsurfaced: Δρόμος χωρίς Επίστρωση historic: archaeological_site: Αρχαιολογικός Χώρος - battlefield: Πεδίο μάχης + battlefield: Πεδίο Μάχης + boundary_stone: Συνοριακή Στήλη building: Κτίριο castle: Κάστρο church: Εκκλησία + citywalls: Τείχη της Πόλης fort: Οχυρό house: Σπίτι icon: Εικονίδιο + manor: Έπαυλη memorial: Μνημείο mine: Ορυχείο monument: Μνημείο museum: Μουσείο - ruins: Ερείπια + ruins: Ερείπιο + tomb: Τάφος tower: Πύργος + wayside_shrine: Εικονοστάσιο wreck: Ναυάγιο landuse: + allotments: Λαχανόκηποι basin: Λεκανοπέδιο + brownfield: Πρώην Βιομηχανική Περιοχή cemetery: Κοιμητήριο commercial: Εμπορική Περιοχή + conservation: Διατήρηση construction: Κατασκευές farm: Αγρόκτημα - farmland: Γεωργική γη + farmland: Γεωργική Γη farmyard: Αγρόκτημα forest: Δάσος + garages: Κλειστοί Χώροι Στάθμευσης grass: Γρασίδι + greenfield: Παρθένα Περιοχή industrial: Βιομηχανική Περιοχή landfill: Χωματερή meadow: Λιβάδι @@ -618,32 +613,46 @@ el: nature_reserve: Φυσικό Καταφύγιο orchard: Περιβόλι park: Πάρκο + piste: Πίστα σκι quarry: Λατομείο railway: Σιδηρόδρομος recreation_ground: Χώρος Αναψυχής reservoir: Ταμιευτήρας residential: Κατοικημένη Περιοχή + retail: Κατάστημα Λιανικής + road: Περιοχή Δρόμων vineyard: Αμπέλι wetland: Υγρότοπος - wood: Μη προσεγμένο δάσος + wood: Φυσικό Δάσος leisure: - beach_resort: Παραθαλάσσιο θέρετρο + beach_resort: Παραθαλάσσιο Θέρετρο bird_hide: Καταφύγιο Πουλιών + common: Κοινόχρηστη Γη fishing: Αλιευτική Περιοχή + fitness_station: Γυμναστήριο garden: Κήπος golf_course: Γήπεδο Γκολφ ice_rink: Παγοδρόμιο marina: Μαρίνα miniature_golf: Μίνι Γκολφ + nature_reserve: Φυσικό Καταφύγιο park: Πάρκο + pitch: Γήπεδο Αθλητισμού playground: Παιδική Χαρά recreation_ground: Χώρος Αναψυχής sauna: Σάουνα + slipway: Γλίστρα sports_centre: Αθλητικό Κέντρο stadium: Στάδιο swimming_pool: Πισίνα + track: Στίβος + water_park: Υδάτινο Πάρκο military: + airfield: Στρατιωτικό Αεροδρόμιο barracks: Στρατώνας + bunker: Οχυρό + mountain_pass: + "yes": Ορεινό Πέρασμα natural: bay: Κόλπος beach: Παραλία @@ -652,15 +661,18 @@ el: channel: Κανάλι cliff: Γκρεμός crater: Κρατήρας + dune: Αμμόλοφος feature: Χαρακτηριστικό fjord: Φιόρδ forest: Δάσος geyser: Θερμοπίδακας glacier: Παγετώνας + heath: Ρείκι hill: Λόφος island: Νησί land: Ξηρά marsh: Βάλτος + moor: Δέστρα mud: Λάσπη peak: Κορυφή point: Σημείο @@ -669,6 +681,8 @@ el: river: Ποτάμι rock: Βράχος scrub: Θαμνότοπος + spring: Πηγή + stone: Πέτρα strait: Πορθμός tree: Δέντρο valley: Κοιλάδα @@ -681,8 +695,15 @@ el: accountant: Λογιστής architect: Αρχιτέκτονας company: Εταιρεία + employment_agency: Οργανισμός Απασχόλησης + estate_agent: Κτηματομεσιτικό Γραφείο + government: Κυβερνητικό Γραφείο + insurance: Ασφαλιστικό Γραφείο lawyer: Δικηγόρος + ngo: Γραφείο ΜΚΟ + telecommunication: Γραφείο Τηλεπικοινωνιών travel_agent: Ταξιδιωτικό Πρακτορείο + "yes": Γραφείο place: airport: Αεροδρόμιο city: Πόλη @@ -694,8 +715,11 @@ el: houses: Σπίτια island: Νησί islet: Νησίδα + isolated_dwelling: Απομονωμένη Οικία locality: Τοποθεσία + moor: Δέστρα municipality: Δήμος + neighbourhood: Γειτονιά postcode: Ταχυδρομικός Κώδικας region: Περιοχή sea: Θάλασσα @@ -706,162 +730,287 @@ el: village: Χωριό railway: abandoned: Εγκαταλελειμμένος Σιδηρόδρομος - construction: Σιδηρόδρομος Υπό Κατασκευή + construction: Σιδηρόδρομος υπό Κατασκευή disused: Σιδηρόδρομος Εκτός Χρήσης disused_station: Σιδηροδρομικός Σταθμός Εκτός Χρήσης halt: Σταθμός Τραίνου - historic_station: Ιστορική Σιδηροδρομικός Σταθμός + historic_station: Ιστορικός Σιδηροδρομικός Σταθμός junction: Σιδηροδρομικός Κόμβος level_crossing: Ισόπεδη Διάβαση + light_rail: Ελαφρύ Τρένο + miniature: Μινιατούρα Σιδηρόδρομος + monorail: Μονοτρόχιος σιδηρόδρομος narrow_gauge: Σιδηρόδρομος Στενής Τροχιάς + platform: Πλατφόρμα Σιδηροδρόμου + preserved: Διατηρητέος Σιδηρόδρομος + proposed: Προτεινόμενος Σιδηρόδρομος station: Σιδηροδρομικός Σταθμός + stop: Σιδηροδρομική Στάση subway: Σταθμός Μετρό - subway_entrance: Είσοδος Στο Μετρό + subway_entrance: Είσοδος στο Μετρό + switch: Σιδηροδρομικά Σημεία tram: Τραμ tram_stop: Στάση Τραμ + yard: Σιδηροδρομικός Σταθμός Διαλογής shop: + antiques: Αντίκες + art: Κατάστημα Τέχνης bakery: Φούρνος + beauty: Σαλόνι Ομορφιάς + beverages: Κατάστημα Ποτών bicycle: Κατάστημα Ποδηλάτων books: Βιβλιοπωλείο + boutique: Μπουτίκ butcher: Κρεοπωλείο + car: Κατάστημα Αυτοκινήτων car_parts: Εξαρτήματα Αυτοκινήτου car_repair: Επισκευή Αυτοκινήτων carpet: Κατάστημα Χαλιών - chemist: Χημικός + charity: Φιλανθρωπικό Κατάστημα + chemist: Φαρμακοποιός clothes: Κατάστημα Ρούχων computer: Κατάστημα Υπολογιστών confectionery: Ζαχαροπλαστική convenience: Παντοπωλείο - copyshop: Κατάστημα φωτοαντιγράφων + copyshop: Κατάστημα Φωτοαντιγράφων cosmetics: Κατάστημα Καλλυντικών + deli: Ντελικατέσεν department_store: Πολυκατάστημα + discount: Εκπτωτικό Κατάστημα doityourself: Ιδιοκατασκευές dry_cleaning: Στεγνό Καθάρισμα electronics: Κατάστημα Ηλεκτρονικών estate_agent: Κτηματομεσίτης + farm: Γεωργικά εφόδια fashion: Κατάστημα Μόδας fish: Ιχθυοπωλείο florist: Ανθοπώλης food: Κατάστημα Τροφίμων - funeral_directors: Γραφείο τελετών + funeral_directors: Γραφείο Τελετών furniture: Έπιπλα + gallery: Γκαλερί + garden_centre: Κέντρο Κήπου + general: Παντοπωλείο gift: Κατάστημα Δώρων greengrocer: Μανάβης grocery: Οπωροπωλείο hairdresser: Κομμωτήριο + hardware: Κατάστημα Σιδηρικών + hifi: Hi-Fi insurance: Ασφαλιστική jewelry: Κοσμηματοπωλείο kiosk: Περίπτερο laundry: Πλυντήριο mall: Εμπορικό Κέντρο market: Αγορά + mobile_phone: Κατάστημα Κινητής Τηλεφωνίας + motorcycle: Κατάστημα Μοτοσικλετών music: Κατάστημα Μουσικής + newsagent: Πρακτορείο Εφημερίδων optician: Οπτικός + organic: Κατάστημα Οργανικών Τροφίμων + pet: Κατάστημα Κατοικίδιων + pharmacy: Φαρμακείο photo: Φωτογραφείο + salon: Σαλόνι + second_hand: Παλαιοπωλείο shoes: Κατάστημα Υποδημάτων + shopping_centre: Εμπορικό Κέντρο sports: Κατάστημα Αθλητικών - stationery: Κατάστημα γραφικής ύλης + stationery: Κατάστημα Γραφικής Ύλης supermarket: Σουπερμάρκετ + tailor: Ράφτης toys: Κατάστημα Παιγνιδιών travel_agency: Ταξιδιωτικό Πρακτορείο + video: Βίντεο Κατάστημα + "yes": Κατάστημα tourism: + alpine_hut: Αλπικό Καταφύγιο + artwork: Έργο Τέχνης + attraction: Αξιοθέατο + bed_and_breakfast: Ενοικιαζόμενα Δωμάτια + cabin: Καμπίνα camp_site: Χώρος Κατασκήνωσης + caravan_site: Χώρος Τροχόσπιτων chalet: Σαλέ guest_house: Ξενώνας hostel: Ξενώνας hotel: Ξενοδοχείο information: Πληροφορίες + motel: Μοτέλ museum: Μουσείο - picnic_site: Τοποθεσία για πικ-νικ + picnic_site: Τοποθεσία για Πικ-Νικ theme_park: Θεματικό Πάρκο valley: Κοιλάδα - zoo: Ζωολογικός κήπος + viewpoint: Έποψη + zoo: Ζωολογικός Κήπος tunnel: + culvert: Οχετός "yes": Σήραγγα waterway: + artificial: Τεχνητή Yδατοδιαδρομή boatyard: Ναυπηγείο canal: Κανάλι dam: Φράγμα + derelict_canal: Εγκαταλελειμμένο Κανάλι ditch: Χαντάκι + dock: Αποβάθρα + drain: Υπόνομος + lock: Κλειδαριά + lock_gate: Κλειδαριά Πύλης + mineral_spring: Πηγή Μεταλλικού Νερού + mooring: Αγκυροβόλι + rapids: Χείμαρροι river: Ποτάμι - riverbank: Όχθη ποταμού + riverbank: Όχθη Ποταμού stream: Ρέμα - waterfall: Καταρράχτης + wadi: Wadi + water_point: Σημείο Πρόσβασης σε Νερό + waterfall: Καταρράκτης + weir: Υδατοφράκτης + prefix_format: "%{name}" + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + welcome: + title: Καλώς ήλθατε στο OSM + url: /welcome + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Κλείσιμο + edit_help: Μετακινήστε το χάρτη και να κάνετε ζουμ σε μια τοποθεσία που θέλετε να επεξεργαστείτε, στη συνέχεια, κάντε κλικ εδώ. + key: + title: Υπόμνημα + tooltip: Υπόμνημα + tooltip_disabled: Το υπόμνημα είναι διαθέσιμο μόνο για το Κανονικό στρώμα + map: + base: + cycle_map: Χάρτης Ποδηλασίας + hot: Ανθρωπιστικός + standard: Κανονικός + transport_map: Συγκοινωνιακός Χάρτης + copyright: © Συνεισφέροντες του OpenStreetMap + donate_link_text: + layers: + data: Δεδομένα Χάρτη + header: Στρώματα Χάρτη + notes: Σημειώσεις Χάρτη + overlays: Ενεργοποίηση επικαλύψεων για την αντιμετώπιση προβλημάτων του χάρτη + title: Στρώματα + locate: + popup: Είστε μεταξύ {distance} {unit} από αυτό το σημείο + title: Προβολή της Τοποθεσίας μου + zoom: + in: Μεγέθυνση + out: Σμίκρυνση + notes: + new: + add: Προσθήκη Σημείωσης + intro: Μετακινείστε το δείκτη στη σωστή θέση και γράψτε μια λεπτομερή περιγραφή του προβλήματος ώστε οι άλλοι χαρτογράφοι, στους οποίους είναι ορατές οι σημειώσεις, να μπορέσουν να βελτιώσουν το χάρτη. + show: + anonymous_warning: Αυτό η σημείωση περιλαμβάνει σχόλια από ανώνυμους χρήστες που πρέπει να επαληθεύονται ανεξάρτητα. + comment: Σχολιάστε + comment_and_resolve: Σχολιάστε και Επιλύστε + hide: Απόκρυψη + reactivate: Επανενεργοποίηση + resolve: Επιλύστε + share: + cancel: Ακύρωση + center_marker: Κεντράρισμα χάρτη στο δείκτη + custom_dimensions: Ορισμός προσαρμοσμένων διαστάσεων + download: Λήψη + embed: HTML + format: "Μορφή:" + image: Εικόνα + image_size: Η εικόνα θα εμφανίσει το κανονικό στρώμα στις + include_marker: Συμπερίληψη δείκτη + link: Σύνδεσμος ή HTML + long_link: Σύνδεσμος + paste_html: Επικόλληση HTML για ενσωμάτωση στην ιστοσελίδα + scale: "Κλίμακα:" + short_link: Σύντομος Σύνδεσμος + short_url: Σύντομος Σύνδεμος + title: Διαμοιρασμός + view_larger_map: Προβολή Μεγαλύτερου Χάρτη site: - edit_disabled_tooltip: Κάνε μεγέθυνση για να επεξεργαστείς το χάρτη + createnote_disabled_tooltip: Μεγεθύνετε για να προσθέσετε μια σημείωση στο χάρτη + createnote_tooltip: Προσθέστε μια σημείωση στο χάρτη + edit_disabled_tooltip: Κάντε μεγέθυνση για να επεξεργαστείτε το χάρτη edit_tooltip: Επεξεργασία του χάρτη - edit_zoom_alert: Πρέπει να μεγεθύνεις για να επεξεργαστείς το χάρτη - history_disabled_tooltip: Μεγέθυνε για να δεις τις αλλαγές για αυτή την περιοχή - history_tooltip: Προβολή αλλαγών για αυτή την περιοχή - history_zoom_alert: Πρέπει να μεγεθύνεις για να δεις τις αλλαγές για αυτή την περιοχή + map_data_zoom_in_tooltip: Μεγεθύνετε τον χάρτη για να δείτε τα δεδομένα του χάρτη + map_notes_zoom_in_tooltip: Μεγεθύνετε τον χάρτη για να δείτε σημειώσεις layouts: + about: Σχετικά community: Κοινότητα community_blogs: Ιστολόγια της Κοινότητας community_blogs_title: Blogs από τα μέλη της κοινότητας του OpenStreetMap - copyright: Πνευματικά δικαιώματα & Άδεια χρήσης - documentation: Τεκμηρίωση - documentation_title: Τεκμηρίωση για το έργο + copyright: Πνευματικά Δικαιώματα + data: Δεδομένα donate: Υποστηρίξτε το OpenStreetMap %{link} στον Έρανο Αναβάθμισης Υλικού. - donate_link_text: δωρίζοντας edit: Επεξεργασία edit_with: Επεξεργασία με %{editor} export: Εξαγωγή - export_tooltip: Εξαγωγή δεδομένων χάρτη + export_data: Εξαγωγή Δεδομένων foundation: Ίδρυμα foundation_title: Το Ίδρυμα OpenStreetMap gps_traces: Ίχνη GPS gps_traces_tooltip: Διαχείριση ιχνών GPS help: Βοήθεια - help_centre: Κέντρο Βοήθειας - help_title: Ιστοσελίδα βοήθειας για το έργο history: Ιστορικό - home: σπίτι - home_tooltip: Μετάβαση στην τοποθεσία σπιτιού - inbox: εισερχόμενα (%{count}) - inbox_tooltip: - one: Τα εισερχόμενα σας περιέχουν 1 αδιάβαστο μήνυμα - other: Τα εισερχόμενα σας περιέχουν %{count} αδιάβαστα μηνύματα - zero: Τα εισερχόμενα σας δεν περιέχουν κανένα αδιάβαστο μήνυμα - intro_1: Ο OpenStreetMap είναι δωρεάν, επεξεργάσιμος χάρτης ολόκληρου του κόσμου. Είναι κατασκευασμένος από ανθρώπους σαν κι εσάς. + home: Μετάβαση στην Τοποθεσία Σπιτιού intro_2_create_account: Δημιουργήστε ένα λογαριασμό χρήστη - intro_2_download: λήψη - intro_2_html: Τα δεδομένα είναι ελεύθερα για %{download} και %{use} κάτω από την %{license}. %{create_account} για να αναβαθμίσετε τον χάρτη. - intro_2_license: ανοικτή του άδεια - intro_2_use: χρήση - license: - title: Τα δεδομένα του OpenStreetMap τελούν υπό την Creative Commons Attribution-Share Alike 2.0 Γενική Άδεια - log_in: είσοδος + intro_header: Καλώς ήλθατε στο OpenStreetMap! + intro_text: Ο OpenStreetMap είναι χάρτης του κόσμου, που δημιουργήθηκε από ανθρώπους σαν κι εσάς και είναι δωρεάν, υπό άδεια ελεύθερης χρήσης. + learn_more: Μάθετε Περισσότερα + log_in: Είσοδος log_in_tooltip: Σύνδεση με έναν υπάρχοντα λογαριασμό logo: alt_text: Λογότυπο OpenStreetMap - logout: έξοδος - logout_tooltip: Έξοδος + logout: Έξοδος make_a_donation: - text: Κάντε μια Δωρεά + text: Κάντε μια δωρεά title: Υποστήριξε το OpenStreetMap με δωρεά χρημάτων + more: Περισσότερα osm_offline: Η βάση δεδομένων του OpenStreetMap είναι προσωρινά εκτός λειτουργίας λόγω εργασιών συντήρησης της βάσης δεδομένων. - osm_read_only: Η βάση δεδομένων του OpenStreetMap είναι προσωρινά σε λειτουργία "μόνο για ανάγνωση" λόγω εργασιών συντήρησης της βάσης δεδομένων. + osm_read_only: Η βάση δεδομένων του OpenStreetMap έχει τεθεί προσωρινά σε λειτουργία «μόνο για ανάγνωση» λόγω εργασιών συντήρησης στη βάση δεδομένων. + partners_bytemark: Bytemark Hosting partners_html: Η φιλοξενία υποστηρίζεται από το %{ucl}, %{ic} και %{bytemark}, και άλλους %{partners}. - partners_ic: Κολέγιο Imperial του Λονδίνου + partners_ic: Imperial College του Λονδίνου partners_partners: συνεργάτες - partners_ucl: UCL VR Centre - sign_up: εγγραφή + partners_ucl: το UCL VR Centre + sign_up: Εγγραφή sign_up_tooltip: Δημιουργήστε λογαριασμό για επεξεργασία - tag_line: Ο Ελεύθ. Παγκ. Χάρτης Βίκι + start_mapping: Ξεκινήστε Τη Χαρτογράφηση + tag_line: O Ελεύθερος Wiki Χάρτης του Κόσμου user_diaries: Ημερολόγια Χρηστών user_diaries_tooltip: Προβολή ημερολογίων χρηστών - view: Προβολή - view_tooltip: Προβολή του χάρτη - welcome_user: Καλώς ορίσατε, %{user_link} - welcome_user_link_tooltip: Η προσωπική σας σελίδα - wiki: Βίκι - wiki_title: Ιστοσελίδα βίκι για το έργο license_page: foreign: english_link: της πρωτότυπης Αγγλικής - text: Σε περίπτωση διένεξης μεταξύ αυτής της μεταφρασμένης σελίδας και %{english_original_link}, Η Αγγλική σελίδα θα προτιμηθεί - title: Σχετικά με αυτή την μετάφραση + text: Σε περίπτωση διένεξης μεταξύ αυτής της μεταφρασμένης σελίδας και %{english_original_link}, η Αγγλική σελίδα θα προτιμηθεί + title: Σχετικά με αυτήν τη μετάφραση + legal_babble: + attribution_example: + alt: Παράδειγμα του πως αναφέρεται το OpenStreetMap σε μια ιστοσελίδα + title: Παράδειγμα αναφοράς δημιουργού + contributors_fr_html: "Γαλλία: Περιέχει δεδομένα που προέρχονται από το Direction Générale des Impôts." + contributors_intro_html: "Οι συνεισφέροντες μας είναι χιλιάδες άτομα. Επίσης έχουμε περιλάβει δεδομένα ανοικτής άδειας από εθνικές υπηρεσίες χαρτογράφησης και άλλες πηγές, μεταξύ αυτών:" + contributors_nl_html: "Ολλανδία: Περιέχει δεδομένα που προέρχονται από το AND © 2007 (www.and.com)" + contributors_title_html: Οι συνεισφέροντές μας + credit_1_html: "Απαιτείται να χρησιμοποιείτε την αναφορά στο “© Συνεισφέροντες του\nOpenStreetMap”." + credit_2_html: "Επίσης πρέπει να κάνετε σαφές ότι τα δεδομένα διατίθενται υπό την άδεια Open\nDatabase License, και αν χρησιμοποιείτε τα πλακίδια χάρτη, ότι η χαρτογραφία είναι υπό την άδεια CC-BY-SA. Μπορείτε να το κάνετε αυτό με σύνδεσμο σε αυτήν τη σελίδα δικαιωμάτων.\nΕναλλακτικά, και σαν προαπαιτούμενο εάν διαμοιράζετε δεδομένα OSM, μπορείτε να δώσετε απευθείας σύνδεσμο προς τις άδειες. Σε μέσα στα οποία οι σύνδεσμοι δεν είναι εφικτοί (π.χ. εκτυπώσεις), προτείνουμε να κατευθύνετε τους αναγνώστες σας στο openstreetmap.org (ίσως επεκτείνοντας το «OpenStreetMap» σε αυτήν τη πλήρη διεύθυνση), προς opendatacommons.org, και αναλόγως στο creativecommons.org." + credit_3_html: "Για έναν ηλεκτρονικά εμφανιζόμενο χάρτη, η αναφορά θα πρέπει να εμφανίζεται στη γωνία του χάρτη.\nΓια παράδειγμα:" + credit_title_html: Πως να πιστώσετε το OpenStreetMap + infringement_1_html: Υπενθυμίζουμε στους συνεισφέροντες του OSM να μην προσθέτουν δεδομένα από πηγές με πνευματικά δικαιώματα (π.χ. Google Maps η έντυπους χάρτες) χωρίς την προηγούμενη άδεια από τους ιδιοκτήτες των δικαιωμάτων. + infringement_title_html: Παραβιάσεις πνευματικών δικαιωμάτων + intro_1_html: Το OpenStreetMap είναι ανοικτά δεδομένα, αδειοδοτημένο υπό την Open Data Commons Open Database License (ODbL). + intro_2_html: Είστε ελεύθεροι να αντιγράψετε, να διανείμετε, μεταδώσετε και προσαρμόσετε τα δεδομένα μας εφόσον πιστώνετε το OpenStreetMap και τους συνεισφέροντές του. Εάν αλλοιώσετε ή αξιοποιήσετε τα δεδομένα μας, μπορείτε να διανείμετε το αποτέλεσμα μόνο σύμφωνα με την ίδια άδεια. Ο πλήρης νομικός κώδικας εξηγεί τα δικαιώματα και τις υποχρεώσεις. + intro_3_html: "Η χαρτογράφηση στα πλακίδια χάρτη, και η τεκμηρίωση μας, είναι αδειοδοτημένες υπο την άδεια Creative\nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." + more_title_html: Μαθαίνοντας περισσότερα + title_html: Πνευματικά Δικαιώματα και Άδεια Χρήσης native: mapping_link: αρχίστε τη χαρτογράφηση native_link: ελληνική έκδοση @@ -873,10 +1022,17 @@ el: inbox: date: Ημ/νία from: Από - my_inbox: Τα Εισερχόμενα μου - no_messages_yet: Δεν έχεις μηνύματα ακόμα. Γιατί δεν έρχεσαι σε επαφή με μερικά από τα %{people_mapping_nearby_link}? + messages: Έχετε %{new_messages} και %{old_messages} + my_inbox: Τα Εισερχόμενά Μου + new_messages: + one: "%{count} νέο μήνυμα" + other: "%{count} νέα μηνύματα" + no_messages_yet: Δεν έχετε μηνύματα ακόμα. Γιατί δεν έρχεστε σε επαφή με μερικά από τα %{people_mapping_nearby_link}? + old_messages: + one: "%{count} παλιό μήνυμα" + other: "%{count} παλιά μηνύματα" outbox: εξερχόμενα - people_mapping_nearby: άτομα που χαρτογραφούν κοντά σου + people_mapping_nearby: άτομα που χαρτογραφούν κοντά σας subject: Θέμα title: Εισερχόμενα mark: @@ -890,7 +1046,7 @@ el: new: back_to_inbox: Πίσω στα Εισερχόμενα body: Κείμενο - limit_exceeded: Έχεις στείλει πολλά μηνύματα πρόσφατα. Παρακαλώ περίμενε για λίγο πριν δοκιμάσεις να στείλεις ξανά. + limit_exceeded: Έχετε στείλει πολλά μηνύματα πρόσφατα. Παρακαλώ περιμένετε λίγο πριν δοκιμάσετε να στείλετε ξανά. message_sent: Αποστολή μηνύματος send_button: Αποστολή send_message_to: Αποστολή νέου μηνύματος προς %{name} @@ -903,30 +1059,61 @@ el: outbox: date: Ημ/νία inbox: εισερχόμενα + messages: + one: Έχετε %{count} απεσταλμένο μήνυμα + other: Έχετε %{count} απεσταλμένα μηνύματα my_inbox: Τα %{inbox_link} μου - no_sent_messages: Δεν έχεις στείλει κανένα μήνυμα ακόμα. Γιατί δεν έρχεσαι σε επαφή με μερικά %{people_mapping_nearby_link}? + no_sent_messages: Δεν έχετε στείλει κανένα μήνυμα ακόμα. Γιατί δεν έρχεστε σε επαφή με μερικά %{people_mapping_nearby_link}? outbox: εξερχόμενα - people_mapping_nearby: άτομα που χαρτογραφούν κοντά σου + people_mapping_nearby: άτομα που χαρτογραφούν κοντά σας subject: Θέμα title: Εξερχόμενα to: Προς read: - back_to_inbox: Πίσω στα Εισερχόμενα - back_to_outbox: Πίσω στα Εξερχόμενα + back: Πίσω date: Ημ/νία from: Από - reading_your_messages: Ανάγνωση μηνυμάτων - reading_your_sent_messages: Ανάγνωση απεσταλμένων μηνυμάτων reply_button: Απάντηση subject: Θέμα title: Ανάγνωση μηνύματος to: Προς unread_button: Σήμανση ως αδιάβαστο - wrong_user: Έχεις συνδεθεί ως `%{user}' αλλά το μήνυμα που ζητάς να διαβάσεις δεν έχει σταλεί σε εσένα ούτε από εσένα. Παρακαλώ συνδέσου με το σωστό όνομα χρήστη ώστε να μπορέσεις να το διαβάσεις. + wrong_user: Έχετε συνδεθεί ως «%{user}» αλλά το μήνυμα που ζητάτε να διαβάσετε δεν έχει σταλεί σε εσάς ούτε από εσάς. Παρακαλώ συνδεθείτε με το σωστό όνομα χρήστη ώστε να μπορέσετε να το διαβάσετε. reply: - wrong_user: Έχεις συνδεθεί ως `%{user}' αλλά το μήνυμα που ζητάς να απαντήσεις δεν έχει σταλεί σε αυτόν το χρήστη. Παρακαλώ συνδέσου με το σωστό όνομα χρήστη ώστε να μπορέσεις να απαντήσεις + wrong_user: Έχετε συνδεθεί ως «%{user}» αλλά το μήνυμα που ζητάτε να απαντήσετε δεν έχει σταλεί σε αυτόν το χρήστη. Παρακαλώ συνδεθείτε με το σωστό όνομα χρήστη ώστε να μπορέσετε να απαντήσετε. sent_message_summary: delete_button: Διαγραφή + note: + description: + closed_at_by_html: Επιλύθηκε %{when} πριν από τον %{user} + closed_at_html: Επιλύθηκε %{when} πριν + commented_at_by_html: Ενημερώθηκε %{when} πριν από τον %{user} + commented_at_html: Ενημερώθηκε %{when} πριν + opened_at_by_html: Δημιουργήθηκε %{when} πριν από τον %{user} + opened_at_html: Δημιουργήθηκε %{when} πριν + reopened_at_by_html: Επανενεργοποιήθηκε %{when} πριν από τον %{user} + reopened_at_html: Επανενεργοποιήθηκε %{when} πριν + entry: + comment: Σχόλιο + full: Πλήρης σημείωση + mine: + ago_html: "%{when} πριν" + created_at: Δημιουργήθηκε στις + creator: Δημιουργός + description: Περιγραφή + heading: σημειώσεις του %{user} + id: Αναγνωριστικό + last_changed: Τελευταία αλλαγή + subheading: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user} + title: Σημειώσεις που υποβλήθηκαν ή σχολιάστηκαν από τον %{user} + rss: + closed: κλείσιμο σημείωσης (κοντα στο %{place}) + commented: νέο σχόλιο (κοντά στο %{place}) + description_area: Μια λίστα με σημειώσεις, που αναφέρθηκαν, σχολιάστηκαν ή επιλύθηκαν στην περιοχή σας [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Μια τροφοδοσία rss για τη σημείωση %{id} + opened: νέα σημείωση (κοντά στο %{place}) + reopened: επανενεργοποίηση σημείωσης (κοντά στο %{place}) + title: Σημειώσεις OpenStreetMap notifier: diary_comment_notification: footer: Μπορείτε επίσης να διαβάσετε το σχόλιο στο %{readurl} και μπορείτε να σχολιάσετε στο %{commenturl} ή να απαντήσετε στο %{replyurl} @@ -936,17 +1123,21 @@ el: email_confirm: subject: "[OpenStreetMap] Επιβεβαιώστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας" email_confirm_html: + click_the_link: Εάν είστε εσείς, παρακαλώ πατήστε τον σύνδεσμο από κάτω για να επιβεβαιωθεί η αλλαγή. greeting: Γεια, + hopefully_you: Κάποιος (ελπίζουμε εσείς) θέλει να αλλάξει την διεύθυνση ηλεκτρονικού ταχυδρομείου στο %{server_url} σε %{new_address}. email_confirm_plain: + click_the_link: Εάν είστε εσείς, παρακαλώ πατήστε τον σύνδεσμο από κάτω για να επιβεβαιωθεί η αλλαγή. greeting: Γεια, + hopefully_you: Κάποιος (ελπίζουμε εσείς) θέλει να αλλάξει την διεύθυνση ηλεκτρονικού ταχυδρομείου στο %{server_url} σε %{new_address}. friend_notification: befriend_them: Μπορείτε επίσης να τους προσθέσετε ως φίλους στο %{befriendurl}. had_added_you: Ο χρήστης %{user} σας πρόσθεσε ως φίλο στο OpenStreetMap. see_their_profile: Μπορείτε να δείτε το προφίλ του στο %{userurl}. - subject: "[OpenStreetMap] Ο χρήστης %{user} σας προσθέσε ως φίλο" + subject: "[OpenStreetMap] Ο χρήστης %{user} σας πρόσθεσε ως φίλο" gpx_notification: and_no_tags: χωρίς ετικέτες - and_the_tags: και τις παρακάτω ετικέτες + and_the_tags: "και τα παρακάτω χαρακτηριστικά:" failure: failed_to_import: "Απέτυχε η εισαγωγή. Το σφάλμα είναι:" more_info_1: Περισσότερες πληροφορίες σχετικά με τα σφάλματα εισαγωγής GPX και πως να τα αποφύγετε @@ -957,101 +1148,175 @@ el: subject: "[OpenStreetMap] Η εισαγωγή GPX πέτυχε" with_description: με περιγραφή your_gpx_file: Μοιάζει με δικό σας αρχείο GPX + lost_password: + subject: "[OpenStreetMap] Αίτηση επαναφοράς κωδικού" lost_password_html: + click_the_link: Εάν είστε εσείς, παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να γίνει επαναφορά του κωδικού σας. greeting: Γεια, - hopefully_you: Κάποιος (πιθανότατα εσείς) έχει ζητήσει επαναφορά του κωδικού πρόσβασης του λογαριασμού στο openstreetmap.org που αντιστοιχεί σε αυτή τη διεύθυνση email. + hopefully_you: Κάποιος (πιθανότατα εσείς) έχει ζητήσει επαναφορά του κωδικού πρόσβασης του λογαριασμού στο openstreetmap.org που αντιστοιχεί σε αυτήν τη διεύθυνση ηλεκτρονικού ταχυδρομείου. lost_password_plain: click_the_link: Εάν πρόκειται για σας, κάντε κλικ στον παρακάτω σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας. greeting: Γεια, + hopefully_you: Κάποιος (πιθανότατα εσείς) έχει ζητήσει επαναφορά του κωδικού πρόσβασης του λογαριασμού στο openstreetmap.org που αντιστοιχεί σε αυτήν τη διεύθυνση ηλεκτρονικού ταχυδρομείου. message_notification: - footer1: Μπορείτε επίσης να διαβάσετε το μήνυμα στο %{readurl} - footer2: και μπορείτε να απαντήσετε στο %{replyurl} + footer_html: Μπορείτε επίσης να διαβάσετε το μήνυμα στο %{readurl} και να απαντήσετε στο %{replyurl} header: "Ο χρήστης %{from_user} σάς έχει στείλει ένα μήνυμα μέσω του OpenStreetMap με θέμα %{subject}:" hi: Γεια σου %{to_user}, + note_comment_notification: + anonymous: Ανώνυμος χρήστης + closed: + commented_note: Ο %{commenter} επίλυσε μια σημείωση που έχετε σχολιάσει. Η σημείωση είναι κοντά σε %{place}. + subject_other: "[OpenStreetMap] Ο %{commenter} επίλυσε μια σημείωση που σας ενδιαφέρει" + subject_own: "[OpenStreetMap] Ο %{commenter} επίλυσε μια από τις σημειώσεις σας" + your_note: Ο %{commenter} σχολίασε μια από τις σημειώσεις σας κοντά στο %{place}. + commented: + commented_note: Ο %{commenter} σχολίασε μια σημείωση που έχετε εσείς σχολιάσει. Η σημείωση είναι κοντά σε %{place}. + subject_other: "[OpenStreetMap] Ο %{commenter} σχολίασε μια σημείωση που σας ενδιαφέρει" + subject_own: "[OpenStreetMap] %{commenter} σχολίασε μια από τις σημειώσεις σας" + your_note: Ο %{commenter} σχολίασε μία από τις σημειώσεις σας κοντά στο %{place}. + details: Περισσότερες λεπτομέρειες σχετικά με τη σημείωση μπορούν να βρεθούν στο %{url}. + greeting: Γεια, + reopened: + commented_note: Ο %{commenter} επανενεργοποίησε μια σημείωση που έχετε σχολιάσει. Η σημείωση είναι κοντά σε %{place}. + subject_other: "[OpenStreetMap] Ο %{commenter} επανενεργοποίησε μια σημείωση που σας ενδιαφέρει" + subject_own: "[OpenStreetMap] Ο %{commenter} επανενεργοποίησε μια από τις σημειώσεις σας" + your_note: Ο %{commenter} επανενεργοποίησε μια από τις σημειώσεις σας κοντά στο %{place}. signup_confirm: - subject: "[OpenStreetMap] Επιβεβαιώστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας" - signup_confirm_html: - click_the_link: Εάν πρόκειται για σας, Καλώς ήρθατε! Κάντε κλικ στο σύνδεσμο παρακάτω, για να επιβεβαιωθεί ο λογαριασμό σας και διαβάστε για περισσότερες πληροφορίες σχετικά με το OpenStreetMap - get_reading: Διάβασε σχετικά με το OpenStreetMap στο wiki, μείνε ενήμερος με τα τελευταία νέα μέσω του OpenStreetMap blog ή το Twitter, ή περιηγήσου στο OpenGeoData blog του ιδρυτή του OpenStreetMap Steve Coast για το ιστορικό του project, το οποίο επίσης έχει podcasts να ακούσεις! - greeting: Γεια! - hopefully_you: Κάποιος (ελπίζουμε εσείς) θέλει να δημιουργήσει ένα λογαριασμό στο - introductory_video: Μπορείτε να παρακολουθήσετε ένα %{introductory_video_link}. - more_videos: Υπάρχουν {more_videos_link} %. - more_videos_here: περισσότερα βίντεο εδώ - video_to_openstreetmap: εισαγωγικό βίντεο για το OpenStreetMap - signup_confirm_plain: - ask_questions: "Μπορείς να ρωτήσεις για οποιαδήποτε απορία έχεις σχετικά με το OpenStreetMap στην ιστοσελίδα ερωτήσεων και απαντήσεων:" - blog_and_twitter: "Μείνε ενήμερος με τα τελευταία νέα μέσω του ιστολογίου του OpenStreetMap ή το Twitter:" - click_the_link_1: Αν αυτός είσαι εσύ, καλώς ήρθες! Παρακαλώ κάνε κλίκ στο σύνδεσμο από κάτω ώστε να επιβεβαιωθεί - click_the_link_2: ο λογαριασμός σου και διάβασε για περισσότερες πληροφορίες σχετικά με το OpenStreetMap. - current_user_1: Ένας κατάλογος με τρέχοντες χρήστες ανά κατηγορίες, βασισμένος στο πού στον κόσμο - current_user_2: "βρίσκονται, είναι διαθέσιμος από:" - greeting: Γεια! - hopefully_you: Κάποιος (ελπίζουμε εσύ) θέλει να δημιουργήσει ένα λογαριασμό στο - introductory_video: "Μπορείς να παρακολουθήσεις ένα εισαγωγικό βίντεο για το OpenStreetMap εδώ:" - more_videos: "Υπάρχουν περισσότερα βίντεο εδώ:" - opengeodata: "Το OpenGeoData.org είναι το ιστολόγιο του ιδρυτή του OpenStreetMap Steve Coast's , έχει επίσης και podcasts:" - the_wiki: "Διάβασε σχετικά με το OpenStreetMap στο wiki:" - user_wiki_1: Προτείνεται να δημιουργήσεις μια σελίδα χρήστη wiki, η οποία περιλαμβάνει - user_wiki_2: ετικέτες που επισημαίνουν που βρίσκεσαι, όπως [[Category:Users_in_London]]. - wiki_signup: "Ίσως θες επίσης να κάνεις εγγραφή στο OpenStreetMap wiki:" + confirm: "Πριν κάνουμε οτιδήποτε άλλο, πρέπει να επιβεβαιώσουμε ότι η αίτηση ήρθε από εσάς, άρα αν το κάνατε εσείς παρακαλώ πατήστε τον παρακάτω σύνδεσμο για αν επιβεβαιώσετε τον λογαριασμό σας:" + created: Κάποιος (ας ελπίσουμε εσύ) μόλις δημιούργησε έναν λογαριασμό στο %{site_url}. + greeting: Γεια σου! + subject: "[OpenStreetMap] Καλώς ήλθατε στο OpenStreetMap" + welcome: Μετά την επιβεβαίωση του λογαριασμού σας, θα σας δώσουμε κάποιες πρόσθετες πληροφορίες για να ξεκινήσετε. + oauth: + oauthorize: + allow_read_gpx: διαβάσει τα ιδιωτικά σας GPS ίχνη. + allow_read_prefs: διαβάσει τις προτιμήσεις σας. + allow_to: "Επιτρέψτε στην εφαρμογή πελάτη να:" + allow_write_api: τροποποιήσει το χάρτη. + allow_write_diary: δημιουργήσει καταχωρήσεις ημερολογίου, σχόλια και να κάνει φίλους. + allow_write_gpx: ανεβάσει ίχνη GPS. + allow_write_notes: τροποποιήσει σημειώσεις. + allow_write_prefs: τροποποιήσει τις προτιμήσεις χρήστη. + request_access: Η εφαρμογή %{app_name} ζητά πρόσβαση στον λογαριασμό σας, %{user}. Παρακαλώ ελέγξτε κατά πόσο θέλετε η εφαρμογή τις παρακάτω δυνατότητες. Μπορείτε να επιλέξετε όσο πολλές ή λίγες θέλετε. oauth_clients: + create: + flash: Οι πληροφορίες καταχωρήθηκαν επιτυχώς edit: submit: Επεξεργασία title: Επεξεργασία της αίτησής σας form: + allow_read_gpx: διαβάσει τα ιδιωτικά τους GPS ίχνη. + allow_read_prefs: διαβάσει τις δικές τους προτιμήσεις χρήστη. + allow_write_api: τροποποιήσει το χάρτη. + allow_write_diary: δημιουργήσει καταχωρήσεις ημερολογίου, σχόλια και να κάνει φίλους. + allow_write_gpx: αποστείλει ίχνη GPS. + allow_write_notes: τροποποιήσει σημειώσεις + allow_write_prefs: τροποποιήσει τις δικές τους προτιμήσεις χρήστη. + callback_url: URL Επανάκλησης name: Όνομα required: Απαιτείται + support_url: URL Υποστήριξης + url: URL Κύριας Εφαρμογής index: application: Όνομα Εφαρμογής - register_new: Εγγραφή αίτησής - revoke: Ανάκληση! + my_apps: Οι Εφαρμογές Πελάτη Μου + my_tokens: Οι Εξουσιοδοτημένες Εφαρμογές μου + register_new: Καταχωρήστε την εφαρμογή σας + registered_apps: "Έχετε τις παρακάτω εφαρμογές πελάτη καταχωρημένες:" + revoke: Ανακαλέστε! + title: Οι λεπτομέρειες του OAuth μου new: submit: Εγγραφή + title: Καταχώρηση νέας εφαρμογής + show: + allow_read_gpx: διαβάσει τα προσωπικά του/της ίχνη GPS. + allow_read_prefs: διαβάσει τις δικές τους προτιμήσεις χρήστη. + allow_write_api: τροποποιήσει το χάρτη. + allow_write_diary: δημιουργήσει εγγραφές ημερολογίου, σχόλια και να κάνει φίλους. + allow_write_gpx: αποστείλει ίχνη GPS. + allow_write_notes: τροποποιήσει σημειώσεις. + allow_write_prefs: τροποποιήσει τις δικές τους προτιμήσεις χρήστη. + confirm: Είσαστε σίγουροι; + delete: Διαγραφή Πελάτη + edit: Επεξεργασία Λεπτομερειών + requests: "Ζητά τα ακόλουθα δικαιώματα από το χρήστη:" + title: Λεπτομέρειες OAuth για το %{app_name} printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" + with_version: "%{id}, v%{version}" redaction: + create: + flash: Η παράληψη δημιουργήθηκε. + destroy: + flash: Η παράληψη καταστραφεί. edit: description: Περιγραφή + heading: Επεξεργασία παράληψης + submit: Αποθήκευση παράληψης + title: Επεξεργαστείτε την παράληψη + index: + empty: Καμία παράληψη προς εμφάνιση. + heading: Κατάλογος παραλήψεων + title: Κατάλογος συντακτικών αλλαγών new: description: Περιγραφή + heading: Εισαγωγή πληροφοριών για νέα παράληψη + submit: Δημιουργία παράληψης + title: Δημιουργώντας νέα παράληψη show: confirm: Είσαι σίγουρος? description: "Περιγραφή:" + destroy: Κατάργηση αυτής της παράληψης + edit: Επεξεργασία αυτής της παράληψης + heading: Εμφάνιση παράληψης «%{title}» + title: Εμφανίζεται η παράληψη user: "Δημιουργός:" + update: + flash: Οι αλλαγές αποθηκεύτηκαν. site: edit: anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό. flash_player_required: Χρειάζεστε Flash player για να χρησιμοποιήσετε το Potlatch, το Flash πρόγραμμα επεξεργασίας του OpenStreetMap. Μπορείτε να κάνετε λήψη του Flash Player από την τοποθεσία Adobe.com. Πολλές άλλες επιλογές είναι επίσης διαθέσιμες για επεξεργασία στο OpenStreetMap. + id_not_configured: Ο iD δεν έχει ρυθμιστεί + no_iframe_support: Ο περιηγητής σας δεν υποστηρίζει iframes του HTML, που είναι απαραίτητο για αυτό το χαρακτηριστικό. not_public: Δεν έχετε ορίσει τις επεξεργασίες σας να είναι δημόσιες. + not_public_description: Δεν μπορείτε πλέον να επεξεργαστείτε το χάρτη αν δεν το κάνετε. Μπορείτε να κάνετε τις επεξεργασίες σας δημόσιες από την %{user_page}. + potlatch2_not_configured: Το Potlatch 2 δεν έχει ρυθμιστεί - παρακαλούμε δείτε http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 για περισσότερες πληροφορίες potlatch2_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε στο Potlatch 2, πρέπει να κάνετε κλικ στο «Αποθήκευση».) - user_page_link: σελίδα χρήστη + potlatch_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε στο Potlatch, πρέπει να αποεπιλέξτε οποιαδήποτε διαδρομή ή κόμβο, αν επεξεργάζεστε σε ζωντανή λειτουργία, ή απλά πατήστε «Αποθήκευση» εάν έχετε κουμπί αποθήκευσης.) + user_page_link: σελίδα σας χρήστη index: + createnote: Προσθήκη σημείωσης js_1: Είτε χρησιμοποιείτε πρόγραμμα περιήγησης που δεν υποστηρίζει JavaScript ή έχετε απενεργοποιήσει την JavaScript. js_2: Το OpenStreetMap χρησιμοποιεί JavaScript για το ολισθαίνοντα χάρτη του. license: - notice: Υπό την άδεια του %{license_name} άδεια από το %{project_name} και τους χρήστες του. - project_name: έργο OpenStreetMap - remote_failed: Η επεξεργασία απέτυχε - βεβαιώσου ότι ο JOSM ή ο Merkaartor έχουν φορτωθεί και η επιλογή τηλεχειρισμού είναι ενεργή + copyright: Πνευματικά δικαιώματα του OpenStreetMap και των συντακτών του, υπό ελεύθερη άδεια + permalink: Μόνιμος σύνδεσμος + remote_failed: Η επεξεργασία απέτυχε - βεβαιωθείτε ότι ο JOSM ή ο Merkaartor έχουν φορτωθεί και η επιλογή τηλεχειρισμού είναι ενεργή + shortlink: Σύντομος σύνδεσμος key: - map_key: Υπόμνημα - map_key_tooltip: Υπόμνημα χάρτη table: entry: admin: Διοικητικό όριο + allotments: Παραχώρηση γης + apron: + 1: τερματικός σταθμός bridge: Μαύρο περίβλημα = γέφυρα bridleway: Μονοπάτι για Άλογα + brownfield: Πρώην βιομηχανική περιοχή building: Σημαντικό κτίριο + byway: Παράδρομος cable: - Τελεφερίκ - τελεφερίκ με καθίσματα cemetery: Κοιμητήριο - centre: Αθλητικό Κέντρο + centre: Αθλητικό κέντρο commercial: Εμπορική περιοχή common: - 1: λιβάδι + - Κοινόχρηστο + - λιβάδι construction: Δρόμοι υπό κατασκευή + cycleway: Ποδηλατόδρομος + destination: Πρόσβαση προορισμού farm: Αγρόκτημα footway: Μονοπάτι forest: Δάσος @@ -1059,16 +1324,18 @@ el: industrial: Βιομηχανική περιοχή lake: - Λίμνη - - Ταμιευτήρας + - ταμιευτήρας military: Στρατιωτική περιοχή motorway: Αυτοκινητόδρομος park: Πάρκο - permissive: Ανεκτική Πρόσβαση - pitch: Γήπεδο Αθλητισμού + permissive: Ανεκτική πρόσβαση + pitch: Γήπεδο αθλήματος primary: Κύρια Οδός private: Ιδιωτική πρόσβαση rail: Σιδηρόδρομος + reserve: Φυσικό καταφύγιο resident: Κατοικημένη περιοχή + retail: Περιοχή λιανικού εμπορίου runway: - Διάδρομος Αεροδρομίου - τροχόδρομος @@ -1077,29 +1344,41 @@ el: - πανεπιστήμιο secondary: Δευτερεύουσα Οδός station: Σιδηροδρομικός σταθμός - subway: Υπόγειος σιδηρόδρομος + subway: Υπόγειος Σιδηρόδρομος summit: - 1: κορυφή + - Κορυφή + - κορυφή tourist: Τουριστικό αξιοθέατο track: Χωματόδρομος tram: 1: τραμ + trunk: Αυτοκινητόδρομος tunnel: Διακεκομμένο περίβλημα = σήραγγα - unsurfaced: Δρόμος χωρίς άσφαλτο - wood: Φυσικό Δάσος + unclassified: Αταξινόμητη Οδός + unsurfaced: Δρόμος χωρίς Επίστρωση + wood: Φυσικό δάσος markdown_help: + alt: Εναλ. κείμενο + first: Πρώτο στοιχείο + heading: Επικεφαλίδα + headings: Επικεφαλίδες image: Εικόνα link: Σύνδεσμος + ordered: Ταξινομημένη λίστα + second: Δεύτερο στοιχείο + subheading: Υποκεφαλίδα text: Κείμενο + title_html: Αναλύθηκε με το Markdown + unordered: Μη ταξινομημένη λίστα url: Διεύθυνση URL richtext_area: edit: Επεξεργασία preview: Προεπισκόπηση search: search: Αναζήτηση - search_help: "παραδείγματα: «Alkmaar», «Regent Street, Cambridge», «CB2 5AQ», ή «ταχυδρομεία κοντά στο Lünen» περισσότερα παραδείγματα..." submit_text: Μετάβαση where_am_i: Πού είμαι; + where_am_i_title: Περιέγραψε την τωρινή τοποθεσία με χρήση της μηχανής αναζήτησης sidebar: close: Κλείσιμο search_results: Αποτελέσματα Αναζήτησης @@ -1111,6 +1390,8 @@ el: upload_trace: Αποστολή Ίχνους GPS delete: scheduled_for_deletion: Το ίχνος προγραμματίστηκε για διαγραφή + description: + description_without_count: Αρχείο GPX από τον χρήστη %{user} edit: description: "Περιγραφή:" download: λήψη @@ -1121,43 +1402,58 @@ el: owner: "Ιδιοκτήτης:" points: "Σημεία:" save_button: Αποθήκευση Αλλαγών - tags: "Ετικέτες:" + start_coord: "Συντεταγμένες αρχής:" + tags: "Χαρακτηριστικά:" tags_help: οριοθετημένο με κόμματα title: Επεξεργασία ίχνους %{name} + uploaded_at: "Μεταφορτώθηκε:" visibility: "Ορατότητα:" visibility_help: τι σημαίνει αυτό; list: + description: Προβολή πρόσφατων μεταφορτώσεων ιχνών GPS public_traces: Δημόσια ίχνη GPS public_traces_from: Δημόσια ίχνη GPS από τον %{user} - tagged_with: σεσημασμένα με %{tags} - your_traces: Τα δικά σου ίχνη GPS + tagged_with: χαρακτηρίστηκαν με %{tags} + your_traces: Τα δικά σας ίχνη GPS + make_public: + made_public: Το ίχνος έγινε δημόσιο + offline_warning: + message: Το σύστημα μεταφόρτωσης αρχείων GPX δεν είναι διαθέσιμο προς το παρών trace: ago: "%{time_in_words_ago} πριν" by: από count_points: "%{count} σημεία" edit: επεξεργασία edit_map: Επεξεργασία Χάρτη + identifiable: ΑΝΑΓΝΩΡΙΣΙΜΟ + in: σε map: χάρτης more: περισσότερα pending: ΕΚΚΡΕΜΕΙ private: ΙΔΙΩΤΙΚΟ public: ΔΗΜΟΣΙΟ + trace_details: Προβολή Λεπτομερειών Ίχνους + trackable: ΑΝΙΧΝΕΥΕΤΑΙ view_map: Προβολή Χάρτη trace_form: description: "Περιγραφή:" help: Βοήθεια - tags: "Ετικέτες:" - tags_help: οριοθετημένο με κόμματα + tags: "Χαρακτηριστικά:" + tags_help: διαχωρισμένο με κόμματα upload_button: Αποστολή - upload_gpx: "Αποστολή αρχείου GPX:" + upload_gpx: "Αποστολή Αρχείου GPX:" visibility: "Ορατότητα:" visibility_help: τι σημαίνει αυτό; + trace_header: + see_all_traces: Δείτε όλα τα ίχνη + see_your_traces: Δείτε τα ίχνη σας + upload_trace: Αποστολή ίχνους trace_optionals: - tags: Ετικέτες + tags: Χαρακτηριστικά trace_paging_nav: - next: Επόμενο » - previous: « Προηγούμενο - showing_page: Εμφάνιση σελίδας %{page} + newer: Νεότερα Ίχνη + older: Παλαιότερα Ίχνη + showing_page: Σελίδα %{page} view: delete_track: Διαγραφή αυτού του ίχνους description: "Περιγραφή:" @@ -1165,24 +1461,39 @@ el: edit: επεξεργασία edit_track: Επεξεργασία αυτού του ίχνους filename: "Όνομα αρχείου:" + heading: Προβολή ίχνους %{name} map: χάρτης none: Κανένα owner: "Ιδιοκτήτης:" + pending: ΕΚΚΡΕΜΕΙ points: "Σημεία:" - tags: "Ετικέτες:" + start_coordinates: "Συντεταγμένες αρχής:" + tags: "Χαρακτηριστικά:" + title: Προβολή ίχνους %{name} + trace_not_found: Δεν βρέθηκε ίχνος! + uploaded: "Μεταφορτώθηκε:" visibility: "Ορατότητα:" + visibility: + private: Προσωπικό (διαμοιρασμός μόνο σαν ανώνυμος) + public: Δημόσιο (Εμφάνιση στη λίστα ιχνών σαν ανώνυμος) + trackable: Ανιχνεύεται (κοινοποιείται ανώνυμα, διέταξε σημεία με χρονοσημάνσεις) user: account: contributor terms: - agreed: Έχεις συμφωνήσει με τους νέους Όρους Συνεισφοράς. + agreed: Έχετε συμφωνήσει με τους νέους Όρους Συνεισφοράς. + agreed_with_pd: Έχετε επίσης δηλώσει ότι θεωρείτε τις επεξεργασίες σας οτι είναι Public Domain. heading: "Όροι Συνεισφοράς:" link text: τι είναι αυτό; - not yet agreed: Δεν έχεις συμφωνήσει με τους νέους Όρους Συνεισφοράς. - review link text: Παρακαλώ ακολούθησε αυτό το σύνδεσμο όταν μπορέσεις για να διαβάσεις και να αποδεχθείς τους νέους Όρους Συνεισφοράς. - current email address: "Τωρινή Διεύθυνση ηλεκτρονικού ταχυδρομείου:" + not yet agreed: Δεν έχετε συμφωνήσει με τους νέους Όρους Συνεισφοράς. + review link text: Παρακαλώ ακολουθήστε αυτό το σύνδεσμο όταν μπορείτε για να διαβάσετε και να αποδεχθείτε τους νέους Όρους Συνεισφοράς. + current email address: "Τωρινή Διεύθυνση Ηλεκτρονικού Ταχυδρομείου:" delete image: Αφαίρεση της τρέχουσας εικόνας email never displayed publicly: (όχι δημόσια εμφάνιση) flash update success: Οι πληροφορίες χρήστη ενημερώθηκαν με επιτυχία. + flash update success confirm needed: Οι πληροφορίες του χρήστη ενημερώθηκαν επιτυχώς. Ελέγξτε το ηλεκτρονικό ταχυδρομείο σας για μια ειδοποίηση επιβεβαίωσης της νέας σας διεύθυνση ηλεκτρονικού ταχυδρομείου. + gravatar: + gravatar: Χρήση Gravatar + link text: τι είναι αυτό; home location: "Τοποθεσία Σπιτιού:" image: "Εικόνα:" image size hint: (τετράγωνες εικόνες τουλάχιστον 100 x 100 λειτουργούν καλύτερα) @@ -1193,61 +1504,74 @@ el: my settings: Οι ρυθμίσεις μου new email address: "Νέα Διεύθυνση ηλεκτρονικού ταχυδρομείου:" new image: Προσθήκη εικόνας - no home location: Δεν έχεις εισάγει την τοποθεσία του σπιτιού σου. + no home location: Δεν έχετε εισάγει την τοποθεσία του σπιτιού σας. openid: + link: http://wiki.openstreetmap.org/wiki/OpenID link text: τι είναι αυτό; - preferred editor: "Προτιμώμενο πρόγραμμα Επεξεργασίας:" - preferred languages: "Προτιμώμενες γλώσσες:" - profile description: "Περιγραφή Λογαριασμού:" + openid: "OpenID:" + preferred editor: "Προτιμώμενο Πρόγραμμα Επεξεργασίας:" + preferred languages: "Προτιμώμενες Γλώσσες:" + profile description: "Περιγραφή Προφίλ:" public editing: - disabled: Απενεργοποιήθηκε και δεν μπορείς να επεξεργαστείς δεδομένα, όλες οι προηγούμενες επεξεργασίες είναι ανώνυμες. + disabled: Απενεργοποιήθηκε και δεν μπορείτε να επεξεργαστείτε δεδομένα, όλες οι προηγούμενες επεξεργασίες είναι ανώνυμες. disabled link text: γιατί δεν μπορώ να επεξεργαστώ τον χάρτη; - enabled: Ενεργοποιήθηκε. Δεν είσαι πια ανώνυμος και μπορείς να επεξεργαστείς δεδομένα. + enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμος και μπορείτε να επεξεργαστείτε δεδομένα. + enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: τι είναι αυτό; heading: "Δημόσια επεξεργασία:" public editing note: heading: "Δημόσια επεξεργασία:" - text: Αυτή τη στιγμή οι επεξεργασίες σου είναι ανώνυμες και δεν μπορεί κανείς να σου στείλει μήνυμα ή να δει την τοποθεσία σου. Για να δείξεις τι έχεις επεξεργαστεί και να επιτρέψεις στους άλλους έρθουν σε επαφή μαζί σου μέσω του ιστοχώρου, πάτα το κουμπί από κάτω. Από την αλλαγή σε API 0.6, μόνο οι επώνυμοι χρήστες μπορούν να επεξεργαστούν δεδομένα του χάρτη.. (μάθε γιατί).

    • Η διεύθυνσή σου ηλεκτρονικού ταχυδρομείου δεν θα αποκαλυφθεί δημόσια.
    • Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και όλοι οι νέοι χρήστες είναι επώνυμοι εξ' αρχής.
    + text: Αυτήν τη στιγμή οι επεξεργασίες σας είναι ανώνυμες και δεν μπορεί κανείς να σας στείλει μήνυμα ή να δει την τοποθεσία σας. Για να δείξετε τι έχετε επεξεργαστεί και να επιτρέψετε στους άλλους έρθουν σε επαφή μαζί σας μέσω του ιστοχώρου, πατήστε το κουμπί από κάτω. Μετά την αλλαγή σε API 0.6, μόνο οι επώνυμοι χρήστες μπορούν να επεξεργαστούν δεδομένα του χάρτη.. (μάθετε γιατί).
    • Η διεύθυνσή σας ηλεκτρονικού ταχυδρομείου δεν θα αποκαλυφθεί δημόσια.
    • Αυτή η ενέργεια δεν μπορεί να αναιρεθεί και όλοι οι νέοι χρήστες είναι επώνυμοι εξ' αρχής.
    replace image: Αντικατάσταση της τρέχουσας εικόνας return to profile: Επιστροφή στο προφίλ save changes button: Αποθήκευση Αλλαγών title: Επεξεργασία λογαριασμού + update home location on click: Ενημέρωση τοποθεσίας σπιτιού όταν κάνω κλικ στον χάρτη; confirm: already active: Αυτός ο λογαριασμός έχει ήδη επιβεβαιωθεί. button: Επιβεβαίωση - heading: Επιβεβαίωση ενός λογαριασμού χρήστη - press confirm button: Πάτα το κουμπί "Επιβεβαίωση" για να ενεργοποιήσεις το λογαριασμό σου. - success: Επιβεβαιώθηκε ο λογαριασμός σου, σε ευχαριστούμε για την εγγραφή σου! + heading: Ελέγξτε το ηλεκτρονικό ταχυδρομείο σας! + introduction_1: Σας στείλαμε ένα email επιβεβαίωσης. + introduction_2: Επιβεβαιώστε το λογαριασμό σας κάνοντας κλικ στο σύνδεσμο στο email και θα είστε σε θέση να ξεκινήσετε τη χαρτογράφηση. + press confirm button: Πατήστε το κουμπί "Επιβεβαίωση" για να ενεργοποιήσετε το λογαριασμό σας. + reconfirm_html: Εάν θέλετε να σας ξαναστείλουμε το email επιβεβαίωσης πατήστε εδώ. + unknown token: Αυτός ο κωδικός επιβεβαίωσης έχει λήξει ή δεν υπάρχει. confirm_email: button: Επιβεβαίωση failure: Μια διεύθυνση ηλεκτρονικού ταχυδρομείου έχει ήδη επιβεβαιωθεί με αυτό το διακριτικό. heading: Επιβεβαίωση αλλαγής της διεύθυνσης ηλεκτρονικού ταχυδρομείου - press confirm button: Πάτα το κουμπί "Επιβεβαίωση" παρακάτω για να επιβεβαιώσεις τη νέα διεύθυνση ηλεκτρονικού ταχυδρομείου σου. - success: Επιβεβαιώθηκε η διεύθυνση ηλεκτρονικού ταχυδρομείου σου, σε ευχαριστούμε για την εγγραφή σου! + press confirm button: Πατήστε το κουμπί «Επιβεβαίωση» παρακάτω για να επιβεβαιώσετε τη νέα διεύθυνση ηλεκτρονικού ταχυδρομείου σας. + success: Επιβεβαιώθηκε η διεύθυνση ηλεκτρονικού ταχυδρομείου σας, σας ευχαριστούμε για την εγγραφή σας! confirm_resend: failure: Ο χρήστης %{name} δεν βρέθηκε. filter: - not_an_administrator: Πρέπει να είσαι διαχειριστής για να το κάνεις αυτό. + not_an_administrator: Πρέπει να είστε διαχειριστής για να το κάνετε αυτό. go_public: - flash success: Όλες οι επεξεργασίες σου είναι τώρα δημόσιες και έχεις τη δυνατότητα να επεξεργαστείς τον χάρτη. + flash success: Όλες οι επεξεργασίες σας είναι τώρα δημόσιες και έχετε τη δυνατότητα να επεξεργαστείτε τον χάρτη. list: - confirm: Επιβεβαίωση επιλεγμένων χρηστών + confirm: Επιβεβαίωση Επιλεγμένων Χρηστών + empty: Δεν βρέθηκαν χρήστες που να ταιριάζουν heading: Χρήστες hide: Απόκρυψη Επιλεγμένων Χρηστών + showing: + one: Σελίδα %{page} (%{first_item} από %{items}) + other: Σελίδα %{page} (%{first_item}-%{last_item} από %{items}) summary: "%{name} δημιουργήθηκε από την διεύθυνση IP %{ip_address} στις %{date}" summary_no_ip: "%{name} δημιουργήθηκε στις %{date}" title: Χρήστες login: - account not active: Λυπάμαι, ο λογαριασμός σου δεν είναι ενεργός ακόμα.
    Παρακαλώ χρησιμοποίησε το σύνδεσμο στο email επιβεβαίωσης για να ενεργοποιήσεις το λογαριασμό σου, ή κάνε αίτηση νέου email επιβεβαίωσης. - auth failure: Λυπάμαι, δεν μπορείς να συνδεθείς με αυτές τις λεπτομέρειες. + account is suspended: Λυπάμαι, ο λογαριασμός σας έχει ανασταλεί λόγω ύποπτης δραστηριότητας.
    Παρακαλώ επικοινωνήστε με τον webmaster εάν θέλετε να το συζητήσετε. + account not active: Λυπάμαι, ο λογαριασμός σας δεν είναι ενεργός ακόμα.
    Παρακαλώ χρησιμοποιήστε το σύνδεσμο στο email επιβεβαίωσης για να ενεργοποιήσετε τον λογαριασμό σας, ή κάντε αίτηση νέου email επιβεβαίωσης. + auth failure: Λυπάμαι, δεν μπορείτε να συνδεθείτε με αυτές τις λεπτομέρειες. create account minute: Δημιούργησε λογαριασμό. Παίρνει μόνο ένα λεπτό. - email or username: "Διεύθυνση ηλεκτρονικού ταχυδρομείου ή Όνομα χρήστη:" - heading: Είσοδος - login_button: Είσοδος - lost password link: Έχασες τον κωδικό σου; - new to osm: Νέος στο OpenStreetMap; - notice: Μάθε περισσότερα σχετικά με την επερχόμενη αλλαγή άδειας του OpenStreetMap (μεταφράσεις) (συζήτηση) - notice_terms: Το OpenStreetMap μετακινείται σε νέα άδεια την 1η Απριλίου 2012. Είναι το ίδιο ανοιχτή όπως η υπάρχουσα, αλλά τα νομικά σημεία ταιριάζουν καλύτερα στη βάση δεδομένων του χάρτη. Θα θέλαμε πολύ να διατηρηθούν οι συνεισφορές σου στο OpenStreetMap, αλλά μπορούμε να το επιτύχουμε μόνο αν συμφωνείς να διανέμονται υπό τη νέα άδεια. Διαφορετικά, θα πρέπει να αφαιρεθούν από τη βάση δεδομένων.

    Παρακαλούμε συνδέσου και στη συνέχεια αφιέρωσε μερικά δευτερόλεπτα για να διαβάσεις και να αποδεχτείς τους νέους όρους. Ευχαριστούμε! + email or username: "Διεύθυνση Ηλ. Ταχυδρομείου ή Όνομα Χρήστη:" + heading: Σύνδεση + login_button: Σύνδεση + lost password link: Χάσατε τον κωδικό σας; + new to osm: Νέοι στο OpenStreetMap; + no account: Δεν έχετε λογαριασμό; + openid: "%{logo} OpenID:" + openid invalid: Λυπάμαι, το OpenID φαίνεται να είναι ακατάλληλο openid missing provider: Λυπάμαι, δεν μπορώ να έρθω σε επαφή με τον πάροχο σας OpenID openid_logo_alt: Σύνδεση με ένα OpenID openid_providers: @@ -1270,54 +1594,65 @@ el: alt: Σύνδεση με ένα Yahoo OpenID title: Σύνδεση με Yahoo password: "Κωδικός:" - register now: Εγγραφή - remember: "Αποθήκευση:" - title: Είσοδος + register now: Εγγραφείτε τώρα + remember: Να με θυμάσαι + title: Σύνδεση to make changes: Για να κάνεις αλλαγές στα δεδομένα του OpenStreetMap, πρέπει να έχεις λογαριασμό. + with openid: "Εναλλακτικά, χρησιμοποιήστε OpenID για να συνδεθείτε:" + with username: "Έχετε ήδη λογαριασμό OpenStreetMap; Παρακαλώ συνδεθείτε με το όνομα χρήστη και κωδικό πρόσβασης:" logout: - heading: Έξοδος από το OpenStreetMap - logout_button: Έξοδος - title: Έξοδος + heading: Αποσύνδεση από το OpenStreetMap + logout_button: Αποσύνδεση + title: Αποσύνδεση lost_password: - email address: "Διεύθυνση ηλεκτρονικού ταχυδρομείου:" - heading: Ξέχασες τον κωδικό σου; - help_text: Πληκτρολόγησε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποίησες για να εγγραφείς, θα στείλουμε ένα σύνδεσμο, όπου μπορείς να χρησιμοποιήσεις για να επαναφέρεις τον κωδικό σου. + email address: "Διεύθυνση Ηλεκτρονικού Ταχυδρομείου:" + heading: Ξεχάσατε τον κωδικό σας; + help_text: Πληκτρολογήστε τη διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιήσατε για να εγγραφείτε. Θα στείλουμε έναν σύνδεσμο τον οποίον μπορείτε να χρησιμοποιήσετε για να επαναφέρετε τον κωδικό σας. new password button: Επαναφορά κωδικού notice email cannot find: Λυπάμαι, δεν βρέθηκε αυτή η διεύθυνση ηλεκτρονικού ταχυδρομείου. - notice email on way: Λυπάμαι που τον έχασες:-(, αλλά ένα μήνυμα ηλεκτρονικού ταχυδρομείου βρίσκεται στο δρόμο, ώστε να μπορέσεις να τον επαναφέρεις σύντομα. - title: Έχασες τον κωδικό σου + notice email on way: Λυπάμαι που τον χάσατε :-(, αλλά ένα μήνυμα ηλεκτρονικού ταχυδρομείου εστάλη, ώστε να μπορέσετε να τον επαναφέρετε σύντομα. + title: Χάσατε τον κωδικό σας make_friend: already_a_friend: Είστε ήδη φίλοι με τον χρήστη %{name}. - failed: Λυπούμαστε, απέτυχε η προσθήκη του χρήστη %{name} ως φίλο. - success: Ο χρήστης %{name} είναι τώρα φίλος σου. + button: Προσθήκη ως φίλο + failed: Λυπούμαστε, απέτυχε η προσθήκη του χρήστη %{name} ως φίλου. + heading: Προσθήκη του %{user} ως φίλου; + success: Ο %{name} είναι τώρα φίλος σου! new: - confirm email address: "Επιβεβαιώση Διεύθυνσης ηλεκτρονικού ταχυδρομείου:" + about: + header: Ελεύθερος και επεξεργάσιμος + html: "

    Σε αντίθεση με άλλους χάρτες, Ο OpenStreetMap έχει ολοκληρωτικά φτιαχτεί από ανθρώπους σαν εσάς,\nκαι είναι ανοικτός στον καθένα τον διορθώσει, αναβαθμίσει, κατεβάσει και χρησιμοποιήσει.

    \n

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

    " + confirm email address: "Επιβεβαίωση Διεύθυνσης Ηλ. Ταχυδρομείου:" confirm password: "Επιβεβαίωση Κωδικού:" - continue: Συνέχεια + continue: Εγγραφή display name: "Εμφανιζόμενο όνομα:" - email address: "Διεύθυνση ηλεκτρονικού ταχυδρομείου:" - fill_form: Συμπλήρωσε τη φόρμα και θα σου στείλουμε ένα γρήγορο email για να ενεργοποιήσεις το λογαριασμό σου. - heading: Δημιουργία Λογαριασμού Χρήστη - license_agreement: Όταν επιβεβαιώσεις το λογαριασμό σου, θα πρέπει να συμφωνήσεις με τους όρους συνεισφοράς. - not displayed publicly: Να μην εμφανίζεται δημόσια (δες την πολιτική απορρήτου) + display name description: Το δημόσια εμφανιζόμενο όνομα χρήστη. Μπορείτε να το αλλάξετε αργότερα από τις προτιμήσεις. + email address: "Διεύθυνση Ηλ. Ταχυδρομείου:" + license_agreement: Όταν επιβεβαιώσετε το λογαριασμό σας, θα πρέπει να συμφωνήσετε με τους όρους συνεισφοράς. + not displayed publicly: Να μην εμφανίζεται δημόσια (δείτε την πολιτική απορρήτου) + openid: "%{logo} OpenID:" + openid no password: Με OpenID δεν απαιτείται κωδικός πρόσβασης, αλλά μερικά τρίτα εργαλεία ή διακομιστές μπορεί να χρειαστούν κωδικό. password: "Κωδικός:" terms accepted: Ευχαριστούμε για την αποδοχή των νέων όρων συνεισφοράς! - terms declined: Λυπούμαστε για το ότι αποφάσισες να μην αποδεχθείς τους νέους όρους συνεισφοράς. Για περισσότερες πληροφορίες, παρακαλούμε δες αυτήν τη σελίδα wiki. - title: Δημιουργία λογαριασμού + terms declined: Λυπούμαστε για το ότι αποφασίσατε να μην αποδεχθείτε τους νέους όρους συνεισφοράς. Για περισσότερες πληροφορίες, παρακαλούμε δείτε αυτήν τη σελίδα wiki. + title: Εγγραφή + use openid: "Εναλλακτικά, χρήσιμοποιήστε %{logo} OpenID για να συνδεθείτε:" no_such_user: - body: Λυπάμαι, δεν υπάρχει χρήστης με το όνομα %{user}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος μέσο του οποίου έφτασες σε αυτήν την σελίδα. + body: Λυπάμαι, δεν υπάρχει χρήστης με το όνομα %{user}. Είναι πιθανό να υπάρχουν ορθογραφικά λάθη ή να είναι λάθος ο σύνδεσμος μέσω του οποίου φτάσατε σε αυτήν τη σελίδα. heading: Ο χρήστης %{user} δεν υπάρχει title: Άγνωστος χρήστης popup: friend: Φίλος nearby mapper: Κοντινός χαρτογράφος - your location: Η τοποθεσία σου + your location: Η τοποθεσία σας remove_friend: - not_a_friend: Ο χρήστης %{name} δεν είναι ένας από τους φίλους σου. - success: Ο χρήστης %{name} καταργήθηκε από φίλος. + button: Αφαίρεση φίλου + heading: Αφαίρεση φίλου %{user}; + not_a_friend: Ο χρήστης %{name} δεν είναι ένας από τους φίλους σας. + success: Ο χρήστης %{name} αφαιρέθηκε από φίλος. reset_password: confirm password: "Επιβεβαίωση Κωδικού:" - flash changed: Ο κωδικός σου αλλάχτηκε. + flash changed: Ο κωδικός σας αλλάχτηκε. heading: Επαναφορά Κωδικού για τον χρήστη %{user} password: "Κωδικός:" reset: Επαναφορά Κωδικού @@ -1325,64 +1660,72 @@ el: set_home: flash success: Η τοποθεσία σπιτιού αποθηκεύτηκε επιτυχώς suspended: - body: "

    \nΛυπάμαι, ο λογαριασμός σου έχει αυτόματα ανασταλεί λόγω\nύποπτης δραστηριότητας.\n

    \n

    \nΗ παρούσα απόφαση θα εξεταστεί από ένα διαχειριστή σύντομα, ή\nμπορείς να επικοινωνήσεις με τον %{webmaster} αν θέλεις να συζητήσετε αυτό το θέμα.\n

    " + body: "

    \nΛυπάμαι, ο λογαριασμός σας έχει αυτόματα ανασταλεί λόγω\nύποπτης δραστηριότητας.\n

    \n

    \nΗ παρούσα απόφαση θα εξεταστεί από ένα διαχειριστή σύντομα, ή\nμπορείτε να επικοινωνήσετε με τον %{webmaster} αν θέλετε να συζητήσετε αυτό το θέμα.\n

    " heading: Ο Λογαριασμός έχει Ανασταλεί title: Ο Λογαριασμός έχει Ανασταλεί + webmaster: webmaster terms: agree: Συμφωνώ - consider_pd_why: Τι είναι αυτό? + consider_pd: Και επιπρόσθετα στην παραπάνω συμφωνία, θεωρώ τις συνεισφορές μου ως Public Domain + consider_pd_why: τι είναι αυτό; decline: Διαφωνώ heading: Όροι συνεισφοράς legale_names: france: Γαλλία italy: Ιταλία rest_of_world: Υπόλοιπος κόσμος - legale_select: "Παρακαλώ επέλεξε τη χώρα κατοικίας σου:" + legale_select: "Παρακαλώ επιλέξτε τη χώρα κατοικίας σας:" + read and accept: Παρακαλούμε διαβάστε τη συμφωνία και πατήστε το κουμπί «συμφωνώ» για να επιβεβαιώσετε ότι αποδέχεστε τους όρους αυτής της συμφωνίας για τις υπάρχουσες και τις μέλλουσες συνεισφορές σας. title: Όροι συνεισφοράς - you need to accept or decline: Παρακαλώ διάβασε και αποδέξου ή απέρριψε τους νέους Όρους Συνεισφοράς για να συνεχίσεις. + you need to accept or decline: Παρακαλώ διαβάστε και αποδεχτείτε ή απορρίψτε τους νέους Όρους Συνεισφοράς για να συνεχίσετε. view: - activate_user: ενεργοποίηση αυτού του λογαριασμού χρήστη - add as friend: προσθήκη ως φίλος + activate_user: ενεργοποίηση αυτού του χρήστη + add as friend: Προσθήκη Φίλου ago: (%{time_in_words_ago} πριν) - block_history: εμφάνιση φραγών που λήφθηκαν - blocks by me: φραγές από εμένα - blocks on me: φραγές σε εμένα - comments: σχόλια + block_history: φραγές που ελήφθησαν + blocks by me: Φραγές από Εμένα + blocks on me: Φραγές σε Εμένα + comments: Σχόλια confirm: Επιβεβαίωση - confirm_user: επιβεβαίωση αυτού το χρήστη + confirm_user: επιβεβαίωση αυτού του χρήστη create_block: φραγή αυτού του χρήστη created from: "Δημιουργήθηκε από:" ct accepted: Αποδοχή %{ago} πριν ct declined: Απόρριψη - ct status: "Όροι Συνεισφοράς:" + ct status: "Όροι συνεισφοράς:" ct undecided: Αναποφάσιστος - deactivate_user: απενεργοποίηση αυτού του λογαριασμού χρήστη + deactivate_user: απενεργοποίηση αυτού του χρήστη delete_user: διαγραφή αυτού του χρήστη description: Περιγραφή - diary: ημερολόγιο - edits: επεξεργασίες - email address: "Διεύθυνση ηλεκτρονικού ταχυδρομείου:" - friends_changesets: Εμφάνιση όλων των ομάδων αλλαγών από φίλους - friends_diaries: Εμφάνιση όλων των καταχωρήσεων ημερολογίου από φίλους + diary: Ημερολόγιο + edits: Επεξεργασίες + email address: "Διεύθυνση Ηλ. Ταχυδρομείου:" + friends_changesets: ομάδες αλλαγών φίλων + friends_diaries: καταχωρήσεις ημερολογίου φίλων hide_user: απόκρυψη αυτού του χρήστη + if set location: Ορίσετε την τοποθεσία του σπιτιού σας στις %{settings_link} για να δείτε κοντινούς χρήστες. km away: "%{count}χλμ μακριά" latest edit: "Τελευταία επεξεργασία %{ago}:" m away: "%{count}μ μακριά" mapper since: "Χαρτογράφος από:" - moderator_history: εμφάνιση φραγών που δόθηκαν - my comments: τα σχόλιά μου - my diary: το ημερολόγιό μου - my edits: οι επεξεργασίες μου - my settings: οι ρυθμίσεις μου - my traces: τα ίχνη μου + moderator_history: φραγές που επιβλήθηκαν + my comments: Τα Σχόλιά Μου + my diary: Το Ημερολόγιό Μου + my edits: Οι Επεξεργασίες Μου + my messages: Τα Μηνύματά Μου + my notes: Οι Σημειώσεις Μου + my profile: Το Προφίλ Μου + my settings: Οι Ρυθμίσεις Μου + my traces: Τα Ίχνη Μου nearby users: Άλλοι κοντινοί χρήστες - nearby_changesets: Εμφάνιση όλων των ομάδων αλλαγών από κοντινούς χρήστες - nearby_diaries: Εμφάνιση όλων των καταχωρήσεων ημερολογίου από κοντινούς χρήστες + nearby_changesets: ομάδες αλλαγών από κοντινούς χρήστες + nearby_diaries: καταχωρήσεις ημερολογίου από κοντινούς χρήστες new diary entry: νέα καταχώρηση ημερολογίου - no friends: Δεν έχεις προσθέσει φίλους ακόμα. + no friends: Δεν έχετε προσθέσει φίλους ακόμα. no nearby users: Δεν υπάρχουν άλλοι χρήστες που παραδέχονται ότι χαρτογραφούν κοντά σου προς το παρόν. + notes: Σημειώσεις Χάρτη oauth settings: ρυθμίσεις oauth - remove as friend: αφαίρεση από φίλος + remove as friend: Αφαίρεση Φίλου role: administrator: Αυτός ο χρήστης είναι διαχειριστής grant: @@ -1390,11 +1733,12 @@ el: moderator: Χορήγηση πρόσβασης συντονιστή moderator: Αυτός ο χρήστης είναι συντονιστής revoke: - administrator: Ανάκληση πρόσβασης διαχειριστή - moderator: Ανάκληση πρόσβασης συντονιστή - send message: αποστολή μηνύματος + administrator: Ανακαλέστε πρόσβαση διαχειριστή + moderator: Ανακαλέστε πρόσβαση συντονιστή + send message: Αποστολή Μηνύματος settings_link_text: ρυθμίσεις status: "Κατάσταση:" + traces: Ίχνη unhide_user: επανεμφάνιση αυτού του χρήστη user location: Τοποθεσία χρήστη your friends: Οι φίλοι σου @@ -1407,59 +1751,96 @@ el: empty: Ο %{name} δεν έχει φραχτεί ακόμα. heading: Κατάλογος φραγών στον %{name} title: Φραγές στον %{name} + create: + flash: Δημιουργήθηκε φραγή στον χρήστη %{name}. edit: back: Προβολή όλων των φραγών heading: Επεξεργασία φραγής στον %{name} show: Προβολή αυτής της φραγής + submit: Ενημέρωση φραγής title: Επεξεργασία φραγής στον %{name} helper: time_future: Τελειώνει σε %{time}. time_past: Τελείωσε %{time} πριν. until_login: Ενεργό έως ότου ο χρήστης συνδεθεί. + index: + heading: Λίστα φραγών του χρήστη + title: Φραγές χρήστη new: back: Προβολή όλων των φραγών heading: Δημιουργία φραγής στον %{name} submit: Δημιουργία φραγής title: Δημιουργία φραγής στον %{name} + tried_contacting: Επικοινώνησα με τον χρήστη και του ζήτησα να σταματήσει. not_found: back: Πίσω στο ευρετήριο partial: - confirm: Είσαι σίγουρος; + confirm: Είσαστε σίγουροι; creator_name: Δημιουργός display_name: Υπό Φραγή Χρήστης edit: Επεξεργασία + next: Επόμενη » not_revoked: (δεν έχει ανακληθεί) + previous: « Προηγούμενη reason: Αιτία φραγής - revoke: Ανάκληση! + revoke: Ανακαλέστε! revoker_name: Ανακλήθηκε από show: Εμφάνιση + showing_page: Σελίδα %{page} status: Κατάσταση period: one: 1 ώρα other: "%{count} ώρες" revoke: flash: Αυτή η φραγή έχει ανακληθεί. - revoke: Ανάκληση! + revoke: Ανακαλέστε! show: back: Προβολή όλων των φραγών - confirm: Είσαι σίγουρος? + confirm: Είστε σίγουρος? edit: Επεξεργασία heading: Ο %{block_on} έχει φραχτεί από τον %{block_by} + needs_view: Ο χρήστης πρέπει να συνδεθεί πριν γίνεται να εκκαθαριστεί αυτή η φραγή. reason: "Αιτία φραγής:" - revoke: Ανάκληση! + revoke: Ανακαλέστε! + revoker: "Έκανε την ανάκληση:" show: Εμφάνιση status: Κατάσταση time_future: Τελειώνει σε %{time} time_past: Τελείωσε %{time} πριν title: Ο %{block_on} έχει φραχτεί από τον %{block_by} + update: + only_creator_can_edit: Μόνο ο συντονιστής που δημιούργησε αυτήν τη φραγή μπορεί να την επεξεργαστεί. + success: Η φραγή ενημερώθηκε. user_role: filter: already_has_role: Ο χρήστης έχει ήδη ρόλο %{role}. doesnt_have_role: Ο χρήστης δεν έχει ρόλο %{role}. + not_a_role: Το αλφαριθμητικό `%{role}' δεν είναι ένας έγκυρος ρόλος. grant: - are_you_sure: Είσαι βέβαιος ότι θέλεις να εκχωρήσεις το ρόλο `%{role}' στον χρήστη `%{name}'? + are_you_sure: Είστε βέβαιος ότι θέλετε να εκχωρήσετε το ρόλο `%{role}' στον χρήστη `%{name}'? confirm: Επιβεβαίωση heading: Επιβεβαίωση χορήγησης ρόλου title: Επιβεβαίωση χορήγησης ρόλου revoke: + are_you_sure: Σίγουρα θέλετε να ανακαλέστε τον ρόλο «%{role}» από τον χρήστη «%{name}»; confirm: Επιβεβαίωση + heading: Επιβεβαίωση ανάκλησης ρόλου + title: Επιβεβαίωση ανάκλησης ρόλου + welcome_page: + add_a_note: + paragraph_1_html: Εάν θέλετε κάτι μικρό να διορθωθεί και δεν έχετε χρόνο να εγγραφείτε και να μάθετε πως να επεξεργάζεστε τον χάρτη, είναι εύκολο να προσθέσετε σημειώσεις. + paragraph_2_html: "Απλά επισκεφτείτε τον χάρτη και πατήστε το εικονίδιο σημείωσης:\n. Αυτό θα προσθέσει έναν δείκτη στο χάρτη, τον οποίο μπορείτε να μετακινήσετε τραβώντας τον. Προσθέστε το μήνυμά σας, κατόπιν πατήστε αποθήκευση, και άλλοι χαρτογράφοι θα το διερευνήσουν." + title: Δεν Έχετε Χρόνο Για Χαρτογράφηση; Προσθέστε μια Σημείωση! + basic_terms: + editor_html: Οι επεξεργαστές είναι εφαρμογές ή ιστοσελίδες που μπορείτε να χρησιμοποιήσετε για να επεξεργαστείτε το χάρτη. + node_html: Οι κόμβοι είναι σημεία στον χάρτη, όπως ένα εστιατόριο ή ένα δένδρο. + tag_html: Τα χαρακτηριστικά είναι δεδομένα που σχετίζονται με κόμβους ή διαδρομές, όπως τα ονόματα εστιατορίως ή τα όριο ταχύτητας διάφορων δρόμων. + title: Βασικοί Όροι Για Τη Χαρτογράφηση + way_html: Οι διαδρομές είναι γραμμές ή περιοχές, όπως δρόμοι, ρέματα, λίμνες ή κτήρια. + introduction_html: Σας καλωσορίζουμε στο OpenStreetMap, τον ελεύθερο και επεξεργάσιμο παγκόσμιο χάρτη. Τώρα που έχετε εγγραφεί, είστε πανέτοιμοι να αρχίσετε τη χαρτογράφηση. Εδώ είναι ένας γρήγορος οδηγός με τα περισσότερο σημαντικά πράγματα που χρειάζεται να ξέρετε. + questions: + title: Ερωτήσεις; + start_mapping: Ξεκινήστε τη Χαρτογράφηση + title: Καλώς ήρθατε! + whats_on_the_map: + title: Τι είναι στον Χάρτη diff --git a/config/locales/en.yml b/config/locales/en.yml index e1f7f416a01..7787fde86b1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,6 +4,7 @@ en: time: formats: friendly: "%e %B %Y at %H:%M" + blog: "%e %B %Y" activerecord: # Translates all the model names, which is used in error handling on the web site models: @@ -47,7 +48,7 @@ en: body: "Body" diary_entry: user: "User" - title: "Title" + title: "Subject" latitude: "Latitude" longitude: "Longitude" language: "Language" @@ -65,7 +66,7 @@ en: description: "Description" message: sender: "Sender" - title: "Title" + title: "Subject" body: "Body" recipient: "Recipient" user: @@ -84,6 +85,9 @@ en: 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)" @@ -91,92 +95,63 @@ en: name: "Remote Control" description: "Remote Control (JOSM or Merkaartor)" browse: + created: "Created" + closed: "Closed" + created_html: "Created %{time} ago" + closed_html: "Closed %{time} ago" + created_by_html: "Created %{time} ago by %{user}" + deleted_by_html: "Deleted %{time} ago by %{user}" + edited_by_html: "Edited %{time} ago by %{user}" + closed_by_html: "Closed %{time} ago by %{user}" + version: "Version" + in_changeset: "Changeset" + anonymous: "anonymous" + no_comment: "(no comment)" + part_of: "Part of" + download_xml: "Download XML" + view_history: "View History" + view_details: "View Details" + location: "Location:" changeset: - title: "Changeset" - changeset: "Changeset: %{id}" + title: "Changeset: %{id}" + belongs_to: "Author" + node: "Nodes (%{count})" + node_paginated: "Nodes (%{x}-%{y} of %{count})" + way: "Ways (%{count})" + way_paginated: "Ways (%{x}-%{y} of %{count})" + relation: "Relations (%{count})" + relation_paginated: "Relations (%{x}-%{y} of %{count})" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: title: "Changeset %{id}" title_comment: "Changeset %{id} - %{comment}" - navigation: - paging: - user: - prev: "« %{id}" - next: "%{id} »" - all: - prev: "« %{id}" - next: "%{id} »" - user: - name_changeset_tooltip: "View edits by %{user}" - prev_changeset_tooltip: "Previous edit by %{user}" - next_changeset_tooltip: "Next edit by %{user}" - all: - prev_node_tooltip: "Previous node" - next_node_tooltip: "Next node" - prev_way_tooltip: "Previous way" - next_way_tooltip: "Next way" - prev_relation_tooltip: "Previous relation" - next_relation_tooltip: "Next relation" - prev_changeset_tooltip: "Previous changeset" - next_changeset_tooltip: "Next changeset" - changeset_details: - created_at: "Created at:" - closed_at: "Closed at:" - belongs_to: "Belongs to:" - bounding_box: "Bounding box:" - no_bounding_box: "No bounding box has been stored for this changeset." - show_area_box: "Show Area Box" - box: "box" - has_nodes: - one: "Has the following %{count} node:" - other: "Has the following %{count} nodes:" - has_ways: - one: "Has the following %{count} way:" - other: "Has the following %{count} ways:" - has_relations: - one: "Has the following %{count} relation:" - other: "Has the following %{count} relations:" - common_details: - edited_at: "Edited at:" - edited_by: "Edited by:" - deleted_at: "Deleted at:" - deleted_by: "Deleted by:" - version: "Version:" - in_changeset: "In changeset:" - changeset_comment: "Comment:" + node: + title: "Node: %{name}" + history_title: "Node History: %{name}" + way: + title: "Way: %{name}" + history_title: "Way History: %{name}" + nodes: "Nodes" + also_part_of: + one: "part of way %{related_ways}" + other: "part of ways %{related_ways}" + relation: + title: "Relation: %{name}" + history_title: "Relation History: %{name}" + members: "Members" + relation_member: + entry: "%{type} %{name}" + entry_role: "%{type} %{name} as %{role}" + type: + node: "Node" + way: "Way" + relation: "Relation" containing_relation: entry: "Relation %{relation_name}" entry_role: "Relation %{relation_name} (as %{relation_role})" - map: - loading: "Loading..." - deleted: "Deleted" - larger: - area: "View area on larger map" - node: "View node on larger map" - way: "View way on larger map" - relation: "View relation on larger map" - edit: - area: "Edit area" - node: "Edit node" - way: "Edit way" - relation: "Edit relation" - node_details: - coordinates: "Coordinates:" - part_of: "Part of:" - node_history: - node_history: "Node History" - node_history_title: "Node History: %{node_name}" - download_xml: "Download XML" - view_details: "View details" - node: - node: "Node" - node_title: "Node: %{node_name}" - download_xml: "Download XML" - view_history: "View history" - edit: "Edit node" not_found: - sorry: "Sorry, the %{type} with the id %{id}, could not be found." + sorry: "Sorry, %{type} #%{id} could not be found." type: node: node way: way @@ -189,9 +164,6 @@ en: way: way relation: relation changeset: changeset - paging_nav: - showing_page: "Showing page" - of: "of" redacted: redaction: "Redaction %{id}" message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details." @@ -199,102 +171,40 @@ en: node: "node" way: "way" relation: "relation" - relation_details: - members: "Members:" - part_of: "Part of:" - relation_history: - relation_history: "Relation History" - relation_history_title: "Relation History: %{relation_name}" - download_xml: "Download XML" - view_details: "View details" - relation_member: - entry: "%{type} %{name}" - entry_role: "%{type} %{name} as %{role}" - type: - node: "Node" - way: "Way" - relation: "Relation" - relation: - relation: "Relation" - relation_title: "Relation: %{relation_name}" - download_xml: "Download XML" - view_history: "View history" - start: - view_data: "View data for current map view" - manually_select: "Manually select a different area" start_rjs: - data_layer_name: "Browse Map Data" - data_frame_title: "Data" - zoom_or_select: "Zoom in or select an area of the map to view" - drag_a_box: "Drag a box on the map to select an area" - manually_select: "Manually select a different area" - hide_areas: "Hide areas" - show_areas: "Show areas" - loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than [[max_features]] features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." + feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?" load_data: "Load Data" - unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})" loading: "Loading..." - show_history: "Show History" - wait: "Wait..." - history_for_feature: "History for [[feature]]" - details: "Details" - private_user: "private user" - edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]" - object_list: - heading: "Object list" - back: "Display object list" - type: - node: "Node" - way: "Way" - # There is no 'relation' type because it is not represented in OpenLayers - api: "Retrieve this area from the API" - details: "Details" - selected: - type: - node: "Node [[id]]" - way: "Way [[id]]" - # There is no 'relation' type because it is not represented in OpenLayers - history: - type: - node: "Node [[id]]" - way: "Way [[id]]" - # There is no 'relation' type because it is not represented in OpenLayers tag_details: - tags: "Tags:" + tags: "Tags" wiki_link: key: "The wiki description page for the %{key} tag" tag: "The wiki description page for the %{key}=%{value} tag" wikipedia_link: "The %{page} article on Wikipedia" - way_details: - nodes: "Nodes:" - part_of: "Part of:" - also_part_of: - one: "also part of way %{related_ways}" - other: "also part of ways %{related_ways}" - way_history: - way_history: "Way History" - way_history_title: "Way History: %{way_name}" - download_xml: "Download XML" - view_details: "View details" - way: - way: "Way" - way_title: "Way: %{way_name}" - download_xml: "Download XML" - view_history: "View history" - edit: "Edit way" + note: + title: "Note: %{id}" + new_note: "New Note" + description: "Description" + open_title: "Unresolved note #%{note_name}" + closed_title: "Resolved note #%{note_name}" + hidden_title: "Hidden note #%{note_name}" + open_by: "Created by %{user} %{when} ago" + open_by_anonymous: "Created by anonymous %{when} ago" + commented_by: "Comment from %{user} %{when} ago" + commented_by_anonymous: "Comment from anonymous %{when} ago" + closed_by: "Resolved by %{user} %{when} ago" + closed_by_anonymous: "Resolved by anonymous %{when} ago" + reopened_by: "Reactivated by %{user} %{when} ago" + reopened_by_anonymous: "Reactivated by anonymous %{when} ago" + hidden_by: "Hidden by %{user} %{when} ago" changeset: changeset_paging_nav: - showing_page: "Showing page %{page}" + showing_page: "Page %{page}" next: "Next »" previous: "« Previous" changeset: - id: "#%{id}" - still_editing: "(still editing)" anonymous: "Anonymous" - no_comment: "(none)" no_edits: "(no edits)" - show_area_box: "show area box" - big_area: "(big)" view_changeset_details: "View changeset details" changesets: id: "ID" @@ -305,22 +215,15 @@ en: list: title: "Changesets" title_user: "Changesets by %{user}" - title_bbox: "Changesets within %{bbox}" - title_user_bbox: "Changesets by %{user} within %{bbox}" title_friend: "Changesets by your friends" title_nearby: "Changesets by nearby users" - heading: "Changesets" - heading_user: "Changesets" - heading_bbox: "Changesets" - heading_user_bbox: "Changesets" - heading_friend: "Changesets" - heading_nearby: "Changesets" - description: "Recent changes" - description_user: "Changesets by %{user}" - description_bbox: "Changesets within %{bbox}" - description_user_bbox: "Changesets by %{user} within %{bbox}" - description_friend: "Changesets by your friends" - description_nearby: "Changesets by nearby users" + empty: "No changesets found." + empty_area: "No changesets in this area." + empty_user: "No changesets by this user." + no_more: "No more changesets found." + no_more_area: "No more changesets in this area." + no_more_user: "No more changesets by this user." + load_more: "Load more" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -335,7 +238,7 @@ en: new: New Diary Entry new_title: Compose a new entry in your user diary no_entries: No diary entries - recent_entries: "Recent diary entries:" + recent_entries: "Recent diary entries" older_entries: Older Entries newer_entries: Newer Entries edit: @@ -365,7 +268,8 @@ en: comment_link: Comment on this entry reply_link: Reply to this entry comment_count: - one: 1 comment + zero: No comments + one: "%{count} comment" other: "%{count} comments" edit_link: Edit this entry hide_link: Hide this entry @@ -397,6 +301,7 @@ en: newer_comments: "Newer Comments" older_comments: "Older Comments" export: + title: "Export" start: area_to_export: "Area to Export" manually_select: "Manually select a different area" @@ -405,10 +310,25 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.' + export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' too_large: - heading: "Area Too Large" - body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area." + advice: "If the above export fails, please consider using one of the sources listed below:" + body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads." + planet: + title: "Planet OSM" + description: "Regularly-updated copies of the complete OpenStreetMap database" + overpass: + title: "Overpass API" + description: "Download this bounding box from a mirror of the OpenStreetMap database" + geofabrik: + title: "Geofabrik Downloads" + description: "Regularly-updated extracts of continents, countries, and selected cities" + metro: + title: "Metro Extracts" + description: "Extracts for major world cities and their surrounding areas" + other: + title: "Other Sources" + description: "Additional sources listed on the OpenStreetMap wiki" options: "Options" format: "Format" scale: "Scale" @@ -421,14 +341,6 @@ en: output: "Output" paste_html: "Paste HTML to embed in website" export_button: "Export" - start_rjs: - export: "Export" - drag_a_box: "Drag a box on the map to select an area" - manually_select: "Manually select a different area" - click_add_marker: "Click on the map to add a marker" - change_marker: "Change marker position" - add_marker: "Add a marker to the map" - view_larger_map: "View Larger Map" geocoder: search: title: @@ -436,17 +348,17 @@ en: us_postcode: 'Results from Geocoder.us' uk_postcode: 'Results from NPEMap / FreeThe Postcode' ca_postcode: 'Results from Geocoder.CA' - osm_namefinder: 'Results from OpenStreetMap Namefinder' osm_nominatim: 'Results from OpenStreetMap Nominatim' geonames: 'Results from GeoNames' - search_osm_namefinder: - prefix: "%{type}" - suffix_place: ", %{distance} %{direction} of %{placename}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} of %{parentname})" - suffix_suburb: "%{suffix}, %{parentname}" + osm_nominatim_reverse: 'Results from OpenStreetMap Nominatim' + geonames_reverse: 'Results from GeoNames' search_osm_nominatim: prefix_format: "%{name}" prefix: + aerialway: + chair_lift: "Chair Lift" + drag_lift: "Drag Lift" + station: "Aerialway Station" aeroway: aerodrome: "Aerodrome" apron: "Apron" @@ -539,6 +451,7 @@ en: shower: "Shower" social_centre: "Social Centre" social_club: "Social Club" + social_facility: "Social Facility" studio: "Studio" supermarket: "Supermarket" swimming_pool: "Swimming Pool" @@ -568,6 +481,9 @@ en: "yes": "Bridge" building: "yes": "Building" + emergency: + fire_hydrant: "Fire Hydrant" + phone: "Emergency Phone" highway: bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" @@ -589,6 +505,7 @@ en: platform: "Platform" primary: "Primary Road" primary_link: "Primary Road" + proposed: "Proposed Road" raceway: "Raceway" residential: "Residential" rest_area: "Rest Area" @@ -599,6 +516,7 @@ en: services: "Motorway Services" speed_camera: "Speed Camera" steps: "Steps" + street_lamp: "Street Lamp" stile: "Stile" tertiary: "Tertiary Road" tertiary_link: "Tertiary Road" @@ -615,6 +533,7 @@ en: building: "Building" castle: "Castle" church: "Church" + citywalls: "City Walls" fort: "Fort" house: "House" icon: "Icon" @@ -624,6 +543,7 @@ en: monument: "Monument" museum: "Museum" ruins: "Ruins" + tomb: "Tomb" tower: "Tower" wayside_cross: "Wayside Cross" wayside_shrine: "Wayside Shrine" @@ -691,6 +611,8 @@ en: airfield: "Military Airfield" barracks: "Barracks" bunker: "Bunker" + mountain_pass: + "yes" : "Mountain Pass" natural: bay: "Bay" beach: "Beach" @@ -760,6 +682,7 @@ en: locality: "Locality" moor: "Moor" municipality: "Municipality" + neighbourhood: "Neighbourhood" postcode: "Postcode" region: "Region" sea: "Sea" @@ -785,8 +708,10 @@ en: narrow_gauge: "Narrow Gauge Railway" platform: "Railway Platform" preserved: "Preserved Railway" + proposed: "Proposed Railway" spur: "Railway Spur" station: "Railway Station" + stop: "Railway Stop" subway: "Subway Station" subway_entrance: "Subway Entrance" switch: "Railway Points" @@ -802,9 +727,11 @@ en: beverages: "Beverages Shop" bicycle: "Bicycle Shop" books: "Book Shop" + boutique: "Boutique" butcher: "Butcher" car: "Car Shop" car_parts: "Car Parts" + car_repair: "Car Repair" carpet: "Carpet Shop" car_repair: "Car Repair" charity: "Charity Shop" @@ -815,6 +742,7 @@ en: convenience: "Convenience Store" copyshop: "Copy Shop" cosmetics: "Cosmetics Shop" + deli: "Deli" department_store: "Department Store" discount: "Discount Items Shop" doityourself: "Do-It-Yourself" @@ -851,17 +779,21 @@ en: organic: "Organic Food Shop" outdoor: "Outdoor Shop" pet: "Pet Shop" + pharmacy: "Pharmacy" photo: "Photo Shop" salon: "Salon" + second_hand: "Second-hand Shop" shoes: "Shoe Shop" shopping_centre: "Shopping Centre" sports: "Sports Shop" stationery: "Stationery Shop" supermarket: "Supermarket" + tailor: "Tailor" toys: "Toy Shop" travel_agency: "Travel Agency" video: "Video Shop" wine: "Off License" + "yes": "Shop" tourism: alpine_hut: "Alpine Hut" artwork: "Artwork" @@ -884,6 +816,7 @@ en: viewpoint: "Viewpoint" zoo: "Zoo" tunnel: + culvert: "Culvert" "yes": "Tunnel" waterway: artificial: "Artificial Waterway" @@ -907,17 +840,22 @@ en: waterfall: "Waterfall" water_point: "Water Point" weir: "Weir" + admin_levels: + level2: "Country Boundary" + level4: "State Boundary" + level5: "Region Boundary" + level6: "County Boundary" + level8: "City Boundary" + level9: "Village Boundary" + level10: "Suburb Boundary" description: title: - osm_namefinder: '%{types} from OpenStreetMap Namefinder' osm_nominatim: 'Location from OpenStreetMap Nominatim' geonames: 'Location from GeoNames' types: cities: Cities towns: Towns places: Places - description_osm_namefinder: - prefix: "%{distance} %{direction} of %{type}" results: no_results: "No results found" more_results: "More results" @@ -942,40 +880,27 @@ en: h1: OpenStreetMap logo: alt_text: OpenStreetMap logo - welcome_user: "Welcome, %{user_link}" - welcome_user_link_tooltip: Your user page - home: home - home_tooltip: Go to home location - inbox: "inbox (%{count})" - inbox_tooltip: - zero: Your inbox contains no unread messages - one: Your inbox contains 1 unread message - other: Your inbox contains %{count} unread messages - logout: logout - logout_tooltip: "Log out" - log_in: log in + home: Go to Home Location + logout: Log Out + log_in: Log In log_in_tooltip: Log in with an existing account - sign_up: sign up + sign_up: Sign Up + start_mapping: Start Mapping sign_up_tooltip: Create an account for editing - view: View - view_tooltip: View the map edit: Edit history: History export: Export - export_tooltip: Export map data + data: Data + export_data: Export Data gps_traces: GPS Traces gps_traces_tooltip: Manage GPS traces user_diaries: User Diaries user_diaries_tooltip: View user diaries edit_with: Edit with %{editor} tag_line: The Free Wiki World Map - intro_1: "OpenStreetMap is a free worldwide map, created by people like you." - intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map." + intro_header: Welcome to OpenStreetMap! + intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - intro_2_license: "open license" - intro_2_use: "use" - intro_2_download: "download" - intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap" partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}." partners_ucl: "the UCL VR Centre" partners_ic: "Imperial College London" @@ -985,30 +910,19 @@ en: osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." - donate_link_text: donating help: Help - help_centre: Help Centre - help_url: http://help.openstreetmap.org/ - help_title: Help site for the project - wiki: Wiki - wiki_url: http://wiki.openstreetmap.org/ - wiki_title: Wiki site for the project - documentation: Documentation - documentation_title: Documentation for the project - copyright: "Copyright & License" + about: About + copyright: Copyright community: Community community_blogs: "Community Blogs" community_blogs_title: "Blogs from members of the OpenStreetMap community" foundation: Foundation foundation_title: The OpenStreetMap Foundation - sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!' - license: - alt: CC BY-SA 2.0 - title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation - + learn_more: "Learn More" + more: More license_page: foreign: title: About this translation @@ -1019,130 +933,225 @@ en: text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping - legal_babble: | -

    Copyright and License

    -

    - OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). -

    -

    - You are free to copy, distribute, transmit and adapt our maps - and data, as long as you credit OpenStreetMap and its - contributors. If you alter or build upon our maps or data, you + legal_babble: + title_html: Copyright and License + intro_1_html: | + OpenStreetMap is open data, licensed under the Open Data + Commons Open Database License (ODbL). + intro_2_html: | + You are free to copy, distribute, transmit and adapt our data, + as long as you credit OpenStreetMap and its + contributors. If you alter or build upon our data, you may distribute the result only under the same licence. The - full legal + full legal code explains your rights and responsibilities. -

    - -

    How to credit OpenStreetMap

    -

    - If you are using OpenStreetMap map images, we request that - your credit reads at least “© OpenStreetMap - contributors, CC BY-SA”. If you are using map data only, - we request “Map data © OpenStreetMap contributors, - CC BY-SA”. -

    -

    - Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ - and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If - you are using a medium where links are not possible (e.g. a - printed work), we suggest you direct your readers to - www.openstreetmap.org (perhaps by expanding - ‘OpenStreetMap’ to this full address) and to - www.creativecommons.org. -

    - -

    Finding out more

    -

    - Read more about using our data at the Creative + Commons Attribution-ShareAlike 2.0 license (CC BY-SA). + credit_title_html: How to credit OpenStreetMap + credit_1_html: | + We require that you use the credit “© OpenStreetMap + contributors”. + credit_2_html: | + You must also make it clear that the data is available under the Open + Database License, and if using our map tiles, that the cartography is + licensed as CC BY-SA. You may do this by linking to + this copyright page. + Alternatively, and as a requirement if you are distributing OSM in a + data form, you can name and link directly to the license(s). In media + where links are not possible (e.g. printed works), we suggest you + direct your readers to openstreetmap.org (perhaps by expanding + 'OpenStreetMap' to this full address), to opendatacommons.org, and + if relevant, to creativecommons.org. + credit_3_html: | + For a browsable electronic map, the credit should appear in the corner of the map. + For example: + attribution_example: + alt: Example of how to attribute OpenStreetMap on a webpage + title: Attribution example + more_title_html: Finding out more + more_1_html: | + Read more about using our data, and how to credit us, at the Legal FAQ. -

    -

    - OSM contributors are reminded never to add data from any - copyrighted sources (e.g. Google Maps or printed maps) without - explicit permission from the copyright holders. -

    -

    + more_2_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. - See our API Usage Policy, Tile Usage Policy and Nominatim Usage Policy. -

    - -

    Our contributors

    -

    - Our CC BY-SA licence requires you to “give the Original - Author credit reasonable to the medium or means You are - utilising”. Individual OSM mappers do not request a - credit over and above that to “OpenStreetMap - contributors”, but where data from a national mapping - agency or other major source has been included in - OpenStreetMap, it may be reasonable to credit them by directly - reproducing their credit or by linking to it on this page. -

    - - - -
      -
    • Australia: Contains suburb data based - on Australian Bureau of Statistics data.
    • -
    • Austria: Contains data from - Stadt Wien (under - CC BY), - Land Vorarlberg and - Land Tirol (under CC-BY AT with amendments).
    • -
    • Canada: Contains data from - GeoBase®, GeoGratis (© Department of Natural - Resources Canada), CanVec (© Department of Natural - Resources Canada), and StatCan (Geography Division, - Statistics Canada).
    • -
    • France: Contains data sourced from - Direction Générale des Impôts.
    • -
    • Netherlands: Contains © AND data, 2007 - (www.and.com)
    • -
    • New Zealand: Contains data sourced from - Land Information New Zealand. Crown Copyright reserved.
    • -
    • Poland: Contains data from UMP-pcPL maps. Copyright - UMP-pcPL contributors. - - More about OSM's use of UMP data
    • -
    • South Africa: Contains data sourced from - Chief Directorate: - National Geo-Spatial Information, State copyright reserved.
    • -
    • United Kingdom: Contains Ordnance - Survey data © Crown copyright and database right - 2010.
    • -
    - -

    + contributors_title_html: Our contributors + contributors_intro_html: | + Our contributors are thousands of individuals. We also include + openly-licensed data from national mapping agencies + and other sources, among them: + contributors_at_html: | + Austria: Contains data from + Stadt Wien (under + CC BY), + Land Vorarlberg and + Land Tirol (under CC BY AT with amendments). + contributors_ca_html: | + Canada: Contains data from + GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), and StatCan (Geography Division, + Statistics Canada). + contributors_fi_html: | + Finland: Contains data from the + National Land Survey of Finland's Topographic Database + and other datasets, under the + NLSFI License. + contributors_fr_html: | + France: Contains data sourced from + Direction Générale des Impôts. + contributors_nl_html: | + Netherlands: Contains © AND data, 2007 + (www.and.com) + contributors_nz_html: | + New Zealand: Contains data sourced from + Land Information New Zealand. Crown Copyright reserved. + contributors_za_html: | + South Africa: Contains data sourced from + Chief Directorate: + National Geo-Spatial Information, State copyright reserved. + contributors_gb_html: | + United Kingdom: Contains Ordnance + Survey data © Crown copyright and database right + 2010-12. + contributors_footer_1_html: | For further details of these, and other sources that have been used to help improve OpenStreetMap, please see the Contributors page on the OpenStreetMap Wiki. -

    -

    + contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability. -

    + infringement_title_html: Copyright infringement + infringement_1_html: | + OSM contributors are reminded never to add data from any + copyrighted sources (e.g. Google Maps or printed maps) without + explicit permission from the copyright holders. + infringement_2_html: | + If you believe that copyrighted material has been inappropriately + added to the OpenStreetMap database or this site, please refer + to our takedown + procedure or file directly at our + on-line filing page. + welcome_page: + title: Welcome! + introduction_html: | + Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed + up, you're all set to get started mapping. Here's a quick guide with the most important + things you need to know. + whats_on_the_map: + title: What's on the Map + on_html: | + OpenStreetMap is a place for mapping things that are both real and current - + it includes millions of buildings, roads, and other details about places. You can map + whatever real-world features are interesting to you. + off_html: | + What it doesn't include is opinionated data like ratings, historical or + hypothetical features, and data from copyrighted sources. Unless you have special + permission, don't copy from online or paper maps. + basic_terms: + title: Basic Terms For Mapping + paragraph_1_html: | + OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy. + editor_html: | + An editor is a program or website you can use to edit the map. + node_html: | + A node is a point on the map, like a single restaurant or a tree. + way_html: | + A way is a line or area, like a road, stream, lake or building. + tag_html: | + A tag is a bit of data about a node or way, like a + restaurant's name or a road's speed limit. + questions: + title: Any questions? + paragraph_1_html: | + OpenStreetMap has several resources for learning about the project, asking and answering + questions, and collaboratively discussing and documenting mapping topics. + Get help here. + start_mapping: Start Mapping + add_a_note: + title: No Time To Edit? Add a Note! + paragraph_1_html: | + If you just want something small fixed and don't have the time to sign up and learn how to edit, it's + easy to add a note. + paragraph_2_html: | + Just go to the map and click the note icon: + . This will add a marker to the map, which you can move + by dragging. Add your message, then click save, and other mappers will investigate. + fixthemap: + title: Report a problem / Fix the map + how_to_help: + title: How to Help + join_the_community: + title: Join the community + explanation_html: | + If you have noticed a problem with our map data, for example a road is missing or your address, the best way to + proceed is to join the OpenStreetMap community and add or repair the data yourself. + add_a_note: + instructions_html: | + Just click or the same icon on the map display. + This will add a marker to the map, which you can move + by dragging. Add your message, then click save, and other mappers will investigate. + other_concerns: + title: Other concerns + explanation_html: | + If you have concerns about how our data is being used or about the contents please consult our + copyright page for more legal information, or contact the appropriate + OSMF working group. + help_page: + title: Getting Help + introduction: | + OpenStreetMap has several resources for learning about the project, asking and answering questions, + and collaboratively discussing and documenting mapping topics. + welcome: + url: /welcome + title: Welcome to OSM + description: Start with this quick guide covering the OpenStreetMap basics. + help: + url: https://help.openstreetmap.org/ + title: help.openstreetmap.org + description: Ask a question or look up answers on OSM's question-and-answer site. + wiki: + url: http://wiki.openstreetmap.org/ + title: wiki.openstreetmap.org + description: Browse the wiki for in-depth OSM documentation. + about_page: + next: Next + copyright_html: ©OpenStreetMap
    contributors + used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices" + lede_text: | + OpenStreetMap is built by a community of mappers that contribute and maintain data + about roads, trails, cafés, railway stations, and much more, all over the world. + local_knowledge_title: Local Knowledge + local_knowledge_html: | + OpenStreetMap emphasizes local knowledge. Contributors use + aerial imagery, GPS devices, and low-tech field maps to verify that OSM + is accurate and up to date. + community_driven_title: Community Driven + community_driven_html: | + OpenStreetMap's community is diverse, passionate, and growing every day. + Our contributors include enthusiast mappers, GIS professionals, engineers + running the OSM servers, humanitarians mapping disaster-affected areas, + and many more. + To learn more about the community, see the user diaries, + community blogs, and + the OSM Foundation website. + open_data_title: Open Data + open_data_html: | + OpenStreetMap is open data: you are free to use it for any purpose + as long as you credit OpenStreetMap and its contributors. If you alter or + build upon the data in certain ways, you may distribute the result only + under the same licence. See the Copyright and + License page for details. + partners_title: Partners notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1153,8 +1162,7 @@ en: subject_header: "[OpenStreetMap] %{subject}" hi: "Hi %{to_user}," header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" - footer1: "You can also read the message at %{readurl}" - footer2: "and you can reply at %{replyurl}" + footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}" friend_notification: subject: "[OpenStreetMap] %{user} added you as a friend" had_added_you: "%{user} has added you as a friend on OpenStreetMap." @@ -1176,46 +1184,16 @@ en: subject: "[OpenStreetMap] GPX Import success" loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points. signup_confirm: - subject: "[OpenStreetMap] Confirm your email address" - signup_confirm_plain: + subject: "[OpenStreetMap] Welcome to OpenStreetMap" greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - # next two translations run-on : please word wrap appropriately - click_the_link_1: "If this is you, welcome! Please click the link below to confirm your" - click_the_link_2: "account and read on for more information about OpenStreetMap." - introductory_video: "You can watch an introductory video to OpenStreetMap here:" - more_videos: "There are more videos here:" - the_wiki: "Get reading about OpenStreetMap on the wiki:" - the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide" - blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:" - opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:" - ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:" - wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" - wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page" - # next four translations are in pairs : please word wrap appropriately - user_wiki_1: "It is recommended that you create a user wiki page, which includes" - user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]." - current_user_1: "A list of current users in categories, based on where in the world" - current_user_2: "they are, is available from:" - signup_confirm_html: - greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap" - introductory_video: "You can watch an %{introductory_video_link}." - video_to_openstreetmap: "introductory video to OpenStreetMap" - more_videos: "There are %{more_videos_link}." - more_videos_here: "more videos here" - get_reading: Get reading about OpenStreetMap on the wiki, catch up with the latest news via the OpenStreetMap blog or Twitter, or browse through OpenStreetMap founder Steve Coast's OpenGeoData blog for the potted history of the project, which has podcasts to listen to also! - ask_questions: You can ask any questions you may have about OpenStreetMap at our question and answer site. - wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.' - user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].' - current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.' + created: "Someone (hopefully you) just created an account at %{site_url}." + confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:" + welcome: "After you confirm your account, we'll provide you with some additional information to get you started." email_confirm: subject: "[OpenStreetMap] Confirm your email address" email_confirm_plain: greeting: "Hi," - hopefully_you_1: "Someone (hopefully you) would like to change their email address over at" - hopefully_you_2: "%{server_url} to %{new_address}." + 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," @@ -1225,17 +1203,35 @@ en: subject: "[OpenStreetMap] Password reset request" lost_password_plain: greeting: "Hi," - hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this" - hopefully_you_2: "email addresses openstreetmap.org account." + 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 email 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," + commented: + subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes" + subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in" + your_note: "%{commenter} has left a comment on one of your map notes near %{place}." + commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}." + closed: + subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes" + subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in" + your_note: "%{commenter} has resolved one of your map notes near %{place}." + commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}." + reopened: + subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes" + subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in" + your_note: "%{commenter} has reactivated one of your map notes near %{place}." + commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}." + details: "More details about the note can be found at %{url}." message: inbox: title: "Inbox" - my_inbox: "My inbox" + my_inbox: "My Inbox" outbox: "outbox" messages: "You have %{new_messages} and %{old_messages}" new_messages: @@ -1284,16 +1280,13 @@ en: wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply." read: title: "Read message" - reading_your_messages: "Reading your messages" from: "From" subject: "Subject" date: "Date" reply_button: "Reply" unread_button: "Mark as unread" - back_to_inbox: "Back to inbox" - reading_your_sent_messages: "Reading your sent messages" + back: "Back" to: "To" - back_to_outbox: "Back to outbox" wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it." sent_message_summary: delete_button: "Delete" @@ -1308,11 +1301,10 @@ en: js_2: "OpenStreetMap uses JavaScript for its slippy map." permalink: Permalink shortlink: Shortlink + createnote: Add a note license: - notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors." - license_name: "Creative Commons Attribution-Share Alike 2.0" - license_url: "http://creativecommons.org/licenses/by-sa/2.0/" - project_name: "OpenStreetMap project" + copyright: "Copyright OpenStreetMap and contributors, under an open license" + license_url: "http://openstreetmap.org/copyright" project_url: "http://openstreetmap.org" remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: @@ -1326,19 +1318,23 @@ en: 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 http://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." sidebar: search_results: Search Results close: Close search: search: Search + get_directions: "Get directions" + get_directions_title: "Find directions between two points" + close_directions: "Close directions" + close_directions_title: "Close the directions panel" + from: "From" + to: "To" where_am_i: "Where am I?" where_am_i_title: Describe the current location using the search engine submit_text: "Go" - search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..." key: - map_key: "Map Key" - map_key_tooltip: "Key for the map" table: entry: motorway: "Motorway" @@ -1464,7 +1460,9 @@ en: upload_trace: "Upload a trace" see_all_traces: "See all traces" see_your_traces: "See your traces" - traces_waiting: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." + traces_waiting: + one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." + other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." trace_optionals: tags: "Tags" view: @@ -1487,9 +1485,9 @@ en: trace_not_found: "Trace not found!" visibility: "Visibility:" trace_paging_nav: - showing_page: "Showing page %{page}" - next: "Next »" - previous: "« Previous" + showing_page: "Page %{page}" + older: "Older Traces" + newer: "Newer Traces" trace: pending: "PENDING" count_points: "%{count} points" @@ -1510,7 +1508,9 @@ en: public_traces: "Public GPS traces" your_traces: "Your GPS traces" public_traces_from: "Public GPS traces from %{user}" + description: "Browse recent GPS track uploads" tagged_with: " tagged with %{tags}" + empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." delete: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -1520,6 +1520,13 @@ en: offline: heading: "GPX Storage Offline" message: "The GPX file storage and upload system is currently unavailable." + georss: + title: "OpenStreetMap GPS Traces" + description: + description_with_count: + one: "GPX file with %{count} point from %{user}" + other: "GPX file with %{count} points from %{user}" + description_without_count: "GPX file from %{user}" application: require_cookies: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." @@ -1530,6 +1537,7 @@ en: need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." oauth: oauthorize: + title: "Authorize access to your account" request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." allow_to: "Allow the client application to:" allow_read_prefs: "read your user preferences." @@ -1538,6 +1546,15 @@ en: allow_write_api: "modify the map." allow_read_gpx: "read your private GPS traces." allow_write_gpx: "upload GPS traces." + allow_write_notes: "modify notes." + oauthorize_success: + title: "Authorization request allowed" + allowed: "You have granted application %{app_name} access to your account." + verification: "The verification code is %{code}." + oauthorize_failure: + title: "Authorization request failed" + denied: "You have denied application %{app_name} access to your account." + invalid: "The authorization token is not valid." revoke: flash: "You've revoked the token for %{application}" oauth_clients: @@ -1554,7 +1571,7 @@ en: url: "Request Token URL:" access_url: "Access Token URL:" authorize_url: "Authorise URL:" - support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode." + support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures." edit: "Edit Details" delete: "Delete Client" confirm: "Are you sure?" @@ -1565,6 +1582,7 @@ en: 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." index: title: "My OAuth Details" my_tokens: "My Authorised Applications" @@ -1589,6 +1607,7 @@ en: 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." not_found: sorry: "Sorry, that %{type} could not be found." create: @@ -1609,7 +1628,7 @@ en: login_button: "Login" register now: Register now with username: "Already have an OpenStreetMap account? Please login with your username and password:" - with openid: "Alternatively please use your OpenID to login:" + with openid: "Alternatively, use OpenID to login:" new to osm: New to OpenStreetMap? to make changes: To make changes to the OpenStreetMap data, you must have an account. create account minute: Create an account. It only takes a minute. @@ -1617,8 +1636,6 @@ en: account not active: "Sorry, your account is not active yet.
    Please use the link in the account confirmation email to activate your account, or request a new confirmation email." account is suspended: Sorry, your account has been suspended due to suspicious activity.
    Please contact the webmaster if you wish to discuss this. auth failure: "Sorry, could not log in with those details." - notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)" - notice_terms: "OpenStreetMap is moving to a new licence on 1st April 2012. It's just as open as our current one, but the legal bits are much better suited to our map database. We'd love to keep your contributions in OpenStreetMap, but we can only do so if you agree to let us distribute them under the new licence. Otherwise, we'll have to remove them from the database.

    Please log in, then take a few seconds to review and accept the new terms. Thank you!" openid missing provider: "Sorry, could not contact your OpenID provider" openid invalid: "Sorry, your OpenID seems to be malformed" openid_logo_alt: "Log in with an OpenID" @@ -1662,11 +1679,15 @@ en: flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" new: - title: "Create account" - heading: "Create a User Account" + title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' - fill_form: "Fill in the form and we will send you a quick email to activate your account." + about: + header: Free and editable + html: | +

    Unlike other maps, OpenStreetMap is completely created by people like you, + and it's free for anyone to fix, update, download and use.

    +

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

    license_agreement: 'When you confirm your account you will need to agree to the contributor terms.' email address: "Email Address:" confirm email address: "Confirm Email Address:" @@ -1688,15 +1709,14 @@ en: with your OpenID in your user settings. - continue: Continue - flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

    If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." + continue: Sign Up terms accepted: "Thanks for accepting the new contributor terms!" terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: "Contributor terms" heading: "Contributor terms" - read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." + read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain @@ -1705,7 +1725,7 @@ en: declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." - legale_select: "Please select your country of residence:" + legale_select: "Country of residence:" legale_names: france: "France" italy: "Italy" @@ -1715,21 +1735,25 @@ en: heading: "The user %{user} does not exist" body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." view: - my diary: my diary + my diary: My Diary new diary entry: new diary entry - my edits: my edits - my traces: my traces - my settings: my settings - my comments: my comments + my edits: My Edits + my traces: My Traces + my notes: My Notes + my messages: My Messages + my profile: My Profile + my settings: My Settings + my comments: My Comments oauth settings: oauth settings - blocks on me: blocks on me - blocks by me: blocks by me - send message: send message - diary: diary - edits: edits - traces: traces - remove as friend: remove as friend - add as friend: add as friend + blocks on me: Blocks on Me + blocks by me: Blocks by Me + send message: Send Message + diary: Diary + edits: Edits + traces: Traces + notes: Map Notes + remove as friend: Unfriend + add as friend: Add Friend mapper since: "Mapper since:" ago: "(%{time_in_words_ago} ago)" ct status: "Contributor terms:" @@ -1743,7 +1767,7 @@ en: spam score: "Spam Score:" description: Description user location: User location - if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your %{settings_link} page." + if set location: "Set your home location on the %{settings_link} page to see nearby users." settings_link_text: settings your friends: Your friends no friends: You have not added any friends yet. @@ -1760,9 +1784,9 @@ en: revoke: administrator: "Revoke administrator access" moderator: "Revoke moderator access" - block_history: "view blocks received" - moderator_history: "view blocks given" - comments: "comments" + block_history: "blocks received" + moderator_history: "blocks given" + comments: "Comments" create_block: "block this user" activate_user: "activate this user" deactivate_user: "deactivate this user" @@ -1771,10 +1795,10 @@ en: unhide_user: "unhide this user" delete_user: "delete this user" confirm: "Confirm" - friends_changesets: "Browse all changesets by friends" - friends_diaries: "Browse all diary entries by friends" - nearby_changesets: "Browse all changesets by nearby users" - nearby_diaries: "Browse all diary entries by nearby users" + friends_changesets: "friends' changesets" + friends_diaries: "friends' diary entries" + nearby_changesets: "nearby user changesets" + nearby_diaries: "nearby user diary entries" popup: your location: "Your location" nearby mapper: "Nearby mapper" @@ -1811,6 +1835,10 @@ en: preferred languages: "Preferred Languages:" preferred editor: "Preferred Editor:" image: "Image:" + gravatar: + gravatar: "Use Gravatar" + link: "http://wiki.openstreetmap.org/wiki/Gravatar" + link text: "what is this?" new image: "Add an image" keep image: "Keep the current image" delete image: "Remove the current image" @@ -1827,14 +1855,16 @@ en: flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." flash update success: "User information updated successfully." confirm: - heading: Confirm a user account + heading: Check your email! + introduction_1: | + We sent you a confirmation email. + introduction_2: | + Confirm your account by clicking on the link in the email and you'll be able to start mapping. press confirm button: "Press the confirm button below to activate your account." button: Confirm - success: "Confirmed your account, thanks for signing up!" - before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below." already active: "This account has already been confirmed." - unknown token: "That token doesn't seem to exist." - reconfirm: "If it's been a while since you signed up you might need to send yourself a new confirmation email." + unknown token: "That confirmation code has expired or does not exist." + reconfirm_html: "If you need us to resend the confirmation email, click here." confirm_resend: success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

    If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." failure: "User %{name} not found." @@ -1849,10 +1879,14 @@ en: go_public: flash success: "All your edits are now public, and you are now allowed to edit." make_friend: - success: "%{name} is now your friend." + heading: "Add %{user} as a friend?" + button: "Add as friend" + success: "%{name} is now your friend!" failed: "Sorry, failed to add %{name} as a friend." already_a_friend: "You are already friends with %{name}." remove_friend: + heading: "Unfriend %{user}?" + button: "Unfriend" success: "%{name} was removed from your friends." not_a_friend: "%{name} is not one of your friends." filter: @@ -1861,8 +1895,8 @@ en: title: Users heading: Users showing: - one: Showing page %{page} (%{first_item} of %{items}) - other: Showing page %{page} (%{first_item}-%{last_item} of %{items}) + one: Page %{page} (%{first_item} of %{items}) + other: Page %{page} (%{first_item}-%{last_item} of %{items}) summary: "%{name} created from %{ip_address} on %{date}" summary_no_ip: "%{name} created on %{date}" confirm: Confirm Selected Users @@ -1961,6 +1995,9 @@ en: status: "Status" revoker_name: "Revoked by" not_revoked: "(not revoked)" + showing_page: "Page %{page}" + next: "Next »" + previous: "« Previous" helper: time_future: "Ends in %{time}." until_login: "Active until the user logs in." @@ -1987,22 +2024,135 @@ en: back: "View all blocks" revoker: "Revoker:" needs_view: "The user needs to log in before this block will be cleared." + note: + description: + opened_at_html: "Created %{when} ago" + opened_at_by_html: "Created %{when} ago by %{user}" + commented_at_html: "Updated %{when} ago" + commented_at_by_html: "Updated %{when} ago by %{user}" + closed_at_html: "Resolved %{when} ago" + closed_at_by_html: "Resolved %{when} ago by %{user}" + reopened_at_html: "Reactivated %{when} ago" + reopened_at_by_html: "Reactivated %{when} ago by %{user}" + rss: + title: "OpenStreetMap Notes" + description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" + description_item: "An rss feed for note %{id}" + opened: "new note (near %{place})" + commented: "new comment (near %{place})" + closed: "closed note (near %{place})" + reopened: "reactivated note (near %{place})" + entry: + comment: Comment + full: Full note + mine: + title: "Notes submitted or commented on by %{user}" + heading: "%{user}'s notes" + subheading: "Notes submitted or commented on by %{user}" + id: "Id" + creator: "Creator" + description: "Description" + created_at: "Created at" + last_changed: "Last changed" + ago_html: "%{when} ago" javascripts: + close: Close + share: + title: "Share" + cancel: "Cancel" + image: "Image" + link: "Link or HTML" + long_link: "Link" + short_link: "Short Link" + embed: "HTML" + custom_dimensions: "Set custom dimensions" + format: "Format:" + scale: "Scale:" + image_size: "Image will show standard layer at " + download: "Download" + short_url: "Short URL" + include_marker: "Include marker" + center_marker: "Center map on marker" + paste_html: "Paste HTML to embed in website" + view_larger_map: "View Larger Map" + key: + title: "Map Key" + tooltip: "Map Key" + tooltip_disabled: "Map Key available only for Standard layer" map: + zoom: + in: Zoom In + out: Zoom Out + locate: + title: Show My Location + popup: You are within {distance} {unit} of this point base: standard: Standard cycle_map: Cycle Map transport_map: Transport Map mapquest: MapQuest Open - overlays: - maplint: Maplint + hot: Humanitarian + layers: + header: Map Layers + notes: Map Notes + data: Map Data + overlays: Enable overlays for troubleshooting the map + title: "Layers" + copyright: "© OpenStreetMap contributors" + donate_link_text: "" site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map - edit_zoom_alert: You must zoom in to edit the map - history_tooltip: View edits for this area - history_disabled_tooltip: Zoom in to view edits for this area - history_zoom_alert: You must zoom in to view edits for this area + createnote_tooltip: Add a note to the map + createnote_disabled_tooltip: Zoom in to add a note to the map + map_notes_zoom_in_tooltip: Zoom in to see map notes + map_data_zoom_in_tooltip: Zoom in to see map data + notes: + new: + intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)" + add: Add Note + show: + anonymous_warning: This note includes comments from anonymous users which should be independently verified. + hide: Hide + resolve: Resolve + reactivate: Reactivate + comment_and_resolve: Comment & Resolve + comment: Comment + edit_help: Move the map and zoom in on a location you want to edit, then click here. + directions: + engines: + graphhopper_bicycle: "Bicycle (GraphHopper)" + graphhopper_foot: "Foot (GraphHopper)" + mapquest_bicycle: "Bicycle (MapQuest)" + mapquest_car: "Car (MapQuest)" + mapquest_foot: "Foot (MapQuest)" + osrm_car: "Car (OSRM)" + directions: "Directions" + distance: "Distance" + errors: + no_route: "Couldn't find a route between those two places." + no_place: "Sorry - couldn't find that place." + instructions: + continue_on: "Continue on " + slight_right: "Slight right onto " + turn_right: "Turn right onto " + sharp_right: "Sharp right onto " + uturn: "U-turn along " + sharp_left: "Sharp left onto " + turn_left: "Turn left onto " + slight_left: "Slight left onto " + via_point: "(via point) " + follow: "Follow " + roundabout: "At roundabout take " + leave_roundabout: "Leave roundabout - " + stay_roundabout: "Stay on roundabout - " + start: "Start at end of " + destination: "Reach destination" + against_oneway: "Go against one-way on " + end_oneway: "End of one-way on " + unnamed: "(unnamed)" + courtesy: "Directions courtesy of %{link}" + time: "Time" redaction: edit: description: "Description" diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 88d36c4a1d3..0d65d4a5856 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1,11 +1,18 @@ # Messages for Esperanto (Esperanto) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Airon90 # Author: Cfoucher +# Author: KuboF # Author: Lucas +# Author: Luckas # Author: LyzTyphone # Author: Michawiki +# Author: Objectivesea # Author: Petrus Adamus +# Author: Timsk +# Author: Tradukisto +# Author: Umbert' # Author: Yekrats eo: activerecord: @@ -40,16 +47,20 @@ eo: languages: Lingvoj pass_crypt: Pasvorto models: + acl: Listo de kontrolo de akiroj changeset: Ŝanĝaro changeset_tag: Etikedo de ŝanĝaro country: Lando diary_comment: Ĵurnala komento + diary_entry: Ĵurnala ero friend: Amiko language: Lingvo message: Mesaĝo node: Nodo - node_tag: Nodetikedo + node_tag: Etikedo de nodo + notifier: Atentigilo old_node: Malnova nodo + old_node_tag: Etikedo de malnova nodo old_relation: Malnova rilato old_way: Malnova vojo relation: Rilato @@ -67,7 +78,6 @@ eo: changeset: changeset: "Ŝanĝaro: %{id}" changesetxml: Ŝanĝaro XML - download: Elŝuti %{changeset_xml_link} aŭ %{osmchange_xml_link} feed: title: Ŝanĝaro %{id} title_comment: Ŝanĝaro %{id} - %{comment} @@ -92,6 +102,8 @@ eo: show_area_box: Montri la skatolon de la areo common_details: changeset_comment: "Komento:" + deleted_at: "Forigita je:" + deleted_by: "Forigita fare de:" edited_at: "Redaktita je:" edited_by: "Redaktita de:" in_changeset: "En ŝanĝaro:" @@ -101,36 +113,49 @@ eo: entry_role: Rilato %{relation_name} (kiel %{relation_role}) map: deleted: Forviŝita + edit: + area: Redakti areon + node: Redakti nodon + note: Redakti noton + relation: Redakti rilaton + way: Redakti vojon larger: area: Vidi la areon en pli granda mapo node: Vidi la nodon en pli granda mapo + note: Vidi la noton en pli granda mapo relation: Vidi la rilaton en pli granda mapo way: Vidi la vojon en pli granda mapo loading: Ŝarĝante... navigation: all: next_changeset_tooltip: Sekvanta ŝanĝaro + next_node_tooltip: Sekva nodo + next_note_tooltip: Sekva noto + next_relation_tooltip: Sekva rilato + next_way_tooltip: Sekva vojo prev_changeset_tooltip: Antaŭa ŝanĝaro + prev_node_tooltip: Antaŭa nodo + prev_note_tooltip: Antaŭa noto + prev_relation_tooltip: Antaŭa rilato + prev_way_tooltip: Antaŭa vojo user: name_changeset_tooltip: Vidi redaktojn el %{user} next_changeset_tooltip: Sekvanta redakto de %{user} prev_changeset_tooltip: Antaŭa redakto de %{user} node: - download: "%{download_xml_link}, %{view_history_link} au %{edit_link}" download_xml: Elŝuti XML - edit: redakti + edit: Redakti nodon node: Nodo node_title: "Nodo: %{node_name}" - view_history: vidi historion + view_history: Vidi historion node_details: coordinates: "Koordinatoj:" part_of: "Parto de:" node_history: - download: "%{download_xml_link} aŭ %{view_details_link}" download_xml: Elŝuti XML node_history: Historio de la nodo node_history_title: "Historio de la nodo: %{node_name}" - view_details: vidi detalojn + view_details: Vidi detalojn not_found: sorry: Bedaŭrinde, la %{type} kun id %{id}, ne troveblas. type: @@ -138,77 +163,90 @@ eo: node: nodo relation: rilato way: vojo + note: + at_by_html: antaŭ %{when} fare de %{user} + at_html: antaŭ %{when} + closed: "Fermita:" + comments: "Komentoj:" + description: "Priskribo:" + last_modified: Laste ŝanĝita + opened: "Malfermita:" + title: Noto paging_nav: of: de - showing_page: Montrante paĝon + showing_page: paĝo + redacted: + message_html: Ne eblas montri la version %{version} de tiu ĉi %{type} ĉar ĝi estas redaktita. Vidu %{redaction_link} por pli da detaloj. + redaction: Redakto %{id} + type: + node: nodo + relation: rilato + way: vojo relation: - download: "%{download_xml_link} aŭ %{view_history_link}" download_xml: Elŝuti XML relation: Rilato relation_title: "Rilato: %{relation_name}" - view_history: vidi historion + view_history: Vidi historion relation_details: members: "Anoj:" part_of: "Parto de:" relation_history: - download: "%{download_xml_link} aŭ %{view_details_link}" download_xml: Elŝuti XML relation_history: Historio de la rilato relation_history_title: "Historio de la rilato: %{relation_name}" - view_details: vidi detalojn + view_details: Vidi detalojn relation_member: entry_role: "%{type} %{name} kiel %{role}" type: node: Nodo relation: Rilato way: Vojo - start: - manually_select: Mane elekti alian areon - view_data: Vidi datumojn por la naŭa mapvidon start_rjs: data_frame_title: Datumo - data_layer_name: Datumo + data_layer_name: Foliumi mapajn datumojn details: Detaloj - drag_a_box: Desegnu skatolon sur la mapo por elekti areon - edited_by_user_at_timestamp: Redaktita de [[user]] je [[timestamp]] - history_for_feature: Historio por [[feature]] + edited_by_user_at_timestamp: Redaktita de %{user} je %{timestamp} + hide_areas: Kaŝi areojn + history_for_feature: Historio por %{feature} load_data: Elŝuti datumojn loading: Ŝarĝante... manually_select: Mane elektu alian areon object_list: api: Obteni tiun areon el la API - back: Vidigi objektliston + back: Reen al listo de objektoj details: Detaloj heading: Objektlisto history: type: - node: Nodo [[id]] - way: Vojo [[id]] + node: Nodo %{id} + way: Vojo %{id} selected: type: - node: Nodo [[id]] - way: Vojo [[id]] + node: Nodo %{id} + way: Vojo %{id} type: node: Nodo way: Vojo private_user: privata uzanto + show_areas: Montri areojn show_history: Montri Historion - unable_to_load_size: "Ne ŝarĝeblas: limskatolo kun dimensio de [[bbox_size]] estas tro granda (devas esti malgranda ol %{max_bbox_size})" + unable_to_load_size: "Ne ŝarĝeblas: limskatolo kun dimensio de %{bbox_size} estas tro granda (devas esti malgranda ol %{max_bbox_size})" wait: Atendu... zoom_or_select: Zomu aŭ elektu videndan mapareon tag_details: tags: "Etikedoj:" + wikipedia_link: La artikolo %{page} en Vikipedio timeout: + sorry: Bedaŭrinde, la datumoj por la %{type} kun la identigilo %{id} alvenis tro malrapide. type: changeset: ŝanĝaro node: nodo relation: rilato way: vojo way: - download: "%{download_xml_link}, %{view_history_link} aŭ %{edit_link}" download_xml: Elŝuti XML - edit: redakti - view_history: vidi historion + edit: Redakti vojon + view_history: Vidi historion way: Vojo way_title: "Vojo: %{way_name}" way_details: @@ -218,9 +256,8 @@ eo: nodes: "Nodoj:" part_of: "Parto de:" way_history: - download: "%{download_xml_link} aŭ %{view_details_link}" download_xml: Elŝuti XML - view_details: vidi detalojn + view_details: Vidi detalojn way_history: Historio de vojo way_history_title: Historio de vojo changeset: @@ -233,7 +270,7 @@ eo: changeset_paging_nav: next: Sekvanta » previous: « Antaŭa - showing_page: Montrante paĝon + showing_page: Paĝo %{page} changesets: area: Areo comment: Komento @@ -241,15 +278,33 @@ eo: saved_at: Konservita la user: Uzanto list: - description: Ĵusaj ŝanĝoj + description: Foliumi lastajn ŝanĝojn en la mapo + description_bbox: Ŝanĝaroj en %{bbox} + description_friend: Ŝanĝaroj de viaj amikoj + description_nearby: Ŝanĝaroj de proksimaj uzuloj + description_user: Ŝanĝaroj de %{user} + description_user_bbox: Ŝanĝaroj de %{user} ene de %{bbox} + empty_anon_html: Ankoraŭ ne estis redaktoj. + empty_user_html: Ŝajne vi ankoraŭ ne redaktis. Por komenci bonvolu konsulti la konsilojn por komencantoj. + heading: Ŝanĝaroj + heading_bbox: Ŝanĝaroj + heading_friend: Ŝanĝaroj + heading_nearby: Ŝanĝaroj + heading_user: Ŝanĝaroj + heading_user_bbox: Ŝanĝaroj + title_friend: Ŝanĝaroj de viaj amikoj + title_nearby: Ŝanĝaroj de proksimaj uzuloj + timeout: + sorry: Pardonu; daŭris tro longe kompili la petitan liston de ŝanĝaroj. diary_entry: diary_comment: confirm: Konfirmi hide_link: Kaši ĉi tiun komenton diary_entry: comment_count: - one: 1 komento + one: "%{count} komento" other: "%{count} komentoj" + zero: Sen komentoj confirm: Konfirmi edit_link: Redakti ĉi tiun enskribon edit: @@ -263,12 +318,25 @@ eo: newer_entries: Pli novaj enskriboj older_entries: Pli malnovaj enskriboj title: Uzantĵurnaloj + title_friends: Taglibroj de amikoj user_title: Ĵurnalo de %{user} + new: + title: Nova taglibra ero view: + leave_a_comment: Komenti login: Ensaluti save_button: Konservi title: Uzantĵurnaloj | %{user} user_title: Ĵurnalo de %{user} + editor: + potlatch: + description: Potlatch 1 (redaktilo en TTT-legilo) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (redaktilo en TTT-legilo) + name: Potlatch 2 + remote: + name: Teleregilo export: start: add_marker: Aldoni markon al la mapo @@ -293,19 +361,15 @@ eo: click_add_marker: Kliku al la mapo por aldoni markon export: Eksporti manually_select: Mane elekti alian aeron. - view_larger_map: Vidi pligrandan mapon geocoder: description: title: geonames: Loko el GeoNames - osm_namefinder: "%{types} el OpenStreetMap Namefinder" osm_nominatim: Loko el OpenStreetMap Nominatim types: cities: Grandurboj places: Lokoj towns: Urboj - description_osm_namefinder: - prefix: "%{distance} %{direction} de %{type}" direction: east: oriento north: nordo @@ -326,37 +390,108 @@ eo: ca_postcode: Rezultoj el Geocoder.CA geonames: Rezultoj el GeoNames latlon: Rezultoj el Internal - osm_namefinder: Rezultoj el OpenStreetMap Namefinder osm_nominatim: Rezultoj el OpenStreetMap Nominatim uk_postcode: Rezultoj el NPEMap / FreeThe Postcode us_postcode: Rezultoj el Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} %{direction} de %{placename}" + search_osm_nominatim: + prefix: + amenity: + bank: Banko + bar: Bufedo + bus_station: Bus-stacio + cafe: Kafejo + car_rental: Aŭtomobil-pruntejo + car_wash: Aŭtopurigejo + casino: Kazino + cinema: Kinejo + clinic: Kliniko + club: Klubo + dentist: Dentisto + embassy: Ambasadorejo + fountain: Fontano + hospital: Hostpitalo + hotel: Hotelo + library: Libraro + market: Bazaro + nightclub: Nokta klubo + park: Parko + pharmacy: Apoteko + police: Polico + prison: Malliberejo + restaurant: Restoracio + school: Lernejo + shop: Vendejo + supermarket: Superbazaro + telephone: Publika telefono + theatre: Teatro + university: Universitato + wifi: WiFi-atingo + boundary: + national_park: Nacia parko + bridge: + aqueduct: Akvedukto + viaduct: Viadukto + "yes": Ponto + building: + "yes": Konstruaĵo + highway: + bus_stop: Bus-haltejo + path: Vojo + primary_link: Strato de unua ordo + road: Vojo + historic: + house: Domo + monument: Monumento + museum: Muzeo + tower: Turo + landuse: + mine: Minejo + park: Parko + railway: Fervojo + wood: Arbaro + natural: + fjord: Fjordo + forest: Arbaro + hill: Monteto + island: Insulo + land: Lando + river: Rivero + tree: Arbo + volcano: Vulkano + water: Akvo + place: + city: Urbego + country: Lando + farm: Farmobieno + house: Domo + houses: Domoj + region: Regiono + sea: Maro + state: Ŝtato + town: Urbo + railway: + tram: Tramlinio + tram_stop: Tram-haltejo + shop: + books: Libro-vendejo + computer: Komputil-vendejo + hifi: Hi-Fi + music: Muzik-vendejo + tourism: + museum: Muzeo layouts: donate: Subtenu OpenStreetMap %{link} al Fonduso de Ĝisdatigo de Aparataro. donate_link_text: donacante edit: Redakti - export: Eksporti - export_tooltip: Eksporti mapajn datumojn gps_traces: GPS spuroj - gps_traces_tooltip: Manipuli spurojn + gps_traces_tooltip: Manipuli la GPS-spurojn history: Historio home: hejmo - home_tooltip: Iri al hejmloko - inbox: leterkesto (%{count}) - inbox_tooltip: - one: Via leterkesto enhavas 1 nelegitan mesaĝon - other: Via leterkesto enhavas %{count} nelegitajn mesaĝojn - zero: Via leterkesto ne enhavas nelegitajn mesaĝojn - license: - title: Datenoj de OpenStreetMap estas disponeblaj laŭ la permesilo Krea Komunaĵo Atribuite-Samkondiĉe 2.0 Ĝenerala log_in: ensaluti log_in_tooltip: Ensaluti kun ekzistanta konto logo: alt_text: Emblemo de OpenStreetMap logout: elsaluti - logout_tooltip: Elsaluti make_a_donation: text: Donaci title: Subteni OpenStreetMap per mondonaco @@ -366,14 +501,16 @@ eo: user_diaries: Uzantĵurnaloj user_diaries_tooltip: Vidi uzantĵurnalojn view: Vidi - view_tooltip: Vidi mapojn - welcome_user: Bonvenon, %{user_link} - welcome_user_link_tooltip: Via uzantpaĝo + view_tooltip: Vidi la mapon + license_page: + foreign: + title: Pri ĉi tiu traduko message: delete: deleted: Mesaĝo forigita inbox: date: Dato + from: De my_inbox: Mia leterkesto title: Alvenkesto mark: @@ -394,17 +531,21 @@ eo: date: Dato inbox: Alvenkesto my_inbox: Mia %{inbox_link} + subject: Temo + to: Al read: - back_to_inbox: Reen al mesaĝejo date: Dato - reading_your_messages: Legante viajn mesaĝojn - reading_your_sent_messages: Legante viajn senditajn mesaĝojn + from: De reply_button: Respondi + subject: Temo title: Legi mesaĝon to: Al unread_button: Marki kiel nelegita sent_message_summary: delete_button: Forigi + note: + mine: + description: Priskribo notifier: diary_comment_notification: hi: Saluton %{to_user}, @@ -425,12 +566,6 @@ eo: greeting: Saluton, message_notification: hi: Saluton %{to_user}, - signup_confirm_html: - introductory_video: Vipovas spekti %{introductory_video_link}. - more_videos_here: pliaj filmetoj ĉi tie - video_to_openstreetmap: enkondukan videon de OpenStreetMap - signup_confirm_plain: - more_videos: "Pliaj videoj estas ĉi tie:" oauth_clients: edit: submit: Redakti @@ -451,15 +586,17 @@ eo: show: edit: Redakti detalojn title: OAuth-detaloj por %{app_name} + redaction: + edit: + description: Priskribo + new: + description: Priskribo + show: + description: "Priskribo:" site: edit: user_page_link: uzantpaĝo - index: - license: - license_name: Creative Commons Atribuite-Samkondiĉe 2.0 - project_name: projekto OpenStreetMap key: - map_key: Klarigo de signoj table: entry: admin: Administra limo @@ -506,6 +643,9 @@ eo: - tramo - tramo wood: Arbaro + markdown_help: + image: Bildo + text: Teksto search: search: Serĉi search_help: "ekzemploj: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ' aŭ 'poŝtoficejoj proksime de Lünen' pliaj ekzemploj..." @@ -514,6 +654,9 @@ eo: sidebar: close: Fermi search_results: Serĉrezultoj + time: + formats: + friendly: "%e %B %Y je %H:%M" trace: create: trace_uploaded: Via GPX dosiero estis alŝutita kaj atendas enkonduko en la datumbason. Tiu ĝenerale okazas antaŭ duonhoro, kaj retletero estos sendita al vi je finaĵo. @@ -559,13 +702,13 @@ eo: trace_details: Vidi detalojn de spuro view_map: Vidi Mapon trace_form: - description: Priskribo + description: "Priskribo:" help: Helpo - tags: Etikedoj + tags: "Etikedoj:" tags_help: dislimataj de komoj upload_button: Alŝuti - upload_gpx: Alŝuti GPX dosieron - visibility: Videbleco + upload_gpx: "Alŝuti GPX dosieron:" + visibility: "Videbleco:" visibility_help: Kion tio signifas ? trace_header: see_all_traces: Vidi ĉiujn spurojn @@ -627,7 +770,6 @@ eo: button: Konfirmi heading: Konfirmi uzantan konton press confirm button: Premu la konfirmbutonon sube por aktivigi vian konton. - success: Via konto estas konfirmita, multan dankon por vi registrado! confirm_email: button: Konfirmi failure: Retadreso jam estis konfirmita per tiu ĵetono. @@ -662,8 +804,6 @@ eo: continue: Pli... display name: "Montrita Nomo:" email address: "Retpoŝtadreso:" - fill_form: Plenigu la formularon kaj ni tuj sendos al vi retleteron, por ke vi aktivigu vian konton. - heading: Krei uzantkonton no_auto_account_create: Bedaŭrinde ni nun ne povas aŭtomate krei konton por vi. password: "Pasvorto:" title: Krei konton @@ -708,10 +848,10 @@ eo: my edits: miaj redaktoj my settings: miaj agordoj my traces: miaj spuroj - nearby users: "Proksimaj uzantoj:" + nearby users: "Pliaj proksimaj uzantoj:" new diary entry: nova ĵurnalrikordo no friends: Vi jam ne aldonis neniun amikon. - remove as friend: forviŝu kiel amiko + remove as friend: eksamikigi role: administrator: Ĉi tiu uzanto estas administranto moderator: Ĉi tiu uzanto estas kontrolanto diff --git a/config/locales/es.yml b/config/locales/es.yml index 13a59c4f864..eda489cb50c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,20 +3,43 @@ # Export driver: syck-pecl # Author: Armando-Martin # Author: Crazymadlover +# Author: Fitoschido +# Author: Fortega +# Author: Guillembb +# Author: Hereñu # Author: Invadinado # Author: Johnarupire # Author: Jynus +# Author: Larjona # Author: Locos epraix # Author: McDutchie # Author: Mor +# Author: Nemo bis +# Author: Nunte +# Author: Ovruni # Author: PerroVerd # Author: Peter17 +# Author: Remux +# Author: Rubenwap +# Author: Sim6 # Author: Toliño # Author: Translationista # Author: VegaDark # Author: Vivaelcelta # Author: Xuacu es: + about_page: + community_driven_html: "La comunidad de OpenStreetMap es diversa, apasionada, y crece cada día. Nuestros colaboradores incluyen a mapeadores entusiastas, profesionales de GIS, ingenieros que ejecutan los servidores de OSM, mapeadores humanitarios de zonas afectadas por desastres, y muchos más.\nPara aprender más acerca de la comunidad, consulte los diarios de usuario, blogs de la comunidad, y el sitio web de la Fundación de OSM." + community_driven_title: Impulsado por la comunidad + copyright_html: ©Colaboradores de
    OpenStreetMap + lede_text: "OpenStreetMap es construido por una comunidad de creadores de mapas que contribuyen y mantienen los datos\nacerca de caminos, senderos, cafeterías, estaciones de ferrocarril, y mucho más, en todo el mundo." + local_knowledge_html: OpenStreetMap enfatiza el conocimiento local. Los colaboradores utilizan imágenes aéreas, dispositivos GPS, y mapas de campo de baja tecnología para verificar que OSM es preciso y está actualizado. + local_knowledge_title: Conocimiento local + next: Siguiente + open_data_html: "OpenStreetMap es open data: usted es libre de utilizarlo para cualquier propósito, siempre y cuando se le dé crédito a OpenStreetMap y sus colaboradores. Si altera o construye sobre los datos de ciertas maneras, deberá distribuir el resultado sólo bajo la misma licencia. Consulte la página de Derechos de autor y Licencia para obtener más detalles." + open_data_title: Datos abiertos + partners_title: Socios + used_by: "%{name} potencia con datos de mapa a cientos de sitios web, aplicaciones móviles, y dispositivos de hardware" activerecord: attributes: diary_comment: @@ -25,7 +48,7 @@ es: language: Idioma latitude: Latitud longitude: Longitud - title: Título + title: Asunto user: Usuario friend: friend: Amigo @@ -34,7 +57,7 @@ es: body: Cuerpo recipient: Destinatario sender: Remitente - title: Título + title: Asunto trace: description: Descripción latitude: Latitud @@ -47,8 +70,8 @@ es: user: active: Activo description: Descripción - display_name: Nombre en pantalla - email: Correo + display_name: Nombre para mostrar + email: Correo electrónico languages: Idiomas pass_crypt: Contraseña models: @@ -56,7 +79,7 @@ es: changeset: Conjunto de cambios changeset_tag: Etiqueta del conjunto de cambios country: País - diary_comment: Comentario al diario + diary_comment: Comentario de diario diary_entry: Entrada del diario friend: Amigo language: Idioma @@ -81,10 +104,10 @@ es: tracetag: Etiqueta de la traza user: Usuario user_preference: Preferencias de usuario - user_token: Token del usuario + user_token: Pase de usuario way: Vía way_node: Nodo de la vía - way_tag: Etiqueta de ví­a + way_tag: Etiqueta de la ví­a application: require_cookies: cookies_needed: Parece que tienes las cookies deshabilitadas. Por favor, habilita las cookies en tu navegador antes de continuar. @@ -94,94 +117,62 @@ es: blocked: Su acceso a la API ha sido bloqueado. Por favor, inicie sesión en la interfaz web para obtener más información. need_to_see_terms: Su acceso a la API está temporalmente suspendido. Por favor, accede a la web para ver los Términos de Contribución. No es necesario aceptar, pero debes conocerlos. browse: + anonymous: anónimo changeset: - changeset: Conjunto de cambios %{id} + belongs_to: Autor changesetxml: XML del conjunto de cambios - download: Descargar %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Conjunto de cambios %{id} title_comment: Conjunto de cambios %{id} - %{comment} + node: Nodos (%{count}) + node_paginated: Nodos (%{x}-%{y} de %{count}) osmchangexml: XML en formato osmChange - title: Conjunto de cambios - changeset_details: - belongs_to: "Pertenece a:" - bounding_box: "Envoltura:" - box: Caja - closed_at: "Cerrado el:" - created_at: "Creado el:" - has_nodes: - one: "Tiene el siguiente %{count} nodo:" - other: "Tiene los siguientes %{count} nodos:" - has_relations: - one: "Tiene la siguiente %{count} relación:" - other: "Tiene las siguientes %{count} relaciones:" - has_ways: "Tiene %{count} vías:" - no_bounding_box: No se ha guardado una envoltura para este conjunto de cambios - show_area_box: Mostrar caja del área - common_details: - changeset_comment: "Comentario:" - deleted_at: "Borrado el:" - deleted_by: "Borrado por:" - edited_at: "Editado el:" - edited_by: "Editado por:" - in_changeset: "En el conjunto de cambios:" - version: "Versión:" + relation: Relaciones (%{count}) + relation_paginated: Relaciones (%{x}-%{y} de %{count}) + title: "Conjunto de cambios: %{id}" + way: Vías (%{count}) + way_paginated: Vías (%{x}-%{y} de %{count}) + closed: Cerrado + closed_by_html: Cerrado hace %{time} por %{user} + closed_html: Cerrado hace %{time} containing_relation: entry: Relación %{relation_name} entry_role: Relación %{relation_name} (como %{relation_role}) - map: - deleted: Borrado - edit: - area: Editar área - node: Editar nodo - relation: Editar relación - way: Editar vía - larger: - area: Ver área en un mapa más grande - node: Ver el nodo en un mapa más grande - relation: Ver la relación en un mapa más grande - way: Ver la vía en un mapa más grande - loading: Cargando... - navigation: - all: - next_changeset_tooltip: Siguiente conjunto de cambios - next_node_tooltip: Siguiente nodo - next_relation_tooltip: Siguiente relación - next_way_tooltip: Siguiente vía - prev_changeset_tooltip: Conjunto de cambios anterior - prev_node_tooltip: Nodo anterior - prev_relation_tooltip: Relación anterior - prev_way_tooltip: Vía anterior - user: - name_changeset_tooltip: Ver ediciones hechas por %{user} - next_changeset_tooltip: Siguiente edición hecha por %{user} - prev_changeset_tooltip: Edición previa hecha por %{user} + created: Creado + created_by_html: Creado hace %{time} por %{user} + created_html: Creado hace %{time} + deleted_by_html: Eliminado hace %{time} por %{user} + download_xml: Descargar XML + edited_by_html: Editado hace %{time} por %{user} + in_changeset: Conjunto de cambios + location: "Ubicación:" + no_comment: (sin comentarios) node: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Descargar XML - edit: editar - node: Nodo - node_title: "Nodo: %{node_name}" - view_history: ver el historial - node_details: - coordinates: "Coordenadas:" - part_of: "Parte de:" - node_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Descargar XML - node_history: Historial del nodo - node_history_title: "Historial del nodo: %{node_name}" - view_details: ver detalles + history_title: "Historial de nodo: %{name}" + title: "Nodo: %{name}" not_found: - sorry: Lo sentimos, %{type} con ID %{id} no fue encontrado + sorry: "Lo sentimos, %{type} #%{id} no se pudo encontrar." type: - changeset: conjunto de cambios + changeset: el conjunto de cambios node: el nodo relation: la relación way: la vía - paging_nav: - of: de - showing_page: Mostrando página + note: + closed_by: Resuelto por %{user} %{when} atrás + closed_by_anonymous: Resuelto por anónimo %{when} atrás + closed_title: "Nota resuelta #%{note_name}" + commented_by: Comentario de %{user} %{when} atrás + commented_by_anonymous: Comentario de anónimo %{when} atrás + hidden_by: Oculto por %{user} %{when} atrás + hidden_title: "Nota oculta #%{note_name}" + new_note: Nueva nota + open_by: Creado por %{user} hace %{when} + open_by_anonymous: Creado por un anónimo hace %{when} + open_title: "Nota sin resolver #%{note_name}" + reopened_by: Reactivado por %{user} %{when} atrás + reopened_by_anonymous: Reactivado por anónimo %{when} atrás + title: "Nota: %{id}" + part_of: Parte de redacted: 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. redaction: Redacción %{id} @@ -190,135 +181,71 @@ es: relation: relación way: vía relation: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Descargar XML - relation: Relación - relation_title: "Relación %{relation_name}:" - view_history: ver el historial - relation_details: - members: "Miembros:" - part_of: "Parte de:" - relation_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Descargar XML - relation_history: Historial de la relación - relation_history_title: "Historial de la relación %{relation_name}:" - view_details: ver detalles + history_title: "Historial de relación: %{name}" + members: Miembros + title: "Relación: %{name}" relation_member: entry_role: "%{type} %{name} como %{role}" type: node: Nodo relation: Relación way: Vía - start: - manually_select: Seleccionar manualmente un área diferente - view_data: Ver datos para el encuadre actual start_rjs: - data_frame_title: Datos - data_layer_name: Examinar datos del mapa - details: Detalles - drag_a_box: Arrastre en el mapa para dibujar un área de encuadre - edited_by_user_at_timestamp: Editado por [[user]] el [[timestamp]] - hide_areas: Ocultar áreas - history_for_feature: Historial de [[feature]] + feature_warning: Cargando %{num_features} características, que pueden hacer su navegador lento o que no responda. ¿Está seguro de que desea mostrar estos datos? load_data: Cargar datos - loaded_an_area_with_num_features: Ha cargado un área que contiene [[num_features]] objetos. Por lo general, algunos navegadores web no aguantan bien el mostrar esta candidad de información vectorial. Generalmente, el funcionamiento óptimo se da cuando se muestran menos de 100 objetos al mismo tiempo; de otra manera, su navegador puede volverse lento o no responder. Si está seguro de que quiere mostrar todos estos datos, puede hacerlo pulsando el botón que aparece debajo. loading: Cargando... - manually_select: Seleccionar manualmente un área diferente - object_list: - api: Descargar esta área a través de la API - back: Mostrar lista de objetos - details: Detalles - heading: Lista de objetos - history: - type: - node: Nodo [[id]] - way: Vía [[id]] - selected: - type: - node: Nodo [[id]] - way: Ví­a [[id]] - type: - node: Nodo - way: Vía - private_user: usuario privado - show_areas: Mostrar áreas - show_history: Mostrar historial - unable_to_load_size: "Imposible cargar: El tamaño de la envoltura ([[bbox_size]] es demasiado grande (debe ser menor que %{max_bbox_size})" - wait: Espere... - zoom_or_select: Para ver los datos, haga más zoom o seleccione un área del mapa tag_details: - tags: "Etiquetas:" + tags: Etiquetas wiki_link: key: La página en el wiki con la descripción de la etiqueta %{key} tag: La página en el wiki con la descripción de la etiqueta %{key}=%{value} wikipedia_link: El artículo %{page} en Wikipedia timeout: - sorry: Lo sentimos, los datos para el %{type} con el identificador %{id} han tomado demasiado tiempo para obtenerse. + sorry: Lo sentimos, los datos para %{type} con el identificador %{id} han tardado demasiado tiempo en obtenerse. type: - changeset: conjunto de cambios - node: nodo - relation: relación - way: vía + changeset: el conjunto de cambios + node: el nodo + relation: la relación + way: la vía + version: Versión + view_details: Ver detalles + view_history: Ver historial way: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Descargar XML - edit: editar - view_history: ver el historial - way: Vía - way_title: "Vía %{way_name}:" - way_details: also_part_of: - one: también parte de la ví­a %{related_ways} - other: también parte de las ví­as %{related_ways} - nodes: "Nodos:" - part_of: "Parte de:" - way_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Descargar XML - view_details: ver detalles - way_history: Historial de la vía - way_history_title: "Historial del camino %{way_name}:" + one: parte de vía %{related_ways} + other: parte de vías %{related_ways} + history_title: "Historial de vía: %{name}" + nodes: Nodos + title: "Vía: %{name}" changeset: changeset: anonymous: Anónimo - big_area: (grande) - no_comment: (ninguno) no_edits: (sin ediciones) - show_area_box: mostrar caja - still_editing: (todavía en edición) view_changeset_details: Ver detalles del conjunto de cambios changeset_paging_nav: next: Siguiente » previous: « Anterior - showing_page: Mostrando página %{page} + showing_page: Página %{page} changesets: area: Área comment: Comentario - id: ID + id: Id. saved_at: Guardado en user: Usuario list: - description: Cambios recientes - description_bbox: Conjunto de cambios dentro de %{bbox} - description_friend: Conjuntos de cambios realizados por vuestros amigos - description_nearby: Conjuntos de cambios realizados por usuarios cercanos - description_user: Conjunto de cambios por %{user} - description_user_bbox: Conjunto de cambios por %{user} dentro de %{bbox} - heading: Conjuntos de cambios - heading_bbox: Conjuntos de cambios - heading_friend: Conjuntos de cambios - heading_nearby: Conjuntos de cambios - heading_user: Conjuntos de cambios - heading_user_bbox: Conjuntos de cambios + empty: No hay conjuntos de cambios encontrados. + empty_area: No hay conjuntos de cambios en esta área. + empty_user: No hay conjuntos de cambios por este usuario. + load_more: Cargar más + no_more: No hay más conjuntos de cambios encontrados. + no_more_area: No hay más conjuntos de cambios en esta área. + no_more_user: No hay más conjuntos de cambios por este usuario. title: Conjuntos de cambios - title_bbox: Conjunto de cambios dentro de %{bbox} - title_friend: Conjuntos de cambios realizados por vuestros amigos + title_friend: Conjuntos de cambios realizados por tus amigos title_nearby: Conjuntos de cambios realizados por usuarios cercanos title_user: Conjunto de cambios por %{user} - title_user_bbox: Conjunto de cambios por %{user} dentro de %{bbox} timeout: - sorry: Lo sentimos, la lista del conjunto de cambios que has solicitado ha tardado mucho tiempo en recuperarse. + sorry: Lo sentimos, la lista de conjuntos de cambios que has solicitado ha tardado mucho tiempo en recuperarse. diary_entry: comments: ago: hace %{ago} @@ -336,12 +263,13 @@ es: comment_count: one: 1 comentario other: "%{count} comentarios" + zero: Sin comentarios comment_link: Comentar esta entrada confirm: Confirmar - edit_link: Editar entrada + edit_link: Editar esta entrada hide_link: Ocultar esta entrada - posted_by: Posteado por %{link_user} el %{created} en %{language_link} - reply_link: Responder a la entrada + posted_by: Publicado por %{link_user} el %{created} en %{language_link} + reply_link: Responder a esta entrada edit: body: "Cuerpo:" language: "Idioma:" @@ -352,7 +280,7 @@ es: save_button: Guardar subject: "Asunto:" title: Editar entrada del diario - use_map_link: Usar mapa + use_map_link: usar mapa feed: all: description: Entradas recientes en los diarios de los usuarios de OpenStreetMap @@ -370,7 +298,7 @@ es: newer_entries: Entradas más modernas no_entries: No hay entradas en el diario older_entries: Entradas más antiguas - recent_entries: "Entradas recientes en el diario:" + recent_entries: Entradas recientes en el diario title: Diarios de usuarios title_friends: Diarios de amigos title_nearby: Diarios de usuarios cercanos @@ -383,7 +311,7 @@ es: title: Nueva entrada en el diario no_such_entry: body: Lo sentimos, no hay ninguna entrada del diario para la ID %{id}. Por favor, comprueba que la dirección esté correctamente escrita. - heading: No hay entrada con la ID %{id} + heading: "No hay entrada con la id: %{id}" title: No existe esa entrada de diario view: leave_a_comment: Dejar un comentario @@ -393,7 +321,10 @@ es: title: Diario de %{user} | %{title} user_title: Diario de %{user} editor: - default: Por defecto (en la actualidad %{name}) + default: Predeterminado (actualmente %{name}) + id: + description: iD (editor en el navegador) + name: iD potlatch: description: Potlatch 1 (editor en el navegador) name: Potlatch 1 @@ -405,49 +336,66 @@ es: name: Control remoto export: start: - add_marker: Añadir chincheta en el mapa + add_marker: Añadir un marcador al mapa area_to_export: Área a exportar - embeddable_html: HTML para pegar + embeddable_html: HTML integrable export_button: Exportar - export_details: Los datos de OpenStreetMap se encuentran bajo una licencia Creative Commons Reconocimiento- Compartir bajo la misma licencia 2.0. + export_details: Los datos de OpenStreetMap se encuentran bajo la licencia Open Database (ODbL) de Open Data Commons. format: Formato format_to_export: Formato de exportación image_size: Tamaño de la imagen latitude: "Lat:" licence: Licencia longitude: "Lon:" - manually_select: Seleccionar a mano otra área + manually_select: Seleccionar manualmente un área diferente map_image: Imagen de mapa (muestra una capa normal) max: max options: Opciones - osm_xml_data: Datos formato OpenStreetMap XML + osm_xml_data: Datos OpenStreetMap en formato XML output: Resultado - paste_html: HTML para empotrar en otro sitio web + paste_html: Pegar código HTML para insertar en otro sitio de internet scale: Escala too_large: - body: Esta área es demasiado grande para ser exportada como OpenStreetMap XML. Por favor, haga zoom o seleccione un área más pequeña. - heading: El área es demasiado grande + advice: "Si la exportación anterior falla, por favor considere usar una de las fuentes que se enumeran a continuación:" + body: Esta área es demasiado grande para ser exportada como datos XML de OpenStreetMap. Por favor, acérquese o seleccione un área más pequeña, o utilice una de las siguientes fuentes para la descarga de datos masiva. + geofabrik: + description: Extractos actualizados regularmente de los continentes, países, y ciudades seleccionadas + title: Descargas de Geofabrik + metro: + description: Extractos de las ciudades principales del mundo y sus alrededores + title: Extractos de Metro + other: + description: Fuentes adicionales que aparecen en la wiki de OpenStreetMap + title: Otras fuentes + overpass: + description: Descargar este cuadro delimitador desde una réplica de la base de datos de OpenStreetMap + title: Overpass API + planet: + description: Copias actualizadas regularmente de la base de datos completa de OpenStreetMap + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Añadir un marcador al mapa - change_marker: Cambiar posición del marcador - click_add_marker: Pinche en el mapa para añadir un marcador - drag_a_box: Arrastre una caja en el mapa para seleccionar un área - export: Exportar - manually_select: Seleccionar manualmente un área distinta - view_larger_map: Ver mapa más grande + title: Exportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Simplemente haz clic en o el mismo icono en la pantalla del mapa.\nEsto agregará un marcador para el mapa, que puedes mover\narrastrándolo. Agrega tu mensaje y luego haz clic en guardar y otros usuarios lo investigarán." + join_the_community: + explanation_html: Si has notado un problema con nuestros datos del mapa, por ejemplo un camino no encontrado o tu dirección, la mejor manera de proceder es unirse a la comunidad de OpenStreetMap y añadir o corrigir los datos por ti mismo. + title: Unirse a la comunidad + title: Cómo ayudar + other_concerns: + explanation_html: "Si tienes preocupaciones sobre cómo se están utilizando nuestros datos o sobre el contenido, consulta nuestra\npágina de derechos de autor para obtener más información legal, o contacta con el grupo de trabajo OSMF apropiado." + title: Otras preocupaciones + title: Reportar un problema / corregir el mapa geocoder: description: title: geonames: Ubicación de GeoNames - osm_namefinder: "%{types} de OpenStreetMap Namefinder" - osm_nominatim: Situaciones desde OpenStreetMap Nominatim + osm_nominatim: Ubicación según OpenStreetMap Nominatim types: cities: Ciudades places: Lugares towns: Municipios - description_osm_namefinder: - prefix: "%{distance} %{direction} de %{type}" direction: east: este north: norte @@ -468,16 +416,26 @@ es: title: ca_postcode: Resultados en Geocoder.CA geonames: Resultados en GeoNames + geonames_reverse: Resultados de GeoNames latlon: Resultados en Internal - osm_namefinder: Resultados en OpenStreetMap Namefinder osm_nominatim: Resultados de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultados de OpenStreetMap Nominatim uk_postcode: Resultados en NPEMap / FreeThe Postcode us_postcode: Resultados en Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: + admin_levels: + level10: Límite de suburbio + level2: Límite de país + level4: Límite de estado + level5: Límite de región + level6: Límite de condado + level8: Límite de ciudad + level9: Límite de pueblo prefix: + aerialway: + chair_lift: Telesilla + drag_lift: Telearrastre + station: Estación de remonte aeroway: aerodrome: Aeródromo apron: Pista @@ -512,7 +470,7 @@ es: cinema: Cine clinic: Clínica club: Club - college: Universidad o instituto + college: Instituto community_centre: Centro comunitario courthouse: Juzgado crematorium: Crematorio @@ -571,13 +529,14 @@ es: shower: Ducha social_centre: Centro social social_club: Club social + social_facility: Centro social studio: Estudio supermarket: Supermercado swimming_pool: Piscina taxi: Taxi telephone: Teléfono público theatre: Teatro - toilets: Aseos + toilets: Baños townhall: Ayuntamiento university: Universidad vending_machine: Máquina expendedora @@ -599,6 +558,9 @@ es: "yes": Puente building: "yes": Edificio + emergency: + fire_hydrant: Hidrante + phone: Teléfono de emergencia highway: bridleway: Camino prioritario para peatones y caballos bus_guideway: Canal guiado de autobuses @@ -620,17 +582,19 @@ es: platform: Plataforma primary: Carretera primaria primary_link: Enlace de carretera principal + proposed: Carretera propuesta raceway: Pista de carreras residential: Calle rest_area: Área de descanso road: Carretera secondary: Carretera secundaria - secondary_link: Enlace de carretera secundaria + secondary_link: Carretera secundaria service: Vía de servicio services: Vía de servicio speed_camera: Radar steps: Escaleras stile: Escalera para atravesar verjas + street_lamp: Farola tertiary: Carretera terciaria tertiary_link: Carretera terciaria track: Pista @@ -643,9 +607,10 @@ es: archaeological_site: Yacimiento arqueológico battlefield: Campo de batalla boundary_stone: Mojón - building: Edificio histórico + building: Edificio castle: Castillo church: Iglesia + citywalls: Murallas de la ciudad fort: Fuerte house: Casa icon: Icono @@ -655,8 +620,9 @@ es: monument: Monumento museum: Museo ruins: Ruinas + tomb: Tumba tower: Torre - wayside_cross: Cruz de término + wayside_cross: Crucero wayside_shrine: Sepulcro wreck: Pecio landuse: @@ -665,7 +631,7 @@ es: brownfield: Solar vacante cemetery: Cementerio commercial: Área de oficinas - conservation: Terreno protegido + conservation: Espacio natural protegido construction: Construcción farm: Granja farmland: Tierra de labranza @@ -716,12 +682,14 @@ es: sports_centre: Centro deportivo stadium: Estadio swimming_pool: Piscina - track: Pista de carreras + track: Pista de atletismo water_park: Parque acuático military: airfield: Aeródromo militar barracks: Barracas bunker: Búnker + mountain_pass: + "yes": Paso de montaña natural: bay: Bahía beach: Playa @@ -791,6 +759,7 @@ es: locality: Localidad moor: Páramo municipality: Municipio + neighbourhood: Barrio postcode: Código postal region: Región sea: Mar @@ -816,8 +785,10 @@ es: narrow_gauge: Ferrocarril de vía estrecha platform: Andén preserved: Vía ferroviaria preservada + proposed: Vía de tren propuesta spur: Ramal ferroviario station: Estación de trenes + stop: Parada de tren subway: Estación de metro subway_entrance: Boca de metro switch: Aguja de ferrocarril @@ -833,6 +804,7 @@ es: beverages: Tienda de bebidas bicycle: Tienda de bicicletas books: Librería + boutique: Boutique butcher: Carnicería car: Concesionario car_parts: Repuestos automotrices @@ -846,6 +818,7 @@ es: convenience: Pequeño supermercado copyshop: Copistería cosmetics: Tienda de cosmética + deli: Deli department_store: Grandes almacenes discount: Tienda de descuento doityourself: Tienda de bricolaje @@ -882,17 +855,21 @@ es: organic: Tienda de alimentos orgánicos outdoor: Tienda de deportes de aventura pet: Tienda de mascotas + pharmacy: Farmacia photo: Tienda fotográfica salon: Salón de belleza + second_hand: Tienda de segunda mano shoes: Zapatería shopping_centre: Centro comercial sports: Tienda de artículos deportivos stationery: Papelería supermarket: Supermercado + tailor: Sastre toys: Juguetería travel_agency: Agencia de viajes video: Videotienda wine: Licorería + "yes": Tienda tourism: alpine_hut: Cabaña alpina artwork: Obra de arte @@ -915,6 +892,7 @@ es: viewpoint: Mirador zoo: Zoológico tunnel: + culvert: Alcantarilla "yes": Túnel waterway: artificial: Vía fluvial artificial @@ -938,96 +916,170 @@ es: water_point: Punto de agua waterfall: Cascada weir: Represa + help_page: + help: + description: Hacer una pregunta o buscar respuestas en el sitio de preguntas y respuestas de OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap tiene varios recursos para aprender sobre el proyecto, preguntando y contestando preguntas, y colaborativamente discutir y documentar temas de cartografía. + title: Cómo obtener ayuda + welcome: + description: Comenzar con esta guía rápida que cubre lo básico de OpenStreetMap. + title: Le damos la bienvenida a OSM + url: /welcome + wiki: + description: Buscar la wiki para la documentación de OSM en profundidad. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/ES:Main_Page javascripts: + close: Cerrar + edit_help: Mover el mapa y acercar una ubicación que desee editar, luego haga clic aquí. + key: + title: Leyenda del mapa + tooltip: Leyenda del mapa + tooltip_disabled: Leyenda del mapa disponible sólo para la capa Estándar map: base: cycle_map: Mapa ciclista + hot: Humanitario mapquest: MapQuest Open standard: Estándar transport_map: Mapa de transporte + copyright: © Colaboradores de OpenStreetMap + donate_link_text: + layers: + data: Datos del mapa + header: Capas del mapa + notes: Notas del mapa + overlays: Activar superposiciones para solucionar problemas en el mapa + title: Capas + locate: + popup: Estás a {distance} {unit} de este punto + title: Mostrar mi ubicación + zoom: + in: Acercar + out: Alejar + notes: + new: + add: Añadir nota + intro: Para mejorar el mapa, la información que introduces es mostrada a otros cartógrafos, así que debe ser tan descriptiva y precisa como sea posible al desplazar el marcador a su posición correcta y escribir tu nota debajo. + show: + anonymous_warning: Esta nota contiene comentarios de usuarios anónimos que deberían ser verificados por separado. + comment: Comentar + comment_and_resolve: Comentar y resolver + hide: Ocultar + reactivate: Reactivar + resolve: Resolver + share: + cancel: Cancelar + center_marker: Centrar mapa en el marcador + custom_dimensions: Establecer dimensiones personalizadas + download: Descargar + embed: HTML + format: "Formato:" + image: Imagen + image_size: La imagen mostrará la capa estándar en + include_marker: Incluir marcador + link: Enlace o código HTML + long_link: Enlace + paste_html: Pegar código HTML para incrustar en el sitio web + scale: "Escala:" + short_link: Enlace corto + short_url: URL corta + title: Compartir + view_larger_map: Ver mapa más grande site: + createnote_disabled_tooltip: Acercar para añadir una nota al mapa + createnote_tooltip: Añadir una nota al mapa edit_disabled_tooltip: Haga zoom para editar el mapa edit_tooltip: Edita el mapa - edit_zoom_alert: Debe hacer más zoom para editar el mapa - history_disabled_tooltip: Haga zoom para ver las ediciones de esta área - history_tooltip: Ver ediciones para esta área - history_zoom_alert: Debe hacer más zoom para ver el histórico de ediciones + map_data_zoom_in_tooltip: Acercar para ver datos del mapa + map_notes_zoom_in_tooltip: Acercar para ver notas del mapa layouts: + about: Acerca de community: Comunidad community_blogs: Blogs de la comunidad community_blogs_title: Blogs de miembros de la comunidad de OpenStreetMap - copyright: Copyright y licencia - documentation: Documentación - documentation_title: Documentación del proyecto + copyright: Derechos de autor + data: Datos donate: Apoye a OpenStreetMap %{link} al Fondo de Actualización de Hardware. - donate_link_text: donando edit: Editar edit_with: Editar con %{editor} export: Exportar - export_tooltip: Exportar datos del mapa + export_data: Exportar datos foundation: Fundación foundation_title: La Fundación OpenStreetMap gps_traces: Trazas GPS gps_traces_tooltip: Gestiona las trazas GPS help: Ayuda - help_centre: Centro de ayuda - help_title: Sitio de ayuda para el proyecto history: Historial - home: inicio - home_tooltip: Ir a la página inicial - inbox: bandeja de entrada (%{count}) - inbox_tooltip: - one: Tu bandeja de entrada contiene un mensaje sin leer - other: Tu bandeja de entrada contiene %{count} mensajes sin leer - zero: Tu bandeja de entrada no tiene mensajes sin leer - intro_1: OpenStreetMap es un mapa libremente editable de todo el mundo. Está hecho por personas como usted. + home: Inicio intro_2_create_account: Crear una cuenta de usuario - intro_2_download: descargar - intro_2_html: Los datos son libres de %{download} y %{use} bajo su %{license}. %{create_account} para mejorar el mapa. - intro_2_license: licencia abierta - intro_2_use: usar - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - title: Los datos de OpenStreetMap se encuentran bajo la licencia Creative Commons Attribution-Share Alike 2.0 Generic License - log_in: identificarse + intro_header: ¡Bienvenido a OpenStreetMap! + intro_text: OpenStreetMap es un mapa del mundo, creado por gente como tú y de uso libre bajo una licencia abierta. + learn_more: Más información + log_in: Iniciar sesión log_in_tooltip: Identificarse con una cuenta existente logo: alt_text: Logo de OpenStreetMap - logout: Salir - logout_tooltip: Salir + logout: Cerrar sesión make_a_donation: text: Hacer una donación title: Apoye a OpenStreetMap con una donación monetaria + more: Más osm_offline: La base de datos de OpenStreetMap no está disponible en estos momentos debido a trabajos de mantenimiento. osm_read_only: La base de datos de OpenStreetMap se encuentra en modo de sólo lectura debido a trabajos de mantenimiento. partners_bytemark: Alojamiento de bytemark - partners_html: El alojamiento está apoyado por %{ucl}, %{ic} and %{bytemark}, y otros %{partners}. + partners_html: El alojamiento está apoyado por %{ucl}, %{ic} y %{bytemark}, y otros %{partners}. partners_ic: Imperial College de Londres partners_partners: socios partners_ucl: el centro de UCL VR partners_url: http://wiki.openstreetmap.org/wiki/Partners - sign_up: registrarse + sign_up: Registrarse sign_up_tooltip: Cree una cuenta para editar - sotm2011: ¡Ven a la Conferencia de OpenStreetMap 2011, El Estado del Mapa, del 09 al 11 de septiembre en Denver! + start_mapping: Comenzar a mapear tag_line: El WikiMapaMundi libre user_diaries: Diarios de usuario user_diaries_tooltip: Ver diarios de usuario - view: Ver - view_tooltip: Ver el mapa - welcome_user: Bienvenido, %{user_link} - welcome_user_link_tooltip: Tu página de usuario - wiki: Wiki - wiki_title: Sitio Wiki del proyecto license_page: foreign: english_link: el original en Inglés text: En el caso de un conflicto entre esta página traducida y %{english_original_link}, la versión inglesa prevalecerá title: Acerca de esta traducción - legal_babble: "

    Derechos de autor y licencia

    \n

    \n OpenStreetMap es Open Data (un servicio de datos de acceso libre), con licencia Creative\n Commons Reconocimiento-CompartirIgual 2.0 (CC BY-SA).\n

    \n

    \n Puedes copiar, distribuir, transmitir y adaptar nuestros mapas e información libremente siempre y cuando des reconocimiento a OpenStreetMap y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e información, solo podrás distribuir estos cambios bajo la misma licencia. El código legal completo explica tus derechos y obligaciones.\n

    \n\n

    Cómo dar reconocimiento a OpenStreetMap

    \n

    \n Si usas imágenes de mapas de OpenStreetMap, solicitamos que tu texto dándonos reconocimiento se lea al menos así: “© Colaboradores de OpenStreetMap, CC BY-SA”. Si sólo utilizas información del mapa, solicitamos que muestres “Información del mapa © Colaboradores de OpenstreetMap, CC BY-SA” \n

    \n

    \n Donde sea posible, OpenStreetMap debería vincularse a http://www.openstreetmap.org/\n y CC BY-SA a http://creativecommons.org/licenses/by-sa/2.0/. Si estás usando un medio donde los enlaces no son posibles (como es el caso de obras impresas), te sugerimos que dirigas a tus lectores a www.openstreetmap.org (por ejemplo, expandiendo ‘OpenStreetMap’ a su dirección completa) y a www.creativecommons.org.\n

    \n\n

    Para saber más...

    \n

    \n Encontrarás más información acerca de cómo utilizar nuestros datos en Preguntas y respuestas legales (en inglés).\n

    \n

    \n Se le recuerda a los colaboradores de OSM que no deberán añadir información procedente de ninguna fuente con derechos de autor reservados (como por ejemplo de Google Maps o mapas impresos) sin el consentimiento explícito de los poseedores de los derechos de autor.\n

    \n

    \n A pesar de que OpenStreetMap es contenido abierto, no podemos proveer una API de mapas gratuita para desarrolladores de aplicaciones para terceros.\n\n Por favor, lee nuestra Política de uso del API (en inglés),\n Política de uso de tiles (en inglés)\n y Políticas de uso de Nominatim (en inglés también).\n

    \n\n

    Nuestros colaboradores

    \n

    \n Nuestra licencia CC BY-SA requiere “reconocer al autor original, de manera razonable conforme al medio o a los medios que usted esté utilizando”. Las persona que hacen contribuciones individualmente a OSM no solicitan la mención de un crédito adicional al de “Colaboradores de OpenStreetMap”, pero en casos donde se ha incluido en OpenStreetMap información de una agencia nacional de cartografía u otra fuente mayor, es razonable reproducir su crédito directamente o añadir su vínculo a esta página.\n

    \n\n\n\n
      \n
    • Australia: Contiene datos suburbanos cuya base es la información provista por Australian Bureau of\n Statistics.
    • \n
    • Austria: Contiene datos de\n Stadt Wien (bajo\n CC BY), Land Vorarlberg y Land Tirol (bajo licencia CC-BY AT con modificaciones).
    • \n
    • Canadá: Contiene datos de GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Francia: Contiene datos extraídos de Direction Générale des Impôts.
    • \n
    • Holanda: Contiene datos de © AND, 2007\n (www.and.com)
    • \n
    • Nueva Zelanda: Contiene datos extraídos de Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polonia: Contiene datos de UMP-pcPL maps. Copyright contribuidores de\n UMP-pcPL. \n Aprenda más sobre el uso de UMP por parte de OSM
    • \n
    • Reino Unido: Contiene datos de Ordnance Survey © Crown copyright and database right\n 2010.
    • \n
    • Sudáfrica: Contiene datos extraídos de \t\n Chief Directorate: Información \n Nacional Geoespacial, State copyright reserved.
    • \n
    \n\n

    \n La inclusión de información en OpenStreetMap no implica que el proveedor de la información original apoya a OpenStreetMap, ofrece alguna garantía o acepta alguna responsabilidad.\n

    " + legal_babble: + attribution_example: + alt: Ejemplo de como dar reconocimiento a OpenStreetMap en una página web + title: Ejemplo de atribución + contributors_at_html: "Austria: Contiene datos de\n Stadt Wien (bajo\n CC BY), Land Vorarlberg y Land Tirol (bajo licencia CC-BY AT con modificaciones)." + contributors_ca_html: "Canadá: Contiene datos de GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Finlandia: Contiene datos de la National Land Survey de la Finland's Topographic Database\ny otras bases de datos, bajo la NLSFI License." + contributors_footer_1_html: Para obtener más detalles sobre estas y otras fuentes que se han utilizado para ayudar a mejorar OpenStreetMap, por favor vea la página de colaboradores en el Wiki de OpenStreetMap. + contributors_footer_2_html: La inclusión de información en OpenStreetMap no implica que el proveedor de la información original apoya a OpenStreetMap, ofrece alguna garantía o acepta alguna responsabilidad. + contributors_fr_html: "Francia: Contiene datos extraídos de Direction Générale des Impôts." + contributors_gb_html: "Reino Unido: Contiene datos de Ordnance Survey © Crown copyright and database right\n 2010-12." + contributors_intro_html: "Nuestros colaboradores son miles de personas. Incluimos también datos con licencia abierta de organismos cartográficos nacionales y otras fuentes, entre ellas:" + contributors_nl_html: "Países Bajos: Contiene datos de © AND, 2007\n (www.and.com)" + contributors_nz_html: "Nueva Zelanda: Contiene datos extraídos de Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Nuestros colaboradores + contributors_za_html: "Sudáfrica: Contiene datos extraídos de \t\n Chief Directorate: Información \n Nacional Geoespacial, State copyright reserved." + credit_1_html: Requerimos que utilices los créditos "© Colaboradores de OpenStreetMap". + credit_2_html: "Usted debe también dejar claro que los datos están disponibles bajo la licencia Open Database License (ODbL), y si utiliza nuestros mapas, que la cartografía posee licencia CC-BY-SA. Puede hacer esto mediante el enlace a esta página de derechos de autor.\nComo alternativa y como un requisito si están distribuyendo OSM en un formulario de datos, puede nombrar y enlazar directamente a las licencias. En medios de comunicación donde los enlaces no sean posibles (por ejemplo, obras impresas), le sugerimos que\ndirija a sus lectores a openstreetmap.org (quizás expandiendo 'OpenStreetMap' hasta esta dirección completa), a opendatacommons.org, y si procede, a creativecommons.org." + credit_3_html: "En un mapa electrónico navegable, los créditos deben aparecer en la esquina del mapa.\nPor ejemplo:" + credit_title_html: Cómo dar reconocimiento a OpenStreetMap + infringement_1_html: Se le recuerda a los colaboradores de OSM que no deberán añadir información procedente de ninguna fuente con derechos de autor reservados (como por ejemplo de Google Maps o mapas impresos) sin el consentimiento explícito de los poseedores de los derechos de autor. + infringement_2_html: Si usted cree que algún material con derechos de autor ha sido incorrectamente agregado a la base de datos de OpenStreetMap o a este sitio, consulte nuestro procedimiento de descolgado o preséntelo directamente en nuestra página de presentación en línea. + infringement_title_html: Violación de copyright + intro_1_html: "OpenStreetMap es Open Data (un servicio de datos de acceso libre), con licencia Creative\nCommons Reconocimiento-CompartirIgual 2.0 (CC BY-SA)." + intro_2_html: Puedes copiar, distribuir, transmitir y adaptar nuestros mapas e información libremente siempre y cuando des reconocimiento a OpenStreetMap y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e información, solo podrás distribuir estos cambios bajo la misma licencia. El código legal completo explica tus derechos y obligaciones. + intro_3_html: La cartografía en nuestros mosaicos de mapas y en nuestra documentación, están licenciados bajo la licencia Creative Commons Reconocimiento-CompartirIgual 2.0 (CC-BY-SA). + more_1_html: Encontrarás más información acerca de cómo utilizar nuestros datos, y cómo citarnos como fuente, en Preguntas legales más frecuentes. + more_2_html: "A pesar de que OpenStreetMap es contenido abierto, no podemos suminstrar una API de mapas gratuita para desarrolladores de aplicaciones para terceros.\n\nPor favor, lea nuestra Política de uso del API,\nPolítica de uso de mosaicos de mapas y Políticas de uso de Nominatim." + more_title_html: Para saber más... + title_html: Derechos de autor y licencia native: mapping_link: comenzar a mapear native_link: Versión en español - text: Está viendo la versión inglesa de la página de copyright. Puede ir a la %{native_link} de esta página o puede dejar de leer acerca de copyrights y %{mapping_link}. + text: Está viendo la versión en inglés de la página de copyright. Puede ir a la %{native_link} de esta página o puede dejar de leer acerca de copyrights y %{mapping_link}. title: Acerca de esta página message: delete: @@ -1036,7 +1088,7 @@ es: date: Fecha from: De messages: Tienes %{new_messages} y %{old_messages} - my_inbox: Mi buzón de entrada + my_inbox: Mi buzón new_messages: one: "%{count} nuevo mensaje" other: "%{count} nuevos mensajes" @@ -1083,22 +1135,50 @@ es: title: Salida to: A read: - back_to_inbox: Regresar a la bandeja de entrada - back_to_outbox: Regresar a la bandeja de salida + back: Volver date: Fecha from: De - reading_your_messages: Leyendo tus mensajes - reading_your_sent_messages: Leyendo tus mensajes enviados reply_button: Responder subject: Asunto title: Leer mensaje to: A unread_button: Marcar como no leído - wrong_user: Está conectado como `%{user}' pero el mensaje que quiere leer no se ha enviado a dicho usuario. Por favor, ingrese con el usuario correcto para ver el mensaje. + wrong_user: Está conectado como `%{user}' pero el mensaje que quiere leer no se ha enviado por o a dicho usuario. Por favor, ingrese con el usuario correcto para ver el mensaje. reply: wrong_user: Está conectado como `%{user}' pero el mensaje que quiere responder no se ha enviado a dicho usuario. Por favor, ingrese con el usuario correcto para responder. sent_message_summary: delete_button: Borrar + note: + description: + closed_at_by_html: Resuelto hace %{when} por %{user} + closed_at_html: Resuelto hace %{when} + commented_at_by_html: Actualizado hace %{when} por %{user} + commented_at_html: Actualizado hace %{when} + opened_at_by_html: Creado hace %{when} por %{user} + opened_at_html: Creado hace %{when} + reopened_at_by_html: Reactivado hace %{when} por %{user} + reopened_at_html: Reactivado hace %{when} + entry: + comment: Comentario + full: Nota completa + mine: + ago_html: hace %{when} + created_at: Creado en + creator: Autor + description: Descripción + heading: Notas de %{user} + id: Identificador + last_changed: Última modificación + subheading: Notas remitidas o comentadas por %{user} + title: Notas remitidas o comentadas por %{user} + rss: + closed: nota cerrada (cerca de %{place}) + commented: nuevo comentario (cerca de %{place}) + description_area: Lista de notas comunicadas, comentadas o cerradas en tu zona [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Agregador RSS para la nota %{id} + opened: nueva nota (cerca de %{place}) + reopened: nota reactivada (cerca de %{place}) + title: Notas de OpenStreetMap notifier: diary_comment_notification: footer: También puede leer el comentario en %{readurl} y puedes comentar en %{commenturl} o responder en %{replyurl} @@ -1106,7 +1186,7 @@ es: hi: Hola %{to_user}, subject: "[OpenStreetMap] %{user} ha comentado en tu entrada de diario" email_confirm: - subject: "[OpenStreetMap] Confirme su dirección de correo" + subject: "[OpenStreetMap] Confirma tu dirección de correo electrónico" email_confirm_html: click_the_link: Si es usted, por favor pulse el enlace inferior para confirmar el cambio greeting: Hola, @@ -1114,8 +1194,7 @@ es: email_confirm_plain: click_the_link: Si es usted, por favor pulse el enlace inferior para confirmar el cambio greeting: Hola, - hopefully_you_1: Alguien (posiblemente usted) quiere cambiar la dirección de correo en - hopefully_you_2: "%{server_url} a %{new_address}." + hopefully_you: Alguien (esperemos que usted) desea cambiar su dirección de correo electrónico a través de %{server_url} a %{new_address}. friend_notification: befriend_them: También puede añadirle como amigo en %{befriendurl}. had_added_you: "%{user} te ha añadido como amigo en OpenStreetMap" @@ -1144,46 +1223,36 @@ es: lost_password_plain: click_the_link: Si es usted, por favor pulse el enlace inferior para resetear la contraseña. greeting: Hola, - hopefully_you_1: Alguien (posiblemente usted) ha solicitado el reestablecimiento de la contraseña en esta - hopefully_you_2: dirección de correo de una cuenta de openstreetmap.org. + hopefully_you: Alguien (posiblemente usted) ha solicitado que su contraseña sea reestablecida en esta dirección de correo electrónico de una cuenta de openstreetmap.org message_notification: - footer1: También puedes leer el mensaje en %{readurl} - footer2: y puedes responder en %{replyurl} + footer_html: También puede leer el mensaje en %{readurl} y puede responder en %{replyurl} header: "%{from_user} te ha enviado un mensaje a través de OpenStreetMap con el asunto %{subject}:" hi: Hola %{to_user}, + note_comment_notification: + anonymous: Un usuario anónimo + closed: + commented_note: "%{commenter} ha resuelto una nota del mapa en la que usted ha comentado. La nota está cerca de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha resuelto una nota en la que usted está interesado" + subject_own: "[OpenStreetMap] %{commenter} ha resuelto una de sus notas" + your_note: "%{commenter} ha resuelto una de sus notas del mapa cerca de %{place}." + commented: + commented_note: "%{commenter} ha dejado un comentario en una nota del mapa que usted ha comentado. La nota está cerca de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha comentado en una nota que usted está interesado" + subject_own: "[OpenStreetMap] %{commenter} ha comentado en una de sus notas" + your_note: "%{commenter} ha dejado un comentario en una de sus notas del mapa cerca de %{place}." + details: Más detalles acerca de la nota pueden encontrarse en %{url}. + greeting: Hola, + reopened: + commented_note: "%{commenter} ha reactivado un nota del mapa en la que usted ha comentado. La nota está cerca de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha reactivado una nota en la que usted está interesado" + subject_own: "[OpenStreetMap] %{commenter} ha reactivado una de sus notas" + your_note: "%{commenter} ha reactivado una de sus notas del mapa cerca de %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirme su dirección de correo electrónico" - signup_confirm_html: - ask_questions: Puedes hacer cualquier pregunta en relación al OpenStreetMap en nuestro sitio de preguntas y respuestas. - click_the_link: Si este es usted, ¡Bienvenido! Por favor, pulse en el enlace más abajo para confirmar su cuenta y leer más información sobre OpenStreetMap. - current_user: Un listado categorizado de usuarios actuales, basado en que zona del mundo se encuentran, está disponible desde Category:Users_by_geographical_region. - get_reading: Siga leyendo sobre OpenStreetMap en el wiki, póngase al día con las últimas noticias vía el blog de OpenStreetMap o Twitter, o navegue por el blog del fundador de OpenStreetMap Steve Coast OpenGeoData para conocer la historia abreviada del proyecto, que además también tiene podcasts para escuchar - greeting: ¡Hola! - hopefully_you: Alguien (probablemente usted) ha creado una cuenta en - introductory_video: Puede ver un %{introductory_video_link} - more_videos: Hay más %{more_videos_link} - more_videos_here: ví­deos aquí­ - user_wiki_page: Se recomienda que crees una página wiki de usuario, que incluya etiquetas de categoría que indiquen donde te encuentras, como por ejemplo [[Category:Users_in_London]]. - video_to_openstreetmap: ví­deo introductorio a OpenStreetMap. - wiki_signup: Además usted seguramente quiera registrarse en el wiki de OpenStreetMapi. - signup_confirm_plain: - ask_questions: "Puedes hacer cualquier pregunta en relación a OpenStreetMap en nuestro sitio de preguntas y respuestas:" - blog_and_twitter: "Ponte al día con las últimas noticias a través del blog de OpenStreetMap o Twitter:" - click_the_link_1: Si este es usted, ¡Bienvenido! Por favor, pulse en el enlace más abajo para - click_the_link_2: confirmar su cuenta y leer más información sobre OpenStreetMap. - current_user_1: Una lista de todos los usuarios por categorí­as, basado en su procedencia, - current_user_2: "está disponible en:" + confirm: "Antes de hacer nada, tenemos que confirmar que esta solicitud procede de ti, así que si esto es cierto haz clic en el siguiente enlace para confirmar tu cuenta:" + created: Alguien (probablemente tú) acaba de crear una cuenta en %{site_url}. greeting: ¡Hola! - hopefully_you: Alguien (probablemente usted) ha creado una cuenta en - introductory_video: "Puede ver un vídeo introductorio sobre OpenStreetMap aquí­:" - more_videos: "Hay más ví­deos aquí­:" - opengeodata: "OpenGeoData.org es el blog del fundador de OpenStreetMap Steve Coast, y también tiene podcasts:" - the_wiki: "Lea más sobre OpenStreetMap en el wiki:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/ES:Beginners_Guide - user_wiki_1: Recomendamos que cree una página de usuario en el wiki, que incluya - user_wiki_2: etiquetas de categorí­a pasa saber de dónde es (por ejemplo [[Category:Users_in_Madrid]]) - wiki_signup: "Puede que también quiera registrarse en el Wiki de OpenStreetMap en:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&returnto=ES:Main_Page + subject: "[OpenStreetMap] Bienvenido a OpenStreetMap" + welcome: Después de confirmar su cuenta, nosotros le proporcionaremos alguna información adicional para ayudarle a empezar. oauth: oauthorize: allow_read_gpx: leer sus trazas GPS privadas. @@ -1192,8 +1261,18 @@ es: allow_write_api: modificar el mapa. allow_write_diary: crear publicaciones en su diario, comentarios y hacer amigos. allow_write_gpx: subir trazas GPS. + allow_write_notes: cambiar notas. allow_write_prefs: modificar sus preferencias de usuario. request_access: La aplicación %{app_name} está solicitando acceso a su cuenta, %{user}. Por favor, revise si quiere que la aplicación tenga las siguientes capacidades. Puede elegir tantas o tan pocas como quiera. + title: Autorizar el acceso a su cuenta + oauthorize_failure: + denied: Usted ha negado el acceso a la aplicación %{app_name} a su cuenta. + invalid: La ficha de autorización no es válida. + title: Solicitud de autorización fallida + oauthorize_success: + allowed: Usted ha concedido el acceso a la aplicación %{app_name} a su cuenta. + title: Solicitud de autorización permitida + verification: El código de verificación es %{code}. revoke: flash: Usted ha revocado el token para %{application} oauth_clients: @@ -1210,12 +1289,13 @@ es: allow_write_api: modificar el mapa. allow_write_diary: crear entradas en el diario, comentarios y hacer amigos. allow_write_gpx: subir trazas GPS. + allow_write_notes: cambiar notas. allow_write_prefs: modificar sus preferencias de usuario. callback_url: Callback URL name: Nombre requests: "Solicita los siguientes permisos del usuario:" required: Requerido - support_url: URL de Soporte + support_url: URL de asistencia url: URL de Aplicación Principal index: application: Nombre de la aplicación @@ -1227,7 +1307,7 @@ es: register_new: Registra tu aplicación registered_apps: "Tienes las siguientes aplicaciones cliente registradas:" revoke: ¡Revocar! - title: Mis detalles OAuth + title: Mis datos OAuth new: submit: Registrar title: Registrar una nueva aplicación @@ -1240,15 +1320,16 @@ es: allow_write_api: modificar el mapa. allow_write_diary: crear entradas del diario, comentarios y hacer amigos. allow_write_gpx: subir trazas de GPS + allow_write_notes: cambiar notas. allow_write_prefs: modificar sus preferencias de usuario. authorize_url: "URL de autorización:" confirm: ¿Estás seguro? delete: Eliminar cliente - edit: Editar Detalles + edit: Editar los detalles key: "Clave de Consumidor:" requests: "Solicitando los siguientes permisos del usuario:" secret: "Secreto de Consumidor:" - support_notice: Soportamos HMAC-SHA1 (recomendado) asi como texto plano en el modo ssl. + support_notice: Soportamos HMAC-SHA1 (recomendado) y firmas RSA-SHA1. title: Detalles OAuth para %{app_name} url: "URL de Token de Solicitud:" update: @@ -1288,6 +1369,7 @@ es: edit: anon_edits_link_text: Descubra a que se debe flash_player_required: 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. + id_not_configured: iD no ha sido configurado no_iframe_support: Su navegador no soporta iframes HTML, que son necesarios para esta funcionalidad. not_public: No has configurado tus ediciones como públicas. not_public_description: No puede seguir editando el mapa a menos que lo haga. Puede marcar sus ediciones como públicas desde su %{user_page}. @@ -1296,18 +1378,15 @@ es: 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.) user_page_link: página de usuario index: + createnote: Añadir una nota js_1: Está usando un navegador que no soporta o tiene desactivado JavaScript js_2: OpenStreetMap utiliza JavaScript para mostrar su mapa license: - license_name: Creative Commons Reconocimiento- Compartir bajo la misma licencia 2.0 - notice: Bajo la licencia %{license_name} a nombre de %{project_name} y sus colaboradores. - project_name: Proyecto OpenStreetMap + copyright: Copyright OpenStreetMap y colaboradores, bajo una licencia abierta permalink: Enlace permanente remote_failed: Error de edición - asegúrese de que JOSM o Merkaartor están cargados y con la opción de control remoto activada shortlink: Atajo key: - map_key: Leyenda del mapa - map_key_tooltip: Leyenda del mapa table: entry: admin: Límites administrativos @@ -1393,7 +1472,6 @@ es: preview: Vista previa search: search: Buscar - search_help: "ejemplos: 'Soria', 'Calle Mayor, Lugo', 'CB2 5AQ', o 'post offices near Lünen' más ejemplos..." submit_text: Ir where_am_i: ¿Dónde estoy? where_am_i_title: Describe la ubicación actual por medio del motor de búsqueda @@ -1405,10 +1483,15 @@ es: friendly: "%e %B %Y a las %H:%M" trace: create: - trace_uploaded: Su archivo GPX ha sido cargado y está esperando ser agregado a la Base de Datos. Esto normalmente ocurre dentro de la próxima media hora, y un ''email'' le será enviado al terminar. + trace_uploaded: Tu archivo GPX ha sido subido y está pendiente de inserción en la base de datos. Esto normalmente ocurre en la próxima media hora, y se te enviará un correo electrónico al terminar. upload_trace: Subir Traza GPS delete: scheduled_for_deletion: Traza programada para eliminación + description: + description_with_count: + one: Archivo GPX con %{count} punto de %{user} + other: Archivo GPX con %{count} puntos de %{user} + description_without_count: Archivo GPX de %{user} edit: description: "Descripción:" download: descargar @@ -1426,7 +1509,11 @@ es: uploaded_at: "Subido el:" visibility: "Visibilidad:" visibility_help: ¿Qué significa esto? + georss: + title: Trazas GPS de OpenStreetMap list: + description: Explorar los itinerarios GPS subidos recientemente + empty_html: No hay nada aquí todavía. Carga una nueva traza o aprende más acerca de cómo hacer trazas con el GPS en la página wiki. public_traces: Trazas GPS públicas public_traces_from: Trazas GPS públicas de %{user} tagged_with: etiquetado con %{tags} @@ -1466,14 +1553,16 @@ es: trace_header: see_all_traces: Ver todas las trazas see_your_traces: Ver todas tus trazas - traces_waiting: Tienes %{count} trazas esperando ser agregadas a la Base de Datos. Por favor, considera el esperar a que estas terminen antes de subir otras, para no bloquear la lista de espera a otros usuarios. + traces_waiting: + one: Tienes %{count} traza esperando por subir. Por favor, considera esperar a que esta termine antes de subir más, para no bloquear la cola a otros usuarios. + other: Tienes %{count} trazas esperando por subir. Por favor, considera esperar a que estas terminen antes de subir más, para no bloquear la cola a otros usuarios. upload_trace: Subir un rastro trace_optionals: tags: Etiquetas trace_paging_nav: - next: Siguiente » - previous: « Anterior - showing_page: Mostrando página %{page} + newer: Trazas más recientes + older: Trazas más antiguas + showing_page: Página %{page} view: delete_track: Borrar esta traza description: "Descripción:" @@ -1512,6 +1601,10 @@ es: email never displayed publicly: (nunca es mostrado públicamente) flash update success: La información del usuario se ha actualizado correctamente. flash update success confirm needed: La información del usuario se ha actualizado correctamente. Compruebe su correo electrónico para ver una nota sobre cómo confirmar su nueva dirección de correo electrónico. + gravatar: + gravatar: Usa Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: ¿Qué es esto? home location: "Lugar de origen:" image: "Imagen:" image size hint: (las imágenes cuadradas de al menos 100x100 funcionan mejor) @@ -1547,13 +1640,13 @@ es: update home location on click: ¿Actualizar tu lugar de origen cuando pulses sobre el mapa? confirm: already active: Esta cuenta ya ha sido confirmada. - before you start: Sabemos que probablemente tienes muchas ganas de comenzar a mapear, pero antes podría gustarte complementar la información sobre ti mismo en el siguiente formulario. button: Confirmar - heading: Confirmar la cuenta de usuario + heading: Revise su correo electrónico! + introduction_1: Te hemos enviado un correo electrónico de confirmación. + introduction_2: Confirme su cuenta haciendo clic en el enlace del correo electrónico y podrá comenzar a mapear. press confirm button: Pulse botón de confirmación de abajo para activar su cuenta. - reconfirm: Si ha pasado un tiempo desde que te registraste podrías necesitar enviarte un nuevo aviso de confirmación. - success: ¡Cuenta confirmada, gracias por registrarse! - unknown token: Ese símbolo parece no existir. + reconfirm_html: Si necesita que le reenviemos el correo electrónico de confirmación, haga clic aquí. + unknown token: Este código de confirmación ha expirado o no existe. confirm_email: button: Confirmar failure: La dirección de correo electrónico ha sido confirmada mediante esta credencial de autentificación. @@ -1562,7 +1655,7 @@ es: success: Dirección de correo electrónico confirmada. ¡Gracias por registrarse! confirm_resend: failure: No se ha encontrado el usuario %{name} - success: Te hemos enviado un nuevo aviso de confirmación a %{email} y tan pronto confirmes tu cuenta podrás comenzar a mapear

    Si usas un sistema para control de spam que envíe solicitudes de confirmación, asegúrate, por favor, de incluir en tu lista blanca a webmaster@openstreetmap.org ya que no podemos responder a ninguna solicitud de confirmación. + success: Te hemos enviado un nuevo aviso de confirmación a %{email} y tan pronto confirmes tu cuenta podrás comenzar a crear mapas

    Si usas un sistema de antispam que envía solicitudes de confirmación, asegúrate, por favor, de incluir en tu lista blanca a webmaster@openstreetmap.org ya que no podemos responder a ninguna solicitud de confirmación. filter: not_an_administrator: Necesitas ser administrador para ejecutar esta acción. go_public: @@ -1573,8 +1666,8 @@ es: heading: Usuarios hide: Ocultar Usuarios Seleccionados showing: - one: Mostrando página %{page} (%{first_item} de %{items}) - other: Mostrando página %{page} (%{first_item}-%{last_item} de %{items}) + one: Página %{page} (%{first_item} de %{items}) + other: Página %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} creado desde %{ip_address} el %{date}" summary_no_ip: "%{name} creado el %{date}" title: Usuarios @@ -1583,14 +1676,12 @@ es: account not active: Lo sentimos, tu cuenta aun no está activa.
    Por favor usa el enlace que hay en el correo de confirmación para activarla, o solicita un nuevo correo de confirmación. auth failure: Lo sentimos. No pudo producirse el acceso con esos datos. create account minute: Cree una cuenta. Sólo se tarda un minuto. - email or username: "Dirección de correo o nombre de usuario:" + email or username: "Dirección de correo electrónico o nombre de usuario:" heading: Iniciar sesión login_button: Iniciar sesión lost password link: ¿Ha perdido su contraseña? new to osm: ¿Nuevo en OpenStreetMap? no account: ¿No está registrado? - notice: Descubre más acerca del próximo cambio de licencia de OpenStreetMap (traducciones) (discusión) - notice_terms: OpenStreetMap cambiará a una nueva licencia el 1 de abril de 2012. Es tan abierta como nuestra licencia actual, pero los términos legales están mucho mejor adaptados a nuestra base de datos del mapa. Nos encantaría conservar sus contribuciones en OpenStreetMap, pero sólo podremos hacerlo si está de acuerdo en permitirnos distribuirlas bajo la nueva licencia. De lo contrario, tendremos que eliminarlas de la base de datos.

    Inicie sesión y, a continuación, tómese unos segundos para revisar y aceptar los nuevos términos. ¡Gracias! openid: "%{logo} OpenID:" openid invalid: Lo sentimos, tu OpenID parece ser incorrecto openid missing provider: Lo sentimos, no hemos podido contactar con su proveedor de OpenID @@ -1626,28 +1717,30 @@ es: logout_button: Cerrar sesión title: Cerrar sesión lost_password: - email address: "Dirección de correo:" + email address: "Dirección de correo electrónico:" heading: ¿Contraseña olvidada? help_text: Escriba el correo electrónico con el que se registró. Le enviaremos un vínculo a esa dirección, que podrá utilizar para restablecer su contraseña. new password button: Restablecer contraseña notice email cannot find: Lo sentimos, no se pudo encontrar esa dirección de correo electrónico. - notice email on way: Sentimos que lo haya perdido :-( pero ya va de camino un correo electrónico que le servirá para restablecer su contraseña. + notice email on way: Sentimos que la haya perdido :-( pero ya va de camino un correo electrónico que le servirá para restablecer su contraseña enseguida. title: Contraseña perdida make_friend: already_a_friend: Ya son amigos + button: Añadir como amigo failed: Lo sentimos, no se ha podido añadir a %{name} como un amigo. - success: "%{name} es tu amigo ahora" + heading: ¿Añadir a %{user} como un amigo? + success: ¡%{name} ahora es tu amigo! new: - confirm email address: "Confirmar la dirección de correo:" + about: + header: Libre y editable + html:

    A diferencia de otros mapas, OpenStreetMap es completamente creado por gente como tú, y es libre para que cualquiera pueda corregir, actualizar, descargar y usar.

    Regístrate para comenzar a contribuir. Te enviaremos un correo electrónico para confirmar tu cuenta.

    + confirm email address: "Confirmar la dirección de correo electrónico:" confirm password: "Confirmar contraseña:" contact_webmaster: Por favor, contacta al webmaster webmaster para organizar la creación de una cuenta. Intentaremos gestionar la solicitud lo más pronto posible. - continue: Continuar + continue: Registrarse display name: "Nombre en pantalla:" display name description: Tu nombre de usuario público. Puedes cambiarlo más tarde en "preferencias". email address: "Dirección de correo electrónico:" - fill_form: Rellene el formulario y le enviaremos un mensaje de correo electrónico rápido para activar su cuenta. - flash create success message: Gracias por registrarte. Te hemos enviado un correo de confirmación a %{email} y tan pronto como confirmes tu cuenta podrás mapear :-).

    Por favor, ten en cuenta que no podrás acceder hasta que hayas recibido el aviso y confirmado tu dirección de correo electrónico,.

    Si utilizas un sistema de bloqueo de correo no deseado que envía solicitudes de confirmación, asegúrate por favor de incluir entre tus remitentes seguros a webmaster@openstreetmap.org, puesto que nosotros no podemos responder solicitudes de confirmación. - heading: Crear una cuenta de usuario license_agreement: Cuando confirmes tu cuenta tendrás que aceptar los términos del contribuyente. no_auto_account_create: Desafortunadamente no estamos actualmente habilitados para crear una cuenta para ti automáticamente. not displayed publicly: No se muestra de forma pública (vea la política de privacidad) @@ -1657,10 +1750,10 @@ es: password: "Contraseña:" terms accepted: ¡Gracias por aceptar los nuevos términos de colaborador! terms declined: Lamentamos que haya decidido no aceptar los nuevos Términos de contribución. Para obtener más información, consulte esta página wiki. - title: Crear cuenta + title: Registrarse use openid: Como alternativa, use %{logo} OpenID para iniciar sesión no_such_user: - body: Lo sentimos, no existe ningún usuario con el nombre %{user}. Por favor, verifica las letras, o posiblemente el vínculo en el que has hecho click está equivocado. + body: Lo sentimos, no existe ningún usuario con el nombre %{user}. Por favor, verifica las letras, o tal vez el vínculo en el que has hecho click está equivocado. heading: El usuario %{user} no existe title: Este usuario no existe popup: @@ -1668,6 +1761,8 @@ es: nearby mapper: Mapeadores cercanos your location: "Tu lugar de origen:" remove_friend: + button: Quitar amistad + heading: ¿Quitar a %{user} de los amigos? not_a_friend: "%{name} no es uno de tus amigos." success: Has quitado a %{name} de tus amigos. reset_password: @@ -1697,17 +1792,17 @@ es: italy: Italia rest_of_world: Resto del mundo legale_select: "Por favor, seleccione su país de residencia:" - read and accept: Por favor, lee el acuerdo que aparece a continuación y haz clic sobre el botón "Aceptar" para confirmar que estás de acuerdo con los términos de este acuerdo para tus contribuciones pasadas y futuras. + read and accept: Por favor, lee el acuerdo que aparece a continuación y haz clic sobre el botón "Aceptar" para confirmar que aceptas los términos de este acuerdo para tus contribuciones pasadas y futuras. title: Términos del colaborador you need to accept or decline: Por favor lea y, a continuación, acepte o rechace los nuevos Términos de contribución para continuar. view: activate_user: activar este usuario - add as friend: añadir como amigo + add as friend: Añadir como amigo ago: (hace %{time_in_words_ago}) - block_history: ver los bloqueos recibidos - blocks by me: bloqueados por mi - blocks on me: bloqueos sobre mi - comments: comentarios + block_history: Bloqueos recibidos + blocks by me: Bloqueados por mí + blocks on me: Bloqueos sobre mí + comments: Comentarios confirm: Confirmar confirm_user: confirmar este usuario create_block: bloquear a este usuario @@ -1719,31 +1814,35 @@ es: deactivate_user: desactivar este usuario delete_user: borrar este usuario description: Descripción - diary: diario - edits: ediciones + diary: Diario + edits: Ediciones email address: "Dirección de correo electrónico:" - friends_changesets: Navegar por los conjuntos de cambios realizados por amigos - friends_diaries: Navegar por todas las entradas de diario realizadas por amigos + friends_changesets: conjuntos de cambios realizados por amigos + friends_diaries: entradas de diario realizadas por amigos hide_user: esconder este usuario - if set location: Si ha configurado su lugar de origen, verá un mapa abajo. Puede configurar su lugar de origen en la página de %{settings_link}. + if set location: Configure su lugar de origen en la página %{settings_link} para ver los usuarios cercanos. km away: "%{count} km de distancia" latest edit: "Última edición %{ago}:" m away: "%{count} m de distancia" mapper since: "Mapeando desde:" - moderator_history: ver los bloqueos impuestos + moderator_history: Bloqueos impuestos my comments: Mis comentarios - my diary: mi diario - my edits: mis ediciones - my settings: mis preferencias - my traces: mis trazas + my diary: Mi diario + my edits: Mis ediciones + my messages: Mis mensajes + my notes: Mis notas + my profile: Mi perfil + my settings: Mi configuración + my traces: Mis trazas nearby users: "Otros usuarios cercanos:" - nearby_changesets: Navegar por todos los conjuntos de cambios de los usuarios cercanos - nearby_diaries: Buscar todas las entradas de diario realizadas por usuarios cercanos + nearby_changesets: conjuntos de cambios de los usuarios cercanos + nearby_diaries: entradas de diario realizadas por usuarios cercanos new diary entry: nueva entrada de diario no friends: No has añadido ningún amigo aún. no nearby users: Todavía no hay usuarios que se hayan ubicado en su proximidad. + notes: Notas del mapa oauth settings: ajustes OAuth - remove as friend: eliminar como amigo + remove as friend: Eliminar como amigo role: administrator: Este usuario es un administrador grant: @@ -1753,11 +1852,11 @@ es: revoke: administrator: Revocar acceso de administrador moderator: Revocar acceso de moderador - send message: enviar mensaje + send message: Enviar mensaje settings_link_text: preferencias spam score: "Puntuación de spam:" status: "Estado:" - traces: trazas + traces: Trazas unhide_user: descubrir este usuario user location: Localización del usuario your friends: Tus amigos @@ -1805,7 +1904,7 @@ es: reason: La razón por la que %{name} está bloqueado. Por favor, actúa con calma y sé tan razonable como sea posible. Presenta tantos datos como puedas acerca de la situación y considera que ese mensaje será visible públicamente. Recuerda que no todos los usuarios entienden la jerga de la comunidad, así que intenta utilizar términos sencillos. submit: Crear bloqueo title: Creando un bloqueo para %{name} - tried_contacting: He contactado al usuario y le he pedido que deje de hacerlo. + tried_contacting: He contactado con el usuario y le he pedido que deje de hacerlo. tried_waiting: Le he dado al usuario un tiempo razonable para que responda a estas comunicaciones. not_found: back: Regresar al índice @@ -1815,11 +1914,14 @@ es: creator_name: Creador display_name: Usuario bloqueado edit: Editar + next: Siguiente » not_revoked: (no revocado) + previous: « Anterior reason: Razón del bloqueo revoke: Revocar revoker_name: Revocado por show: Mostrar + showing_page: Página %{page} status: Estado period: one: 1 hora @@ -1867,3 +1969,25 @@ es: fail: No se pudo revocar la función `%{role}' del usuario `%{name}'. Por favor, comprueba que el usuario y la función sean válidos. heading: Confirmar revocación de función title: Confirmar revocación de función + welcome_page: + add_a_note: + paragraph_1_html: Si sólo desea corregir algo pequeño y no tiene tiempo para registrarse y aprender a editar, es fácil añadir una nota. + paragraph_2_html: "Sólo tiene que ir a el mapa y hacer clic en el icono de nota: . Esto añadirá un marcador en el mapa, que se puede mover arrastrando. Agregue su mensaje, haga clic en guardar y otros mapeadores investigarán." + title: ¿No hay tiempo para editar? Agregar una nota! + basic_terms: + editor_html: Un editor es un programa o sitio web que puede utilizar para editar el mapa. + node_html: Un nodo es un punto en el mapa, como un restaurante o un árbol. + paragraph_1_html: OpenStreetMap tiene su propia jerga. Estas son algunas palabras clave que le pueden ser útiles. + tag_html: Una etiqueta es un poco de información acerca de un nodo o vía, como un nombre de restaurante o un límite de velocidad de la carretera. + title: Términos básicos para mapear + way_html: Una vía es una línea o área, como una carretera, arroyo, lago o edificio. + introduction_html: Bienvenido a OpenStreetMap, el mapa libre y editable del mundo. Ahora que usted está registrado, está todo listo para comenzar a mapear. He aquí una guía rápida con las cosas más importantes que usted necesita saber. + questions: + paragraph_1_html: "OpenStreetMap tiene varios recursos para aprender sobre el proyecto, preguntando y contestando preguntas, y colaborativamente discutir y documentar temas de cartografía.\nObtenga ayuda aquí." + title: ¿Alguna pregunta? + start_mapping: Comenzar a mapear + title: Bienvenido! + whats_on_the_map: + off_html: Lo que no se incluyen son datos obstinados como clasificaciones, características históricas o hipotéticas, y datos procedentes de fuentes con derechos de autor. A menos que tenga un permiso especial, no copie de mapas en línea o en papel. + on_html: OpenStreetMap es un lugar para el mapeo de las cosas que son reales y actuales - esto incluye millones de edificios, carreteras, y otros detalles acerca de lugares. Puede mapear cualquier característica de la vida real que es interesante para usted. + title: ¿Qué hay en el mapa? diff --git a/config/locales/et.yml b/config/locales/et.yml index 985c2593717..2d09b5fc6f3 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1,11 +1,25 @@ # Messages for Estonian (eesti) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: AivoK # Author: Avjoska # Author: Kanne +# Author: Luckas # Author: RM87 # Author: WikedKentaur et: + about_page: + community_driven_html: "OpenStreetMapi kogukond on mitmepalgeline, kirglik ja suureneb iga päevaga.\nMeie kaastöölisteks on innukad kaardistajad, GIS spetsialistid, insenerid, kes hoiavad töös OSM servereid, humanitaarid, kes kaardistavad katastroofipiirkondi,\nja paljud teised.\nKogukonnaga tutvumiseks vaata kasutajate päevikuid,\nkogukonna blogisid ja\nOSM Sihtasutuse veebilehte." + community_driven_title: Kogukonna põhine + copyright_html: ©OpenStreetMap
    kaastöölised + lede_text: OpenStreetMap on loodud kaardistajate kogukonna poolt, kes täiendavad ja hooldavad andmeid teede, radade, kohvikute, raudteejaamade ja paljude teiste objektide kohta üle kogu maailma. + local_knowledge_html: OpenStreetMap asetab rõhu kohalikule teabele. Kaastöölised kasutavad aerofotosid, GPS-seadmeid ja iseloodud kaarte kontrollimaks, et OSM oleks täpne ja ajakohane. + local_knowledge_title: Kohalik teave + next: Edasi + open_data_html: "OpenStreetMap on avatud andmed: sa võid neid vabalt kasutada igal eesmärgil\nseni kuni sa tunnustad OpenStreetMapi ja selle kaastööliseid. Kui sa muudad või\nvõi lood midagi nende andmete põhjal, siis võid sa oma tulemust levitada ainult\nsama litsentsi alusel. Täpsemat infot vaata lehelt Autoriõigused ja litsents." + open_data_title: Avatud andmed + partners_title: Partnerid + used_by: "%{name} varustab kaardiandmetega sadu veebisaite, mobiilside rakendusi ja riistvara seadmeid" activerecord: attributes: diary_comment: @@ -34,189 +48,163 @@ et: user: Kasutaja visible: Nähtav user: + active: Aktiivne description: Kirjeldus display_name: Näita nime email: E-posti aadress languages: Keeled pass_crypt: Parool models: + acl: Pääsuloend + changeset: Muutuskogum + changeset_tag: Muutuskogumi silt country: Riik + diary_comment: Päeviku kommentaar diary_entry: Päeviku sissekanne + friend: Sõber language: Keel message: Sõnum node: Sõlm node_tag: Sõlme silt old_node: Vana sõlm + old_node_tag: Sõlme vana silt old_relation: Vana relatsioon + old_relation_member: Vana relatsioon + old_relation_tag: Relatsiooni vana silt old_way: Vana joon + old_way_node: Joone vana sõlm + old_way_tag: Joone vana silt relation: Relatsioon + relation_member: Relatsiooni liige + relation_tag: Relatsiooni silt + session: Seanss + trace: Jälg + tracepoint: Jälje punkt + tracetag: Jälje silt user: Kasutaja + user_preference: Kasutaja eelistused + user_token: Kasutaja tunnus way: Joon way_node: Joone sõlm way_tag: Joone silt + application: + require_cookies: + cookies_needed: Sul on ilmselt küpsised keelatud - palun luba brauseris küpsised enne jätkamist. + require_moderator: + not_a_moderator: Selle tegevuse sooritamiseks pead sa olema moderaator. + setup_user_auth: + blocked: Sinu juurdepääs API-le on blokeeritud. Palun logi sisse veebiliidese kaudu, et saada rohkem infot. + need_to_see_terms: Sinu juurdepääs API-le on ajutiselt peatatud. Palun logi sisse veebiliidese kaudu, et näha Kaastöötingimusi. Sa ei pea nendega nõustuma, kuid sa pead neid vaatama. browse: + anonymous: anonüümne changeset: - changeset: "Muutustekogu: %{id}" - download: Laadi %{changeset_xml_link} või %{osmchange_xml_link} - title: Muutustekogu - changeset_details: - belongs_to: "Kuulub:" - box: ala - closed_at: "Suletud:" - created_at: "Loodud:" - common_details: - changeset_comment: "Kommentaar:" - deleted_at: "Kustutamise aeg:" - deleted_by: "Kustutaja:" - edited_at: "Muudetud:" - edited_by: "Muutja:" - version: "Versioon:" + belongs_to: Autor + changesetxml: Muutuskogumi XML + feed: + title: Muutuskogum %{id} + title_comment: Muutuskogum %{id} - %{comment} + node: Sõlmed (%{count}) + node_paginated: Sõlmed (%{x}-%{y}/%{count}) + osmchangexml: osmChange XML + relation: Relatsioonid (%{count}) + relation_paginated: Relatsioonid (%{x}-%{y}/%{count}) + title: "Muutuskogum: %{id}" + way: Jooned (%{count}) + way_paginated: Jooned (%{x}-%{y}/%{count}) + closed: Suletud + closed_by_html: Suletud %{user} poolt %{time} tagasi + closed_html: Suletud %{time} tagasi containing_relation: entry: Relatsioon %{relation_name} entry_role: Relatsioon %{relation_name} (kui %{relation_role}) - map: - deleted: kustutatud - edit: - area: Muuda ala - relation: Muuda relatsiooni - larger: - area: Vaata ala suuremal kaardil - node: Vaata sõlme suuremal kaardil - relation: Vaata relatsiooni suuremal kaardil - way: Vaata joont suuremal kaardil - loading: Laen... - navigation: - all: - next_changeset_tooltip: Järgmine muutustekogu - next_node_tooltip: Järgmine sõlm - next_relation_tooltip: Järgmine relatsioon - next_way_tooltip: Järgmine joon - prev_changeset_tooltip: Eelmine muutustekogu - prev_node_tooltip: Eelmine sõlm - prev_relation_tooltip: Eelmine relatsioon - prev_way_tooltip: Eelmine joon - user: - name_changeset_tooltip: Vaata kasutaja %{user} muudatusi - next_changeset_tooltip: Kasutaja %{user} järgmine muudatus - prev_changeset_tooltip: Kasutaja %{user} eelmine muudatus + created: Loodud + created_by_html: Loodud %{user} poolt %{time} tagasi + created_html: Loodud %{time} tagasi + deleted_by_html: Kustutatud %{user} poolt %{time} tagasio + download_xml: Laadi alla XML + edited_by_html: Muudetud %{user} poolt %{time} tagasi + in_changeset: Muutuskogum + location: "Asukoht:" + no_comment: (kommentaare pole) node: - download: "%{download_xml_link}, %{view_history_link} või %{edit_link}" - download_xml: Laadi XML - edit: redigeeri - node: sõlm - node_title: "Punkt: %{node_name}" - view_history: vaata redigeerimiste ajalugu - node_details: - coordinates: "koordinaadid:" - part_of: "Osa joonest:" - node_history: - download: "%{download_xml_link} või %{view_details_link}" - download_xml: Laadi XML - node_history: Punkti muudatusteajalugu - node_history_title: Punkti %{node_name} ajalugu - view_details: vaata üksikasju + history_title: "Sõlme ajalugu: %{name}" + title: "Sõlm: %{name}" not_found: - sorry: "Vabandame, %{type}\n id-ga %{id} ei leitud." + sorry: "Vabandame, %{type}\n #%{id} ei leitud." type: + changeset: muutuskogumit node: sõlme relation: relatsiooni way: joont - paging_nav: - of: " /" - showing_page: Näitan lehte + note: + closed_by: Lahendatud kasutaja %{user} poolt %{when} tagasi + closed_by_anonymous: Lahendatud anonüümse kasutaja poolt %{when} tagasi + closed_title: "Lahendatud märkus: #%{note_name}" + commented_by: Kommentaar kasutajalt %{user} %{when} tagasi + commented_by_anonymous: Kommentaar anonüümselt kasutajalt %{when} tagasi + hidden_by: Peidetud kasutaja %{user} poolt %{when} tagasi + hidden_title: "Peidetud märkus #%{note_name}" + new_note: Uus märkus + open_by: Loodud %{user} poolt %{when} tagasi + open_by_anonymous: Loodud anonüümse kasutaja poolt %{when} tagasi + open_title: "Lahendamata märkus: #%{note_name}" + reopened_by: Taasavatud kasutaja %{user} poolt %{when} tagasi + reopened_by_anonymous: Taasavatud anonüümse kasutaja poolt %{when} tagasi + title: "Märkus: %{id}" + part_of: Osa + redacted: + message_html: Selle %{type} versiooni %{version} ei saa kuvada, sest seda on muudetud. Palun vaata üksikasju %{redaction_link}. + redaction: Redaktsioon %{id} + type: + node: sõlm + relation: relatsioon + way: joon relation: - download: "%{download_xml_link} või %{view_history_link}" - download_xml: Laadi XML - relation: relatsioon - relation_title: "Relatsioon: %{relation_name}" - view_history: vaata ajalugu - relation_details: - members: "Liikmed:" - relation_history: - download: "%{download_xml_link} või %{view_details_link}" - download_xml: Laadi XML - relation_history: Relatsiooni muudatuste ajalugu - relation_history_title: Relatsiooni %{relation_name} ajalugu - view_details: vaata üksikasju + history_title: "Relatsiooni ajalugu: %{name}" + members: Liikmed + title: "Relatsioon: %{name}" relation_member: entry_role: "%{type} %{name} kui %{role}" type: node: Sõlm relation: relatsioon way: joon - start: - manually_select: Vali käsitsi teine ala start_rjs: - data_frame_title: Andmed - data_layer_name: Andmed - details: Detailid - drag_a_box: Märgi kaardil hiirega uus ala - edited_by_user_at_timestamp: Viimati muudetud kasutaja [[user]] poolt kell [[timestamp]] - hide_areas: Peida alad - history_for_feature: Omaduse [[feature]] ajalugu + feature_warning: Laaditakse %{num_features} objekti, mis võib muuta su veebilehitseja aeglaseks. Kas oled kindel, et soovid neid andmeid kuvada? load_data: Laadi andmed loading: Laadin andmeid... - manually_select: Vali uus ala - object_list: - back: Näita objektide nimekirja - details: Detailid - heading: Objektide nimekiri - history: - type: - node: Punkt [[id]] - way: Joon [[id]] - selected: - type: - node: Punkt [[id]] - way: Joon [[id]] - type: - node: Punkt - way: Joon - show_areas: Näita alasid - show_history: Näita ajalugu - unable_to_load_size: "Laadimine ebaõnnestus: valitud ala küjepikkus [[bbox_size]] on liiga suur (see peab olema väiksem kui %{max_bbox_size})" - wait: Oota... - zoom_or_select: Suurenda või vali soovitud ala kaardil tag_details: - tags: "Sildid:" + tags: Sildid wiki_link: - key: Sildi %{key} kirjelduse lehekülg wiki's - tag: Sildi %{key}=%{value} kirjelduse lehekülg wiki's + key: Sildi %{key} kirjelduse leht vikis + tag: Sildi %{key}=%{value} kirjelduse leht vikis wikipedia_link: Artikkel %{page} Vikipeedias timeout: + sorry: Kahjuks võttis andmete (%{type} id-ga %{id}) laadimine liiga kaua aega. type: + changeset: muutuskogumi node: sõlme relation: relatsiooni - way: joont + way: joone + version: Versioon + view_details: Vaata üksikasju + view_history: Vaata ajalugu way: - download: "%{download_xml_link}, %{view_history_link} või %{edit_link}" - download_xml: Lae XML - edit: redigeeri - view_history: vaata ajalugu - way: Joon - way_title: "Joon: %{way_name}" - way_details: also_part_of: - one: on ka osa joonest %{related_ways} - other: on ka osa joontest %{related_ways} - nodes: "Sõlmed:" - part_of: "Osa:" - way_history: - download: "%{download_xml_link} või %{view_details_link}" - download_xml: Lae alla XML-fail. - view_details: vaata detaile - way_history: Joone muudatuste ajalugu - way_history_title: "Joone: %{way_name} ajalugu" + one: on osa joonest %{related_ways} + other: on osa joontest %{related_ways} + history_title: "Joone ajalugu: %{name}" + nodes: Sõlmed + title: "Joon: %{name}" changeset: changeset: anonymous: Anonüümne - big_area: (suur) - no_comment: (puudub) - still_editing: redigeerimine pooleli + no_edits: (muudatused puuduvad) + view_changeset_details: Vaata muutuskogumi üksikasju changeset_paging_nav: next: Järgmine » previous: « Eelmine - showing_page: Näitan lehekülge %{page} + showing_page: Leht %{page} changesets: area: Ala comment: Kommentaar @@ -224,22 +212,42 @@ et: saved_at: Salvestatud user: Kasutaja list: - description: Viimased muudatused + empty: Muutuskogumeid ei leitud. + empty_area: Selles alas ei ole muutuskogumeid. + empty_user: Selle kasutaja tehtud muutuskogumeid ei ole. + load_more: Laadi veel + no_more: Rohkem muutuskogumeid ei leitud. + no_more_area: Sellest alast ei leitud rohkem muutuskogumeid. + no_more_user: Sellelt kasutajalt ei leitud rohkem muutuskogumeid. + title: Muutuskogumid + title_friend: Sõprade muutuskogumid + title_nearby: Läheduses asuvate kasutajate muutuskogumid + title_user: Kasutaja %{user} muutuskogumid + timeout: + sorry: Kahjuks võttis taotletud muutuskogumite laadimine liiga kaua aega. diary_entry: comments: + ago: "%{ago} tagasi" + comment: Kommentaar + has_commented_on: "%{display_name} on kommenteerinud järgnevaid päeviku sissekandeid" newer_comments: Uuemad kommentaarid older_comments: Vanemad kommentaarid + post: Postitus + when: Millal diary_comment: + comment_from: Kommentaar kasutajalt %{link_user} %{comment_created_at} confirm: Kinnita hide_link: Peida see kommentaar diary_entry: comment_count: - one: 1 kommentaar + one: "%{count} kommentaar" other: "%{count} kommentaari" + zero: Kommentaarid puuduvad comment_link: Kommenteeri seda päeviku sissekannet confirm: Kinnita edit_link: Muuda seda sissekannet hide_link: Peida see sissekanne + posted_by: Postitas %{link_user} %{created} %{language_link} reply_link: Vasta sellele sissekandele edit: body: "Tekst:" @@ -247,18 +255,32 @@ et: latitude: "Laiuskraad:" location: "Asukoht:" longitude: "Pikkuskraad:" + marker_text: Päeviku sissekande tegemise asukoht save_button: Salvesta subject: "Teema:" title: Muuda päeviku sissekannet use_map_link: kasuta kaarti + feed: + all: + description: Hiljutised OpenStreetMap kasutajate päeviku sissekanded + title: OpenStreetMap päeviku sissekanded + language: + description: Hiljutised OpenStreetMap kasutajate päeviku sissekanded keeles %{language_name} + title: OpenStreetMap päeviku sissekanded keeles %{language_name} + user: + description: Kasutaja %{user} hiljutised OpenStreetMap päeviku sissekanded + title: Kasutaja %{user} OpenStreetMap päeviku sissekanded list: + in_language_title: Päeviku sissekanded %{language} new: Uus päeviku sissekanne new_title: Lisa päevikusse uus sissekanne newer_entries: Uuemad... no_entries: Päevikus pole sissekandeid older_entries: Vanemad... - recent_entries: "Hiljutised päeviku sissekanded:" + recent_entries: Hiljutised päeviku sissekanded title: Kasutajate päevikud + title_friends: Sõprade päevikud + title_nearby: Lähedalasuvate kasutajate päevikud user_title: Kasutaja %{user} päevik location: edit: muuda @@ -267,6 +289,7 @@ et: new: title: Uus päeviku sissekanne no_such_entry: + body: Kahjuks ei leidu päeviku sissekannet või kommentaari id-ga %{id}. Kontrolli sisestatud lingi õigekirja. Võimalik, et link millele sa vajutasid on vigane. heading: Sissekannet id'ga %{id} pole olemas title: Sellist päeviku sissekannet pole olemas view: @@ -278,19 +301,25 @@ et: user_title: Kasutaja %{user} päevik editor: default: Vaikimisi (praegu %{name}) + id: + description: iD (veebilehitsejapõhine redaktor) + name: iD potlatch: + description: Potlatch 1 (veebilehitsejapõhine redaktor) name: Potlatch 1 potlatch2: + description: Potlatch 2 (veebilehitsejapõhine redaktor) name: Potlatch 2 remote: - description: Remote Control (JOSM või Merkaartor) + description: Kaugjuhtimine (JOSM või Merkaartor) + name: Kaugjuhtimine export: start: add_marker: Lisa kaardile kohamärk area_to_export: Eksporditav ala embeddable_html: Põimitav HTML export_button: Ekspordi - export_details: OpenStreetMapi andmed on avaldatud Creative Commons Attribution-ShareAlike 2.0 litsentsi tingimustel. + export_details: OpenStreetMapi andmed on avaldatud Open Data Commons Open Database litsentsi tingimustel. format: "Vorming:" format_to_export: Eksporditav vorming image_size: Pildi suurus @@ -298,23 +327,50 @@ et: licence: Litsents longitude: "Pikkus:" manually_select: Vali käsitsi teine ala + map_image: Kaardi pilt (kuvab tavakaardi) max: maks. options: Sätted - osm_xml_data: OpenStreetMap'i andmed XML kujul + osm_xml_data: OpenStreetMapi andmed XML kujul output: Väljund paste_html: Kopeeri ja lisa see HTML-kood oma veebilehele. scale: Mõõtkava too_large: - body: See ala on liiga suur, et eksportida OpenStreetMap'i andmeid XML kujul. Palun suurenda või vali väiksem ala. - heading: Ala on liiga suur + advice: "Kui ülaltoodu eksportimine ebaõnnestub, siis kasuta palun ühte alljärgnevatest allikatest:" + body: See ala on liiga suur, et eksportida OpenStreetMapi andmeid XML kujul. Palun suurenda või vali väiksem ala või kasuta ühte allikatest suurte andmehulkade allalaadimiseks. + geofabrik: + description: Regulaarselt uuendatavad tõmmised kontinentidest, riikidest ja valikulistest linnadest + title: Geofabrik allalaadimised + metro: + description: Tõmmised maailma suurematest linnadest ja nende ümbruskondadest + title: Metro tõmmised + other: + description: Täiendavad allikad on välja toodud OpenStreetMapi wikis + title: Muud allikad + overpass: + description: Laadi alla piiritletud ala OpenStreetMap andmebaasi peegelserverist + title: Overpass API + planet: + description: Regulaarselt uuendatavad koopiad tervest OpenStreetMap andmebaasist + title: Planet OSM zoom: Suurendus - start_rjs: - add_marker: Lisa kaardile marker - change_marker: Muuda märgi asukohta - export: Ekspordi - view_larger_map: Näita suuremat kaarti + title: Eksportimine + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Kliki või samale ikoonile kaardivaates.\nSee lisab kaardile markeri, mida sa saad liigutada seda hiirega lohistades. Lisa oma sõnum, seejärel kliki \"Salvesta\" ja teised kaardistajad näevad seda." + join_the_community: + explanation_html: Kui oled märganud probleemi meie kaardi andmetes, näiteks puuduvat teed või enda aadressi, siis parim viis selle lahendamiseks on liituda OpenStreetMapi kogukonnaga ja muuta või parandada andmed ise. + title: Liitu kogukonnaga + title: Kuidas aidata + other_concerns: + explanation_html: "Kui sul on küsimusi meie andmete kasutamise või sisu kohta, siis palun pöördu juriidilise info\nsaamiseks meie autoriõiguste lehele või võta ühendust sobiva OSMF töögrupiga." + title: Muud probleemid + title: Probleemist teatamine / kaardi parandamine geocoder: description: + title: + geonames: Asukoht teenusest GeoNames + osm_nominatim: Asukoht OpenStreetMap Nominatimist types: cities: Linnad places: Kohad @@ -328,6 +384,10 @@ et: south_east: kagu south_west: edela west: lääne + distance: + one: umbes 1km + other: umbes %{count}km + zero: vähem kui 1km results: more_results: Veel tulemusi no_results: Ei leidnud midagi @@ -335,19 +395,32 @@ et: title: ca_postcode: Geocoder.CA tulemused geonames: GeoNamesi tulemused - osm_namefinder: OpenStreetMapi Namefinderi tulemused + geonames_reverse: GeoNames tulemused + latlon: Sisemised tulemused osm_nominatim: OpenStreetMap Nominatimi tulemused + osm_nominatim_reverse: OpenStreetMap Nominatim tulemused uk_postcode: " NPEMap / FreeThe Postcode tulemused" us_postcode: Geocoder.us tulemused - search_osm_namefinder: - suffix_place: ", %{distance} %{direction} kohast %{placename}" search_osm_nominatim: + admin_levels: + level10: Linnajao piir + level2: Riigipiir + level4: Osariigi piir + level5: Regiooni piir + level6: Maakonna piir + level8: Linnapiir + level9: Küla piir prefix: aeroway: gate: Värav + helipad: Kopteriväljak + taxiway: Ruleerimisrada terminal: Terminal amenity: + WLAN: WiFi-ühendus airport: Lennujaam + arts_centre: Kunstikeskus + artwork: Kunstiteos atm: Pangaautomaat auditorium: Auditoorium bank: Pank @@ -362,32 +435,44 @@ et: car_rental: Autorent car_wash: Autopesu casino: Kasiino + charging_station: Laadimisjaam cinema: Kino clinic: Kliinik club: Klubi courthouse: Kohtuhoone crematorium: Krematoorium dentist: Hambaarst + doctors: Arstid + dormitory: Ühiselamu drinking_water: Joogivesi driving_school: Autokool embassy: Saatkond emergency_phone: Hädaabi telefon fast_food: Kiirtoit + ferry_terminal: Praamiterminal + fire_hydrant: Tuletõrjehüdrant fire_station: Tuletõrjedepoo fountain: Purskkaev fuel: Kütus grave_yard: Surnuaed + hall: Hall + health_centre: Tervisekeskus hospital: Haigla hotel: Hotell + hunting_stand: Jahikantsel ice_cream: Jäätis kindergarten: Lasteaed library: Raamatukogu market: Turg marketplace: Turg + mountain_rescue: Mäepäästeteenistus nightclub: Ööklubi + nursing_home: Hooldekodu + office: Kontor park: Park parking: Parkimisplats pharmacy: Apteek + place_of_worship: Pühapaik police: Politsei post_box: Postkast post_office: Postkontor @@ -395,42 +480,60 @@ et: prison: Vangla pub: Pubi reception_area: Vastuvõtt + recycling: Jäätmekäitluspunkt restaurant: Restoran retirement_home: Vanadekodu sauna: Saun school: Kool shelter: Varjualune shop: Kauplus + shower: Dušš supermarket: Supermarket taxi: Takso + telephone: Üldkasutatav telefon theatre: Teater toilets: WC university: Ülikool + vending_machine: Müügiautomaat + veterinary: Loomakliinik waste_basket: Prügikast - wifi: WiFi + wifi: WiFi-ühendus youth_centre: Noortekeskus boundary: administrative: Halduspiir + national_park: Rahvuspark bridge: + aqueduct: Akvedukt + suspension: Rippsild + swing: Pöördsild viaduct: Viadukt "yes": Sild building: "yes": Hoone + emergency: + fire_hydrant: Tuletõrjehüdrant + phone: Hädaabi telefon highway: bridleway: Ratsatee bus_stop: Bussipeatus + byway: Kõrvaltee cycleway: Jalgrattatee + emergency_access_point: Hädaabi punkt footway: Jalgrada ford: Koolmekoht living_street: Õueala + milestone: Verstapost motorway: Kiirtee path: Rada pedestrian: Jalakäijatele tee platform: Platvorm primary: Põhimaantee + raceway: Võidusõidurada road: Tee secondary: Tugimaantee + speed_camera: Kiiruskaamera steps: Trepp + street_lamp: Tänavavalgusti tertiary: Kohalik maantee unsurfaced: Katteta tee historic: @@ -439,6 +542,7 @@ et: building: Hoone castle: Kindlus church: Kirik + citywalls: Linnamüürid fort: Kindlus house: Maja icon: Ikoon @@ -449,6 +553,8 @@ et: museum: Muuseum ruins: Varemed tower: Torn + wayside_cross: Teeäärne rist + wayside_shrine: Teeäärne altar wreck: Vrakk landuse: cemetery: Surnuaed @@ -460,15 +566,18 @@ et: meadow: Niit mine: Kaevandus nature_reserve: Looduskaitseala + orchard: Viljapuuaed park: Park quarry: Karjäär railway: Raudtee + recreation_ground: Puhkeala reservoir: Veehoidla residential: Elamurajoon vineyard: Viinamarjaistandus wetland: Soo wood: Mets leisure: + fishing: Kalapüügipiirkond garden: Aed golf_course: Golfiväljak ice_rink: Uisuväli @@ -482,11 +591,14 @@ et: sports_centre: Spordikeskus stadium: Saadion swimming_pool: Ujula + track: Jooksurada water_park: Veepark military: airfield: Sõjaväe lennuväli barracks: Kasarmud bunker: Punker + mountain_pass: + "yes": Mäekuru natural: bay: Laht beach: Rand @@ -507,9 +619,11 @@ et: moor: Raba mud: Muda peak: Mäetipp + point: Neem reef: Riff river: Jõgi rock: Kivi + shoal: Madalik spring: Allikas stone: Kivi strait: Väin @@ -548,14 +662,20 @@ et: historic_station: Ajalooline raudteejaam junction: Raudtee ülekäigukoht level_crossing: Raudtee ülesõidukoht + light_rail: Kergraudtee + miniature: Miniatuurraudtee narrow_gauge: Kitsarööpmeline raudtee platform: Raudteeperroon + spur: Raudtee harutee station: Raudteejaam + stop: Raudteepeatus subway: Metroojaam + subway_entrance: Metroo sissepääs switch: Pöörangud tram: Trammitee tram_stop: Trammipeatus shop: + antiques: Antikvariaat bicycle: Rattapood books: Raamatupood butcher: Lihunik @@ -563,8 +683,12 @@ et: carpet: Vaibakauplus clothes: Riidepood computer: Arvutikauplus + copyshop: Paljunduskoda cosmetics: Kosmeetikapood + department_store: Kaubamaja dry_cleaning: Keemiline puhastus + electronics: Elektroonikapood + farm: Talupood fish: Kalapood florist: Lillepood food: Toidupood @@ -572,22 +696,32 @@ et: furniture: Mööbel gallery: Galerii garden_centre: Aianduskeskus + gift: Kingipood + grocery: Toidupood hairdresser: Juuksur + hardware: Rauakauplus insurance: Kindlustus jewelry: Juveelipood kiosk: Kiosk + laundry: Pesumaja market: Turg mobile_phone: Mobiiltelefonide pood + motorcycle: Mootorrattapood music: Muusikapood + optician: Prillipood pet: Lemmikloomapood + pharmacy: Apteek shoes: Kingapood + shopping_centre: Kaubanduskeskus sports: Spordipood supermarket: Supermarket toys: Mänguasjapood travel_agency: Reisiagentuur tourism: alpine_hut: Alpimaja + artwork: Kunstiteos attraction: Turismiatraktsioon + bed_and_breakfast: Kodumajutus camp_site: Laagriplats guest_house: Külalistemaja hostel: Hostel @@ -597,7 +731,11 @@ et: museum: muuseum picnic_site: piknikuplats theme_park: Teemapark + valley: Org + viewpoint: Vaatepunkt zoo: Loomaaed + tunnel: + "yes": Tunnel waterway: canal: Kanal dam: Tamm @@ -608,65 +746,169 @@ et: riverbank: Jõekallas stream: Oja waterfall: Kosk + weir: Pais + help_page: + help: + description: Esita küsimus või otsi vastuseid OSMi küsimuste ja vastuste veebilehel. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap pakub erinevaid võimalusi projekti tundmaõppimiseks, küsimuste esitamiseks ja vastamiseks ning kaardistamise teemade üle üheskoos arupidamiseks ja dokumenteerimiseks. + title: Abikeskus + welcome: + description: Alusta selle kiirjuhendiga, mis hõlmab OpenStreetMapi põhitõdesid. + title: Tere tulemast OSMi + url: /welcome + wiki: + description: Sirvi vikis põhjalikumat OSM dokumentatsiooni. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/Et:Main_Page javascripts: + close: Sulge + edit_help: Nihuta kaarti ja suumi sisse asukohta mida soovid redigeerida ja seejärel kliki siia. + key: + title: Legend + tooltip: Legend + tooltip_disabled: Legend on nähtav ainult Tavakaardil map: base: cycle_map: Rattakaart + standard: Tavakaart transport_map: Transpordikaart + copyright: © OpenStreetMap kaastöölised + donate_link_text: + layers: + data: Kaardi andmed + header: Kaardi kihid + notes: Kaardi märkused + overlays: Luba kattekihte, et kaarti analüüsida + title: Kihid + locate: + popup: Sa asud sellest punktist {distance} {unit} kaugusel + title: Näita minu asukohta + zoom: + in: Suurenda + out: Vähenda + notes: + new: + add: Lisa märkus + intro: Sisestatav info on nähtav teistele kasutajatele ja võib-olla aitab see kaarti parandada. Palun lisa lühike kirjeldus ja lohista kaardil marker õigesse asukohta. + show: + anonymous_warning: Käesolev märkus sisaldab kommentaare anonüümsetelt kasutajatelt, mida tuleks eraldi üle kontrollida. + comment: Kommenteeri + comment_and_resolve: Kommenteeri ja lahenda + hide: Peida + reactivate: Aktiveeri uuesti + resolve: Lahenda + share: + cancel: Loobu + center_marker: Tsentreeri kaart markerile + custom_dimensions: Vali suurus käsitsi + download: Laadi alla + embed: HTML + format: "Vorming:" + image: Pilt + image_size: Luuakse pilt tavakaardist mõõtudega + include_marker: Lisa marker + link: Link või HTML + long_link: Link + paste_html: Kopeeri HTML-kood oma veebilehele + scale: "Mõõtkava:" + short_link: Lühilink + short_url: Lühilink + title: Jaga + view_larger_map: Vaata suuremat kaarti site: + createnote_disabled_tooltip: Suurenda, et lisada kaardile märkus + createnote_tooltip: Märkuse lisamine kaardile edit_disabled_tooltip: Kaardi redigeerimiseks suurenda kaarti - edit_tooltip: Töötle kaarti - history_tooltip: Vaata tehtud muudatusi + edit_tooltip: Muuda kaarti + map_data_zoom_in_tooltip: Suumi sisse, et näha kaardi andmeid + map_notes_zoom_in_tooltip: Suumi sisse, et näha kaardil märkuseid layouts: + about: Teave community: Kogukond - community_blogs: Kogukonna Blogid - community_blogs_title: OpenStreetMap'i kogukonna liikmete blogid - copyright: Autoriõigused ja litsents - documentation: Dokumentatsioon - documentation_title: Projekti dokumentatsioon - donate: Toeta OpenStreetMap'i %{link} Riistvara Uuendamise Fondi. - donate_link_text: annetades + community_blogs: Kogukonna blogid + community_blogs_title: OpenStreetMapi kogukonna liikmete blogid + copyright: Autoriõigused + data: Andmed + donate: Toeta OpenStreetMapi %{link} Riistvara Uuendamise Fondi. edit: Redigeeri edit_with: Redigeeri %{editor}-ga - export: Ekspordi - export_tooltip: Ekspordi kaardiandmed + export: Eksport + export_data: Andmete eksportimine + foundation: Sihtasutus + foundation_title: OpenStreetMapi Sihtasutus gps_traces: GPS rajad + gps_traces_tooltip: Halda GPS radasid help: Juhend history: Ajalugu - home: kodu - home_tooltip: Mine kodupaika - inbox: postkast (%{count}) - inbox_tooltip: - one: Sul on üks lugemata sõnum - other: Sul on %{count} lugemata sõnumit - zero: Sul ei ole lugemata sõnumeid - log_in: logi sisse + home: Kodu asukohta + intro_2_create_account: loo oma konto + intro_header: Tere tulemast OpenStreetMappi! + intro_text: OpenStreetMap on maailma kaart, mille on loonud inimesed nagu sina ja seda võib vabalt kasutada avatud litsentsi tingimustel. + learn_more: Lisateave + log_in: Logi sisse log_in_tooltip: Logi sisse oma kasutajanimega logo: alt_text: OpenStreetMapi logo - logout: logi välja - logout_tooltip: Logi välja + logout: Logi välja make_a_donation: text: Anneta - title: Toeta OpenStreetMappi rahaliselt - sign_up: registreeru + title: Toeta OpenStreetMapi rahaliselt + more: Veel + osm_offline: OpenStreetMapi andmebaas ei ole hetkel juurdepääsetav sest teostatakse vajalikke hooldustöid. + osm_read_only: OpenStreetMapi andmebaas on hetkel oluliste hooldustööde tõttu ligipääsetav ainult lugemiseks. + partners_bytemark: Bytemark Hosting + partners_html: Majutust toetavad %{ucl}, %{ic} ja %{bytemark} ning teised %{partners}. + partners_ic: Imperial College London + partners_partners: partnerid + partners_ucl: UCL VR Centre + sign_up: Registreeru sign_up_tooltip: Redigeerimiseks loo omale konto + start_mapping: Alusta kaardistamist tag_line: Vaba viki-maailmakaart user_diaries: Kasutajate päevikud user_diaries_tooltip: Vaata kasutajate päevikuid - view: Vaata - view_tooltip: Vaata kaarti - welcome_user: Tere tulemast, %{user_link} - welcome_user_link_tooltip: Sinu kasutajaleht - wiki: Viki license_page: foreign: - english_link: ingliskeelne originaal + english_link: ingliskeelse originaali + text: Juhul kui tekib vastuolu käesoleva tõlgitud lehe ja %{english_original_link} vahel, on ingliskeelne leht ülimuslik. title: Info selle tõlke kohta + legal_babble: + attribution_example: + alt: Näide, kuidas tunnustada OpenStreetMapi veebilehel + title: Tunnustamise näide + contributors_at_html: "Austria: Sisaldab andmeid\nViini linnast \n(CC BY tingimustel),\nVorarlbergi liidumaast ja\nTirooli liidumaast (CC BY AT tingimustel koos õiendustega)." + contributors_ca_html: "Kanada: Sisaldab\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) ja StatCan (Geography Division,\nStatistics Canada) kaardiandmeid." + contributors_fi_html: "Soome: Sisaldab kaardiandmeid, mis on pärit Maanmittauslaitos\nja teistest andmekogumitest \nMaanmittauslaitos litsentsi tingimustel." + contributors_footer_1_html: "Täpsemat teavet nendest ja teistest allikatest, mida on kasutatud\nOpenStreetMapi täiustamiseks võib näha Kaastööliste lehel OpenStreetMapi vikis." + contributors_footer_2_html: "Andmete kaasamisest OpenStreetMapi ei järeldu, et\nalgne andmete pakkuja toetab OpenStreetMapi, pakub mingit garantiid või\nvõtab endale mingeid kohustusi." + contributors_fr_html: "Prantsusmaa: Sisaldab kaardiandmeid, mis on pärit\nDirection Générale des Impôts." + contributors_gb_html: "Suurbritannia: Sisaldab Ordnance\nSurvey andmeid © Crown copyright and database right\n2010-12." + contributors_intro_html: "Meie kaastöölisteks on tuhanded üksikisikud. Oleme samuti kaasanud vabalt litsentseeritud andmeid rahvuslikest kartograafia asutustest\nja muudest allikatest, sealhulgas:" + contributors_nl_html: "Holland: Sisaldab © AND data, 2007\n(www.and.com)" + contributors_nz_html: "Uus-Meremaa: Sisaldab kaardiandmeid\nLand Information New Zealand. Crown Copyright reserved." + contributors_title_html: Peamised kaastöölised + contributors_za_html: "LAV: Sisaldab andmeid allikast\nChief Directorate:\nNational Geo-Spatial Information, Õigused kuuluvad riigile." + credit_1_html: "Me nõuame, et sa mainiksid teksti “© OpenStreetMapi\nkaastöölised”." + credit_2_html: "Sa pead samuti selgeks tegema, et need andmed on saadaval Open\nDatabase License litsentsi tingimustel, ja kui kasutatakse meie kaardi paane, siis see kartograafia\non litsenseeritud CC BY-SA tingimustel. Sa võid seda teha, lisades lingi\nsellele autoriõiguse lehele.\nTeine võimalus ja samas ka nõue, kui levitad OSM-i\nandmete kujul on, et nimetad ja annad otse lingi litsentsi(de)le. Meedias,\nkus lingid ei ole võimalikud (nt trükitud tööd) me soovitame, et\nsuunaksid oma lugejad lehele openstreetmap.org (näiteks laiendades\n'OpenStreetMap' täielikuks aadressiks), opendatacommons.org ja\nkui vaja siis ka lehele creativecommons.org." + credit_3_html: "Sirvitaval elektroonilisel kaardil peaks tunnustus näha olema kaardi nurgas.\nNäiteks:" + credit_title_html: Kuidas tunnustada OpenStreetMapi + infringement_1_html: "OSM kaastöölised peavad meeles pidama, et nad ei tohi kunagi lisada andmeid\nautoriõigustega kaitstud allikatest (nt Google Maps või trükitud kaardid) kui\nneil puudub selgesõnaline luba autoriõiguste omanikelt." + infringement_2_html: "Kui sa arvad, et OpenStreetMap andmebaasi või sellele saidile on lisatud sobimatult\nautoriõigustega kaitstud materjali, siis palun pöördu\nmeie eemaldamise\nprotseduuri poole või otse meie\nonlain lehele." + infringement_title_html: Autoriõiguste rikkumine + intro_1_html: "OpenStreetMap on avatud andmed, mis on litsentseeritud Open Data\nCommons Open Database License (ODbL) tingimustel." + intro_2_html: "Sa võid vabalt kopeerida, levitada, edastada ja kohandada meie andmeid\nseni kuni sa tunnustad OpenStreetMapi ja selle\nkaastööliseid. Kui sa muudad või tugined meie andmetele siis\nsiis võid sa tulemust levitada ainult sama litsentsi tingimustel.\nTäielik litsentsi juriidiline\ntekst selgitab sinu õiguseid ja kohustusi." + intro_3_html: "Meie kaardipaanide kartograafia ja meie dokumentatsioon on\nlitsentseeritud Creative\nCommons Attribution-ShareAlike 2.0 litsentsiga (CC BY-SA)." + more_1_html: "Rohkem infot, kuidas kasutada meie andmeid ja kuidas meid tunnustada leiab lehelt Legal\nFAQ." + more_2_html: "Kuigi OpenStreetMap on vabad andmed, ei saa me pakkuda\ntasuta kaardi API-t kolmandate osapoolte arendajatele.\nVaata meie API kasutusreegleid,\nKaardi paanide kasutusreegleid\nja Nominatimi kasutusreegleid." + more_title_html: Lisateave + title_html: Autoriõigused ja litsents native: mapping_link: alustada kaardistamist native_link: eestikeelse versiooni - text: Sa vaatad ingliskeelset versiooni autoriõiguste leheküljest. Sa võid minna tagasi %{native_link} juurde sellest lehest või lõpetada autoriõigustest lugemise ja %{mapping_link}. + text: Sa vaatad ingliskeelset versiooni autoriõiguste lehest. Sa võid minna tagasi selle lehe %{native_link} juurde või lõpetada autoriõiguste lugemise ja %{mapping_link}. + title: Sellest lehest message: delete: deleted: Sõnum kustutatud @@ -716,13 +958,12 @@ et: my_inbox: "%{inbox_link}" no_sent_messages: Sul ei ole veel saadetud sõnumeid. Miks mitte kontakteeruda mõne %{people_mapping_nearby_link}? outbox: saadetud sõnumid - people_mapping_nearby: lähedalolevad kaardistajad + people_mapping_nearby: lähedaloleva kaardistajaga subject: Teema title: Saadetud sõnumid to: Kellele read: - back_to_inbox: Tagasi postkasti - back_to_outbox: Tagasi saadetud sõnumite juurde + back: Tagasi date: Kuupäev from: Kellelt reply_button: Vasta @@ -730,58 +971,250 @@ et: title: Loe sõnumit to: Kellele unread_button: Märgi mitteloetuks + wrong_user: Oled sisse loginud kui "%{user}" aga sõnum, mida soovid lugeda ei ole sellele kasutajale saadetud ega selle kasutaja poolt saadetud. Lugemiseks palun logi sisse õige kasutajana. + reply: + wrong_user: Oled sisse loginud kui "%{user}" aga sõnum, millele soovid vastata ei olnud sellele kasutajale saadetud. Vastamiseks palun logi sisse õige kasutajana. sent_message_summary: delete_button: Kustuta + note: + description: + closed_at_by_html: Lahendatud %{when} tagasi kasutaja %{user} poolt + closed_at_html: Lahendatud %{when} tagasi + commented_at_by_html: Uuendatud %{when} tagasi kasutaja %{user} poolt + commented_at_html: Uuendatud %{when} tagasi + opened_at_by_html: Loodud %{when} tagasi kasutaja %{user} poolt + opened_at_html: Loodud %{when} tagasi + reopened_at_by_html: Taasaktiveeritud %{when} tagasi kasutaja %{user} poolt + reopened_at_html: Taasaktiveeritud %{when} tagasi + entry: + comment: Kommentaar + full: Täielik tekst + mine: + ago_html: "%{when} tagasi" + created_at: Loodud + creator: Looja + description: Kirjeldus + heading: Kasutaja %{user} märkused + id: ID + last_changed: Viimati muudetud + subheading: Kasutaja %{user} loodud või kommenteeritud märkused + title: Kasutaja %{user} loodud või kommenteeritud märkused + rss: + closed: suletud märkus (lähedal kohale %{place}) + commented: uus kommentaar (lähedal kohale %{place}) + description_area: Loetelu märkustest mida teatati, kommenteeriti või suleti sinu piirkonnas [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Märkuse %{id} RSS uudisvoog + opened: uus märkus (lähedal kohale %{place}) + reopened: taasaktiveeritud märkus (lähedal kohale %{place}) + title: OpenStreetMap märkused notifier: diary_comment_notification: + footer: Loe kommentaari lehel %{readurl}. Võid lisada oma kommentaari lehel %{commenturl} või vastata kommentaarile lehel %{replyurl}. + header: "%{from_user} on kommenteerinud sinu hiljutist OpenStreetMap päeviku sissekannet pealkirjaga %{subject}:" hi: Tere, %{to_user}! subject: "[OpenStreetMap] %{user} kommenteeris sinu päeviku sissekannet" email_confirm: subject: "[OpenStreetMap] Kinnita oma e-posti aadress" email_confirm_html: + click_the_link: Kui see oled sina, siis palun kliki allolevale lingile muudatuse kinnitamiseks. greeting: Tere, + hopefully_you: Keegi (loodetavasti sina) soovib muuta oma %{server_url} meiliaadressi kujule %{new_address}. email_confirm_plain: + click_the_link: Kui see oled sina, siis palun kliki allolevale lingile muudatuse kinnitamiseks. greeting: Tere, + hopefully_you: Keegi (loodetavasti sina) soovib muuta oma %{server_url} meiliaadressi kujule %{new_address}. friend_notification: + befriend_them: Sa võid ta lisada oma sõbraks aadressil %{befriendurl}. + had_added_you: "%{user} lisas sind OpenStreetMapis sõbraks." + see_their_profile: Tema profiiliga võid tutvuda aadressil %{userurl}. subject: "[OpenStreetMap] %{user} lisas sind oma sõbraks" gpx_notification: + and_no_tags: ja millel sildid puuduvad. + and_the_tags: "ja järgmised sildid:" + failure: + failed_to_import: "importimine ebaõnnestus. Siin on viga:" + more_info_1: Rohkem infot GPX importimise tõrgete ja selle kohta, kuidas + more_info_2: "neid vältida leiab:" + subject: "[OpenStreetMap] GPX importimine nurjus" greeting: Tere, + success: + loaded_successfully: laaditi üles edukalt %{trace_points} punkti võimalikust %{possible_points} punktist. + subject: "[OpenStreetMap] GPX Importimine õnnestus" + with_description: ", mille kirjeldus on" + your_gpx_file: Paistab, et sinu GPX-fail + lost_password: + subject: "[OpenStreetMap] Parooli lähtestamise taotlus" lost_password_html: + click_the_link: Kui see oled sina, siis palun kliki allaolevale lingile oma parooli lähtestamiseks. greeting: Tere, + hopefully_you: Keegi (tõenäoliselt sina) on esitanud taotluse oma parooli lähtestamiseks antud meiliaadressiga openstreetmap.org kasutajakonto alt. lost_password_plain: + click_the_link: Kui see oled sina, siis palun kliki allaolevale lingile oma parooli lähtestamiseks. greeting: Tere, + hopefully_you: Keegi (tõenäoliselt sina) on esitanud taotluse oma parooli lähtestamiseks antud meiliaadressiga openstreetmap.org kasutajakonto alt. message_notification: + footer_html: Sõnumit võib lugeda samuti lehel %{readurl} ja vastata sellele %{replyurl}. + header: "%{from_user} on saatnud sulle OpenStreetMapi kaudu sõnumi teemaga %{subject}:" hi: Tere, %{to_user}, + note_comment_notification: + anonymous: Anonüümne kasutaja + closed: + commented_note: "%{commenter} on lahendanud märkuse, mida sa oled kommenteerinud. Märkus on %{place} lähedal." + subject_other: "[OpenStreetMap]%{commenter} on lahendanud ühe märkuse millest sa huvitatud oled" + subject_own: "[OpenStreetMap]%{commenter} on lahendanud ühe sinu märkuse" + your_note: "%{commenter} on lahendanud ühe sinu märkuse %{place} lähedal." + commented: + commented_note: "%{commenter} on jätnud kommentaari märkusele mida sa oled kommenteerinud. Märkus on %{place} lähedal." + subject_other: "[OpenStreetMap] %{commenter} on kommenteerinud märkust, millest oled huvitatud" + subject_own: "[OpenStreetMap] %{commenter} on kommenteerinud ühte sinu märkust" + your_note: "%{commenter} on jätnud kommentaari ühele sinu %{place} lähedal olevale märkusele." + details: Märkuse lisateavet leiad %{url}. + greeting: Tere, + reopened: + commented_note: "%{commenter} on taasaktiveerinud märkuse, mida sa oled kommenteerinud. Märkus on %{place} lähedal." + subject_other: "[OpenStreetMap] %{commenter} on taasaktiveerinud ühe märkuse, millest sa huvitatud oled" + subject_own: "[OpenStreetMap] %{commenter} on taasaktiveerinud ühe sinu märkustest" + your_note: "%{commenter} on taasaktiveerinud ühe sinu märkuse %{place} lähedal." signup_confirm: - subject: "[OpenStreetMap] E-posti aadressi kinnitamine" - signup_confirm_plain: - greeting: Hei! + confirm: "Enne kasutajakonto loomist peame saama kinnituse, et see taotlus tuli sinult ja selleks klõpsa alloleval lingil:" + created: Keegi (loodetavasti sina) lõi äsja %{site_url} kasutajakonto. + greeting: Tere! + subject: "[OpenStreetMap] Tere tulemast OpenStreetMappi" + welcome: Peale seda, kui oled kinnitanud enda konto pakume sulle lisainfot, et saaksid kasutamist hõlpsalt alustada. oauth: oauthorize: + allow_read_gpx: lugeda sinu privaatseid GPS jälgi. + allow_read_prefs: lugeda sinu kasutajaeelistusi. + allow_to: "Klientrakendusel lubatakse:" allow_write_api: muuda kaarti. + allow_write_diary: luua päeviku sissekandeid, kommentaare ja saada sõbraks. + allow_write_gpx: laadida üles GPS jälgi. + allow_write_notes: muuta märkuseid. + allow_write_prefs: muuta sinu kasutajaeelistusi. + request_access: See rakendus %{app_name} taotleb juurdepääsu sinu kasutajakontole, %{user}. Palun kontrolli, kas sa soovid, et rakendus omaks järgmisi võimalusi. Sa võid valida neist nii palju või vähe kui soovid. + title: Lubada juurdepääs sinu kontole + oauthorize_failure: + denied: Oled keelanud rakendusele %{app_name} juurdepääsu oma kontole. + invalid: Autoriseerimisluba ei ole kehtiv. + title: Autoriseerimistaotlus ebaõnnestus + oauthorize_success: + allowed: Oled andnud rakendusele %{app_name} juurdepääsu oma kontole. + title: Autoriseerimise taotlemine on lubatud + verification: Kontrollkood on %{code}. + revoke: + flash: Oled tühistanud %{application} tõendi oauth_clients: + create: + flash: Teave registreeriti edukalt. + destroy: + flash: Klientrakenduse registratsioon hävitati edit: submit: Redigeeri - title: Redigeeri oma avaldust + title: Redigeeri oma rakendust form: + allow_read_gpx: lugeda enda privaatseid GPS-radasid. + allow_read_prefs: lugeda oma kasutajaeelistusi. + allow_write_api: muuta kaarti. + allow_write_diary: luua päeviku sissekandeid, kommenteerida ja saada sõpradeks. + allow_write_gpx: laadida üles GPS-radasid. + allow_write_notes: muuta märkuseid. + allow_write_prefs: muuta oma kasutajaeelistusi. + callback_url: Tagasihelistamise URL name: Nimi + requests: "Kasutajalt nõutakse järgmisi õiguseid:" + required: Nõutav + support_url: Toe URL + url: Põhirakenduse URL index: - application: Avalduse nimi + application: Rakenduse nimi + issued_at: Väljastatud + list_tokens: "Järgmised turvamärgid on rakendustele väljastatud sinu nime all:" + my_apps: Minu klientrakendused + my_tokens: Minu autoriseeritud rakendused + no_apps: Kas omad rakendust, mida soovid siin kasutamiseks registreerida, kasutades %{oauth} standardit? Selleks tuleb kõigepealt registreerida oma veebirakendus enne kui see saab teostada OAuth päringuid antud teenusele. + register_new: Registreeri oma rakendus + registered_apps: "Sul on registreeritud on järgmised klientrakendused:" + revoke: Tühista! + title: Minu OAuth seaded new: submit: Registreeri - title: Registreeri uus avaldus + title: Registreeri uus rakendus + not_found: + sorry: Kahjuks tüüpi %{type} ei leitud. + show: + access_url: "Pääsutõendi URL:" + allow_read_gpx: lugeda nende privaatseid GPS-radasid. + allow_read_prefs: lugeda nende kasutajaeelistusi. + allow_write_api: muuta kaarti. + allow_write_diary: luua päeviku sissekandeid, kommenteerida ja saada sõbraks. + allow_write_gpx: laadida üles GPS-radasid. + allow_write_notes: muuta märkuseid. + allow_write_prefs: muuta nende kasutajaeelistusi. + authorize_url: "Autoriseeriv URL:" + confirm: Kas oled kindel? + delete: Kustuta klient + edit: Muuda üksikasju + key: "Tarbija võti:" + requests: "Järgnevate õiguste taotlemine kasutajalt:" + secret: "Tarbija saladus:" + support_notice: Me toetame HMAC-SHA1 (soovitatav) ja RSA-SHA1 allkirju. + title: OAuth üksikasjad %{app_name} + url: Taotlustõendi URL + update: + flash: Kliendi informatsioon uuendati edukalt + redaction: + create: + flash: Redaktsioon on loodud. + destroy: + error: Viga selle redaktsiooni hävitamisel. + flash: Redaktsioon hävitatud. + not_empty: Redaktsioon ei ole tühi. Palun eemaldage enne selle hävitamist kõik versioonid, mis kuuluvad selle redaktsiooni alla. + edit: + description: Kirjeldus + heading: Redigeeri redaktsiooni + submit: Salvesta redaktsioon + title: Redigeeri redaktsiooni + index: + empty: Redaktsioone pole näidata. + heading: Redaktsioonide loend + title: Redaktsioonide loend + new: + description: Kirjeldus + heading: Sisesta teave uue redaktsiooni kohta + submit: Loo redaktsioon + title: Uue redaktsiooni loomine + show: + confirm: Kas oled kindel? + description: "Kirjeldus:" + destroy: Kustuta see redaktsioon + edit: Muuda seda redaktsiooni + heading: Näidatakse redaktsiooni "%{title}" + title: Nähtaval redaktsioon + user: "Looja:" + update: + flash: Salvestati muudatused. site: edit: + anon_edits_link_text: Uuri välja, miks see on nii. + flash_player_required: Sa vajad Flash playerit Potlatchi kasutamiseks. Sa saad Flash Playeri laadida alla lehelt Adobe.com. OpenStreetMapi redigeerimiseks on olemas ka mitmeid teisi võimalusi. + id_not_configured: iD ei ole seadistatud + no_iframe_support: Antud veebilehitseja ei toeta HTML iframes funktsiooni mis on vajalik antud režiimi toimimiseks. + not_public: Sa ei ole seadnud oma muudatused avalikuks. + not_public_description: Sa ei saa enam anonüümselt kaarti muuta. Sa saad muuta oma muudatused avalikuks lehel %{user_page}. + potlatch2_not_configured: Potlatch 2 pole konfigureeritud - lisateavet vaata palun http://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.) + 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.) user_page_link: kasutajaleht index: + createnote: Lisa märkus js_1: Sa kas kasutad veebilehitsejat, mis ei toeta JavaScript'i või sa oled JavaScript'i ära keelanud. + js_2: OpenStreetMap kasutab JavaScripti kaartide laadimiseks. license: - project_name: OpenStreetMap projekt + copyright: Autoriõigused OpenStreetMap ja kaasautorid avatud litsentsi alusel permalink: Püsilink + remote_failed: Redigeerimise ebaõnnestus - veendu, et JOSM või Merkaartor töötab ning kaugjuhtimine on lubatud shortlink: Lühilink key: - map_key: Legend - map_key_tooltip: Kaardi legend table: entry: admin: Halduspiir @@ -847,11 +1280,28 @@ et: unclassified: Klassifitseerimata tee unsurfaced: Katteta tee wood: Mets + markdown_help: + alt: Alternatiivne tekst + first: Esimene kirje + heading: Pealkiri + headings: Pealkirjad + image: Pilt + link: Link + ordered: Nummerdatud loetelu + second: Teine kirje + subheading: Alapealkiri + text: Tekst + title_html: Parsitud Markdowniga + unordered: Nummerdamata loetelu + url: URL + richtext_area: + edit: Muuda + preview: Eelvaade search: search: Otsi - search_help: "näit.: 'Laagri', 'Pargi, Tartu' või 'ATM near Kohila' veel näiteid... (ingl. k)" submit_text: Otsi - where_am_i: Kus ma olen? + where_am_i: Kus ma asun? + where_am_i_title: Määra praegune asukoht otsimootori abil sidebar: close: Sulge search_results: Otsingu tulemused @@ -860,6 +1310,7 @@ et: friendly: "%e %B %Y kell %H:%M" trace: create: + trace_uploaded: Sinu GPX-fail on üles laaditud ja ootab andmebaasi sisestamist. See võtab aega tavaliselt pool tundi kuni tund. Peale lõpetamist saadetakse sulle meil. upload_trace: Laadi üles GPS-rada edit: description: "Kirjeldus:" @@ -872,27 +1323,40 @@ et: save_button: Salvesta muudatused start_coord: "Alguskoordinaadid:" tags: "Sildid:" + tags_help: komaga eraldatud uploaded_at: "Üles laaditud:" visibility: "Nähtavus:" visibility_help: Mida see tähendab? + list: + description: Sirvi viimati üles laaditud GPS-radasid + public_traces: Avalikud GPS rajad + public_traces_from: Kasutaja %{user} avalikud GPS rajad + tagged_with: ", millel on silt %{tags}" + your_traces: Sinu GPS rajad trace: ago: "%{time_in_words_ago} tagasi" - count_points: - one: "%{count} punkt" - other: "%{count} punkti" + by: kasutajalt + count_points: "%{count} punkti" edit: redigeeri edit_map: Redigeeri kaarti + identifiable: TUVASTATAV + in: kohas + map: asukoht kaardil more: rohkem pending: OOTEL - trace_details: Vaata Jälje Detaile + private: PRIVAATNE + public: AVALIK + trace_details: Vaata jälje teavet + trackable: JÄLGITAV view_map: Vaata kaarti trace_form: - description: Kirjeldus + description: "Kirjeldus:" help: Abi tags: "Sildid:" + tags_help: komaga eraldatud upload_button: Laadi üles - upload_gpx: "Laadi GPX-fail üles:" - visibility: Nähtavus + upload_gpx: "Laadi üles GPX-fail:" + visibility: "Nähtavus:" visibility_help: mida see tähendab? trace_header: see_all_traces: Vaata kõiki GPS-radasid @@ -901,9 +1365,9 @@ et: trace_optionals: tags: Sildid trace_paging_nav: - next: Järgmine » - previous: « Eelmine - showing_page: Näitan lehekülge %{page} + newer: Uuemad jäljed + older: Vanemad jäljed + showing_page: Leht %{page} view: delete_track: Kustuta see jälg description: "Kirjeldus:" @@ -915,31 +1379,45 @@ et: none: Puuduvad owner: "Omanik:" pending: OOTEL - points: "Punktid:" + points: "Punkte:" start_coordinates: "Alguskoordinaadid:" tags: "Sildid:" trace_not_found: Jälge ei leitud! uploaded: "Üles laaditud:" visibility: "Nähtavus:" + visibility: + identifiable: Tuvastatav (nähtav jälgede loendis ja tuvastatav, järjestatud punktid koos ajatemplitega) + private: Privaatne (jagatud ainult anonüümselt, järjestamata punktid) + public: Avalik (nähtav jälgede loendis ja anonüümsena, järjestamata punktid) + trackable: Jälgitav (jagatud ainult anonüümselt, järjestatud punktid koos ajatemplitega) user: account: contributor terms: + agreed: Oled nõustunud uute Kaastöö tingimustega. + agreed_with_pd: Samuti oled deklareerinud oma kaastöö autoriõigustest vabaks (Public Domain). heading: "Kaastöö tingimused:" link text: Mis see on? + not yet agreed: Sa ei ole veel nõustunud uute Kaastöö tingimustega. + review link text: Loe ja nõustu uute Kaastöö tingimustega klõpsates endale sobival ajal antud lingil. current email address: "Praegune e-posti aadress:" delete image: Eemalda praegune pilt email never displayed publicly: (ei näidata mitte kunagi avalikult) flash update success: Kasutaja informatsioon uuendatud edukalt. + flash update success confirm needed: Kasutajateabe värskendamine õnnestus. Kontrolli oma elektronposti, et kinnitada oma uus e-posti aadress. + gravatar: + gravatar: Kasuta Gravatari + link text: mis see on? home location: "Kodu asukoht:" image: "Pilt:" image size hint: (ruudukujuline pilt mõõtudega vähemalt 100x100 on sobiv) keep image: Säilitada praegune pilt latitude: "Laiuskraadid:" longitude: "Pikkuskraadid:" + make edits public button: Tee kõik minu muudatused avalikuks my settings: Minu seaded new email address: "Uus e-posti aadress:" new image: Lisa pilt - no home location: Sa pole oma kodupaika märkinud. + no home location: Sa pole oma kodu asukohta märkinud. openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: mis see on? @@ -948,43 +1426,94 @@ et: preferred languages: "Eelistatud keeled:" profile description: "Profiili kirjeldus:" public editing: + disabled: Keelatud ja ei saa andmeid muuta, kõik varasemad muudatused on anonüümsed. disabled link text: Miks ma ei saa kaarti töödelda? + enabled: Lubatud. Pole anonüümne ja saab andmeid muuta. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: Mis see on? heading: "Avalikud seaded:" public editing note: heading: Avalik toimetamine + text: Praegu on su muudatused anonüümsed ja inimesed ei saa saata sulle sõnumeid ega näha sinu asukohta. Et näha, mida sa muutsid ja võimaldada inimestel sinuga ühendust võtta selle veebilehe kaudu klõpsa alljärgneval nupul. Peale üleminekut API versioonile 0.6 võivad kaardi andmeid muuta ainult avalikud kasutajad. (uurige välja, miks).
    • Sinu elektronposti aadressi ei avalikustata avalikuks muutumisel.
    • Seda toimingut ei saa tühistada ja kõik uued kasutajad on nüüdsest vaikimisi avalikud.
    replace image: Asenda praegune pilt return to profile: Tagasi profiili juurde save changes button: Salvesta muudatused title: Redigeeri kasutajakontot + update home location on click: Kas uuendan kodu asukohta kui ma klõpsan kaardil? confirm: already active: See konto on juba kinnitatud. button: Kinnita - heading: Kinnita kasutajakonto + heading: Kontrolli oma e-posti. + introduction_1: Me saatsime sulle kinnitusmeili. + introduction_2: Kinnita oma konto, klikkides meilis lingile ja sa saad alustada kaardistamist. press confirm button: Vajuta allolevale kinnitamise nupule, et oma kasutajakonto aktiveerida. + reconfirm_html: Kui soovid, et saadaksime sulle uuesti kinnitusmeili, siis kliki siia. + unknown token: See kinnituskood on aegunud või seda pole olemas. confirm_email: button: Kinnita + failure: E-posti aadress on juba antud pääsuloaga kinnitatud. heading: Kinnita e-posti aadressi muutmine + press confirm button: Kliki nupul kinnita oma uue e-posti aadressi kinnitamiseks. + success: Sinu eposti aadress on kinnitatud, tänan registreerimast! confirm_resend: failure: Kasutajat %{name} ei leitud. + success: Me saatsime sulle uue kinnitusmeili aadressile %{email} ja niipea kui oled oma konto kinnitanud saad alustada kaardistamist.

    Kui sa kasutad rämpskirjade vastast süsteemi, mis saadab kinnitustaotluse, siis veendu, et oled kandnud aadressi webmaster@openstreetmap.org valgesse nimekirja, sest me ei ole võimelised vastama ühelegi kinnitustaotlusele. filter: not_an_administrator: Selle tegevuse sooritamiseks pead sa olema administraator. + go_public: + flash success: Kõik sinu muudatused on nüüd avalikud ja sul on lubatud muudatusi teha. list: + confirm: Kinnita valitud kasutajad empty: Sobivaid kasutajaid ei leitud! heading: Kasutajad hide: Peida valitud Kasutajad + showing: + one: Lehekülg %{page} (%{first_item} / %{items}) + other: Lehekülg %{page} (%{first_item}-%{last_item} / %{items}) + summary: "%{name} loodud ip aadressilt %{ip_address} %{date}" summary_no_ip: "%{name} loodud %{date}" title: Kasutajad login: + account is suspended: Vabandust, sinu kasutajakonto on peatatud kahtlase tegevuse tõttu.
    Palun võta ühendust veebimeistriga kui soovid sellel teemal arutleda. + account not active: Vabandust, sinu kasutajakonto ei ole veel aktiivne.
    Aktiveerimiseks klõpsa palun lingil, mis saadeti sulle meiliga, või taotle uut kontot kinnitavat meili. + auth failure: Vabandust, kahjuks ei saa nende andmetega sisse. + create account minute: Loo kasutajakonto. See võtab vaid hetke. email or username: "E-posti aadress või kasutajanimi:" heading: Logi sisse login_button: Logi sisse lost password link: Salasõna ununes? + new to osm: Oled uus OpenStreetMap kasutaja? + no account: Sa ei ole veel registreerinud kasutajaks? openid: "%{logo} OpenID:" + openid invalid: Vabandust, sinu OpenID näib olevat vigane + openid missing provider: Vabandust, kahjuks ei õnnestu luua ühendust sinu OpenID pakkujaga + openid_logo_alt: Sisene OpenID tunnusega + openid_providers: + aol: + alt: Sisene AOL OpenID tunnusega + title: Sisene AOL tunnusega + google: + alt: Sisene Google'i OpenID tunnusega + title: Sisene Google'i tunnusega + myopenid: + alt: Sisene MyOpenID OpenID tunnusega + title: Sisene MyOpenID tunnusega + openid: + alt: Sisene OpenID URL abil + title: Sisene OpenID tunnusega + wordpress: + alt: Sisene Wordpress OpenID tunnusega + title: Sisene Wordpress tunnusega + yahoo: + alt: Sisene Yahoo OpenID tunnusega + title: Sisene Yahoo tunnusega password: "Parool:" + register now: "Registreeru:" remember: "Jäta mind meelde:" - title: Sisselogimise lehekülg + title: Sisselogimise leht + to make changes: Muudatuste tegemiseks OpenStreetMap andmetes peab sul olema kasutajakonto. + with openid: "Või kasuta sisse logimiseks oma OpenID kasutajat:" + with username: Kas omad juba OpenStreetMap kasutajakontot? Palun logi sisse enda kasutajanime ja salasõnaga. logout: heading: Välju OpenStreetMap -st logout_button: Logi välja @@ -995,23 +1524,36 @@ et: help_text: Sisesta e-posti aadress, mida kasutasid registreerumisel. Me saadame sinna lingi, mida saad kasutada oma parooli uuesti seadmiseks. new password button: Saada mulle uus salasõna notice email cannot find: Seda e-posti aadressi ei leitud. + notice email on way: Kahju, et sa parooli kaotasid :-( kuid ära muretse, peagi saad meili, et saaksid oma parooli ära muuta. title: Unustatud salasõna make_friend: already_a_friend: Sa oled kasutajaga %{name} juba sõber. + button: Lisa sõbraks failed: Vabandust, kasutaja %{name} sõbraks lisamine ebaõnnestus. - success: "%{name} on nüüd Sinu sõber." + heading: Lisada %{user} sõbraks? + success: "%{name} on nüüd sinu sõber." new: + about: + header: Vaba ja muudetav + html: "

    Erinevalt teistest kaartidest on OpenStreetMap loodud samade inimeste poolt nagu sina ja igaüks võib seda parandada, täiendada, alla laadida ja kasutada.

    \n

    Registreeru, et alustada kaardi täiendamist. Me saadama sulle meili, et saaksid kinnitada oma kasutajakonto.

    " confirm email address: "Kinnita e-posti aadress:" confirm password: "Kinnita parool:" - continue: Jätka + contact_webmaster: Palun võta ühendust veebimeistriga, et kasutajakonto luua - me üritame tegeleda selle taotlusega nii kiiresti kui võimalik. + continue: Registreeru display name: "Kuvatav nimi:" display name description: Avalikult kuvatud kasutajanimi. Seda saate muuta hiljem eelistustes. email address: "E-posti aadress:" - fill_form: Täitke vorm ning me saadame teile e-posti konto aktiveerimiseks. - heading: Loo uus kasutajanimi + license_agreement: Oma kasutajakonto kinnitamiseks pead nõustuma kaastöö tingimustega. + no_auto_account_create: Kahjuks ei ole meil võimalik luua hetkel sinu jaoks automaatselt kontot. + not displayed publicly: Ei näidata avalikult (vaata privaatsusreegleid) openid: "%{logo} OpenID:" + openid association: "

    Sinu OpenID ei ole seotud veel OpenStreetMapi kasutajakontoga.

    \n
      \n
    • Kui oled uus OpenStreetMapi kasutaja, siia loo palun uus konto, kasutades alljärgnevat vormi.
    • \n
    • \n Kui sul juba on kasutajakonto, siis võid siseneda oma kontoga,\n kasutades oma kasutajanime ja parooli ja seejärel siduda oma\n kasutajakonto oma OpenID-ga kasutaja seadistuste all.\n
    • \n
    " + openid no password: OpenID kasutamisel ei ole parool kohustuslik, kuid mõned eritööriistad või serverid nõuavad seda siiski. password: "Uus parool:" - title: Loo uus konto + terms accepted: Täname, et nõustusid uute kaastöö tingimustega! + terms declined: Meil on kahju, et otsustasid mitte nõustuda uute kaastöö tingimustega. Lisateabe saamiseks vaata seda wiki lehte. + title: Registreerumine + use openid: Teise võimalusena kasuta %{logo} OpenID sisselogimist no_such_user: body: Vabandust kuid kasutajat nimega %{user} pole olemas. Kontrolli sisestatud lingi õigekirja. Võimalik, et link millele sa vajutasid on vigane. heading: Kasutajat %{user} pole olemas @@ -1021,90 +1563,232 @@ et: nearby mapper: Lähedaloevad kaardistajad your location: Sinu asukoht remove_friend: + button: Eemalda sõprade hulgast + heading: Eemaldada %{user} sõprade hulgast? not_a_friend: "%{name} ei ole üks sinu sõpradest." success: "%{name} eemaldati sinu sõprade hulgast." reset_password: confirm password: "Kinnita parool:" flash changed: Sinu parool on muudetud. + flash token bad: Ei leitud sellist kinnituskoodi. Kontrolli URL-i. heading: Lähtesta parool kasutajale %{user} password: "Parool:" reset: Lähtesta parool title: Lähtesta parool set_home: flash success: Kodukoht edukalt salvestatud + suspended: + body: "

    \n Vabandame, teie konto on automaatselt peatatud kahtlase tegevuse tõttu.\n

    \n

    \n Käesolev otsus vaadatakse administraatori poolt peatselt üle, või\n võite kontakteeruda %{webmaster} kui soovite seda arutada.\n

    " + heading: Konto peatatud + title: Konto peatatud + webmaster: Veebiülem terms: agree: Nõustun - consider_pd_why: Mis see on? + consider_pd: Eelnevale nõusolekule lisaks leian, et minu kaastöö kuulub avalikku omandisse (Public Domain) + consider_pd_why: mis see on? decline: Ei nõustu + guidance: "Informatsioon, mis aitab mõista neid tingimusi: a inimloetav kokkuvõte mõned mitteametlikud tõlked" + heading: "Kaastöötingimused:" legale_names: france: Prantsusmaa italy: Itaalia rest_of_world: Muu maailm legale_select: "Palun valige oma elukohariik:" + read and accept: Palun loe lepingut ja vajuta nuppu "Nõustun" kinnitamaks, et nõustud selle lepingu tingimustega oma olemasoleva ja edaspidise kaastöö jaoks. + title: "Kaastöötingimused:" + you need to accept or decline: Enne jätkamist palun tutvu uute Kaastöötingimustega ja seejärel kas nõustu või ära nõustu nendega. view: activate_user: aktiveeri see kasutaja add as friend: lisa sõbraks ago: (%{time_in_words_ago} tagasi) + block_history: saadud blokeeringud + blocks by me: Minu antud blokeeringud + blocks on me: Saadud blokeeringud + comments: kommentaarid confirm: Kinnita + confirm_user: kinnita see kasutaja create_block: blokeeri see kasutaja ct accepted: Vastu võetud %{ago} tagasi + ct declined: Tagasi lükatud + ct status: "Kaastöötingimused:" + ct undecided: Otsustamata + deactivate_user: desaktiveeri see kasutaja delete_user: kustuta see kasutaja description: Kirjeldus - diary: päevik - edits: muudatused + diary: Päevik + edits: Muudatused email address: "E-posti aadress:" + friends_changesets: Sõprade muutuskogumid + friends_diaries: Sõprade päevikusissekanded hide_user: peida see kasutaja + if set location: Määra kodu asukoht lehel %{settings_link}, et näha läheduses asuvaid kasutajaid. km away: "%{count} kilomeetri kaugusel" latest edit: "Viimane muudatus %{ago}:" m away: "%{count} meetri kaugusel" mapper since: "Kaardistaja alates:" - my diary: minu päevik - my edits: minu muutmised - my settings: minu seaded - my traces: minu jäljelogid + moderator_history: antud blokeeringud + my comments: Minu kommentaarid + my diary: Minu päevik + my edits: Minu muutmised + my messages: Minu sõnumid + my notes: Minu märkused + my profile: Minu profiil + my settings: Minu seadistused + my traces: Minu jäljelogid nearby users: Teised lähedal asuvad kasutajad + nearby_changesets: Lähedalasuvate kasutajate muutuskogumid + nearby_diaries: Lähedalasuvate kasutajate päevikusissekanded new diary entry: uus päevikusissekanne no friends: Sa ei ole lisanud veel ühtegi sõpra. no nearby users: Puuduvad teised kasutajad, kes tunnistavad, et kaardistavad läheduses. + notes: Märkused oauth settings: oauth seaded - remove as friend: Eemalda sõprade hulgast + remove as friend: eemalda sõprade hulgast role: administrator: See kasutaja on administraator + grant: + administrator: Omista administraatori õigused + moderator: Omista moderaatori õigused moderator: See kasutaja on moderaator - send message: saada sõnum + revoke: + administrator: Eemalda administraatori õigused + moderator: Eemalda moderaatori õigused + send message: Saada sõnum settings_link_text: seaded spam score: "Rämpsposti tulemus:" status: "Staatus:" - traces: jäljelogid + traces: Jäljelogid unhide_user: muuda see kasutaja nähtavaks user location: Kasutaja asukoht your friends: Sinu sõbrad user_block: + blocks_by: + empty: Kasutaja %{name} ei ole veel andnud ühtegi blokeeringut. + heading: Kasutaja %{name} antud blokeeringud + title: Kasutaja %{name} antud blokeeringud + blocks_on: + empty: Kasutajat %{name} ei ole veel kordagi blokeeritud. + heading: Kasutaja %{name} blokeeringud + title: Kasutaja %{name} blokeeringud + create: + flash: Blokeeriti kasutaja %{name}. + try_contacting: Palun ürita võtta ühendust kasutajaga enne blokeerimist, andes talle võimalust mõistliku aja jooksul vastata. + try_waiting: Palun ürita enne kasutaja blokeerimist anda talle võimalus mõistliku aja jooksul reageerida. edit: back: Vaata kõiki blokeeringuid + heading: Kasutaja %{name} blokeeringu muutmine + needs_view: Kas kasutaja peab sisse logima enne kui see blokeering eemaldatakse? + period: Kui kaua sellest hetkest alates on kasutaja API-st blokeeritud. + reason: Põhjus, miks %{name} blokeeritakse. Palun ole nii rahulik ja mõistlik kui võimalik, andes olukorrast nii palju üksikasju kui võimalik. Pea meeles, et mitte kõik kasutajad ei pruugi mõista kogukonna žargooni ja seepärast palun ürita kasutada tavainimesele arusaadavat sõnastust. + show: Vaata seda blokeeringut + submit: Uuenda blokeeringut + title: Kasutaja %{name} blokeeringu muutmine + filter: + block_expired: Blokeering on juba aegunud ja seda ei saa muuta. + block_period: Blokeeringu ajavahemik peab olema üks valitav rippmenüü loendi väärtus. helper: time_future: Lõppeb %{time}. time_past: Lõppes %{time} tagasi. until_login: Aktiivne kuni kasutaja logib sisse. + index: + empty: Ühtegi blokeeringut pole veel antud. + heading: Kasutaja blokeeringute loetelu + title: Kasutaja blokeeringud + model: + non_moderator_revoke: Blokeeringu eemaldamiseks pead olema moderaator. + non_moderator_update: Blokeeringu loomiseks või uuendamiseks pead olema moderaator. new: back: Vaata kõiki blokeeringuid + heading: Blokeeringu loomine kasutajale %{name} + needs_view: Kasutaja peab sisse logima enne kui see blokeering eemaldatakse. + period: Kui kaua sellest hetkest alates on kasutaja API-st blokeeritud. + reason: Põhjus, miks %{name} blokeeritakse. Palun ole nii rahulik ja mõistlik kui võimalik, andes olukorrast nii palju üksikasju kui võimalik, pidades meeles, et see teade on avalikkusele nähtav. Pea meeles, et mitte kõik kasutajad ei pruugi mõista kogukonna žargooni ja seepärast palun ürita kasutada tavainimesele arusaadavat sõnastust. + submit: Loo blokeering + title: Blokeeringu loomine kasutajale %{name} + tried_contacting: Olen võtnud ühendust kasutajaga ja palunud teda lõpetada. + tried_waiting: Olen andnud kasutajale mõistlikul hulgal aega, et vastata nendele teadetele. + not_found: + back: Tagasi loendisse + sorry: Vabandust, blokeeritud kasutajat ID-ga %{id} ei leitud. partial: confirm: Oled Sa kindel? + creator_name: Looja + display_name: Blokeeritud kasutaja edit: Redigeeri + next: Järgmine » + not_revoked: (pole tühistatud) + previous: « Eelmine reason: Blokeerimise põhjus + revoke: Tühista! + revoker_name: Tühistanud show: Näita + showing_page: Leht %{page} + status: Olek + period: + one: 1 tund + other: "%{count} tundi" + revoke: + confirm: Kas oled kindel, et soovid seda blokeeringut tühistada? + flash: See blokeering on tühistatud. + heading: Blokeeringu %{block_on} eemaldamine, mille oli andnud %{block_by} + past: See blokeering lõppes %{time} tagasi ja seda ei saa enam tagasi võtta. + revoke: Tühista! + time_future: See blokeering lõpeb %{time} pärast. + title: Blokeeringu %{block_on} eemaldamine show: back: Vaata kõiki blokeeringuid confirm: Oled Sa kindel? edit: Redigeeri + heading: "%{block_on} blokeeritud kasutaja %{block_by} poolt" + needs_view: Kasutaja peab sisse logima enne kui see blokeering eemaldatakse. reason: "Blokeerimise põhjus:" + revoke: Tühista! revoker: Tühistaja show: Näita status: Olek time_future: Lõpeb %{time} time_past: Lõppes %{time} tagasi + title: "%{block_on} blokeeritud kasutaja %{block_by} poolt" + update: + only_creator_can_edit: Seda saab muuta ainult moderaator, kes selle blokeeringu andis. + success: Blokeering uuendatud. user_role: + filter: + already_has_role: Kasutajal on juba roll %{role}. + doesnt_have_role: Kasutajal ei ole rolli %{role}. + not_a_role: String `%{role}' ei ole kehtiv roll. + not_an_administrator: Kasutaja rollide haldamist saavad teostada ainult administraatorid, kuid sina ei ole administraator. grant: + are_you_sure: Oled kindel, et soovid anda rolli `%{role}' kasutajale `%{name}'? confirm: Kinnita + fail: Ei õnnestu anda rolli `%{role}' kasutajale `%{name}'. Palun veendu, et kasutaja ja roll on mõlemad kehtivad. + heading: Kinnita rolli andmine + title: Kinnita rolli andmine revoke: + are_you_sure: Oled kindel, et soovid tühistada kasutaja `%{name}' rolli `%{role}'? confirm: Kinnita + fail: Ei õnnestu eemaldada rolli `%{role}' kasutajalt `%{name}'. Palun kontrolli, et kasutaja ja roll on mõlemad kehtivad. + heading: Kinnita rolli tühistamine + title: Kinnita rolli tühistamine + welcome_page: + add_a_note: + paragraph_1_html: Kui soovid teha väikest parandust ja sul pole aega registreeruda ning õppida, kuidas kaarti muuta, siis lisa lihtsalt kaardile märkus. + paragraph_2_html: "See on lihtne! Mine kaardile ja kliki märkuse ikoonile:\n. See lisab kaardile markeri, mida sa saad liigutada seda hiirega lohistades. Lisa oma sõnum, seejärel kliki \"Salvesta\" ja teised kaardistajad näevad seda." + title: Pole aega kaarti muuta? Lisa märkus! + basic_terms: + editor_html: Redaktor on programm või veebileht, mida saab kasutada kaardi redigeerimiseks. + node_html: Sõlm on punkt kaardil, nagu näiteks restoran või puu. + paragraph_1_html: OpenStreetMapil on omad erialased mõisted. Siin on mõned peamised mõisted, mida tasub meelde jätta. + tag_html: Silt sisaldab väikest hulka andmeid sõlme või joone kohta, näiteks restorani nime või tee kiiruspiirangut. + title: Põhilised mõisted kaardistamisel + way_html: Joon on joon või ala ja tähistab näiteks teed, oja, järve või hoonet. + introduction_html: Tere tulemast OpenStreetMappi, vabasse ja muudetavasse maailmakaarti. Registreerumine on nüüd tehtud ja sa võid alustada kaardistamist. Siin on lühiülevaade kõige olulisematest asjadest, mida peaksid teadma. + questions: + paragraph_1_html: "OpenStreetMap pakub erinevaid võimalusi projekti tundmaõppimiseks, küsimuste esitamiseks ja vastamiseks ning kaardistamise teemade üle üheskoos arupidamiseks ja dokumenteerimiseks.\nLeia abi siit." + title: Tekkis küsimusi? + start_mapping: Alusta kaardistamist + title: Tere tulemast! + whats_on_the_map: + off_html: Kaart ei sisalda arvamuslikke andmeid, nagu näiteks hinnangud, ajaloolisi või hüpoteetilisi omadusi, ega andmeid autoriõigustega kaitstud allikatest. Kui sul puudub eriluba siis ära kopeeri võrgus olevatelt või paberkaartidelt. + on_html: OpenStreetMap on koht, kus saab kaardile kanda objekte mis on reaalselt antud hetkel olemas - nendeks on miljonid hooned, teed ja muud üksikasjad. Sa võid kaardile kanda suvalisi reaalselt eksisteerivaid üksikasju, mis sulle huvi pakuvad. + title: Mis on kaardil? diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 48a54aa09cf..21736ca691a 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -6,6 +6,8 @@ # Author: Asieriko # Author: MikelEH # Author: PerroVerd +# Author: Subi +# Author: Theklan # Author: Xabier Armendaritz eu: activerecord: @@ -16,15 +18,16 @@ eu: language: Hizkuntza latitude: Latitude longitude: Longitude - title: Izenburua + title: Gaia user: Erabiltzailea friend: friend: Lagun user: Erabiltzailea message: body: Testua + recipient: Hartzailea sender: Igorlea - title: Izenburua + title: Gaia trace: description: Deskribapen latitude: Latitude @@ -49,107 +52,44 @@ eu: old_relation: Erlazio zaharra old_way: Bide zaharra relation: Erlazioa + session: Saioa + trace: Trazoa + tracepoint: Trazo puntua + tracetag: Trazo etiketa user: Lankide way: Bidea way_tag: Bidearen etiketa browse: changeset: - download: "%{changeset_xml_link} edo %{osmchange_xml_link} jaitsi" - changeset_details: - box: kutxa - closed_at: "Noiz itxita:" - created_at: "Noiz sortua:" - common_details: - changeset_comment: "Iruzkin:" - edited_at: "Noiz aldatuta:" - edited_by: "Nork aldatuta:" - version: "Bertsio:" + belongs_to: Egilea containing_relation: entry: "%{relation_name} erlazioa" - map: - deleted: Ezabatua - loading: Kargatzen... - node: - download: "%{download_xml_link}, %{view_history_link} edo %{edit_link}" - download_xml: XML jaitsi - edit: aldatu - node: Nodo - node_title: "%{node_name} nodoa" - view_history: historia ikusi - node_details: - coordinates: "Koordenatuak:" - node_history: - download: "%{download_xml_link} edo %{view_details_link}" - download_xml: XML jaitsi - view_details: xehetasunak ikusi + location: "Kokapena:" not_found: type: node: nodo relation: erlazio way: bide + note: + title: "Oharra: %{id}" relation: - download: "%{download_xml_link} edo %{view_history_link}" - download_xml: XML jaitsi - relation: Erlazio - relation_title: "%{relation_name} erlazioa" - view_history: historia ikusi - relation_details: - members: "Kideak:" - relation_history: - download: "%{download_xml_link} edo %{view_details_link}" - download_xml: XML jaitsi - view_details: xehetasunak ikusi + members: Kideak relation_member: type: node: Nodo relation: Erlazio way: Bide start_rjs: - data_frame_title: Datuak - data_layer_name: Datuak - details: Xehetasunak loading: Kargatzen... - object_list: - back: Objetu zerrenda erakutsi - details: Xehetasunak - heading: Objetu zerrenda - history: - type: - node: "[[id]]. nodoa" - way: "[[id]]. bidea" - selected: - type: - node: "[[id]]. nodoa" - way: "[[id]]. bidea" - type: - node: Nodo - way: Bide - private_user: erabiltzaile pribatua - show_history: Historia Ikusi - wait: Itxoin... tag_details: - tags: "Etiketak:" + tags: Etiketak timeout: type: relation: erlazio - way: - download: "%{download_xml_link}, %{view_history_link} edo %{edit_link}" - download_xml: XML jaitsi - edit: aldatu - view_history: historia ikusi - way: Bide - way_title: "%{way_name} bidea" - way_details: - nodes: "Nodoak:" - way_history: - download: "%{download_xml_link} edo %{view_details_link}" - download_xml: XML jaitsi - view_details: xehetasunak ikusi + version: Bertsioa changeset: changeset: anonymous: Anonimoa - big_area: (handia) - no_comment: (bat ere) changeset_paging_nav: next: Hurrengoa » previous: « Aurrekoa @@ -163,8 +103,9 @@ eu: hide_link: Iruzkin hau ezkutatu diary_entry: comment_count: - one: iruzkin bat + one: iruzkin %{count} other: "%{count} iruzkin" + zero: Iruzkinik ez confirm: Berretsi edit: body: "Testua:" @@ -193,7 +134,7 @@ eu: export: start: export_button: Esportatu - export_details: OpenStreetMap-eko datuak Creative Commons Aitortu-Partekatu baimen baten mende daude. + export_details: OpenStreetMap-eko datuak Open Data Commons Datu-base Irekiko Lizentzia baimen baten mende daude. format: Formatua format_to_export: Esportatzeko formatua image_size: Irudiaren tamaina @@ -205,17 +146,12 @@ eu: osm_xml_data: OpenStreetMap XML Data scale: Eskala zoom: Zooma - start_rjs: - export: Esportatu - view_larger_map: Ikusi Mapa Handiagoa geocoder: description: types: cities: Hiriak places: Lekuak towns: Herriak - description_osm_namefinder: - prefix: "%{type}tik %{distance} %{direction}ra" direction: east: ekialde north: iparra @@ -229,16 +165,24 @@ eu: one: km bat inguru other: "%{count}km inguru" zero: km bat baino gutxiago - search_osm_namefinder: - suffix_place: ", %{placename}tik %{distance} %{direction}ra" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodromoa + apron: Pista + gate: Atea + helipad: Heliportua + runway: Lurreratze pista + terminal: Terminala amenity: + WLAN: WiFi Sarbidea airport: Aireportu arts_centre: Arte Zentroa + atm: Kutxazain automatikoa auditorium: Entzunareto bank: Banku bar: Taberna + bbq: Barbakoa bench: Eserleku bicycle_rental: Txirrindu Alokairua brothel: Putetxe @@ -257,6 +201,7 @@ eu: crematorium: Errauste labe dentist: Dentista doctors: Medikuak + dormitory: Ikasle egoitza drinking_water: Edateko ur driving_school: Autoeskola embassy: Enbaxada @@ -265,6 +210,7 @@ eu: ferry_terminal: Ferry terminal fire_station: Suhiltzaileak fountain: Iturri + fuel: Gasolindegia grave_yard: Hilerri gym: Osasun Zentroa / Gimnasioa hall: Aretoa @@ -300,6 +246,7 @@ eu: shopping: Erosketak studio: Estudio supermarket: Supermerkatu + swimming_pool: Igerilekua taxi: Taxi telephone: Telefono publiko theatre: Antzokia @@ -307,17 +254,28 @@ eu: townhall: Udaletxe university: Unibertsitate vending_machine: Salmenta automatiko + veterinary: Albaitaritza klinika + village_hall: Herriko aretoa wifi: WiFi Sarbidea youth_centre: Gaztelekua boundary: administrative: Muga Administratiboa + census: Erroldaren muga + national_park: Parke Nazionala + protected_area: Babestutako Eremua + bridge: + aqueduct: Akueduktua + "yes": Zubia building: "yes": Eraikina highway: bus_stop: Autobus-geraleku construction: Eraikitze-lanetan dagoen Autopista + cycleway: Bidegorria emergency_access_point: Larrialdi Sarbide Gunea footway: Oinezkoen bide + ford: Ibia + milestone: Mugarria motorway: Autobide motorway_link: Autobidea platform: Nasa @@ -329,6 +287,7 @@ eu: secondary_link: Bigarren mailako errepide service: Zerbitzu Errepidea services: Autobide Zerbitzuak + speed_camera: Radarra steps: Eskailera-mailak tertiary: Hirugarren mailako errepide track: Pista @@ -349,6 +308,7 @@ eu: construction: Eraikuntza farm: Baserria forest: Baso + garages: Garajeak meadow: Larre military: Eremu Militarra mine: Meategi @@ -361,6 +321,7 @@ eu: beach_resort: Hondartza konplexu common: Lur Komunak fishing: Arrantza Lekua + fitness_station: Gimnasioa garden: Lorategi golf_course: Golf-zelai ice_rink: Izotz-pista @@ -370,6 +331,7 @@ eu: park: Parkea pitch: Kirolgunea playground: Jolastoki + sauna: Sauna sports_centre: Kiroldegi stadium: Estadio swimming_pool: Igerilekua @@ -381,6 +343,7 @@ eu: channel: Kanal crater: Crater fjord: Fiordo + forest: Basoa geyser: Geiser glacier: Glaziar hill: Muinoa @@ -399,6 +362,15 @@ eu: volcano: Sumendi water: Ura wood: Baso + office: + architect: Arkitektoa + employment_agency: Enplegu agentzia + estate_agent: Inmobiliaria + government: Gobernuko bulegoa + insurance: Aseguruetako bulegoa + lawyer: Abokatua + ngo: GKE bulegoa + "yes": Bulegoa place: airport: Aireportu city: Hiria @@ -465,6 +437,7 @@ eu: newsagent: Kioskoa optician: Optika pet: Animalia-denda + pharmacy: Farmazia photo: Argazki-denda shoes: Zapatadenda shopping_centre: Merkatal Gunea @@ -500,28 +473,21 @@ eu: waterfall: Ur-jauzi weir: Uharka layouts: + about: Honi buruz edit: Aldatu export: Esportatu help: Laguntza - help_centre: Laguntza Zentroa history: Historia home: hasiera - inbox: sarrera-ontzia (%{count}) - license: - title: OpenStreetMap-eko datuak Creative Commons Aitortu-Partekatu 2.0 Generiko baimen baten mende daude. + learn_more: Gehiago ikasi log_in: Saioa hasi logo: alt_text: OpenStreetMap logoa logout: saioa itxi - logout_tooltip: Saioa itxi make_a_donation: text: Dohaintza egin + more: Gehiago sign_up: izena eman - view: Ikusi - view_tooltip: Mapa ikusi - welcome_user: Ongietorri, %{user_link} - welcome_user_link_tooltip: Zure lankide orrialdea - wiki: Wikia license_page: foreign: title: Itzulpen honi buruz @@ -539,9 +505,9 @@ eu: title: Sarrera-ontzia message_summary: delete_button: Ezabatu - read_button: Markatu irakurrita gisa + read_button: Markatu irakurritzat reply_button: Erantzun - unread_button: Markatu irakurri gabe gisa + unread_button: Markatu irakurri gabekotzat new: back_to_inbox: Itzuli sarrera-ontzira body: Testua @@ -556,16 +522,19 @@ eu: subject: Gaia to: Hartzailea read: - back_to_inbox: Sarrera-ontzira itzuli date: Data from: Igorlea reply_button: Erantzun subject: Gaia - title: Mezua irakurri + title: Irakurri mezua to: Hartzailea - unread_button: Markatu irakurri gabe gisa + unread_button: Markatu irakurri gabekotzat sent_message_summary: delete_button: Ezabatu + note: + mine: + creator: Sortzailea + description: Deskribapena notifier: diary_comment_notification: hi: Kaixo %{to_user}, @@ -583,13 +552,8 @@ eu: greeting: Kaixo, message_notification: hi: Kaixo %{to_user}, - signup_confirm_html: - greeting: Kaixo! - introductory_video: "%{introductory_video_link} ikus dezakezu." - more_videos: "%{more_videos_link} daude." - more_videos_here: bideo gehiago hemen - signup_confirm_plain: - greeting: Kaixo! + note_comment_notification: + greeting: Kaixo, oauth: oauthorize: allow_write_api: mapa aldatu. @@ -600,13 +564,14 @@ eu: name: Izena show: allow_write_api: mapa aldatu. + confirm: Ziur zaude? + redaction: + show: + description: "Deskribapena:" + user: "Sortzailea:" site: edit: user_page_link: Lankide orria - index: - license: - license_name: Creative Commons Aitortu-PartekatuBerdin 2.0 - project_name: OpenStreetMap proiektua key: table: entry: @@ -679,18 +644,15 @@ eu: public: PUBLIKOA view_map: Mapa ikusi trace_form: - description: Deskribapena + description: "Deskribapena:" help: Laguntza tags: "Etiketak:" upload_button: Igo - upload_gpx: GPX fitxategi igo - visibility: Ikusgarritasuna + upload_gpx: "GPX fitxategi igo:" + visibility: "Ikusgarritasuna:" visibility_help: Zer esan nahi du honek? trace_optionals: tags: Etiketak - trace_paging_nav: - next: Hurrengoa » - previous: « Aurrekoa view: description: "Deskribapena:" download: jaitsi @@ -760,7 +722,6 @@ eu: continue: Jarraitu display name: "Erakusteko izena:" email address: "Eposta Helbidea:" - heading: Erabiltzaile Kontua sortu password: "Pasahitza:" title: Kontua sortu popup: @@ -789,29 +750,30 @@ eu: legale_select: "Mesedez bizi zaren herrialdean aukeratu:" view: activate_user: erabiltzaile hau gaitu - add as friend: lagun bezala + add as friend: lagun bezala gehitu ago: (duela %{time_in_words_ago}) confirm: Berretsi confirm_user: erabiltzaile hau baieztatu - create_block: Erabiltzaile hau blokeatu + create_block: Blokeatu erabiltzaile hau deactivate_user: erabiltzaile hau ezgaitu delete_user: lankide hau ezabatu description: Deskribapen - diary: egunerokoa - edits: aldaketak + diary: Egunerokoa + edits: Aldaketak email address: "Eposta helbidea:" hide_user: Erabiltzaile hau ezkutatu km away: "%{count} km-tara" m away: "%{count} m-tara" mapper since: "Noiztik mapatzaile:" + my comments: Nire Iruzkinak my diary: nire egunerokoa my edits: nire aldaketak - my settings: nire aukerak + my settings: Nire Hobespenak remove as friend: lagun bezala kendu role: administrator: Lankide hau administratzailea da moderator: Lankide hau moderatzailea da - send message: mezua bidali + send message: Mezua bidali settings_link_text: hobespenak status: "Egoera:" user location: Lankidearen kokapena @@ -820,6 +782,8 @@ eu: partial: creator_name: Egilea edit: Aldatu + next: Hurrengoa » + previous: « Aurrekoa show: Erakutsi status: Egoera period: @@ -835,3 +799,5 @@ eu: confirm: Berretsi revoke: confirm: Berretsi + welcome_page: + title: Ongi etorri! diff --git a/config/locales/fa.yml b/config/locales/fa.yml index eaa82c8fb6a..5b8a25a3faa 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1,19 +1,39 @@ # Messages for Persian (فارسی) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: BMRG14 +# Author: Baqeri +# Author: Ebraminio # Author: Grille chompa # Author: Hooshmand.hasannia # Author: Huji # Author: Leyth +# Author: Mcuteangel +# Author: Omidh # Author: Reza1615 # Author: Sahim +# Author: Taha # Author: Wayiran # Author: ZxxZxxZ +# Author: جواد +# Author: فلورانس fa: + about_page: + community_driven_html: "انجمن OpenStreetMap گوناگون، پرشور، و هر روز در حال رشد است.\nهمکاران ما عبارت اند از: نقشه کشان علاقه مند، متخصصان GIS، مهندسین اجرایی در سرور های OSM، نقشه کشی بشردوستان در مناطق فاجعه زده، و خیلی بیشتر.\nبرای یادگیری بیشتر درباره ی انجمن، یادداشت های روزانه کاربر، وبلاگ های انجمن، و وبسایت بنیاد OSM را ببینید." + community_driven_title: نوع جامعه گرایی + copyright_html: ©OpenStreetMap
    contributors + lede_text: OpenStreetMap توسط جامعه ای از نقشه کشان ساخته شده که نگه داری و کمک میکنند داده ها یی درباره ی جاده ها، مسیر های پیاده روی، کافه ها، ایستگاه های راه آهن، و خیلی بیشتر، در سرتاسر جهان. + local_knowledge_html: OpenStreetMap بر دانش محلی تاکید دارد. همکاران از تصاویر هوایی، دستگاه های GPS، و نقشه های حوزه تکنولوژی پایین بمنظور دقت و بروز بودن OSM استفاده میکنند. + local_knowledge_title: دانش محلی + next: بعدی + open_data_html: "OpenStreetMap داده بازاست: شما آزادید آنرا برای هر منظور و مقصودی استفاده کنید تا وقتی که اعتبار OpenStreetMap و همکارانش را دارید. اگر شما داده ها را در روش های خاص تغییر دهید یا بسازید، شما باید نتایج را تحت همین مجوز توزیع کنید. صفحه ی حق نشر و مجوز را برای راهنمایی ببینید." + open_data_title: داده های باز + partners_title: شرکای تجاری + used_by: "%{name} در صدها وب سایت، برنامه های موبایل، و وسایل سخت افزاری داده های نقشه را قدرت داده است" activerecord: attributes: diary_comment: - body: بدنه + body: بدن diary_entry: language: زبان latitude: عرض جغرافیایی @@ -41,266 +61,265 @@ fa: active: فعال description: توضیحات display_name: نام نمایشی - email: پست الکترونیکی - languages: زبان ها - pass_crypt: کلمه عبور + email: ایمیل + languages: زبان‌ها + pass_crypt: رمز عبور models: - acl: دسترسی به لیست کنترل - changeset: مجموعه تغییرات - changeset_tag: برچسب Changeset + acl: فهرست کنترل دسترسی + changeset: تغییرات انجام شده + changeset_tag: برچسب تغییرات انجام شده country: کشور + diary_comment: نظر یادداشت روزانه + diary_entry: ورودی یادداشت روزانه friend: دوست language: زبان - message: پیغام + message: پیام node: گره - node_tag: تگ گره - notifier: آگاه‌گردان + node_tag: برچسب گره + notifier: اطلاع رسان + old_node: گره‎ قدیمی + old_node_tag: برچسپ گرهٔ قدیمی + old_relation: رابطهٔ قدیمی + old_relation_member: عضو رابطهٔ قدیمی + old_relation_tag: برچسپ رابطهٔ قدیمی old_way: راه قدیمی + old_way_node: گرهٔ راه قدیمی + old_way_tag: برچسپ راه قدیمی relation: ارتباط - session: نشست - trace: ردیابی - tracepoint: ردیابی نقطه - tracetag: ردیابی برچسب + relation_member: عضو رابطه + relation_tag: برچسپ رابطه + session: جلسه + trace: پیگیری + tracepoint: نقطه پیگیری + tracetag: برچسب پیگیری user: کاربر user_preference: ترجیحات کاربر + user_token: نشانه کاربر way: راه way_node: گره راه way_tag: برچسب راه + application: + require_cookies: + cookies_needed: بنظر میرسد که کوکی ها را غیر فعال کرده اید - لطفا قبل از ادامه کوکی ها را روی مرورگرتان فعال کنید. + require_moderator: + not_a_moderator: برای انجام آن عمل نیاز هست مدیر باشید. + setup_user_auth: + blocked: دسترسی شما به API مسدود شده. برای یافتن اطلاعات بیشتر لطفا وارد رابط کاربری وب شوید. + need_to_see_terms: دسترسی شما به API بطور موقت معلق شده. برای مشاهده ی شرایط شرکت کننده لطفا وارد رابط کاربری وب شوید. نیاز به موافقت شما نیست، ولی باید حتما آنها را ببینید. browse: + anonymous: ناشناس changeset: - changeset: "مجموعه تغییرات: %{id}" - changesetxml: مجموعه تغییرات XML - download: بارگیری %{changeset_xml_link} یا %{osmchange_xml_link} + belongs_to: پدیدآور + changesetxml: تغییرات انجام شده XML feed: - title: مجموعه تغییرات %{id} - title_comment: مجموعه تغییرات %{id} - %{comment} + title: تغییرات انجام شده %{id} + title_comment: تغییرات انجام شده %{id} - %{comment} + node: گره ها (%{count}) + node_paginated: گره ها (%{x}-%{y} از %{count}) osmchangexml: osmChange XML - title: مجموعه تغییرات - changeset_details: - belongs_to: "متعلق به :" - bounding_box: جعبه مرزی - box: جعبه - closed_at: "بسته شده بر:" - created_at: "ایجاد توسط:" - has_nodes: - other: "یک=دارای %{count} نقطه:" - has_relations: - other: "یک=دارای %{count} مرتبط:" - has_ways: - other: "یک=دارای %{count} مسیر:" - no_bounding_box: هیچ جعبه مرزی برای این مجموعه تغییرات ذخیره نشده‌است - show_area_box: نمایش جعبه منطقه - common_details: - changeset_comment: "نظر:" - deleted_at: "حذف‌شده در:" - deleted_by: "حذف‌شده توسط:" - edited_at: "ویرایش در:" - edited_by: "ویرایش توسط:" - in_changeset: "تغییرات در:" - version: "نسخه:" + relation: روابط (%{count}) + relation_paginated: روابط (%{x}-%{y} از %{count}) + title: "تغییرات انجام شده: %{id}" + way: راه ها (%{count}) + way_paginated: راه ها (%{x}-%{y} از %{count}) + closed: بسته‌شده + closed_by_html: بسته شده در %{time} قبل توسط %{user} + closed_html: بسته شده %{time} قبل containing_relation: - entry: ارتباطات %{relation_name} - entry_role: رابطه %{relation_name} (به عنوان %{relation_role}) - map: - deleted: حذف - edit: - area: ویرایش منطقه - node: ویرایش گره - relation: ویرایش ارتباط - way: ویرایش راه - larger: - area: مشاهده منطقه روی نقشه بزرگتر - node: مشاهده منطقه روی نقشه بزرگتر - relation: مشاهده رابطه در نقشه بزرگتر - way: روش نمایش بر روی نقشه بزرگتر - loading: در حال بارگذاری… - navigation: - all: - next_changeset_tooltip: تغییرات بعدی - next_node_tooltip: گره بعدی - next_relation_tooltip: ارتباط بعدی - next_way_tooltip: راه بعدی - prev_changeset_tooltip: تغییرات قبلی - prev_node_tooltip: گره قبلی - prev_relation_tooltip: رابطه قبلی - prev_way_tooltip: راه قبلی - user: - name_changeset_tooltip: نمایش ویرایش‌های انجام‌شده توسط %{user} - next_changeset_tooltip: "%{user} ویرایش بعدی توسط" - prev_changeset_tooltip: "%{user} قبلی ویرایش توسط" + entry: ارتباط %{relation_name} + entry_role: رابطه %{relation_name} (به‌عنوان %{relation_role}) + created: ایجاد شده + created_by_html: ساخته شده %{time} قبل توسط %{user} + created_html: ایجاد شده %{time} قبل + deleted_by_html: حذف شده در %{time} قبل توسط %{user} + download_xml: دانلود XML + edited_by_html: ویرایش شده در %{time} قبل توسط %{user} + in_changeset: تغییرات انجام شده + location: "مکان:" + no_comment: (بدون نظر) node: - download: "%{download_xml_link}، %{view_history_link} یا %{edit_link}" - download_xml: بارگیری XML - edit: ویرایش - node: گره - node_title: "گره: %{node_name}" - view_history: نمایش تاریخچه - node_details: - coordinates: "مختصات:" - part_of: "بخشی از:" - node_history: - download: "%{download_xml_link} یا %{view_details_link}" - download_xml: بارگیری XML - node_history: تاریخچه منطقه - node_history_title: "تاریخچه منطقه: %{node_name}" - view_details: نمایش جزئیات + history_title: "تاریخچه گره: %{name}" + title: "گره: %{name}" not_found: - sorry: با عرض پوزش ، %{type} با شناسه %{id} ،یافت نمی‌شود. + sorry: "پوزش، %{type} #%{id} یافت نمیشود." + type: + changeset: تغییر انجام شده + node: گره + relation: ارتباط + way: راه + note: + closed_by: برطرف شده توسط %{user} %{when} قبل + closed_by_anonymous: برطرف شده توسط ناشناس %{when} قبل + closed_title: "یادداشت برطرف‌شده #%{note_name}" + commented_by: نظر از %{user} %{when} قبل + commented_by_anonymous: نظر از ناشناس %{when} قبل + hidden_by: مخفی شد توسط %{user} %{when} قبل + hidden_title: "یادداشت پنهان #%{note_name}" + new_note: یادداشت جدید + open_by: ایجاد شده توسط %{user} %{when} قبل + open_by_anonymous: ایجاد شده توسط ناشناس %{when} قبل + open_title: "یادداشت برطرف نشده #%{note_name}" + reopened_by: دوباره فعال شده توسط %{user} %{when} قبل + reopened_by_anonymous: دوباره فعال شده توسط ناشناس %{when} قبل + title: "یادداشت: %{id}" + part_of: بخشی از + redacted: + message_html: نسخه ی %{version} از این %{type} نمایش داده نمی شود تا وقتی تحریر نشود. برای جزئیات %{redaction_link} را ببینید. + redaction: ویرایش %{id} type: - changeset: مجموعه تغییرات node: گره relation: ارتباط way: راه - paging_nav: - of: از - showing_page: صفحه نمایش relation: - download: "%{download_xml_link} یا %{view_history_link}" - download_xml: بارگیری XML - relation: ارتباط - relation_title: "ارتباطات: %{relation_name}" - view_history: نمایش تاریخچه - relation_details: - members: "اعضا:" - part_of: "بخشی از:" - relation_history: - download: "%{download_xml_link} یا %{view_details_link}" - download_xml: بارگیری XML - relation_history: تاریخچه ارتباطات - relation_history_title: "تاریخچه ارتباطات: %{relation_name}" - view_details: نمایش جزئیات + history_title: "تاریخچه رابطه: %{name}" + members: اعضا + title: "رابطه: %{name}" relation_member: - entry_role: "%{type} %{name} به عنوان %{role}" + entry_role: "%{type} %{name} بعنوان %{role}" type: node: گره relation: ارتباط way: راه - start: - manually_select: به صورت دستی منطقه دیگری را انتخاب کنید - view_data: مشاهده اطلاعات برای نمایش نقشه فعلی start_rjs: - data_frame_title: داده ها - data_layer_name: داده ها - details: جزئیات - drag_a_box: " جعبه‌ای را روی نقشه برای انتخاب یک منطقه بکشید" - edited_by_user_at_timestamp: "[[timestamp]] در [[user]] ویرایش توسط" - hide_areas: پنهان‌کردن منطقه‌ها - history_for_feature: "[[feature]] تاریخچه برای" - load_data: بارگذاری داده ها - loaded_an_area_with_num_features: " شما منطقه‌ای را بارگذاری کردید که شامل[[num_features]] می‌شود. به طورکلی بعضی از مرورگرها نمی توانند با این مقدار اطلاعات تصویری کار کنند.کلا مرورگرها برای نمایش اطلاعات کمتر از 100 مورد در زمان در بهترین وضعیت هستند: و هر میزان دیگر میتواند مرورگر ار کند یا قفل کند.اگر شما میخواهید این اطلاعات دیده شود دکمه زیر را فشار دهید." - loading: در حال بارگذاری… - manually_select: به صورت دستی منطقه دیگری را انتخاب کنید - object_list: - api: بازیابی این منطقه از ای‌پی‌آی - back: نمایش فهرست موضوع - details: جزئیات - heading: لیست اجزاء - history: - type: - node: گره [[id]] - way: راه [[id]] - selected: - type: - node: گره [[id]] - way: راه [[id]] - type: - node: گره - way: راه - private_user: کاربر شخصی - show_areas: نمایش منطقه‌ها - show_history: نمایش سابقه - unable_to_load_size: "نمی‌تواند بارگذاری کند: اندازه جعبه ارتباطی [[bbox_size]] خیلی زیاد هست و باید کمتر از %{max_bbox_size} باشد" - wait: صبر کنید... - zoom_or_select: بزگنمایی کنید یا بخشی از منطقه را برای دیدن انتخاب کنید + feature_warning: در حال بارگزاری %{num_features} ویژگی، که ممکن است مرورگرتان را کند یا بدون واکنش سازد. مطمئنید میخواهید این داده ها نمایش داده شوند؟ + load_data: بارگیری داده‌ها + loading: در حال بارگیری... tag_details: - tags: "برچسب‌ها:" + tags: برچسب‌ها wiki_link: - key: " %{key} توضیحات صفحه ویکی برای برچسب" - tag: " %{key} = %{value} توضیحات صفحه ویکی برای برچسب" - wikipedia_link: صفحه %{page} مقاله در ویکی‌پدیا + key: توضیحات صفحه ویکی برای برچسب %{key} + tag: توضیحات صفحه ویکی برای برچسب %{key}=%{value} برچسب + wikipedia_link: صفحه مقاله %{page} در ویکی‌پدیا timeout: - sorry: با عرض پوزش ، داده ها برای %{type} با شناسه %{id} ، زمان بیش از حد طولانی برای بازیابی میبرد + sorry: با عرض پوزش ، داده ها برای %{type} با شناسه %{id} ، برای بازیابی زمان خیلی زیادی می برد. type: - changeset: مجموعه تغییرات + changeset: تغییر انجام شده node: گره relation: ارتباط way: راه + version: نسخه + view_details: مشاهده جزئیات + view_history: نمایش تاریخچه way: - download: "%{download_xml_link}، %{view_history_link} یا %{edit_link}" - download_xml: بارگیری XML - edit: ویرایش - view_history: نمایش تاریخچه - way: راه - way_title: "راه: %{way_name}" - way_details: also_part_of: - other: "همچنین بخشی از مسیرها %{related_ways} " - nodes: "گره‌ها:" - part_of: "بخشی از:" - way_history: - download: "%{download_xml_link} یا %{view_details_link}" - download_xml: بارگیری XML - view_details: نمایش جزئیات - way_history: تاریخچهٔ راه - way_history_title: "تاریخچهٔ راه: %{way_name}" + one: بخشی از راه %{related_ways} + other: " بخشی از راه های %{related_ways}" + history_title: "تاریخچه راه: %{name}" + nodes: گره ها + title: "راه: %{name}" changeset: changeset: - anonymous: گمنام - big_area: (بزرگ) - no_comment: (هیچ) + anonymous: ناشناس no_edits: (بدون ویرایش) - show_area_box: نمایش جعبهٔ منطقه - still_editing: (هنوز در حال ویرایش) + view_changeset_details: نمایش جزئیات تغییرات انجام شده changeset_paging_nav: next: بعدی » previous: « قبلی - showing_page: نمایش صفحهٔ %{page} + showing_page: صفحهٔ %{page} changesets: area: منطقه - comment: توضیح + comment: نظر id: شناسه saved_at: ذخیره شد در user: کاربر list: - description: تغییرات اخیر + empty: هیچ تغییراتی یافت نشد. + empty_area: تغییراتی در این ناحیه یافت نشد. + empty_user: تغییراتی توسط این کاربر انجام نشده. + load_more: بارگیری بیشتر + no_more: تغییرات انجام شده ی بیشتری یافت نشد. + no_more_area: در این ناحیه تغییرات بیشتری انجام نشده. + no_more_user: تغییرات بیشتری توسط این کاربر انجام نشده. + title: تغییرات انجام شده + title_friend: تغییرات انجام شده توسط دوستانتان + title_nearby: تغییرات انجام شده توسط کاربران نزدیک + title_user: تغییرات انجام شده توسط %{user} + timeout: + sorry: پوزش، فهرست تغییرات انجام شده ی درخواستی شما برای بازیابی بیش از حد زمان میبرد. diary_entry: comments: + ago: "%{ago} قبل" + comment: نظر + has_commented_on: "%{display_name} در یادداشت روزانه های زیر نظر داده است" newer_comments: نظرات جدیدتر older_comments: نظرات قدیمی‌تر + post: پست + when: زمان diary_comment: + comment_from: نظر از %{link_user} در %{comment_created_at} confirm: تأیید + hide_link: پنهان‌کردن این نظر diary_entry: comment_count: - one: 1 نظر + one: "%{count} نظر" other: "%{count} نظر" + zero: بدون نظر + comment_link: نظر گذاشتن در این ورودی confirm: تأیید - edit_link: ویرایش این مطلب - hide_link: نهفتن این مطلب - reply_link: پاسخ به این پیام + edit_link: ویرایش این ورودی + hide_link: پنهان سازی این ورودی + posted_by: پست شده توسط %{link_user} در %{created} در %{language_link} + reply_link: پاسخ به این ورودی edit: body: "بدنه:" language: "زبان:" latitude: "عرض جغرافیایی:" location: "مکان:" longitude: "طول جغرافیایی:" + marker_text: محل ورودی یادداشت روزانه save_button: ذخیره subject: "موضوع:" + title: ویرایش ورودی یادداشت روزانه use_map_link: استفاده از نقشه + feed: + all: + description: یادداشت روزانه های اخیر کاربران OpenStreetMap + title: یادداشت روزانه های OpenStreetMap + language: + description: یادداشت روزانه های اخیر کاربران OpenStreetMap در %{language_name} + title: ورودی های یادداشت روزانه ی OpenStreetMap در %{language_name} + user: + description: ورودی های یادداشت روزانه ی OpenStreetMap اخیر از %{user} + title: ورودی های یادداشت روزانه ی OpenStreetMap برای %{user} + list: + in_language_title: ورودی یادداشت های روزانه در %{language} + new: ورودی یادداشت های روزانه جدید + new_title: نوشتن ورودی جدید در یادداشت های روزانه ی کاربری شما + newer_entries: ورودی های جدیدتر + no_entries: بدون ورودی یادداشت روزانه + older_entries: ورودی های قدیمی تر + recent_entries: ورودی های یادداشت روزانه ی اخیر + title: یادداشت های روزانه کاربران + title_friends: یادداشت های روزانه دوستان + title_nearby: یادداشت های روزانه کاربران نزدیک + user_title: یادداشت های روزانه ی %{user} location: edit: ویرایش location: "مکان:" view: نمایش + new: + title: ورودی یادداشت های روزانه جدید + no_such_entry: + body: پوزش، با کاربری %{id} هیچ یادداشت روزانه یا نظری ثبت نشده. لطفا نوع نوشتنتان را بررسی کنید، یا شاید لینکی که کلیک کرده اید اشتباه است. + heading: "بدون ورودی با کاربری: %{id}" + title: چنین یادداشت روزانه ای نیست view: leave_a_comment: ارسال نظر login: ورود به سیستم + login_to_leave_a_comment: "%{login_link} برای گذاشتن نظر" save_button: ذخیره + title: یادداشت روزانه ی %{user} | %{title} + user_title: یادداشت های روزانه ی %{user} editor: default: پیش‌فرض (در حال حاضر %{name}) + id: + description: iD (ویرایشگر در مرورگر) + name: iD potlatch: - description: جلسه ۱ (در مرورگر ویرایشگر) + description: Potlatch 1 (ویرایشگر در مرورگر) name: Potlatch 1 potlatch2: - description: جلسه ۲ (در مرورگر ویرایشگر) + description: Potlatch 2 (ویرایشگر در مرورگر) name: Potlatch 2 remote: description: کنترل از راه دور (JOSM یا Merkaartor) @@ -308,43 +327,62 @@ fa: export: start: add_marker: اضافه کردن نشانگر به نقشه - area_to_export: برون‌بری منطقه - embeddable_html: درج اچ‌تی‌ام‌ال - export_button: برون‌بری - export_details: اطلاعات نقشه‌باز‌شهری تحت مجوز کریتیو کانز اشتراک‌یکسان 2 است - format: قالب - format_to_export: قالب برای خروجی‌سازی + area_to_export: خارج سازی منطقه + embeddable_html: HTML قابل درج + export_button: خارج سازی + export_details: داده های OpenStreetMap دارای مجوز زیر هستند داده های باز عمومی مجوز دیتابیس باز (ODbL). + format: فرمت + format_to_export: فرمت خارج سازی image_size: اندازهٔ تصویر latitude: "عرض:" - licence: اجازه‌نامه + licence: مجوز longitude: "طول:" manually_select: به صورت دستی منطقه دیگری را انتخاب کنید + map_image: تصویر نقشه (لایه استاندارد را نشان میدهد) max: حداکثر - options: تنظیمات - osm_xml_data: داده‌های XML نقشه‌باز‌شهری + options: گزینه‌ها + osm_xml_data: داده‌های XML OpenStreetMap output: خروجی - paste_html: برای تعبیه کردن در وب‌گاه اچ‌تی‌ام‌ال را پیست کنید + paste_html: برای درج در وب سایت HTML را جایگذاری کنید scale: مقیاس too_large: - body: این منطقه برای خروجی سازی در قالب XML بسیار بزرگ است لطفا پس از بزرگنمایی منطقه کوچکتری را انتخاب کنید - heading: منطقه بیش از حد بزرگ + advice: "اگر خارج سازی بالا ناموفق بود، لطفا از یکی از منابع ذکر شده در زیر استفاده کنید:" + body: این منطقه برای خارج سازی بعنوان داده های XML OpenStreetMap خیلی بزرگ است. لطفا بزرگنمایی کنید یا یک منطقه کوچکتر را انتخاب کنید، یا برای دانلود داده های انبوه یکی از منابع فهرست زیر را استفاده کنید. + geofabrik: + description: بروز رسانی های مرتب خلاصه از قاره ها، کشورها، و شهرهای انتخابی + title: دانلود های Geofabrik + metro: + description: خلاصه هایی برای شهرهای بزرگ جهان و مناطق اطرافشان + title: خلاصه های مترو + other: + description: منابع اضافی ذکر شده در ویکی OpenStreetMap + title: سایر منابع + overpass: + description: دانلود این جعبه محدوده از یکی از لینک های کمکی دیتابیس OpenStreetMap + title: روگذر API + planet: + description: کپی منظم از دیتابیس کامل OpenStreetMap + title: سیاره ی OSM zoom: بزگ‌نمایی - start_rjs: - add_marker: افزودن نشانگر به نقشه - change_marker: تغییر موقعیت نشانه‌گذار - click_add_marker: برای اضافه کردن نشانگر بر روی نقشه کلیک کنید - drag_a_box: " جعبه‌ای را روی نقشه برای انتخاب یک منطقه بکشید" - export: صدور - manually_select: به صورت دستی منطقهٔ دیگری را انتخاب کنید - view_larger_map: نمایش نقشه بزرگتر + title: خارج سازی + fixthemap: + how_to_help: + join_the_community: + explanation_html: اگر مشکلی با داده های نقشهٔ ما دارید به عنوان مثال جاده‌ای یا نشانی‌ای گم شده‌است، بهترین راه برای اقدام به عضویت جامعهٔ اپن‌استریت‌مپ بپیوندید و داده‌ها را خودتان اضافه یا تعمیر کنید. + title: به جمع ما بپیوندید + title: چگونه کمک کنید + other_concerns: + title: نگرانی‌های دیگر + title: گزارش مشکل / تعمیر نقشه geocoder: description: + title: + geonames: مکان از GeoNames + osm_nominatim: مکان از OpenStreetMap Nominatim types: cities: شهرها places: مکانها towns: شهرستانها - description_osm_namefinder: - prefix: "%{distance} %{direction} %{type}" direction: east: شرق north: شمال @@ -355,8 +393,7 @@ fa: south_west: جنوب غربی west: غرب distance: - one: تقریباً 1کیلومتر - other: تقریباً %{count}کیلومتر + other: حدود 1کیلومتر zero: کمتر از 1کیلومتر results: more_results: نتایج بیشتر @@ -365,81 +402,99 @@ fa: title: ca_postcode: نتایج Geocoder.CA geonames: نتایج GeoNames + geonames_reverse: نتایج حاصل از GeoNames latlon: نتایج داخلی - osm_namefinder: نتایج OpenStreetMap Namefinder osm_nominatim: نتایج OpenStreetMap Nominatim + osm_nominatim_reverse: نتایج حاصل از OpenStreetMap Nominatim uk_postcode: نتایج NPEMap / FreeThe Postcode us_postcode: نتایج Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} %{parentname})" - suffix_place: ", %{distance} %{direction} %{placename}" search_osm_nominatim: + admin_levels: + level10: مرز حومه + level2: مرز کشور + level4: مرز ایالت + level5: مرز منطقه + level6: مرز شهرستان + level8: مرز شهری + level9: مرز روستایی prefix: + aerialway: + chair_lift: صندلی بالابر + drag_lift: بالابر کشیدنی + station: ایستگاه راه هوایی aeroway: + aerodrome: فرودگاه هواپیما + apron: صحن gate: ورودی - runway: باند + helipad: محل فرود هلی کوپتر + runway: باند فرودگاه + taxiway: فرود به صحن terminal: پایانه amenity: - WLAN: دسترسی به وای‌فای + WLAN: دسترسی WiFi airport: فرودگاه - arts_centre: هنرکده + arts_centre: مرکز هنری artwork: اثر هنری - atm: عابربانک - auditorium: سالن + atm: خودپرداز + auditorium: سالن اجتماعات bank: بانک - bar: کافه + bar: بار + bbq: BBQ bench: نیمکت bicycle_parking: پارکینگ دوچرخه bicycle_rental: اجارهٔ دوچرخه + biergarten: باغ آبجو brothel: فاحشه‌خانه bureau_de_change: دفتر ارز bus_station: ایستگاه اتوبوس cafe: کافه car_rental: اجارهٔ خودرو - car_sharing: خودروی قرضی + car_sharing: به اشتراک گذاری خودرو car_wash: کارواش casino: کازینو + charging_station: ایستگاه شارژ cinema: سینما clinic: درمانگاه club: باشگاه college: کالج - community_centre: مرکز شهر + community_centre: مرکز انجمن courthouse: دادگاه crematorium: کوره dentist: دندانپزشکی doctors: پزشکان - dormitory: خوابگاه دانشجویی + dormitory: خوابگاه drinking_water: آب آشامیدنی driving_school: آموزشگاه رانندگی embassy: سفارت emergency_phone: تلفن اضطراری - fast_food: فست فود - ferry_terminal: ترمینال کشتی + fast_food: غذای آماده + ferry_terminal: پایانه کشتی fire_hydrant: شیر آتش‌نشانی fire_station: آتش‌نشانی + food_court: پذيرايي fountain: چشمه fuel: پمپ بنزین grave_yard: محوطهٔ گورستان - gym: مرکز تناسب اندام / سالن ورزش + gym: مرکز تناسب اندام / ورزشگاه hall: سالن health_centre: مركز بهداشت hospital: بیمارستان hotel: هتل - hunting_stand: ایستگاه شکار - ice_cream: بستنی‌فروشی + hunting_stand: شکارگاه + ice_cream: بستنی فروشی kindergarten: کودکستان library: کتابخانه market: بازار marketplace: بازار - mountain_rescue: نجات کوهستان - nightclub: کلوب شبانه - nursery: مهد کودک - nursing_home: خانهٔ سالمندان + mountain_rescue: امداد کوهستان + nightclub: باشگاه شبانه + nursery: شیر خوارگاه + nursing_home: خانه سالمندان office: دفتر park: پارک parking: پارکینگ pharmacy: داروخانه - place_of_worship: نیایشگاه + place_of_worship: عبادتگاه police: پلیس post_box: صندوق پست post_office: اداره پست @@ -449,67 +504,91 @@ fa: public_building: ساختمان عمومی public_market: بازار عمومی reception_area: محوطه پذیرش - recycling: بازیافت + recycling: نقطه بازیافت restaurant: رستوران - retirement_home: خانهٔ سالمندان + retirement_home: خانه ی بازنشستگی sauna: سونا school: مدرسه - shelter: سایبان + shelter: پناهگاه shop: فروشگاه shopping: خرید + shower: دوش + social_centre: مرکز اجتماعی social_club: باشگاه اجتماعی + social_facility: تسهیلات اجتماعی studio: استودیو supermarket: سوپرمارکت swimming_pool: استخر شنا taxi: تاکسی telephone: تلفن عمومی theatre: تئاتر - toilets: توالت + toilets: سرویس های بهداشتی townhall: شهرداری university: دانشگاه - vending_machine: عابربانک + vending_machine: دستگاه فروش veterinary: جراح دامپزشک - village_hall: دهداری - waste_basket: سطل آشغال - wifi: دسترسی وای‌فای + village_hall: دهیاری + waste_basket: سطل زباله + wifi: دسترسی WiFi youth_centre: مرکز جوانان boundary: - administrative: مرز کشوری + administrative: مرز اداری + census: مرز آماری national_park: پارک ملی protected_area: منطقه حفاظت‌شده bridge: + aqueduct: قنات + suspension: پل معلق + swing: پل نوسان + viaduct: پل راه آهن روی دره "yes": پل building: "yes": ساختمان + emergency: + fire_hydrant: شیر آتش‌نشانی + phone: تلفن اضطراری highway: + bridleway: راه حیوان رو + bus_guideway: خط هدایت کننده اتوبوس bus_stop: ایستگاه اتوبوس + byway: Byway construction: بزرگراه در دست ساخت cycleway: مسیر دوچرخه emergency_access_point: نقطهٔ دسترسی اضطراری footway: پیاده رو - ford: فورد + ford: معبر کنار رود living_street: خیابان محل سکونت + milestone: سنگ فرسخ شمار minor: جادهٔ فرعی motorway: اتوبان motorway_junction: اتصال بزرگراه‌ها - motorway_link: بزرگراه + motorway_link: جاده بزرگراه path: مسیر - pedestrian: پیاده راه + pedestrian: راه عابر پیاده platform: پلت‌فرم primary: جادهٔ اصلی primary_link: جادهٔ اصلی + proposed: راه پیشنهادی + raceway: مسیر مسابقه residential: مسکونی rest_area: استراحتگاه road: جاده - secondary: جادهٔ فرعی - secondary_link: جادهٔ فرعی + secondary: جاده دوم + secondary_link: جاده دوم + service: جاده خدماتی services: خدمات بزرگراه‌ها speed_camera: دوربین کنترل سرعت steps: پله - track: ردیابی + stile: نردبانی + street_lamp: چراغ خیابانی + tertiary: راه سوم + tertiary_link: راه سوم + track: پیگیری + trail: دنباله trunk: بزرگراه trunk_link: بزرگراه unclassified: جادهٔ طبقه‌بندی‌نشده + unsurfaced: جاده ظاهر نشده historic: archaeological_site: پایگاه باستان‌شناسی battlefield: میدان جنگ @@ -517,92 +596,134 @@ fa: building: ساختمان castle: قلعه church: کلیسا + citywalls: دیوارهای شهر + fort: دژ house: خانه icon: نماد + manor: ملک اربابی memorial: یادبود mine: معدن - monument: یادبود + monument: بنای یادبود museum: موزه ruins: خرابه‌ها + tomb: مقبره tower: برج + wayside_cross: صلیب کنار جاده + wayside_shrine: مقبره کنار جاده + wreck: لاشه landuse: - cemetery: گورستان + allotments: تقسیم بندی شده + basin: حوزه رودخانه + brownfield: زمین جهت ساخت + cemetery: قبرستان commercial: منطقهٔ تجاری + conservation: حفاظت شده construction: ساخت‌وساز farm: مزرعه - farmland: زمین کشاورزی - farmyard: زمین کشاورزی + farmland: زمین های کشاورزی + farmyard: محوطه مزرعه forest: جنگل + garages: گاراژ grass: چمن - greenfield: فضای سبز + greenfield: زمین سرسبز industrial: ناحیهٔ صنعتی + landfill: محل دفن زباله meadow: علفزار military: منطقهٔ نظامی mine: معدن - orchard: باغ + nature_reserve: طبیعت یدکی + orchard: باغستان park: پارک + piste: پیست سرعت + quarry: معدن railway: راه‌آهن + recreation_ground: زمین تفریحی reservoir: مخزن + reservoir_watershed: آبخیزداری مخزن residential: منطقهٔ مسکونی retail: خرده‌فروشی - vineyard: تاکستان + road: جاده منطقه + village_green: روستای سبز + vineyard: باغ انگوری wetland: تالاب wood: چوب leisure: beach_resort: تفریحگاه ساحلی + bird_hide: محل مشاهده ی پرندگان common: سرزمین مشترک fishing: منطقهٔ ماهی‌گیری fitness_station: ایستگاه تناسب اندام garden: باغ golf_course: زمین گلف + ice_rink: رینک یخ marina: تفریح‌گاه ساحلی miniature_golf: گلف کوچک + nature_reserve: طبیعت حفاظت شده park: پارک pitch: زمین ورزشی playground: زمین بازی + recreation_ground: زمین تفریحی + sauna: سونا + slipway: تعميرگاه دريايي sports_centre: مرکز ورزشی stadium: ورزشگاه swimming_pool: استخر شنا + track: مسیر دو میدانی water_park: پارک آبی military: airfield: فرودگاه نظامی barracks: پادگان + bunker: پناهگاه + mountain_pass: + "yes": گردنه natural: - bay: خلیج + bay: خور beach: ساحل + cape: دماغه cave_entrance: ورودی غار channel: کانال cliff: صخره - dune: ریگ روان - fell: قطع کردن + crater: دهانه اتش فشان + dune: تل شنی + feature: ویژگی + fell: سقوط گاه + fjord: فلات forest: جنگل + geyser: چشمه آب گرم glacier: یخچال طبیعی + heath: خارزار hill: تپه island: جزیره land: زمین marsh: مرداب moor: دشت - mud: گل + mud: لجن زار peak: قله point: نقطه - reef: آب‌سنگ + reef: جزیره نما ridge: خط‌الرأس river: رود خانه rock: صخره - spring: بهار + scree: ریگ زار + scrub: خارزار غیر قابل عبور + shoal: کم عمق + spring: سرچشمه stone: سنگ strait: تنگه tree: درخت valley: دره - volcano: کوه آتشفشان + volcano: آتشفشان water: اب wetland: تالاب wetlands: تالاب‌ها wood: جنگل office: + accountant: حسابدار architect: معمار company: شرکت - government: دفتر دولتی + employment_agency: آژانس کاریابی + estate_agent: بنگاه املاک + government: اداره دولتی insurance: دفتر بیمه lawyer: وکیل ngo: دفتر سازمان غیر دولتی @@ -615,258 +736,754 @@ fa: country: کشور county: شهرستان farm: مزرعه + hamlet: دهکده کوچک house: خانه houses: خانه‌ها island: جزیره islet: جزیره کوچک + isolated_dwelling: خانه پیش ساخته locality: محل moor: دشت - municipality: شهرداری + municipality: دارای شهردار + neighbourhood: محله postcode: کدپستی region: منطقه sea: دریا state: ایالت subdivision: زیربخش - suburb: محله + suburb: حومه شهر town: شهر + unincorporated_area: منطقه گنجانده نشده village: دهکده railway: abandoned: راه‌آهن رهاشده construction: راه‌آهن در دست ساخت disused: راه‌آهن منسوخ disused_station: ایستگاه منسوخ راه‌آهن - funicular: راه‌آهن بندی + funicular: راه‌آهن کابلی halt: ایستگاه قطار historic_station: ایستگاه تاریخی راه‌آهن junction: اتصال راه‌آهن level_crossing: محل تقاطع دو خط راه‌آهن light_rail: ریل سبک + miniature: راه آهن کوچک monorail: مونوریل narrow_gauge: زاه‌آهن تبادلگر باریک platform: بستر راه‌آهن + preserved: راه آهن محفوظ شده + proposed: راه آهن پیشنهادی + spur: خار راه آهن station: ایستگاه راه‌آهن + stop: ایستگاه راه آهن subway: ایستگاه مترو subway_entrance: ورودی مترو - tram: تراموای + switch: جدا کننده راه آهن + tram: واگن برقی + tram_stop: ایستگاه واگن برقی + yard: محوطه راه آهن shop: + alcohol: مجوز غیر فعال + antiques: عتیقه جات art: فروشگاه لوازم هنری bakery: نانوایی - beauty: فروشگاه لوازم آرایشی + beauty: فروشگاه زیبایی beverages: فروشگاه نوشیدنی‌ها و عرقیات bicycle: فروشگاه دوچرخه books: فروشگاه کتاب - butcher: قصاب + boutique: بوتیک + butcher: قصابی car: فروشگاه خودرو car_parts: قطعات خودرو car_repair: تعمیرگاه خودرو carpet: فروشگاه فرش + charity: فروشگاه خیریه + chemist: شیمی‌دان clothes: فروشگاه پوشاک computer: فروشگاه رایانه + confectionery: فروشگاه قنادی + convenience: فروشگاه زنجیره ای copyshop: مغازه فتوکپی cosmetics: فروشگاه لوازم آرایشی + deli: اغذیه فروشی + department_store: فروشگاه بزرگ + discount: اقلام تخفیف فروشگاه + doityourself: خودتان انجامش دهید + dry_cleaning: تمیز کننده خشک + electronics: فروشگاه الکترونیک + estate_agent: بنگاه املاک + farm: فروشگاه مزرعه + fashion: فروشگاه مد + fish: فروشگاه ماهی + florist: گلفروشی + food: فروشگاه مواد غذایی + funeral_directors: کارگردانان تشییع جنازه + furniture: مبلمان + gallery: گالری + garden_centre: مرکز باغ + general: فروشگاه عمومی + gift: هدیه فروشی greengrocer: سبزی فروش - kiosk: کیوسک + grocery: فروشگاه خواروبار + hairdresser: سلمانی + hardware: فروشگاه سخت افزار + hifi: Hi-Fi + insurance: بیمه + jewelry: فروشگاه طلا و جواهر + kiosk: فروشگاه کیوسک laundry: خشکشویی mall: بازار market: بازار mobile_phone: فروشگاه تلفن همراه motorcycle: فروشگاه موتورسیکلت - organic: فروشگاه مواد غذایی ارگانیک + music: فروشگاه موسیقی + newsagent: دکه روزنامه + optician: عینک سازی + organic: فروشگاه مواد غذایی آلی + outdoor: فروشگاه رو باز pet: فروشگاه حیوانات خانگی + pharmacy: داروخانه + photo: فروشگاه عکس + salon: سالن زیبایی + second_hand: سمساری + shoes: فروشگاه کفش + shopping_centre: مرکز خرید + sports: فروشگاه ورزشی + stationery: فروشگاه لوازم التحریر supermarket: سوپرمارکت + tailor: خیاطی toys: اسباب‌بازی‌فروشی travel_agency: آژانس مسافرتی + video: فروشگاه فیلم + wine: خارج از مجوز + "yes": فروشگاه tourism: + alpine_hut: کلبه بالای تپه artwork: آثار هنری attraction: جاذبه bed_and_breakfast: تخت‌خواب و صبحانه - cabin: اطاق + cabin: کابین camp_site: محل اردوگاه + caravan_site: مکان خودرو کاروان chalet: کلبه ییلاقی guest_house: مهمانخانه - hostel: هتل + hostel: شبانه روزی hotel: هتل information: اطلاعات + lean_to: آلونک motel: متل museum: موزه + picnic_site: مکان پیک نیک + theme_park: پارک تفریحی valley: دره + viewpoint: منطره بین zoo: باغ وحش tunnel: + culvert: مجرای آب زیر جاده "yes": تونل waterway: + artificial: آبراه مصنوعی + boatyard: محوطه قایق canal: کانال + connector: رابط آبراه dam: سد + derelict_canal: کانال متروک + ditch: نهر آب + dock: لنگر گاه + drain: زه کشی lock: قفل + lock_gate: ورودی قفل mineral_spring: چشمهٔ آب معدنی + mooring: مکان لنگر انداختن + rapids: سریع السیر river: رودخانه + riverbank: حاشیه رودخانه + stream: جوی آب + wadi: Wadi + water_point: مکان آب waterfall: ابشار + weir: آب بند + help_page: + help: + description: یک سؤال بپرسید یا پاسخ ها را ببینید در سایت پرسش و پاسخ OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap چندین منبع برای یادگیری پیرامون پروژه، پرسش و پاسخ به پرسش، و بحث مشترک و مباحث نقشه برداری مستند دارد. + title: کمک گرفتن + welcome: + description: با این آموزش ساده که در بر دارنده مبانی OpenStreetMap است آغاز کنید. + title: به OSM خوش آمدید + url: /welcome + wiki: + description: برای مستندات عمیق OSM ویکی را مرور کنید. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ html: dir: rtl + javascripts: + close: بستن + edit_help: نقشه را جابجا کنید و روی مکانی که میخواهید ویرایش کنید بزرگنمایی کنید، سپس اینجا کلیک کنید. + key: + title: کلید نقشه + tooltip: کلید نقشه + tooltip_disabled: کلید نقشه تنها برای لایه ی استاندارد در دسترس است + map: + base: + cycle_map: نقشه دوچرخه + hot: بشر دوستانه + standard: استاندارد + transport_map: نقشه حمل و نقل + copyright: © شرکت کنندگانOpenStreetMap + donate_link_text: + layers: + data: داده های نقشه + header: لایه های نقشه + notes: یادداشت های نقشه + overlays: فعال سازی همپوشانی ها برای اشکال زدایی نقشه + title: لایه ها + locate: + popup: شما درون {distance} {unit} از این نقطه اید + title: نمایش مکان من + zoom: + in: بزرگنمایی + out: کوچک نمایی + notes: + new: + add: افزودن یادداشت + intro: برای بهبود نقشه اطلاعاتی که شما وارد میکنید به سایر نقشه کشان نشان داده میشود،پس لطفا تا جایی که امکان دارد دقت و توصیف داشته باشید موقع حرکت دادن نشانگر به مکان درست و یادداشتتان را در زیر وارد کنید. + show: + anonymous_warning: این یادداشت شامل نظرات کاربران ناشناس است که باید بطور مستقل تایید شوند. + comment: نظر + comment_and_resolve: نظر و راه حل + hide: پنهان کردن + reactivate: فعال سازی مجدد + resolve: برطرف کردن + share: + cancel: لغو + center_marker: مرکز نقشه در نشانگر + custom_dimensions: تنظیم ابعاد سفارشی + download: دانلود + embed: HTML + format: "قالب:" + image: تصویر + image_size: تصویر لایه ی استاندارد را نشان می دهد در + include_marker: شامل نشانگر + link: لینک یا HTML + long_link: پیوند + paste_html: برای درج در وب سایت HTML را جایگذاری کنید + scale: "مقیاس:" + short_link: لینک کوتاه + short_url: آدرس کوتاه + title: به‌اشتراک‌گذاری + view_larger_map: نمایش نقشه بزرگتر + site: + createnote_disabled_tooltip: بزرگنمایی برای افزودن یک یادداشت به نقشه + createnote_tooltip: افزودن یک یادداشت به نقشه + edit_disabled_tooltip: بزرگنمایی برای ویرایش نقشه + edit_tooltip: ویرایش نقشه + map_data_zoom_in_tooltip: بزرگنمایی برای دیدن داده های نقشه + map_notes_zoom_in_tooltip: بزرگنمایی برای دیدن یادداشت های نقشه layouts: - copyright: حق تکثیر و مجوز - documentation: مستندات - documentation_title: مستندات برای پروژه - donate_link_text: حمایت مالی + about: درباره + community: انجمن + community_blogs: وبلاگهای انجمن + community_blogs_title: وبلاگ های کاربران انجمن OpenStreetMap + copyright: حق طبع و نشر + data: داده‌ها + donate: OpenStreetMap را با %{link} پشتیبانی کنید تا سخت افزار صندوق بروز رسانی شوند. edit: ویرایش - edit_with: با {editor} % ویرایش کن - export: صدور + edit_with: ویرایش با %{editor} + export: خارج سازی + export_data: خارج سازی داده ها foundation: بنیاد foundation_title: بنیاد OpenStreetMap - help: راهنما - help_centre: مرکز کمک - help_title: سایت کمک برای پروژه + gps_traces: پیگیری های GPS + gps_traces_tooltip: مدیریت پیگیری های GPS + help: کمک history: تاریخچه - home: خانه - home_tooltip: رفتن به مکان خانگی - inbox: صندوق پستی (% {count}) + home: رفتن به محل خانه intro_2_create_account: ایجاد حساب کاربری - intro_2_download: بارگیری - intro_2_license: مجوز آزاد - intro_2_use: استفاده کن + intro_header: به OpenStreetMap خوش آمدید! + intro_text: OpenStreetMap یک نقشه از جهان است، که توسط افرادی مثل شما ایجاد شده و برای استفاده رایگان است تحت یک مجوز باز. + learn_more: اطلاعات بیشتر log_in: ورود به سیستم + log_in_tooltip: ورود به سیستم با یک حساب موجود logo: alt_text: لوگوی OpenStreetMap logout: خروج - logout_tooltip: خروج از سیستم make_a_donation: text: کمک مالی - title: OpenStreetMap پشتیبانی با اهداء پولی + title: OpenStreetMap را با کمک های مالی پولی حمایت کنید + more: بیشتر + osm_offline: دیتابیس OpenStreetMap در حال حاضر آفلاین است در حالی که کار تعمیر و نگهداری دیتابیس ضروری انجام میگیرد. + osm_read_only: دیتابیس OpenStreetMap در حال حاضر روی حالت فقط خواندنی است در حالی که کار نگهداری و تعمیر دیتابیس ضروری انجام میگیرد. + partners_bytemark: میزبانی Bytemark + partners_html: میزبانی وب پشتیبانی شده توسط %{ucl}، %{ic} و %{bytemark}، و سایر %{partners}. partners_ic: کالج سلطنتی لندن + partners_partners: شرکای تجاری + partners_ucl: مرکز VR UCL sign_up: ثبت نام sign_up_tooltip: ایجاد یک حساب کاربری برای ویرایش + start_mapping: شروع نقشه کشی tag_line: ویکی رایگان نقشهٔ جهان - user_diaries: یادداشت کاربر - view: نمایش - view_tooltip: نمایش نقشه - welcome_user: خوش آمدید، %{user_link} - welcome_user_link_tooltip: صفحهٔ کاربری شما - wiki: ویکی‌ - wiki_title: سایت ویکی برای پروژه + user_diaries: یادداشت های روزانه کاربر + user_diaries_tooltip: مشاهده یادداشت های روزانه ی کاربر license_page: foreign: english_link: اصل انگلیسی - text: در زمان به وجود آمدن تداخل بین ترجمه فارسی و %{english_original_link} متن انگلیسی در اولویت است + text: در زمان به وجود آمدن تداخل بین برگردان فارسی و %{english_original_link}، نوشتهٔ انگلیسی برتری دارد title: درباره این ترجمه‌ها + legal_babble: + attribution_example: + alt: مثال برای چگونه OpenStreetMap را در صفحه ی وبی نسبت دهیم + title: مثال انتساب + contributors_at_html: "Austria: Contains data from\nStadt Wien (under\nCC BY),\nLand Vorarlberg and\nLand Tirol (under CC BY AT with amendments)." + contributors_ca_html: "Canada: Contains data from\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), and StatCan (Geography Division,\nStatistics Canada)." + contributors_fi_html: "Finland: Contains data from the\nNational Land Survey of Finland's Topographic Database\nand other datasets, under the\nNLSFI License." + contributors_footer_1_html: برای اطلاعات بیشتر درباره این منابع و سایر منابع مورد استفاده برای پیشرفت اوپن‌استریت‌مپ، لطفا این پیوند را نگاه کنید. + contributors_footer_2_html: ورود داده ها در OpenStreetMap به این معنی نیست که ارائه دهنده ی اصلی داده ها توسط OpenStreetMap تایید شده، هر گونه ضمانتی فراهم میکند، یا هر گونه مسئولیت را میپذیرد. + contributors_fr_html: "France: Contains data sourced from\nDirection Générale des Impôts." + contributors_gb_html: "United Kingdom: Contains Ordnance\nSurvey data © Crown copyright and database right\n2010-12." + contributors_intro_html: "شرکای ما هزاران شخص هستند. ما همچنین جواز علنی داده از سازمان نقشه برداری ملی و دیگر منابع را شامل میشویم، در بین آنها:" + contributors_nl_html: "Netherlands: Contains © AND data, 2007\n(www.and.com)" + contributors_nz_html: "New Zealand: Contains data sourced from\nLand Information New Zealand. Crown Copyright reserved." + contributors_title_html: همکاران ما + contributors_za_html: "South Africa: Contains data sourced from\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: ما نیاز داریم که شما استفاده کنید از اعتبار “© همکاران OpenStreetMap”. + credit_2_html: همچنین مطمئن باشید که پاک کردن داده ها تحت یک مجوز دیتابیس باز است، و اگر از کاشی های نقشه ی ما استفاده میکنید، نقشه برداری تحت مجوز CC BY-SA است. میتوانید با لینک دادن به این صفحه حق نشر متناوبا آنرا انجام دهید، و بعنوان یک درخواست اگر شما توزیع کننده ی نوع داده های OSM هستید، میتوانید نام و لینک را بطور مستقیم به مجوز بدهید. در رسانه ها جاهایی که لینک ها مقدور نیستند(مثل کارهای چاپی)، پیشنهاد میکنیم خوانندگان تان را به openstreetmap.org راهنمایی کنید(شاید با گسترش 'OpenStreetMap' به این آدرس کامل)، به opendatacommons.org، و اگر مناسب باشد، به creativecommons.org. + credit_3_html: "برای یک نقشه الکترونیکی قابل مرور، اعتبار باید در گوشه ای از نقشه ظاهر شود.\nبرای مثال:" + credit_title_html: چگونه از OpenStreetMap اعتبار بگیریم + infringement_1_html: شرکای OSM یادآوری میکنند هرگز داده ای را از منابع حق نشر اضافه نکنید(مثلا نقشه های گوگل یا نقشه های چاپ شده) بدون اجازه صریح از دارندگان حق تکثیر. + infringement_2_html: اگر فکر می کنید که این حق نشر داده شده بطور نامناسب به دیتابیس OpenStreetMap یا این سایت اضافه شده، لطفا به رویه ی حذف ما یا پرونده مستقیم در صفحه ی بایگانی آنلاین ما مراجعه کنید. + infringement_title_html: نقض کپی رایت + intro_1_html: "OpenStreetMap داده باز است، تحت مجوز Open Data\nCommons Open Database License (ODbL)." + intro_2_html: شما برای کپی برداری، توزیع، انتقال و انطباق داده های ما آزاد هستید، تا زمانی که معتبران و همکاران OpenStreetMap باشید. اگر شما تغییر دهید یا بسازید داده های ما را، شما باید نتایج را فقط تحت همین مجوز توزیع کنید. اطلاعات کامل کد قانونی حقوق و وظایف شما را توضیح میدهد. + intro_3_html: "نقشه کشی در کاشی های نقشه ی ما، و مدارک ما، تحت مجوز Creative\nCommons Attribution-ShareAlike 2.0هستند ، مجوز (CC BY-SA)." + more_1_html: "درباره استفاده از داده های ما، و چگونه به ما اعتبار دهید بیشتر بخوانید، در Legal\nFAQ." + more_2_html: اگرچه OpenStreetMap داده باز است، ما نمی توانیم API نقشه را به رایگان در اختیار توسعه دهندگان شخص ثالث قرار دهیم. API Usage Policy ما را ببینید، Tile Usage Policy و Nominatim Usage Policy. + more_title_html: پیدا کردن اطلاعات بیشتر + title_html: حق نشر و مجوز native: mapping_link: شروع به نقشه‌کشی - native_link: THIS_LANGUAGE_NAME_HERE نسخه - text: شما در حال مشاهده ویرایش انگلیسی قانون کپی‌رایت هستید. برای دیدن %{native_link} می توانید به عقب باز گردید یا خواندن متن کپی رایت و %{mapping_link} را متوقف کنید + native_link: نسخهٔ فارسی + text: شما در حال مشاهده ویرایش انگلیسی قانون کپی‌رایت هستید. برای دیدن %{native_link} می توانید به عقب باز گردید یا خواندن متن کپی رایت و %{mapping_link} را متوقف کنید. title: درباره این صفحه message: + delete: + deleted: پیام حذف شد inbox: date: تاریخ from: از + messages: شما %{new_messages} و %{old_messages} دارید my_inbox: صندوق دریافتی من + new_messages: + one: "%{count} پیام جدید" + other: "%{count} پیام جدید" + no_messages_yet: هنوز پیامی ندارید. چرا با برخی از %{people_mapping_nearby_link} ارتباط برقرار نمی کنید؟ + old_messages: + one: "%{count} پیام قدیمی" + other: "%{count} پیام قدیمی" outbox: صندوق خروجی + people_mapping_nearby: افراد نقشه کش نزدیک subject: عنوان - title: صندوق دریافتی + title: صندوق دریافت + mark: + as_read: پیام به عنوان خوانده شده علامت گذاری شد + as_unread: پیام به عنوان خوانده نشده علامتگذاری شد message_summary: delete_button: حذف - read_button: علامت‌گذاری به عنوان خوانده‌شده + read_button: علامت‌گذاری به‌عنوان خوانده‌شده reply_button: پاسخ - unread_button: علامت‌گذاری به عنوان خوانده‌شده + unread_button: علامت‌گذاری به‌عنوان خوانده‌شده new: - back_to_inbox: بازگشت به صندوق پستی + back_to_inbox: بازگشت به صندوق دریافت body: بدنه + limit_exceeded: شما اخیرا تعداد زیادی پیام ارسال کرده اید. لطفا قبل از تلاش برای ارسال موارد بیشتر کمی صبر کنید. message_sent: پیام فرستاده شد - send_button: بفرست - send_message_to: فرستادن پیام به %{name} + send_button: ارسال + send_message_to: فرستادن پیام جدید به %{name} subject: عنوان title: فرستادن پیام no_such_message: + body: متاسفانه هیچ پیامی با شناسه کاربری نیست. + heading: چنین پیغامی وجود ندارد title: چنین پیغامی وجود ندارد outbox: date: تاریخ inbox: صندوق دریافتی + messages: + one: شما %{count} پیام ارسال شده دارید + other: شما %{count} پیام ارسال شده دارید my_inbox: "%{inbox_link} من" + no_sent_messages: شما هنوز پیام ارسال شده ندارید. چرا با برخی از %{people_mapping_nearby_link} ارتباط برقرار نمیکنید؟ outbox: صندوق خروجی + people_mapping_nearby: افراد نقشه کش نزدیک subject: عنوان title: صندوق خروجی to: به read: - back_to_inbox: بازگشت به صندوق پستی + back: عقب date: تاریخ from: از - reading_your_sent_messages: خواندن پیام‌هایی که فرستاده‌اید reply_button: پاسخ subject: عنوان + title: خواندن پیام to: به - unread_button: علامت‌گذاری به عنوان خوانده‌شده + unread_button: علامت‌گذاری به‌عنوان خوانده‌شده + wrong_user: شما بعنوان %{user} وارد سیستم شده اید اما پیامی که درخواست خواندن اش را داده اید توسط کاربر ارسال نشده یا به او ارسال نشده. برای امکان خواندن لطفا بعنوان کاربر صحیح وارد سیستم شوید. + reply: + wrong_user: شما بعنوان %{user} وارد سیستم شده اید اما پیامی که درخواست پاسخ اش را داده اید به این شناسه ارسال نشده. برای امکان پاسخ دادن لطفا بعنوان کاربر صحیح وارد سیستم شوید. sent_message_summary: delete_button: حذف + note: + description: + closed_at_by_html: حل شده %{when} قبل توسط %{user} + closed_at_html: حل شده %{when} قبل + commented_at_by_html: بروز شده %{when} قبل توسط %{user} + commented_at_html: بروز شده %{when} قبل + opened_at_by_html: ایجاد شده %{when} قبل توسط %{user} + opened_at_html: ایجاد شده %{when} قبل + reopened_at_by_html: دوباره فعال شده %{when} قبل توسط %{user} + reopened_at_html: دوباره فعال شده %{when} قبل + entry: + comment: نظر + full: یادداشت کامل + mine: + ago_html: "%{when} قبل" + created_at: ایجاد شده در + creator: ایجاد کننده + description: شرح + heading: یادداشت های %{user} + id: شناسه + last_changed: آخرین تغییر + subheading: یادداشت ها ارسال شده یا نظر داده شده توسط %{user} + title: یادداشت ها ارسال شده یا نظر داده شده توسط %{user} + rss: + closed: یادداشت بسته شد(نزدیک %{place}) + commented: نظر جدید(نزدیک %{place}) + description_area: لیستی از یادداشت ها، گزارش داده شده ها، نظرات داده شده در یا بسته شده در منطقه شما [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: خوراک rss برای یادداشت %{id} + opened: یادداشت جدید (نزدیک %{place}) + reopened: یادداشت دوباره فعال شد(نزدیک %{place}) + title: یادداشت های OpenStreetMap notifier: diary_comment_notification: + footer: همچنین میتوانید نظر را در %{readurl} بخوانید و میتوانید در %{commenturl} نظر دهید یا در %{replyurl} پاسخ دهید + header: "%{from_user} روی آخرین یادداشت روزانه ی OpenStreetMap شما با موضوع %{subject} نظر داد:" hi: سلام %{to_user} ، + subject: "[OpenStreetMap] %{user} در یادداشت روزانه شما نظر داد" + email_confirm: + subject: "[OpenStreetMap] ایمیل تان را تایید کنید" email_confirm_html: + click_the_link: اگر این شمایید، برای تایید تغییر لطفا روی لینک زیر کلیک کنید. greeting: سلام ، + hopefully_you: کسی (امیدواریم شما) میخواهد آدرس ایمیلش را تغییر دهد از %{server_url} به %{new_address}. email_confirm_plain: + click_the_link: اگر این شمایید، برای تایید تغییر روی لینک زیر کلیک کنید. greeting: سلام ، + hopefully_you: کسی (امیدواریم شما) میخواهد آدرس ایمیلش را تغییر دهد از %{server_url} به %{new_address}. + friend_notification: + befriend_them: همچنین میتوانید در %{befriendurl} او را بعنوان دوست اضافه کنید. + had_added_you: "%{user} در OpenStreetMap شما را بعنوان دوست افزود." + see_their_profile: میتوانید نمایه کاربری اش را در %{userurl} ببینید. + subject: "[OpenStreetMap] %{user} شما را بعنوان دوست اضافه کرد" gpx_notification: + and_no_tags: و بدون برچسب. + and_the_tags: "و برچسب های زیر:" + failure: + failed_to_import: "وارد سازی ناموفق، خطا اینجاست:" + more_info_1: اطلاعات بیشتر درباره ی شکست وارد سازی GPX و چگونگی اجتناب از آن + more_info_2: "آنها را میتوان اینجا یافت:" + subject: "[OpenStreetMap] وارد سازی GPX ناموفق" greeting: سلام ، + success: + loaded_successfully: با موفقیت لود شد با %{trace_points} از %{possible_points} نقاط ممکن. + subject: "[OpenStreetMap] وارد سازی GPX موفق" with_description: با توضیحات + your_gpx_file: پرونده ی GPX شما اینگونه است + lost_password: + subject: "[OpenStreetMap] درخواست تنظیم مجدد رمز عبور" lost_password_html: + click_the_link: اگر این شمایید، برای تنظیم مجدد لطفا روی لینک زیر کلیک کنید. greeting: سلام ، + hopefully_you: کسی (احتمالا شما) خواسته است که رمز عبورش تنظیم مجدد شود در ایمیل این حساب در openstreetmap.org . lost_password_plain: + click_the_link: اگر این شمایید، برای تنظیم مجدد رمز عبور لطفا روی لینک زیر کلیک کنید. greeting: سلام ، + hopefully_you: کسی (احتمالا شما) خواسته است که رمز عبورش تنظیم مجدد شود در ایمیل این حساب در openstreetmap.org . message_notification: + footer_html: همپنین میتوانید پیام را در %{readurl} بخوانید و میتوانید در %{replyurl} پاسخ دهید + header: "%{from_user} از طریق OpenStreetMap یک پیام با موضوع %{subject} برای شما فرستاده:" hi: سلام %{to_user}, - signup_confirm_html: - greeting: سلام! - signup_confirm_plain: - greeting: سلام! + note_comment_notification: + anonymous: کاربر ناشناس + closed: + commented_note: "%{commenter} یکی از یادداشت های نقشه که شما در آن نظر گذاشته اید را برطرف ساخت. یادداشت نزدیک %{place} است." + subject_other: "[OpenStreetMap] %{commenter} یکی از یادداشت های مورد علاقه ی شما را برطرف کرد" + subject_own: "[OpenStreetMap] %{commenter} یکی از یادداشت های شما را برطرف کرده است" + your_note: "%{commenter} یکی از یادداشت های نقشه شما در نزدیک %{place} را برطرف ساخت." + commented: + commented_note: "%{commenter} روی یادداشت نقشه که شما در آن نظر داده اید نظر داد. این یادداشت نزدیک %{place} است." + subject_other: "[OpenStreetMap] %{commenter} روی یادداشتی که شما به آن علاقه مندید نظر داد" + subject_own: "[OpenStreetMap] %{commenter} روی یادداشت شما نظر داده است" + your_note: "%{commenter} روی یکی از یادداشت های نقشه ی شما نزدیک %{place} نظر گذاشت." + details: اطلاعات بیشتر درباره ی یادداشت در %{url} یافت میشود. + greeting: ‎سلام ، + reopened: + commented_note: "%{commenter} یکی از یادداشت های نقشه که شما در آن نظر گذاشته اید را دوباره فعال کرد. یادداشت نزدیک %{place} است." + subject_other: "[OpenStreetMap] %{commenter} یکی از یادداشت های مورد علاقه ی شما را دوباره فعال کرد" + subject_own: "[OpenStreetMap] %{commenter} یکی از یادداشت های شما را دوباره فعال کرد" + your_note: "%{commenter} یکی از یادداشت های نقشه شما در نزدیک %{place} را دوباره فعال کرد." + signup_confirm: + confirm: "قبل از اینکه ما کار دیگری انجام دهیم، نیاز داریم که تایید شود این درخواست از شما آمده، پس اگر این چنین است لطفا برای تایید حسابتان روی لینک زیر کلیک کنید:" + created: کسی (امیدواریم شما) یک حساب در %{site_url} ایجاد کرد. + greeting: ‎سلام، + subject: "[OpenStreetMap] به OpenStreetMap خوش آمدید" + welcome: بعد از اینکه حسابتان را تایید کردید، ما به شما برخی از اطلاعات اضافی را ارائه میدهیم تا بتوانید شروع کنید. + oauth: + oauthorize: + allow_read_gpx: خواندن پیگیری های GPS شخصی شما. + allow_read_prefs: خواندن ترجیحات کاربری شما. + allow_to: "برنامه سرویس گیرنده اجازه میدهد به:" + allow_write_api: تغییر نقشه. + allow_write_diary: ایجاد یادداشت روزانه، نظر و ایجاد دوستان. + allow_write_gpx: بارگزاری پیگیری های GPS. + allow_write_notes: تغییر یادداشت ها. + allow_write_prefs: تغییر ترجیحات کاربری شما. + request_access: برنامه ی %{app_name}%{app_name} درخواست دسترسی به حسابتان %{user} را دارد. لطفا بررسی کنید که میخواهید برنامه به قابلیت های زیر دسترسی داشته باشد. ممکن است چندتا یا فقط تعدادی را که دوست دارید انتخاب کنید. + title: دسترسی اجازه دادن به حسابتان + oauthorize_failure: + denied: شما به برنامه ی %{app_name} اجازه ی دسترسی به حسابتان را ندادید. + invalid: نشانه مجوز معتبر نیست. + title: درخواست اجازه دادن انجام نشد + oauthorize_success: + allowed: شما به برنامه ی %{app_name} اجازه ی دسترسی به حسابتان را دادید. + title: درخواست اجازه دادن مجاز است + verification: کد تایید %{code} است. + revoke: + flash: شما نشانه را برای %{application} باطل کردید oauth_clients: + create: + flash: اطلاعات با موفقیت ثبت نام شد + destroy: + flash: ثبت نام برنامه ی سرویس گیرنده از بین رفت edit: submit: ویرایش + title: ویرایش برنامه تان form: + allow_read_gpx: خواندن پیگیری های GPS شخصی شان. + allow_read_prefs: خواندن ترجیحات کاربرانشان. + allow_write_api: تغییر نقشه. + allow_write_diary: ایجاد یادداشت های روزانه، نظر و ایجاد دوستان. + allow_write_gpx: بارگزاری پیگیری های GPS. + allow_write_notes: تغییر یادداشت ها. + allow_write_prefs: تغییر ترجیحات کاربرانشان. + callback_url: آدرس پاسخ به تماس name: نام + requests: "مجوز های زیر از کاربر درخواست شده:" + required: موردنیاز + support_url: آدرس پشتیبانی + url: آدرس برنامه اصلی + index: + application: نام برنامه + issued_at: صادر شده در + list_tokens: "نشانه های زیر برای برنامه ی به نام شما صادر شده:" + my_apps: برنامه های سرویس گیرنده ی من + my_tokens: برنامه های مجاز شده ی من + no_apps: آیا برنامه ای دارید که بخواهید برای استفاده بوسیله ی %{oauth} استاندارد ما آنرا ثبت نام کنید؟ شما باید برنامه ی تحت وب خود را ثبت نام کنید قبل از اینکه بتواند در این خدمات OAuth درخواست کند. + register_new: ثبت نام برنامه ی شما + registered_apps: "شما برنامه های سرویس گیرنده ی زیر را ثبت کرده اید:" + revoke: باطل کردن! + title: جزئیات OAuth من + new: + submit: ثبت نام + title: ثبت نام برنامه ی جدید + not_found: + sorry: پوزش، %{type} یافت نمی شود. + show: + access_url: "آدرس دسترسی نشانه:" + allow_read_gpx: خواندن پیگیری های GPS شخصی شان. + allow_read_prefs: خواندن ترجیحات کاربرانشان. + allow_write_api: تغییر نقشه. + allow_write_diary: ایجاد یادداشت های روزانه، نظر و ایجاد دوستان. + allow_write_gpx: بارگزاری پیگیری های GPS. + allow_write_notes: تغییر یادداشت ها. + allow_write_prefs: تغییر ترجیحات کاربرانشان. + authorize_url: "آدرس authorise:" + confirm: آیا مطمئن هستید؟ + delete: حذف مصرف کننده + edit: ویرایش جزئیات + key: "کلید مصرف کننده:" + requests: "مجوز های زیر از سوی کاربر درخواست شده:" + secret: "کد مخفی مصرف کننده:" + support_notice: ما امضا های HMAC-SHA1 (پیشنهاد شده) و RSA-SHA1 را پشتیبانی می کنیم. + title: جزئیات OAuth برای %{app_name} + url: "آدرس درخواست نشانه:" + update: + flash: بروز رسانی اطلاعات سرویس گیرنده موفقیت آمیز بود + redaction: + create: + flash: ویرایش پاک شد. + destroy: + error: در حال از بین بردن این ویرایش خطایی رخ داد. + flash: ویرایش از بین رفت. + not_empty: ویرایش خالی نیست. لطفا همه ی نسخه های متعلق به این ویرایش را در آورید قبل از نابود کردنش. + edit: + description: شرح + heading: ویرایش کردن ویرایش + submit: ذخیره ویرایش + title: ویرایش کردن ویرایش + index: + empty: ویرایشی برای نشان دادن نیست. + heading: فهرست ویرایش ها + title: فهرست ویرایش ها + new: + description: شرح + heading: اطلاعات را برای ویرایش جدید وارد کنید + submit: ایجاد ویرایش + title: ایجاد ویرایش جدید + show: + confirm: آیا مطمئن هستید؟ + description: "شرح:" + destroy: حذف این ویرایش + edit: ویرایش این ویرایش + heading: نمایش ویرایش %{title} + title: نمایش دادن ویرایش + user: "ایجاد کننده:" + update: + flash: تغییرات ذخیره شد. site: + edit: + anon_edits_link_text: پیدا کنید چرا این وضعیت است. + flash_player_required: برای استفاده از Potlatch, ویرایشگر فلش OpenStreetMap به فلش پلیر نیاز دارید. میتوانید آنرا از Adobe.com دانلود کنید. همچنین چندین گزینه ی دیگر برای ویرایش OpenStreetMap موجود است. + id_not_configured: iD پیکربندی نشده است + no_iframe_support: مرورگر شما فریم های HTML که برای این ویژگی لازم است را پشتیبانی نمی کند. + not_public: شما ویرایش هایتان را عمومی تنظیم نکرده اید. + not_public_description: شما دیگر نمی توانید نقشه را ویرایش کنید مگر اینکه این کار را انجام دهید. می توانید در %{user_page} ویرایش هایتان را بعنوان عمومی تنظیم کنید. + potlatch2_not_configured: Potlatch 2 پیکربندی نشده - برای اطلاعات بیشتر http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 را ببینید + potlatch2_unsaved_changes: شما تغییرات ذخیره نشده دارید.( برای ذخیره در Potlatch 2، شما باید ذخیره را کلیک کنید.) + potlatch_unsaved_changes: شما تغییرات ذخیره نشده دارید. (برای ذخیره در Potlatch، اگر ویرایش در حالت زنده است، باید راه یا نقطه ی فعلی را عدم انتخاب کنید، یا اگر دکمه ی ذخیره دارید روی آن کلیک کنید.) + user_page_link: صفحهٔ کاربر index: + createnote: افزودن یادداشت + js_1: شما در حال استفاده از مرورگری هستید که جاوا اسکریپت را پشتیبانی نمی کند، یا جاوا اسکریپت را غیر فعال کرده اید. + js_2: OpenStreetMap برای لیز خوردن نقشه هایش از جاوا اسکریپت استفاده می کند. license: - project_name: پروژه OpenStreetMap + copyright: حق نشر OpenStreetMap و شرکا، تحت یک مجوز باز است + permalink: لینک ثابت + remote_failed: ویرایش ناموفق - مطمئن شوید JOSM یا Merkaartor لوذ شده و گزینه ی کنترل از راه دور فعال است + shortlink: لینک کوتاه key: table: entry: + admin: مرز اداری + allotments: تقسیم بندی شده + apron: + - صحن فرودگاه + - پایانه + bridge: پوشش سیاه = پل + bridleway: راه حیوان رو + brownfield: مکان جهت ساخت + building: ساختمان مهم + byway: Byway + cable: + - ماشین کابلی + - صندلی بالابر cemetery: گورستان + centre: مرکز ورزشی + commercial: منطقه تجاری + common: + - عمومی + - علفزار + construction: جاده در دست ساخت + cycleway: راه دوچرخه + destination: دسترسی به مقصد farm: مزرعه + footway: راه پیاده forest: جنگل golf: زمین گلف + heathland: Heathland + industrial: منطقه صنعتی lake: - دریاچه + - مخزن + military: منطقه نظامی motorway: اتوبان park: پارک + permissive: دسترسی مجاز + pitch: زمین ورزشی + primary: جادهٔ اصلی + private: دسترسی شخصی + rail: راه‌آهن + reserve: طبیعت حفاظت شده + resident: منطقه مسکونی + retail: منطقه خرده فروشی runway: - باند فرودگاه + - فرود به صحن school: - مدرسه - دانشگاه + secondary: جاده دوم + station: ایستگاه راه آهن subway: مترو summit: - قله - قله + tourist: جاذبه ی توریستی + track: پیگیری + tram: + - راه آهن سبک + - قطار برقی trunk: بزرگراه + tunnel: پوشش خط چین شده = تونل + unclassified: جاده طبقه بندی نشده + unsurfaced: جاده ی ظاهر نشده + wood: چوب + markdown_help: + alt: دگرسازی متن + first: اولین مورد + heading: عنوان + headings: عنوان‌ ها + image: تصویر + link: پیوند + ordered: فهرست مرتب شده + second: دومین مورد + subheading: عنوان فرعی + text: متن + title_html: تجزیه با نشانه گذار + unordered: لیست نا مرتب + url: نشانی اینترنتی + richtext_area: + edit: ویرایش + preview: پیش‌نمایش search: search: جستجو - search_help: "مثال : 'نامجو ۱۶، مشهد' ، 'CB2 5AQ' ، 'post offices near تهران' مثالها ادامه..." submit_text: برو where_am_i: من کجا هستم؟ + where_am_i_title: با استفاده از موتور جستجو مکان فعلی را توصیف کنید sidebar: close: بستن search_results: نتایج جستجو time: formats: - friendly: "%e %B %Y ساعت %H:%M" + friendly: "%e %B %Y در %H:%M" trace: create: trace_uploaded: پروندهٔ GPX شما بارگذاری شده است و در انتظار درج در پایگاه داده است. این کار معمولاً نیم ساعت طول می‌کشد و در صورت تکمیل، رایانامه‌ای به شما فرستاده خواهد شد. - upload_trace: ارسال ردیابی جی‌پی‌اس + upload_trace: بارگزاری پیگیری GPS delete: - scheduled_for_deletion: فهرست پیگیری برای حذف کردن + scheduled_for_deletion: پی‌گیری برای حذف برنامه ریزی شده + description: + description_with_count: + one: پرونده GPX با %{count} نقطه از %{user} + other: " پرونده GPX با %{count} نقطه از %{user}" + description_without_count: پرونده GPX از %{user} edit: description: "شرح:" - download: بارگیری + download: دانلود edit: ویرایش filename: "نام پرونده:" - heading: ویرایش رهگیری %{name} + heading: ویرایش پیگیری %{name} map: نقشه owner: "مالک:" points: "نقاط:" @@ -874,22 +1491,26 @@ fa: start_coord: "شروع مختصات:" tags: "برچسب‌ها:" tags_help: ویرگول مرزبندی شده - title: ویرایش رهگیری %{name} - uploaded_at: ":بارگذاری شد" + title: ویرایش پیگیری %{name} + uploaded_at: "بارگذاری شد:" visibility: "پدیداری:" visibility_help: به چه معنی است؟ + georss: + title: پیگیری های GPS OpenStreetMap list: - public_traces: مسیر‌های جی‌پی‌اس عمومی - public_traces_from: مسیر جی‌پی‌اس عمومی از %{user} - tagged_with: با %{tags} برچسب بزنید - your_traces: آثار جی‌پی‌اس شما + description: مرور آخرین پیگیری های GPS بارگذاری شده + empty_html: هنوز چیزی اینجا نیست. بارگذاری پیگیری جدید یا درباره ی پیگیری کردن GPS بیشتر بخوانید در صفحه ی ویکی. + public_traces: پیگیری های GPS عمومی + public_traces_from: پیگیری های GPS عمومی از %{user} + tagged_with: با %{tags} برچسب خورده + your_traces: پیگیری های GPS شما make_public: - made_public: رسم‌کردن عمومی + made_public: پیگیری عمومی ایجاد شده offline: - heading: ذخیره بدون اینترنت جی‌پی‌اس - message: ذخیره جی‌پی‌اس و بارگذاری سامانه غیرقابل دسترس می‌باشد + heading: ذخیره سازی آفلاین GPX + message: ذخیره سازی پرونده GPX و سیستم بارگذاری در حال حاظر در دسترس نیست offline_warning: - message: سامانه بارگذاری جی‌پی‌اکس غیرقابل دسترس می‌باشد + message: سیستم بارگذاری GPX در حال حاظر در دسترس نیست trace: ago: "%{time_in_words_ago} پیش" by: توسط @@ -903,36 +1524,39 @@ fa: pending: انتظار private: خصوصی public: عمومی - trace_details: مشاهده جزئیات رهگیری + trace_details: مشاهده جزئیات پیگیری trackable: قابل رهگیری view_map: نمایش نقشه trace_form: - description: توضیح - help: راهنما - tags: برچسب‌ها + description: "توضیحات:" + help: کمک + tags: "برچسب‌ها:" tags_help: ویرگول مرزبندی شده upload_button: بارگذاری - upload_gpx: ارسال پرونده GPX - visibility: پدیداری - visibility_help: حد وسط این چیست؟ + upload_gpx: "بارگذاری پرونده ی GPX:" + visibility: "پدیداری:" + visibility_help: این به چه معناست؟ trace_header: - see_all_traces: دیدن همه رهگیری‌ها - see_your_traces: دیدن تمام رهگیری‌های شما - upload_trace: بارگذاری یک رهگیری + see_all_traces: دیدن همه پیگیری ها + see_your_traces: دیدن تمام پیگیری های شما + traces_waiting: + one: شما %{count} پیگیری منتظر بارگذاری دارید. لطفا برای تمام شدن منتظر بمانید قبل از بارگذاری موارد بیشتر، تا صف برای سایر کاربران بسته نشود. + other: شما %{count} پیگیری منتظر بارگذاری دارید. لطفا برای تمام شدن منتظر بمانید قبل از بارگذاری موارد بیشتر، تا صف برای سایر کاربران بسته نشود. + upload_trace: بارگذاری یک پیگیری trace_optionals: tags: برچسب‌ها trace_paging_nav: - next: بعدی » - previous: « قبلی - showing_page: نمایش صفحه %{page} + newer: پیگیری های جدید تر + older: پیگیری های قدیمی تر + showing_page: صفحه %{page} view: - delete_track: حذف این رهگیری + delete_track: حذف این پیگیری description: "شرح:" - download: بارگیری + download: دانلود edit: ویرایش - edit_track: ویرایش این رهگیری + edit_track: ویرایش این پیگیری filename: "نام پرونده:" - heading: دیدن رهگیری %{name} + heading: دیدن پیگیری %{name} map: نقشه none: هیچ کدام owner: "مالک:" @@ -940,45 +1564,52 @@ fa: points: "نقاط:" start_coordinates: "شروع مختصات :" tags: "برچسب‌ها:" - title: دیدن رهگیری %{name} - trace_not_found: رهگیری یافت نشد! - uploaded: ":بارگذاری شد" + title: دیدن پیگیری %{name} + trace_not_found: پیگیری یافت نشد! + uploaded: "بارگذاری شد:" visibility: "پدیداری:" visibility: - identifiable: " قابل تشخیص(نقاط مرتب شده بر اساس زمان را در فهرست پیگیری به عنوان قابل تشخیص نشان دهید)" - private: خصوصی (فقط به عنوان ناشناس ، نقاط نامشخص) - public: عمومی (نقاط مرتب نشده را در فهرست پیگیری به عنوان ناشناس نمایش دهید( - trackable: (قابل پیگیری (نقاط مرتب شده بر اساس زمان را تنها به عنوان ناشناس به اشتراک بگذارید + identifiable: قابل شناسایی (نقاط مرتب‌شده بر اساس زمان را در فهرست پی‌گیری به‌عنوان قابل تشخیص نشان دهید) + private: خصوصی (فقط به‌عنوان ناشناس ، نقاط نامشخص) + public: عمومی (نمایش نقاط نامرتب در فهرست پیگیری ها بعنوان ناشناس) + trackable: قابل پی‌گیری (نقاط مرتب شده بر اساس زمان را تنها به عنوان ناشناس به اشتراک بگذارید) user: account: contributor terms: - agreed: شما باید با شرایط کاربرهای جدید موافقت کنید - agreed_with_pd: شما اقرار کردید که ویرایش‌های شما به صورت عمومی ارائه گردند + agreed: شما باید با شرایط کاربرهای جدید موافقت کنید. + agreed_with_pd: شما اعلام کردید که ویرایش‌های شما به صورت عمومی ارائه گردند. heading: "شرایط شرکت‌کنندگان:" link text: این چیست؟ - not yet agreed: شما هنوز با شرایط کار جدی موافقت نکردید - review link text: برای آسودگی خود این پیوند را دنبال کنید تا شرایز کاربر جدید را مطالعه و موافقت کنید - current email address: "آدرس رایانامهٔ فعلی:" + not yet agreed: شما هنوز با شرایط شرکت کنندگان جدید موافقت نکردید. + review link text: برای آسودگی خود این پیوند را دنبال کنید تا شرایط شرکت کنندگان را مطالعه و موافقت کنید. + current email address: "آدرس ایمیل کنونی:" delete image: حذف تصویر فعلی - email never displayed publicly: (هرگز به صورت عمومی نمایش داده نشود) + email never displayed publicly: (هرگز به صورت عمومی نمایش داده نمی شود) flash update success: اطلاعات کاربر با موفقیت به روز شد. - flash update success confirm needed: اطلاعات کاربر با موفقیت به روز شد . پست‌الکترونیک خود را برای مشاهده تائید نشانی پست‌الکترونیک جدید چک کنید + flash update success confirm needed: اطلاعات کاربر با موفقیت به روز شد. برای تایید آدرس ایمیل جدیدتان یادداشت موجود در ایمیل تان را بررسی کنید. + gravatar: + gravatar: استفاده از Gravatar + link text: این چیست؟ home location: "موقعیت خانه:" image: "تصویر :" - image size hint: (مربع عکس‌ها حداقل 100 در 100 بهترین کار) + image size hint: (مربع عکس‌ها حداقل 100 در 100 بهترین کاریی را دارد) keep image: نگه‌داشتن تصویر فعلی latitude: "عرض جغرافیایی:" longitude: "طول جغرافیایی:" make edits public button: همه ویرایش‌های من را عمومی کن my settings: تنظیمات من - new email address: "رایانامهٔ جدید:" + new email address: "آدرس ایمیل جدید:" new image: افزون یک تصویر - no home location: شما مجبور به وارد کردن موقعیت خانه‌تان نیستید - preferred editor: "ویرایشگر مرجع:" - preferred languages: "زبان برگزیده:" - profile description: "توصیف نمایه:" + no home location: شما محل خانهٔ خودتان را وارد نکرده‌اید. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: این چیست؟ + openid: "OpenID:" + preferred editor: "ویرایشگر برگزیده:" + preferred languages: "زبان های برگزیده:" + profile description: "شرح نمایه:" public editing: - disabled: غیر فعال شده است و تمام ویرایش‌های قبلی به‌صورت ناشناس هستند + disabled: غیر فعال شده و نمیتوان ویرایش کرد، همه ی ویرایش های قبلی بصورت ناشناس اند. disabled link text: چرا من نمی‌توانم ویرایش کنم؟ enabled: فعال شدید.ناشناس نیستید و می‌توانید اطلاعات را ویرایش کنید enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits @@ -986,195 +1617,362 @@ fa: heading: "ویرایش عمومی:" public editing note: heading: ویرایش عمومی + text: هم اکنون ویرایش های شما ناشناس اند و مردم نمی توانند مکان شما را ببینند یا برایتان پیام بفرستند. برای نمایش آنچه ویرایش کرده اید و اجازه به مردم برای برقراری ارتباط با شما از طریق وب سایت، روی دکمه ی زیر کلیک کنید. از تغییرات 0.6 API، فقط کاربران عمومی میتوانند نقشه را ویرایش کنند. (دلیل را پیدا کنید).
    • آدرس ایمیل شما با تبدیل به عمومی آشکار نخواهد شد.
    • این عملیات را نمی شود برگرداند و همه ی کاربران تازه به طور پیشفرض عمومی هستند.
    replace image: " تصویر فعلی را جایگزین کنید" - return to profile: بازگشت به محل مشخصات - save changes button: "ذخیرهٔ تغییرات:" - title: "ویرایش حساب:" - update home location on click: آیا وقتی که روی نقشه کلیک میکنید موقعیت خانه را به روز کنم ؟ + return to profile: بازگشت به نمایه + save changes button: ذخیرهٔ تغییرات + title: ویرایش حساب + update home location on click: وقتی روی نقشه کلیک میکنم موقعیت خانه بروز شود؟ confirm: already active: این حساب کاربری در حال حاضر تأیید شده است. button: تایید - heading: تایید حساب کاربر - success: " تشکر از ثبت نام حساب کاربری تایید شد" - unknown token: مورد گرفته شده موجود نیست + heading: ایمیل تان را بررسی کنید! + introduction_1: یک ایمیل تایید به شما ارسال کردیم. + introduction_2: حسابتان را با کلیک روی لینکی که در ایمیل بود تایید کنید و قادر خواهید بود نقشه کشی را شروع کنید. + press confirm button: برای فعالسازی حساب تان روی دکمه ی تایید زیر کلیک کنید. + reconfirm_html: اگر نیاز دارید ایمیل تائید را دوباره بفرستیم، اینجا کلیک کنید. + unknown token: کد تایید منقضی شده یا وجود ندارد. confirm_email: button: تأیید - failure: یک رایانامه با همین نشانه، پیش‌از این تایید شده است. - heading: تایید یک رایانامه تغییریافته - press confirm button: دکمه تایید زیرین را برای تایید آدرس رایانامهٔ جدیدتان بفشارید. - success: آدرس پست‌الکتریک شما تادید شد . ممنون از ثبت نام شما + failure: یک آدرس ایمیل در حال حاظر با این نشانه تایید شده است. + heading: تایید تغییر آدرس ایمیل + press confirm button: برای تایید آدرس ایمیل جدیدتان دکمه ی تایید زیر را فشار دهید. + success: آدرس ایمیل تان تایید شد، با تشکر از شما برای ثبت نام! confirm_resend: - failure: کاربری با نام %{name} یافت نشد. + failure: کاربر %{name} یافت نشد. + success: ما نکته ی تایید جدیدی به %{email} فرستادیم و به محض اینکه شما حسابتان را تایید کنید شما قابلیت نقشه کشی را خواهید داشت.

    اگر شما از یک سیتم ضد هرزنامه استفاده میکنید که درخواست های تایید را میفرستد مطمئن شوید webmaster@openstreetmap.org را در لیست سفید گذاشته اید که ما قادر به پاسخ به هیچ درخواست تاییدی نیستیم. filter: not_an_administrator: برای انجام آن عملیات نیاز هست که سرپرست باشید go_public: - flash success: تمام ویرایش‌های شما به صورت عمومی منتشر شد و شما اجازه ویرایش دارید + flash success: تمام ویرایش‌های شما اکنون عمومی اند، و شما برای ویرایش مجاز هستید. list: confirm: تایید کاربران انتخاب شده empty: هیچ کاربر مشابهی یافت نشد heading: کاربران hide: پنهان کردن کاربران انتخاب شده showing: - one: "نمایش صفحه %{page} (%{first_item} از %{items}) " - other: " نمایش صفحه صفحه %{page} (%{first_item}-%{last_item} از %{items})" + one: صفحه %{page} (%{first_item} از %{items}) + other: صفحه %{page} (%{first_item}-%{last_item} از %{items}) summary: "%{name} ایجاد شده از %{ip_address} در %{date}" summary_no_ip: " %{name}در %{date} ایجاد شد" title: کاربران login: - email or username: "رایانامه یا نام کاربری:" + account is suspended: پوزش، حساب شما به دلیل فعالیت های مشکوک مسدود شده است.
    لطفا تماس بگیرید با مدیر سایت اگر میخواهید آنرا مطرح کنید. + account not active: پوزش، حساب تان هنوز فعال نشده.
    لطفا از لینکی که در ایمیل تائید بود برای فعال سازی حساب تان استفاده کنید، یا یک ایمیل تایید جدید درخواست دهید. + auth failure: پوزش، با این اطلاعات نمی توان وارد شد. + create account minute: یک حساب بسازید. فقط یک دقیقه زمان می برد. + email or username: "ایمیل یا نام کاربری:" heading: ورود به سیستم login_button: ورود - new to osm: به نقشهٔ باز شهری جدید؟ + lost password link: کلمه عبور خود را فراموش کرده اید؟ + new to osm: برای OpenStreetMap جدید اید؟ + no account: حساب کاربری ندارید؟ + openid: "%{logo} OpenID:" + openid invalid: پوزش، OpenID شما ناقص به نظر می رسد + openid missing provider: پوزش، با ارایه دهنده OpenID شما نمی توان ارتباط برقرار کرد + openid_logo_alt: ورود با OpenID + openid_providers: + aol: + alt: ورود با یک OpenID ، AOL + title: ورود با AOL + google: + alt: ورود با یک OpenID گوگل + title: ورود با گوگل + myopenid: + alt: ورود با یک OpenID myOpenID + title: ورود با myOpenID + openid: + alt: ورود با یک آدرس OpenID + title: ورود با OpenID + wordpress: + alt: ورود با یک OpenID وردپرس + title: ورود با وردپرس + yahoo: + alt: ورود با یک OpenID یاهو + title: ورود با یاهو password: "کلمه عبور:" - remember: "به‌خاطر سپردن من:" + register now: اکنون ثبت نام شود + remember: مرا به خاطر بسپار title: ورود به سیستم + to make changes: برای ایجاد تغییرات در داده های OpenStreetMap، شما باید یک حساب داشته باشید. + with openid: "متناوبا، برای وارد شدن از OpenID استفاده کنید:" + with username: "از قبل حساب OpenStreetMap دارید؟ لطفا با نام کاربری و رمز عبورتان وارد شوید:" logout: - heading: خروج از نقشه باز شهری + heading: خروج از OpenStreetMap logout_button: خروج title: خروج lost_password: - email address: "رایانامه:" - heading: گذرواژه خود را فراموش کرده‌اید؟ - help_text: رایانامه خودتان را که برای ثبت نام استفاده می‌کنید وارد کنید، ما می‌خواهیم یک پیوند برای شما ارسال کنیم تا بتوانید بوسیله آن گذواژهٔ خود را بازنشانی کنید. - new password button: بازنشانی گذرواژه - notice email cannot find: شرمنده نشانی آن پست‌الکترونیک یافت نشد - notice email on way: متاسفم که گم کردید ولی یک نامه الکترونیک در راه هست و شما به زودی می‌توانید آن را از نو تنظیم کنید - title: شکست گذرواژه + email address: "آدرس ایمیل:" + heading: کلمه عبور خود را فراموش کرده‌اید؟ + help_text: ایمیلی را که هنگام ثبت نام استفاده کرده اید وارد کنید، ما لینکی به آن می فرستیم تا بتوانید بوسیله ی آن کلمه عبورتان را مجدد تنظیم کنید. + new password button: تنظیم مجدد کلمه عبور + notice email cannot find: آدرس ایمیل یافت نشد، متاسفیم. + notice email on way: متاسفیم که آنرا گم کرده اید :-( اما ایمیلی در راه است که میتوانید بزودی آنرا مجدد تنظیم کنید. + title: فراموشی کلمه عبور make_friend: - already_a_friend: شما در حال حاضر دوست با %{name} هستید. - failed: شرمنده، نمی‌توان %{name} را به عنوان دوست افزود - success: "%{name} الان از دوستان شما هست." + already_a_friend: شما در حال حاضر با %{name} دوست هستید. + button: افزودن بعنوان دوست + failed: پوزش، افزودن %{name} به عنوان دوست ناموفق بود. + heading: افزودن %{user} بعنوان دوست؟ + success: "%{name} اکنون دوست شما است!" new: - confirm email address: "تایید نشانی رایانامه:" - confirm password: "تایید گذرواژه:" - contact_webmaster: لطفا با سرپرست برای ساختن حساب کاربری هماهنگی کنید و تماس بگیرید - ما سعی میکنیم به درخواست ‌ها به سرعت پاسخ دهیم - continue: ادامه - display name: "نمایش نام:" - display name description: " نام کاربری شما برای عموم نمایش داده شده. شما می توانید این مورد را در بخش ترجیحات تغییر دهید." - email address: "رایانامه:" - fill_form: این فرم را پر کنید . ما برای شما یک پیام‌الکترونیکی برای فعال سازی حساب کاربریتان خواهیم فرستاد - heading: ایجاد حساب کاربری - no_auto_account_create: متاسفانه در حال حاضر برای ما امکان ساخت خودکار حساب کاربری مقدور نیست + about: + header: رایگان و قابل ویرایش + html: "

    بر خلاف سایر نقشه ها، OpenStreetMap کاملا توسط افرادی مثل شما ساخته شده و برای تعمیر، بروزرسانی، دانلود و استفاده برای هر کسی آزاد است.

    \n

    برای شروع کمک ثبت نام کنید. برای تائید حساب تان ایمیلی می فرستیم.

    " + confirm email address: "تایید آدرس ایمیل:" + confirm password: "تایید کلمه عبور:" + contact_webmaster: لطفا با مدیر سایت برای ساختن حساب کاربری هماهنگی کنید و تماس بگیرید - ما سعی میکنیم به درخواست ‌ها به سرعت پاسخ دهیم. + continue: ثبت نام + display name: "نام نمایشی:" + display name description: " نام کاربری شما برای عموم نمایش داده شده. شما می توانید بعدا این مورد را در ترجیحات تغییر دهید." + email address: "آدرس ایمیل:" + license_agreement: وقتی ایمیل تان را تایید کردید نیاز است که با شرایط همکاریموافقت کنید. + no_auto_account_create: متاسفانه در حال حاضر برای ما امکان ساخت خودکار حساب کاربری شما مقدور نیست. + not displayed publicly: به عموم نشان داده نمیشود (حفظ حریم خصوصیرا ببینید) + openid: "%{logo} OpenID:" + openid association: "

    OpenID شما هنوز با یک حساب OpenStreetMap همراه نیست.

    \n
      \n
    • اگر در OpenStreetMap جدید هستید، لطفا از زیر یک حساب بسازید.
    • \n
    • \nاگر از قبل حسابی دارید، میتوانید با استفاده از نام کاربری و رمز عبورتان وارد حساب تان شوید و سپس حسابتان را در تنظیمات کاربری به OpenID وابسته سازید.\n
    • \n
    " + openid no password: با OpenID رمز عبور درخواست نمیشود، اما برخی ابزارهای اضافی یا سرویس دهنده هنوز به یکی نیاز دارند. password: "کلمه عبور:" - terms accepted: با تشکر از پذیرش شرایط نویسندگان جدید! - title: ایجاد حساب کاربری + terms accepted: با تشکر از پذیرش شرایط شرکت کنندگان جدید! + terms declined: متاسفیم که تصمیم گرفتید شرایط شرکت کننده جدید را نپذیرید. برای اطلاعات بیشتر، این صفحه ویکیرا ببینید. + title: ثبت نام + use openid: روش دیگر، استفاده از %{logo} OpenID برای وارد شدن no_such_user: - body: با عرض پوزش ، هیچ کاربر با نام %{user} وجود ندارد. لطفا املایی خود نام کاربری را بازبینی کنید یا شاید لینکی که کلیک کردید اشتباه است. + body: با عرض پوزش ، هیچ کاربری با نام %{user} وجود ندارد. لطفا نحوه نوشتن تان را بررسی کنید، یا شاید لینکی که کلیک کردید اشتباه است. heading: کاربر %{user} وجود ندارد title: چنین کاربری وجود ندارد popup: friend: دوست - nearby mapper: نقشه‌ترسیم کننده در این اطراف - your location: مکان حضور شما + nearby mapper: نقشه کش نزدیک + your location: مکان شما remove_friend: - not_a_friend: "%{name} از دوستان شما نیست." - success: "%{name} از دوستان شما حذف شده است." + button: لغو دوستی + heading: لغو دوستی %{user}؟ + not_a_friend: "%{name} یکی از دوستان شما نیست." + success: "%{name} از دوستان شما حذف شده‌است." reset_password: - confirm password: "تایید گذرواژه:" - flash changed: رمز عبور شما تغییر کرده است. - flash token bad: آیا آن مورد دیافتی را یافتید؟آدرس اینترنتی را چک کنید - heading: بازیابی کلمه عبور برای %{user} + confirm password: "تایید کلمه عبور:" + flash changed: کلمه عبور شما تغییر کرده است. + flash token bad: نشانه را نیافتید؟ آدرس را برسی کنید شاید یافتید. + heading: تنظیم مجدد کلمه عبور برای %{user} password: "کلمه عبور:" - reset: بازنشانی گذرواژه - title: بازنشانی گذرواژه + reset: تنظیم مجدد کلمه عبور + title: تنظیم مجدد کلمه عبور set_home: flash success: موقعیت خانه با موفقیت ذخیره شد suspended: - body: "

    \n شرمنده ! یه خاطر فعالیت مشکوک حساب کاربری شما به تعلیق افتاده است\n

    \n

    \nاین تصمیم به وسیله یک مدیر بازبینی خواهد شد . در صورتی که بخواهید میتوانید با %{webmaster}برای بحث در این زمینه تماس حاصل نمایید\n

    " - heading: حساب کاربری معلق - title: حساب کاربری معلق + body: "

    \nپوزش! یه خاطر فعالیت مشکوک حساب کاربری شما بصورت خودکار متوقف شده است.\n

    \n

    \nاین تصمیم به وسیله یک مدیر در مدت کوتاه بازبینی می شود، در صورتی که بخواهید میتوانید با %{webmaster}برای بحث در این زمینه تماس بگیرید.\n

    " + heading: حساب کاربری معلق شده + title: حساب کاربری معلق شده webmaster: مدیرسایت terms: agree: موافقت consider_pd: بر اساس توافق‌نامه موفق من ویرایش‌ها و تولیدات خودم را اجازه میدهم که به صورت عمومی انتشار یابد consider_pd_why: این چیست؟ - decline: کاهش - heading: شرایط نویسندگان + decline: رد کردن + guidance: "اطلاعات برای کمک به درک این شرایط: human readable summaryو برخی از ترجمه های غیر رسمی" + heading: شرایط شرکت کنندگان legale_names: france: فرانسه italy: ایتالیا rest_of_world: دیگر نقاط جهان - legale_select: "لطفا کشور محل سکونت خود را انتخاب کنید:" + legale_select: "كشور محل سكونت:" read and accept: برای ادامه‌دادن و ویرایش‌کردن‌های آینده لطفا این توافق‌نامه را مطالعه کنید و دکمه موافق هستم را فشار دهید به عنوان اینکه شما موارد این توافق نامه را قبول دارید title: شرایط شرکت‌کنندگان + you need to accept or decline: برای ادامه لطفا بخوانید و سپس شرایط شرکت کننده ی جدید را بپذیرید یا رد کنید. view: activate_user: فعال‌کردن این کاربر - add as friend: اضافه‌کردن به عنوان دوست - ago: )%{time_in_words_ago} پیش( - block_history: نمایش بلوک‌های دریافتی - blocks by me: بستن‌ها توسط من - blocks on me: بلوک های من + add as friend: افزودن دوست + ago: (%{time_in_words_ago}قبل) + block_history: بلوک های دریافتی + blocks by me: بوک های توسط من + blocks on me: بلوک های بر من + comments: نظرات confirm: تأیید confirm_user: تایید این کاربر - create_block: بستن این کاربر + create_block: بلوک کردن این کاربر created from: "ایجادشده از:" - deactivate_user: این کاربر را غیر فعال کنید - delete_user: این کاربر حذف شود - description: توضیح - diary: دفتر خاطرات - edits: ویرایش‌ها - email address: "نشانی رایانامه:" - hide_user: این کاربر را مخفی کنید - if set location: در صورت تظیم موقعیتتان تعدادی نقشه و متعلقات در اینجا اضافه میشوند . شما میتوانید موقعیت خانه خود را در صفحه %{settings_link} تنظیم کنید + ct accepted: پذیرفته شده %{ago} قبل + ct declined: رد شده + ct status: "شرایط شرکت کنندگان:" + ct undecided: بلاتکلیف + deactivate_user: غیر فعال کردن این کاربر + delete_user: حذف این کاربر + description: شرح + diary: یادداشت روزانه + edits: ویرایش‌ ها + email address: "آدرس ایمیل:" + friends_changesets: تغییرات انجام شده ی دوستان + friends_diaries: یادداشت های روزانه ی دوستان + hide_user: مخفی کردن این کاربر + if set location: مکان خانه تان را در صفحه ی %{settings_link} تنظیم کنید تا کاربران نزدیک تان را ببینید. km away: "%{count} کیلومتر فاصله" latest edit: "آخرین ویرایش %{ago}:" m away: "%{count} متر فاصله" mapper since: "نقشه‌برداری از:" - moderator_history: نمایش بلوک‌های دریافتی - my diary: دفتر خاطرات من - my edits: ویرایش‌های من + moderator_history: بلوک های داده شده + my comments: نظرات من + my diary: یادداشت روزانه ی من + my edits: ویرایش های من + my messages: پیام های من + my notes: یادداشت های من + my profile: نمایه ی من my settings: تنظیمات من - my traces: پیگیری‌های من + my traces: پیگیری‌ های من nearby users: دیگر کاربران نزدیک - new diary entry: ورود خاطرات جدید + nearby_changesets: تغییرات انجام شده ی کاربران نزدیک + nearby_diaries: یادداشت های روزانه ی کاربران نزدیک + new diary entry: ورودی یادداشت روزانه جدید no friends: شما هنوز هیچ دوستی اضافه نکرده‌اید no nearby users: در این حوالی هیچ کاربری نقشه ترسیم نکرده است + notes: یادداشت های نقشه oauth settings: تنظیمات oauth - remove as friend: حذف به‌عنوان دوست + remove as friend: لغو دوستی role: - administrator: این کاربر سرپرست می‌باشد + administrator: این کاربر سرپرست است grant: - administrator: به سرپرست دسترسی بدهید - moderator: به سرپرست دسترسی بدهید + administrator: اجازه ی دسترسی به سرپرست + moderator: اجازه ی دسترسی به محیط moderator: این کاربر مدیر است revoke: - administrator: دسترسی سرپرست را لغو شد - moderator: دسترسی مدیر را لغو کنید - send message: ارسال پیغام + administrator: لغو دسترسی سرپرست + moderator: لغو دسترسی مدیر + send message: ارسال پیام settings_link_text: تنظیمات spam score: "امتیاز هرزنامه:" status: "وضعیت:" - traces: اثرها - unhide_user: این کاربر را غیر مخفی کنید + traces: پیگیری ها + unhide_user: آشکار ساختن این کاربر user location: موقعبت کاربر your friends: دوستان شما user_block: + blocks_by: + empty: "%{name} هنوز بلوکی ایجاد نکرده." + heading: فهرست بلوک توسط %{name} + title: بلوک توسط %{name} + blocks_on: + empty: "%{name} هنوز بلوک نشده." + heading: فهرست بلوک ها در %{name} + title: بلوک ها در %{name} + create: + flash: یک بلوک روی کاربر %{name} ایجاد شد. + try_contacting: لطفا قبل از بلوک کردن با کاربر تماس بگیرید و به آنها زمان مناسب دهید تا پاسخ دهند. + try_waiting: لطفا به کاربر زمان کافی دهید تا پاسخگو باشد قبل از بلوک کردنش. + edit: + back: مشاهده تمام بلوک ها + heading: ویرایش بلوک در %{name} + needs_view: چرا قبل از پاک کردن این بلوک کاربر نیاز به وارد شدن دارد؟ + period: چه مدت، الان شروع شود، کاربر از API بلوک میشود برای. + reason: دلیل اینکه چرا %{name} بلوک شده است. لطفا آرام باشید و تا جایی که ممکن است معقول و منطقی باشید، تا جایی که میتوانید درباره ی وضعیت اطلاع دهید. به یاد داشته باشید همه ی کاربران اصطلاحات خاص انجمن را نمی فهمند، پس لطفا سعی کنید از شرایط تازه واردان استفاده کنید. + show: مشاهده این بلوک + submit: به روز رسانی بلوک + title: ویرایش بلوک در %{name} + filter: + block_expired: بلوک قبلا منقضی شده و قابل ویرایش نیست. + block_period: دوره ی بلوک کردن باید یکی از مقدار های قابل انتخاب در لیست بازشو باشد. + helper: + time_future: در %{time} پایان می پذیرد. + time_past: به پایان رسیده %{time} قبل. + until_login: فعال تا وقتی کاربر وارد شود. + index: + empty: هنوز بلوکی ساخته نشده. + heading: لیست بلوک های کاربر + title: بلوک های کاربر + model: + non_moderator_revoke: برای لغو یک بلوک باید مدیر بود. + non_moderator_update: برای بروزرسانی یا ایجاد بلوک باید یک مدیر بود. + new: + back: مشاهده تمام بلوک ها + heading: ایجاد بلوک در %{name} + needs_view: کاربر قبل از پاک شدن این بلوک نیاز به وارد شدن دارد + period: چه مدت، الان شروع شود، کاربر از API بلوک میشود برای. + reason: دلیل اینکه چرا %{name} بلوک شده است. لطفا آرام باشید و تا جایی که ممکن است معقول و منطقی باشید، تا جایی که میتوانید درباره ی وضعیت اطلاع دهید، این را به خاطر داشته باشید که این پیام بصورت عمومی پدیدار است. به یاد داشته باشید همه ی کاربران اصطلاحات خاص انجمن را نمی فهمند، پس لطفا سعی کنید از شرایط تازه واردان استفاده کنید. + submit: ایجاد بلوک + title: ایجاد بلوک در %{name} + tried_contacting: من با کاربر تماس گرفته و درخواست کردم توقف کند. + tried_waiting: من مقدار مناسبی زمان را به کاربر دادم تا به این ارتباط پاسخ دهد. + not_found: + back: بازگشت به فهرست + sorry: پوزش، بلوک کاربر با شناسه %{id} یافت نمی شود. partial: + confirm: آیا مطمئن هستید؟ + creator_name: ایجاد کننده + display_name: کاربر بلوک شده edit: ویرایش + next: بعدی » + not_revoked: (باطل نشده) + previous: « قبلی + reason: دلیل بلوک + revoke: باطل کردن! + revoker_name: باطل شده توسط + show: نمایش + showing_page: صفحهٔ %{page} status: وضعیت period: one: 1 ساعت other: "%{count} ساعت" + revoke: + confirm: مطمئنید میخواهید این بلوک را لغو کنید؟ + flash: این بلوک باطل شد. + heading: لغو بلوک در %{block_on} توسط %{block_by} + past: این بلوک %{time} پایان یافته و اکنون قابل لغو کردن نیست. + revoke: باطل کردن! + time_future: این بلوک در %{time} پایان می یابد. + title: لغو بلوک در %{block_on} show: + back: مشاهده تمام بلوک ها confirm: آیا مطمئن هستید؟ edit: ویرایش + heading: "%{block_on} توسط %{block_by} بلوک شده" + needs_view: کاربر قبل از پاک شدن این بلوک نیاز به وارد شدن دارد. + reason: "دلیل بلوک:" + revoke: باطل کردن! + revoker: "باطل کننده:" show: نمایش status: وضعیت + time_future: در %{time} پایان می پذیرد + time_past: به پایان رسیده %{time} قبل + title: "%{block_on} توسط %{block_by} بلوک شده" + update: + only_creator_can_edit: فقط مدیری که این بلوک را ایجاد کرده میتواند آنرا ویرایش کند. + success: بلوک بروزرسانی شد. user_role: filter: already_has_role: کاربر در حال حاضر نقش %{role} دارد. - doesnt_have_role: کاربر نقشی ندارد %{role}. - not_a_role: رشته '%{role}' نقش معتبر نیست. - not_an_administrator: فقط مدیران می توانند نقش مدیریت کاربرها را انجام دهند ، و شما مدیر نیستید. + doesnt_have_role: کاربر نقش %{role} را ندارد. + not_a_role: رشته '%{role}' یک نقش معتبر نیست. + not_an_administrator: فقط مدیران می توانند مدیریت نقش کاربران را انجام دهند ، و شما مدیر نیستید. grant: - are_you_sure: آیا اطمینان دارید که می خواهید نقش '%{role}' از کاربر '%{name}' را اعطا کنید؟ + are_you_sure: آیا اطمینان دارید که می خواهید نقش '%{role}' را به کاربر '%{name}' اعطا کنید؟ confirm: تأیید - fail: نمی‌توان نقش %{role} کاربر %{name} را اهدا کرد . لطفا از معتبر بودن کاربر و نقش اطمینان حاصل نمایید + fail: نمی‌توان نقش %{role} کاربر %{name} را اعطا کرد . لطفا از معتبر بودن کاربر و نقش اطمینان حاصل نمایید. heading: تایید اعطای نقش title: تایید اعطای نقش revoke: - are_you_sure: آیا شما اطمینان دارید که می خواهید نقش `%{role}' را از کاربر '%{name}' حذف نمایید؟ + are_you_sure: آیا شما اطمینان دارید که می خواهید نقش `%{role}' را از کاربر '%{name}' لغو نمایید؟ confirm: تأیید - fail: نمی‌توان نقش %{role} کاربر %{name} را لغو کرد . لطفا از معتبر بودن کاربر و نقش اطمینان حاصل نمایید - heading: تایید لغو نقش - title: تایید لغو نقش + fail: نمی‌توان نقش %{role} کاربر %{name} را لغو کرد . لطفا از معتبر بودن کاربر و نقش اطمینان حاصل نمایید. + heading: تایید ابطال نقش + title: تایید ابطال نقش + welcome_page: + add_a_note: + paragraph_1_html: "اگر فقط چیزهای کوچکی را میخواهید ترمیم کنید و زمانی برای ثبت نام و یادگیری ویرایش ندارید، \nافزودن یک یادداشت خیلی ساده است." + paragraph_2_html: "فقط بروید به نقشه و روی آیکون یادداشت کلیک کنید:\n. اینجوری یک علامت گذار به نقشه اضافه میشود، که میتوانید با کشیدن جابجایش کنید. پیامتان را اضاف کنید، بعد روی ذخیره کلیک کنید، و سایر نقشه کشان بررسی خواهند کرد." + title: زمانی برای ویرایش ندارید؟ یک یادداشت اضافه کنید! + basic_terms: + editor_html: ویرایشگر یک برنامه یا وبسایت است که با استفاده از آن میتوانید نقشه را ویرایش کنید. + node_html: گره یک نقطه روی نقشه است، مثل یک رستوران تنها یا یک درخت. + paragraph_1_html: OpenStreetMap مقداری زبان ویژه خود دارد. اینجا چند کلمه ی کلیدی هست که بصورت دستی آمده اند. + tag_html: برچسب یک بیت داده درباره ی یک گره یا راه است، شبیه نام یک رستوران یا محدودیت سرعت یک جاده. + title: شرایط اساسی برای نقشه برداری + way_html: راه یک خط یا فضا است، مثل یک رود، نهر آب، برکه یا ساختمان. + introduction_html: به OpenStreetMap خوش آمدید، نقشه ای رایگان و قابل ویرایش از جهان. حالا که شما وارد سیستم شده اید، شما همه ی شروط نقشه کشی را دارید. اینجا یک راهنمایی سریع هست با مهمترین چیزهایی که شما به دانستنش نیاز دارید. + questions: + paragraph_1_html: "OpenStreetMap چندین منبع برای یادگیری پیرامون پروژه، پرسش و پاسخ به پرسش، و بحث مشترک و مباحث نقشه برداری مستند دارد.\nبرای کمک اینجا بروید." + title: سؤالی هست؟ + start_mapping: شروع نقشه کشی + title: خوش آمدید! + whats_on_the_map: + off_html: آنچه شامل نمیشود داده های خودرای مثل رتبه بندی، ویژگی های تاریخی یا فرضی، و داده های منابع حق نشر شده اند. از نقشه های آنلاین یا کاغذی کپی نکنید، مگر اینکه اجازه ی ویژه داشته باشید. + on_html: OpenStreetMap مکانی برای کارهای نقشه کشی است که هر دو واقعی و حاضر اند- شامل میلیون ها ساختمان، جاده، و سایر جزئیات در مورد مکان هاست. شما میتوانید هرچه که در دنیای واقعی برایتان جالب است را نقشه کنید. + title: داخل نقشه چیست diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 7b49a6d0d3c..2de822f811f 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -2,18 +2,36 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Alluk. +# Author: Centerlink # Author: Crt # Author: Daeron # Author: Lliehu +# Author: Nedergard +# Author: Nemo bis # Author: Nike # Author: Olli # Author: Ramilehti +# Author: Samoasambia # Author: Silvonen +# Author: Snidata # Author: Str4nd +# Author: Susannaanas # Author: Tomi Toivio # Author: Usp # Author: ZeiP fi: + about_page: + community_driven_html: "OpenStreetMap-yhteisö on monipuolinen, intohimoinen ja kasvaa joka päivä. Yhteisöön kuuluu harrastajakartoittajia, GIS-ammattilaisia, järjestelmää ylläpitäviä insinöörejä, humanitaarisia auttajia, jotka kartoittavat katastrofin kärsineitä alueita sekä monia muita. Lisätietoja yhteisöstä saa lukemalla käyttäjien päiväkirjoja,\nyhteisöblogeja ja\nOSM-säätiön verkkosivua." + community_driven_title: Yhteisön voima + copyright_html: ©OpenStreetMap
    -kartoittajat + lede_text: OpenStreetMapia rakentavat vapaaehtoiset yhteisön jäsenet, jotka tuottavat ja ylläpitävät karttatietoja teistä, rautateistä, kahviloista, rautatieasemista ja monista muista kohteista kaikkialla maailmassa. + local_knowledge_html: OpenStreetMapissa korostuu paikallistuntemus. Kartoittajat käyttävät ilmakuvia, GPS-paikantamia ja jalkautumista pitääkseen OpenStreetMap-kartan ajan tasalla. + local_knowledge_title: Paikallistuntemus + next: Seuraava + open_data_html: "OpenStreetMap on avointa dataa: palvelua saa käyttää vapaasti mihin tahansa, kunhan OpenStreetMap tekijöineen mainitaan. Jos palvelua kehitetään tai muuunnellaan, sitä saa levittää eteenpäin vain samalla lisenssillä. Lisätietoja on Tekijänoikeus ja lisenssi -sivulla." + open_data_title: Avoin data + partners_title: Kumppanit + used_by: Sadat verkkosivustot, sovellukset ja laitteet käyttävät %{name}-karttaa activerecord: attributes: diary_comment: @@ -51,7 +69,7 @@ fi: models: acl: Pääsyoikeuslista changeset: Muutoskokoelma - changeset_tag: Muutoskokoelman tunniste + changeset_tag: Muutoskokoelman tagi country: Maa diary_comment: Päiväkirjan kommentti diary_entry: Päiväkirjamerkintä @@ -59,116 +77,66 @@ fi: language: Kieli message: Viesti node: Piste - node_tag: Pisteen tunniste + node_tag: Pisteen tagi notifier: Ilmoitus old_node: Vanha piste - old_node_tag: Vanha pisteen tunniste. + old_node_tag: Vanha pisteen tagi old_relation: Vanha relaatio old_relation_member: Vanha relaation jäsen - old_relation_tag: Vanha relaation tunniste. - old_way: Vanha polku - old_way_node: Vanha tien piste - old_way_tag: Vanha tien tunniste + old_relation_tag: Vanha relaation tagi + old_way: Vanha viiva + old_way_node: Vanha viiva piste + old_way_tag: Vanha viivan tagi relation: Relaatio relation_member: Relaation jäsen - relation_tag: Relaation tunniste + relation_tag: Relaation tagi session: Istunto trace: Jälki tracepoint: Jälkipiste - tracetag: Jäljen tunniste + tracetag: Jäljen tagi user: Käyttäjä user_preference: Käyttäjän asetus user_token: Käyttäjän tunnus way: Viiva way_node: Viivan piste - way_tag: Viivan tunniste + way_tag: Viivan tagi application: require_cookies: cookies_needed: Selaimen evästeet on otettu pois päältä - salli evästeiden käyttö selaimessasi ennen jatkamista. + require_moderator: + not_a_moderator: Tämän toiminnon suorittamiseksi sinun on oltava ylläpitäjä. setup_user_auth: blocked: Pääsysi APIin on estetty. Lisätietoja saat kirjautumalla web-käyttöliittymään. need_to_see_terms: API:n käyttöoikeutesi on tilapäisesti hyllytetty. Kirjaudu sisään verkkokäyttöliittymään nähdäksesi osallistujien ehdot. Niihin ei tarvitse suostua, mutta ne täytyy lukea. browse: + anonymous: tuntematon changeset: - changeset: "Muutoskokoelma: %{id}" - changesetxml: muutoskokoelman XML - download: Lataa %{changeset_xml_link} tai %{osmchange_xml_link} + belongs_to: Lähettäjä + changesetxml: Muutoskokoelman XML feed: title: Muutoskokoelma %{id} title_comment: Muutoskokoelma %{id} - %{comment} osmchangexml: osmChange XML - title: Muutoskokoelma - changeset_details: - belongs_to: "Käyttäjä:" - bounding_box: "Alueen rajat:" - box: alue - closed_at: "Suljettu:" - created_at: "Avattu:" - has_nodes: - one: "Sisältää seuraavan pisteen:" - other: "Sisältää seuraavat %{count} pistettä:" - has_relations: - one: "Sisältää seuraavan relaation:" - other: "Sisältää seuraavat %{count} relaatiota:" - has_ways: - one: "Sisältää seuraavan polun:" - other: "Sisältää seuraavat %{count} polkua:" - no_bounding_box: Tässä muutoskokoelmassa ei ole rajattua aluetta. - show_area_box: Näytä rajattu alue - common_details: - changeset_comment: "Kommentti:" - deleted_at: "Poistettu:" - deleted_by: "Poistaja:" - edited_at: "Muokattu:" - edited_by: "Muokkaaja:" - in_changeset: "Muutoskokoelma:" - version: "Versio:" + relation: Relaatiot (%{count}) + title: "Muutoskokoelma: %{id}" + closed: Ratkaistu + closed_by_html: Suljettu %{time} sitten käyttäjän %{user} toimesta + closed_html: Ratkaistu %{time} sitten containing_relation: entry: Relaatio %{relation_name} entry_role: Relaatio %{relation_name} (rooli %{relation_role}) - map: - deleted: Poistettu - edit: - area: Muokkaa aluetta - node: Muokkaa pistettä - relation: Muokkaa relaatiota - way: Muokkaa tietä - larger: - area: Näytä alue suurella kartalla - node: Näytä piste suurella kartalla - relation: Näytä relaatio suurella kartalla - way: Näytä polku suurella kartalla - loading: Ladataan… - navigation: - all: - next_changeset_tooltip: Seuraava muutoskokoelma - next_node_tooltip: Seuraava piste - next_relation_tooltip: Seuraava relaatio - next_way_tooltip: Seuraava polku - prev_changeset_tooltip: Edellinen muutoskokoelma - prev_node_tooltip: Edellinen piste - prev_relation_tooltip: Edellinen relaatio - prev_way_tooltip: Edellinen polku - user: - name_changeset_tooltip: Näytä käyttäjän %{user} muutokset - next_changeset_tooltip: Käyttäjän %{user} seuraava muutos - prev_changeset_tooltip: Käyttäjän %{user} edellinen muutos + created: Luotu + created_by_html: Lähettänyt käyttäjä %{user} %{time} sitten + created_html: Lähettänyt käyttäjä %{time} sitten + deleted_by_html: Poistettu %{time} sitten käyttäjän %{user} toimesta + download_xml: Lataa XML-tiedostona + edited_by_html: Muokannut viimeksi käyttäjä %{user} %{time} sitten + in_changeset: Muutoskokoelma + location: "Sijainti:" + no_comment: (ei kommenttia) node: - download: "%{download_xml_link}, %{view_history_link} tai %{edit_link}" - download_xml: Lataa XML - edit: muokkaa - node: Piste - node_title: "Piste: %{node_name}" - view_history: näytä muokkaushistoria - node_details: - coordinates: "Koordinaatit:" - part_of: "Osana teitä:" - node_history: - download: "%{download_xml_link} tai %{view_details_link}" - download_xml: Lataa muokkaushistorian XML - node_history: Pisteen muokkaushistoria - node_history_title: Pisteen %{node_name} historia - view_details: näytä pisteen tiedot + history_title: Pisteen %{name} historia + title: "Piste: %{name}" not_found: sorry: "%{type} %{id} ei ole olemassa." type: @@ -176,76 +144,47 @@ fi: node: Pistettä relation: Relaatiota way: Polkua - paging_nav: - of: " /" - showing_page: Nykyinen sivu + note: + closed_by: Ratkaissut käyttäjä %{user} %{when} sitten + closed_by_anonymous: Ratkaissut tuntematon käyttäjä %{when} sitten + closed_title: "Ratkaistu karttailmoitus #%{note_name}" + commented_by: Kommentti käyttäjältä %{user} %{when} sitten + commented_by_anonymous: Kommentti tuntemattomalta käyttäjältä %{when} sitten + hidden_by: Piilottanut käyttäjä %{user} %{when} sitten + hidden_title: "Piilotettu karttailmoitus #%{note_name}" + new_note: Uusi karttailmoitus + open_by: Lähettänyt käyttäjä %{user} %{when} sitten + open_by_anonymous: Luonut tuntematon käyttäjä %{when} sitten + open_title: "Ratkaisematon karttailmoitus #%{note_name}" + reopened_by: Avannut uudelleen käyttäjä %{user} %{when} sitten + reopened_by_anonymous: Avannut uudelleen tuntematon käyttäjä %{when} sitten + title: "Karttailmoitus: %{id}" + part_of: Osana seuraavia redacted: + message_html: Tämän %{type}-tyypin versiota ei voi näyttää koska se on laitostettu. Katso lisätietoja %{redaction_link}. + redaction: Redaktio %{id} type: node: piste relation: relaatio way: polku relation: - download: "%{download_xml_link} tai %{view_history_link}" - download_xml: Lataa XML - relation: Relaatio - relation_title: "Relaatio: %{relation_name}" - view_history: näytä historia - relation_details: - members: "Jäsenet:" - part_of: "Relaatiojäsenyydet:" - relation_history: - download: "%{download_xml_link} tai %{view_details_link}" - download_xml: Lataa XML - relation_history: Relaation muokkaushistoria - relation_history_title: Relaation %{relation_name} historia - view_details: näytä yksityiskohdat + history_title: Relaation %{name} historia + members: Jäsenet + title: "Relaatio: %{name}" relation_member: entry_role: "%{type} %{name} roolissa %{role}" type: node: Piste relation: Relaatio way: Polku - start: - manually_select: Valitse pienempi alue - view_data: Näytä tiedot nykyisestä karttanäkymästä start_rjs: - data_frame_title: Tiedot - data_layer_name: Selaa karttatietoja - details: Tarkemmin - drag_a_box: Valitse alue kartalta hiirellä maalaamalla - edited_by_user_at_timestamp: Viimeinen muokkaaja [[user]] kello [[timestamp]] - hide_areas: Piilota alueet - history_for_feature: Ominaisuuden [[feature]] historia + feature_warning: Ladataan %{num_features} ominaisuutta, mikä saatta hidastaa tai kaataa verkkoselaimen. Haluatko varmasti näyttää nämä tiedot? load_data: Lataa tiedot - loaded_an_area_with_num_features: Olet ladannut alueen, joka sisältää [[num_features]] osiota. Yleensä jotkin selaimet eivät kykene näyttämään tätä määrää dataa. Yleisesti selaimet toimivat parhaiten näyttäessään alle 100 osiota kerrallaan. Muussa tapauksessa selain saattaa tulla hitaaksi tai lakata toimimasta kokonaan. Jos olet varma että haluat näyttää tämän datan, voit tehdä niin napsauttamalla alla olevaa painiketta. loading: Ladataan tietoja... - manually_select: Rajaa pienempi alue käsin - object_list: - api: Hae tämä alue APIsta - back: Näytettävien kohteiden lista - details: Lisätiedot - heading: Objektiluettelo - history: - type: - node: Piste [[id]] - way: Polku [[id]] - selected: - type: - node: Piste [[id]] - way: Polku [[id]] - type: - node: Piste - way: Polku - private_user: käyttäjä - show_areas: Näytä alueet - show_history: Näytä historia - unable_to_load_size: "Ei voi ladata: Laatikon rajojen koko [[bbox_size]] on liian suuri (täytyy olla pienempi kuin %{max_bbox_size})" - wait: Odota... - zoom_or_select: Katso pienempää aluetta tai valitse kartalta alue, jonka tiedot haluat tag_details: - tags: "Tunnisteet:" + tags: Tagit wiki_link: - key: Wikisivu tietueelle %{key} + key: Wikisivu avaimelle %{key} tag: Wikisivu tietueelle %{key}=%{value} wikipedia_link: Artikkeli %{page} Wikipediassa timeout: @@ -255,33 +194,20 @@ fi: node: piste relation: relaatio way: polku + version: Versio + view_details: Näytä tiedot + view_history: Näytä historia way: - download: "%{download_xml_link}, %{view_history_link} tai %{edit_link}" - download_xml: Lataa XML - edit: muokkaa - view_history: näytä historia - way: Polku - way_title: "Polku: %{way_name}" - way_details: also_part_of: - one: on myös osana polkua %{related_ways} - other: on myös osana polkuja %{related_ways} - nodes: "Pisteet:" - part_of: "Relaatiojäsenyydet:" - way_history: - download: "%{download_xml_link} tai %{view_details_link}" - download_xml: Lataa XML - view_details: näytä tiedot - way_history: Polun muokkaushistoria - way_history_title: Polun %{way_name} historia + one: osa viivaa %{related_ways} + other: osa viivoja %{related_ways} + history_title: Viivan %{name} historia + nodes: Pisteet + title: "Viiva: %{name}" changeset: changeset: - anonymous: Anonyymi - big_area: (iso) - no_comment: (tyhjä) + anonymous: Tuntematon no_edits: (ei muokkauksia) - show_area_box: näytä alueen rajat kartalla - still_editing: (muokkaus kesken) view_changeset_details: Näytä muutoskokoelman tarkemmat tiedot changeset_paging_nav: next: Seuraava → @@ -290,28 +216,15 @@ fi: changesets: area: Alue comment: Kommentti - id: ID + id: Tunniste saved_at: Tallennettu user: Käyttäjä list: - description: Tuoreet muutokset - description_bbox: Muutoskokoelmat alueelle %{bbox} - description_friend: Ystäviesi muutoskokoelmat - description_nearby: Lähellä olevien käyttäjien muutoskokoelmat - description_user: Käyttäjän %{user} muutoskokoelmat - description_user_bbox: Käyttäjän %{user} muutoskokoelmat %{bbox} sisällä - heading: Muutoskokoelmat - heading_bbox: Muutoskokoelmat - heading_friend: Muutoskokoelmat - heading_nearby: Muutoskokoelma - heading_user: Muutoskokoelmat - heading_user_bbox: Muutoskokoelmat + load_more: Lataa lisää title: Muutoskokoelmat - title_bbox: Muutoskokoelmat alueelle %{bbox} - title_friend: Ystäviesi muutoskokoelmat + title_friend: Kaverien muutoskokoelmat title_nearby: Lähellä olevien käyttäjien muutoskokoelmat title_user: Käyttäjän %{user} muutoskokoelmat - title_user_bbox: Käyttäjän %{user} muutoskokoelmat %{bbox} sisällä timeout: sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian kauan. diary_entry: @@ -331,6 +244,7 @@ fi: comment_count: one: 1 kommentti other: "%{count} kommenttia" + zero: Ei kommentteja comment_link: Kommentoi tätä kirjoitusta confirm: Vahvista edit_link: Muokkaa päiväkirjamerkintää @@ -367,7 +281,7 @@ fi: older_entries: Vanhempia... recent_entries: Uusimmat päiväkirjamerkinnät title: Käyttäjien päiväkirjamerkinnät - title_friends: Ystäviesi päiväkirjat + title_friends: Kaverien päiväkirjat title_nearby: Lähellä olevien käyttäjien päiväkirjat user_title: Käyttäjän %{user} päiväkirja location: @@ -389,11 +303,14 @@ fi: user_title: Käyttäjän %{user} päiväkirja editor: default: Oletus (tällä hetkellä %{name}) + id: + description: iD (selainkäyttöinen muokkain) + name: iD potlatch: - description: Potlatch 1 (selaineditori) + description: Potlatch 1 (selainkäyttöinen muokkain) name: Potlatch 1 potlatch2: - description: Potlatch 2 (selaineditori) + description: Potlatch 2 (selainkäyttöinen muokkain) name: Potlatch 2 remote: description: Kauko-ohjaus (JOSM tai Merkaartor) @@ -404,7 +321,7 @@ fi: area_to_export: Vietävä alue embeddable_html: HTML-koodi export_button: Vie - export_details: OpenStreetMap-karttatietoja saa käyttää Creative Commons Attribution-ShareAlike 2.0 lisenssin (engl.) ehdoilla. + export_details: OpenStreetMap-karttatietoja saa käyttää Open Data Commons Open Database License (ODbL) (engl.) ehdoilla. format: "Tiedostomuoto:" format_to_export: Vientimuoto image_size: Kuvan koko @@ -420,29 +337,31 @@ fi: paste_html: Kopioi ja liitä tämä HTML-koodi verkkosivullesi scale: Mittakaava too_large: - body: Tämä alue on liian suuri OpenStreetMap XML-tiedoksi tuotavaksi. Lähennä karttaa tai valitse pienempi alue. - heading: Liian suuri alue + advice: "Jos vientitoiminto ei toimi, kokeile myös seuraavia palveluja:" + body: "Näin suurta aluetta ei voi viedä OpenStreetMap XML-tiedostona. Lähennä karttaa tai valitse pienempi alue, tai vaihtoehtoisesti lataa tiedosto joltakin seuraavista:" + geofabrik: + description: Säännöllisesti päivitetyt otteet maanosista, maista ja valituista kaupungeista + title: Geofabrik-lataukset + metro: + description: Otteita maailman suurista kaupungeista ja niitä ympäröivistä alueista + title: Metro-otteet + other: + description: Muut lähteet ovat esillä OpenStreetMap-wikissä + title: Muut lähteet + planet: + description: Säännöllisesti päivitettyjä kopioita täydellisestö OpenStreetMap-tietokannasta + title: Planet OSM zoom: Zoom-taso - start_rjs: - add_marker: Lisää vietävään karttaan kohdemerkki - change_marker: Muuta merkin sijaintia - click_add_marker: Napsauta kartalta mihin haluat merkin - drag_a_box: Valitse alue kartalta hiirellä vetämällä - export: Vienti - manually_select: Valitse pienempi alue - view_larger_map: Näytä suurempi kartta + title: Alueen vienti geocoder: description: title: geonames: Sijainti palvelusta GeoNames - osm_namefinder: "%{types} OpenStreetMap Namefinderistä" osm_nominatim: Sijainti OpenStreetMap Nominatimista types: cities: Kaupungit places: Paikat towns: Kylät - description_osm_namefinder: - prefix: "%{distance} %{direction} kohteesta %{type}" direction: east: itään north: pohjoiseen @@ -463,16 +382,25 @@ fi: title: ca_postcode: Tulokset palvelusta Geocoder.CA geonames: Tulokset palvelusta GeoNames + geonames_reverse: Hakutulokset GeoNamesista latlon: Sisäiset tulokset - osm_namefinder: Tulokset OpenStreetMap Namefinderistä osm_nominatim: Tulokset OpenStreetMap Nominatimista + osm_nominatim_reverse: Hakutulokset OpenStreetMap Nominatimista uk_postcode: Tulokset palvelusta NPEMap / FreeThe Postcode us_postcode: Tulokset palvelusta Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} kohdasta %{parentname})" - suffix_place: ", %{distance} %{direction} paikasta %{placename}" search_osm_nominatim: + admin_levels: + level10: Asuinalueen raja + level2: Valtion raja + level4: Osavaltion raja + level5: Alueen raja + level6: Maan raja + level8: Kunnan raja + level9: Kylän raja prefix: + aerialway: + chair_lift: Tuolihissi + drag_lift: Vetohissi aeroway: aerodrome: Lentokenttä apron: Asemataso @@ -545,7 +473,7 @@ fi: park: Puisto parking: Parkkipaikka pharmacy: Apteekki - place_of_worship: Kirkko + place_of_worship: Kirkko, temppeli, pyhä paikka police: Poliisi post_box: Kirjelaatikko post_office: Postitoimisto @@ -589,11 +517,14 @@ fi: bridge: aqueduct: Akvedukti suspension: Riippusilta - swing: Riippusilta + swing: Kääntösilta viaduct: Maasilta "yes": Silta building: "yes": Rakennus + emergency: + fire_hydrant: Paloposti + phone: Hätäpuhelin highway: bridleway: Ratsastustie bus_guideway: Ohjattu linja-autokaista @@ -615,6 +546,7 @@ fi: platform: Asemalaituri primary: Kantatie primary_link: Kantatie + proposed: Suunnitteilla oleva tie raceway: Kilparata residential: Asuinkatu rest_area: Lepoalue @@ -626,6 +558,7 @@ fi: speed_camera: Nopeuskamera steps: Portaat stile: Aidanylitys + street_lamp: Katuvalaisin tertiary: Yhdystie tertiary_link: Yhdystie track: Metsätie @@ -641,6 +574,7 @@ fi: building: Rakennus castle: Linna church: Kirkko + citywalls: Kaupunginmuurit fort: Linnake house: Talo icon: Ikoni @@ -650,6 +584,7 @@ fi: monument: Muistomerkki museum: Museo ruins: Rauniot + tomb: Hautakammio tower: Torni wayside_cross: Tieristi wayside_shrine: Tienvarsialttari @@ -657,7 +592,7 @@ fi: landuse: allotments: Siirtolapuutarha basin: Syvänne - brownfield: Viljelysmaa + brownfield: Purettujen rakennusten alue cemetery: Hautausmaa commercial: Kaupallinen alue conservation: Suojeltu kohde @@ -717,6 +652,8 @@ fi: airfield: Sotilaskenttä barracks: Kasarmi bunker: Bunkkeri + mountain_pass: + "yes": Vuoristosola natural: bay: Lahti beach: Hiekkaranta @@ -786,6 +723,7 @@ fi: locality: Paikkakunta moor: Nummi municipality: Kunta + neighbourhood: Naapurusto postcode: Postinumero region: Alue sea: Meri @@ -811,8 +749,10 @@ fi: narrow_gauge: Kapearaiteinen rautatie platform: Asemalaituri preserved: Museorautatie + proposed: Suunnitteilla oleva rautatie spur: Pistoraide station: Rautatieasema + stop: Rautatieseisake subway: Metroasema subway_entrance: Metron sisäänkäynti switch: Ratavaihde @@ -828,6 +768,7 @@ fi: beverages: Juomakauppa bicycle: Polkupyöräkauppa books: Kirjakauppa + boutique: Puoti butcher: Lihakauppa car: Autokauppa car_parts: Auton osia @@ -841,6 +782,7 @@ fi: convenience: Lähikauppa copyshop: Kopiointipalvelu cosmetics: Kosmetiikkakauppa + deli: Herkkukauppa department_store: Tavaratalo discount: Alennusmyymälä doityourself: Tee-se-itse @@ -877,17 +819,21 @@ fi: organic: Luomukauppa outdoor: Ulkoiluvälinekauppa pet: Eläinkauppa + pharmacy: Apteekki photo: Valokuvausliike salon: Salonki + second_hand: Osto- ja myyntiliike shoes: Kenkäkauppa shopping_centre: Ostoskeskus sports: Urheilukauppa stationery: Paperikauppa supermarket: Supermarketti + tailor: Räätäli toys: Lelukauppa travel_agency: Matkatoimisto video: Videokauppa wine: Alkoholikauppa + "yes": Kauppa tourism: alpine_hut: Alppimaja artwork: Taideteos @@ -910,6 +856,7 @@ fi: viewpoint: Näköalapaikka zoo: Eläintarha tunnel: + culvert: Siltarumpu "yes": Tunneli waterway: artificial: Kanava @@ -933,66 +880,118 @@ fi: water_point: Vedenottopaikka waterfall: Vesiputous weir: Pato + help_page: + help: + description: Etsi vastauksia tai esitä oma kysymyksesi OSM:n kysy- ja vastaa -sivustolla. Englanninkielinen. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: Ohjeita ja vinkkejä OpenStreetMapin käyttöön on saatavilla useista eri lähteistä. + title: Ohjekeskus + welcome: + description: Opi OpenStreetMapin perusteet tällä helpolla aloitusoppaalla. + title: Tervetuloa OpenStreetMapiin + url: /welcome + wiki: + description: Tutustu syvällisemmin OpenStreetMapiin wikikirjastossa. Osittain englanninkielinen. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/Fi:Main_Page javascripts: + close: Sulje + edit_help: Siirrä ja lähennä kartta muokattavaan paikkaan ja napsauta sitten tästä. + key: + title: Karttamerkinnät + tooltip: Merkkien selitykset + tooltip_disabled: Ei käytettävissä tässä karttanäkymässä map: base: cycle_map: Pyöräilykartta + hot: Ihmisystävällisyys standard: Perinteinen transport_map: Joukkoliikenne + copyright: © OpenStreetMapin tekijät + donate_link_text: + layers: + data: Kartta-aineisto + header: Karttanäkymä + notes: Karttailmoitukset + overlays: Nämä toiminnot on tarkoitettu karttavirheiden korjaamiseen + title: Karttanäkymä + locate: + popup: Sijainti tarkkuudella {distance} {unit} tästä pisteestä + title: Näytä oma sijaintini + zoom: + in: Lähennä + out: Loitonna + notes: + new: + add: Lähetä ilmoitus + intro: Auta parantamaan karttatietokantaa ilmoittamalla virheistä. Muut kartoittajat näkevät tämän ilmoituksen ja voivat korjata ongelman, joten valitse sijainti ja kirjoita virheen kuvaus mahdollisimman huolellisesti. + show: + anonymous_warning: Tässä karttailmoituksessa on kommentteja tunnistautumattomilta käyttäjiltä, joihin tulisi suhtautua varauksella. + comment: Kommentoi + comment_and_resolve: Kommentoi + ratkaise + hide: Piilota + reactivate: Avaa uudelleen + resolve: Ratkaise + share: + cancel: Peruuta + center_marker: Keskitä kartta karttamerkkiin + custom_dimensions: Rajaa alue itse + download: Lataa + embed: HTML-koodi + format: "Tiedostomuoto:" + image: Kartta kuvana + image_size: Kuva esitetään perinteisessä karttanäkymässä koossa + include_marker: Lisää karttamerkki + link: Linkki tai HTML-koodi + long_link: Linkki + paste_html: Upota karttaikkuna liittämällä tämä koodi verkkosivulle + scale: "Mittakaava:" + short_link: Lyhyt linkki + short_url: Lyhyt osoite + title: Jakaminen + view_larger_map: Näytä isommalla kartalla site: + createnote_disabled_tooltip: Lähennä karttaa ennen karttavirheestä ilmoittamista. + createnote_tooltip: Ilmoita karttavirheestä edit_disabled_tooltip: Aloita kartan muokkaaminen suurentamalla karttaa edit_tooltip: Muokkaa karttaa - edit_zoom_alert: Aloita kartan muokkaaminen suurentamalla karttaa - history_disabled_tooltip: Zoomaa lähemmäs nähdäksesi tämän alueen muokkaukset - history_tooltip: Tarkastele tämän alueen muutoksia - history_zoom_alert: Sinun täytyy zoomata lähemmäs nähdäksesi tämän alueen muokkaukset + map_data_zoom_in_tooltip: Näytä kartta-aineisto lähentämällä karttaa + map_notes_zoom_in_tooltip: Näytä karttailmoitukset lähentämällä karttaa layouts: + about: Tietoja community: Yhteisö community_blogs: Yhteisöblogit community_blogs_title: OpenStreetMap-yhteisön jäsenten blogit - copyright: Tekijänoikeudet ja lisenssit - documentation: Ohjeet - documentation_title: Projektin ohjeet + copyright: Tekijänoikeudet + data: Tiedot donate: Tue OpenStreetMapia %{link} laitteistopäivitysrahastoon. - donate_link_text: lahjoittamalla edit: Muokkaa - edit_with: Muokkaa %{editor}:lla + edit_with: "Muokkaa: %{editor}" export: Vienti - export_tooltip: Karttatiedon vienti + export_data: Vie tiedostona foundation: Säätiö - foundation_title: OpenStreetMap Foundation + foundation_title: OpenStreetMap-säätiö gps_traces: GPS-jäljet gps_traces_tooltip: Hallitse GPS-jälkiä help: Ohje - help_centre: Ohjekeskus - help_title: Projektin ohjesivusto history: Historia - home: kotipaikka - home_tooltip: Siirry kotipaikkaan - inbox: viestit (%{count}) - inbox_tooltip: - one: Sinulla on yksi lukematon viesti. - other: Sinulla on %{count} lukematonta viestiä. - zero: Sinulla ei ole lukemattomia viestejä. - intro_1: OpenStreetMap on avoin ja vapaasti muokattava maailmankartta. Kuka vain voi osallistua. + home: Siirry kotipaikkaan intro_2_create_account: luomalla ensin käyttäjätunnuksen - intro_2_download: ladattavissa - intro_2_html: Kartat ovat vapaasti %{download} ja %{use} %{license} mukaisesti. Voit auttaa meitä parantamaan karttaa %{create_account}. - intro_2_license: avoimen lisenssimme - intro_2_use: käytettävissä - license: - title: OpenStreetMap-tiedot lisensoidaan Creative Commons Attribution-Share Alike 2.0 Generic -lisenssillä + intro_header: Tervetuloa OpenStreetMapiin! + intro_text: OpenStreetMap on tavallisten ihmisten luoma maailmankartta. Palvelun käyttäminen on ilmaista avoimen lisenssin ansiosta. + learn_more: Lisätietoja log_in: kirjaudu sisään log_in_tooltip: Kirjaudu sisään tunnuksellasi logo: alt_text: OpenStreetMap-logo - logout: kirjaudu ulos - logout_tooltip: Kirjaudu ulos + logout: Kirjaudu ulos make_a_donation: text: Lahjoita title: Tue OpenStreetMapia rahallisella lahjoituksella. - osm_offline: OpenStreetMapin tietokantaan ei toistaiseksi ole pääsyä välttämättömien ylläpitotöiden takia. - osm_read_only: OpenStreetMapin tietokantaan ei toistaiseksi voi lähettää mitään välttämättömien ylläpitotöiden takia. + more: Lisää + osm_offline: OpenStreetMapin tietokanta ei toistaiseksi ole käytettävissä välttämättömien ylläpitotöiden takia. + osm_read_only: OpenStreetMapin tietokantaa ei toistaiseksi voi muokata välttämättömien ylläpitotöiden takia. partners_bytemark: Bytemark Hosting partners_html: Palvelinta ylläpitää %{ucl}, %{ic} ja %{bytemark} sekä muut %{partners}. partners_ic: Imperial College London @@ -1000,49 +999,72 @@ fi: partners_ucl: UCL VR Centre sign_up: rekisteröidy sign_up_tooltip: Muokkaaminen edellyttää käyttäjätunnusta - sotm2011: Tule vuoden 2011 OpenStreetMap-konferenssiin, 9. - 11. syyskuuta Denveriin! - tag_line: Vapaa wikimaailmankartta + start_mapping: Liity mukaan + tag_line: Vapaa ja avoin maailmankartta user_diaries: Päiväkirjamerkinnät user_diaries_tooltip: Näytä käyttäjän päiväkirjat - view: Kartta - view_tooltip: Näytä kartta - welcome_user: Tervetuloa, %{user_link}! - welcome_user_link_tooltip: Käyttäjäsivusi - wiki: Wiki - wiki_title: Projektin wikisivusto license_page: foreign: english_link: englanninenkielisen alkuperäisversion text: Jos tämän käännetyn sivun ja %{english_original_link} välillä on eroja, englanninkielinen sivu on aina etusijalla. title: Tietoja tästä käännöksestä - legal_babble: "

    Tekijänoikeus ja lisenssi

    \n

    \nOpenStreetMapin sisältö on avointa tietoa, joka on lisensoitu \nCreative Commonsin Nimeä-Tarttuva 2.0 Raakaversio -lisenssilllä (CC BY-SA).\n

    \n

    \nKarttojamme ja tietojamme voi kopioida, levittää, välittää ja mukauttaa, \nkunhan OpenStreetMap ja sen tekijät mainitaan.\nJos muutat tai kehität karttojamme tai tietoja, voit\njakaa teosta vain saman lisenssin nojalla.\nLegal codessa\nkerrotaan oikeutesi ja velvollisuutesi.\n

    \n\n\n

    OpenStreetMapin mainitseminen

    \n

    \nJos käytät OpenStreetMapin karttakuvia, pyydämme että\nmainitset ainakin ”© OpenStreetMapin tekijät, CC BY-SA”.\nJos käytät vain karttatietoja,\nmainitse ”Karttatiedot © OpenStreetMapin tekijät, CC BY-SA”.\n

    \n

    \nAina kun se on mahdollista, linkitä OpenStreetMap osoitteeseen\nhttp://www.openstreetmap.org/\nja CC BY-SA osoitteeseen\nhttp://creativecommons.org/licenses/by-sa/2.0/.\nJos hyperlinkit eivät ole mahdollisia (esimerkiksi\ntulostettu työ), suosittelemme, että ohjaat lukijat osoitteisiin\nwww.openstreetmap.org ja\nwww.creativecommons.org.\n

    \n\n

    Lisätietoja

    \n

    \nLue lisää\nLegal FAQ:sta.\n

    \n

    \nOSM:n tekijöitä muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista\n(esimerkiksi Google Maps tai painetut kartat) ilman\ntekijänoikeuden haltijan nimenomaista lupaa on kielletty.\n

    \n

    \nVaikka OpenStreetMap on avointa dataa, emme voi tarjota\nmaksutonta karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nKatso APIn käyttösäännöt,\nkarttakuvien käyttösäännöt\nja Nominatimin käyttösäännöt.\n

    \n\n

    Tekijät

    \n

    \nKäyttämämme CC BY-SA-lisenssi vaatii ”alkuperäisten tekijöiden\nmainintaa” käyttömediaan ja käyttötapaan sopivalla tavalla.\nYksittäisiä OSM-kartoittajia ei tarvitse mainita muuten kuin \nmaininnalla ”OpenStreetMapin tekijät”. Kun kyseessä on\npaikallinen maanmittauslaitos tai muu merkittävä lähde,\njonka tietoja käytetään OpenStreetMapissa, voi olla\nperusteltua nimetä myös kyseiset tahot suoraan tai viitata\nsiihen tällä sivulla.\n

    \n\n\n\n
      \n
    • Australia: Sisältää lähiötietoja\n Australian Bureau of Statisticsilta.
    • \n
    • Kanada: Sisältää tietoja\n GeoBasesta ®, GeoGratisista (© Department of Natural\n Resources Canada), CanVecista (© Department of Natural\n Resources Canada), ja StatCanista (Geography Division,\n Statistics Canada).
    • \n
    • France: Contains data sourced from\n Direction Générale des Impôts.
    • \n
    • Uusi-Seelanti: Sisältää tietoja Land Information New Zealandista. Crown Copyright.\n
    • Puola: Sisältää tietoja\n UMP-pcPL-kartoista. Tekijänoikeus\n UMP-pcPL:n tekijät.
    • \n
    • Yhdistyneet kuningaskunnat: Sisältää Ordnance\n Surveyn keräämiä tietoja © Crown Copyright ja tietokantojen käyttöoikeus\n 2010.\n
    \n\n\n

    \nTietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja\nottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta.\n

    " + legal_babble: + attribution_example: + alt: Esimerkki siitä, miten nimetä OpenStreetMap nettisivulla + title: Nimeämisesimerkki + contributors_at_html: "Itävalta: Sisältää karttatietoja\nStadt Wienistä (\nCC BY -lisenssillä),\nLand Vorarlbergista ja\nLand Tirolista (CC-BY AT -lisenssillä tietyin muutoksin)." + contributors_ca_html: "Kanada: Sisältää karttatietoja\n GeoBasesta ®, GeoGratisista (© Department of Natural\n Resources Canada), CanVecista (© Department of Natural\n Resources Canada), ja StatCanista (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Suomi: Sisältää karttatietoja Maanmittauslaitoksen maastotietokannasta ja muista lähteistä, Maanmittauslaitoksen lisenssin mukaisesti." + contributors_footer_1_html: "Täydellinen lista OpenStreetMapin tukijoista löytyy OpenStreetMapin wikistä Avustajat-sivulta." + contributors_footer_2_html: "Tietojen sisältyminen OpenStreetMapiin ei tarkoita, että tietojen antaja\nottaa kantaa OpenStreetMapiin tai vastuuta tietojen oikeellisuudesta." + contributors_fr_html: "Ranska: Sisältää karttatietoja\n Direction Générale des Impôtsista." + contributors_gb_html: "Iso-Britanna: Sisältää Ordnance Surveyn\nkeräämiä karttatietoja © Crown Copyright ja tietokantojen käyttöoikeus 2010-12." + contributors_intro_html: "Tekijöinämme on tuhansia yksityishenkilöitä. Olemme myös sisällyttäneet\nvapaasti lisensöityä dataa kansallisilta kartoitustoimistoilta\nja muista lähteistä, muun muassa:" + contributors_nl_html: "Alankomaat: Sisältää © AND-karttatietoja vuodelta 2007\n(www.and.com)" + contributors_nz_html: "Uusi-Seelanti: Sisältää karttatietoja Land Information New Zealandista. Crown Copyright." + contributors_title_html: Tekijät + contributors_za_html: "Etelä-Afrikka: Sisältää karttatietoja\nChief Directorate:\nNational Geo-Spatial Informationista, kaikki oikeudet pidätetään." + credit_1_html: OpenStreetMapin sisältöä levitettäessä on mainittava teksti "© OpenStreetMapin tekijät" tai sen englanninkielinen vastine "© OpenStreetMap contributors". + credit_2_html: "Levittäjän tulee tehdä selväksi, että aineisto on saatavilla Open Database Lisenssillä,\nja kartta-aineiston olevan lisensoitu CC-BY-SA-lisenssillä. Tämä voidaan tehdä sijoittamalla sivulle linkki\ntälle tekijänoikeussivulle. \nJos linkkien käyttö ei ole mahdollisia (esimerkiksi paperille tulostettu aineisto),\nsuosittelemme ohjaamaan lukijat osoitteisiin www.openstreetmap.org, opendatacommons.org ja tarvittaessa myös creativecommons.org." + credit_3_html: "Sähköisen karttaikkunan tulee sisältää tekijän nimi kartan alaosassa:" + credit_title_html: OpenStreetMapin mainitseminen + infringement_1_html: "OpenStreetMapin kartoittajia muistutetaan, että kopioiminen tekijänoikeuksien alaisista teoksista\n(esimerkiksi Google Mapsista tai paperikartoista) ilman tekijänoikeuden haltijan nimenomaista lupaa on kielletty." + infringement_2_html: Jos kuka tahansa OpenStreetMapin käyttäjä epäilee, että karttatietoja on otettu luvattomasta lähteestä OSM:n karttatietoihin tai sivustolle, siitä tulee tehdä poistopyyntö tai ilmoittaa suoraan. + infringement_title_html: Tekijänoikeusloukkaus + intro_1_html: "OpenStreetMap on avointa dataa, joka on lisensoitu Open Data\nCommons Open Database Lisenssillä (ODbL)." + intro_2_html: "OpenStreetMapin karttoja ja tietoja voi kopioida, levittää, välittää ja mukauttaa, \nkunhan OpenStreetMap ja sen tekijät mainitaan. Jos karttoja tai tietoja muutetaan tai kehitetään, niitä saa levittää vain samalla lisenssillä.\nLakitekstissä mainitaan levittäjän oikeudet ja velvollisuudet." + intro_3_html: "Kartta-aineisto ja dokumentaatio on lisensoitu Creative\nCommons Nimeä-Jaa samoin 2.0 -lisenssillä. (CC-BY-SA)." + more_1_html: Lue lisää aineiston käyttämisestä lakiasioiden useimmin kysytyimmistä kysymyksistä. + more_2_html: "Vaikka OpenStreetMap on avointa dataa, emme voi tarjota maksutonta karttarajapintaa (API) kolmannen osapuolen kehittäjille.\n\nTutustu API:n käyttöehtoihin,\nkartta-aineiston käyttöehtoihin ja \nNominatimin käyttöehtoihin." + more_title_html: Lisätietoja + title_html: Tekijänoikeus ja lisenssi native: mapping_link: aloittaa kartoituksen native_link: suomenkielinen versio - text: Tällä sivulla on englanninkielinen ja alkuperäinen versio tekijäoikeuksista. Saatavilla on myös %{native_link} tai lopettaa tekijänoikeuksien lukemisen ja %{mapping_link}. + text: Tällä sivulla on alkuperäinen englanninkielinen versio tekijäoikeuksista. Saatavilla on myös %{native_link}. Voit myös lopettaa tekijänoikeuksien lukemisen ja %{mapping_link}. title: Tietoja sivusta message: delete: - deleted: Viesti poistettu + deleted: Viesti on poistettu. inbox: date: Päiväys from: Lähettäjä - messages: Sinulla on %{new_messages} ja %{old_messages} + messages: Kansiossa on %{new_messages} ja %{old_messages}. my_inbox: Saapuneet new_messages: - one: "%{count} uusi viesti" - other: "%{count} uutta viestiä" + one: "%{count} lukematon viesti" + other: "%{count} lukematonta viestiä" no_messages_yet: Ei viestejä. %{people_mapping_nearby_link} old_messages: - one: "%{count} vanha viesti" - other: "%{count} vanhaa viestiä" - outbox: lähetetyt - people_mapping_nearby: Lähellä kartoittavia ihmisiä + one: "%{count} luettu viesti" + other: "%{count} luettua viestiä" + outbox: Lähetetyt + people_mapping_nearby: Lähiseudun kartoittajat subject: Otsikko title: Saapuneet mark: - as_read: Viesti merkitty luetuksi - as_unread: Viesti merkitty lukemattomaksi + as_read: Viesti on merkitty luetuksi. + as_unread: Viesti on merkitty lukemattomaksi. message_summary: delete_button: Poista read_button: Merkitse luetuksi @@ -1052,7 +1074,7 @@ fi: back_to_inbox: Takaisin saapuneisiin body: Sisältö limit_exceeded: Olet lähettänyt runsaasti viestejä lyhyessä ajassa. Odota hetki ennen kuin yrität lähettää lisää. - message_sent: Viesti lähetetty + message_sent: Viesti on lähetetty. send_button: Lähetä send_message_to: Lähetä viesti käyttäjälle %{name} subject: Otsikko @@ -1063,24 +1085,21 @@ fi: title: Ei sellaista viestiä outbox: date: Päiväys - inbox: saapuneet + inbox: Saapuneet messages: - one: Sinulla on %{count} lähetetty viesti - other: Sinulla on %{count} lähetettyä viestiä + one: Kansiossa on %{count} lähetetty viesti. + other: Kansiossa on %{count} lähetettyä viestiä. my_inbox: "%{inbox_link}" no_sent_messages: Et ole lähettänyt vielä viestejä. Miksi et ottaisi yhteyttä joihinkin %{people_mapping_nearby_link}? - outbox: lähetetyt + outbox: Lähetetyt people_mapping_nearby: lähellä kartoittaviin käyttäjiin subject: Otsikko title: Lähetetyt to: Vastaanottaja read: - back_to_inbox: Takaisin saapuneisiin - back_to_outbox: Takaisin lähetettyihin + back: Takaisin date: Päiväys from: "Lähettäjä:" - reading_your_messages: Saapunut viesti - reading_your_sent_messages: Lähetetty viesti reply_button: Vastaa subject: Otsikko title: Lue viesti @@ -1091,10 +1110,41 @@ fi: wrong_user: Olet kirjautunut sisään tunnuksella `%{user}' mutta viestiä, johon tahdot vastata, ei ole lähetetty kyseiselle käyttäjälle. Ole hyvä ja kirjaudu sisään oikealla käyttäjätunnuksella vastataksesi. sent_message_summary: delete_button: Poista + note: + description: + closed_at_by_html: "%{user} ratkaissut %{when} sitten" + closed_at_html: Ratkaistu %{when} sitten + commented_at_by_html: "%{user} päivittänyt %{when} sitten" + commented_at_html: Päivitetty %{when} sitten + opened_at_by_html: "%{user} luonut %{when} sitten" + opened_at_html: Luotu %{when} sitten + reopened_at_by_html: "%{user} aktivoinut uudelleen %{when} sitten" + reopened_at_html: Avattu uudelleen %{when} sitten + entry: + comment: Kommentti + full: Koko karttailmoitus + mine: + ago_html: "%{when} sitten" + created_at: Luotu + creator: Tekijä + description: Kuvaus + heading: Käyttäjän %{user} karttailmoitukset + id: Tunniste + last_changed: Viimeksi muutettu + subheading: Käyttäjän %{user} kommentoimat ja luomat karttailmoitukset + title: Käyttäjän %{user} kommentoimat ja luomat huomautukset + rss: + closed: suljettu karttailmoitus (lähellä paikkaa %{place}) + commented: uusi kommentti (lähellä kohdetta %{place}) + description_area: Luettelo raportoiduista, kommentoiduista tai suljetuista huomautuksista omalla alueellasi [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})] + description_item: Karttailmoituksen %{id} RSS-syöte + opened: uusi huomautus (lähellä kohdetta %{place}) + reopened: uudelleenavattu karttailmoitus (lähellä paikka %{place}) + title: OpenStreetMapin karttailmoitukset notifier: diary_comment_notification: - footer: Voit lukea kommentin sivulla %{readurl}. Jatkokommentin voit esittää sivulla %{commenturl} tai lähettää vastausviestin sivulla %{replyurl} - header: "%{from_user} kommentoi päiväkirjamerkintääsi OpenStreetMapissa otsikolla %{subject}:" + footer: Lue kommentti sivulla %{readurl}. Jatkokommentin voi lähettää sivulla %{commenturl} tai vastausviestin sivulla %{replyurl}. + header: "%{from_user} kommentoi kirjoittamaasi päiväkirjamerkintää OpenStreetMapissa otsikolla %{subject}:" hi: Hei %{to_user}, subject: "[OpenStreetMap] %{user} on lisännyt kommentin päiväkirjamerkintääsi" email_confirm: @@ -1106,27 +1156,26 @@ fi: email_confirm_plain: click_the_link: Jos tämä olet sinä, napsauta linkkiä alla vahvistaaksesi muutoksen. greeting: Hei, - hopefully_you_1: Joku (toivottavasti sinä) tahtoo muuttaa sähköpostiosoitteensa osoitteessa - hopefully_you_2: "%{server_url} osoitteeseen %{new_address}." + hopefully_you: Joku (toivottavasti sinä) haluaa vaihtaa sähköpostiosoitteen palvelimella %{server_url} osoitteeksi %{new_address} friend_notification: - befriend_them: Voit myös lisätä lähettäjän ystäväksi osoitteessa %{befriendurl}. - had_added_you: Käyttäjä %{user} lisäsi sinut kaverikseen OpenStreetMap:ssa. - see_their_profile: Näet hänen tietonsa sivulla %{userurl}. - subject: "[OpenStreetMap] %{user} lisäsi sinut ystäväkseen" + befriend_them: Voit myös lisätä lähettäjän kaveriksi osoitteessa %{befriendurl}. + had_added_you: Käyttäjä %{user} lisäsi sinut kaverikseen OpenStreetMapissa. + see_their_profile: Voit tutustua hänen profiiliinsa osoitteessa %{userurl}. + subject: "[OpenStreetMap] %{user} lisäsi sinut kaverikseen" gpx_notification: - and_no_tags: ja ei tageja. + and_no_tags: ja jolla ei tageja. and_the_tags: "ja seuraavat avainsanat:" failure: failed_to_import: "epäonnistui tuoda. Tässä virhe:" more_info_1: Lisätietoja GPX-tuontiongelmista ja miten niitä voi välttää more_info_2: "ne löytyvät osoitteesta:" subject: "[OpenStreetMap] GPX-tuonti epäonnistui" - greeting: Hei, + greeting: Hei! success: loaded_successfully: "%{trace_points} pistettä ladattu onnistuneesti mahdollisista %{possible_points} pisteestä." subject: "[OpenStreetMap] GPX-tuonti onnistui" - with_description: kuvauksen kanssa - your_gpx_file: Näyttää siltä, että GPX-tiedostosi + with_description: ", jonka kuvaus on" + your_gpx_file: Lähettämäsi GPX-tiedosto lost_password: subject: "[OpenStreetMap] Salasanan vaihtopyyntö" lost_password_html: @@ -1136,59 +1185,56 @@ fi: lost_password_plain: click_the_link: Jos tämä olet sinä, napsauta linkkiä alla nollataksesi salasanasi. greeting: Hei! - hopefully_you_1: Joku (ehkä sinä) pyysi nollaamaan salasanan - hopefully_you_2: openstreetmap.org-käyttäjätilin sähköpostiosoitteet. + hopefully_you: Joku (mahdollisesti sinä) on pyytänyt tähän sähköpostiosoitteeseen rekisteröidyn openstreetmap.org-tunnuksen salasanan vaihtoa. message_notification: - footer1: Voit lukea viestin myös osoitteessa %{readurl} - footer2: ja voit vastata siihen osoitteessa %{replyurl} - header: "%{from_user} on lähettänyt sinulle viestin OpenStreetMapin kautta, otsikko %{subject}:" - hi: Hei %{to_user}, - signup_confirm: - subject: "[OpenStreetMap] Sähköpostiosoitteen vahvistus" - signup_confirm_html: - ask_questions: OpenStreetMapista voi esittää kysymyksiä kysymyksiä ja vastauksia -sivulla. - click_the_link: Jos se olet sinä, tervetuloa! Ole hyvä ja napsauta linkkiä alla vahvistaaksesi käyttäjätilin ja lukeaksesi tietoa OpenStreetMapista - current_user: Lista nykyisistä käyttäjistä eri kategorioissa, perustuen heidän sijaintiinsa maailmassa, löytyy sivulta Category:Users_by_geographical_region. - get_reading: Wikissä on tietoa OpenStreetMapista, uusimmat uutiset löytyvät OpenStreetMap-blogista tai Twitteristä, lisäksi OpenStreetMapin perustaneen Steve Coastin OpenGeoData-blogi käsittelee projektin historiaa, kuunneltavissa on myös podcasteja! + footer_html: Lue viesti osoitteessa %{readurl} ja vastaa siihen osoitteessa %{replyurl}. + header: "%{from_user} on lähettänyt sinulle viestin OpenStreetMapissa otsikkolla %{subject}:" + hi: Hei %{to_user}! + note_comment_notification: + anonymous: Tuntematon käyttäjä + closed: + commented_note: "%{commenter} on selvittänyt merkinnän jota olet kommentoinut. Merkintä on lähellä paikkaa %{place}." + subject_other: "[OpenStreetMap] %{commenter} on selvittänyt merkinnän josta olet kiinnostunut" + subject_own: "[OpenStreetMap] %{commenter} on selvittänyt yhden merkintäsi" + your_note: "%{commenter} on selvittänyt yhden merkintäsi lähellä paikkaa %{place}" + commented: + commented_note: "%{commenter} on kommentoinut yhtä kommentoimaasi merkintää. Merkintä on lähellä paikkaa %{place}." + subject_other: "[OpenStreetMap] %{commenter} on kommentoinut merkintää josta olet kiinnostunut" + subject_own: "[OpenStreetMap] %{commenter} on kommentoinut yhtä merkinnöistäsi" + your_note: "%{commenter} on kommentoinut yhtä merkinnöistäsi lähellä paikkaa %{place}." + details: Lisää tietoja merkinnästä löytyy osoitteesta %{url}. greeting: Hei! - hopefully_you: Joku (toivottavasti sinä) tahtoo luoda käyttäjätilin osoitteessa - introductory_video: Voit katsella %{introductory_video_link}. - more_videos: On olemassa %{more_videos_link}. - more_videos_here: lisää videoita täällä - user_wiki_page: On suositeltavaa, että luot käyttäjän wikisivun, jossa on kategoriatagit, jotka ilmaisevat sijaintisi, esimerkiksi [[Category:Users_in_London]]. - video_to_openstreetmap: OpenStreetMapin esittelyvideo - wiki_signup: Haluat ehkä myös rekisteröityä OpenStreetMap-wikiin. - signup_confirm_plain: - ask_questions: "Voit kysyä kysymyksiä OpenStreetMapiin liittyen kysymys-ja-vastaus -sivustollamme:" - blog_and_twitter: "Katso viimeisimmät uutiset OpenStreetMap-blogista tai Twitteristä:" - click_the_link_1: Jos se olit sinä, tervetuloa! Napsauta linkkiä alla vahvistaaksesi - click_the_link_2: tilisi ja lukeaksesi lisätietoja OpenStreetMapista. - current_user_1: Luettelo tämänhetkisistä käyttäjistä luokissa, pohjautuen heidän sijaintiin - current_user_2: "ne ovat, on saatavilla täältä:" + reopened: + 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}." + subject_other: "[OpenStreetMap] %{commenter} on avannut karttailmoituksen uudelleen" + subject_own: "[OpenStreetMap] %{commenter} on avannut karttamerkintäsi uudelleen" + your_note: "%{commenter} on avannut karttamerkinnän uudelleen lähellä paikkaa %{place}." + signup_confirm: + confirm: "Jos olet luonut tämän käyttäjätilin, vahvista se napsauttamalla tätä linkkiä:" + created: Joku (toivottavasti sinä) on luonut käyttäjätunnuksen osoitteessa %{site_url}. greeting: Hei! - hopefully_you: Joku (toivottavasti sinä) haluaa luoda tilin - introductory_video: "Voit katsoa OpenStreetMap-esittelyvideon täällä:" - more_videos: "Lisää videoita:" - opengeodata: "OpenGeoData.org on OpenStreetMapin perustajan Steve Coastin blogi. Myös podcasteja on saatavissa:" - the_wiki: "Lue lisää OpenStreetMapista wikissä:" - user_wiki_1: On suositeltavaa, että luot käyttäjäsivun, joka sisältää - user_wiki_2: "sijaintisi ilmoittavan luokka-tagin. Esimerkiksi näin: [[Category:Users_in_London]]." - wiki_signup: "Saatat myös haluta rekisteröityä OpenStreetMap-wikiin:" + subject: "[OpenStreetMap] Tervetuloa OpenStreetMap-sovellukseen" + welcome: Käyttäjätilin vahvistamisen jälkeen haluaisimme kertoa joitain hyödyllisiä asioita, jotta pääset alkuun. oauth: oauthorize: allow_read_gpx: lukea yksityisiä GPS-jälkiäsi allow_read_prefs: lukea käyttäjäsi asetuksia allow_to: "Salli asiakassovelluksen:" allow_write_api: muokata karttaa - allow_write_diary: luo päiväkirjamerkintöjä, kommentteja ja ystävysty. + allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä ystäviä. allow_write_gpx: tallenna GPS-jälkiä. + allow_write_notes: Muokkaa muistiinpanoja. allow_write_prefs: muokata käyttäjäsi asetuksia request_access: Sovellus %{app_name} pyytää pääsyä käyttäjätiliisi %{user}. Tarkasta oikeudet, jotka tahdot antaa sovellukselle. Voit valita mielestäsi sopivat oikeudet. + oauthorize_success: + verification: Vahvistuskoodi on %{code}. revoke: flash: Olet poistanut sovelluksen %{application} avaimen oauth_clients: create: flash: Tiedot on lähetetty hyväksyttäväksi. + destroy: + flash: Sovelluksen käyttöoikeus on poistettu. edit: submit: Muokkaa title: Muokkaa sovellustasi @@ -1198,7 +1244,9 @@ fi: allow_write_api: kartan muokkaaminen. allow_write_diary: päiväkirjamerkintöjen luominen ja kommentointi sekä kaveripyynnöt. allow_write_gpx: GPS-jälkien tallentaminen. + allow_write_notes: Muokkaa muistiinpanoja. allow_write_prefs: käyttäjäasetusten muuttaminen. + callback_url: Takaisinsoiton verkko-osoite name: Nimi requests: "Sovellus pyytää käyttäjältä seuraavia tietoja:" required: vaadittu @@ -1212,62 +1260,88 @@ fi: my_tokens: Valtuutetut sovellukset no_apps: Oletko kehittänyt sovelluksen, jonka haluaisit käyttävän %{oauth}-kirjautumismenetelmää? Sovellus on rekisteröitävä, ennen kuin se voi lähettää kirjautumispyyntöjä tähän palveluun. register_new: Rekisteröi sovelluksesi + registered_apps: "Seuraavat sovellukset käyttävät käyttäjätunnustasi:" revoke: Peruuta! title: Omat OAuth-tietoni new: submit: Rekisteröi title: Rekisteröi uusi sovellus + not_found: + sorry: Valitettavasti tyyppiä %{type} ei löydy. show: + access_url: "Pääsyavaimen URRL-osoite:" allow_read_gpx: lukea heidän yksityisiä GPS-jälkiään allow_read_prefs: lukea heidän käyttäjäasetuksiaan allow_write_api: muokata karttaa allow_write_diary: kirjoita päiväkirjamerkintöjä, kommentoi ja löydä ystäviä. allow_write_gpx: tallentaa GPS-jälkiä + allow_write_notes: Muokkaa muistiinpanoja. allow_write_prefs: muokata heidän käyttäjäasetuksiaan + authorize_url: "Valtuuta URL-osoite:" confirm: Oletko varma? + delete: Poista asiakas edit: Muokkaa yksityiskohtia key: "Kuluttajan avain:" requests: "Pyydetään seuraavia oikeuksia käyttäjältä:" secret: "Kuluttajan salaisuus:" - support_notice: Tuettuja ovat HMAC-SHA1 (suositeltu) ja pelkkä teksti SSL-tilassa. + support_notice: Tuemme HMAC-SHA1 (suositeltu) ja RSA-SHA1 allekirjoituksia. title: OAuth-tiedot sovellukselle %{app_name} url: "Pyynnön URL-avain:" update: flash: Sovelluksen tiedot on päivitetty. redaction: + create: + flash: Redaktio luotu. + destroy: + error: Laitosta tuhottaessa tapahtui virhe. + flash: Redaktio tuhottu. + not_empty: Redaktio ei ole tyhjä. Poista redaktiotiedot kaikista tähän redaktioon liittyvistä versioista ennen sen tuhoamista. edit: description: Kuvaus + heading: Muokkaa laitosta + submit: Tallenna redaktio + title: Muokkaa laitosta + index: + empty: Ei ole näytettävää laitosta + heading: Laitosten luettelo + title: Laitosten luettelo new: description: Kuvaus + heading: Kirjoita tietoja uudesta laitoksesta + submit: Luo redaktio + title: Luodaan uusi redaktio show: confirm: Oletko varma? description: "Kuvaus:" + destroy: Poista tämä redaktio + edit: Muokkaa tätä laitosta + heading: Näytetään redaktio ”%{title}” + title: Näytetään redaktio + user: "Luoja:" update: flash: Muutokset on tallennettu. site: edit: anon_edits_link_text: Perustelut (englanniksi) julkisuusvaatimukselle. - flash_player_required: Potlatch-editori tarvitsee Flash player -laajennuksen. Saat sen Adobe.comin download Flash Player -sivulta. Kartan muokkaamiseen on useita muitakin ohjelmia. - no_iframe_support: Selaimesi ei tue HTML iframeja, joita tähän ominaisuuteen tarvitaan. + flash_player_required: 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. + 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. not_public: Muokkauksesi eivät ole julkisia. not_public_description: Et voi enää muokata karttaa ennen kuin vaihdat muokkauksesi julkisiksi. Voit vaihtaa asetuksen %{user_page}-sivulta. potlatch2_not_configured: Potlatch 2 ei ole määritetty - Katso lisätietoja http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: Olet tehnyt tallentamattomia muutoksia. (Tallentaaksesi Potlatch 2 -editorissa voit napsauttaa.) - potlatch_unsaved_changes: Tallentamattomia muutoksia. Tallentaaksesi muutokset Potlatchissa, poista valinta nykyiseltä karttakohteelta; tai paina Tallenna -nappia jos sellainen on käytössä. + potlatch2_unsaved_changes: Karttaan on tehty tallentamattomia muutoksia. Tallenna muokkaukset Potlatch 2:ssa napsauttamalla Tallenna-painiketta. + potlatch_unsaved_changes: Tallentamattomia muutoksia. Tallenna muutokset Potlatchissa poistamalla valinta nykyiseltä karttakohteelta tai napsauta Tallenna-painiketta, jos sellainen on käytössä. user_page_link: käyttäjätiedot index: - js_1: Selaimesi ei tue JavaScriptiä tai sen suoritus on estetty. + createnote: Ilmoita karttavirheestä + js_1: Selain ei tue JavaScriptiä tai sen suorittaminen on estetty. js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan. license: - license_name: Creative Commons Nimeä-Tarttuva 2.0 - notice: Lisensoitu %{license_name} lisenssillä projektin %{project_name} ja sen osallistujien toimesta. - project_name: OpenStreetMap-projekti + copyright: "Tekijänoikeus: OpenStreetMapin tekijät, avoimella lisenssillä" permalink: Ikilinkki remote_failed: Muokkaus epäonnistui - varmista, että JOSM tai Merkaartor on ladattu ja etähallinta-asetus on käytössä shortlink: Lyhytosoite key: - map_key: Karttamerkit - map_key_tooltip: Merkkien selitykset table: entry: admin: Hallinnollinen raja @@ -1291,7 +1365,7 @@ fi: - keto construction: Rakenteilla olevia teitä cycleway: Pyörätie - destination: Sallittu kohteeseen + destination: Ei läpikulkua farm: Maatila footway: Jalankulkutie forest: Talousmetsä @@ -1304,7 +1378,7 @@ fi: military: Sotilasalue motorway: Moottoritie park: Puisto - permissive: Salliva pääsy + permissive: Luvanvarainen pääsy pitch: Urheilukenttä primary: Kantatie private: Yksityinen @@ -1353,7 +1427,6 @@ fi: preview: Esikatselu search: search: Haku - search_help: "esim.: 'Munkkivuori', 'Karttatie, Oulu' tai 'post offices near Helsinki' lisää esimerkkejä... (englanniksi)" submit_text: Hae where_am_i: Nykyinen sijainti? where_am_i_title: Määrittää nykyisen sijainnin hakukoneella @@ -1365,10 +1438,15 @@ fi: friendly: "%e. %Bta %Y kello %H:%M" trace: create: - trace_uploaded: GPX-tiedostosi on nyt palvelimella ja jonossa tietokantaan syötettäväksi. Yleensä tämä valmistuu puolen tunnin sisällä. Saat vielä sähköpostiisi vahvistuksen asiasta. + trace_uploaded: GPX-tiedosto on tallennettu palvelimelle ja on jonossa tietokantaan syötettäväksi. Yleensä tämä kestää noin puoli tuntia. Saat vielä sähköposti-ilmoituksen asiasta. upload_trace: Lähetä GPS-jälki delete: scheduled_for_deletion: Jälki on poistojonossa. + description: + description_with_count: + one: GPX-tiedosto, jossa on %{count} piste käyttäjältä %{user} + other: GPX-tiedosto, jossa on %{count} pistettä käyttäjältä %{user} + description_without_count: GPX-tiedosto käyttäjältä %{user} edit: description: "Kuvaus:" download: lataa @@ -1380,16 +1458,20 @@ fi: points: "Pisteet:" save_button: Tallenna muutokset start_coord: "Alun koordinaatit:" - tags: "Tunnisteet:" + tags: "Tagit:" tags_help: pilkuilla erotettu lista title: Muokataan jälkeä %{name} uploaded_at: "Lähetetty:" visibility: "Näkyvyys:" visibility_help: mitä tämä tarkoittaa? + georss: + title: OpenStreetMapin GPS-jäljet list: + description: Selaa juuri lähetettyjä GPS-jälkiä + empty_html: Sivu on tyhjä. Lähetä uusi GPS-jälki tai lue lisätietoja GPS-jälkien keräämisestä wikisivulta. public_traces: Julkiset GPS-jäljet public_traces_from: Käyttäjän %{user} julkiset GPS-jäljet - tagged_with: ", joilla on tunniste %{tags}" + tagged_with: ", joilla on tagi %{tags}" your_traces: Omat GPS-jäljet make_public: made_public: Jäljestä tehtiin julkinen @@ -1428,13 +1510,15 @@ fi: trace_header: see_all_traces: Näytä kaikki jäljet see_your_traces: Näytä kaikki omat jäljet - traces_waiting: Lähettämiäsi jälkiä on jo %{count} käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan. + traces_waiting: + one: Sinulla on %{count} jälki käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan. + other: Sinulla on %{count} jälkeä käsittelyjonossa odottamassa tallennusta tietokantaan. Olisi huomaavaista jos odottaisit näiden valmistuvan ennen kuin lähetät lisää jälkiä. Näin muidenkin käyttäjien lähettämät jäljet pääsevät aiemmin tietokantaan. upload_trace: Lisää GPS-jälki trace_optionals: - tags: Tunnisteet + tags: Tagit trace_paging_nav: - next: Seuraava » - previous: « Edellinen + newer: Uudet jäljet + older: Vanhat jäljet showing_page: Sivu %{page} view: delete_track: Poista tämä jälki @@ -1450,20 +1534,21 @@ fi: pending: ODOTTAA KÄSITTELYÄ points: "Pisteitä:" start_coordinates: "Alkupisteen koordinaatit:" - tags: Tunnisteet + tags: Tagit title: Näytetään jälkeä %{name} trace_not_found: Jälkeä ei löydy! uploaded: "Lähetetty:" visibility: "Näkyvyys:" visibility: identifiable: Tunnistettavissa (näytetään jälkiluettelossa ja pisteet tunnistettavasti järjestettynä aikaleimoineen) - private: Yksityinen (pisteet vain ilman nimeä ja aikaleimoja) - public: Julkisen (näytetään jälkiluettelossa, mutta pisteet ilman nimeä ja aikaleimoja) + private: Yksityinen (vain pisteet ilman nimeä ja aikaleimoja) + public: Julkinen (näytetään jälkiluettelossa, mutta pisteet ilman nimeä ja aikaleimoja) trackable: Jäljitettävissä (pisteet jaetaan järjestettynä aikaleimoineen, mutta nimettömänä) user: account: contributor terms: agreed: Olet hyväksynyt Kartoittajan ehdot. + agreed_with_pd: Olet myös ilmaissut muokkaustesi olevan tekijänoikeudesta vapaita (Public Domain). heading: "Kartoittajan ehdot:" link text: Mitä tämä tarkoittaa? not yet agreed: Et ole vielä hyväksynyt Kartoittajan ehtoja. @@ -1473,6 +1558,9 @@ fi: email never displayed publicly: (ei näy muille) flash update success: Käyttäjätietojen muutokset on tallennettu. flash update success confirm needed: Käyttäjätietojen muutokset on tallennettu. Vahvista uusi sähköpostiosoite siihen lähetettyjen ohjeiden mukaisesti. + gravatar: + gravatar: Käytä Gravataria + link text: mikä tämä on? home location: "Kotipaikka:" image: "Kuva:" image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään 100x100) @@ -1480,7 +1568,7 @@ fi: latitude: "Leveyspiiri:" longitude: "Pituuspiiri:" make edits public button: Tee muokkauksistani julkisia - my settings: Käyttäjän asetukset + my settings: Käyttäjäasetukset new email address: "Uusi sähköpostiosoite:" new image: Lisää kuva no home location: Kotipaikkaa ei ole vielä määritetty. @@ -1490,7 +1578,7 @@ fi: openid: "OpenID:" preferred editor: "Ensisijainen muokkausohjelma:" preferred languages: "Kielivalinnat:" - profile description: "Kuvaustekstisi:" + profile description: "Henkilökuvaus:" public editing: disabled: Ei. Karttatietojen muokkaus estetty. Aiemmat karttamuutokset anonyymejä. disabled link text: Miksen voi enää muokata karttaa? @@ -1508,9 +1596,12 @@ fi: confirm: already active: Tämä tunnus on jo vahvistettu. button: Vahvista - heading: Vahvista käyttäjätunnuksen luominen + heading: Tarkista sähköpostisi! + introduction_1: Vahvistusviesti lähetetty. + introduction_2: Vahvista tilisi klikkaamalla sähköpostissa olevaa linkkiä ja voit aloittaa kartoituksen. press confirm button: Aktivoi uusi käyttäjätunnuksesi valitsemalla Vahvista. - success: Käyttäjätunnuksesi on nyt vahvistettu. + reconfirm_html: Tarvittaessa voimme lähettää vahvistuksen sähköpostitse, klikkaa tästä. + unknown token: Vahvistuskoodi on vanhentunut tai sitä ei ole. confirm_email: button: Vahvista failure: Tällä tunnisteella on jo vahvistettu sähköpostiosoite. @@ -1519,15 +1610,24 @@ fi: success: Sähköpostiosoite on vahvistettu. Kiitos liittymisestä! confirm_resend: failure: Käyttäjää %{name} ei löytynyt. + success: Olemme lähettäneet vahvistusviestin osoitteeseen %{email}. Vahvistettuasi käyttäjätunnuksesi voit aloittaa kartoittamisen.

    Jos käytät roskapostit suodattavaa ohjelmaa, joka lähettää vahvistusviestejä, laita webmaster@openstreetmap.org sallittujen osoitteiden listalle, sillä emme voi vastata vahvistusviesteihin. filter: not_an_administrator: Tähän toimintoon tarvitaan ylläpitäjän oikeudet. go_public: flash success: Kaikki tekemäsi muokkaukset ovat nyt julkisia. list: + confirm: Vahvista valitut käyttäjät + empty: Käyttäjiä ei löytynyt. heading: Käyttäjät hide: Piilota valitut käyttäjät + showing: + one: Näytetään sivu %{page} (%{first_item}/%{items}) + other: Näytetään sivu %{page} (%{first_item}-%{last_item} / %{items}) + summary: "%{name} luotu %{date} osoitteesta %{ip_address}" + summary_no_ip: "%{name} luotu %{date}" title: Käyttäjät login: + account is suspended: Valitettavasti käyttäjätilisi on jäädytetty epäilyttävän toiminnan seurauksena.
    Ole hyvä ja ota yhteyttä webmasteriin jos haluat keskustella tästä. account not active: Käyttäjätunnustasi ei ole vielä aktivoitu.
    Aktivoi käyttäjätunnuksesi napsauttamalla sähköpostitse saamaasi vahvistuslinkkiä, tai pyydä uusi varmistusviesti. auth failure: Kirjautuminen epäonnistui. create account minute: Luo käyttäjätunnus. Se kestää vain hetken. @@ -1537,19 +1637,19 @@ fi: lost password link: Unohditko salasanasi? new to osm: Oletko uusi OpenStreetMapin käyttäjä? no account: Eikö sinulla vielä ole käyttäjätunnusta? - notice: Lisätietoja tulevasta OpenStreetMapin lisenssinmuutoksesta (käännetyt versiot) (keskustelu) + openid: "%{logo} OpenID:" openid invalid: Valitettavasti OpenID-tunnuksesi vaikuttaa olevan virheellinen. openid missing provider: Yhteyden muodostaminen OpenID-palvelimeen epäonnistui openid_logo_alt: Kirjaudu sisään OpenID-tunnuksella openid_providers: aol: - alt: Kirjaudu sisään AOL OpenID-tunnuksella + alt: Kirjaudu sisään AOL:n OpenID-tunnuksella title: Kirjaudu sisään AOL-tunnuksella google: alt: Kirjaudu sisään Googlen OpenID-tunnuksella title: Kirjaudu sisään Google-tunnuksella myopenid: - alt: Kirjaudu sisään myOpenID OpenID-tunnuksella + alt: Kirjaudu sisään myOpenID:n OpenID-tunnuksella title: Kirjaudu sisään myOpenID-tunnuksella openid: alt: Kirjaudu sisään OpenID-tunnuksen URL-osoitteella @@ -1562,10 +1662,10 @@ fi: title: Kirjaudu sisään Yahoo-tunnuksella password: "Salasana:" register now: Rekisteröidy - remember: "Muista minut:" + remember: Muista minut title: Kirjautumissivu to make changes: OpenStreetMapin karttatietojen muuttaminen vaatii käyttäjätunnuksen. - with openid: "Vaihtoehtoisesti kirjautuminen voidaan suorittaa OpenID-tunnuksella:" + with openid: "Kirjaudu OpenID-tunnuksella:" with username: "Onko sinulla jo OpenStreetMap-tunnus? Kirjaudu sillä sisään:" logout: heading: Kirjaudu ulos OpenStreetMapista @@ -1575,45 +1675,49 @@ fi: email address: "Sähköpostiosoite:" heading: Unohditko salasanasi? help_text: Kirjoita alapuolelle kirjautumissähköpostiosoitteesi. Osoitteeseen lähetetään salasanan palautusohjeet. - new password button: Lähetä minulle uusi salasana + new password button: Lähetä salasanan palautusohjeet notice email cannot find: Annettu sähköpostiosoite ei ole käytössä. notice email on way: Salasanan palautusohjeet on lähetetty annettuun sähköpostiosoitteeseen. title: Unohtunut salasana make_friend: already_a_friend: "%{name} on jo kaverisi." + button: Lisää kaveriksi failed: Käyttäjää %{name} ei voitu lisätä kaverilistaasi. + heading: Lisätäänkö %{user} kaveriksi? success: "%{name} on nyt kaverisi." new: + about: + header: Muokkaa vapaasti + html: "

    Toisin kuin muut karttapalvelut, OpenStreetMap on täysin yhteisön eli vapaaehtoisten ihmisten luoma. Palvelun käyttö ja muokkaaminen on täysin ilmaista ja vapaata.

    \n

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

    " confirm email address: "Sähköpostiosoite uudelleen:" confirm password: "Salasana uudelleen:" contact_webmaster: Voit ottaa yhteyttä webmasteriin (englanniksi) saadaksesi oman käyttäjätunnuksen. Pyrimme vastaamaan pyyntöihin mahdollisimman pikaisesti. - continue: Jatka + continue: Rekisteröidy display name: "Käyttäjätunnus:" - display name description: Julkisesti näkyvä käyttäjänimesi. Tätä voi myöhemmin muuttaa asetuksista. + display name description: Julkisesti näkyvä käyttäjänimi. Tätä voi myöhemmin muuttaa asetuksista. email address: "Sähköpostiosoite:" - fill_form: Lomakkeen täyttämisen jälkeen annettuun sähköpostiosoitteeseen lähetetään vahvistusviesti, jolla aktivoidaan käyttäjätunnus. - flash create success message: Kiitos rekisteröitymisestä. Olemme lähettäneet vahvistusviestin osoitteeseen %{email}. Vahvistettuasi käyttäjätunnuksesi voit aloittaa kartoittamisen.

    Jos käytät roskapostit suodattavaa ohjelmaa, joka lähettää vahvistusviestejä, laita webmaster@openstreetmap.org sallittujen osoitteiden listalle, sillä emme voi vastata vahvistusviesteihin. - heading: Luo uusi käyttäjätunnus - license_agreement: Luomalla tunnuksen sallit kaiken openstreetmap.org-palvelimelle lähetetyn tiedon sekä kaikkien openstreetmap.org-palvelimeen yhteydessä olevilla työkaluilla tuotetun tiedon hyödyntämisen Creative Commons by-sa 2.0 -lisenssin mukaisin ehdoin. Tämä ei rajoita oikeuttasi levittää edellämainittuja tietoja myös muiden lisenssien ehdoilla. + license_agreement: Kun vahvistat tilisi sinun on sitouduttava osallistujan ehtoihin. no_auto_account_create: Automaattinen käyttäjätunnuksen luonti ei ole juuri nyt käytössä. - not displayed publicly: Sähköpostia ei näytetä palvelussa julkisesti. (Sivulla tietosuojakäytäntö on englanniksi lisätietoa tietosuojakäytännöistä.) + not displayed publicly: Ei näytetä julkisesti. Lisätietoja tietosuojakäytännöstä on saatavilla englanniksi. openid: "%{logo} OpenID:" openid association: "

    OpenID-tunnustasi ei ole vielä yhdistetty OpenStreetMap-käyttäjätiliin.

    \n
      \n
    • Jos olet uusi OpenStreetMapin käyttäjä, luo uusi tunnus käyttäen lomaketta, joka näkyy alla.
    • \n
    • \n Jos sinulla on jo käyttäjätunnus, voit kirjautua sisään\n käyttäen käyttäjätunnustasi ja salasanaasi, jonka \n jälkeen voit liittää OpenID-tunnuksesi käyttäjätiliin\n käyttäjäasetuksistasi. \n
    • \n
    " openid no password: OpenID:iä käytettäessä salasana ei ole pakollinen, mutta jotkut erikoistyökalut ja -palvelimet saattavat vaatia sen. password: "Salasana:" terms accepted: Kiitos uusien osallistujaehtojen hyväksymisestä! terms declined: Olemme pahoillamme, ettet hyväksynyt uusia osallistujaehtoja. Katso lisätietoja tältä wikisivulta. - title: Uusi käyttäjätunnus + title: Rekisteröidy use openid: Rekisteröidy %{logo} OpenID-tunnuksella no_such_user: body: Käyttäjää %{user} ei löytynyt. Tarkista oikeikirjoitus. heading: Käyttäjää %{user} ei ole olemassa title: Haettua käyttäjää ei ole olemassa popup: - friend: Ystävä + friend: Kaveri nearby mapper: Lähellä oleva kartoittaja your location: Oma sijaintisi remove_friend: + button: Poista kaveri + heading: Poistetaanko kaveri %{user}? not_a_friend: "%{name} ei ole enää kaverisi." success: "%{name} poistettiin kaverilistastasi." reset_password: @@ -1626,11 +1730,16 @@ fi: title: Salasanan vaihto set_home: flash success: Kodin sijainnin tallennus onnistui + suspended: + heading: Käyttäjätili jäädytetty + title: Käyttäjätili jäädytetty + webmaster: webmaster terms: agree: Hyväksyn consider_pd: Edellisen sopimuksen lisäksi katson lisäyksieni olevan Public Domainissa consider_pd_why: mikä tämä on? decline: En hyväksy + guidance: "Tietoa, joka auttaa ymmärtämään nämä käsitteet: a ihmisluettava yhteenveto ja joitain epävirallisia käännöksiä" heading: Osallistujaehdot legale_names: france: Ranska @@ -1642,12 +1751,12 @@ fi: you need to accept or decline: Ennen jatkamista lue läpi Kartoittajan ehdot ja hyväksy tai hylkää se. view: activate_user: aktivoi tämä käyttäjä - add as friend: lisää kaveriksi + add as friend: Lisää kaveriksi ago: (%{time_in_words_ago} sitten) - block_history: näytä estot - blocks by me: tekemäni estot - blocks on me: saadut estot - comments: kommentit + block_history: saadut estot + blocks by me: Tekemäni estot + blocks on me: Saadut estot + comments: Kommentit confirm: Vahvista confirm_user: vahvista tämä käyttäjä create_block: estä tämä käyttäjä @@ -1659,31 +1768,35 @@ fi: deactivate_user: poista tämän käyttäjän aktivointi delete_user: poista käyttäjä description: Kuvaus - diary: päiväkirja - edits: muokkaukset + diary: Päiväkirja + edits: Muokkaukset email address: "Sähköpostiosoite:" - friends_changesets: Selaa kaikkia ystävien muutoskokoelmia - friends_diaries: Selaa kaikkia ystävien päiväkirjamerkintöjä + friends_changesets: kaverien muutoskokoelmat + friends_diaries: kaverien päiväkirjamerkinnät hide_user: piilota käyttäjä - if set location: Jos määrittelet sijaintisi, alle ilmestyy nätti kartta. Voit määritellä sijaintisi %{settings_link}. + if set location: Määrittelet sijaintisi sivulla %{settings_link} nähdäksesi lähialueen käyttäjiä. km away: "%{count} kilometrin päässä" latest edit: "Viimeisin muutos %{ago}:" m away: "%{count} metrin päässä" mapper since: "Liittyi palveluun:" - moderator_history: näytä tehdyt estot - my comments: omat kommentit - my diary: oma päiväkirja - my edits: omat muokkaukset - my settings: asetukset - my traces: omat jäljet + moderator_history: tehdyt estot + my comments: Omat kommentit + my diary: Oma päiväkirja + my edits: Omat muokkaukset + my messages: Viestit + my notes: Omat karttailmoitukset + my profile: Profiili + my settings: Asetukset + my traces: Omat jäljet nearby users: Muut lähialueen käyttäjät - nearby_changesets: Selaa lähialueen käyttäjien muutoskokoelmia - nearby_diaries: Selaa lähialueen käyttäjien päiväkirjamerkintöjä + nearby_changesets: lähialueen käyttäjien muutoskokoelmat + nearby_diaries: lähialueen käyttäjien päiväkirjamerkinnät new diary entry: uusi päiväkirjamerkintä no friends: Sinulla ei ole vielä kavereita. no nearby users: Valitun sijainnin lähellä ei ole tiedossa muita käyttäjiä. + notes: Karttailmoitukset oauth settings: oauth-asetukset - remove as friend: poista kavereista + remove as friend: Poista kavereista role: administrator: Tämä käyttäjä on ylläpitäjä. grant: @@ -1693,10 +1806,10 @@ fi: revoke: administrator: Poista ylläpitäjän oikeudet moderator: Poista moderaattorin oikeudet - send message: lähetä viesti + send message: Lähetä viesti settings_link_text: asetussivulla status: "Tila:" - traces: jäljet + traces: Jäljet unhide_user: piilota tämä käyttäjä user location: Käyttäjän sijainti your friends: Kaverit @@ -1733,12 +1846,17 @@ fi: empty: Ei estoja. heading: Luettelo käyttäjän estoista title: Estetyt käyttäjät + model: + non_moderator_revoke: Sinun on oltava moderaattori poistaaksesi eston. + non_moderator_update: Sinun on oltava moderaattori luodaksesi tai muokataksesi estoa. new: back: Näytä kaikki estot + heading: Luodaan esto käyttäjälle %{name} needs_view: Käyttäjän tulee kirjautua sisään ennen tämän eston poistumista period: Kuinka kauan käyttäjä on estetty käyttämästä APIa. Esto alkaa heti. reason: Syy käyttäjän %{name} estoon. Ole mahdollisimman rauhallinen ja järkevä. Anna niin paljon yksityiskohtia tilanteesta kuin voit. Muista, että viesti tulee olemaan esillä julkisesti. Muista myös, että kaikki käyttäjät eivät ymmärrä yhteisön slangia. Käytä siis maallikkojen termejä. submit: Luo esto + title: Luodaan esto käyttäjälle %{name} tried_contacting: Olen ottanut yhteyttä käyttäjään ja pyytänyt heitä lopettamaan. tried_waiting: Olen antanut käyttäjälle kohtuullisen ajan vastata näihin viesteihin. not_found: @@ -1749,11 +1867,14 @@ fi: creator_name: Tekijä display_name: Estetty käyttäjä edit: Muokkaa + next: Seuraava » not_revoked: (ei kumottu) + previous: « Edellinen reason: Eston syy revoke: Estä! revoker_name: Eston tehnyt show: Näytä + showing_page: Sivu %{page} status: Tila period: one: 1 tunti @@ -1790,11 +1911,36 @@ fi: not_a_role: Merkkijono '%{role}' ei ole kelvollinen rooli. not_an_administrator: Vain ylläpitäjät voivat hallita käyttäjärooleja, etkä ole ylläpitäjä. grant: + are_you_sure: Haluatko varmasti lisätä käyttäjän ”%{name}” ryhmään ”%{role}”? confirm: Vahvista fail: Roolin ”%{role}” myöntäminen käyttäjälle ”%{name}” epäonnistui. Tarkista että käyttäjä ja rooli ovat molemmat kelvollisia. heading: Vahvista roolin myöntäminen title: Vahvista roolin myöntäminen revoke: + are_you_sure: Haluatko varmasti poistaa käyttäjän ”%{name}” ryhmästä ”%{role}”? confirm: Vahvista + fail: Ryhmän ”%{role}” poistaminen käyttäjältä ”%{name}” epäonnistui. Tarkista että käyttäjä ja ryhmä ovat molemmat kelvollisia. heading: Vahvista roolin poistaminen title: Vahvista roolin poistaminen + welcome_page: + add_a_note: + paragraph_1_html: Jos huomaat kartalla virheen, muttet halua korjata sitä itse, tee siitä karttavirheilmoitus. + paragraph_2_html: "Se on helppoa! Siirry kartalle ja napsauta -kuvaketta. Siirrä kartalle ilmestyvä karttamerkki virheen kohdalle. Kirjoita virheestä lisätietoja: Suomessa olevista virheistä suomeksi ja muualla olevista virheistä paikallisella kielellä tai englanniksi. Lopuksi tallenna ilmoitus, jolloin muut kartoittajat voivat korjata virheen." + title: Eikö muokkaaminen kiinnosta? Ilmoita karttavirheistä! + basic_terms: + editor_html: Muokkausohjelma tai kartanmuokkain (engl. editor) on ohjelmisto tai verkkosivusto, jolla voi muokata karttaa. + node_html: Piste (engl. node) on pistemäinen kohde kartalla, kuten ravintola tai puu. Näitä kutsutaan paikkapisteiksi. Pisteet, joilla ei ole ominaisuustietoja ja ovat vain viivan osana, kutsutaan myös viivapisteiksi. + paragraph_1_html: OpenStreetMapissa käytetään lukuisia, vain siinä esiintyviä termejä. Kun nämä termit ovat hallinnassa, olet jo voiton puolella! + tag_html: Tagi eli ominaisuustieto kuvaa pisteen, viivan tai alueen käyttötarkoitusta. Tällaisia tietoja ovat esimerkiksi ravintolan nimi tai kadun nopeusrajoitus. + title: Käsitteitä ja termistöä + way_html: Avoin viiva (engl. way) on viivamainen kohde, kuten katu tai joki. Suljettu viiva eli alue (engl. area) kuvaa aluetta, kuten järveä tai rakennusta. + introduction_html: Tervetuloa OpenStreetMapiin, ilmaiseen ja vapaasti muokattavaan maailmankarttaan. Rekisteröityminen on nyt suoritettu, joten olet valmis aloittamaan kartan muokkaamisen. Tutustu ensin kuitenkin näihin perusasioihin. + questions: + paragraph_1_html: OpenStreetMapin käyttötukea on saatavilla useilla eri tavoilla. Tutustu OpenStreetMapin ohjekeskukseen. + title: Kysyttävää? + start_mapping: Aloita kartan muokkaaminen + title: Tervetuloa! + whats_on_the_map: + off_html: Kartta ei sisällä mielipiteitä, kuten arvosteluja, historiallisia tai hypoteettisia ominaisuuksia, eikä tietoja tekijänoikeuksin suojatuista lähteistä. Ellei sinulla ole erityistä lupaa, älä kopioi verkko- tai paperikarttoja. + on_html: OpenStreetMapissä voi kartoittaa asioita, jotka ovat olemassa juuri nyt – se sisältää miljoonia rakennuksia, teitä ja muita tietoja maailmasta. Voit kartoittaa mitä tahansa reaalimaailman piirteitä, jotka sinua kiinnostavat. + title: Mitä kartalla on diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 0404be8c7a1..0940cd8da09 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -2,28 +2,52 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Alno +# Author: Boniface +# Author: Cquoi # Author: Crochet.david # Author: Damouns # Author: DavidL +# Author: Efred # Author: EtienneChove # Author: F.rodrigo # Author: Gomoko # Author: Hashar # Author: IAlex +# Author: JB # Author: Jean-Frédéric # Author: Jiremek # Author: Litlok # Author: Ljubinka # Author: McDutchie +# Author: Metroitendo +# Author: Nemo bis # Author: Od1n +# Author: Olasd +# Author: Otourly # Author: Peter17 # Author: Phoenamandre +# Author: Pipo +# Author: Pyrog # Author: Quentinv57 # Author: Seb35 +# Author: Sherbrooke # Author: Urhixidur +# Author: Vcalame # Author: Verdy p # Author: Yvecai fr: + about_page: + community_driven_html: "La communauté d’OpenStreetMap est diverse, passionée et grossit chaque jour. Nos contributeurs incluent des cartographes enthousiastes, des professionnels du GIS, des ingénieurs qui conduisent les serveurs OSM, des humanitaires cartographiant les zones dévastées par une catastrophe et bien d’autres.\nPour en savoir plus sur la communauté, consultez les annuaires d’utilisateurs, les blogues communautaires et le site web de la Fondation OSM." + community_driven_title: Conduit par la communauté + copyright_html: ©Contributeurs
    d’OpenStreetMap + 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. + local_knowledge_html: OpenStreetMap encourage et met en avant la connaissance locale du terrain. Les contributeurs utilisent l’imagerie aérienne, les récepteurs GPS et les cartes classiques du terrain pour vérifier qu’OSM est exact et à jour. + local_knowledge_title: Connaissance locale + next: Suivant + open_data_html: "OpenStreetMap est en open data : vous êtes libre de l’utiliser pour 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 distribuez le résultat seulement suivant la même licence. Consultez la page sur les droits d’auteur et licence pour plus de détails." + open_data_title: Données libres + partners_title: Partenaires + used_by: "%{name} fournit des données cartographie sur des centaines de sites web, applications mobiles et appareils" activerecord: attributes: diary_comment: @@ -32,7 +56,7 @@ fr: language: Langue latitude: Latitude longitude: Longitude - title: Titre + title: Sujet user: Utilisateur friend: friend: Ami @@ -41,7 +65,7 @@ fr: body: Corps recipient: Destinataire sender: Expéditeur - title: Titre + title: Sujet trace: description: Description latitude: Latitude @@ -61,7 +85,7 @@ fr: models: acl: Liste de contrôle d’accès changeset: Groupe de modifications - changeset_tag: Balise du groupe de modifications + changeset_tag: Attribut du groupe de modifications country: Pays diary_comment: Commentaire du journal diary_entry: Entrée du journal @@ -69,29 +93,29 @@ fr: language: Langue message: Message node: Nœud - node_tag: Balise de nœud + node_tag: Attribut du nœud notifier: Notificateur old_node: Ancien nœud - old_node_tag: Balise de l'ancien nœud + old_node_tag: Attribut de l’ancien nœud old_relation: Ancienne relation - old_relation_member: Ancien membre de la relation - old_relation_tag: Balise de l’ancienne relation + old_relation_member: Membre de l’ancienne relation + old_relation_tag: Attribut de l’ancienne relation old_way: Ancien chemin old_way_node: Nœud de l’ancien chemin - old_way_tag: Balise de l’ancien chemin + old_way_tag: Attribut de l’ancien chemin relation: Relation relation_member: Membre de la relation - relation_tag: Balise de relation + relation_tag: Attribut de la relation session: Session - trace: Piste + trace: Trace tracepoint: Point de la trace - tracetag: Balise de la piste + tracetag: Mot-clé de la trace user: Utilisateur user_preference: Préférences de l’utilisateur - user_token: Jeton de l'utilisateur + user_token: Jeton de l’utilisateur way: Chemin way_node: Nœud du chemin - way_tag: Balise du chemin + way_tag: Attribut du chemin application: require_cookies: cookies_needed: Il semble que les cookies soient désactivés sur votre navigateur. Veuillez les activer avant de continuer. @@ -101,231 +125,133 @@ fr: blocked: Votre accès à l'API a été bloqué. Connectez-vous sur l'interface web pour plus d'informations. need_to_see_terms: Votre accès à l’API est temporairement suspendu. Veuillez vous connecter à l’interface web pour afficher les conditions de contributions. Vous n'avez pas besoin d’accord, mais vous devez les visualiser. browse: + anonymous: anonyme changeset: - changeset: "Groupe de modifications : %{id}" - changesetxml: Groupe de modifications XML - download: Télécharger %{changeset_xml_link} ou %{osmchange_xml_link} + belongs_to: Auteur + changesetxml: XML du groupe de modifications feed: title: Groupe de modifications %{id} title_comment: Groupe de modifications %{id} – %{comment} - osmchangexml: osmChange XML - title: Groupe de modifications - changeset_details: - belongs_to: "Appartient à :" - bounding_box: "Cadre de délimitation :" - box: cadre - closed_at: "Terminé le :" - created_at: "Créé le :" - has_nodes: - one: "Concerne le nœud suivant :" - other: "Concerne les %{count} nœuds suivants :" - has_relations: - one: "Concerne la relation suivante :" - other: "Concerne les %{count} relations suivantes :" - has_ways: - one: "Concerne le chemin suivant :" - other: "Concerne les %{count} chemins suivants :" - no_bounding_box: Aucun cadre de délimitation n’a été stocké pour ce groupe de modifications. - show_area_box: Montrer le cadre de la zone - common_details: - changeset_comment: "Commentaire :" - deleted_at: "Supprimé à :" - deleted_by: "Supprimé par :" - edited_at: "Modifié le :" - edited_by: "Modifié par :" - in_changeset: "Dans le groupe de modifications :" - version: "Version :" + node: Nœuds (%{count}) + node_paginated: Nœuds (%{x} à %{y} sur %{count}) + osmchangexml: XML osmChange + relation: Relations (%{count}) + relation_paginated: Relations (%{x} à %{y} sur %{count}) + title: "Groupe de modifications : %{id}" + way: Chemins (%{count}) + way_paginated: Chemins (%{x} à %{y} sur %{count}) + closed: Fermé + closed_by_html: Fermé il y a %{time} par %{user} + closed_html: Fermé il y a %{time} containing_relation: entry: Relation %{relation_name} entry_role: Relation %{relation_name} (en tant que %{relation_role}) - map: - deleted: Effacé - edit: - area: Modifier la zone - node: Modifier le nœud - relation: Modifier la relation - way: Modifier le chemin - larger: - area: Voir la zone dans une carte plus grande - node: Voir le nœud dans une carte plus grande - relation: Voir la relation sur une carte plus grande - way: Voir le chemin sur une carte plus grande - loading: Chargement... - navigation: - all: - next_changeset_tooltip: Groupe de modifications suivant - next_node_tooltip: Nœud suivant - next_relation_tooltip: Relation suivante - next_way_tooltip: Chemin suivant - prev_changeset_tooltip: Groupe de modifications précédent - prev_node_tooltip: Nœud précédent - prev_relation_tooltip: Relation précédente - prev_way_tooltip: Chemin précédent - user: - name_changeset_tooltip: Voir les modifications par %{user} - next_changeset_tooltip: Modifications suivantes par %{user} - prev_changeset_tooltip: Modifications précédentes par %{user} + created: Créé + created_by_html: Créé il y a %{time} par %{user} + created_html: Créé il y a %{time} + deleted_by_html: Supprimé il y a %{time} par %{user} + download_xml: Télécharger le XML + edited_by_html: Modifié il y a %{time} par %{user} + in_changeset: Groupe de modifications + location: "Emplacement :" + no_comment: (sans commentaire) node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Télécharger en XML - edit: modifier - node: Nœud - node_title: "Nœud : %{node_name}" - view_history: afficher l’historique - node_details: - coordinates: "Coordonnées :" - part_of: "Faisant partie de :" - node_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Télécharger en XML - node_history: Historique du nœud - node_history_title: "Historique du nœud : %{node_name}" - view_details: voir les détails + history_title: "Historique du nœud : %{name}" + title: "Nœud : %{name}" not_found: - sorry: Désolé, l’objet de type %{type} avec l’identifiant %{id} n’a pas pu être trouvé. + sorry: "Désolé, %{type} #%{id} n’a pas pu être trouvé." type: changeset: groupe de modifications node: nœud relation: relation way: chemin - paging_nav: - of: de - showing_page: Page en cours + note: + closed_by: Résolu par %{user} il y a %{when} + closed_by_anonymous: Résolu par un utilisateur anonyme il y a %{when} + closed_title: Note résolue nº %{note_name} + commented_by: Commenté par %{user} il y a %{when} + commented_by_anonymous: Commenté par un utilisateur anonyme il y a %{when} + hidden_by: Masqué par %{user} il y a %{when} + hidden_title: Note masquée nº %{note_name} + new_note: Nouvelle note + open_by: Créé par %{user} il y a %{when} + open_by_anonymous: Créé par un utilisateur anonyme il y a %{when} + open_title: Note non résolue nº %{note_name} + reopened_by: Réactivé par %{user} il y a %{when} + reopened_by_anonymous: Réactivé par un utilisateur anonyme il y a %{when} + title: "Note : %{id}" + part_of: Partie de redacted: - message_html: La version %{version} de ce %{type} ne peut être affiché t'el qu'il(elle) a été rédigé(e). Veuillez consulter %{redaction_link} pour plus d'informations. - redaction: Rédaction %{id} + message_html: La version %{version} de ce(tte) %{type} ne peut être affichée car elle a été masquée. Veuillez consulter %{redaction_link} pour plus d’informations. + redaction: Masquage %{id} type: node: nœud relation: relation - way: route + way: chemin relation: - download: "%{download_xml_link} ou %{view_history_link}" - download_xml: Télécharger en XML - relation: Relation - relation_title: "Relation : %{relation_name}" - view_history: afficher l’historique - relation_details: - members: "Membres :" - part_of: "Faisant partie de :" - relation_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Télécharger en XML - relation_history: Historique de la relation - relation_history_title: "Historique de la relation : %{relation_name}" - view_details: afficher les détails + history_title: "Historique de la relation : %{name}" + members: Membres + title: "Relation : %{name}" relation_member: entry_role: "%{type} %{name} avec le rôle %{role}" type: node: Nœud relation: Relation way: Chemin - start: - manually_select: Sélectionner manuellement une zone différente - view_data: Voir les données sur la carte actuelle start_rjs: - data_frame_title: Données - data_layer_name: Parcourir les données de la carte - details: Détails - drag_a_box: Cliquez et tirez un cadre sur la carte pour sélectionner une zone - edited_by_user_at_timestamp: Modifié par [[user]] le [[timestamp]] - hide_areas: Masquer les zones - history_for_feature: Historique pour [[feature]] + feature_warning: Le chargement de %{num_features} caractéristiques pourrait rendre votre navigateur lent ou il pourrait ne plus répondre. Êtes-vous sûr de vouloir afficher ces données ? load_data: Charger les données - loaded_an_area_with_num_features: "Vous avez chargé une zone qui contient [[num_features]] éléments. En général, certains navigateurs ne supportent pas bien l’affichage de tant de données et travaillent mieux lorsqu’ils affichent moins de 100 objets à la fois : procéder autrement pourrait rendre votre navigateur lent ou non fonctionnel. Si vous êtes sûr de vouloir afficher ces données, vous pouvez le faire en appuyant sur le bouton ci-dessous." loading: Chargement... - manually_select: Sélectionner manuellement une zone différente - object_list: - api: Obtenir cette zone depuis l’API - back: Afficher la liste d’objets - details: Détails - heading: Liste d’objets - history: - type: - node: Nœud [[id]] - way: Chemin [[id]] - selected: - type: - node: Nœud [[id]] - way: Chemin [[id]] - type: - node: Nœud - way: Chemin - private_user: utilisateur privé - show_areas: Afficher les zones - show_history: Afficher l’historique - unable_to_load_size: "Impossible de charger les données : le cadre de délimitation d’une taille de [[bbox_size]] est trop grand (il doit être inférieur à %{max_bbox_size})" - wait: Patientez... - zoom_or_select: Zoomer ou sélectionner une zone de la carte pour la visualiser tag_details: - tags: "Balises :" + tags: Attributs wiki_link: - key: La description de la balise %{key} sur le wiki - tag: La description de la balise %{key}=%{value} sur le wiki + key: La description de l’attribut %{key} sur le wiki + tag: La description de l’attribut %{key}=%{value} sur le wiki wikipedia_link: L’article « %{page} » sur Wikipédia timeout: - sorry: Désolé, les données pour le type %{type} avec l'id %{id} prennent trop de temps à être récupérées. + sorry: Désolé, les données pour le type %{type} avec l’id %{id} prennent trop de temps à être récupérées. type: changeset: groupe de modifications node: nœud relation: relation way: chemin + version: Version + view_details: Afficher les détails + view_history: Afficher l’historique way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Télécharger en XML - edit: modifier - view_history: afficher l’historique - way: Chemin - way_title: "Chemin : %{way_name}" - way_details: also_part_of: - one: faisant aussi partie du chemin %{related_ways} - other: faisant aussi partie des chemins %{related_ways} - nodes: "Nœuds :" - part_of: "Faisant partie de :" - way_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Télécharger en XML - view_details: afficher les détails - way_history: Historique du chemin - way_history_title: "Historique du chemin : %{way_name}" + one: partie du chemin %{related_ways} + other: partie des chemins %{related_ways} + history_title: "Historique du chemin : %{name}" + nodes: Nœuds + title: "Chemin : %{name}" changeset: changeset: anonymous: Anonyme - big_area: (grand) - no_comment: (aucun) no_edits: (aucune modification) - show_area_box: montrer le cadre de la zone - still_editing: (en cours de modification) view_changeset_details: Afficher les détails du groupe de modifications changeset_paging_nav: - next: Suivants » - previous: « Précédents - showing_page: Affichage de la page %{page} + next: Suivant » + previous: « Précédent + showing_page: Page %{page} changesets: area: Zone comment: Commentaire id: Identifiant - saved_at: Sauvegardé à + saved_at: Enregistré le user: Utilisateur list: - description: Modifications récentes - description_bbox: Groupes de modifications dans %{bbox} - description_friend: Groupes de modifications par vos amis - description_nearby: Groupes de modifications par les utilisateurs à proximité - description_user: Groupes de modifications par %{user} - description_user_bbox: Groupes de modifications par %{user} dans %{bbox} - heading: Groupes de modifications - heading_bbox: Groupes de modifications - heading_friend: Groupes de modifications - heading_nearby: Groupes de modifications - heading_user: Groupes de modifications - heading_user_bbox: Groupes de modifications + empty: Aucun groupe de modifications trouvé. + empty_area: Aucun groupe de modifications dans cette zone. + empty_user: Aucun groupe de modifications par cet utilisateur. + load_more: Charger plus + no_more: Aucun autre groupe de modifications trouvé. + no_more_area: Aucun autre groupe de modifications dans cette zone. + no_more_user: Aucun autre groupe de modifications par cet utilisateur. title: Groupes de modifications - title_bbox: Groupes de modifications dans %{bbox} title_friend: Groupes de modifications par vos amis - title_nearby: Groupes de modifications des utilisateurs à proximité + title_nearby: Groupes de modifications par des utilisateurs à proximité title_user: Groupes de modifications par %{user} - title_user_bbox: Groupes de modifications par %{user} dans %{bbox} timeout: sorry: Désolé, la liste des groupes de modifications que vous avez demandée met trop de temps pour être récupérée. diary_entry: @@ -343,8 +269,9 @@ fr: hide_link: Masquer ce commentaire diary_entry: comment_count: - one: 1 commentaire + one: "%{count} commentaire" other: "%{count} commentaires" + zero: Aucun commentaire comment_link: Commenter cette entrée confirm: Confirmer edit_link: Modifier cette entrée @@ -357,29 +284,29 @@ fr: latitude: "Latitude :" location: "Lieu :" longitude: "Longitude :" - marker_text: Emplacement de l'entrée du journal - save_button: Sauvegarder + marker_text: Emplacement de l’entrée du journal + save_button: Enregistrer subject: "Objet :" title: Modifier l’entrée du journal - use_map_link: Utiliser la carte + use_map_link: utiliser la carte feed: all: - description: Entrées récentes du journal des utilisateurs d'OpenStreetMap - title: Entrées du journal d'OpenStreetMap + description: Entrées récentes du journal des utilisateurs d’OpenStreetMap + title: Entrées du journal d’OpenStreetMap language: - description: Entrées récentes du journal des utilisateurs d'OpenStreetMap en %{language_name} - title: Entrées du journal d'OpenStreetMap en %{language_name} + description: Entrées récentes du journal des utilisateurs d’OpenStreetMap en %{language_name} + title: Entrées du journal d’OpenStreetMap en %{language_name} user: - description: Entrées récentes du journal d'OpenStreetMap pour %{user} - title: Entrées du journal d'OpenStreetMap pour %{user} + description: Entrées récentes du journal d’OpenStreetMap pour %{user} + title: Entrées du journal d’OpenStreetMap pour %{user} list: in_language_title: Entrées du journal en %{language} new: Nouvelle entrée du journal - new_title: Ajouter une nouvelle entrée dans votre journal + new_title: Écrire une nouvelle entrée dans votre journal newer_entries: Entrées plus récentes no_entries: Aucune entrée dans votre journal older_entries: Entrées plus anciennes - recent_entries: "Entrées récentes du journal :" + recent_entries: "Entrées récentes du journal:" title: Journaux des utilisateurs title_friends: Journaux des amis title_nearby: Journaux des utilisateurs à proximité @@ -391,18 +318,21 @@ fr: new: title: Nouvelle entrée du journal no_such_entry: - body: Desolé, il n'y a aucune entrée dans le journal ou commentaires avec l'id %{id}. Veuillez vérifier l'orthographe, ou le lien que vous avez cliqué n'est pas valide. - heading: "Aucune entrée avec l'id : %{id}" - title: Aucune entrée du journal n'a été trouvé + body: Desolé, il n’y a aucune entrée dans le journal ni aucun commentaire avec l’id %{id}. Veuillez vérifier votre orthographe ou la validité du lien que vous avez cliqué. + heading: "Aucune entrée avec l’id : %{id}" + title: Aucune entrée du journal n’a été trouvée view: - leave_a_comment: Ajouter un commentaire - login: Connectez-vous - login_to_leave_a_comment: "%{login_link} pour ajouter un commentaire" + leave_a_comment: Laisser un commentaire + login: Utilisateur + login_to_leave_a_comment: "%{login_link} pour laisser un commentaire" save_button: Enregistrer title: Journal de %{user} | %{title} user_title: Journal de %{user} editor: default: Par défaut (actuellement %{name}) + id: + description: iD (éditeur intégré au navigateur) + name: iD potlatch: description: Potlatch 1 (éditeur intégré au navigateur) name: Potlatch 1 @@ -418,10 +348,10 @@ fr: area_to_export: Zone à exporter embeddable_html: HTML incorporable. export_button: Exporter - export_details: Les données d’OpenStreetMap sont publiées sous licence Creative Commons paternité – partage à l’identique 2.0. + export_details: Les données d’OpenStreetMap sont publiées sous la licence Open Data Commons ­– Base de données Ouverte (ODbL). format: Format format_to_export: Format à exporter - image_size: Taille de l'image + image_size: Taille de l’image latitude: "Lat :" licence: Licence longitude: "Lon :" @@ -429,34 +359,51 @@ fr: map_image: Image de carte (affiche un calque normal) max: max options: Options - osm_xml_data: Données XML d'OpenStreetMap + osm_xml_data: Données XML d’OpenStreetMap output: Sortie - paste_html: Collez le code HTML pour incorporer dans un site web. + paste_html: Copier le code HTML à intégrer dans un site web scale: Échelle too_large: - body: Cette zone est trop vaste pour être exportée comme données XML OpenStreetMap. Veuillez zoomer ou sélectionner une zone plus petite. - heading: Zone trop grande + advice: "Si l’export ci-dessus échoue, veuillez envisager l’utilisation d’une des sources listées ci-dessous :" + body: "Cette zone est trop vaste pour être exportée comme données XML OpenStreetMap. Veuillez zoomer ou sélectionner une zone plus petite, ou utiliser une des sources suivantes pour le téléchargement de données massives :" + geofabrik: + description: Extractions régulièrement mises à jour de continents, pays et villes sélectionnées + title: Téléchargements de Geofabrik + metro: + description: Extractions des principales villes du monde et de leurs environs + title: Extractions de Metro + other: + description: Sources supplémentaires listées dans le wiki de OpenStreetMap + title: Autres sources + overpass: + description: Télécharger ce cadre englobant depuis un miroir de la base de données de OpenStreetMap + title: API passerelle + planet: + description: Copies régulièrement mises à jour de la base de données complète de OpenStreetMap + title: Planète OSM zoom: Zoom - start_rjs: - add_marker: Ajouter un marqueur à la carte - change_marker: Modifier la position du marqueur - click_add_marker: Cliquer sur la carte pour ajouter un marqueur - drag_a_box: Dessiner un cadre sur la carte pour sélectionner une zone - export: Exporter - manually_select: Sélectionner manuellement une zone différente - view_larger_map: Voir une carte plus grande + title: Exporter + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Cliquez simplement sur ou cette même icône sur l’affichage de la carte.\nCela ajoutera un marqueur à la carte, que vous pourrez déplacer en le tirant. Ajoutez votre message, puis cliquez sur enregistrer, et d’autres cartographes l’investigueront." + join_the_community: + explanation_html: "Si vous avez remarqué un problème avec nos données de carte, par exemple une route manquante ou votre adresse, le meilleur moyen de\nfaire est de rejoindre la communauté OpenStreetMap et d’ajouter ou réparer les données vous-même." + title: Rejoindre la communauté + title: Comment aider + other_concerns: + 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\npage d e droit d’auteur pour des informations plus légales, ou contacter le \ngroupe de travail OSMF approprié." + title: Autres préoccupations + title: Signaler un problème / Corriger la carte geocoder: description: title: geonames: Localisation depuis GeoNames - osm_namefinder: "%{types} depuis OpenStreetMap Namefinder" osm_nominatim: Localisation depuis OpenStreetMap Nominatim types: cities: Villes - places: Places + places: Lieux towns: Villages - description_osm_namefinder: - prefix: "%{distance} %{direction} de %{type}" direction: east: est north: nord @@ -469,24 +416,34 @@ fr: distance: one: environ 1 km other: environ %{count} km - zero: moins de 1 km + zero: moins d’1 km results: more_results: Plus de résultats - no_results: Aucun résultat n'a été trouvé + no_results: Aucun résultat n’a été trouvé search: title: ca_postcode: Résultats depuis Geocoder.CA geonames: Résultats depuis GeoNames + geonames_reverse: Résultats de GeoNames latlon: Résultats internes - osm_namefinder: Résultats depuis OpenStreetMap Namefinder osm_nominatim: Résultats de OpenStreetMap Nominatim + osm_nominatim_reverse: Résultats de OpenStreetMap Nominatim uk_postcode: Résultats depuis NPEMap / FreeThe Postcode us_postcode: Résultats depuis Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: + admin_levels: + level10: Frontière de quartier + level2: Frontière du pays + level4: Frontière d’État / de province + level5: Frontière de région + level6: Frontière de comté + level8: Frontière de ville + level9: Frontière de village prefix: + aerialway: + chair_lift: Télésiège + drag_lift: Téléski + station: Gare de télécabine aeroway: aerodrome: Aérodrome apron: Tablier @@ -521,7 +478,7 @@ fr: cinema: Cinéma clinic: Clinique club: Club - college: Établissement d'enseignement supérieur + college: Établissement d’enseignement supérieur community_centre: Salle polyvalente courthouse: Palais de justice crematorium: Crématorium @@ -531,30 +488,30 @@ fr: drinking_water: Eau potable driving_school: École de conduite embassy: Ambassade - emergency_phone: Téléphone d'urgence + emergency_phone: Borne d’appel d’urgence fast_food: Restauration rapide ferry_terminal: Terminal de ferry - fire_hydrant: Bouche d'incendie + fire_hydrant: Bouche d’incendie fire_station: Caserne des pompiers food_court: Aire de restauration fountain: Fontaine fuel: Carburant grave_yard: Cimetière - gym: Fitness /gymnastique + gym: Fitness / gymnastique hall: Salle - health_centre: Centre de santé + health_centre: Centre de santé / dispensaire hospital: Hôpital hotel: Hôtel hunting_stand: Stand de tir ice_cream: Crème glacée - kindergarten: Jardin d'enfant + kindergarten: Jardin d’enfant library: Bibliothèque market: Marché marketplace: Place de marché mountain_rescue: Secours en montagne nightclub: Boîte de nuit nursery: Nurserie - nursing_home: Maison de santé + nursing_home: Soins infirmiers office: Bureau park: Parc parking: Parking @@ -568,18 +525,19 @@ fr: pub: Bar public_building: Bâtiment public public_market: Marché public - reception_area: Zone de réception + reception_area: Zone de livraison recycling: Point de recyclage restaurant: Restaurant retirement_home: Maison de retraite sauna: Sauna school: École shelter: Refuge - shop: Magasin + shop: Boutique shopping: Commerce shower: Douche social_centre: Centre social social_club: Club social + social_facility: Service social studio: Studio supermarket: Supermarché swimming_pool: Piscine @@ -587,12 +545,12 @@ fr: telephone: Téléphone public theatre: Théâtre toilets: Toilettes - townhall: Hôtel de ville + townhall: Hôtel de ville / mairie university: Université vending_machine: Distributeur automatique veterinary: Chirurgie vétérinaire - village_hall: Salle communale - waste_basket: Corbeille + village_hall: Salle municipale + waste_basket: Poubelle wifi: Accès WiFi youth_centre: Centre pour la jeunesse boundary: @@ -608,42 +566,47 @@ fr: "yes": Pont building: "yes": Bâtiment + emergency: + fire_hydrant: Bouche d’incendie + phone: Borne d’appel d’urgence highway: bridleway: Chemin pour cavaliers - bus_guideway: Voie de bus guidée + bus_guideway: Voie de bus guidé / trolley bus_stop: Arrêt de bus byway: Route secondaire construction: Autoroute en construction cycleway: Piste cyclable - emergency_access_point: Point d'accès d'urgence + emergency_access_point: Point d’accès d’urgence footway: Chemin piéton ford: Gué living_street: Rue en zone de rencontre milestone: Borne kilométrique minor: Route mineure motorway: Autoroute - motorway_junction: Jonction d'autoroute - motorway_link: Route autoroutière + motorway_junction: Jonction d’autoroute + motorway_link: Voie autoroutière path: Chemin pedestrian: Chemin piéton platform: Plateforme primary: Route principale primary_link: Route principale + proposed: Projet de route raceway: Circuit residential: Rue résidentielle rest_area: Aire de repos road: Route secondary: Route secondaire secondary_link: Route secondaire - service: Route de service + service: Voie de service services: Services autoroutiers speed_camera: Radar de vitesse steps: Escalier stile: Échalier + street_lamp: Lampadaire tertiary: Route tertiaire tertiary_link: Route tertiaire track: Piste - trail: Piste + trail: Sentier trunk: Voie express trunk_link: Voie express unclassified: Route mineure @@ -655,6 +618,7 @@ fr: building: Bâtiment castle: Château church: Église + citywalls: Remparts fort: Fort house: Maison icon: Icône @@ -664,28 +628,29 @@ fr: monument: Monument museum: Musée ruins: Ruines + tomb: Tombeau tower: Tour - wayside_cross: Croix de chemin + wayside_cross: Calvaire wayside_shrine: Oratoire wreck: Épave landuse: allotments: Jardins familiaux basin: Bassin - brownfield: Terrain rasé + brownfield: Friche industrielle cemetery: Cimetière commercial: Zone tertiaire - conservation: Zone protégée + conservation: Zone préservée construction: Construction - farm: Zone agricole - farmland: Terrains agricoles - farmyard: Bâtiments de ferme + farm: Ferme + farmland: Terres agricoles + farmyard: Corps de ferme forest: Forêt garages: Garages - grass: Herbe - greenfield: Zone de construction future + grass: Pelouse + greenfield: Terrain vierge industrial: Zone industrielle landfill: Décharge - meadow: Prairie + meadow: Prairie / bocage military: Zone militaire mine: Mine nature_reserve: Réserve naturelle @@ -700,7 +665,7 @@ fr: residential: Zone résidentielle retail: Zone commerciale road: Zone routière - village_green: Zone publique herborée + village_green: Espace vert public vineyard: Vignoble wetland: Zone humide wood: Bois @@ -728,9 +693,11 @@ fr: track: Piste water_park: Parc aquatique military: - airfield: Terrain d'aviation militaire + airfield: Terrain d’aviation militaire barracks: Caserne bunker: Bunker + mountain_pass: + "yes": Col de montagne natural: bay: Baie beach: Plage @@ -775,14 +742,14 @@ fr: office: accountant: Comptable architect: Architecte - company: Société - employment_agency: Agence pour l'emploi + company: Entreprise + employment_agency: Agence pour l’emploi estate_agent: Agent immobilier government: Agence gouvernementale - insurance: Bureau d'assurance + insurance: Agence d’assurance lawyer: Avocat - ngo: Bureau d'une ONG - telecommunication: Bureaux de télécommunication + ngo: Agence d’une ONG + telecommunication: Agence de télécommunication travel_agent: Agence de voyage "yes": Bureau place: @@ -800,6 +767,7 @@ fr: locality: Localité moor: Maure municipality: Municipalité + neighbourhood: Quartier postcode: Code postal region: Région sea: Mer @@ -807,7 +775,7 @@ fr: subdivision: Subdivision suburb: Quartier town: Ville - unincorporated_area: Lieu non organisé + unincorporated_area: Territoire non organisé village: Village railway: abandoned: Voie ferrée abandonnée @@ -819,14 +787,16 @@ fr: historic_station: Arrêt de train historique junction: Jonction ferroviaire level_crossing: Passage à niveau - light_rail: Petite voie ferrée + light_rail: Voie ferrée légère miniature: Voie ferrée miniature monorail: Monorail - narrow_gauge: Chemin de fer à voie étroite + narrow_gauge: Voie ferrée étroite platform: Plateforme ferroviaire preserved: Voie ferrée conservée - spur: Voie de connexion + proposed: Voie ferrée en projet + spur: Embranchement ferroviaire station: Gare ferroviaire + stop: Arrêt de chemin de fer subway: Station de métro subway_entrance: Bouche de métro switch: Aiguillage @@ -834,40 +804,42 @@ fr: tram_stop: Arrêt de tram yard: Voie de triage shop: - alcohol: Magasin officiel d'alcool + alcohol: Vendeur d’alcool à emporter / caviste antiques: Antiquaire - art: Boutique d'art + art: Boutique d’art bakery: Boulangerie beauty: Magasin de produits de beauté beverages: Magasin de boissons bicycle: Magasin de vélos books: Librairie - butcher: Boucher - car: Magasin de voitures - car_parts: Pièces d'automobile - car_repair: Réparation de voitures + boutique: Boutique + butcher: Boucherie + car: Concession automobile + car_parts: Pièces d’automobile + car_repair: Garage de réparation automobile carpet: Magasin de tapis - charity: Magasin de bienfaisance - chemist: Magasin de produits d'hygiène - clothes: Magasin de vêtements - computer: Magasin informatique + charity: Boutique humanitaire + chemist: Droguerie + clothes: Boutique de vêtements + computer: Boutique informatique confectionery: Confiserie convenience: Épicerie - copyshop: Magasin de photocopies - cosmetics: Magasin de cosmétiques + copyshop: Boutique de photocopies + cosmetics: Boutique de cosmétiques + deli: Traiteur department_store: Grand magasin discount: Magasin discount doityourself: Magasin de bricolage - dry_cleaning: Nettoyage à sec - electronics: Magasin d'électronique + dry_cleaning: Pressing de nettoyage à sec + electronics: Boutique de produits électroniques estate_agent: Agent immobilier farm: Magasin de produits agricoles - fashion: Magasin de mode + fashion: Boutique de mode fish: Poissonnerie florist: Fleuriste - food: Magasin d'alimentation + food: Magasin d’alimentation funeral_directors: Pompes funèbres - furniture: Ameublement + furniture: Magasin de meubles gallery: Galerie garden_centre: Jardinerie general: Magasin généraliste @@ -883,25 +855,29 @@ fr: laundry: Blanchisserie mall: Galerie marchande market: Marché - mobile_phone: Magasin de téléphones mobiles - motorcycle: Magasin de moto - music: Magasin de musique - newsagent: Marchand de journaux + mobile_phone: Boutique de téléphones mobiles + motorcycle: Magasin de motos + music: Boutique de musique / disquaire + newsagent: Marchand de journaux / maison de la presse optician: Opticien - organic: Magasin bio - outdoor: Magasin d'activités de plein air - pet: Magasin d'animaux - photo: Magasin de photographie - salon: Salon + organic: Magasin d’alimentation bio + outdoor: Magasin d’articles pour activité en plein air + pet: Animalerie + pharmacy: Pharmacie + photo: Boutique de photographie + salon: Salon de beauté + second_hand: Boutique de produits d’occasion shoes: Magasin de chaussures shopping_centre: Centre commercial - sports: Magasin de sport + sports: Magasin de d’articles de sport stationery: Papeterie supermarket: Supermarché + tailor: Tailleur toys: Magasin de jouets travel_agency: Agence de voyage video: Magasin de vidéos - wine: Caviste + wine: Vendeur d’alcool à emporter / caviste + "yes": Boutique tourism: alpine_hut: Refuge artwork: Œuvre d’art @@ -915,128 +891,203 @@ fr: hostel: Auberge hotel: Hôtel information: Informations - lean_to: Stand + lean_to: Abri ouvert motel: Motel museum: Musée - picnic_site: Site de pique-nique + picnic_site: Aire de pique-nique theme_park: Parc à thème valley: Vallée viewpoint: Point de vue zoo: Zoo tunnel: + culvert: Ponceau "yes": Tunnel waterway: - artificial: Cours d'eau artificiel + artificial: Cours d’eau artificiel boatyard: Chantier naval canal: Canal - connector: Connexion hydrographique + connector: Canal de connexion dam: Digue derelict_canal: Canal de délaissement ditch: Fossé dock: Dock drain: Drain lock: Écluse - lock_gate: Porte d'écluse - mineral_spring: Source d'eau minérale + lock_gate: Porte d’écluse + mineral_spring: Source d’eau minérale mooring: Mouillage rapids: Rapides river: Rivière riverbank: Lit de rivière stream: Ruisseau wadi: Oued - water_point: Point d'eau - waterfall: Chute d'eau + water_point: Point d’eau + waterfall: Chute d’eau weir: Barrage + help_page: + help: + description: Poser une question ou chercher des réponses sur le site questions-et-réponses de OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap a plusieurs ressources pour apprendre le projet, pour poser et répondre à des questions, et pour discuter en collaboration avec d’autres et documenter les sujets de cartographie. + title: Obtenir de l’aide + welcome: + description: Commencer avec ce guide rapide couvrant les bases de OpenStreetMap. + title: Bienvenue à OSM + url: /welcome + wiki: + description: Parcourez le wiki pour la documentation approfondie d’OSM + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Fermer + edit_help: Déplacez la carte et zoomer sur un emplacement que vous voulez modifier, puis cliquez là. + key: + title: Légende + tooltip: Légende + tooltip_disabled: La légende n’est disponible que pour la couche standard map: base: cycle_map: Carte cyclable + hot: Humanitaire mapquest: MapQuest ouverte standard: Standard transport_map: Carte de transport + copyright: © Contributeurs de OpenStreetMap + donate_link_text: + layers: + data: Données de carte + header: Couches de carte + notes: Notes de carte + overlays: Autoriser les superpositions pour réparer la carte + title: Couches + locate: + popup: Vous êtes à {distance} {unit} de ce point + title: Afficher mon emplacement + zoom: + in: Vue rapprochée + out: Vue éloignée + notes: + new: + add: Ajouter une note + intro: "Vous pouvez signaler une erreur sur la carte ou proposer l'ajout d'un élément qui n'y est pas encore présent. Un membre de la communauté OpenStreetMap lira votre message et prendra soin de la correction ou de l'ajout.\nVeuillez donc être aussi descriptif et précis que possible et placez le marqueur à sa position exacte." + show: + anonymous_warning: Cette note comprend des commentaires d’utilisateurs anonymes, qui devraient être vérifiés de façon indépendante. + comment: Commentaire + comment_and_resolve: Commenter et résoudre + hide: Masquer + reactivate: Réactiver + resolve: Résoudre + share: + cancel: Annuler + center_marker: Centrer la carte sur le marqueur + custom_dimensions: Définir les dimensions personnalisées + download: Télécharger + embed: HTML + format: "Format :" + image: Image + image_size: L’image affichera la couche standard en + include_marker: Inclure le marqueur + link: Lien ou HTML + long_link: Lien + paste_html: Coller le HTML à inclure dans le site web + scale: "Échelle :" + short_link: Lien abrégé + short_url: URL courte + title: Partager + view_larger_map: Afficher une carte plus grande site: + createnote_disabled_tooltip: Zoomer pour ajouter une note sur la carte + createnote_tooltip: Suggérer une amélioration de la carte edit_disabled_tooltip: Zoomez en avant pour modifier la carte edit_tooltip: Modifier la carte - edit_zoom_alert: Vous devez zoomer pour modifier la carte - history_disabled_tooltip: Zoomez en avant pour voir les modifications dans cette zone - history_tooltip: Voir les modifications dans cette zone - history_zoom_alert: Vous devez zoomer pour voir l’historique des modifications + map_data_zoom_in_tooltip: Zoomez pour lire voir les données sur la carte + map_notes_zoom_in_tooltip: Zoomez pour lire les notes sur la carte layouts: + about: À propos community: Communauté - community_blogs: Blogs de la communauté - community_blogs_title: Blogs de membres de la communauté OpenStreetMap - copyright: Copyright & Licence - documentation: Documentation - documentation_title: Documentation du projet - donate: Soutenez OpenStreetMap, %{link} au fond pour améliorer le matériel. - donate_link_text: participez + community_blogs: Blogues de la communauté + community_blogs_title: Blogues de membres de la communauté OpenStreetMap + copyright: Droits d’auteur + data: Données + donate: Soutenez OpenStreetMap, %{link} au fonds de mise à niveau du matériel. edit: Modifier edit_with: Modifier avec %{editor} export: Exporter - export_tooltip: Exporter les données de la carte + export_data: Exporter les données foundation: La Fondation foundation_title: La Fondation OpenStreetMap gps_traces: Traces GPS gps_traces_tooltip: Gérer les traces GPS help: Aide - help_centre: Centre d'aide - help_title: site d’aide pour le projet history: Historique - home: Chez moi - home_tooltip: Aller à l'emplacement de mon domicile - inbox: Boîte aux lettres (%{count}) - inbox_tooltip: - one: Votre boîte aux lettres contient 1 message non lu - other: Votre boîte aux lettres contient %{count} messages non lus - zero: Votre boîte aux lettres ne contient pas de messages non lus - intro_1: OpenStreetMap est une carte du monde entier librement modifiable, faite par des gens comme vous. - intro_2_create_account: Créer un compte d'utilisateur - intro_2_download: télécharger - intro_2_html: Les données sont libres pour être %{download} et %{use} sous sa %{license}. %{create_account} pour améliorer la carte. - intro_2_license: licence ouverte - intro_2_use: utiliser - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - title: Les données d’OpenStreetMap sont publiées sous licence Creative Commons paternité – partage à l’identique 2.0 générique. - log_in: Connexion + home: Aller à votre domicile + intro_2_create_account: Créez un compte d'utilisateur + 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. + learn_more: En savoir plus + log_in: Se connecter log_in_tooltip: Se connecter avec un compte existant logo: - alt_text: Logo d'OpenStreetMap - logout: Déconnexion - logout_tooltip: Se déconnecter + alt_text: Logo d’OpenStreetMap + logout: Se déconnecter make_a_donation: text: Faire un don title: Soutenez OpenStreetMap avec un don financier - osm_offline: La base de données de OpenStreetMap est actuellement hors ligne; une maintenance essentielle à son bon fonctionnement est en cours. - osm_read_only: La base de données de OpenStreetMap est actuellement en mode lecture seule ; une maintenance essentielle à son bon fonctionnement est en cours. + more: Plus + osm_offline: La base de données OpenStreetMap est actuellement hors ligne ; une maintenance essentielle à son bon fonctionnement est en cours. + osm_read_only: La base de données OpenStreetMap est actuellement en mode lecture seule ; une maintenance essentielle à son bon fonctionnement est en cours. partners_bytemark: Hébergement Bytemark partners_html: L'hébergement est pris en charge par %{ucl}, %{ic} et %{bytemark}, et d'autres %{partners}. - partners_ic: le Collège Impérial de Londres + partners_ic: le Collège impérial de Londres partners_partners: partenaires - partners_ucl: le VR Centre de l'UCL + partners_ucl: le Centre VR de l’UCL partners_url: http://wiki.openstreetmap.org/wiki/Partners - sign_up: S'inscrire + sign_up: Créer un compte sign_up_tooltip: Créer un compte pour la modification - sotm2011: Venez à la Conférence d'OpenStreetMap 2011, L’État de la Carte, du 9 au 11 septembre à Denver ! - tag_line: La carte coopérative libre + start_mapping: Commencer à cartographier + tag_line: La carte wiki libre du monde user_diaries: Journaux - user_diaries_tooltip: Voir les journaux d'utilisateurs - view: Voir - view_tooltip: Afficher la carte - welcome_user: Bienvenue, %{user_link} - welcome_user_link_tooltip: Votre page utilisateur - wiki: Wiki - wiki_title: site Wiki pour le projet + user_diaries_tooltip: Voir les journaux d’utilisateurs license_page: foreign: - english_link: original en anglais - text: En cas de conflit entre cette page et la page %{english_original_link}, la version anglaise prime + english_link: l’original en anglais + text: En cas de conflit entre la présente page traduite et %{english_original_link}, la version anglaise prévaudra title: À propos de cette traduction - legal_babble: "

    Copyright et licence

    \n

    \n OpenStreetMap est un ensemble de données ouvertes, disponibles sous la licence Creative Commons\n paternité – partage à l’identique 2.0 (CC BY-SA).\n

    \n

    \n Vous êtes libre de copier, distribuer, transmettre et adapter nos cartes\n et données, à condition que vous créditiez OpenStreetMap et ses\n contributeurs. Si vous modifiez ou utilisez nos cartes ou données dans d’autres œuvres dérivées, vous\n ne pouvez distribuer celles-ci que sous la même licence. Le\n texte\n légal complet détaille vos droits et responsabilités.\n

    \n\n

    Comment créditer OpenStreetMap

    \n

    \n Si vous utilisez les images d’OpenStreetMap, nous demandons que\n votre crédit comporte au moins la mention « © les contributeurs d’OpenStreetMap,\n CC BY-SA ». Si vous n’utilisez que les données des cartes,\n nous demandons « Données cartographiques © les contributeurs d’OpenStreetMap,\n CC BY-SA ».\n

    \n

    \n Là où cela est possible, OpenStreetMap doit être mentionné avec un lien hypertexte vers http://www.openstreetmap.org/\n et CC BY-SA vers http://creativecommons.org/licenses/by-sa/2.0/. Si\n vous utilisez un support qui ne permet pas de créer des liens hypertextes (par ex. un\n imprimé), nous suggérons que vous dirigiez vos lecteurs vers\n www.openstreetmap.org (en étendant éventuellement\n « OpenStreetMap » à cette adresse complète) et vers\n www.creativecommons.org.\n

    \n\n

    Pour trouver plus d’informations

    \n

    \n Si vous voulez obtenir plus d’informations sur la réutilisation de nos données, lisez la FAQ\n légale.\n

    \n

    \n Nous rappelons aux contributeurs d’OSM qu’ils ne doivent jamais ajouter de données provenant de\n sources protégées par le droit d’auteur (copyright) ou des droits voisins (par ex. Google Maps ou des cartes imprimées) sans\n autorisation explicite de la part des détenteurs des droits d’auteur.\n

    \n

    \n Bien qu’OpenStreetMap soit un ensemble de données ouvertes, nous ne pouvons pas fournir\n d’API cartographique libre de frais pour les développeurs tiers.\n\n Consultez nos règles d’utilisation de l’API, nos\n règles d’utilisation des tuiles graphiques\n et nos règles d’utilisation de Nominatim.\n

    \n\n

    Nos contributeurs

    \n

    \n Notre licence CC BY-SA nécessite que vous « donniez à l’auteur d’origine\n un crédit raisonnable selon les support et moyens que vous\n utilisez ». Les cartographes individuels d’OSM ne demandent pas\n d’autre crédit supplémentaire que « les contributeurs\n d’OpenStreetMap », mais lorsque des données venant d’une agence nationale\n de cartographie ou d’une autre source majeure ont été incluses dans\n OpenStreetMap, il peut être raisonnable de les créditer directement\n de la manière qu’ils demandent ou en établissant un lien vers cette page.\n

    \n\n\n
      \n
    • Australie : contient des données sur les quartiers\n basées sur les données de l’Australian Bureau of Statistics.
    • \n
    • Autriche: contient des données sur la\n Ville de Vienne (sous licence\n CC BY 3.0 Autriche),\n la région du Vorarlberg.
    • \n et Land Tirol (sous licence CC-BY AT avec amendements).\n
    • Canada : contient des données de\n GeoBase®, GeoGratis (© Département des Ressources\n naturelles du Canada), CanVec (© Département des Ressources\n naturelles du Canada) et StatCan (Division Géographie,\n Statistiques du Canada).
    • \n
    • France : contient des données de la\n Direction générale des impôts.
    • \n
    • Hollande: Contient © ET données, 2007\n (www.and.com)
    • \n
    • Nouvelle-Zélande : contient des données provenant du\n Land Information New Zealand. © Copyright de la Couronne réservé.
    • \n
    • Pologne : contient des données provenant des cartes UMP-pcPL. © Copyright\n les contributeurs de UMP-pcPL.\n \n En savoir davantage sur l’utilisation par OSM des données UMP
    • \n
    • Afrique du Sud :contient des données provenant du\n Chief Directorate:\n National Geo-Spatial Information, copyright de l’État réservé.
    • \n
    • Royaume-Uni : contient des données provenant des Ordnance\n Survey data. © Copyright de la Couronne et droits de base de données 2010.
    • \n
    \n\n

    \n L’inclusion de données dans OpenStreetMap n’implique pas que les\n fournisseurs d’origine du contenu approuvent OpenStreetMap, ni ne fournissent, ne garantissent ou\n n’acceptent quelque responsabilité que ce soit.\n

    " + legal_babble: + attribution_example: + alt: Exemple d'attribution OpenStreetMap sur une page internet + title: Exemple d'attribution + contributors_at_html: "Autriche: Contient des données sur\n la ville de Vienne (sous licence\n CC BY 3.0 Autriche),\n la région du Vorarlberg. et la région du Tyrol (sous licence CC-BY AT avec amendements)." + contributors_ca_html: "Canada : contient des données de\n GeoBase®, GeoGratis (© Département des Ressources\n naturelles du Canada), CanVec (© Département des Ressources\n naturelles du Canada) et StatCan (Division Géographie,\n Statistiques du Canada)." + 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 \nlicence NLSFI." + contributors_footer_1_html: "Pour plus de détails sur ceux-ci, et les autres sources utilisées pour aider à améliorer OpenStreetMap, voyez la page des Contributeurs sur le wiki de OpenStreetMap." + contributors_footer_2_html: "L’inclusion de données dans OpenStreetMap n’implique pas que les\n fournisseurs d’origine du contenu approuvent OpenStreetMap, ni ne fournissent, ne garantissent ou\n n’acceptent quelque responsabilité que ce soit." + contributors_fr_html: "France : contient des données de la\n Direction générale des impôts." + contributors_gb_html: "Royaume Uni: Contient des données de l'Institut Géographique National © Droits de la couronne et de la base de données 2010-12." + contributors_intro_html: "Nos collaborateurs sont des milliers de personnes. Nous incluons également \n ouvertement-données sous licence des agences nationales de cartographie \n et d'autres sources, parmi eux :" + contributors_nl_html: "Pays-Bas: Contient des données © AND, 2007\n(www.and.com)" + contributors_nz_html: "Nouvelle-Zélande : contient des données provenant du\n Land Information New Zealand. © Copyright de la Couronne réservé." + contributors_title_html: Nos contributeurs + contributors_za_html: "Afrique du Sud: Contient des données issues de\nDirection principale:\nInformation Géospatiale Nationale, tous droits de l'État réservés." + credit_1_html: Nous demandons que votre crédit comporte la mention « © les contributeurs d’OpenStreetMap ». + credit_2_html: "Vous devez également préciser clairement que les données sont disponibles sous la licence\n ODbL, et si vous utilisez les tuiles de notre carte, que la carte est sous\n la licence CC-BY-SA. Vous pouvez mentionner ceci avec un lien hypertexte vers\n cette page de mentions légales.\n Alternativement, et obligatoirement si vous distribuez OpenStreetMap sous\n forme de données brutes, vous pouvez directement nommer et fournir un lien vers la ou les licences.\n Sur les supports où les liens hypertexte sont impossibles (par exemple sur un support papier), nous vous suggérons\n de rediriger vos lecteurs vers le site openstreetmap.org (éventuellement en développant\n « OpenStreetMap » en l'adresse openstreetmap.org), vers opendatacommons.org, et,\n si c'est pertinent, vers creativecommons.org." + credit_3_html: "Pour une carte électronique navigable, le crédit devrait apparaître dans le coin de la carte.\nPar exemple:" + credit_title_html: Comment créditer OpenStreetMap + infringement_1_html: "Nous rappelons aux contributeurs d’OSM qu’ils ne doivent jamais ajouter de données provenant de\n sources protégées par le droit d’auteur (copyright) ou des droits voisins (par ex. Google Maps ou des cartes imprimées) sans\n autorisation explicite de la part des détenteurs des droits d’auteur." + infringement_2_html: Si vous pensez que des données ont été ajoutées à la base de données OpenStreetMap ou à ce site en violation des droits d'auteur, veuillez vous référer à notre procédure de retrait de données ou notifiez nous directement à travers notre formulaire en ligne. + infringement_title_html: Violation des droits d'auteur + intro_1_html: "OpenStreetMap est un ensemble de données ouvertes, disponibles sous la licence Open Data Commons Open Database License (ODbL)." + intro_2_html: Vous êtes libre de copier, distribuer, transmettre et adapter nos données, à condition que vous créditiez OpenStreetMap et ses contributeurs. Si vous modifiez ou utilisez nos données dans d’autres œuvres dérivées, vous ne pouvez distribuer celles-ci que sous la même licence. Le texte légal complet détaille vos droits et responsabilités. + intro_3_html: Nos carreaux de rendu cartographiques, ainsi que notre documentation, sont disponibles sous la licence Creative Commons paternité – partage à l’identique 2.0 (CC-BY-SA). + more_1_html: "Si vous voulez obtenir plus d’informations sur comment réutiliser nos données et nous créditer, lisez la FAQ\n légale." + more_2_html: "Bien qu'OpenStreetMap soit un ensemble de données libres et ouverte, nous ne pouvons pas fournir une API gratuite en libre accès pour les développeurs tiers.\nVeuillez vous référer à notre politique d'utilisation de l'API, à notre politique d'utilisation des tuiles, et à la politique d'utilisation de Nominatim." + more_title_html: Pour trouver plus d’informations + title_html: Droits d’auteur et licence native: mapping_link: commencer à contribuer - native_link: version française - text: Vous lisez la version anglaise de la page de copyright. Vous pouvez retourner à la %{native_link} de cette page ou arrêter de lire cette page et %{mapping_link}. + native_link: traduction française + text: Vous lisez la version anglaise originale de la page au sujet des droits d’auteur. Vous pouvez retourner à la %{native_link} de cette page ou arrêter de lire à son sujet et %{mapping_link}. title: À propos de cette page message: delete: @@ -1092,12 +1143,9 @@ fr: title: Boîte d'envoi to: À read: - back_to_inbox: Revenir à la boîte de réception - back_to_outbox: Revenir à la boîte d'envoi + back: Retour date: Date from: De - reading_your_messages: Lecture de vos messages - reading_your_sent_messages: Lecture de vos messages envoyés reply_button: Répondre subject: Objet title: Lire le message @@ -1108,6 +1156,37 @@ fr: 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. sent_message_summary: delete_button: Supprimer + note: + description: + closed_at_by_html: Résolu il y a %{when} par %{user} + closed_at_html: Résolu il y a %{when} + commented_at_by_html: Mise à jour il y a %{when} par %{user} + commented_at_html: Mis à jour il y a %{when} + opened_at_by_html: Créé il y a %{when} par %{user} + opened_at_html: Créé il y a %{when} + reopened_at_by_html: Réactivé il y a %{when} par %{user} + reopened_at_html: Réactivé il y a %{when} + entry: + comment: Commentaire + full: Note complète + mine: + ago_html: il y a %{when} + created_at: Créé le + creator: Créateur + description: Description + heading: Notes de %{user} + id: Id + last_changed: Dernière modification + subheading: Notes soumises ou commentées par %{user} + title: Notes soumises ou commentées par %{user} + rss: + closed: note fermée (près de %{place}) + commented: nouveau commentaire (près de %{place}) + description_area: Une liste de notes, reportées, commentées ou fermées dans votre zone [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Un fil rss pour la note %{id} + opened: nouvelle note (près de %{place}) + reopened: note réactivée (près de %{place}) + title: Notes OpenStreetMap notifier: diary_comment_notification: footer: Vous pouvez également lire le commentaire sur %{readurl}, commenter sur %{commenturl} ou répondre sur %{replyurl} @@ -1123,16 +1202,15 @@ fr: email_confirm_plain: click_the_link: Si vous êtes à l'origine de cette requête, cliquez sur le lien ci-dessous pour confirmer cette modification. greeting: Bonjour, - hopefully_you_1: Quelqu'un (problablement vous) voudrait changer son adresse de courriel de - hopefully_you_2: "%{server_url} à %{new_address}." + hopefully_you: Quelqu’un (vous avec un peu de chance) aimerait modifier son adresse de courriel sur %{server_url} en %{new_address}. friend_notification: befriend_them: "Vous pouvez également l'ajouter comme ami ici : %{befriendurl}." had_added_you: "%{user} vous a ajouté comme ami dans OpenStreetMap." see_their_profile: "Vous pouvez voir son profil ici : %{userurl}." subject: "[OpenStreetMap] %{user} vous a ajouté comme ami" gpx_notification: - and_no_tags: et sans balise. - and_the_tags: "et les balises suivantes :" + and_no_tags: et sans mot-clé. + and_the_tags: "et les mots-clés suivants :" failure: failed_to_import: "n'a pas pu être importé. Voici l'erreur :" more_info_1: Plus d'informations sur les erreurs lors de l'import GPX et comment les éviter @@ -1153,45 +1231,36 @@ fr: lost_password_plain: click_the_link: Si vous êtes à l'origine de cette requête, cliquez sur le lien ci-dessous pour réinitialiser votre mot de passe. greeting: Bonjour, - hopefully_you_1: Quelqu'un (problablement vous) a demandé de réinitialiser le mot de passe du - hopefully_you_2: compte openstreetmap.org avec cette adresse de courriel. + hopefully_you: Quelqu’un (peut-être vous) a demandé la réinitialisation du mot de passe du compte openstreetmap.org de cette adresse de courriel. message_notification: - footer1: Vous pouvez également lire le message sur %{readurl} - footer2: et vous pouvez répondre sur %{replyurl} + footer_html: Vous pouvez aussi lire le message à %{readurl} et vous pouvez y répondre à %{replyurl} header: "%{from_user} vous a envoyé un message depuis OpenStreetMap avec le sujet %{subject} :" hi: Bonjour %{to_user}, + note_comment_notification: + anonymous: Un utilisateur anonyme + closed: + commented_note: "%{commenter} a résolu une note de carte que vous avez commentée. La note est proche de %{place}." + subject_other: "[OpenStreetMap] %{commenter} a résolu une note à laquelle vous vous intéressez" + subject_own: "[OpenStreetMap] %{commenter} a résolu une de vos notes" + your_note: "%{commenter} a résolu une de vos notes de carte près de %{place}." + commented: + commented_note: "%{commenter} a laissé un commentaire sur une note de carte que vous avez commentée. La note est proche de %{place}." + subject_other: "[OpenStreetMap] %{commenter} a commenté une note à laquelle vous vous intéressez" + subject_own: "[OpenStreetMap] %{commenter} a commenté l’une de vos notes" + your_note: "%{commenter} a laissé un commentaire sur une de vos notes de carte près de %{place}." + details: Plus de détail sur la note peut être obtenu à %{url}. + greeting: Bonjour, + reopened: + commented_note: "%{commenter} a réactivé une note de carte que vous avez commentée. La note se trouve près de %{place}." + subject_other: "[OpenStreetMap] %{commenter} a réactivé une note à laquelle vous vous intéressez" + subject_own: "[OpenStreetMap] %{commenter} a réactivé une de vos notes" + your_note: "%{commenter} a réactivé une de vos notes de carte près de %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirmer votre adresse de courriel" - signup_confirm_html: - ask_questions: Vous pouvez poser toutes les questions que vous pourriez avoir à propos d’OpenStreetMap sur notre site de questions-réponses. - click_the_link: Si vous êtes à l'origine de cette action, bienvenue ! Cliquez sur le lien ci-dessous pour confirmer la création de compte et avoir plus d'informations sur OpenStreetMap - current_user: Une liste par catégories des utilisateurs actuels, basée sur leur position géographique, est disponible dans Category:Users_by_geographical_region. - get_reading: Informez-vous sur OpenStreetMap sur le wiki, restez au courant des dernières infos ''via'' le blogue OpenStreetMap ou Twitter, ou surfez sur le blogue OpenGeoData de Steve Coast, le fondateur d’OpenStreetMap pour un petit historique du projet, avec également des balados à écouter ! - greeting: Bonjour ! - hopefully_you: Quelqu'un (probablement vous) aimerait créer un compte sur - introductory_video: Vous pouvez visionner une %{introductory_video_link}. - more_videos: Il y a %{more_videos_link}. - more_videos_here: plus de vidéos ici - user_wiki_page: Nous vous conseillons de créer une page utilisateur sur le wiki, et d'y placer des marqueurs de catégories indiquant où vous êtes, tels que [[Category:Users_in_Paris]]. - video_to_openstreetmap: vidéo introductive à OpenStreetMap - wiki_signup: Vous pouvez également vous créer un compte sur le wiki d'OpenStreetMap. - signup_confirm_plain: - ask_questions: "Vous pouvez poser toutes les questions que vous pourriez avoir à propos d’OpenStreetMap sur notre site de questions-réponses :" - blog_and_twitter: "Restez au courant des dernières infos ''via'' le blogue OpenStreetMap ou Twitter :" - click_the_link_1: Si vous êtes à l'origine de cette requête, bienvenue ! Cliquez sur le lien ci-dessous pour confirmer votre - click_the_link_2: compte et obtenir plus d'informations à propos d'OpenStreetMap. - current_user_1: Une liste des utilisateurs actuels, basée sur leur localisation dans le monde, - current_user_2: "est disponible depuis :" - greeting: Salut ! - hopefully_you: Quelqu'un (probablement vous) aimerait créer un compte sur - introductory_video: "Vous pouvez visionner une vidéo introductive à OpenStreetMap ici :" - more_videos: "Davantage de vidéos sont disponibles ici :" - opengeodata: "OpenGeoData.org est le blogue de Steve Coast, le fondateur d’OpenStreetMap et il propose également des balados :" - the_wiki: "Lisez à propos d'OpenStreetMap sur le wiki :" - the_wiki_url: http://wiki.openstreetmap.org/wiki/FR:Beginners_Guide - user_wiki_1: Il est recommandé de créer une page utilisateur qui inclut - user_wiki_2: des catégories qui indiquent votre localisation, comme [[Category:Users_in_London]]. - wiki_signup: "Vous pouvez également vous créer un compte sur le wiki d'OpenStreetMap sur :" + 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 bien le cas, veuillez donc cliquer sur le lien ci-dessous ^pour confirmer votre compte:" + created: Quelqu'un (vous, avec un peu de chance) vient juste de créer un compte sur %{site_url}. + greeting: Bonjour! + subject: "[OpenStreetMap] Bienvenue dans OpenStreetMap" + welcome: Une fois que vous aurez confirmé votre compte, nous vous fournirons des informations supplémentaires pour démarrer. oauth: oauthorize: allow_read_gpx: lire vos traces GPS privées. @@ -1200,15 +1269,25 @@ fr: allow_write_api: modifier la carte. allow_write_diary: créez des entrées dans le journal, des commentaires et faites-vous des amis. allow_write_gpx: envoyer des traces GPS. + allow_write_notes: modifier les notes. allow_write_prefs: modifier vos préférences utilisateur. request_access: L'application %{app_name} demande l'accès à votre compte, %{user}. Vérifiez si vous désirez que l'application ait les possibilités suivantes. Vous pouvez en choisir autant ou aussi peu que vous voulez. + title: Autoriser l’accès à votre compte + oauthorize_failure: + denied: Vous avez refusé à l’application %{app_name} l’accès à votre compte. + invalid: Le jeton d’autorisation n’est pas valide. + title: La demande d’autorisation a échoué + oauthorize_success: + allowed: Vous avez accordé à l’application %{app_name} l’accès à votre compte. + title: La demande d’autorisation a été acceptée + verification: Le code de vérification est %{code}. revoke: flash: Vous avez révoqué le jeton pour %{application} oauth_clients: create: flash: Informations enregistrées avec succès destroy: - flash: Enregistrements de l'application clientes détruits + flash: Enregistrement de l'application cliente supprimé edit: submit: Modifier title: Modifier votre application @@ -1218,6 +1297,7 @@ fr: allow_write_api: modifier la carte. allow_write_diary: créez des entrées dans le journal, des commentaires et faites-vous des amis. allow_write_gpx: envoyer des traces GPS. + allow_write_notes: modifier les notes. allow_write_prefs: modifier ses préférences utilisateur. callback_url: URL de rappel name: Nom @@ -1248,6 +1328,7 @@ fr: allow_write_api: modifier la carte. allow_write_diary: créez des entrées dans le journal, des commentaires et faites-vous des amis. allow_write_gpx: envoi trace GPS. + allow_write_notes: modifier les notes. allow_write_prefs: modifier ses préférences utilisateur. authorize_url: "URL d'autorisation :" confirm: Êtes-vous sûr? @@ -1256,39 +1337,39 @@ fr: key: "Clé de l'utilisateur :" requests: "Demande des permission suivantes de l'utilisateur :" secret: "Secret de l'utilisateur :" - support_notice: Nous supportons hamc-sha1 (recommandé) et texte brut en mode ssl. + support_notice: Nous supportons les signatures HMAC-SHA1 (recommandé) et RSA-SHA1. title: Détails OAuth pour %{app_name} url: "URL du jeton de requête :" update: flash: Informations du client enregistrées avec succès redaction: create: - flash: Rédaction créée. + flash: Masquage créé. destroy: - error: Il y a eu une erreur en détruisant cette rédaction. - flash: Rédaction détruite. - not_empty: Rédaction n'est pas vide. Veuillez dé-rédiger toutes les versions appartenant à cette rédaction avant de la détruire. + error: Il y a eu une erreur en supprimant ce masquage. + flash: Masquage supprimé. + not_empty: Ce masquage n'est pas vide. Veuillez dé-masquer toutes les versions appartenant à ce masquage avant de le supprimer. edit: description: Description - heading: Modifier la rédaction - submit: Enregistrer la rédaction - title: Modifier la rédaction + heading: Modifier le masquage + submit: Enregistrer le masquage + title: Modifier le masquage index: - empty: Aucune rédaction à afficher. - heading: Liste des rédactions - title: Liste des rédactions + empty: Aucun masquage à afficher. + heading: Liste des masquages + title: Liste des masquages new: description: Description - heading: Saisissez les informations sur la nouvelle rédaction - submit: Créer la rédaction - title: Créer une nouvelle rédaction + heading: Saisissez les informations sur le nouveau masquage + submit: Créer le masquage + title: Créer unn nouveau masquage show: confirm: Êtes-vous certain ? - description: "Description:" - destroy: Supprimer cette rédaction - edit: Modifier cette rédaction - heading: Afficher le "%{title}" de la rédaction - title: Afficher la rédaction + description: "Description :" + destroy: Supprimer ce masquage + edit: Modifier ce masquage + heading: Masquage "%{title}" + title: Affichage du masquage user: "Créateur :" update: flash: Modifications enregistrées. @@ -1296,6 +1377,7 @@ fr: edit: anon_edits_link_text: Trouvez pourquoi ici. flash_player_required: Vous avez besoin d’un lecteur Flash pour utiliser Potlatch, l’éditeur Flash de OpenStreetMap. Vous pouvez télécharger Flash Player sur le site d’Adobe. D’autres options sont également disponibles pour modifier OpenStreetMap. + id_not_configured: iD n’a pas été configuré no_iframe_support: Votre navigateur ne supporte pas les iframes HTML, qui sont nécessaires pour cette fonctionnalité. not_public: Vous n'avez pas réglé vos modifications pour qu'elles soient publiques. not_public_description: Vous ne pouvez plus modifier la carte à moins que vous ne rendiez vos modifications publiques. Vous pouvez rendre vos modifications publiques à partir de votre %{user_page}. @@ -1304,18 +1386,15 @@ fr: potlatch_unsaved_changes: Vous avez des modifications non sauvegardées. (Pour sauvegarder dans Potlatch, vous devez dé-sélectionner le way ou le node en cours si vous modifiez en mode direct, ou cliquer sur sauvegarder si vous avez un bouton sauvegarder.) user_page_link: page utilisateur index: + createnote: Ajouter une note js_1: Vous utilisez soit un navigateur qui ne supporte pas Javascript soit vous avez désactivé Javascript. js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes. license: - license_name: Creative Commons paternité – partage à l’identique 2.0 - notice: Sous license %{license_name} par le %{project_name} et ses contributeurs. - project_name: projet OpenStreetMap + copyright: Copyright OpenStreetMap et ses contributeurs, sous une licence ouverte permalink: Lien permanent remote_failed: Échec de la modification - vérifiez que JOSM ou Merkaartor sont ouverts et que le greffon de contrôle à distance RemoteControl est activé. shortlink: Lien court key: - map_key: Légende de la carte - map_key_tooltip: Légende de la carte table: entry: admin: Limite administrative @@ -1401,7 +1480,6 @@ fr: preview: Aperçu search: search: Recherche - search_help: "exemples : « Ouagadougou », « Place Grenette, Grenoble », « H2Y 1C6 », ou « post office near Alger »Autres exemples..." submit_text: Ok where_am_i: Où suis-je ? where_am_i_title: Décrit la position actuelle en utilisant le moteur de recherche @@ -1417,6 +1495,11 @@ fr: upload_trace: Envoyer la trace GPS delete: scheduled_for_deletion: Piste prévue pour la suppression + description: + description_with_count: + one: Fichier GPX file avec %{count} point de %{user} + other: Fichier GPX avec %{count} points de %{user} + description_without_count: Fichier GPX de %{user} edit: description: "Description :" download: télécharger @@ -1428,13 +1511,17 @@ fr: points: "Points :" save_button: Enregistrer les modifications start_coord: "Coordonnées de départ :" - tags: "Balises :" + tags: "Mots-clés :" tags_help: séparées par des virgules title: Modifier la trace %{name} uploaded_at: "Envoyé le :" visibility: "Visibilité :" visibility_help: que signifie ceci ? + georss: + title: Traces GPS de OpenStreetMap list: + description: Parcourir les récentes traces GPS téléchargées + empty_html: Rien à voir par ici. Télécharger une nouvelle trace ou pour en savoir plus sur le traçage GPS, consultez la page wiki. public_traces: Traces GPS publiques public_traces_from: Traces GPS publiques de %{user} tagged_with: " balisé avec %{tags}" @@ -1465,7 +1552,7 @@ fr: trace_form: description: "Description :" help: Aide - tags: "Balises :" + tags: "Mots-clés :" tags_help: séparées par des virgules upload_button: Envoyer upload_gpx: "Envoyer un fichier GPX :" @@ -1474,14 +1561,16 @@ fr: trace_header: see_all_traces: Voir toutes les traces see_your_traces: Voir toutes vos traces - traces_waiting: Vous avez %{count} traces en attente d’envoi. Il serait peut-être préférable d’attendre avant d’en envoyer d’autres, pour ne pas bloquer la file d’attente aux autres utilisateurs. + traces_waiting: + one: Vous avez %{count} trace en attente de chargement. Il serait peut-être préférable d’attendre qu’il soit terminé avant d’en charger d’autres, pour ne pas bloquer la file d’attente aux autres utilisateurs. + other: Vous avez %{count} traces en attente de chargement. Il serait peut-être préférable d’attendre qu’il soit terminé avant d’en charger d’autres, pour ne pas bloquer la file d’attente aux autres utilisateurs. upload_trace: Envoyer une trace trace_optionals: - tags: Balises + tags: Mots-clés trace_paging_nav: - next: Suivants » - previous: « Précédents - showing_page: Affichage de la page %{page} + newer: Nouvelles traces + older: Anciennes traces + showing_page: Page %{page} view: delete_track: Supprimer cette piste description: "Description :" @@ -1496,7 +1585,7 @@ fr: pending: EN ATTENTE points: "Points :" start_coordinates: "Coordonnées de départ :" - tags: "Balises :" + tags: "Mots-clés :" title: Affichage de la trace %{name} trace_not_found: Trace non trouvée ! uploaded: "Envoyé le :" @@ -1520,6 +1609,10 @@ fr: email never displayed publicly: (jamais affiché publiquement) flash update success: Informations sur l'utilisateur mises à jour avec succès. flash update success confirm needed: Informations sur l'utilisateur mises à jour avec succès. Vérifiez votre boîte mail afin de valider la vérification de votre nouvelle adresse e-mail. + gravatar: + gravatar: Utiliser Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: qu'est-ce que c'est ? home location: "Emplacement du domicile :" image: "Image :" image size hint: (les images carrées d'au moins 100×100 pixels fonctionnent le mieux) @@ -1555,13 +1648,13 @@ fr: update home location on click: Mettre a jour l'emplacement de votre domicile quand vous cliquez sur la carte ? confirm: already active: Ce compte a déjà été confirmé. - before you start: Nous savons que vous êtes probablement pressé de commencer à cartographier, mais avant, vous pourriez vouloir fournir de plus amples informations sur vous-même, dans le formulaire ci-dessous. button: Confirmer - heading: Confirmer un compte utilisateur + 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 compte. - reconfirm: Si cela fait longtemps que vous vous êtes inscrit, vous pourriez vouloir vous renvoyer un courrier électronique de confirmation. - success: Compte confirmé, merci de vous être enregistré ! - unknown token: Ce jeton ne semble pas exister. + reconfirm_html: Si vous avez besoin que nous vous renvoyions un courriel de confirmation, cliquez ici. + unknown token: Le code de confirmation a expiré ou n’existe pas. confirm_email: button: Confirmer failure: Une adresse email a déjà été confirmée avec ce jeton d'authentification. @@ -1581,8 +1674,8 @@ fr: heading: Utilisateurs hide: Masquer les utilisateurs sélectionnés showing: - one: Affichage de la page %{page} (%{first_item} sur %{items}) - other: Affichage de la page %{page} (%{first_item}-%{last_item} sur %{items}) + one: Page %{page} (%{first_item} sur %{items}) + other: Page %{page} (%{first_item}-%{last_item} sur %{items}) summary: "%{name} créé depuis %{ip_address} le %{date}" summary_no_ip: "%{name} créé le %{date}" title: Utilisateurs @@ -1597,8 +1690,6 @@ fr: lost password link: Vous avez perdu votre mot de passe ? new to osm: Nouveau sur OpenStreetMap ? no account: Vous n’avez pas encore de compte ? - notice: En savoir plus sur le futur changement de licence d’OpenStreetMap (traductions) (discussion) - notice_terms: OpenStreetMap migrera sous une nouvelle licence le 1er avril 2012. Elle est tout aussi ouverte que l'actuelle, mais les termes juridiques sont beaucoup mieux adaptés à notre base de données cartographique. Nous serions ravis de conserver vos contributions à OpenStreetMap, mais nous ne pouvons le faire que si vous acceptez de nous laisser les distribuer sous la nouvelle licence. Sinon, nous devrons les supprimer de la base de données.

    Veuillez ouvrir une session, puis prendre quelques secondes pour examiner et accepter les nouvelles conditions. Merci! openid: "%{logo} OpenID :" openid invalid: Désolé, votre OpenID semble malformé openid missing provider: Désolé, impossible de contacter votre fournisseur OpenID @@ -1643,19 +1734,21 @@ fr: title: Mot de passe perdu make_friend: already_a_friend: Vous êtes déjà ami avec %{name}. + button: Ajouter en tant qu'ami failed: Désolé, échec lors de l'ajout de %{name} comme votre ami - success: "%{name} est à présent votre ami." + heading: Ajouter %{user} en tant qu'ami? + success: "%{name} est désormais votre ami!" new: + 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.

    \n

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

    " confirm email address: "Confirmer l'adresse e-mail :" confirm password: "Confirmez le mot de passe :" contact_webmaster: Veuillez contacter le webmaster pour qu'il vous crée un compte - nous essaierons de traiter votre demande le plus rapidement possible. - continue: Continuer + continue: S’inscrire display name: "Nom affiché :" display name description: Votre nom d'utilisateur affiché publiquement. Vous pouvez changer ceci ultérieurement dans les préférences. email address: "Adresse e-mail :" - fill_form: Remplissez le formulaire et nous vous enverrons un e-mail pour activer votre compte. - flash create success message: Merci de vous être enregistré ! Nous avons envoyé une note de confirmation à %{email}. Dès que vous aurez confirmé votre compte, vous pourrez commencer à cartographier.

    Si vous utilisez un logiciel anti-spam qui envoie des requêtes de confirmation, veuillez mettre webmaster@openstreetmap.org dans votre liste blanche, car nous sommes incapables de répondre à ces messages. - heading: Créer un compte utilisateur license_agreement: En confirmant votre compte, vous devrez accepter les termes du contributeur. no_auto_account_create: Malheureusement, nous sommes actuellement dans l'impossibilité de vous créer un compte automatiquement. not displayed publicly: Non affichée publiquement (voir notre charte sur la confidentialité) @@ -1665,7 +1758,7 @@ fr: password: "Mot de passe :" 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 consulter cette page wiki. - title: Créer un compte + title: S’inscrire use openid: Vous pouvez également utiliser %{logo} OpenID pour vous identifier no_such_user: 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. @@ -1676,6 +1769,8 @@ fr: nearby mapper: Mappeur dans les environs your location: Votre emplacement remove_friend: + button: Supprimer en tant qu’ami + heading: Supprimer %{user} en tant qu’ami? not_a_friend: "%{name} n'est pas parmi vos amis." success: "%{name} a été retiré de vos amis." reset_password: @@ -1710,12 +1805,12 @@ fr: you need to accept or decline: Veuillez lire et ensuite soit accepter ou refuser les nouvelles conditions de contributeur pour continuer. view: activate_user: activer cet utilisateur - add as friend: ajouter en tant qu'ami + add as friend: Ajouter en tant qu’ami ago: (il y a %{time_in_words_ago}) block_history: blocages reçus - blocks by me: blocages donnés - blocks on me: mes blocages - comments: commentaires + blocks by me: Blocages de ma part + blocks on me: Blocages me concernant + comments: Commentaires confirm: Confirmer confirm_user: confirmer cet utilisateur create_block: bloquer cet utilisateur @@ -1727,31 +1822,35 @@ fr: deactivate_user: désactiver cet utilisateur delete_user: supprimer cet utilisateur description: Description - diary: journal - edits: modifications - email address: "Adresse email :" - friends_changesets: Parcourir tous les groupes de modifications des amis - friends_diaries: Parcourir toutes les entrées de journal des amis + diary: Journal + edits: Modifications + email address: "Adresse de courriel :" + friends_changesets: Groupes de modifications des amis + friends_diaries: Entrées de journal des amis hide_user: masquer cet utilisateur - if set location: Si vous définissez un lieu, une jolie carte va apparaître en dessous. Vous pouvez définir votre lieu sur votre page %{settings_link}. + if set location: Positionner votre lieu d’habitation sur la page %{settings_link} pour voir les utilisateurs à proximité. km away: "%{count} km" latest edit: "Dernière modification %{ago} :" m away: distant de %{count} m mapper since: "Mappeur depuis:" - moderator_history: voir les blocages donnés - my comments: mes commentaires - my diary: mon journal - my edits: mes modifications - my settings: mes options - my traces: mes traces + moderator_history: blocages fournis + my comments: Mes commentaires + my diary: Mon journal + my edits: Mes modifications + my messages: Mes messages + my notes: Mes notes + my profile: Mon profil + my settings: Mes options + my traces: Mes traces nearby users: Autres utilisateurs à proximité - nearby_changesets: Parcourir tous les groupes de modifications des utilisateurs à proximité - nearby_diaries: Parcourir toutes les entrées de journal des utilisateurs à proximité + nearby_changesets: Groupes de modifications des utilisateurs à proximité + nearby_diaries: Entrées de journal des utilisateurs à proximité new diary entry: nouvelle entrée dans le journal no friends: Vous n'avez pas encore ajouté d'ami no nearby users: Aucun utilisateur n'a encore signalé qu'il cartographiait à proximité. + notes: Notes de carte oauth settings: paramètres OAuth - remove as friend: enlever en tant qu'ami + remove as friend: Supprimer en tant qu’ami role: administrator: Cet utilisateur est un adminstrateur grant: @@ -1761,11 +1860,11 @@ fr: revoke: administrator: Révoquer l'accès administrateur moderator: Révoquer l'accès modérateur - send message: envoyer un message + send message: Envoyer un message settings_link_text: options spam score: "Note pour le spam :" status: "Statut :" - traces: traces + traces: Traces unhide_user: ré-afficher cet utilisateur user location: Emplacement de l'utilisateur your friends: Vos amis @@ -1823,11 +1922,14 @@ fr: creator_name: Créateur display_name: Utilisateur Bloqué edit: Modifier + next: Suivant » not_revoked: (non révoqué) + previous: « Précédent reason: Motif du blocage revoke: Révoquer ! revoker_name: Révoqué par show: Afficher + showing_page: Page %{page} status: État period: one: 1 heure @@ -1875,3 +1977,25 @@ fr: fail: Impossible de révoquer le rôle « %{role} » de l'utilisateur « %{name} ». Vérifiez que l'utilisateur et le rôle sont valides. heading: Confirmer la révocation du rôle title: Confirmer la révocation du rôle + welcome_page: + add_a_note: + paragraph_1_html: "Si vous voulez juste faire une petite correction et n'avez pas le temps de vous\nenregistrer et d'apprendre à éditer, il est facile d'ajouter une note." + paragraph_2_html: "Allez simplement sur la carte et cliquez sur l'icône note:\n. Cela ajoutera un marqueur sur la carte, que vous\npouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur\n\"ajouter une note\", et d'autres contributeurs iront regarder." + title: Pas le temps d'éditer ? Ajoutez une note ! + basic_terms: + editor_html: Un éditeur est un programme ou site web qui vous permet d'éditer la carte. + node_html: Un nœud est un point sur la carte, comme un restaurant ou un arbre individuel. + paragraph_1_html: OpenStreetMap a son propre jargon. Voici quelques mots clefs qui vous seront utiles. + tag_html: "Un tag est une information à propos d'un nœud ou d'un chemin, comme\nle nom d'un restaurant ou la vitesse limite d'une rue." + title: Vocabulaire de base de cartographie + way_html: "Un cheminTrouvez de l’aide ici." + title: Des questions ? + start_mapping: Commencer à cartographier + title: Bienvenue ! + whats_on_the_map: + off_html: "Ce qui est par contre exclu sont les données subjectives comme les cotes de\npopularité, les éléments historiques ou hypothétiques, et les données venant de source\ncopyrightée. À moins d'avoir une permission spéciale, ne copiez pas à partir d'une\ncarte papier ou en ligne." + on_html: "OpenStreetMap sert à cartographier des choses à la fois réelles et actuelles\n- il inclut des millions de bâtiments, de routes, et d'autres détails de lieux. Vous\npouvez cartographier n'importe quel élément du monde réel qui vous intéresse." + title: Ce qu'il y a sur la carte diff --git a/config/locales/fur.yml b/config/locales/fur.yml index b8de53a377a..434db0b0582 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -1,8 +1,15 @@ # Messages for Friulian (furlan) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Davio # Author: Klenje +# Author: Tocaibon fur: + about_page: + copyright_html: ©Colaboradôrs
    di OpenStreetMap + local_knowledge_title: Cognossince locâl + next: Prossim + open_data_title: Dâts vierts activerecord: attributes: diary_comment: @@ -19,6 +26,7 @@ fur: message: body: Cuarp recipient: Destinatari + sender: Mitent title: Titul trace: description: Descrizion @@ -37,6 +45,7 @@ fur: languages: Lenghis pass_crypt: Password models: + acl: Liste di control des jentradis changeset: Grup di cambiaments changeset_tag: Etichete dal grup di cambiaments country: Paîs @@ -47,167 +56,106 @@ fur: message: Messaç node: Grop node_tag: Etichete dal grop + notifier: Promemorie + old_node: Vecjo grop + old_node_tag: Vecje etichete dal grop old_relation: Viere relazion old_relation_member: Membri de relazion vieli old_relation_tag: Etichete viele de relazion + old_way: Vecjo percors + old_way_node: Vecjo grop dal percors + old_way_tag: Vecje etichete dal percors relation: Relazion relation_member: Membri de relazion relation_tag: Etichete de relazion session: Session trace: Percors tracepoint: Pont dal percors + tracetag: etichete dal tracjât user: Utent user_preference: Preference utent + user_token: Codiç dal utent way: Vie way_node: Grop de vie way_tag: Etichete de vie browse: + anonymous: anonim changeset: - changeset: "Grup di cambiaments: %{id}" + belongs_to: Autôr changesetxml: Grup di cambiaments XML - download: Discjame %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Grup di cambiaments %{id} title_comment: Grup di cambiaments %{id} - %{comment} + node: Grops (%{count}) + node_paginated: Grops (%{x}-%{y} su %{count}) osmchangexml: XML in formât osmChange - title: Grup di cambiaments - changeset_details: - belongs_to: "Al è di:" - bounding_box: "Retangul di selezion:" - box: retangul - closed_at: "Sierât ai:" - created_at: "Creât ai:" - has_nodes: - one: "Al à il grop ca sot:" - other: "Al à i %{count} grops ca sot:" - has_relations: - one: "Al à la relazion ca sot:" - other: "Al à lis %{count} relazions ca sot:" - has_ways: - one: "Al à la vie ca sot:" - other: "Al à lis %{count} viis ca sot:" - show_area_box: Mostre ricuadri de aree - common_details: - changeset_comment: "Coment:" - deleted_at: "Eliminât ai:" - deleted_by: "Eliminât di:" - edited_at: "Cambiât ai:" - edited_by: "Cambiât di:" - in_changeset: "Tal grup di cambiaments:" - version: "Version:" + relation: Relazions (%{count}) + relation_paginated: Relazions (%{x}-%{y} su %{count}) + title: "Grup di cambiaments: %{id}" + way: Viis (%{count}) + way_paginated: Viis (%{x}-%{y} su %{count}) + closed: Sierât + closed_by_html: Sierât %{time} indaûr di %{user} + closed_html: Sierât %{time} indaûr containing_relation: entry: Relazion %{relation_name} entry_role: Relazion %{relation_name} (come %{relation_role}) - map: - deleted: Eliminât - edit: - area: Modifiche aree - relation: Modifiche relazion - larger: - area: Viôt la aree suntune mape plui grande - node: Viôt il grop suntune mape plui grande - relation: Viôt la relazion suntune mape plui grande - way: Viôt la vie suntune mape plui grande - loading: Daûr a cjamâ... - navigation: - all: - next_changeset_tooltip: Grup di cambiaments sucessîf - next_node_tooltip: Grop sucessîf - next_relation_tooltip: Relazion sucessive - next_way_tooltip: Vie sucessive - prev_changeset_tooltip: Grup di cambiaments precedent - prev_node_tooltip: Grop precedent - prev_relation_tooltip: Relazion precedente - prev_way_tooltip: Vie precedente - user: - name_changeset_tooltip: Viôt i cambiaments di %{user} - next_changeset_tooltip: Cambiament sucessîf di %{user} - prev_changeset_tooltip: Cambiament precedent di %{user} + created: Creât + created_by_html: Creât %{time} indaûr di %{user} + created_html: Creât %{time} indaûr + deleted_by_html: Eliminât %{time} indaûr di %{user} + download_xml: Discjame XML + edited_by_html: Cambiât %{time} indaûr di %{user} + in_changeset: Grup di cambiaments + location: "Lûc:" + no_comment: (nissun coment) node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Discjame XML - edit: cambie - node: Grop - node_title: "Grop: %{node_name}" - view_history: cjale storic - node_details: - coordinates: "Coordenadis:" - part_of: "Part di:" - node_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Discjame XML - node_history: Storic dal grop - node_history_title: "Storic dal grop: %{node_name}" - view_details: cjale i detais + history_title: "Storic dal grop: %{name}" + title: "Grop: %{name}" not_found: - sorry: Nus displâs, nol è stât pussibil cjatâ il %{type} cun id %{id}. + sorry: "Nus displâs, nol è stât pussibil cjatâ il %{type} cun id #%{id}." type: changeset: "Non dal file:" node: grop relation: relazion way: vie - paging_nav: - of: su - showing_page: Mostrant la pagjine + note: + closed_by: Risolte di %{user} %{when} indaûr + closed_by_anonymous: Risolte di anonim %{when} indaûr + closed_title: "Note risolte #%{note_name}" + commented_by: Coment di %{user} %{when} indaûr + commented_by_anonymous: Coment di un anonim %{when} indaûr + hidden_by: Platade di %{user} %{when} indaûr + hidden_title: "Note platade #%{note_name}" + new_note: Gnove note + open_by: Creade di %{user} %{when} indaûr + open_by_anonymous: Creade di un anonim %{when} indaûr + open_title: "Note no risolte #%{note_name}" + reopened_by: Tornade a ativâ di %{user} %{when} indaûr + reopened_by_anonymous: Tornade a ativâ di un anonim %{when} indaûr + title: "Note: %{id}" + part_of: Part di + redacted: + type: + node: grop + relation: relazion + way: vie relation: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Discjame XML - relation: Relazion - relation_title: "Relazion: %{relation_name}" - view_history: cjale storic - relation_details: - members: "Membris:" - part_of: "Part di:" - relation_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Discjame XML - relation_history: Storic relazion - relation_history_title: "Storic de relazion: %{relation_name}" - view_details: cjale detais + history_title: "Storic de relazion: %{name}" + members: Membris + title: "Relazion: %{name}" relation_member: entry_role: "%{type} %{name} come %{role}" type: node: Grop relation: Relazion way: Vie - start: - manually_select: Sielç a man une aree divierse - view_data: Viôt i dâts pe viodude atuâl de mape start_rjs: - data_frame_title: Dâts - data_layer_name: Dâts - details: Detais - drag_a_box: Disegne un retangul su la mape par sielzi une aree - edited_by_user_at_timestamp: Cambiât di [[user]] ai [[timestamp]] - hide_areas: Plate areis - history_for_feature: Storic par [[feature]] + feature_warning: Daûr a cjamâ %{num_features} carateristichis, che a podaressin ralentâ o blocâ il to computer. Sêstu sigûr di volê mostrâ chescj dâts? load_data: Cjame i dâts - loaded_an_area_with_num_features: "Tu âs cjamât une aree che e conten [[num_features]] carateristichis. In gjenerâl, cualchi sgarfadôr al podarès no rivâ a gjestî ben cheste cuantitât di dâts. I sgarfadôrs par solit a lavorin miôr se a mostrin mancul di 100 carataristichis ae volte: cualsisei altri numar al podarès ralentâ/no fâ plui rispuindi il sgarfadôr. Se tu sês sigûr di volê mostrâ chescj dâts, frache sul boton ca sot." loading: Daûr a cjamâ... - manually_select: Sielç a man une aree divierse - object_list: - api: Recupere cheste aree doprant l'API - back: Mostre liste dai ogjets - details: Detais - heading: di - history: - type: - node: Grop [[id]] - way: Vie [[id]] - selected: - type: - node: Grop [[id]] - way: Vie [[id]] - type: - node: Grop - way: Vie - private_user: utent privât - show_areas: Mostre areis - show_history: Mostre storic - wait: Daûr a spietâ... - zoom_or_select: Ingrandìs o sielç la aree de mape che tu vuelis viodi tag_details: - tags: "Etichetis:" + tags: Etichetis wiki_link: key: La pagjine de vichi cu la descrizion de etichete %{key}. tag: La pagjine de vichi cu la descrizion de etichete %{key}=%{value} @@ -218,38 +166,25 @@ fur: node: grop relation: relazion way: vie + version: Version + view_details: Cjale i detais + view_history: Cjale il storic way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Discjame XML - edit: cambie - view_history: cjale storic - way: Vie - way_title: "Vie: %{way_name}" - way_details: also_part_of: - one: ancje part de vie %{related_ways} - other: ancje part des viis %{related_ways} - nodes: "Grops:" - part_of: "Part di:" - way_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Discjame XML - view_details: cjale i detais - way_history: Storic de vie - way_history_title: "Storic de vie: %{way_name}" + one: part de vie %{related_ways} + other: part des viis %{related_ways} + history_title: "Storic de vie: %{name}" + nodes: Grops + title: "Vie: %{name}" changeset: changeset: anonymous: Anonim - big_area: (grant) - no_comment: (nissun) no_edits: (nissun cambiament) - show_area_box: mostre il ricuadri de aree - still_editing: (ancjemò in cambiament) view_changeset_details: Viôt detais dal grup di cambiaments changeset_paging_nav: - next: Successîf » + next: Sucessîf » previous: « Precedent - showing_page: Daûr a mostrâ la pagjine %{page} + showing_page: Pagjine %{page} changesets: area: Aree comment: Coment @@ -257,21 +192,25 @@ fur: saved_at: Salvât ai user: Utent list: - description: Ultins cambiaments - description_bbox: Grups di cambiaments jentri di %{bbox} - description_user: Grups di cambiaments di %{user} - description_user_bbox: Grups di cambiaments di %{user} jentri di %{bbox} - heading: Grups di cambiaments - heading_bbox: Grups di cambiaments - heading_friend: Grups di cambiaments - heading_nearby: Grups di cambiaments - heading_user: Grups di cambiaments - heading_user_bbox: Grups di cambiaments + empty: Nissun grup di cambiaments cjatât. + empty_area: Nissun grup di cambiaments in cheste zone. + empty_user: Nissun grup di cambiaments par chest utent. + load_more: Cjame di plui title: Grups di cambiaments - title_bbox: Grups di cambiaments jentri di %{bbox} + title_friend: Grups di cambiaments dai tiei amîs + title_nearby: Grups di cambiaments dai utents dongje title_user: Grups di cambiaments di %{user} - title_user_bbox: Grups di cambiaments di %{user} jentri di %{bbox} + timeout: + sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je stade masse timp a cjamâsi. diary_entry: + comments: + ago: "%{ago} indaûr" + comment: Coment + has_commented_on: "%{display_name} al à comentâts lis vôs dal diari ca sot" + newer_comments: Coments plui gnûfs + older_comments: Coments plui vieris + post: Publiche + when: Cuant diary_comment: comment_from: Coment di %{link_user} ai %{comment_created_at} confirm: Conferme @@ -314,8 +253,10 @@ fur: newer_entries: Vôs plui gnovis no_entries: Nissune vôs tal diari older_entries: Vôs plui vieris - recent_entries: "Ultimis vôs dal diari:" + recent_entries: Ultimis vôs dal diari title: Diaris dai utents + title_friends: Diaris dai amîs + title_nearby: Diaris dai utents dongje user_title: Diari di %{user} location: edit: Cambie @@ -325,6 +266,7 @@ fur: title: Gnove vôs dal diari no_such_entry: body: No esist une vôs dal diari o un coment cun id %{id}. Controle par plasê la grafie o che tu vedis seguît il leam just. + heading: Nissune vôs cun identificatîf %{id} title: La vôs dal diari no esist view: leave_a_comment: Lasse un coment @@ -335,6 +277,9 @@ fur: user_title: Diari di %{user} editor: default: Predeterminât (par cumò %{name}) + id: + description: iD (editôr tal sgarfadôr) + name: iD potlatch: description: Potlatch 1 (editôr tal sgarfadôr) name: Potlatch 1 @@ -349,7 +294,7 @@ fur: add_marker: Zonte un segnalut ae mape area_to_export: Aree di espuartâ export_button: Espuarte - export_details: I dâts di OpenStreetMap a son dâts fûr sot de licence Creative Commons Attribution-ShareAlike 2.0 license. + export_details: I dâts di OpenStreetMap a son dâts fûr sot de licence Open Data Commons Open Database License (ODbL). format: "Formât:" format_to_export: Formât di espuartâ image_size: "Dimensions figure:" @@ -364,29 +309,21 @@ fur: paste_html: Tache l'HTML par inserîlu tal to sît web scale: Scjale too_large: - body: Cheste aree e je masse grande par espuartâle come dâts XML di OpenStreetMap. Par plasê incrès il zoom o sielç une aree plui piçule. - heading: La aree e je masse largje + body: Cheste aree e je masse grande par espuartâle come dâts XML di OpenStreetMap. Par plasê incrès il zoom, sielç une aree plui piçule o dopre une des sorzints ca sot par discjamâ un grum di dâts. + other: + description: Altris sorzints elencadis su la wiki di OpenStreetMap + title: Altris sorzints zoom: Ingrandiment - start_rjs: - add_marker: Zonte un segnalut ae mape - change_marker: Cambie la posizion dal segnalut - click_add_marker: Frache su la mape par zontâ un segn - drag_a_box: Disegne un retangul su la mape par sielzi une aree - export: Espuarte - manually_select: Sielç a man une aree divierse - view_larger_map: Viôt une mape plui grande + title: Espuarte geocoder: description: title: geonames: Lûc cjolt di GeoNames - osm_namefinder: "%{types} dal OpenStreetMap Namefinder" osm_nominatim: Lûc di OpenStreetMap Nominatim types: cities: Citâts places: Puescj towns: Citadinis - description_osm_namefinder: - prefix: "%{distance} a %{direction} di %{type}" direction: east: est north: nord @@ -407,17 +344,25 @@ fur: title: ca_postcode: Risultâts cjolts di Geocoder.CA geonames: Risultâts cjolts di GeoNames + geonames_reverse: Risultâts di GeoNames latlon: Risultâts cjolts dal sît interni - osm_namefinder: Risultâts cjolts di OpenStreetMap Namefinder osm_nominatim: Risultâts di OpenStreetMap Nominatim + osm_nominatim_reverse: Risultâts di OpenStreetMap Nominatim uk_postcode: Risultâts cjolts di NPEMap / FreeThe Postcode us_postcode: Risultâts cjolts di Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} di %{parentname})" - suffix_place: ", %{distance} a %{direction} di %{placename}" search_osm_nominatim: + admin_levels: + level2: Confin di paîs + level4: Confin di stât + level5: Confin di regjon + level6: Confin di contee + level8: Confin di citât + level9: Confin di vilaç prefix: + aeroway: + terminal: Terminâl amenity: + WLAN: Pont di acès WiFi airport: Aeropuart arts_centre: Centri pes arts atm: Bancomat @@ -425,12 +370,15 @@ fur: bank: Bancje bar: Bar bench: Bancjute + bicycle_parking: Parc pes bicicletis bicycle_rental: Nauli di bicicletis bureau_de_change: Ufizi di cambi bus_station: Stazion des corieris car_rental: Nauli di machinis + car_sharing: Condivision di machinis car_wash: Lavaç machinis casino: Casinò + charging_station: Stazion di cjarie cinema: Cine clinic: Cliniche community_centre: Centri civic @@ -441,6 +389,7 @@ fur: driving_school: Scuele guide embassy: Ambassade emergency_phone: Telefon di emergjence + ferry_terminal: Terminâl traghets fire_hydrant: Idrant fire_station: Stazion dai pompîrs fountain: Fontane @@ -469,7 +418,9 @@ fur: sauna: Saune school: Scuele shop: Buteghe + social_centre: Centri sociâl supermarket: Supermarcjât + swimming_pool: Pissine taxi: Taxi telephone: Telefon public theatre: Teatri @@ -478,20 +429,48 @@ fur: vending_machine: Distributôr automatic veterinary: Veterinari village_hall: Centri civic - wifi: Acès a internet WiFi + wifi: Pont di acès WiFi youth_centre: Centri zovanîl boundary: administrative: Confin aministratîf + national_park: Parc nazionâl + protected_area: Aree protezude + bridge: + aqueduct: Acuedot + viaduct: Viadot + "yes": Puint building: "yes": Edifici + emergency: + fire_hydrant: Idrant + phone: Telefon di emergjence highway: bus_stop: Fermade autobus construction: Strade in costruzion + cycleway: Percors ciclabil emergency_access_point: Pont di acès di emergjence + footway: Percors pedonâl + motorway: Autostrade + motorway_junction: Svincul autostradâl + motorway_link: Autostrade + path: Percors pedestrian: Strade pedonâl + primary: Strade primarie + primary_link: Strade primarie + proposed: Strade proponude raceway: Circuit + residential: Strade residenziâl + rest_area: Aree di polse road: Strade + secondary: Strade secondarie + secondary_link: Strade secondarie + service: Strade di servizi + speed_camera: Radar fis pe velocitât steps: Scjalis + street_lamp: Lampion stradâl + tertiary: Strade terziarie + tertiary_link: Strade terziarie + track: Piste unsurfaced: Strade no asfaltade historic: archaeological_site: Sît archeologic @@ -499,21 +478,30 @@ fur: building: Edifici castle: Cjiscjel church: Glesie + citywalls: Muris + fort: Fuart house: Cjase icon: Icone + memorial: Memoriâl + mine: Miniere monument: Monument museum: Museu ruins: Ruvinàs + tomb: Tombe tower: Tor landuse: cemetery: Simiteri commercial: Aree comerciâl construction: In costruzion + forest: Bosc + grass: Prât industrial: Aree industriâl + meadow: Prâts military: Aree militâr mine: Miniere nature_reserve: Riserve naturâl park: Parc + piste: Piste di rivade a tiere quarry: Gjave railway: Ferade residential: Aree residenziâl @@ -523,28 +511,52 @@ fur: fishing: Riserve par pescjâ garden: Zardin golf_course: Troi di golf + marina: Puart turistic miniature_golf: Minigolf nature_reserve: Riserve naturâl park: Parc + pitch: Cjamp sportîf + sauna: Saune sports_centre: Centri sportîf stadium: Stadi swimming_pool: Pissine track: Piste pe corse water_park: Parc acuatic + military: + airfield: Cjamp di aviazion militâr + barracks: Caserme + mountain_pass: + "yes": Pas di montagne natural: bay: Rade beach: Splaze channel: Canâl crater: Cratêr + dune: Dune fjord: Fiort + forest: Bosc + geyser: Geyser glacier: Glaçâr + heath: Magrêt hill: Culine island: Isule + land: Tiere + peak: Pic point: Pont river: Flum tree: Arbul valley: Val volcano: Vulcan + water: Aghe + office: + architect: Architet + employment_agency: Agjenzie di ocupazion + estate_agent: Agjent imobiliâr + government: Ufizi governatîf + insurance: Agjenzie di assicurazions + lawyer: Avocat + travel_agent: Agjenzie di viaçs + "yes": Ufizi place: airport: Aeropuart city: Citât @@ -555,6 +567,7 @@ fur: houses: Cjasis sparniçadis island: Isule islet: Isulute + isolated_dwelling: Cjasâi spars locality: Localitât municipality: Comun postcode: Codis postâl @@ -577,9 +590,11 @@ fur: tram_stop: Fermade dal tram shop: bakery: Pancôr + beauty: Centri estetic bicycle: Buteghe di bicicletis books: Librerie butcher: Becjarie + car_parts: Tocs par machinis car_repair: Riparazion di machinis carpet: Buteghe di tapêts clothes: Buteghe di vistîts @@ -590,101 +605,152 @@ fur: jewelry: Buteghe dal oresin laundry: Lavandarie market: Marcjât + newsagent: Buteghe dai gjornâi optician: Otic pet: Buteghe di animâi + pharmacy: Farmacie + photo: Buteghe di fotografie shoes: Buteghe di scarpis supermarket: Supermarcjât toys: Negozi di zugatui travel_agency: Agjenzie di viaçs + "yes": Buteghe tourism: hostel: Ostel hotel: Hotel information: Informazions museum: Museu + theme_park: Parc tematic valley: Val viewpoint: Pont panoramic zoo: Zoo + tunnel: + "yes": Galarie waterway: canal: Canâl dam: Dighe ditch: Fuesse river: Flum + help_page: + title: Cemût vê un jutori + welcome: + title: Benvignûts in OSM javascripts: + close: Siere + edit_help: Môf la mape e aumente il zoom tal lûc che tu vuelis cambiâ, po frache culì + key: + title: Leiende + tooltip: Leiende + tooltip_disabled: La leiende e je disponibile dome pal nivel Standard map: base: cycle_map: Cycle Map + hot: Umanitari standard: Standard transport_map: Mape dai traspuarts + copyright: © Colaboradôrs di OpenStreetMap + donate_link_text: + layers: + data: Dâts de mape + header: Nivei de mape + notes: Notis de mape + overlays: Ative i nivei utii par risolvi i problemis de mape + title: Nivei + locate: + popup: Tu sês a {distance} {unit} di chest pont + title: Mostre la mê posizion + zoom: + in: Aumente zoom + out: Diminuìs zoom + notes: + new: + add: Zonte une note + intro: Par vê une mape simpri miôr, lis informazions che tu inserissis a son mostradis a chei altris che a mapin, par cui cîr di jessi plui descritîf pussibil e di spostâ il segnalut te posizion precise prime di inserî ca sot la tô note. + show: + anonymous_warning: Cheste note e inclût coments di utents anonims che a varessin di jessi verificâts in mût indipendent. + comment: Coment + comment_and_resolve: Comente e risolf + hide: Plate + reactivate: Torne a ativâ + resolve: Risolf + share: + cancel: Scancele + center_marker: Centre la mape sul marcadôr + custom_dimensions: Dopre dimensions personalizadis + download: Discjame + embed: HTML + format: "Formât:" + image: Figure + image_size: La figure e mostrarà il nivel standard a + include_marker: Inclût il marcadôr + link: Leam o HTML + long_link: Leam + paste_html: Tache l'HTML par inserîlu tal to sît web + scale: "Scjale:" + short_link: Leam curt + short_url: URL curte + title: Condivît + view_larger_map: Viôt une mape plui grande site: + createnote_disabled_tooltip: Aumente il zoom par zontâ une note ae mape + createnote_tooltip: Zonte une note ae mape edit_disabled_tooltip: Cres il zoom par cambiâ la mape edit_tooltip: Cambie la mape - edit_zoom_alert: Tu scugnis cressi il zoom par cambiâ la mape - history_disabled_tooltip: Cres il zoom par viodi i cambiaments in cheste aree - history_tooltip: Cjale i cambiaments in cheste aree - history_zoom_alert: Tu scugnis cressi il zoom par viodi il storic dai cambiaments + map_data_zoom_in_tooltip: Aumente il zoom par viodi i dâts de mape + map_notes_zoom_in_tooltip: Aumente il zoom par viodi lis notis su la mape layouts: + about: Informazions community: Comunitât community_blogs: Blogs de comunitât community_blogs_title: Blogs di bande dai membris de comunitât OpenStreetMap - copyright: Copyright & Licence - documentation: Documentazion - documentation_title: Documentazion dal progjet + copyright: Copyright + data: Dâts donate: Sosten OpenStreetMap %{link} al font pal inzornament dal hardware. - donate_link_text: donant edit: Cambie edit_with: Cambie cun %{editor} export: Espuarte - export_tooltip: Espuarte i dâts de mape + export_data: Espuarte i dâts foundation: Fondazion foundation_title: La fondazion OpenStreetMap gps_traces: Percors GPS gps_traces_tooltip: Gjestìs i percors GPS help: Jutori - help_centre: Jutori - help_title: Sît di jutori pal progjet history: Storic - home: lûc iniziâl - home_tooltip: Va al lûc iniziâl - inbox: "%{count} in jentrade" - inbox_tooltip: - one: Al è un messaç di lei te pueste in jentrade - other: A son %{count} messaçs di lei te pueste in jentrade - zero: Nol è nissun messaç di lei te pueste in jentrade - intro_1: OpenStreetMap al è une mape libare e modificabile dal marimont. Al è fat di int come te. + home: Va al lûc iniziâl intro_2_create_account: Cree il to profîl utent - intro_2_download: discjamâ - intro_2_html: I dâts si puedin liberementri %{download} e %{use} sot de lôr %{license}. %{create_account} par miorâ la mape. - intro_2_license: licence vierte - intro_2_use: doprâ - license: - title: I dâts di OpenStreetMap a son dâts fûr sot de Creative Commons Attribution-Share Alike 2.0 Generic License - log_in: jentre + intro_header: Benvignût in OpenStreetMap! + intro_text: OpenStreetMap e je une mape dal mont, creade di int come te e di ûs libar sot di une licence vierte. + learn_more: Par savênt di plui + log_in: Jentre log_in_tooltip: Jentre cuntun profîl esistint logo: alt_text: Logo di OpenStreetMap - logout: jes - logout_tooltip: Jes + logout: Jes make_a_donation: text: Done alc title: Sosten OpenStreetMap fasint une donazion monetarie + more: Plui osm_offline: La base di dâts di OpenStreetMap e je par cumò fûr linie parcè che o sin daûr a fâ lavôrs essenziâi di manutenzion de base di dâts. osm_read_only: La base di dâts di OpenStreetMap e je par cumò dome in leture dilunc la esecuzion di lavôrs essenziâi di manutenzion de base di dâts. + partners_bytemark: Bytemark Hosting partners_html: L'hosting al è sostignût di %{ucl}, %{ic}, %{bytemark} e altris %{partners}. partners_ic: Imperial College di Londre partners_ucl: UCL VR Centre - sign_up: regjistriti + sign_up: Regjistriti sign_up_tooltip: Cree un profîl par colaborâ - sotm2011: Ven ae Conference OpenStreetMap 2011, The State of the Map, dal 9 al 11 di Setembar a Denver! + start_mapping: Scomence a mapâ tag_line: Il WikiMapeMont libar user_diaries: Diaris dai utents user_diaries_tooltip: Viôt i diaris dai utents - view: Viôt - view_tooltip: Viôt la mape - welcome_user: Benvignût/de, %{user_link} - welcome_user_link_tooltip: La tô pagjine utent - wiki: Vichi - wiki_title: Vichi dal progjet license_page: + foreign: + title: Informazions su cheste traduzion + legal_babble: + attribution_example: + title: Esempli di atribuzion + contributors_title_html: Nestris colaboradôrs + more_title_html: Par savênt di plui + title_html: Copyright e licence native: mapping_link: scomence a mapâ title: Informazions su cheste pagjine @@ -695,7 +761,7 @@ fur: date: Date from: Di messages: Tu âs %{new_messages} e %{old_messages} - my_inbox: I miei messaç in jentrade + my_inbox: I miei messaçs in jentrade new_messages: one: "%{count} messaç gnûf" other: "%{count} messaçs gnûfs" @@ -740,12 +806,9 @@ fur: title: In jessude to: A read: - back_to_inbox: Torne ai messaçs in jentrade - back_to_outbox: Torne ai messaçs in jessude + back: Indaûr date: Date from: Di - reading_your_messages: Leture dai tiei messaçs - reading_your_sent_messages: Leture dai messaçs che tu âs inviât reply_button: Rispuint subject: Sogjet title: Leture messaç @@ -753,6 +816,37 @@ fur: unread_button: Segne come di lei sent_message_summary: delete_button: Elimine + note: + description: + closed_at_by_html: Risolte %{when} indaûr di %{user} + closed_at_html: Risolte %{when} indaûr + commented_at_by_html: Inzornade %{when} indaûr di %{user} + commented_at_html: Inzornade %{when} indaûr + opened_at_by_html: Creât %{when} indaûr di %{user} + opened_at_html: Creât %{when} indaûr + reopened_at_by_html: Tornade a ativâ %{when} indaûr di %{user} + reopened_at_html: Tornade a ativâ %{when} indaûr + entry: + comment: Coment + full: Note complete + mine: + ago_html: "%{when} indaûr" + created_at: Creade ai + creator: Creadôr + description: Descrizion + heading: Lis notis di %{user} + id: Identificatîf + last_changed: Ultin cambiament + subheading: Lis notis inseridis o comentadis di %{user} + title: Note inseride o comentade di %{user} + rss: + closed: note sierade (dongje di %{place}) + commented: gnûf coment (dongje di %{place}) + description_area: Une liste des notis segnaladis, comentadis o risoltis inte tô zone [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Un canâl RSS per note %{id} + opened: gnove note (dongje di %{place}) + reopened: note tornade a ativâ (dongje di %{place}) + title: Notis di OpenStreetMap notifier: diary_comment_notification: footer: Tu puedis ancje lei il coment su %{readurl} e tu puedis zontâ un coment su %{commenturl} o ben rispuindi su %{replyurl} @@ -778,24 +872,34 @@ fur: with_description: cu la descrizion your_gpx_file: Al somee che il to file GPX message_notification: - footer1: Tu puedis ancje lei il messaç su %{readurl} - footer2: e tu puedis rispuindi su %{replyurl} + footer_html: Tu puedis ancje lei il messaç su %{readurl} e tu puedis rispuindi su %{replyurl} header: "%{from_user} ti à mandât un messaç su OpenStreetMap cun sogjet %{subject}:" hi: Mandi %{to_user}, + note_comment_notification: + anonymous: Un utent anonim signup_confirm: - subject: "[OpenStreetMap] Conferme la tô direzion di pueste eletroniche" - signup_confirm_html: - hopefully_you: Cualchidun (sperìn propite tu) al vûl creâ une identitât - introductory_video: Tu puedis viodi un %{introductory_video_link}. - more_videos: A son %{more_videos_link}. - more_videos_here: altris videos culì - video_to_openstreetmap: video di introduzion a OpenStreetMap + subject: "[OpenStreetMap] Benvignût in OpenStreetMap" + oauth: + oauthorize: + allow_read_prefs: lei lis tôs preferencis dal utent. + allow_to: "Permèt ae aplicazion client di:" + allow_write_api: modificâ la mape. + allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs. + allow_write_notes: cambiâ lis notis. + allow_write_prefs: modificâ lis tôs preferencis dal utent. + request_access: La aplicazion %{app_name} e je daûr a domandâ di vê acès al to profîl, %{user}. Controle se tu sês dacuardi che la aplicazion e podedi fâ chestis robis. Tu puedis sielzi ogni opzion in mût indipendent. oauth_clients: edit: submit: Cambie title: Cambie la tô aplicazion form: + allow_read_prefs: lei lis sôs preferencis dal utent. + allow_write_api: modificâ la mape. + allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs. + allow_write_notes: cambiâ lis notis. + allow_write_prefs: modificâ lis sôs preferencis dal utent. name: Non + url: URL principâl de aplicazion index: application: Non de aplicazion issued_at: Aprovade il @@ -804,14 +908,34 @@ fur: my_tokens: Lis aplicazions che o ai autorizât no_apps: Âstu une aplicazion web che tu volaressis regjistrâ par doprâ ca di no cul standard %{oauth}? Tu scugnis regjistrâle prime che podedi fâ richiestis OAuth a chest servizi. register_new: Regjistre la tô aplicazion + registered_apps: "Tu âs chestis aplicazions client regjistradis:" revoke: Revoche! title: I miei detais OAuth new: submit: Regjistre title: Regjistre une gnove aplicazion show: + allow_read_prefs: lei lis sôs preferencis dal utent. + allow_write_api: modificâ la mape. + allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs. + allow_write_notes: cambiâ lis notis. + allow_write_prefs: modificâ lis sôs preferencis dal utent. + confirm: Sêstu sigûr? + delete: Elimine client edit: Cambie i detais + requests: "Domande i permès ca sot al utent:" title: Detais OAuth par {app_name} + redaction: + edit: + description: Descrizion + new: + description: Descrizion + show: + confirm: Sêstu sigûr? + description: "Descrizion:" + user: "Creadôr:" + update: + flash: Cambiaments salvâts. site: edit: anon_edits_link_text: Discuvierç parcè che al è cussì. @@ -823,18 +947,15 @@ fur: 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.) user_page_link: pagjine dal utent index: + createnote: Zonte une note js_1: Tu stâs doprant un sgarfadôr che nol supuarte JavaScript o ben JavaScript al è stât disativât. js_2: OpenStreetMap al dopre JavaScript par mostrâ la sô mape. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Dât fûr sot de licence %{license_name} di %{project_name} e i siei utents che a àn contribuît. - project_name: progjet OpenStreetMap + copyright: Copyright di OpenStreetMap e dai siei colaboradôrs, sot di une licence vierte permalink: Leam permanent remote_failed: Cambiament falît - siguriti che JOSM o Merkaartor a sedin inviâts e la opzion pal remote control e sedi ativade shortlink: Leam curt key: - map_key: Leiende - map_key_tooltip: Leiende de mape table: entry: admin: Confin aministratîf @@ -848,13 +969,16 @@ fur: - Comugnâi - prâts construction: Stradis in costruzion + forest: Bosc golf: Troi di golf industrial: Aree industriâl lake: - Lâc military: Aree militâr + motorway: Autostrade park: Parc pitch: Cjamp sportîf + primary: Strade primarie private: Acès privât rail: Ferade reserve: Riserve naturâl @@ -864,16 +988,33 @@ fur: school: - Scuele - universitât + secondary: Strade secondarie station: stazion de ferade tourist: Atrazion turistiche tram: - - tram + - Metropolitana leggera - tram tunnel: Rie a trats = galarie unsurfaced: Strade blancje + markdown_help: + alt: Test alternatîf + first: Prin element + heading: Titul + headings: Intestazions + image: Figure + link: Leam + ordered: Liste ordenade + second: Secont element + subheading: Sottitul + text: Test + title_html: Analizât cun Markdown + unordered: Liste no ordenade + url: URL + richtext_area: + edit: Cambie + preview: Anteprime search: search: Cîr - search_help: "esemplis: 'Cividât', 'Vie Julie, Naiarêt', 'CB2 5AQ', o se no 'post offices near Gurize' altris esemplis..." submit_text: Va where_am_i: Dulà soio? where_am_i_title: Descrîf il lûc atuâl doprant il motôr di ricercje @@ -887,6 +1028,8 @@ fur: create: trace_uploaded: Il to file GPX al è stât cjamât e al è cumò daûr a spietâ di jessi zontât ae base di dâts. Chest al sucêt in gjenar jentri di une ore; ti mandarìn un messaç cuant che il lavôr al sarà stât completât. upload_trace: Cjame percors GPS + description: + description_without_count: File GPS di %{user} edit: description: "Descrizion:" download: discjame @@ -904,7 +1047,10 @@ fur: uploaded_at: "Cjamât ai:" visibility: "Visibilitât:" visibility_help: ce vuelial dî? + georss: + title: Percors GPS di OpenStreetMap list: + description: Viôt i percors GPS cjamâts sù tai ultins timps public_traces: Percors GPS publics public_traces_from: Percors GPS publics di %{user} tagged_with: " etichetât cun %{tags}" @@ -915,13 +1061,14 @@ fur: count_points: "%{count} ponts" edit: cambie edit_map: Cambie mape + identifiable: IDENTIFICABIL in: in map: mape more: plui pending: IN SPIETE private: PRIVÂT public: PUBLIC - trace_details: "Cjale i detais dal percors:" + trace_details: Cjale i detais dal percors view_map: Viôt mape trace_form: description: "Descrizion:" @@ -939,9 +1086,9 @@ fur: trace_optionals: tags: Etichetis trace_paging_nav: - next: Sucessîf » - previous: « Precedent - showing_page: Daûr a mostrâ la pagjine %{page} + newer: Percors plui gnûfs + older: Percors plui vieris + showing_page: Pagjine %{page} view: delete_track: Elimine chest percors description: "Descrizion:" @@ -975,6 +1122,9 @@ fur: email never displayed publicly: (mai mostrade in public) flash update success: Informazions dal utent inzornadis cun sucès. flash update success confirm needed: Informazions dal utent inzornadis cun sucès. Controle la tô pueste par confermâ la tô gnove direzion di pueste eletroniche. + gravatar: + gravatar: Dopre Gravatar + link text: ce isal chest? home location: "Lûc iniziâl:" image: "Figure:" image size hint: (figuris cuadris di almancul 100x100 a van miôr) @@ -1009,11 +1159,13 @@ fur: update home location on click: Aio di inzornâ il lûc iniziâl cuant che o frachi parsore la mape? confirm: already active: Chest profîl al è za stât confermât. - before you start: O savìn che tu varâs premure di scomençâ a mapâ, ma prime tu podaressis jemplâ culì sot cualchidune des informazions su di te. button: Conferme - heading: Conferme di un profîl utent + heading: Controle la tô pueste! + introduction_1: Ti vin mandât un messaç di conferme. + introduction_2: Conferme il to profîl fracant sul leam tal messaç di pueste e tu podarâs scomençâ a mapâ daurman. press confirm button: Frache il boton Conferme par ativâ il to profîl. - success: Profîl confermât, graziis par jessiti regjistrât! + reconfirm_html: Se tu âs bisugne di un altri messaç di pueste par conferme, frache culì. + unknown token: Chest codiç di conferme al è scjadût o nol esist. confirm_email: button: Conferme heading: Conferme dal cambiament de direzion email @@ -1024,7 +1176,9 @@ fur: go_public: flash success: Ducj i tiei cambiaments a son cumò publics e tu puedis za scomençâ a lavorâ. list: + confirm: Conferme i utents selezionâts heading: Utents + hide: Plate i utents selezionâts showing: one: Pagjine %{page} (%{first_item} su %{items}) other: Pagjine %{page} (%{first_item}-%{last_item} su %{items}) @@ -1081,22 +1235,21 @@ fur: title: Password pierdude make_friend: already_a_friend: Tu sês za amì di %{name}. - success: "%{name} al è cumò to amì." + button: Zonte ai amîs + heading: Zontâ %{user} ai amîs? + success: "%{name} al è cumò to amì!" new: confirm email address: "Conferme direzion pueste:" confirm password: "Conferme la password:" - continue: Va indevant + continue: Regjistriti display name: "Non di mostrâ:" display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs gambiâlu plui tart tes preferencis. email address: "Direzion di pueste eletroniche:" - fill_form: Jemple il modul e ti mandarin in curt un messaç di pueste par ativâ il to profîl. - flash create success message: Graciis par jessiti regjistrât. Spiete che ti rivedi par pueste il messaç di conferme che o vin mandât a %{email} e po tu podarâs scomençâ a mapâ intun lamp :-)

    Se tu dopris un sisteme antispam che al mande richiestis di conferme, siguriti di meti te whitelist webmaster@openstreetmap.org, parcè che no podin rispuindi aes richiestis di conferme. - heading: Cree un account utent license_agreement: Creant un profîl tu scugnis aprovâ i tiermins par contribuî. openid: "%{logo} OpenID:" password: "Password:" terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî! - title: Cree profîl + title: Regjistriti use openid: O se no, dopre %{logo} OpenID par jentrâ no_such_user: body: Nol esist un utent di non %{user}. Controle par plasê la grafie o che tu vedis seguît il leam just. @@ -1107,6 +1260,8 @@ fur: nearby mapper: Mapadôr dongje your location: La tô posizion remove_friend: + button: Gjave dai amîs + heading: Vuelistu gjavâ dai amîs %{user}? not_a_friend: "%{name} nol è un dai tiei amîs." success: "%{name} al è stât gjavât dai tiei amîs." reset_password: @@ -1132,11 +1287,13 @@ fur: title: Tiermins par contribuî you need to accept or decline: Par plasê lei e po acete o refude i gnûfs Tiermins par Contribuî par lâ indevant. view: - add as friend: zonte ai amîs + activate_user: ative chest utent + add as friend: Zonte ai amîs ago: (%{time_in_words_ago} indaûr) - block_history: viôt i blocs ricevûts - blocks by me: blocs aplicâts di me - blocks on me: blocs su di me + block_history: blocs ricevûts + blocks by me: Blocs aplicâts di me + blocks on me: Blocs su di me + comments: Coments confirm: Conferme confirm_user: conferme chest utent create_block: bloche chest utent @@ -1145,40 +1302,47 @@ fur: ct declined: Refudâts ct status: "Tiermins par contribuî:" ct undecided: Nol à decidût + deactivate_user: disative chest utent delete_user: elimine chest utent description: Descrizion - diary: diari - edits: cambiaments + diary: Diari + edits: Cambiaments email address: "Direzion di pueste:" - friends_changesets: Viôt ducj i grups di cambiaments dai amîs - friends_diaries: Viôt dutis lis vôs di diari dai amîs + friends_changesets: grups di cambiaments dai amîs + friends_diaries: vôs di diari dai amîs hide_user: plate chest utent - if set location: Se tu impuestis la tô locazion, tu viodarâs culì une biele mape e altris informazions. Tu puedis impuestâ il to lûc iniziâl inte pagjine des %{settings_link}. + if set location: Impueste il to lûc iniziâl intes %{settings_link} par viodi i utents dongje di te. km away: "%{count}km di distance" latest edit: "Ultin cambiament %{ago}:" m away: "%{count}m di distance" mapper since: "Al mape dai:" - moderator_history: viôt i blocs ricevûts - my diary: il gno diari - my edits: miei cambiaments - my settings: mês impostazions - my traces: percors personâi + moderator_history: blocs aplicâts + my comments: I mei coments + my diary: Il gno diari + my edits: I miei cambiaments + my messages: I miei messaçs + my notes: Lis mês notis + my profile: Il gno profîl + my settings: Impostazions + my traces: I miei percors nearby users: Altris utents dongje - nearby_changesets: Viôt ducj i grups di cambiaments dai utents dongje - nearby_diaries: Viôt dutis lis vôs di diari dai utents dongje + nearby_changesets: grups di cambiaments dai utents dongje + nearby_diaries: vôs di diari dai utents dongje new diary entry: gnove vôs dal diari no friends: No tu âs ancjemò nissun amì. no nearby users: Nol è ancjemò nissun utent che al declare di mapâ dongje di te. + notes: Notis ae mape oauth settings: configurazion OAuth - remove as friend: gjave dai amîs + remove as friend: Gjave dai amîs role: administrator: Chest utent al è un aministradôr moderator: Chest utent al è un moderatôr - send message: mande messaç + send message: Mande messaç settings_link_text: impostazions spam score: "Ponts di spam:" status: "Stât:" - traces: percors + traces: Percors + unhide_user: mostre chest utent user location: Lûc dal utent your friends: I tiei amîs user_block: @@ -1195,8 +1359,10 @@ fur: show: Cjale chest bloc submit: Inzorne bloc helper: + time_future: Finìs ca di %{time}. time_past: Finît %{time} indaûr. index: + empty: No son stâts metûts blocs fin cumò. heading: Liste dai blocs dal utent title: Blocs dal utent new: @@ -1211,22 +1377,26 @@ fur: creator_name: Creadôr display_name: Utent blocât edit: Cambie + next: Sucessîf » not_revoked: (no revocât) + previous: « Precedent reason: Reson dal bloc revoke: Revoche! revoker_name: Revocât di show: Mostre + showing_page: Pagjine %{page} status: Stât period: one: 1 ore other: "%{count} oris" revoke: revoke: Revoche! + time_future: Chest bloc al finìs ca di %{time}. show: back: Cjale ducj i blocs confirm: Sêstu sigûr? edit: Cambie - heading: "%{block_on} blocked by %{block_by}" + heading: "%{block_on} blocât di %{block_by}" reason: "Reson dal bloc:" revoke: Revoche! revoker: "Chel che al à revocât:" @@ -1235,8 +1405,19 @@ fur: time_future: Finìs ca di %{time} time_past: Finît %{time} indaûr title: "%{block_on} blocât di %{block_by}" + update: + success: Bloc inzornât. user_role: grant: confirm: Conferme revoke: confirm: Conferme + welcome_page: + add_a_note: + title: No tu âs timp par fâ i cambiaments? Zonte une note! + questions: + title: Domandis? + start_mapping: Scomence a mapâ + title: Benvignût! + whats_on_the_map: + title: Ce ch'al è su la mape diff --git a/config/locales/gcf.yml b/config/locales/gcf.yml index d123823c353..2c551cc0fc6 100644 --- a/config/locales/gcf.yml +++ b/config/locales/gcf.yml @@ -61,15 +61,15 @@ gcf: data_frame_title: Doné details: Plis bitin drag_a_box: Désiné on rektang asi kat la pou chwazi on zonn - edited_by_user_at_timestamp: Édité pa [[user]] lè [[timestamp]] - history_for_feature: Istwa a [[feature]] + edited_by_user_at_timestamp: Édité pa %{user} lè %{timestamp} + history_for_feature: Istwa a %{feature} load_data: Chajé sé doné la - loaded_an_area_with_num_features: "Ou chwazi on zonn ki ti ni [[num_features]] éléman adan. Ti ni onlo navigatè ki pa ka sipòté tou sa zafè. Yo ka travay mié lè yo ti ni mwens ki 100 zéléman pou vwè: Si ou di wi navigatè aw ka riské vini mòlòkoy ouben pwan pann. Si ou sèten ou vlé vwè sé doné la ou pé pijé bouton la ki an ba." + loaded_an_area_with_num_features: "Ou chwazi on zonn ki ti ni %{num_features} éléman adan. Ti ni onlo navigatè ki pa ka sipòté tou sa zafè. Yo ka travay mié lè yo ti ni mwens ki 100 zéléman pou vwè: Si ou di wi navigatè aw ka riské vini mòlòkoy ouben pwan pann. Si ou sèten ou vlé vwè sé doné la ou pé pijé bouton la ki an ba." loading: Y ka chajé... manually_select: Chwazi manielman on dot zonn private_user: Itilizatè privé show_history: Vwè listwa la - unable_to_load_size: "Pa ni moyen chajé sé doné la: karé limit la ka mèziré [[bbox_size]] y tro gran (y dwèt pli piti ki %{max_bbox_size})" + unable_to_load_size: "Pa ni moyen chajé sé doné la: karé limit la ka mèziré %{bbox_size} y tro gran (y dwèt pli piti ki %{max_bbox_size})" wait: Atann... zoom_or_select: Gwosi ouben chwazi on zonn asi kat la pou vwèy diary_entry: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 5bccba24da0..47e7861a536 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1,9 +1,18 @@ # Messages for Galician (galego) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Elisardojm # Author: Gallaecio +# Author: Nemo bis # Author: Toliño +# Author: Vivaelcelta gl: + about_page: + copyright_html: ©Colaboradores do
    OpenStreetMap + local_knowledge_title: Coñecemento local + next: Seguinte + open_data_title: Datos libres + partners_title: Socios activerecord: attributes: diary_comment: @@ -12,7 +21,7 @@ gl: language: Lingua latitude: Latitude longitude: Lonxitude - title: Título + title: Asunto user: Usuario friend: friend: Amigo @@ -21,7 +30,7 @@ gl: body: Corpo recipient: Destinatario sender: Remitente - title: Título + title: Asunto trace: description: Descrición latitude: Latitude @@ -81,96 +90,62 @@ gl: blocked: O seu acceso á API foi bloqueado. Acceda ao sistema para atopar máis información na interface web. need_to_see_terms: O seu acceso á API está suspendido temporalmente. Acceda ao sistema para ollar os termos do colaborador. Non ten que aceptalos, pero debe coñecelos. browse: + anonymous: anónimo changeset: - changeset: "Conxunto de cambios: %{id}" + belongs_to: Autor changesetxml: Conxunto de cambios XML - download: Descargar %{changeset_xml_link} ou %{osmchange_xml_link} feed: title: Conxunto de cambios %{id} title_comment: Conxunto de cambios %{id} - %{comment} + node: Nodos (%{count}) + node_paginated: Nodos (%{x}-%{y} de %{count}) osmchangexml: osmChange XML - title: Conxunto de cambios - changeset_details: - belongs_to: "Pertence a:" - bounding_box: "Caixa de envoltura:" - box: caixa - closed_at: "Pechouse o:" - created_at: "Creado o:" - has_nodes: - one: "Ten o seguinte %{count} nodo:" - other: "Ten os seguintes %{count} nodos:" - has_relations: - one: "Ten a seguinte relación:" - other: "Ten as seguintes %{count} relacións:" - has_ways: - one: "Ten o seguinte camiño:" - other: "Ten os seguintes %{count} camiños:" - no_bounding_box: Non se seleccionou ningunha caixa de envoltura para este conxunto de cambios. - show_area_box: Mostrar o cadro da zona - common_details: - changeset_comment: "Comentario:" - deleted_at: "Borrado o:" - deleted_by: "Borrado por:" - edited_at: "Editado o:" - edited_by: "Editado por:" - in_changeset: "No conxunto de cambios:" - version: "Versión:" + relation: Relacións (%{count}) + relation_paginated: Relacións (%{x}-%{y} de %{count}) + title: "Conxunto de cambios: %{id}" + way: Camiños (%{count}) + way_paginated: Camiños (%{x}-%{y} de %{count}) + closed: Pechado + closed_by_html: Pechado hai %{time} por %{user} + closed_html: Pechado hai %{time} containing_relation: entry: Relación %{relation_name} entry_role: Relación %{relation_name} (como %{relation_role}) - map: - deleted: Borrado - edit: - area: Editar a zona - node: Editar o nodo - relation: Editar a relación - way: Editar o camiño - larger: - area: Ver a zona nun mapa máis grande - node: Ver o nodo nun mapa máis grande - relation: Ver a relación nun mapa máis grande - way: Ver o camiño nun mapa máis grande - loading: Cargando... - navigation: - all: - next_changeset_tooltip: Seguinte conxunto de cambios - next_node_tooltip: Nodo seguinte - next_relation_tooltip: Seguinte relación - next_way_tooltip: Camiño seguinte - prev_changeset_tooltip: Conxunto de cambios anterior - prev_node_tooltip: Nodo anterior - prev_relation_tooltip: Relación anterior - prev_way_tooltip: Camiño anterior - user: - name_changeset_tooltip: Ver as edicións de %{user} - next_changeset_tooltip: Seguinte edición de %{user} - prev_changeset_tooltip: Edición anterior de %{user} + created: Creado + created_by_html: Creado hai %{time} por %{user} + created_html: Creado hai %{time} + deleted_by_html: Borrado hai %{time} por %{user} + download_xml: Descargar en XML + edited_by_html: Editado hai %{time} por %{user} + in_changeset: Conxunto de cambios + location: "Localización:" + no_comment: (sen comentarios) node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Descargar en XML - edit: editar - node: Nodo - node_title: "Nodo: %{node_name}" - view_history: ver o historial - node_details: - coordinates: "Coordenadas:" - part_of: "Forma parte de:" - node_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Descargar en XML - node_history: Historial do nodo - node_history_title: "Historial do nodo: %{node_name}" - view_details: ver os detalles + history_title: "Historial do nodo: %{name}" + title: "Nodo: %{name}" not_found: - sorry: Sentímolo, non se puido atopar o %{type} co id %{id}. + sorry: Sentímolo, non se puido atopar o %{type} co nº%{id}. type: changeset: conxunto de cambios node: nodo relation: relación way: camiño - paging_nav: - of: de - showing_page: Mostrando a páxina + note: + closed_by: Resolto por %{user} hai %{when} + closed_by_anonymous: Resolto por un anónimo hai %{when} + closed_title: Nota resolta nº%{note_name} + commented_by: Comentado por %{user} hai %{when} + commented_by_anonymous: Comentado por un anónimo hai %{when} + hidden_by: Agochado por %{user} hai %{when} + hidden_title: Nota agochada nº%{note_name} + new_note: Nova nota + open_by: Creado por %{user} hai %{when} + open_by_anonymous: Creado por un anónimo hai %{when} + open_title: Nota sen resolver nº%{note_name} + reopened_by: Reactivado por %{user} hai %{when} + reopened_by_anonymous: Reactivado por un anónimo hai %{when} + title: "Nota: %{id}" + part_of: Parte de redacted: message_html: A versión %{version} deste %{type} non se pode mostrar tal como foi redactada. Consulte %{redaction_link} para obter máis detalles. redaction: Redacción %{id} @@ -179,65 +154,21 @@ gl: relation: relación way: camiño relation: - download: "%{download_xml_link} ou %{view_history_link}" - download_xml: Descargar en XML - relation: Relación - relation_title: "Relación: %{relation_name}" - view_history: ver o historial - relation_details: - members: "Membros:" - part_of: "Forma parte de:" - relation_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Descargar en XML - relation_history: Historial da relación - relation_history_title: "Historial da relación: %{relation_name}" - view_details: ver os detalles + history_title: "Historial da relación: %{name}" + members: Membros + title: "Relación: %{name}" relation_member: entry_role: "%{type} %{name} como %{role}" type: node: Nodo relation: Relación way: Camiño - start: - manually_select: Escoller manualmente unha zona distinta - view_data: Ver os datos para a vista do mapa actual start_rjs: - data_frame_title: Datos - data_layer_name: Explorar os datos do mapa - details: Detalles - drag_a_box: Arrastre unha caixa sobre o mapa para escoller unha zona - edited_by_user_at_timestamp: Editado por [[user]] o [[timestamp]] - hide_areas: Agochar as zonas - history_for_feature: Historial de [[feature]] + feature_warning: A carga de %{num_features} características pode facer que o seu navegador vaia lento ou que non responda. Está seguro de querer mostrar eses datos? load_data: Cargar os datos - loaded_an_area_with_num_features: Cargou unha zona que contén [[num_features]] funcionalidades. Pode que algúns navegadores teñan problemas para mostrar correctamente esta cantidade de datos. Xeralmente, os navegadores traballan mellor mostrando menos de 100 funcionalidades á vez. Utilizar máis pode provocar que o navegador vaia lento ou non responda. Se está seguro de que quere mostrar estes datos, pode facelo premendo no seguinte botón. loading: Cargando... - manually_select: Escoller manualmente unha zona distinta - object_list: - api: Obter esta área desde a API - back: Mostrar a lista de obxectos - details: Detalles - heading: Lista de obxectos - history: - type: - node: Nodo [[id]] - way: Camiño [[id]] - selected: - type: - node: Nodo [[id]] - way: Camiño [[id]] - type: - node: Nodo - way: Camiño - private_user: usuario privado - show_areas: Mostrar as zonas - show_history: Mostrar o historial - unable_to_load_size: "Non se puido cargar: o tamaño [[bbox_size]] da caixa de envoltura é grande de máis (ten que ser menor de %{max_bbox_size})" - wait: Agarde... - zoom_or_select: Escolla unha zona do mapa ou achéguese a ela para vela tag_details: - tags: "Etiquetas:" + tags: Etiquetas wiki_link: key: A páxina de descrición da etiqueta %{key} tag: A páxina de descrición da etiqueta %{key}=%{value} @@ -249,38 +180,25 @@ gl: node: nodo relation: relación way: camiño + version: Versión + view_details: Ver os detalles + view_history: Ver o historial way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Descargar en XML - edit: editar - view_history: ver o historial - way: Camiño - way_title: "Camiño: %{way_name}" - way_details: also_part_of: - one: tamén parte do camiño %{related_ways} - other: tamén parte dos camiños %{related_ways} - nodes: "Nodos:" - part_of: "Parte de:" - way_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Descargar en XML - view_details: ver os detalles - way_history: Historial do camiño - way_history_title: "Historial co camiño: %{way_name}" + one: parte do camiño %{related_ways} + other: parte dos camiños %{related_ways} + history_title: "Historial do camiño: %{name}" + nodes: Nodos + title: "Camiño: %{name}" changeset: changeset: anonymous: Anónimo - big_area: (grande) - no_comment: (ningún) no_edits: (sen edicións) - show_area_box: mostrar o cadro da zona - still_editing: (en edición) view_changeset_details: Ollar os detalles do conxunto de cambios changeset_paging_nav: next: Seguinte » previous: « Anterior - showing_page: Mostrando a páxina %{page} + showing_page: Páxina %{page} changesets: area: Zona comment: Comentario @@ -288,24 +206,17 @@ gl: saved_at: Gardado o user: Usuario list: - description: Cambios recentes - description_bbox: Conxuntos de cambios en %{bbox} - description_friend: Conxuntos de cambios dos seus amigos - description_nearby: Conxuntos de cambios dos usuarios de lugares próximos - description_user: Conxuntos de cambios por %{user} - description_user_bbox: Conxuntos de cambios por %{user} en %{bbox} - heading: Conxuntos de cambios - heading_bbox: Conxuntos de cambios - heading_friend: Conxuntos de cambios - heading_nearby: Conxuntos de cambios - heading_user: Conxuntos de cambios - heading_user_bbox: Conxuntos de cambios + empty: Non se atopou ningún conxunto de cambios. + empty_area: Non hai conxuntos de cambios nesta zona. + empty_user: Este usuario non ten ningún conxunto de cambios. + load_more: Cargar máis + no_more: Non se atopou ningún outro conxunto de cambios. + no_more_area: Non hai máis conxuntos de cambios nesta zona. + no_more_user: Este usuario non ten ningún outro conxunto de cambios. title: Conxuntos de cambios - title_bbox: Conxuntos de cambios en %{bbox} title_friend: Conxuntos de cambios dos seus amigos title_nearby: Conxuntos de cambios dos usuarios de lugares próximos title_user: Conxuntos de cambios por %{user} - title_user_bbox: Conxuntos de cambios por %{user} en %{bbox} timeout: sorry: Sentímolo, a lista do conxunto de cambios solicitada tardou demasiado tempo en ser recuperada. diary_entry: @@ -323,8 +234,9 @@ gl: hide_link: Agochar este comentario diary_entry: comment_count: - one: 1 comentario + one: "%{count} comentario" other: "%{count} comentarios" + zero: Sen comentarios comment_link: Comentar esta entrada confirm: Confirmar edit_link: Editar esta entrada @@ -359,7 +271,7 @@ gl: newer_entries: Entradas máis novas no_entries: Non hai entradas no diario older_entries: Entradas máis vellas - recent_entries: "Entradas recentes no diario:" + recent_entries: Entradas recentes no diario title: Diarios de usuarios title_friends: Diarios de amigos title_nearby: Diarios de usuarios de lugares próximos @@ -383,6 +295,9 @@ gl: user_title: Diario de %{user} editor: default: Predeterminado (actualmente, %{name}) + id: + description: iD (editor no navegador) + name: iD potlatch: description: Potlatch 1 (editor integrado no navegador) name: Potlatch 1 @@ -398,7 +313,7 @@ gl: area_to_export: Zona a exportar embeddable_html: HTML incorporable export_button: Exportar - export_details: Os datos do OpenStreetMap están licenciados baixo a licenza Creative Commons recoñecemento compartir igual 2.0 . + export_details: Os datos do OpenStreetMap están licenciados baixo a licenza Open Data Commons Open Database License (ODbL). format: Formato format_to_export: Formato de exportación image_size: Tamaño da imaxe @@ -414,29 +329,45 @@ gl: paste_html: Pegue o código HTML para incluílo na páxina web scale: Escala too_large: - body: Esta zona é grande de máis para ser exportada como datos XML do OpenStreetMap. Amplíe a zona ou escolla unha menor. - heading: Zona demasiado grande + advice: "Se a exportación anterior falla, considere utilizar unha das fontes listadas a continuación:" + body: "Esta zona é grande de máis para ser exportada como datos XML do OpenStreetMap. Amplíe a zona ou escolla unha menor, ou utilice unha das seguintes fontes para as descargas masivas de datos:" + geofabrik: + description: Extraccións actualizadas regularmente dalgúns continentes, países e cidades seleccionados + title: Descargas Geofabrik + metro: + description: Extraccións das maiores cidades do mundo e as súas zonas próximas + title: Extraccións Metro + other: + description: Fontes adicionais listadas no wiki do OpenStreetMap + title: Outras fontes + overpass: + description: Descargar esta caixa desde un espello da base de datos do OpenStreetMap + title: Pasarela da API + planet: + description: Copias actualizadas regularmente da base de datos do OpenStreetMap ao completo + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Engadir un marcador ao mapa - change_marker: Cambiar a posición do marcador - click_add_marker: Prema sobre o mapa para engadir un marcador - drag_a_box: Arrastre unha caixa sobre o mapa para escoller unha zona - export: Exportar - manually_select: Escoller manualmente unha zona distinta - view_larger_map: Ver un mapa máis grande + title: Exportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Simplemente, prema en ou na mesma icona na visualización do mapa.\nIsto ha engadir un marcador ao mapa que pode mover\narrastrándoo. Engada a súa mensaxe, prema en \"Gardar\" e outras persoas investigarán iso." + join_the_community: + explanation_html: "Se atopa algún problema cos datos dos nosos mapas (por exemplo, se falta algunha estrada), o mellor é\nunirse á comunidade do OpenStreetMap e engadir ou corrixir os datos directamente." + title: Únase á comunidade + title: Como axudar + other_concerns: + title: Outras preocupacións + title: Informar dun problema/Corrixir o mapa geocoder: description: title: geonames: Localización desde GeoNames - osm_namefinder: "%{types} desde OpenStreetMap Namefinder" osm_nominatim: Localización desde OpenStreetMap Nominatim types: cities: Cidades places: Lugares towns: Municipios - description_osm_namefinder: - prefix: "%{distance} ao %{direction} de %{type}" direction: east: leste north: norte @@ -457,16 +388,26 @@ gl: title: ca_postcode: Resultados desde Geocoder.CA geonames: Resultados desde GeoNames + geonames_reverse: Resultados desde GeoNames latlon: Resultados internos - osm_namefinder: Resultados desde OpenStreetMap Namefinder osm_nominatim: Resultados desde OpenStreetMap Nominatim + osm_nominatim_reverse: Resultados desde OpenStreetMap Nominatim uk_postcode: Resultados desde NPEMap / FreeThe Postcode us_postcode: Resultados desde Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} ao %{direction} de %{placename}" search_osm_nominatim: + admin_levels: + level10: Fronteira do barrio + level2: Fronteira do país + level4: Fronteira do estado/provincia + level5: Fronteira da rexión + level6: Fronteira do condado + level8: Fronteira da cidade + level9: Fronteira da vila prefix: + aerialway: + chair_lift: Teleférico + drag_lift: Telesquí + station: Estación de telesquí aeroway: aerodrome: Aeródromo apron: Plataforma @@ -560,6 +501,7 @@ gl: shower: Ducha social_centre: Centro social social_club: Club social + social_facility: Servizos sociais studio: Estudio supermarket: Supermercado swimming_pool: Piscina @@ -588,6 +530,9 @@ gl: "yes": Ponte building: "yes": Construción + emergency: + fire_hydrant: Boca de incendios + phone: Teléfono de emerxencia highway: bridleway: Pista de cabalos bus_guideway: Liña de autobuses guiados @@ -609,6 +554,7 @@ gl: platform: Plataforma primary: Estrada principal primary_link: Estrada principal + proposed: Proxecto de estrada raceway: Circuíto residential: Residencial rest_area: Área de lecer @@ -620,6 +566,7 @@ gl: speed_camera: Radar steps: Chanzos stile: Escada + street_lamp: Luminaria tertiary: Estrada terciaria tertiary_link: Estrada terciaria track: Pista @@ -635,6 +582,7 @@ gl: building: Construción castle: Castelo church: Igrexa + citywalls: Muralla fort: Forte house: Casa icon: Icona @@ -644,6 +592,7 @@ gl: monument: Monumento museum: Museo ruins: Ruínas + tomb: Sepulcro tower: Torre wayside_cross: Cruce de camiños wayside_shrine: Santuario no camiño @@ -711,6 +660,8 @@ gl: airfield: Aeródromo militar barracks: Barracas bunker: Búnker + mountain_pass: + "yes": Porto de montaña natural: bay: Baía beach: Praia @@ -724,7 +675,7 @@ gl: fell: Brañal fjord: Fiorde forest: Bosque - geyser: Geyser + geyser: Géyser glacier: Glaciar heath: Breixeira hill: Outeiro @@ -780,6 +731,7 @@ gl: locality: Localidade moor: Páramo municipality: Municipio + neighbourhood: Veciñanza postcode: Código postal region: Rexión sea: Mar @@ -805,8 +757,10 @@ gl: narrow_gauge: Vía ferroviaria estreita platform: Plataforma ferroviaria preserved: Vía ferroviaria conservada + proposed: Proxecto de vía ferroviaria spur: Vía ramificada station: Estación de ferrocarril + stop: Parada de ferrocarril subway: Estación de metro subway_entrance: Boca de metro switch: Puntos de cambio de vía @@ -822,6 +776,7 @@ gl: beverages: Tenda de bebidas bicycle: Tenda de bicicletas books: Libraría + boutique: Boutique butcher: Carnizaría car: Concesionario car_parts: Recambios de automóbil @@ -835,6 +790,7 @@ gl: convenience: Tenda 24 horas copyshop: Tenda de fotocopias cosmetics: Tenda de cosméticos + deli: Tenda de delicias department_store: Gran almacén discount: Tenda de descontos doityourself: Tenda de bricolaxe @@ -871,17 +827,21 @@ gl: organic: Tenda de alimentos orgánicos outdoor: Tenda de deportes ao aire libre pet: Tenda de mascotas + pharmacy: Farmacia photo: Tenda de fotografía salon: Salón de beleza + second_hand: Tenda de segunda man shoes: Zapataría shopping_centre: Centro comercial sports: Tenda de deportes stationery: Papelaría supermarket: Supermercado + tailor: Xastraría toys: Xoguetaría travel_agency: Axencia de viaxes video: Tenda de vídeos wine: Tenda de licores + "yes": Tenda tourism: alpine_hut: Cabana alpina artwork: Obra de arte @@ -904,6 +864,7 @@ gl: viewpoint: Miradoiro zoo: Zoolóxico tunnel: + culvert: Sumidoiro "yes": Túnel waterway: artificial: Vía fluvial artificial @@ -927,65 +888,116 @@ gl: water_point: Punto de auga waterfall: Fervenza weir: Vaira + help_page: + help: + description: Formule unha pregunta ou busque respostas no sitio de preguntas e respostas do OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: "O OpenStreetMap ten varios recursos para aprender sobre o proxecto, para formular e responder preguntas,\nasí como para debater e documentar colaborativamente sobre temas de cartografía." + title: Obter axuda + welcome: + description: Comece con esta guía rápida cos principios básicos do OpenStreetMap. + title: Dámoslle a benvida ao OSM + url: /welcome + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Pechar + edit_help: Desplace o mapa e amplíeo na localización que queira editar; logo, prema aquí. + key: + title: Lenda do mapa + tooltip: Lenda do mapa + tooltip_disabled: A lenda do mapa só está dispoñible para a capa estándar map: base: cycle_map: Mapa ciclista + hot: Humanitario mapquest: MapQuest Open standard: Estándar transport_map: Mapa de transporte + copyright: © Colaboradores do OpenStreetMap + donate_link_text: + layers: + data: Datos do mapa + header: Capas do mapa + notes: Notas de mapa + overlays: Activar a sobreposición para reparar o mapa + title: Capas + locate: + popup: Está a {distance} {unit} deste punto + title: Mostrar a miña localización + zoom: + in: Ampliar + out: Reducir + notes: + new: + add: Engadir a nota + intro: Co fin de mellorar o mapa, a información que insire móstrase aos demais cartógrafos. Sexa todo o descritivo e preciso que poida ao mover o marcador á posición correcta e inserir a súa nota. + show: + anonymous_warning: Esta nota inclúe comentarios de usuarios anónimos que deben verificarse independentemente. + comment: Comentar + comment_and_resolve: Comentar e resolver + hide: Agochar + reactivate: Reactivar + resolve: Resolver + share: + cancel: Cancelar + center_marker: Centrar o mapa no marcador + custom_dimensions: Establecer dimensións personalizadas + download: Descargar + embed: HTML + format: "Formato:" + image: Imaxe + image_size: A imaxe mostrará a capa estándar en + include_marker: Incluír o marcador + link: Ligazón ou HTML + long_link: Ligazón + paste_html: Pegue o código HTML para incluílo na páxina web + scale: "Escala:" + short_link: Ligazón abreviada + short_url: Enderezo URL curto + title: Compartir + view_larger_map: Ver un mapa máis grande site: + createnote_disabled_tooltip: Achegar o mapa para engadirlle unha nota + createnote_tooltip: Engadir unha nota ao mapa edit_disabled_tooltip: Achegue para editar o mapa edit_tooltip: Editar o mapa - edit_zoom_alert: Debe achegar para editar o mapa - history_disabled_tooltip: Achegue para ollar as edicións nesta zona - history_tooltip: Ollar as edicións feitas nesta zona - history_zoom_alert: Debe achegarse para ollar as edicións nesta zona + map_data_zoom_in_tooltip: Achegar para ver os datos do mapa + map_notes_zoom_in_tooltip: Achegar para ver as notas do mapa layouts: + about: Acerca de community: Comunidade community_blogs: Blogues da comunidade community_blogs_title: Blogues de membros da comunidade do OpenStreetMap - copyright: Dereitos de autor e licenza - documentation: Documentación - documentation_title: Documentación do proxecto + copyright: Dereitos de autoría + data: Datos donate: Apoie o OpenStreetMap %{link} ao fondo de actualización de hardware. - donate_link_text: doando edit: Editar edit_with: Editar con %{editor} export: Exportar - export_tooltip: Exportar os datos do mapa + export_data: Exportar os datos foundation: Fundación foundation_title: A fundación do OpenStreetMap gps_traces: Pistas GPS gps_traces_tooltip: Xestionar as pistas GPS help: Axuda - help_centre: Centro de axuda - help_title: Sitio de axuda do proxecto history: Historial - home: inicio - home_tooltip: Ir ao meu domicilio - inbox: caixa de entrada (%{count}) - inbox_tooltip: - one: A súa caixa de entrada contén 1 mensaxe sen ler - other: A súa caixa de entrada contén %{count} mensaxes sen ler - zero: Non hai mensaxes novas na súa caixa de entrada - intro_1: O OpenStreetMap é un mapa libre de todo o mundo que se pode editar. Está feito por xente coma vostede. + home: Ir á localización inicial intro_2_create_account: Cree unha conta de usuario - intro_2_download: descargar - intro_2_html: Os datos pódense %{download} e %{use} de xeito libre baixo unha %{license}. %{create_account} para mellorar o mapa. - intro_2_license: licenza aberta - intro_2_use: utilizar - license: - title: Os datos do OpenStreetMap están licenciados baixo a licenza Creative Commons recoñecemento xenérico 2.0 - log_in: rexistro + intro_header: Dámoslle a benvida ao OpenStreetMap! + intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma vostede e de libre uso baixo unha licenza aberta. + learn_more: Máis información + log_in: Rexistro log_in_tooltip: Acceder ao sistema cunha conta existente logo: alt_text: Logo do OpenStreetMap - logout: saír - logout_tooltip: Saír ao anonimato + logout: Saír make_a_donation: text: Facer unha doazón title: Apoie o OpenStreetMap cunha doazón + more: Máis osm_offline: A base de datos do OpenStreetMap atópase desconectada mentres realizamos traballos de mantemento nela. osm_read_only: A base de datos do OpenStreetMap atópase en modo de só lectura mentres realizamos traballos de mantemento nela. partners_bytemark: Bytemark Hosting @@ -993,24 +1005,47 @@ gl: partners_ic: Imperial College London partners_partners: socios partners_ucl: centro de realidade virtual do UCL - sign_up: rexistrarse + sign_up: Rexistrarse sign_up_tooltip: Crear unha conta para editar - sotm2011: Veña á conferencia do OpenStreetMap de 2011, O estado do mapa, do 9 ao 11 de setembro en Denver! + start_mapping: Comezar a cartografiar tag_line: O mapa mundial libre user_diaries: Diarios de usuario user_diaries_tooltip: Ollar os diarios do usuario - view: Ver - view_tooltip: Ver o mapa - welcome_user: Benvido, %{user_link} - welcome_user_link_tooltip: A súa páxina de usuario - wiki: wiki - wiki_title: Wiki de axuda do proxecto license_page: foreign: english_link: a orixinal en inglés text: En caso de conflito entre esta páxina traducida e %{english_original_link}, a páxina en inglés prevalecerá title: Acerca desta tradución - legal_babble: "

    Dereitos de autor e licenza

    \n

    \n O OpenStreetMap é de datos abertos e atópase baixo a licenza Creative\n Commons recoñecemento compartir igual 2.0 (CC BY-SA).\n

    \n

    \n Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos mapas\n e datos, na medida en que acredite o OpenStreetMap e mais os seus\n colaboradores. Se altera ou constrúe a partir dos nosos mapas ou datos, terá\n que distribuír o resultado baixo a mesma licenza. O\n texto\n legal ao completo explica os seus dereitos e responsabilidades.\n

    \n\n

    Como acreditar o OpenStreetMap

    \n

    \n Se está a empregar imaxes dos mapas do OpenStreetMap, pedímoslle que\n acredite o traballo con, polo menos: “© dos colaboradores do\n OpenStreetMap, CC BY-SA”. Se tan só emprega datos dos mapas,\n pedímoslle que inclúa: “Datos do mapa © dos colaboradores do OpenStreetMap,\n CC BY-SA”.\n

    \n

    \n Onde sexa posible, debe haber unha ligazón ao OpenStreetMap cara a http://www.openstreetmap.org/\n e ao CC BY-SA cara a http://creativecommons.org/licenses/by-sa/2.0/. Se\n fai uso dun medio que non permite as ligazóns (por exemplo, unha\n obra impresa), suxerimos que dirixa os lectores cara a\n www.openstreetmap.org (quizais expandindo\n “OpenStreetMap“ ao enderezo ao completo) e cara a\n www.creativecommons.org.\n

    \n\n

    Máis información

    \n

    \n Descubra máis sobre como empregar os nosos datos nas preguntas máis frecuentes\n sobre asuntos legais.\n

    \n

    \n Lembramos aos colaboradores do OSM que nunca engadan datos de\n fontes con dereitos de autor (por exemplo, o Google Maps ou mapas impresos) sen\n o permiso explícito dos posuidores deses dereitos.\n

    \n

    \n Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un\n mapa API gratuíto aos desenvolvedores.\n\n Vexa a política de uso da API,\n a política de uso de cuadrantes\n e a política de uso do Nominatim.\n

    \n\n

    Os nosos colaboradores

    \n

    \n A nosa licenza CC BY-SA necesita que “dea crédito ao autor\n orixinal de xeito razoable segundo o medio ou medios que estea a\n utilizar”. Os usuarios individuais do OSM non solicitan outro\n crédito ca “colaboradores do OpenStreetMap”,\n pero en caso de inclusión de datos dunha axencia nacional ou\n outra fonte maior, pode ser razoable acreditalos reproducindo\n directamente o seu crédito ou ligando cara a el nesta páxina.\n

    \n\n\n\n
      \n
    • Australia: Contén datos de barrios baseados\n nos datos do Australian Bureau of Statistics.
    • \n
    • Austria: Contén datos de\n Stadt Wien (baixo a licenza\n CC BY),\n Land Vorarlberg e\n Land Tirol (baixo a licenza CC-BY AT con emendas).
    • \n
    • Canadá: Contén datos de\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada) e StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Francia: Contén datos con orixe na\n Direction Générale des Impôts.
    • \n
    • Países Baixos: Contén datos de © AND, 2007\n (www.and.com)
    • \n
    • Nova Zelandia: Contén datos con orixe no\n Land Information New Zealand. Dereitos de autor da coroa.
    • \n
    • Polonia: Contén datos dos mapas UMP-pcPL. Dereitos de autor\n dos colaboradores do UMP-pcPL.\n \n Máis información sobre o uso que fai o OSM dos datos do UMP
    • \n
    • Sudáfrica: Contén datos con orixe no\n Chief Directorate:\n National Geo-Spatial Information, dereitos de autor do estado reservados.
    • \n
    • Reino Unido: Contén datos da Ordnance\n Survey © Dereitos de autor da coroa e dereitos da base de datos\n 2010.
    • \n
    \n\n

    \n A inclusión de datos no OpenStreetMap non implica que o que\n orixinalmente proporcionou os datos apoie o OpenStreetMap,\n dea calquera garantía ou acepte calquera responsabilidade.\n

    " + legal_babble: + attribution_example: + alt: Exemplo de como recoñecer o OpenStreetMap nunha páxina web + title: Exemplo de recoñecemento + contributors_at_html: "Austria: Contén datos de\nStadt Wien (baixo a licenza\nCC BY),\nLand Vorarlberg e\nLand Tirol (baixo a licenza CC-BY AT con emendas)." + contributors_ca_html: "Canadá: Contén datos de\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada) e StatCan (Geography Division,\nStatistics Canada)." + contributors_fi_html: "Finlandia: Contén datos da\nNational Land Survey of Finland's Topographic Database\ne outros conxuntos de datos, baixo a\nlicenza NLSFI." + contributors_footer_1_html: "Para obter máis información sobre estas e outras fontes usadas\npara axudar na mellora do OpenStreetMap, bote unha ollada á páxina dos\ncolaboradores no wiki do OpenStreetMap." + contributors_footer_2_html: "A inclusión de datos no OpenStreetMap non implica que o que\norixinalmente proporcionou os datos apoie o OpenStreetMap,\ndea calquera garantía ou acepte calquera responsabilidade." + contributors_fr_html: "Francia: Contén datos con orixe na\nDirection Générale des Impôts." + contributors_gb_html: "Reino Unido: Contén datos da Ordnance\nSurvey © Dereitos de autor da coroa e dereito da base de datos\n2010-12." + contributors_intro_html: "Os nosos colaboradores son miles de persoas. Tamén incluímos\ndatos baixo licenzas abertas de axencias nacionais de cartografía\ne outras fontes, entre elas:" + contributors_nl_html: "Países Baixos: Contén datos de © AND, 2007\n(www.and.com)" + contributors_nz_html: "Nova Zelandia: Contén datos con orixe no\nLand Information New Zealand. Dereitos de autor da coroa." + contributors_title_html: Os nosos colaboradores + contributors_za_html: "Sudáfrica: Contén datos con orixe no\nChief Directorate:\nNational Geo-Spatial Information, dereitos de autor do estado reservados." + credit_1_html: "Pedímoslle que acredite o traballo así: “© dos colaboradores do\nOpenStreetMap”." + credit_2_html: "Cómpre tamén deixar claro que os datos están dispoñibles baixo a Open \nDatabase License e, se utiliza os cuadrantes dos nosos mapas, que os datos cartográficos\nestán baixo a licenza CC-BY-SA. Pode facelo ligando con\nesta páxina.\nComo alternativa, e obrigatoriamente se está distribuíndo o OSM nun\nformulario de datos, pode nomear e ligar directamente cara á(s) licenza(s). Naqueles medios\nnos que non sexa posible incluír as ligazóns (por exemplo, nas obras impresas), suxerimos\nque dirixa aos lectores a openstreetmap.org (quizais poñendo o texto\n\"OpenStreetMap\" no enderezo completo), a opendatacommons.org e,\nse fose relevante, a creativecommons.org." + credit_3_html: "Nun mapa electrónico explorable, o crédito debe aparecer na beira do mapa.\nPor exemplo:" + credit_title_html: Como acreditar o OpenStreetMap + infringement_1_html: "Lembramos aos colaboradores do OSM que nunca engadan datos de\nfontes con dereitos de autor (por exemplo, o Google Maps ou mapas impresos) sen\no permiso explícito dos posuidores deses dereitos." + infringement_2_html: "Se pensa que se engadiu material protexido de xeito inapropiado\ná base de datos do OpenStreetMap ou a este sitio, consulte\no noso procedemento\npara retirar datos ou deixe unha notificación no noso\nformulario en liña." + infringement_title_html: Violación dos dereitos de autoría + intro_1_html: "O OpenStreetMap é de datos abertos e atópase baixo a Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Vostede é libre de copiar, distribuír, transmitir e adaptar os nosos datos,\nna medida en que acredite o OpenStreetMap e mais os seus\ncolaboradores. Se altera ou constrúe a partir dos nosos datos, terá\nque distribuír o resultado baixo a mesma licenza. O\ntexto\nlegal ao completo explica os seus dereitos e responsabilidades." + intro_3_html: "Os datos cartográficos dos cuadrantes dos nosos mapas e a nosa documentación\natópanse baixo a licenza Creative\nCommons recoñecemento compartir igual 2.0 (CC BY-SA)." + more_1_html: "Descubra máis sobre como empregar os nosos datos e como acreditarnos nas preguntas máis frecuentes\nsobre asuntos legais." + more_2_html: "Malia que o OpenStreetMap é de datos abertos, non podemos proporcionar un\nmapa API gratuíto aos desenvolvedores.\nVexa a política de uso da API,\na política de uso de cuadrantes\ne a política de uso do Nominatim." + more_title_html: Máis información + title_html: Dereitos de autoría e licenza native: mapping_link: comezar a contribuír native_link: versión en galego @@ -1070,12 +1105,9 @@ gl: title: Caixa de saída to: Para read: - back_to_inbox: Volver á caixa de entrada - back_to_outbox: Volver á caixa de saída + back: Volver date: Data from: De - reading_your_messages: Lendo as súas mensaxes - reading_your_sent_messages: Lendo as mensaxes enviadas reply_button: Responder subject: Asunto title: Ler a mensaxe @@ -1086,6 +1118,37 @@ gl: wrong_user: Accedeu ao sistema como "%{user}", pero a mensaxe que pediu responder non lla enviou a ese usuario. Acceda co usuario correcto para redactar a resposta. sent_message_summary: delete_button: Borrar + note: + description: + closed_at_by_html: Resolto hai %{when} por %{user} + closed_at_html: Resolto hai %{when} + commented_at_by_html: Cargado hai %{when} por %{user} + commented_at_html: Cargado hai %{when} + opened_at_by_html: Creado hai %{when} por %{user} + opened_at_html: Creado hai %{when} + reopened_at_by_html: Reactivado hai %{when} por %{user} + reopened_at_html: Reactivado hai %{when} + entry: + comment: Comentario + full: Nota completa + mine: + ago_html: hai %{when} + created_at: Creado o + creator: Creador + description: Descrición + heading: Notas de %{user} + id: ID + last_changed: Última modificación + subheading: Notas enviadas ou comentadas por %{user} + title: Notas enviadas ou comentadas por %{user} + rss: + closed: nota pechada (preto de %{place}) + commented: comentario novo (preto de %{place}) + description_area: Unha lista das notas recibidas, comentadas ou pechadas na súa zona [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Unha fonte de novas RSS para a nota %{id} + opened: nota nova (preto de %{place}) + reopened: nota reactivada (preto de %{place}) + title: Notas do OpenStreetMap notifier: diary_comment_notification: footer: Tamén pode ler o comentario en %{readurl}, comentar en %{commenturl} ou responder en %{replyurl} @@ -1101,8 +1164,7 @@ gl: email_confirm_plain: click_the_link: Se este é vostede, prema na seguinte ligazón para confirmar a modificación. greeting: "Ola:" - hopefully_you_1: Alguén (probablemente vostede) quere cambiar o seu enderezo de correo electrónico en - hopefully_you_2: "%{server_url} a %{new_address}." + hopefully_you: Alguén (probablemente vostede) quere cambiar o seu enderezo de correo electrónico en %{server_url} a %{new_address}. friend_notification: befriend_them: Tamén pode engadilo como amigo en %{befriendurl}. had_added_you: "%{user} engadiuno como amigo en OpenStreetMap." @@ -1131,54 +1193,51 @@ gl: lost_password_plain: click_the_link: Se este é vostede, prema na seguinte ligazón para restablecer o seu contrasinal. greeting: "Ola:" - hopefully_you_1: Alguén (probablemente vostede) pediu o restablecemento do contrasinal desta - hopefully_you_2: conta de correo electrónico en openstreetmap.org + hopefully_you: Alguén (probablemente vostede) pediu o restablecemento do contrasinal desta conta de correo electrónico en openstreetmap.org. message_notification: - footer1: Tamén pode ler a mensaxe en %{readurl} - footer2: e pode responder en %{replyurl} + footer_html: Tamén pode ler a mensaxe en %{readurl} e pode responder en %{replyurl} header: "%{from_user} envioulle unha mensaxe a través do OpenStreetMap co asunto \"%{subject}\":" hi: "Ola %{to_user}:" + note_comment_notification: + anonymous: Un usuario anónimo + closed: + commented_note: "%{commenter} resolveu unha das súas notas de mapa nas que vostede comentou. A nota está preto de %{place}." + subject_other: "[OpenStreetMap] %{commenter} resolveu unha das notas nas que ten interese" + subject_own: "[OpenStreetMap] %{commenter} resolveu unha das súas notas" + your_note: "%{commenter} resolveu unha das súas notas de mapa preto de %{place}." + commented: + commented_note: "%{commenter} deixou un comentario nunha das súas notas de mapa nas que vostede comentou. A nota está preto de %{place}." + subject_other: "[OpenStreetMap] %{commenter} comentou nunha das notas nas que ten interese" + subject_own: "[OpenStreetMap] %{commenter} comentou nunha das súas notas" + your_note: "%{commenter} deixou un comentario nunha das súas notas de mapa preto de %{place}." + details: Pode atopar máis detalles da nota en %{url}. + greeting: "Ola:" + reopened: + commented_note: "%{commenter} reactivou unha das súas notas de mapa nas que vostede comentou. A nota está preto de %{place}." + subject_other: "[OpenStreetMap] %{commenter} reactivou unha das notas nas que ten interese" + subject_own: "[OpenStreetMap] %{commenter} reactivou unha das súas notas" + your_note: "%{commenter} reactivou unha das súas notas de mapa preto de %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirme o seu enderezo de correo electrónico" - signup_confirm_html: - ask_questions: Pode facer calquera pregunta en relación ao OpenStreetMap no noso sitio de preguntas e respostas. - click_the_link: Se este é vostede, benvido! Prema na ligazón que aparece a continuación para confirmar a súa conta e obter máis información sobre o OpenStreetMap. - current_user: "A lista de todos os usuarios por categorías, baseada segundo a súa localización no mundo, está dispoñible en: Category:Users_by_geographical_region." - get_reading: Infórmese sobre o OpenStreetMap no wiki, póñase ao día das últimas novas a través do blogue ou o Twitter do OpenStreetMap ou vaia polo blogue OpenGeoData de Steve Coast, o fundador do OpenStreetMap, para ler a pequena historia do proxecto e escoitar os podcasts tamén! - greeting: Boas! - hopefully_you: Alguén (probablemente vostede) quere crear unha conta en - introductory_video: Pode ollar un %{introductory_video_link}. - more_videos: Hai %{more_videos_link}. - more_videos_here: máis vídeos aquí - user_wiki_page: Recoméndase crear unha páxina de usuario que inclúa etiquetas de categoría que indiquen a súa localización, como [[Category:Users_in_London]]. - video_to_openstreetmap: vídeo introdutorio ao OpenStreetMap - wiki_signup: Poida que tamén queira crear unha conta no wiki do OpenStreetMap. - signup_confirm_plain: - ask_questions: "Pode facer calquera pregunta en relación ao OpenStreetMap no noso sitio de preguntas e respostas:" - blog_and_twitter: "Póñase ao día das últimas novas a través do blogue ou o Twitter do OpenStreetMap:" - click_the_link_1: Se este é vostede, benvido! Prema na ligazón que aparece a continuación para confirmar a súa - click_the_link_2: conta e obter máis información sobre o OpenStreetMap. - current_user_1: A lista de todos os usuarios por categorías, baseada segundo a súa localización no mundo, - current_user_2: "está dispoñible en:" + confirm: "Antes de facer nada, cómpre confirmar que esta solicitude veu de vostede. Se é así, prema na ligazón inferior para confirmar a conta:" + created: Alguén (probablemente vostede) acaba de crear unha conta en %{site_url}. greeting: Boas! - hopefully_you: Alguén (probablemente vostede) quere crear unha conta en - introductory_video: "Pode ollar un vídeo introdutorio ao OpenStreetMap aquí:" - more_videos: "Hai máis vídeos aquí:" - opengeodata: "OpenGeoData.org é o blogue de Steve Coast, o fundador do OpenStreetMap. Tamén ten podcasts:" - the_wiki: "Lea máis acerca do OpenStreetMap no wiki:" - user_wiki_1: Recoméndase crear unha páxina de usuario que inclúa - user_wiki_2: etiquetas de categoría que indiquen a súa localización, como [[Category:Users_in_London]]. - wiki_signup: "Poida que tamén queira crear unha conta no wiki do OpenStreetMap en:" + subject: "[OpenStreetMap] Dámoslle a benvida ao OpenStreetMap" + welcome: Despois de confirmar a súa conta, proporcionarémoslle algunha información adicional como axuda para comezar. oauth: oauthorize: allow_read_gpx: ler as súas pistas GPS privadas. allow_read_prefs: ler as súas preferencias de usuario. - allow_to: "Permitir a aplicación de cliente a:" + allow_to: "Permitir á aplicación de cliente a:" allow_write_api: modificar o mapa. allow_write_diary: crear entradas de diario, comentarios e facer amigos. allow_write_gpx: cargar pistas GPS. + allow_write_notes: modificar as notas. allow_write_prefs: modificar as súas preferencias de usuario. request_access: A aplicación %{app_name} solicita acceso á súa conta, %{user}. Comprobe que desexa que a aplicación teña as seguintes capacidades. Pode elixir cantas queira. + oauthorize_failure: + invalid: O pase de autorización non é válido. + oauthorize_success: + verification: O código de verificación é %{code}. revoke: flash: Revogou o pase de %{application} oauth_clients: @@ -1195,6 +1254,7 @@ gl: allow_write_api: modificar o mapa. allow_write_diary: crear entradas de diario, comentarios e facer amigos. allow_write_gpx: cargar pistas GPS. + allow_write_notes: modificar as notas. allow_write_prefs: modificar as súas preferencias de usuario. callback_url: URL de retorno name: Nome @@ -1225,6 +1285,7 @@ gl: allow_write_api: modificar o mapa. allow_write_diary: crear entradas de diario, comentarios e facer amigos. allow_write_gpx: cargar pistas GPS. + allow_write_notes: modificar as notas. allow_write_prefs: modificar as súas preferencias de usuario. authorize_url: "Autorizar o URL:" confirm: Está seguro? @@ -1233,7 +1294,7 @@ gl: key: "Clave do consumidor:" requests: "Solicitar os seguintes permisos ao usuario:" secret: "Pregunta secreta do consumidor:" - support_notice: Soportamos HMAC-SHA1 (recomendado), así como texto sinxelo en modo ssl. + support_notice: Soportamos HMAC-SHA1 (recomendado) e sinaturas RSA-SHA1. title: Detalles OAuth para %{app_name} url: "Solicitar un URL de pase:" update: @@ -1273,6 +1334,7 @@ gl: edit: anon_edits_link_text: Descubra aquí o motivo. flash_player_required: Necesita un reprodutor de Flash para usar o Potlatch, o editor Flash do OpenStreetMap. Pode descargar o reprodutor Flash desde Adobe.com. Hai dispoñibles outras opcións para editar o OpenStreetMap. + id_not_configured: iD non está configurado no_iframe_support: O seu navegador non soporta os iframes HTML, necesarios para esta característica. not_public: Non fixo que as súas edicións fosen públicas. not_public_description: Non pode editar o mapa a menos que o faga. Pode establecer as súas edicións como públicas desde a súa %{user_page}. @@ -1281,18 +1343,15 @@ gl: potlatch_unsaved_changes: Ten cambios sen gardar. (Para gardar no Potlatch, ten que desmarcar o camiño actual ou o punto, se está a editar no modo en vivo, ou premer sobre o botón "Gardar".) user_page_link: páxina de usuario index: + createnote: Engadir unha nota js_1: Está a usar un navegador que non soporta o JavaScript ou teno desactivado. js_2: O OpenStreetMap emprega JavaScript para o seu mapa estático e dinámico. license: - license_name: Creative Commons recoñecemento compartir igual 2.0 - notice: Baixo a licenza %{license_name} polo %{project_name} e os seus colaboradores. - project_name: proxecto OpenStreetMap + copyright: Dereitos de autor do OpenStreetMap e os seus colaboradores, baixo unha licenza aberta permalink: Ligazón permanente remote_failed: Fallo de edición; comprobe que ou ben JOSM ou ben Merkaartor estea cargado e que a opción do control remoto estea activada shortlink: Atallo key: - map_key: Lenda do mapa - map_key_tooltip: Lenda do mapa table: entry: admin: Límite administrativo @@ -1378,7 +1437,6 @@ gl: preview: Vista previa search: search: Procurar - search_help: "exemplos: \"Santiago de Compostela\", \"rúa Rosalía de Castro, Vigo\" ou \"oficinas postais preto de Mondoñedo\" máis exemplos..." submit_text: Ir where_am_i: Onde estou? where_am_i_title: Describa a localización actual usando o motor de procuras @@ -1387,13 +1445,18 @@ gl: search_results: Resultados da procura time: formats: - friendly: "%e %B %Y ás %H:%M" + friendly: "%e de %B de %Y ás %H:%M" trace: create: trace_uploaded: O seu ficheiro GPX foi cargado e está pendente de inserción na base de datos. Isto adoita ocorrer nun período de tempo de media hora. Recibirá un correo electrónico cando remate. upload_trace: Cargar unha pista GPS delete: scheduled_for_deletion: Pista á espera da súa eliminación + description: + description_with_count: + one: Ficheiro GPX cun punto de %{user} + other: Ficheiro GPX con %{count} puntos de %{user} + description_without_count: Ficheiro GPX de %{user} edit: description: "Descrición:" download: descargar @@ -1411,7 +1474,11 @@ gl: uploaded_at: "Cargado o:" visibility: "Visibilidade:" visibility_help: que significa isto? + georss: + title: Pistas GPS do OpenStreetMap list: + description: Examinar as cargas recentes de pistas GPS + empty_html: Aínda non hai nada por aquí. Cargue unha nova pista ou obteña máis información sobre as pistas GPS na páxina do wiki. public_traces: Pistas GPS públicas public_traces_from: Pistas GPS públicas de %{user} tagged_with: " etiquetadas con %{tags}" @@ -1451,14 +1518,16 @@ gl: trace_header: see_all_traces: Ollar todas as pistas see_your_traces: Ollar todas as súas pistas - traces_waiting: Ten %{count} pistas á espera de ser cargadas. Considere agardar a que remate antes de cargar máis para non bloquear a cola do resto de usuarios. + traces_waiting: + one: Ten %{count} pista á espera de ser cargada. Considere agardar a que remate antes de cargar máis para non bloquear a cola do resto de usuarios. + other: Ten %{count} pistas á espera de ser cargadas. Considere agardar a que remate antes de cargar máis para non bloquear a cola do resto de usuarios. upload_trace: Cargar unha pista trace_optionals: tags: Etiquetas trace_paging_nav: - next: Seguinte » - previous: « Anterior - showing_page: Mostrando a páxina "%{page}" + newer: Pistas máis novas + older: Pistas máis antigas + showing_page: Páxina %{page} view: delete_track: Borrar esta pista description: "Descrición:" @@ -1497,6 +1566,10 @@ gl: email never displayed publicly: (nunca mostrado publicamente) flash update success: Información de usuario actualizada correctamente. flash update success confirm needed: Información de usuario actualizada correctamente. Busque no seu correo electrónico unha mensaxe para confirmar o seu novo enderezo. + gravatar: + gravatar: Usar Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: que é isto? home location: "Lugar de orixe:" image: "Imaxe:" image size hint: (as imaxes cadradas de, polo menos, 100x100 funcionan mellor) @@ -1532,13 +1605,13 @@ gl: update home location on click: Quere actualizar o domicilio ao premer sobre o mapa? confirm: already active: Esta conta xa se confirmou. - before you start: Sabemos que probablemente queira comezar cos mapas de contado, pero antes gustaríanos que enchese algunha información acerca de vostede no formulario que hai a continuación. button: Confirmar - heading: Confirmar unha conta de usuario + heading: Comprobe o seu correo! + introduction_1: Enviámoslle un correo electrónico de confirmación. + introduction_2: Confirme a súa conta premendo na ligazón do correo electrónico e poderá comezar a traballar nos mapas. press confirm button: Prema sobre o botón de confirmación que aparece a continuación para activar a súa conta. - reconfirm: Se hai tempo que non accede ao sistema, quizais necesite enviarse un novo correo electrónico de confirmación. - success: Confirmouse a súa conta. Grazas por se rexistrar! - unknown token: Semella que o pase non existe. + reconfirm_html: Se quere que reenviemos o correo electrónico de confirmación, prema aquí. + unknown token: Ese código de confirmación caducou ou non existe. confirm_email: button: Confirmar failure: Xa se confirmou un enderezo de correo electrónico con este pase. @@ -1558,8 +1631,8 @@ gl: heading: Usuarios hide: Agochar os usuarios seleccionados showing: - one: Mostrando a páxina "%{page}" (%{first_item} de %{items}) - other: Mostrando a páxina "%{page}" (%{first_item}-%{last_item} de %{items}) + one: Páxina %{page} (%{first_item} de %{items}) + other: Páxina %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} creado desde %{ip_address} o %{date}" summary_no_ip: "%{name} creado o %{date}" title: Usuarios @@ -1574,8 +1647,6 @@ gl: lost password link: Perdeu o seu contrasinal? new to osm: É novo no OpenStreetMap? no account: Non está rexistrado? - notice: Máis información acerca do cambio na licenza do OpenStreetMap (traducións) (conversa) - notice_terms: OpenStreetMap pasa a usar unha licenza nova o 1 de abril de 2012. É igual de aberta que a actual, pero algunhas partes desta nova licenza acáenlle mellor á nosa base de datos. Gustaríanos manter as súas contribucións, pero unicamente podemos facelo se acepta que as distribuamos baixo esta nova licenza. En caso contrario, teremos que eliminalos da base de datos.

    Acceda ao sistema, revise con calma e acepte os novos termos. Grazas! openid: "%{logo} OpenID:" openid invalid: Sentímolo, o seu OpenID semella non estar ben formado openid missing provider: Sentímolo, non podemos contactar co seu provedor do OpenID @@ -1601,7 +1672,7 @@ gl: title: Acceder ao sistema con Yahoo password: "Contrasinal:" register now: Rexístrese agora - remember: "Lembrádeme:" + remember: Lembrádeme title: Rexistro to make changes: Para realizar as modificacións nos datos do OpenStreetMap, cómpre ter unha conta. with openid: "Tamén pode usar o seu OpenID para acceder:" @@ -1620,19 +1691,21 @@ gl: title: Contrasinal perdido make_friend: already_a_friend: Xa é amigo de %{name}. + button: Engadir como amigo failed: Houbo un erro ao engadir a %{name} como amigo. - success: "%{name} xa é o seu amigo." + heading: Quere engadir a %{user} como amigo? + success: "%{name} xa é o seu amigo!" new: + about: + header: Libre e editable + html: "

    A diferenza doutros mapas, o OpenStreetMap está completamente creado por xente coma vostede, e calquera persoa é libre de corrixilo, actualizalo, descargalo e utilizalo.

    \n

    Rexístrese para comezar a contribuír. Enviarémoslle un correo electrónico para confirmar a súa conta.

    " confirm email address: Confirmar o enderezo de correo electrónico confirm password: "Confirmar o contrasinal:" contact_webmaster: Póñase en contacto co webmaster para que cree unha conta por vostede; intentaremos xestionar a solicitude o máis axiña que poidamos. - continue: Continuar + continue: Rexistrarse display name: "Nome mostrado:" display name description: O seu nome de usuario mostrado publicamente. Pode cambialo máis tarde nas preferencias. email address: "Enderezo de correo electrónico:" - fill_form: Encha o formulario e axiña recibirá un correo electrónico coas instrucións para activar a súa conta. - flash create success message: O usuario creouse correctamente. Busque unha nota de confirmación que lle enviamos a %{email} e comezará a crear mapas de contado.

    Se emprega un sistema de bloqueo de spam, asegúrese de incluír webmaster@openstreetmap.org na súa lista branca para poder completar o proceso sen problemas. - heading: Crear unha conta de usuario license_agreement: Cando confirme a súa conta necesitará aceptar os termos do colaborador. no_auto_account_create: Por desgraza, arestora non podemos crear automaticamente unha conta para vostede. not displayed publicly: Non mostrado publicamente (véxase a política de protección de datos) @@ -1642,7 +1715,7 @@ gl: password: "Contrasinal:" terms accepted: Grazas por aceptar os novos termos do colaborador! terms declined: Sentimos que decidise non aceptar os novos Termos do colaborador. Para obter máis información, consulte esta páxina wiki. - title: Crear unha conta + title: Rexistrarse use openid: Tamén pode usar %{logo} OpenID para acceder no_such_user: body: Non existe ningún usuario co nome "%{user}". Comprobe a ortografía ou que a ligazón que seguiu estea ben. @@ -1653,6 +1726,8 @@ gl: nearby mapper: Cartógrafo próximo your location: A súa localización remove_friend: + button: Eliminar como amigo + heading: Quere eliminar a %{user} dos amigos? not_a_friend: "%{name} non é un dos seus amigos." success: "%{name} foi eliminado dos seus amigos." reset_password: @@ -1687,12 +1762,12 @@ gl: you need to accept or decline: Lea e, a continuación, acepte ou rexeite os novos Termos do colaborador para continuar. view: activate_user: activar este usuario - add as friend: engadir como amigo + add as friend: Engadir como amigo ago: (hai %{time_in_words_ago}) - block_history: ver os bloqueos recibidos - blocks by me: bloqueos efectuados - blocks on me: os meus bloqueos - comments: comentarios + block_history: bloqueos recibidos + blocks by me: Bloqueos efectuados + blocks on me: Os meus bloqueos + comments: Comentarios confirm: Confirmar confirm_user: confirmar este usuario create_block: bloquear este usuario @@ -1704,31 +1779,35 @@ gl: deactivate_user: desactivar este usuario delete_user: borrar este usuario description: Descrición - diary: diario - edits: edicións + diary: Diario + edits: Edicións email address: "Enderezo de correo electrónico:" - friends_changesets: Explorar todos os conxuntos de cambios dos seus amigos - friends_diaries: Explorar todas as entradas de diario dos amigos + friends_changesets: conxuntos de cambios dos amigos + friends_diaries: entradas de diario dos amigos hide_user: agochar este usuario - if set location: Se define a súa localización, aquí aparecerá un mapa. Pode establecer o seu lugar de orixe na súa páxina de %{settings_link}. + if set location: Defina a súa localización na páxina de %{settings_link} para ollar usuarios de lugares próximos. km away: a %{count}km de distancia latest edit: "Última edición %{ago}:" m away: a %{count}m de distancia mapper since: "Cartógrafo desde:" - moderator_history: ver os bloqueos dados - my comments: os meus comentarios - my diary: o meu diario - my edits: as miñas edicións - my settings: os meus axustes - my traces: as miñas pistas + moderator_history: bloqueos impostos + my comments: Os meus comentarios + my diary: O meu diario + my edits: As miñas edicións + my messages: As miñas mensaxes + my notes: As miñas notas de mapa + my profile: O meu perfil + my settings: Os meus axustes + my traces: As miñas pistas nearby users: Outros usuarios próximos - nearby_changesets: Explorar todos os conxuntos de cambios dos usuarios de lugares próximos - nearby_diaries: Explorar todas as entradas de diario dos usuarios de lugares próximos + nearby_changesets: conxuntos de cambios dos usuarios de lugares próximos + nearby_diaries: entradas de diario dos usuarios de lugares próximos new diary entry: nova entrada no diario no friends: Aínda non engadiu ningún amigo. no nearby users: Aínda non hai usuarios que estean situados na súa proximidade. + notes: Notas de mapa oauth settings: axustes OAuth - remove as friend: eliminar como amigo + remove as friend: Eliminar como amigo role: administrator: Este usuario é administrador grant: @@ -1738,11 +1817,11 @@ gl: revoke: administrator: Revogar o acceso de administrador moderator: Revogar o acceso de moderador - send message: enviar unha mensaxe + send message: Enviar unha mensaxe settings_link_text: axustes spam score: "Puntuación do spam:" status: "Estado:" - traces: pistas + traces: Pistas unhide_user: descubrir este usuario user location: Localización do usuario your friends: Os seus amigos @@ -1800,11 +1879,14 @@ gl: creator_name: Creador display_name: Usuario bloqueado edit: Editar + next: Seguinte » not_revoked: (non revogado) + previous: « Anterior reason: Motivo para o bloqueo revoke: Revogar! revoker_name: Revogado por show: Mostrar + showing_page: Páxina %{page} status: Estado period: one: 1 hora @@ -1852,3 +1934,25 @@ gl: fail: Non se lle puido revogar o rol "%{role}" ao usuario "%{name}". Comprobe que tanto o usuario coma o rol son correctos. heading: Confirmar a revogación do rol title: Confirmar a revogación do rol + welcome_page: + add_a_note: + paragraph_1_html: Se soamente quere corrixir unha pequena cousa e non ten tempo de rexistrarse e aprender a editar, engadir unha nota é moi sinxelo. + paragraph_2_html: "Vaia ao mapa e prema na icona de notas: . Isto ha engadir un marcador ao mapa, que pode desplazar arrastrándoo. Engada a súa mensaxe, logo prema no botón de gardar e os outros colaboradores han comprobalo." + title: Non ten tempo para editar? Engada unha nota! + basic_terms: + editor_html: Un editor é un programa ou sitio web que pode usar para editar o mapa. + node_html: Un nodo é un punto no mapa, como un restaurante ou unha árbore. + paragraph_1_html: O OpenStreetMap ten unha xerga propia. Velaquí hai unhas palabras clave que son de utilidade. + tag_html: Unha etiqueta é unha peza de datos sobre un nodo ou un camiño, como o nome dun restaurante ou o límite de velocidade dunha estrada. + title: Vocabulario básico para cartografiar + way_html: Un camiño é unha liña ou área, como unha estrada, un arroio, un lago ou un edificio. + introduction_html: Dámoslle a benvida ao OpenStreetMap, o mapa do mundo libre e editable. Agora que está rexistrado, xa pode empezar a cartografiar. Velaquí hai unha guía rápida das cousas máis importantes que necesita saber. + questions: + paragraph_1_html: "O OpenStreetMap ten varios recursos para aprender sobre o proxecto, para formular e responder\npreguntas, así como para debater e documentar colaborativamente sobre temas de cartografía.\nObteña axuda aquí." + title: Ten algunha pregunta? + start_mapping: Comezar a cartografiar + title: Reciba a nosa benvida! + whats_on_the_map: + off_html: O que non inclúe son datos subxectivos como valoracións, características históricas ou hipotéticas e datos de fontes protexidas por dereitos de autoría. A menos que teña permisos especiais, non copie de mapas en liña ou en papel. + on_html: O OpenStreetMap é un lugar para cartografiar cousas que son reais e actuais, entre as que se atopan millóns de edificios, estradas e outros detalles sobre os lugares. Pode cartografiar calquera característica do mundo real na que teña interese. + title: Que hai no mapa diff --git a/config/locales/gsw.yml b/config/locales/gsw.yml index b5072961b8a..6c57f26a9e6 100644 --- a/config/locales/gsw.yml +++ b/config/locales/gsw.yml @@ -110,10 +110,10 @@ gsw: data_layer_name: Date details: Einzelheite drag_a_box: E Rammen iber d Charten ufzie go ne Beryych uuswehle - edited_by_user_at_timestamp: Bearbeitet vu [[user]] am [[timestamp]] - history_for_feature: Chronik fir [[feature]] + edited_by_user_at_timestamp: Bearbeitet vu %{user} am %{timestamp} + history_for_feature: Chronik fir %{feature} load_data: Date lade - loaded_an_area_with_num_features: Du hesch e Beryych glade, wu s [[num_features]] Elemänt din het. E Teil Browser hän Probläm bi dr Darstellig vun ere so große Datenmängi. Normalerwyys isch s am beschte, nume weniger wie 100 Elemänt z bschaue; alles ander macht Dyy Browser langsam bzw. losst e nimmi uf Yygabe reagiere. Wänn Du sicher bisch, ass Du die Daten witt darstelle, no druck unten uf „Date lade“. + loaded_an_area_with_num_features: Du hesch e Beryych glade, wu s %{num_features} Elemänt din het. E Teil Browser hän Probläm bi dr Darstellig vun ere so große Datenmängi. Normalerwyys isch s am beschte, nume weniger wie 100 Elemänt z bschaue; alles ander macht Dyy Browser langsam bzw. losst e nimmi uf Yygabe reagiere. Wänn Du sicher bisch, ass Du die Daten witt darstelle, no druck unten uf „Date lade“. loading: Am Lade ... manually_select: En andere Chartenuusschnitt manuäll uuswehle object_list: @@ -123,18 +123,18 @@ gsw: heading: Objäktlischt history: type: - node: Chnote [[id]] - way: Wäg [[id]] + node: Chnote %{id} + way: Wäg %{id} selected: type: - node: Chnote [[id]] - way: Wäg [[id]] + node: Chnote %{id} + way: Wäg %{id} type: node: Chnote way: Wäg private_user: Anonyme Benutzer show_history: Chronik - unable_to_load_size: "Het nit chenne glade wäre: Beryych vu dr Greßi [[bbox_size]] isch z groß (sott chleiner syy wie %{max_bbox_size})" + unable_to_load_size: "Het nit chenne glade wäre: Beryych vu dr Greßi %{bbox_size} isch z groß (sott chleiner syy wie %{max_bbox_size})" wait: E Momänt bitte ... zoom_or_select: Charte vergreßere oder e Beryych uf dr Charten uuswehle tag_details: diff --git a/config/locales/he.yml b/config/locales/he.yml index f23fba56149..35a9290ab0f 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -3,13 +3,24 @@ # Export driver: syck-pecl # Author: Amire80 # Author: Aude +# Author: Dekel E # Author: Deror avi # Author: Ex-Diktator +# Author: ExampleTomer # Author: GilCahana +# Author: Inkbug # Author: Itay naor +# Author: Metraduk +# Author: Nemo bis +# Author: Orsa # Author: YaronSh +# Author: Yona b # Author: תומר ט he: + about_page: + local_knowledge_title: ידע מקומי + next: הבא + partners_title: שותפים activerecord: attributes: diary_comment: @@ -18,7 +29,7 @@ he: language: שפה latitude: קו רוחב longitude: קו אורך - title: כותרת + title: נושא user: משתמש friend: friend: חבר @@ -27,7 +38,7 @@ he: body: גוף recipient: נמען sender: שולח - title: כותרת + title: נושא trace: description: תיאור latitude: קו רוחב @@ -81,90 +92,44 @@ he: application: require_cookies: cookies_needed: נראה שהעוגיות כבויות אצלך – נא להפעיל עוגיות בדפדפן שלך כדי להמשיך. + require_moderator: + not_a_moderator: צריל להיות מנחה כדי לבצע את הפעולה הזאת. setup_user_auth: blocked: גישתך ל־API נחסמה. נא להיכנס לממשק הווב למידע נוסף. need_to_see_terms: גישתך ל־API מושעית זמנית. נא להיכנס לאתר כדי לצפות בתנאי התרומה. אין צורך לקבל אותם, אבל חובה להציג אותם. browse: + anonymous: אלמוני changeset: - changeset: "ערכת שינויים: %{id}" + belongs_to: יוצר changesetxml: XML של ערכת שינויים - download: הורדת %{changeset_xml_link} או %{osmchange_xml_link} feed: title: ערכת שינויים %{id} title_comment: ערכת שינויים %{id} – %{comment} + node: צמתים (%{count}) + node_paginated: צמתים (%{x}–%{y} מתוך %{count}) osmchangexml: osmChange XML - title: ערכת שינויים - changeset_details: - belongs_to: "שייכת ל:" - bounding_box: "תיבה תוחמת:" - box: תיבה - closed_at: "נסגרה ב:" - created_at: "נוצר בתאריך:" - has_nodes: - one: "מחזיק בצומת אחד:" - other: "מחזיק ב־%{count} צמתים:" - has_relations: - one: "מחזיק ביחס אחד:" - other: "מחזיק ב־%{count} יחסים:" - has_ways: - one: "מחזיק בדרך אחת:" - other: "מחזיק ב־%{count} דרכים:" - no_bounding_box: לא נשמרה תיבה תוחמת עבור ערכת השינויים הזאת. - show_area_box: הצגת תיבת אזור - common_details: - changeset_comment: "הערה:" - deleted_at: "נמחק ב:" - deleted_by: "נמחק על־ידי:" - edited_at: "נערך ב:" - edited_by: "נערך על־ידי:" - in_changeset: "בערכת השינויים:" - version: "גרסה:" + relation: יחסים (%{count}) + relation_paginated: יחסים (%{x}–%{y} מתוך %{count}) + title: "ערכת שינויים: %{id}" + way: דרכים (%{count}) + way_paginated: דרכים (%{x}–%{y} מתוך %{count}) + closed: נסגר + closed_by_html: נסגר לפני %{time} על ידי %{user} + closed_html: נסגר לפני %{time} containing_relation: entry: יחס %{relation_name} entry_role: יחס %{relation_name} (בתור %{relation_role}) - map: - deleted: נמחק - edit: - area: עריכת אזור - node: עריכת צומת - relation: עריכת יחס - way: עריכת דרך - larger: - area: צפייה בשטח במפה גדולה יותר - node: צפייה בצומת במפה גדולה יותר - relation: צפייה ביחס במפה גדולה יותר - way: צפייה בדרך במפה גדולה יותר - loading: בטעינה... - navigation: - all: - next_changeset_tooltip: ערכת השינויים הבאה - next_node_tooltip: הצומת הבא - next_relation_tooltip: היחס הבא - next_way_tooltip: הדרך הבאה - prev_changeset_tooltip: ערכת השינויים הקודמת - prev_node_tooltip: הצומת הקודם - prev_relation_tooltip: היחס הקודם - prev_way_tooltip: הדרך הקודמת - user: - name_changeset_tooltip: צפייה בעריכות של %{user} - next_changeset_tooltip: העריכה הבאה של %{user} - prev_changeset_tooltip: העריכה הקודמת של %{user} + created: נוצר + created_by_html: נוצר לפני %{time} על ידי %{user} + created_html: נוצר לפני %{time} + deleted_by_html: נמחק לפני %{time} על ידי %{user} + download_xml: הורדת XML + edited_by_html: נערך לפני %{time} על ידי %{user} + in_changeset: ערכת שינויים + no_comment: (אין הערות) node: - download: "%{download_xml_link} או %{view_history_link}" - download_xml: הורדת XML - edit: עריכה - node: צומת - node_title: "צומת: %{node_name}" - view_history: צפייה בהיסטוריה - node_details: - coordinates: "נקודות ציון:" - part_of: "חלק מתוך:" - node_history: - download: "%{download_xml_link} או %{view_details_link}" - download_xml: הורדת XML - node_history: היסטוריית הצומת - node_history_title: "היסטוריית הצומת: %{node_name}" - view_details: צפייה בפרטים + history_title: "היסטוריית הצומת: %{name}" + title: "צומת: %{name}" not_found: sorry: אנו מתנצלים, אך הסוג %{type} בעל המזהה %{id} לא נמצא. type: @@ -172,75 +137,33 @@ he: node: צומת relation: יחס way: דרך - paging_nav: - of: מתוך - showing_page: הצגת דף + note: + closed_title: הערה פתורה מס' %{note_name} + hidden_title: הערה מוסתרת מס' %{note_name} + new_note: הערה חדשה + open_title: הערה שלא נפתרה מס' %{note_name} + title: הערה + part_of: חלק מתוך redacted: - message_html: "לא ניתן להציג את גרסה %{version} של %{type} מכיוון שהיא נערכה. למידע נוסף: %{redaction_link}." + message_html: "לא ניתן להציג את הגרסה %{version} של %{type} מכיוון שהיא נחתכה. למידע נוסף: %{redaction_link}." + redaction: חיתוך %{id} type: node: צומת relation: יחס way: דרך relation: - download: "%{download_xml_link} או %{view_history_link}" - download_xml: הורדת XML - relation: יחס - relation_title: "יחס: %{relation_name}" - view_history: לצפייה בהיסטוריה - relation_details: - members: "איברים:" - part_of: "חלק מתוך:" - relation_history: - download: "%{download_xml_link} או %{view_details_link}" - download_xml: הורדת XML - relation_history: היסטוריית היחס - relation_history_title: "היסטוריית היחס: %{relation_name}" - view_details: צפייה בפרטים + members: חברים relation_member: entry_role: "%{type} %{name} בתור %{role}" type: node: צומת relation: יחס way: דרך - start: - manually_select: בחירה ידנית באזור אחר - view_data: לצפייה במידע עבור התצוגה הנוכחית של המפה start_rjs: - data_frame_title: נתונים - data_layer_name: עיון בנתוני מפה - details: פרטים - drag_a_box: נא לגרור את התיבה על המפה כדי לבחור אזור - edited_by_user_at_timestamp: נערך על־ידי [[user]] ב־[[timestamp]] - hide_areas: להסתרת אזורים - history_for_feature: ההיסטוריה של [[feature]] load_data: טעינת נתונים - loaded_an_area_with_num_features: "האזור שנטען מכיל [[num_features]] תכונות. באופן כללי, חלק מהדפדפנים לא יוכלו להתמודד עם הצגה של כזו כמות של נתונים. לרוב, דפדפנים עובדים באופן מיטבי בהצגת פחות מ־100 תכונות בו־זמנית: ביצוע משימות נוספות עלול לגרום לדפדפן לפעול באופן איטי או להיתקע. אם ברצונך בכל זאת להציג מידע זה, באפשרותך להציג אותו בלחיצה על הכפתור למטה." loading: בטעינה... - manually_select: בחירת אזור אחר ידנית - object_list: - api: אחזור אזור זה מה־API - back: הצגת רשימת הפריטים - details: פרטים - heading: רשימת פריטים - history: - type: - node: צומת [[id]] - way: דרך [[id]] - selected: - type: - node: צומת [[id]] - way: דרך [[id]] - type: - node: צומת - way: דרך - private_user: משתמש פרטי - show_areas: להצגת אזורים - show_history: הצגת ההיסטוריה - unable_to_load_size: "לא ניתן לטעון: תיבה תוחמת בגודל [[bbox_size]] היא גדולה מדי (מוכרחה להיות קטנה מאשר %{max_bbox_size})" - wait: נא להמתין... - zoom_or_select: התקרבות או בחירה אזור במפה לצפייה tag_details: - tags: "תגים:" + tags: תגים wiki_link: key: עמוד התיאור עבור התג %{key} tag: עמוד התיאור עבור התג %{key}=%{value} @@ -252,38 +175,22 @@ he: node: צומת relation: קשר way: דרך + version: גרסה + view_details: הצגת פרטים + view_history: הצגת ההיסטוריה way: - download: "%{download_xml_link} או %{view_history_link}" - download_xml: הורדת XML - edit: עריכה - view_history: צפייה בהיסטוריה - way: דרך - way_title: "דרך: %{way_name}" - way_details: - also_part_of: - one: גם כן חלק מהדרך %{related_ways} - other: גם כן חלק מהדרכים %{related_ways} - nodes: "צמתים:" - part_of: "חלק מתוך:" - way_history: - download: "%{download_xml_link} או %{view_details_link}" - download_xml: הורדת XML - view_details: צפייה בפרטים - way_history: היסטוריית הדרך - way_history_title: "היסטוריית הדרך: %{way_name}" + history_title: "היסטוריית הדרך: %{name}" + nodes: צמתים + title: "דרך: %{name}" changeset: changeset: anonymous: אלמוני - big_area: (גדול) - no_comment: (אין) no_edits: (אין עריכות) - show_area_box: הצגת תיבת אזור - still_editing: (עדיין בעריכה) view_changeset_details: הצגת פרטי ערכת שינויים changeset_paging_nav: next: הבא » previous: « הקודם - showing_page: הצגת הדף %{page} + showing_page: הדף %{page} changesets: area: שטח comment: הערה @@ -291,24 +198,12 @@ he: saved_at: "נשמרו ב:" user: משתמש list: - description: שינויים אחרונים - description_bbox: ערכות שינויים בתוך %{bbox} - description_friend: ערכות שינויים של חברים שלכם - description_nearby: ערכות שינויים של משתמשים בסביבה - description_user: ערכות שינויים של %{user} - description_user_bbox: ערכות שינויים של %{user} בתוך %{bbox} - heading: ערכות שינויים - heading_bbox: ערכות שינויים - heading_friend: ערכות שינויים - heading_nearby: ערכות שינויים - heading_user: ערכות שינויים - heading_user_bbox: ערכות שינויים + empty: לא נמצאה סדרת שינויים + load_more: טען עוד title: ערכות שינויים - title_bbox: ערכות שינויים בתוך %{bbox} title_friend: ערכות שינויים של החברים שלך title_nearby: ערכות שינויים של משתמשים בסביבה title_user: ערכות שינויים של %{user} - title_user_bbox: ערכות שינויים של %{user} בתוך %{bbox} timeout: sorry: סליחה, לוקח יותר מדי זמן לאחזר על רשימת ערכות השינויים שביקשת. diary_entry: @@ -328,6 +223,7 @@ he: comment_count: one: תגובה אחת other: "%{count} תגובות" + zero: אין תגובות comment_link: הערות לרשומה הזאת confirm: לאישור edit_link: עריכת רשומה @@ -362,7 +258,7 @@ he: newer_entries: רשומות חדשות יותר no_entries: אין רשומות יומן older_entries: רשומות ישנות יותר - recent_entries: "רשומות יומן אחרונות:" + recent_entries: רשומות יומן אחרונות title: יומנים של המשתמש title_friends: יומנים של חברים title_nearby: יומנים של משתמשים בסביבה @@ -386,6 +282,9 @@ he: user_title: היומן של %{user}‏ editor: default: בררת מחדל (כעת %{name}) + id: + description: iD (עורך בתוך הדפדפן) + name: iD potlatch: description: Potlatch 1 (עורך בתוך הדפדפן) name: Potlatch 1 @@ -401,7 +300,7 @@ he: area_to_export: האזור לייצוא embeddable_html: HTML שניתן להטמעה export_button: ייצוא - export_details: המידע ב־OpenStreetMap מוגש בכפוף לרישיון CC ייחוס־שיתוף זהה 2.0. + export_details: המידע ב־OpenStreetMap מוגש בכפוף לרישיון Open Data Commons לנתונים פתוחים (ODbL). format: פורמט format_to_export: תבנית לייצוא image_size: גודל התמונה @@ -417,29 +316,38 @@ he: paste_html: להדביק HTML להטמעה באתר scale: קנה מידה too_large: - body: האזור גדול מכדי שאפשר יהיה לייצא אותו בתור נתוני XML של OpenStreetMap. נא להתקרב או לבחור אזור קטן יותר. - heading: האזור גדול מדי + body: "האזור גדול מכדי שאפשר יהיה לייצא אותו בתור נתוני XML של OpenStreetMap. נא להתקרב או לבחור אזור קטן יותר, או להשתמש במקורות הבאים בשביל הורדות נתונים גדולות:" + geofabrik: + description: עותקים מעודכנים באופן קבוע של יבשות, מדינות וערים נבחרות + title: הורדות של Geofabrik + metro: + description: מובאות חלקיות לערים עולמיות גדולות ואזורים בסביבתן + title: מובאות מטרו + other: + description: מקורות נוספים רשומים בוויקי של OpenStreetMap + title: מקורות אחרים + planet: + description: עותקים מעודכנים באופן קבוע של כל מסד הנתונים של OpenStreetMap + title: פלאנט OSM zoom: מרחק מתצוגה - start_rjs: - add_marker: הוספת סמן למפה - change_marker: שינוי מיקום סמן - click_add_marker: לחצו על המפה להוספת סמן - drag_a_box: נא לגרור מלבן על המפה לבחירת אזור - export: ייצוא - manually_select: בחירה ידנית של אזור אחר - view_larger_map: לצפייה במפה גדולה יותר + title: ייצוא + fixthemap: + how_to_help: + join_the_community: + title: להצטרף לקהילה + title: איך ניתן לעזור + other_concerns: + title: דאגות אחרות + title: דווח על בעיה / תקן את המפה geocoder: description: title: geonames: מיקום מאתר GeoNames - osm_namefinder: "%{types} מ־OpenStreetMap Namefinder" osm_nominatim: מיקום מאתר OpenStreetMap Nominatim types: cities: ערים places: מקומות towns: עיירות - description_osm_namefinder: - prefix: "%{distance} מ%{direction} ל־%{type}" direction: east: מזרח north: צפון @@ -460,16 +368,26 @@ he: title: ca_postcode: תוצאות מאתר Geocoder.CA geonames: תוצאות מאתר GeoNames + geonames_reverse: תוצאות מ־GeoNames latlon: תוצאות מאתר זה - osm_namefinder: תוצאות מאתר OpenStreetMap Namefinder osm_nominatim: תוצאות מאתר OpenStreetMap Nominatim + osm_nominatim_reverse: תוצאות מ־OpenStreetMap Nominatim uk_postcode: תוצאות מאתר NPEMap / FreeThe Postcode us_postcode: תוצאות מאתר Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} ל־%{parentname})" - suffix_place: ", %{distance} מ%{direction} ל־%{placename}" search_osm_nominatim: + admin_levels: + level10: גבול הפרבר + level2: גבול המדינה + level4: גבול המדינה + level5: גבול האזור + level6: גבול המחוז + level8: גבול העיר + level9: גבול הכפר prefix: + aerialway: + chair_lift: מעלית סקי בישיבה + drag_lift: מעלית סקי בגרירה + station: תחנת רכבל aeroway: aerodrome: מנחת apron: רחבת חניה @@ -563,6 +481,7 @@ he: shower: מקלחת social_centre: מרכז חברתי social_club: מועדון + social_facility: מתקן חברתי studio: סטודיו supermarket: סופרמרקט swimming_pool: ברֵכת שחייה @@ -591,6 +510,9 @@ he: "yes": גשר building: "yes": בניין + emergency: + fire_hydrant: ברז כיבוי אש + phone: טלפון חירום highway: bridleway: שביל עבור סוסים bus_guideway: נתיב תחבורה ציבורית מונחית @@ -612,6 +534,7 @@ he: platform: פלטפורמה primary: דרך ראשית primary_link: כביש ראשי + proposed: כביש מוצע raceway: מסלול מרוצים residential: מגורים rest_area: אזור מנוחה @@ -623,6 +546,7 @@ he: speed_camera: מצלמת מהירות steps: מדרגות stile: מעבר מעל גדר + street_lamp: פנס רחוב tertiary: דרך צדית tertiary_link: דרך שלישונית track: מסלול מרוצים @@ -638,6 +562,7 @@ he: building: בניין castle: טירה church: כנסייה + citywalls: חומות העיר fort: מעוז house: בית icon: איקונין @@ -647,6 +572,7 @@ he: monument: אנדרטה museum: מוזיאון ruins: הריסות + tomb: קבר tower: מגדל wayside_cross: צלב בצד הדרך wayside_shrine: מקדש בצד הדרך @@ -714,6 +640,8 @@ he: airfield: מנחת צבאי barracks: מגורי חיילים bunker: בונקר + mountain_pass: + "yes": מעבר הררי natural: bay: מפרץ beach: חוף רחצה @@ -783,6 +711,7 @@ he: locality: יישוב moor: אדמת כבול municipality: עירייה + neighbourhood: שכונה postcode: מיקוד region: אזור sea: ים @@ -808,8 +737,10 @@ he: narrow_gauge: מסילת רכבת צרה platform: רציף רכבת preserved: רכבת משומרת + proposed: פסי רכבת מוצעים spur: שלוחת מסילת ברזל station: תחנת רכבת + stop: תחנת רכבת subway: תחנת רכבת תחתית subway_entrance: כניסה לתחנת רכבת תחתית switch: נקודות מסילת ברזל @@ -825,6 +756,7 @@ he: beverages: חנות משקאות bicycle: חנות אפניים books: חנות ספרים + boutique: בוטיק butcher: קצב car: חנות כלי רכב car_parts: חלקי רכב @@ -838,6 +770,7 @@ he: convenience: מכולת copyshop: חנות צילום cosmetics: חנות קוסמטיקה + deli: מעדנייה department_store: כלבו discount: חנות מוזלת doityourself: חנות עשה־זאת־בעצמך @@ -874,17 +807,21 @@ he: organic: חנות מזון אורגני outdoor: חנות ציוד מחנאות pet: חנות חיות מחמד + pharmacy: בית מרקחת photo: חנות צילום salon: סלון + second_hand: חנות יד שנייה shoes: חנות נעליים shopping_centre: מרכז קניות sports: חנות ספורט stationery: חנות כלי כתיבה supermarket: סופרמרקט + tailor: חייט toys: חנות צעצועים travel_agency: סוכנות נסיעות video: ספריית וידאו wine: חנות לממכר משקאות אלכוהוליים + "yes": חנות tourism: alpine_hut: בקתה אלפינית artwork: יצירת אמנות @@ -907,6 +844,7 @@ he: viewpoint: נקודת תצפית zoo: גן חיות tunnel: + culvert: ביוב "yes": מנהרה waterway: artificial: נתיב מים מלאכותי @@ -930,67 +868,111 @@ he: water_point: נקודת מים waterfall: מפל מים weir: סכר + help_page: + help: + title: help.openstreetmap.org + title: קבלת עזרה + welcome: + title: ברוכים הבאים ל-OSM + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ html: dir: rtl javascripts: + close: סגירה + edit_help: עליך להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן. + key: + title: מפת מפתח + tooltip: מפת מפתח + tooltip_disabled: מפתח מפה זמין רק לשכבה התקנית map: base: cycle_map: מפת אופניים + hot: הומניטרי standard: תקני transport_map: מפת תחבורה + copyright: © מתנדבי OpenStreetMap + donate_link_text: + layers: + data: נתוני המפה + header: שכבות במפה + notes: הערות במפה + overlays: הפעלת שכבות לפתרון תקלות במפה + title: שכבות + locate: + popup: המרחק שלך מהנקודה הזאת הוא {distance} {unit} + title: הצגת המיקום שלי + zoom: + in: התקרבות + out: התרחקות + notes: + new: + add: הוספת הערה + intro: כדי לשפר את המפה, המידע שהזנת מוצג לממפים אחרים, אז נא לספק כמה שיותר פירוט בעת הזזת הסמן למיקום המדויק ובהזנת ההערה שלך להלן. + show: + anonymous_warning: ההערה הזאת כוללת תגובות ממשתמשים אלמוניים שצריך לאמת באופן עצמאי. + comment: להגיב + comment_and_resolve: להגיב ולפתור + hide: להסתיר + reactivate: הפעלה מחדש + resolve: לפתור + share: + cancel: ביטול + center_marker: למרכז את המפה לפי הסמן + custom_dimensions: הגדרת ממדים בהתאמה אישית + download: הורדה + embed: HTML + format: "תסדיר:" + image: תמונה + image_size: התמונה תציג שכבה רגילה תחת + include_marker: לכלול סמן + link: קישור או HTML + long_link: קישור + paste_html: הדבקת HTML להטבעה באתר + scale: "קנה מידה:" + short_link: קישור קצר + short_url: כתובת קצרה + title: שיתוף + view_larger_map: צפייה במפה גדולה יותר site: + createnote_disabled_tooltip: נא להתקרב כדי להוסיף הערה למפה + createnote_tooltip: הוספת הערה למפה edit_disabled_tooltip: להתקרב כדי לערוך את המפה edit_tooltip: עריכת המפה - edit_zoom_alert: יש להתקרב כדי לערוך את המפה - history_disabled_tooltip: יש לקרב כדי להציג עריכות עבור אזור זה - history_tooltip: הצגת עריכות עבור אזור זה - history_zoom_alert: יש לקרב כדי להציג עריכות עבור אזור זה + map_data_zoom_in_tooltip: יש לקרב את המפה כדי לראות נתוני מפה layouts: + about: אודות community: קהילה community_blogs: בלוגים של הקהילה community_blogs_title: בלוגים של חברי קהילת OpenStreetMap - copyright: זכויות יוצרים ורישיון - documentation: תיעוד - documentation_title: תיעוד המיזם + copyright: זכויות יוצרים + data: נתונים donate: תִמכו ב־OpenStreetMap על־ידי %{link} לקרן לשדרוג החומרה. - donate_link_text: תרומה edit: עריכה edit_with: לעריכה עם %{editor} export: ייצוא - export_tooltip: ייצוא נתוני המפה + export_data: ייצוא נתונים foundation: קרן foundation_title: קרן אופן סטריט מאפ gps_traces: מסלולי GPS gps_traces_tooltip: ניהול מסלולי GPS help: עזרה - help_centre: מרכז עזרה - help_title: אתר עזרה עבור המיזם history: היסטוריה - home: הביתה - home_tooltip: מעבר למיקום הבית - inbox: תיבת דואר נכנס (%{count}) - inbox_tooltip: - one: תיבת הדואר הנכנס שלכם מכילה הודעה אחת שלא נקראה - other: תיבת הדואר הנכנס שלכם מכילה %{count} הודעות שלא נקראו - zero: תיבת הדואר הנכנס שלכם אינה מכילה הודעות שלא נקראו - intro_1: OpenStreetMap היא מפה חופשית של כל העולם, שכל אחד יכול לערוך. יוצרים אותה אנשים כמוך. + home: מעבר למיקום הבית intro_2_create_account: נא ליצור חשבון משתמש - intro_2_download: להוריד - intro_2_html: יש לך חופש %{download} את הנתונים ו%{use} בהם בהתאם ל%{license} שהם מתפרסמים לפיו. %{create_account} כדי לשפר את המפה. - intro_2_license: רישיון פתוח - intro_2_use: להשתמש - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - title: מידע בֹ־OpenStreetMap מתפרסם לפי תנאי רישיון Creative Commons–ייחוס–שיתוף זהה 2.0 כללי + intro_header: ברוכים הבאים ל-OpenStreetMap! + intro_text: OpenStreetMap הוא מפה של העולם, נוצר על ידי אנשים כמוך, וחופשי לשימוש תחת רשיון פתוח. + learn_more: מידע נוסף log_in: כניסה לחשבון log_in_tooltip: כניסה עם חשבון קיים logo: alt_text: הלוגו של OpenStreetMap logout: יציאה מהחשבון - logout_tooltip: ניתוק make_a_donation: text: תרומה title: תִמכו במיזם OpenStreetMap על־ידי מתן תרומה כספית + more: עוד osm_offline: מסד הנתונים של אתר OpenStreetMap אינו מקוון כעת בשל עבודות תחזוקה המבוצעות בו. osm_read_only: מסד הנתונים של אתר OpenStreetMap נתון כעת במצב קריאה בלבד בשל עבודות תחזוקה המבוצעות בו. partners_bytemark: בייטמארק @@ -1001,22 +983,45 @@ he: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: הרשמה sign_up_tooltip: יצירת חשבון לעריכה - sotm2011: בואו לכנס אופן סטריט מאפ 2011, מצב המפה, ספטמבר 9–11 בדנוור! + start_mapping: להתחיל למפות tag_line: מפת עולם חופשית בשיטת הוויקי user_diaries: יומני משתמשים user_diaries_tooltip: צפייה ביומני המשתמש - view: תצוגה - view_tooltip: לצפייה במפה - welcome_user: ברוך בואך, %{user_link} - welcome_user_link_tooltip: דף המשתמש שלך - wiki: ויקי - wiki_title: אתר ויקי עבור המיזם license_page: foreign: english_link: העמוד המקורי באנגלית text: במקרה של חוסר תאימות בין עמוד מתורגם זה ובין %{english_original_link}, יש לתת עדיפות לעמוד באנגלית title: אודות תרגום זה - legal_babble: "

    זכויות יוצרים ורישיון

    \n

    \n אתר OpenStreetMap הוא נותנים פתוחים, המופצים לפי רישיון קריאייטיב\n קומונז ייחוס–שיתוף־זהה 2.0 (CC BY-SA).\n

    \n

    \n אתם חופשיים להעתיק, להפיץ, לשדר ולהתאים את המפות שלנו\n ואת הנתונים שלנו, כל עוד אתם נותנים ייחוס ל־OpenStreetMap\n ולתורמי המיזם. אם אתם משנים או בונים מידע חדש על גבי המפות או הנתונים שלנו,\n מותר לכם להפיץ את התוצאות רק לפי תנאי אותו הרישיון.\n המסמך\n המשפטי המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם.\n

    \n\n

    איך לתת ייחוס ל־OpenStreetMap

    \n

    \n אם אתם משתמשים בתמונות של מפות מ־OpenStreetMap, אנו מבקשים\n שבנתונים על היוצר יהיה כתוב לכל הפחות „© תורמי OpenStreetMap,\n רישיון CC BY-SA”. אם אתם משתמשים רק בנתוני מפות,\n אנו מבקשים „נתוני מפות © תורמי OpenStreetMap,\n רישיון CC BY-SA”.\n

    \n

    \n כשזה אפשרי, המילה OpenStreetMap צריכה להיות מקושרת אל הכתובת\n http://www.openstreetmap.org/\n ו־CC BY-SA אל http://creativecommons.org/licenses/by-sa/2.0/. אם\n אתם משתמשים באמצעי תקשורת שבו אין אפשרות להשתמש בקישורים (למשל\n בדפוס), אנו ממליצים שתַפנו את קוראיכם לאתר\n www.openstreetmap.org (אולי על־ידי\n כתיבת הכתובת המלאה הזאת במקום „OpenStreetMap”) ואל\n www.creativecommons.org.\n

    \n\n

    איך למצוא מידע נוסף

    \n

    \n קִראו עוד על שימוש בנתונים שלנו בדף שו״ת\n משפטי.\n

    \n

    \n אנו מזכירים לתורמי OSM לעולם לא להוסיף נתונים משום מקור\n שמוגבל בזכויות יוצרים (למשל מפות גוגל או מפות מודפסות) ללא\n אישור מפורש מבעלי הזכויות.\n

    \n

    \n אף־על־פי ש־OpenStreetMap הוא מיזם נתונים פתוחים, איננו יכולים לספק\n API מפות בחינם למפתחי צד שלישי.\n\n ר׳ את דפי המדיניות שלנו: המדיניות השימוש ב־API,\n מדיניות השימוש באריחים\n ומדיניות השימוש בנומינטים.\n

    \n\n

    התורמים שלנו

    \n

    \n מדיניות CC BY-SA שלנו דורשת מכם „לייחס את היצירה (לתת קרדיט) ליוצר\n באופן הסביר באמצעי התקשורת שאתם\n משתמשים בו”. מְמַפֵּי OSM פרטניים אינם מבקשים ייחוס ייחודי מעבר\n ל„תורמי OpenStreetMap”, אבל כאשר נתונים מסוכנות מיפוי\n לאומית או ממקור גדול אחר נכללים ב־OpenStreetMap,\n יכול להיות סביר לתת להם ייחוס ישיר באמצעות העתקת המידע עליהם\n או באמצעות קישור לדף הזה.\n

    \n\n\n\n
      \n
    • אוסטרליה: מכיל מנתוני פרוורים המבוססים על\n נתוני הלשכה האוסטרלית לסטטיסטיקה (Australian Bureau of Statistics).
    • \n
    • אוסטריה: מכיל נתונים\n מ־Stadt Wien לפי תנאי\n CC BY.
    • \n
    • קנדה: מכיל נתונים\n מ־GeoBase®‏, GeoGratis‏ (©‏ Department of Natural\n Resources Canada)‏, CanVec‏ (©‏ Department of Natural\n Resources Canada), ו־StatCan‏ (Geography Division,\n Statistics Canada).
    • \n
    • צרפת: מכיל נתונים שהגיעו במקור\n ממנהלת המסים הכללית (Direction Générale des Impôts).
    • \n
    • ניו זילנד: מכיל נתונים שהגיעו במקור\n מ־Land Information New Zealand. זכויות הכתר.
    • \n
    • פולין: מכיל נתונים מתוך מפות UMP-pcPL. זכויות היוצרים:\n תורמי UMP-pcPL.\n \n מידע נוסף על השימוש של OSM במידע של UMP.
    • \n
    • דרום אפריקה: מכיל נתונים שהגיעו במקור\n מ־Chief Directorate:\n National Geo-Spatial Information‏, State copyright reserved.
    • \n
    • הממלכה המאוחדת: מכיל נתוני סקר מדידות\n © זכויות הכתר וזכויות מסדי נתונים\n 2010.
    • \n
    \n\n

    \n הכללה של נתונים ב־OpenStreetMap אינה אומרת שהספק\n המקורי של הנתוהים תומך ב־OpenStreetMap, נותן אחריות כלשהי, או\n מקבל חבות כלשהי.\n

    " + legal_babble: + attribution_example: + alt: דוגמה לצורה הנכונה לתת ייחוס ל־OpenStreetMap באתר האינטרנט + title: דוגמה לייחוס + contributors_at_html: "אוסטריה: מכיל נתונים\nמעיריית וינה לפי תנאי\nCC BY,\nממדינת פורארלברג\nוממדינת טירול (לפי CC-BY AT עם תיקונים)." + contributors_ca_html: "קנדה: מכיל נתונים\nמ־GeoBase®‏, GeoGratis‏ (©‏ Department of Natural\nResources Canada)‏, CanVec‏ (©‏ Department of Natural\nResources Canada), ו־StatCan‏ (Geography Division,\nStatistics Canada)." + contributors_fi_html: "פינלנד: מכיל מידע ממסד נתונים טופוגרפיים של פינדלנד וממקורות מידע אחרים, תחת\nרישיון NLSFI." + contributors_footer_1_html: "למידע נוסף על מקורות אלה ואחרים ששימשו\nלשיפור OpenStreetMap, נא לראות את דף\nהתורמים בוויקי של OpenStreetMap." + contributors_footer_2_html: "הכללה של נתונים ב־OpenStreetMap אינה אומרת שהספק המקורי\nשל הנתוהים תומך ב־OpenStreetMap, לוקח על עצמו אחריות כלשהי, או\nמקבל חבות כלשהי." + contributors_fr_html: "צרפת: מכיל נתונים שהגיעו במקור\nממנהלת המסים הכללית (Direction Générale des Impôts)." + contributors_gb_html: "הממלכה המאוחדת: מכיל נתוני סקר מדידות\n© זכויות הכתר וזכויות מסדי נתונים\n2010–2012." + contributors_intro_html: "התורמים שלנו הם אלפי אנשים. אנו גם כוללים\nנתונים ברישיון פתוח מסוכנויות מיפוי לאומות\nוממקורות אחרים, בהם:" + contributors_nl_html: "הולנד: מכיל © נתונים מ־ AND‏, 2007\n(www.and.com)" + contributors_nz_html: "ניו זילנד: מכיל נתונים שהגיעו במקור\nמ־Land Information New Zealand. זכויות היוצרים של הכתר שמורות." + contributors_title_html: התורמים שלנו + contributors_za_html: "דרום אפריקה: מכיל נתונים שהגיעו\nמ־מִנהל כללי:\nמידע גאו־מרחבי לאומי, זכות יוצרים ממלכתית שמורה." + credit_1_html: אנו דורשים ייחוס אל „© תורמי OpenStreetMap”. + credit_2_html: "כמו־כן, חובתך להבהיר שהנתונים זמינים בכפוף לרישיון למסדי\nנתונים פתוחים, ואם נעשה שימוש באריחי המפה שלנו, שהמיפוי כפופות\nלרישיון CC-BY-SA. באפשרותך לעשות זאת באמצעות קישור אל\nדף זכויות היוצירם.\nלחלופין, וזו חובתך בעת הפצת OSM בצורת\nנתונים, באפשרותך לציין את השמות ולקשר ישירות אל הרישיון או הרישיונות. באמצעי תקשורת\nשלא ניתן להשתמש בהם בקישורים (למשל בדפוס), אני ממליצים\nלהפנות את הקוראים שלך אל openstreetmap.org (אולי על־ידי הרחבת\n„OpenStreetMap” ככתובת מלאה), אל opendatacommons.org, ואם\nזה מתאים, אל creativecommons.org." + credit_3_html: "בשביל מפה אלקטרונית שאפשר לעיין בה, הייחוס צריך להופיע בפינת המפה. למשל:" + credit_title_html: איך לתת ייחוס ל־OpenStreetMap + infringement_1_html: "אנו מזכירים לתורמים ל־OSM לעולם לא להוסיף נתונים משום מקור\nשמוגבל בזכויות יוצרים (למשל מפות גוגל או מפות מודפסות) ללא\nאישור מפורש מבעלי הזכויות." + infringement_2_html: "אם נראה לך שחומר שמוגבל בזכויות יוצרים נוסף באופן לא הולם\nאל מסד הנתונים של OpenStreetMap או אל האתר הזה, נא לפנות\nאל נוהל\nההסרה שלנו או כתבו תלונה ישירות\nבדף התלונות המקוון שלנו." + infringement_title_html: הפרת זכויות יוצרים + intro_1_html: "OpenStreetMap הוא מיזם נתונים פתוחים, לפי רישיון Open Data\nCommons Open Database License‏ (ODbL)." + intro_2_html: "אתם חופשיים להעתיק, להפיץ, לשדר ולהתאים את הנתונים שלנו,\nכל עוד אתם נותנים ייחוס ל־OpenStreetMap\nולתורמים למיזם. אם אתם משנים את הנתונים או את המפות שלנו או מסתמכים עליהם כדי ליצור משהו חדש,\nמותר לכם להפיץ את התוצאות רק לפי תנאי אותו הרישיון.\nהמסמך\nהמשפטי המלא מסביר את זכויותיכם ואת תחומי האחריות שלכם." + intro_3_html: "המיפוי באריחי המפה שלנו, והתיעוד שלנו מוגשים בכפוף\nלרישיון קריאייטיב\nקומונז ייחוס–שיתוף־זהה 2.0 license (בקיצור CC-BY-SA)." + more_1_html: "קִראו עוד על שימוש בנתונים שלנו ועל דרכים לייחס אלינו יצירות נגזרות בדף שו״ת\nמשפטי." + more_2_html: "אף־על־פי ש־OpenStreetMap הוא מיזם נתונים פתוחים, איננו יכולים לספק\nAPI מפות בחינם למפתחי צד שלישי.\nר׳ את דפי המדיניות שלנו: המדיניות השימוש ב־API,\nמדיניות השימוש באריחים\nומדיניות השימוש בנומינטים." + more_title_html: איך למצוא מידע נוסף + title_html: זכויות יוצרים ורישיון native: mapping_link: להתחיל למפות native_link: גרסה העברית @@ -1076,12 +1081,9 @@ he: title: תיבת דואר יוצא to: אל read: - back_to_inbox: לחזרה לתיבת הדואר הנכנס - back_to_outbox: חזרה לתיבת הדואר היוצא + back: חזרה date: תאריך from: מאת - reading_your_messages: קריאת ההודעות שלך - reading_your_sent_messages: לקריאת ההודעות שנשלחו reply_button: להשיב subject: נושא title: הודעה שנקראה @@ -1092,6 +1094,37 @@ he: wrong_user: נכנסת בשם „%{user}”, אבל ההודעה שביקשת להשיב עליה לא נשלחה לאותו המשתמש. נא להיכנס בחשבון הנכון כדי להשיב. sent_message_summary: delete_button: מחיקה + note: + description: + closed_at_by_html: נפתרה לפני %{when} על־ידי %{user} + closed_at_html: נפתרה לפני %{when} + commented_at_by_html: עודכנה לפני %{when} על־ידי %{user} + commented_at_html: עודכנה לפני %{when} + opened_at_by_html: נוצרה לפני %{when} על־ידי %{user} + opened_at_html: נוצרה לפני %{when} + reopened_at_by_html: הופעלה מחדש לפני %{when} על־ידי %{user} + reopened_at_html: הופעלה מחדש לפני %{when} + entry: + comment: תגובה + full: הערה מלאה + mine: + ago_html: לפני %{when} + created_at: "יצירה:" + creator: יוצר + description: תיאור + heading: הערות של %{user} + id: מזהה + last_changed: "שינוי אחרון:" + subheading: הערות ותגובות של %{user} + title: הערות ותגובות של %{user} + rss: + closed: הערה סגורה (ליד %{place}) + commented: תגובה חדשה (ליד %{place}) + description_area: רשימת הערות שהוספו, שהתקבלו עליהן הערות ושנדבגרו באזור שלך [(%{min_lat}|%{min_lon}) – (%{max_lat}|%{max_lon})] + description_item: הזנת rss עבור ההערה %{id} + opened: הערה חדשה (ליד %{place}) + reopened: הערה שהופעלה מחדש (ליד %{place}) + title: הערות של OpenStreetMap notifier: diary_comment_notification: footer: אפשר גם לקרוא את התגובה בכתובת %{readurl} ולהגיב בכתובת %{commenturl} או להשיב בכתובת %{replyurl} @@ -1107,8 +1140,7 @@ he: email_confirm_plain: click_the_link: אם באמת עשית את זה, נא ללחוץ על הקישור להלן כדי לאשר את השינוי. greeting: שלום, - hopefully_you_1: מישהו (בתקווה מדובר בך) רוצה לשנות את כתובת הדוא״ל ב־ - hopefully_you_2: "%{server_url} אל %{new_address}." + hopefully_you: מישהו (אנחנו מקווים שאת או אתה) ביקש לשנות את כתובת הדוא"ל הזאת באתר %{server_url} לכתובת %{new_address} friend_notification: befriend_them: באפשרותך לסמנו כחבר בכתובת %{befriendurl}. had_added_you: "%{user} הוסיף אותך כחבר ב־OpenStreetMap." @@ -1137,44 +1169,36 @@ he: lost_password_plain: click_the_link: אם אכן עשית את זה, יש ללחוץ על הקישור להלן כדי לאפס את הססמה. greeting: שלום, - hopefully_you_1: מישהו (אולי את או אתה) ביקש לאפס את הססמה - hopefully_you_2: בחשבון openstreetmap.org המשויך לכתובת הדוא"ל הזאת. + hopefully_you: מישהו (אולי את או אתה) ביקש שהססמה המשויכת לחשבון המזוהה עם כתובת הדוא"ל הזאת באתר openstreetmap.org. message_notification: - footer1: אפשר גם לקרוא את ההודעה בכתובת %{readurl} - footer2: ולענות בכתובת %{replyurl} + footer_html: ניתן גם לקרוא את ההודעה בכתובת %{readurl} ולהגיב באמצעות %{replyurl} header: "לתיבתך ב־OpenStreetMap הגיעה הודעה מאת %{from_user} עם הנושא %{subject}:" hi: שלום %{to_user}, + note_comment_notification: + anonymous: משתמש אלמוני + closed: + commented_note: הערת מפה שהגבת עליה נפתרה על־ידי %{commenter}. ההערה נמצאת ליד %{place} + subject_other: "[OpenStreetMap] הערה שהתעניינת בה נפתרה על־ידי %{commenter}" + subject_own: "[OpenStreetMap] אחת מההערות שלך נפתרה על־ידי %{commenter}" + your_note: אחת מהערות המפה שלך ליד %{place} נפתרה על־ידי %{commenter}. + commented: + commented_note: התקלבה תגובה מאת %{commenter} על הערה על מפה שהגבת עליה. הערה נמצאת ליד %{place} + subject_other: "[OpenStreetMap] התקבלה תגובה מאת %{commenter} על הערה שהתעניינת בה" + subject_own: "[OpenStreetMap] התקבלה תגובה מאת %{commenter} על אחת מההערות שלך" + your_note: התקבלה תגובה מאת %{commenter} על אחת מהערות המפה שלך ליד %{place} + details: אפשר למצוא פרטים נוספים על ההערה בכתובת %{url} + greeting: שלום, + reopened: + commented_note: הערה במפה שהגבת עליה הופעלה מחדש ע״י %{commenter}. ההערה היא ליד %{place}. + subject_other: "[OpenStreetMap] הערה שמעניינת אותך הופעלה מחדש ע״י %{commenter}" + subject_own: "[OpenStreetMap] אחת ההערות שלך הופעלה מחדש ע״י %{commenter}" + your_note: הערה שהוספת ליד %{place} הופעלה מחדש ע״י %{commenter}. signup_confirm: - subject: "[אופן סטריט מאפ OpenStreetMap] נא לאשר כתובת דוא״ל" - signup_confirm_html: - ask_questions: באפשרותך לשאול שאלות על אתר OpenStreetMap באתר השאלות ותשובות שלנו. - click_the_link: אם אכן מדובר בך, ברוך בואך! נא ללחוץ על הקישור מטה כדי לאמת את החשבון ולקרוא מידע נוסף על OpenStreetMap - current_user: רשימת משתמשים נוכחיים בקטגוריות, בהתאום למיקומם בעולם, זמינה בדף Category:Users_by_geographical_region. - get_reading: "לקריאה נוספת על OpenStreetMap באתר הוויקי, להתעדכן בחדשות האחרונות בבלוג OpenStreetMap או בטוויטר, או לקריאה בבלוג של מייסד OpenStreetMap סטיב קוסט: OpenGeoData blog למידע על ההיסטוריה של המיזם, ויש בו גם קובצי קול!" - greeting: שלום! - hopefully_you: מישהו (בתקווה שמדובר בך) ביקש ליצור חשבון משתמש ב - introductory_video: ניתן לצפות בסרטו מבוא ב-%{introductory_video_link}. - more_videos: צפייה בסרטונים נוספים בכתובת %{more_videos_link}. - more_videos_here: סרטונים נוספים מצויים כאן - user_wiki_page: מומלץ ליצור דף משתמש בוויקי, שיכלול קטגוריות שמספרות מה מיקומך כגון such as [[Category:Users_in_London]] (משתמשים בלונדון). - video_to_openstreetmap: סרטון מבוא לאתר OpenStreetMap - wiki_signup: באפשרותך להירשם לאתר הוויקי של OpenStreetMap. - signup_confirm_plain: - ask_questions: "באפשרותך לשאול שאלות על OpenStreetMap בדף השאלות ותשובות שלנו:" - blog_and_twitter: "ניתן להתעדכן בחדשות האחרונות דרך הבלוג או חשבון הטוויטר של OpenStreetMap:" - click_the_link_1: אם אכן מדובר בך, ברוך בואך! נא ללחוץ על הקישור מטה כדי לאמת את - click_the_link_2: החשבון ולקרוא מידע נוסף על אתר OpenStreetMap. - current_user_1: רשימת קטגוריות משתמשים, המבוססת על מיקומכם ברחבי העולם - current_user_2: "מצויה כאן:" - greeting: שלום! - hopefully_you: מישהו (בתקווה שמדובר בך) מבקש ליצור חשבון ב - introductory_video: "באפשרותך לצפות בסרטון הדרכה לאתר OpenStreetMap כאן:" - more_videos: "סרטוני הדרכה נוספים מצויים כאן:" - opengeodata: "אתר OpenGeoData.org הוא הבלוג של מייסד OpenStreetMap סטיב קוסט, ויש בו גם פודקאסטים (הקלטות קול):" - the_wiki: "ניתן לקרוא על OpenStreetMap בדפי ויקי:" - user_wiki_1: אנו ממליצים ליצור דף משתמש, שיכלול - user_wiki_2: "קטגוריות המסמנות את מקומכם, כגון קטגוריית „משתמשים בלונדון”: [[Category:Users_in_London]]." - wiki_signup: "באפשרותך להירשם לוויקי OpenStreetMap בכתובת:" + confirm: "לפני שאנחנו ממשיכים, אנחנו צריכים לוודא שהבקשה הגיעה ממך, אז אם באמת עשית את זה, צריך ללחוץ כאן כדי לאמת את החשבון שלך:" + created: מישהו (בתקווה את או אתה) יצר חשבון באתר %{site_url}. + greeting: אהלן! + subject: "[אופן סטריט מאפ OpenStreetMap] ברוך בואך לאופן סטריט מאפ" + welcome: אחרי אמות החשבון שלך, נספק לך מידע נוסף שיעזור לך להתחיל. oauth: oauthorize: allow_read_gpx: לקרוא את מסלולי ה־GPS הפרטיים שלך. @@ -1183,8 +1207,15 @@ he: allow_write_api: לשנות את המפה. allow_write_diary: ליצור רשומות יומן והערות ולהוסיף חברים. allow_write_gpx: להעלות מסלולי GPS. + allow_write_notes: לשנות הערות allow_write_prefs: לשנות את העדפות המשתמש שלך. request_access: היישום %{app_name} דורש גישה לחשבונך, %{user}. נא לבדוק האם מתאים לך שהיישום יקבל את היכולות האלו. אפשר לבחור או לא לבחור את כל מה שמתאים לך. + oauthorize_failure: + invalid: האסימון האישור אינו תקף. + title: בקשת אישור נכשלה + oauthorize_success: + title: בקשת אישור אושרה + verification: קוד האימות הוא %{code}. revoke: flash: שללת את האסימון מהיישום %{application}. oauth_clients: @@ -1201,6 +1232,7 @@ he: allow_write_api: לשנות את המפה. allow_write_diary: ליצור רשומות יומן והערות ולהוסיף חברים. allow_write_gpx: להעלות מסלולי GPS. + allow_write_notes: לשנות הערות allow_write_prefs: לשנות ההעדפות של המשתמש. callback_url: כתובת קריאה (callback) name: שם @@ -1231,6 +1263,7 @@ he: allow_write_api: לשנות את המפה. allow_write_diary: ליצור רשומות יומן והערות ולהוסיף חברים. allow_write_gpx: להעלות מסלולי GPS. + allow_write_notes: לשנות הערות allow_write_prefs: לשנות את ההעדפות שלהם. authorize_url: "כתובת אישור:" confirm: באמת? @@ -1239,19 +1272,39 @@ he: key: "מפתח צרכן:" requests: "מבקש את ההרשאות הבאות מהמשתמש:" secret: "סוד צרכן:" - support_notice: אנחנו תומכים ב־HMAC-SHA1 (מומלץ) וגם בטקסט פשוט במצב SSL. + support_notice: אנחנו תומכים בחתימות ב־HMAC-SHA1 (מומלץ) וגם ב־RSA-SHA1. title: פרטי OAuth עבור %{app_name} url: "כתובת אסימון בקשה:" update: flash: מידע הלקוח עודכן בהצלחה redaction: + create: + flash: נוצר חיתוך + destroy: + error: אירעה שגיאה בעת הריסת החיתוך הזה. + flash: החיתוך נהרס. + not_empty: החיתוך אינו ריק. נא לבטל את החיתוכים של הגרסאות ששיכות לחיתוך הזה לפני הריסתו. edit: description: תיאור + heading: עריכת חיתוך + submit: שמירת חיתוך + title: עריכת חיתוך + index: + empty: אין חיתוכים שאפשר להציג + heading: רשימת חיתוכים + title: רשימת חיתוכים new: description: תיאור + heading: הזנת מידע לחיתוך חדש + submit: יצירת חיתוך + title: מתבצעת יצירת חיתוך חדש show: confirm: באמת? description: "תיאור:" + destroy: הסרת החיתוך הזה + edit: עריכת החיתוך הזה + heading: הצגת החיתוך "%{title}" + title: הצגת חיתוך user: "יוצר:" update: flash: השינויים שנשמרו. @@ -1259,6 +1312,7 @@ he: edit: anon_edits_link_text: גלה מדוע זה כך. flash_player_required: יש צורך בנגן פלאש כדי להשתמש ב־Potlatch, ערוך הפלאש של OpenStreetMap. אפשר להוריד נגן פלאש מאתר Adobe.com. יש אפשרויות נוספות לעריכת OpenStreetMap. + id_not_configured: לא התבצעו הגדרות של iD no_iframe_support: הדפדפן שלך אינו תומך באלמנטים מסוג iframe של HTML, ואלו חיוניים עבור תכונה זו. not_public: לא הגדרת את עריכותיך כציבוריות. not_public_description: לא תוכל להמשיך לערוך את המפה בטרם תעשה זאת. באפשרותך להגדיר את עריכותיך כציבוריות דרך %{user_page} שלך. @@ -1267,18 +1321,15 @@ he: 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.) user_page_link: דף המשתמש index: + createnote: הוספת הערה js_1: הדפדפן שבו אתה משתמש אינו תומך ב־JavaScript, או שהשבתת את השימוש ב־JavaScript. js_2: אתר OpenStreetMap משתמש ב־JavaScript למפה המחליקה. license: - license_name: CC ייחוס–שיתוף זהה 2.0 - notice: מוגש בכפוף לרישיון %{license_name}, על ידי מיזם %{project_name} ועורכיו. - project_name: מיזם OpenStreetMap + copyright: "זכויות היוצרים: מיזם OpenStreetMap ותורמיו, בכפוף לרישיון פתוח" permalink: קישור קבוע remote_failed: העריכה נכשלה – נא לוודא כי JOSM או Merkaartor נטענו ושאפשרות השליטה מקחור מופעלת shortlink: קישור מקוצר key: - map_key: מפתח - map_key_tooltip: מפתח מפה table: entry: admin: גבול שטח שיפוט @@ -1356,6 +1407,7 @@ he: second: הפריט השני subheading: כותרת משנה text: טקסט + title_html: מפוענח עם Markdown unordered: רשימה בלתי־ממוינת url: כתובת richtext_area: @@ -1363,7 +1415,6 @@ he: preview: תצוגה מקדימה search: search: לחיפוש - search_help: "למשל: ‚נתניה’, ‚רחוב רחל המשוררת, ירושלים’, ‚90880’, או 'סניפי דואר באזור שפרעם' דוגמאות נוספות..." submit_text: מעבר where_am_i: איפה אני? where_am_i_title: נא לתאר את מיקומך הנוכחי באמצעות מנוע החיפוש @@ -1379,6 +1430,11 @@ he: upload_trace: העלאת מסלול GPS delete: scheduled_for_deletion: מסלול מיועד למחיקה + description: + description_with_count: + one: קובץ GPS עם נקודה אחת מאת %{user} + other: קובץ GPS עם %{count} נקודות מאת %{user} + description_without_count: קובץ GPS מאת %{user} edit: description: "תיאור:" download: הורדה @@ -1396,7 +1452,11 @@ he: uploaded_at: "תאריך העלאה:" visibility: "נִראוּת:" visibility_help: מה זה אומר? + georss: + title: מסלולי GPS של OpenStreetMap list: + description: עיון בהעלאות אחרונות של נתיבי GPS + empty_html: אין פה עדיין שום דבר. אפשר להעלות מידע חדש או ללמוד עוד על מעקב מסלולים ב־GPS בדף הוויקי. public_traces: מסלולי GPS ציבוריים public_traces_from: מסלולי GPS ציבוריים מאת %{user} tagged_with: " מתויג עם %{tags}" @@ -1436,14 +1496,15 @@ he: trace_header: see_all_traces: הצגת כל המסלולים see_your_traces: הצגת המסלולים שלך - traces_waiting: יש לך %{count} מסלולים שמחכים להעלאה. נא לשקול לחכות עד סיום העלאתם לפני העלאת נוספים, כדי לא לחסום את התור למשתמשים אחרים. + traces_waiting: + other: יש לך מסלול שמחכה להעלאה. נא לשקול לחכות עד סיום העלאתו לפני העלאת מסלולים נוספים, כדי לא לחסום את התור למשתמשים אחרים. upload_trace: העלאת מסלול trace_optionals: tags: תגים trace_paging_nav: - next: הבא » - previous: « הקודם - showing_page: הצגת הדף %{page} + newer: מסלולים חדשים יותר + older: מסלולים ישנים יותר + showing_page: הדף %{page} view: delete_track: מחיקת המסלול הזה description: "תיאור:" @@ -1482,6 +1543,10 @@ he: email never displayed publicly: (לעולם לא מוצגת בפומבי) flash update success: פרטי המשתמש/ת עודכנו בהצלחה. flash update success confirm needed: מידע המשתמש/ת עודכן בהצלחה. נא בדקו את תיבת הדוא"ל על מנת לאשרר את הדוא"ל החדש. + gravatar: + gravatar: להשתמש ב־Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: מה זה? home location: "מיקום ראשי:" image: "תמונה:" image size hint: (תמונה מרובעת בגודל 100x100 לפחות עובדת הכי טוב) @@ -1517,13 +1582,13 @@ he: update home location on click: עדכון המיקום הראשי שלך בעת לחיצה על המפה? confirm: already active: החשבון הזה כבר אושר. - before you start: אנחנו יודעים שבטח בא לך להתחיל כבר למפות, אבל אולי אפשר לבקש ממך לפני־כן למלא את הטופס להלן? button: אישור heading: אימות חשבון משתמש + introduction_1: שלחנו לך מכתב אימות. + introduction_2: נא לאמת את החשבון שלך באמצעות לחיצה על קישור בדוא"ל, ואחרי זה תהיה לך אפשרות להתחיל למפות. press confirm button: נא ללחוץ על כפתור האישור כדי להפעיל את חשבונך. - reconfirm: אם עבר זמן רב מאז שנרשמת, אולי צריך לשלוח לעצמך מכתב אישור חדש. - success: חשבונך אושר, תודה שנרשמת! - unknown token: נראה שהאסימון הזה אינו קיים. + reconfirm_html: אם ברצונך לקבל שוב מכתב אימות, נא ללחוץ כאן. + unknown token: נראה שקוד האישור הזה פג או שאינו קיים. confirm_email: button: אישור failure: כתובת הדוא״ל שלך כבר אושרה באסימון הזה. @@ -1543,8 +1608,8 @@ he: heading: משתמשים hide: הסתרת משתמשים נבחרים showing: - one: מוצג דף %{page} (%{first_item} מתוך %{items}) - other: מוצג דף %{page} (%{first_item}–%{last_item} מתוך %{items}) + one: דף %{page} (%{first_item} מתוך %{items}) + other: דף %{page} (%{first_item}–%{last_item} מתוך %{items}) summary: "%{name} נוצר מכתובת %{ip_address} ב־%{date}" summary_no_ip: "%{name} נוצר ב־%{date}" title: משתמשים @@ -1557,10 +1622,8 @@ he: heading: כניסה login_button: כניסה lost password link: איבדת את הססמה שלך? - new to osm: חדש ב־OpenStreetMap? + new to osm: הגעת עכשיו ב־OpenStreetMap? no account: אין לך חשבון? - notice: מידע נוסף על השינוי המתקרב ברישיון של OpenStreetMap (תרגומים) (דיון) - notice_terms: מיזם OpenStreetMap עובר לרישיון חדש ב־1 באפריל 2012. הוא פתוח כמו הנוכחי, אבל הפרטים המשפטיים בו מתאימים הרבה יותר למסד נתוני המפות שלנו. אנחנו רוצים מאוד לשמור על התרומות שלך ל־OpenStreetMap, אבל נוכל לעשות זאת רק לאחר הסכמתך להפיץ אותן לפי תנאי הרישיון החדש. אחרת, נצטרך להוציא אותם ממסד הנתונים.

    אנו מבקשים ממך להיכנס לחשבון, להקדיש מספר דקות לעיון ברישיון החדש ולקבל את התנאים החדשים. תודה! openid: "%{logo} OpenID:" openid invalid: סליחה, ה־OpenID שלך נראה מקולקל openid missing provider: סליחה, לא התאפשר ליצור קשר עם ספק ה־OpenID שלך @@ -1586,7 +1649,7 @@ he: title: כניסה עם חשבון יאהו password: "ססמה:" register now: להירשם עכשיו - remember: "לזכור אותי:" + remember: לזכור אותי title: כניסה to make changes: כדי לשנות את נתוני OpenStreetMap, צריך שיהיה לך חשבון. with openid: "לחלופין אפשר להשתמש ב־OpenID כדי להיכנס:" @@ -1605,19 +1668,21 @@ he: title: הססמה הלכה לאיבוד make_friend: already_a_friend: "%{name} כבר חבר שלך." + button: להוסיף כחבר failed: סליחה, הוספת %{name} כחבר נכשלה. - success: "%{name} חבר שלך עכשיו." + heading: להוסיף את %{user} בתור חבר? + success: "%{name} חבר שלך עכשיו!" new: + about: + header: חופשית וניתנת לעריכה + html: "

    להבדיל ממפות אחרות, OpenStreetMap נוצרת כולה על־ידי אנשים כמוך,\nוכולם חופשיים לתקן, לעדכן ולהוריד אותה ולהשתמש בה.

    \n

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

    " confirm email address: "אימות כתובת דוא״ל:" confirm password: "אימות ססמה:" contact_webmaster: נא ליצור קשר עם מנהל האתר כדי שייווצר חשבון, ואנחנו נשתדל לטפל בבקשה כמה שיותר מהר. - continue: להמשיך + continue: הרשמה display name: "שם התצוגה:" display name description: שם המשתמש שלך, שמוצג בפומבי. אפשר לשנות את זה בהעפות שלך. email address: "כתובת דוא״ל:" - fill_form: נא למלא את הטופס הבא ונשלח לך מכתב מהיר כדי להפעיל את חשבונך. - flash create success message: תודה על הרישום. שלחנו מכתב אישור לכתוב %{email} וכשנקבל ממך את האישור, אפשר יהיה להתחיל למפות.

    אם נעשה בחשבון הדוא״ל שלך שימוש במערכת שמלבינה הודעות, נא להוסיף את webmaster@openstreetmap.org לרשימה הלבנה, כי איננו יכולים להשיב לבקשות אישור. - heading: יצירת חשבון משתמש license_agreement: עם אישור החשבון יש לקבל את תנאי התרומה. no_auto_account_create: למרבה הצער, כעת איננו יכולים ליצור לך חשבון באופן אוטומטי. not displayed publicly: לא מוצג בפומבי (ר׳ מידיניות פרטיות) @@ -1627,7 +1692,7 @@ he: password: "ססמה:" terms accepted: תודה על קבלת תנאי התרומה החדשים! terms declined: אנחנו מצטערים שהחלטת לא לקבל את תנאי התרומה החדשים. למידע נוסף ר׳ דף הוויקי הזה. - title: יצירת חשבון + title: הרשמה use openid: לחלופין, אפשר להשתמש ב־%{logo} OpenID כדי להיכנס no_such_user: body: סליחה, אין חשבון בשם %{user}. אולי האיות לא נכון ואולי לחצת על קישור שגוי. @@ -1638,6 +1703,8 @@ he: nearby mapper: ממפה סמוך your location: מיקומך remove_friend: + button: להסיר מרשימת החברים + heading: להסיר את %{user} מרשימת החברים? not_a_friend: "%{name} לא אחד מהחברים שלך." success: "%{name} הוסר מרשימת החברים שלך." reset_password: @@ -1674,7 +1741,7 @@ he: activate_user: להפעלת משתמש זה add as friend: הוספה כחבר ago: (לפני %{time_in_words_ago}) - block_history: הצגת חסימות שהתקבלו + block_history: חסימות שהתקבלו blocks by me: מתי חסמתי blocks on me: מתי חסמו אותי comments: הערות @@ -1692,26 +1759,30 @@ he: diary: יומן edits: עריכות email address: "כתובת דוא\"ל:" - friends_changesets: עיון בכל ערכות השינויים של חברים - friends_diaries: עיון בכל רשומות היומן של חברים + friends_changesets: ערכות שינויים של חברים + friends_diaries: רשומות יומן של חברים hide_user: להסתרת משתמש זה - if set location: אם הגדרת את מיקומך, מפה יפה ועוד דברים יופיעו פה. אפשר להגדיר את מיקומך הראשי בדף %{settings_link}. + if set location: הגדרה של מיקום הבית שלך בדף %{settings_link} תאפשר לך לראות משתמשים בסביבתך. km away: במרחק %{count} ק״מ latest edit: "עריכה אחרונה %{ago}:" m away: במרחק %{count} מ׳ mapper since: "ממפה מאז:" - moderator_history: הצגת חסימות שניתנו + moderator_history: חסימות שניתנו my comments: ההערות שלי my diary: היומן שלי my edits: העריכות שלי + my messages: ההודעות שלי + my notes: הערות המפה שלי + my profile: הפרופיל שלי my settings: ההגדרות שלי my traces: המסלולים שלי nearby users: עוד משתמשים בסביבה - nearby_changesets: עיון בכל ערכות השינויים של משתמשים בסביבה - nearby_diaries: עיון בכל רשומות היומן של משתמשים בסביבה + nearby_changesets: ערכות השינויים של משתמשים בסביבה + nearby_diaries: רשומות יומן של משתמשים בסביבה new diary entry: רשומה חדשה ביומן no friends: עדיין לא הוספת חברים כלל. no nearby users: אין עדיין עוד משתמשים שמודים שהם מיפו בסביבה. + notes: הערות מפה oauth settings: הגדרות oauth remove as friend: הסרה מרשימת חברים role: @@ -1785,11 +1856,14 @@ he: creator_name: יוצר display_name: משתמש חסום edit: עריכה + next: הבא » not_revoked: (לא בוטלה) + previous: « הקודם reason: סיבה לחסימה revoke: לבטל! revoker_name: בוטלה על־ידי show: הצגה + showing_page: הדף %{page} status: מצב period: one: שעה אחת @@ -1837,3 +1911,25 @@ he: fail: שלילת התפקיד „%{role}” מהמשתמש „%{name}” נכשלה. נא לבדוק שהמשתמש והתפקיד תקינים. heading: אישור שלילת תפקיד title: אישור שלילת תפקיד + welcome_page: + add_a_note: + paragraph_1_html: אם רק רצית לתקן משהו קטן ואין לך זמן להירשם וללמוד איך לערוך, קל להוסיף הערה. + paragraph_2_html: "צריך פשוט ללכת אל המפה וללחוץ על סמל ההערה: . זה יוסיף למפה סמן, שאפשר לגרור. אחרי הוספת ההערה יש ללחוץ על שמירה וממפים אחרים יבדקו את זה." + title: אין לך זמן לערוך? אפשר להוסיף הערה! + basic_terms: + editor_html: עורך הוא תכנה או אתר לעריכת המפה. + node_html: צומת נוא נקודה על מפה, כגון מסעדה אחת או עץ אחד. + paragraph_1_html: למיזם OpenStreetMap יש עגה משלו. הנה מספר מילות מפתח שיהיו שימושיות. + tag_html: תג הוא פיסת מידע על צומת או על נתיב כמו שם של מסעדה או מגבלת מהירות בדרך. + title: מונחים בסיסיים למיפוי + way_html: נתיב הוא קו או אזור כמו דרך, זרם, אגם או מבנה. + introduction_html: ברוך בואך ל־OpenStreetMap, מפה חופשית של העולם, שאפשר לערוך. עכשיו שנרשמת, הכול מוכן ואפשר להתחיל לצייר מפות. הנה מדריך קצת שייתן לך את הדברים החשובים שכדאי לך לדעת. + questions: + paragraph_1_html: "ל-OpenStreetMap מספר מקורות ללמידה על הפרויקט, לשאול ולענות על שאלות, דיונם לשיתוף פעולה ותיעוד נושאי המיפוי. \n\nלקבל עזרה." + title: יש שאלות? + start_mapping: להתחיל למפות + title: ברוך בואך! + whats_on_the_map: + off_html: מה שאין פה זה מידע דעתני כמו דירוגים, מקומות היסטוריים או היפותטיים ונתונים ומקורות שמוגבלים בזכויות יוצרים. אנו דורשים ממך לא להוסיף מידע ממפות מקוונות או מודפסות אלא אם יש לך אישור מיוחד לכך. + on_html: OpenStreetMap הוא מקום למיפוי דברים אמתיים ונוכחיים – הוא מכיל מיליוני מבנים, דרכים ופרטים אחרים על מקומות. אפשר למפות כל דבר מהעולם מהאמתי שמעניין אותך. + title: מה על המפה diff --git a/config/locales/hi.yml b/config/locales/hi.yml index 704e489abac..f9eaea97a00 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -129,25 +129,25 @@ hi: data_layer_name: तथ्य details: "विवरण:" drag_a_box: मानचित्र पर एक बॉक्स खींचें एक क्षेत्र का चयन करने के लिए - edited_by_user_at_timestamp: "[[user]] द्वारा [[timestamp]] पर संपादित" - loaded_an_area_with_num_features: "इस क्षेत्र में [[num_features]] विशेषताओं शामिल है| सामान्य तौर पर, कुछ ब्राउज़रों इस मात्रा के तथ्यों प्रदर्शित करने में सक्षम नहीं हो सकता है| वे सबसे अच्छा काम करते है जब एक बार में १०० से कम सुविधाओं को प्रदर्शन करते है: कुछ और करने पर आपके ब्राउजर कम तेज़ हो सकती है| यदि आप इस तथ्यों को प्रदर्शित करना चाहते हैं, तो आप नीचे दिए गए बटन पर क्लिक करे|" + edited_by_user_at_timestamp: "%{user} द्वारा %{timestamp} पर संपादित" + loaded_an_area_with_num_features: "इस क्षेत्र में %{num_features} विशेषताओं शामिल है| सामान्य तौर पर, कुछ ब्राउज़रों इस मात्रा के तथ्यों प्रदर्शित करने में सक्षम नहीं हो सकता है| वे सबसे अच्छा काम करते है जब एक बार में १०० से कम सुविधाओं को प्रदर्शन करते है: कुछ और करने पर आपके ब्राउजर कम तेज़ हो सकती है| यदि आप इस तथ्यों को प्रदर्शित करना चाहते हैं, तो आप नीचे दिए गए बटन पर क्लिक करे|" manually_select: कृपया, आप एक अलग क्षेत्र चुनिए object_list: details: विवरण history: type: - node: आसंधि [[id]] - way: रस्ता [[id]] + node: आसंधि %{id} + way: रस्ता %{id} selected: type: - node: आसंधि [[id]] - way: रस्ता [[id]] + node: आसंधि %{id} + way: रस्ता %{id} type: node: आसंधि way: रस्ता private_user: असार्वजनिक उपयोगकर्ता show_history: इतहास दिखाइए - unable_to_load_size: "भरण करने में असमर्थ: इस आकार [[bbox_size]] के बॉक्स बहुत बड़ी है:" + unable_to_load_size: "भरण करने में असमर्थ: इस आकार %{bbox_size} के बॉक्स बहुत बड़ी है:" wait: कृपया प्रतीक्षा करें... zoom_or_select: कृपया ज़ूम करे या नक्शे के एक क्षेत्र देखने के लिए चुनें tag_details: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 92cd040f940..60f5dba9f40 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -2,10 +2,20 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Ex13 +# Author: Janjko # Author: Mnalis # Author: Mvrban +# Author: Nemo bis +# Author: Phidrho +# Author: Roberta F. # Author: SpeedyGonsales hr: + about_page: + copyright_html: ©OpenStreetMap
    doprinositelji + local_knowledge_title: Lokalno znanje + next: Dalje + open_data_html: "OpenStreetMap sadrži slobodne podatke: možeš ih slobodno koristiti za bilo koju svrhu dok god su uz podatke naznačene zasluge OpenStreetMap-a i njegovih doprinositelja. Ako izmjenjuješ podatke ili stvaraš nove na temelju preuzetih podataka, te podatke možeš distribuirati samo pod istom licencom. Vidi stranicu:Autorska prava i licenca za detalje." + open_data_title: Otvoreni podaci activerecord: attributes: diary_comment: @@ -65,9 +75,9 @@ hr: relation_member: Član relacije relation_tag: Oznaka relacije session: Sesija - trace: Trasa + trace: Trag tracepoint: Točka trase - tracetag: Oznaka trase + tracetag: Oznaka traga user: korisnik user_preference: Korisničke postavke user_token: korisnički token @@ -80,153 +90,84 @@ hr: setup_user_auth: blocked: Tvoj pristup API-u je blokiran. Prijavite se na web sučelje da saznate više. browse: + anonymous: anonimno changeset: - changeset: "Changeset: %{id}" + belongs_to: Autor changesetxml: XLM Changeset - download: Preuzmi %{changeset_xml_link} ili %{osmchange_xml_link} feed: title: Changeset %{id} title_comment: Changeset %{id} - %{comment} + node: Točaka (%{count}) + node_paginated: Točke (%{x}-%{y} od %{count}) osmchangexml: osmChange XML - title: Changeset - changeset_details: - belongs_to: "Pripada:" - bounding_box: "Granični okvir:" - box: okvir - closed_at: "Zatvoreno:" - created_at: "Napravljeno:" - has_nodes: - few: Sadrži slijedeće %{count} točke - one: "Sadrži slijedeću %{count} točku:" - other: "Sadrži sljedećih %{count} točaka:" - has_relations: - few: "Sadrži slijedeće %{count} relacije:" - one: "Sadrži slijedeću %{count} relaciju:" - other: "Sadrži slijedećih %{count} relacija:" - has_ways: - few: "Sadrži slijedeća %{count} puta:" - many: "Sadrži slijedećih %{count} puteva:" - one: "Sadrži slijedeći %{count} put:" - other: "Sadrži slijedećih %{count} puteva:" - no_bounding_box: Granični okvir nije pohranjen za ovaj set promjena. - show_area_box: Prikaži granični okvir - common_details: - changeset_comment: "Komentar:" - edited_at: "Uređeno:" - edited_by: "Uredio:" - in_changeset: "U changesetu:" - version: "Verzija:" + relation: Relacije (%{count}) + relation_paginated: Relacije(%{x}-%{y} od %{count}) + title: "Changeset: %{id}" + way: Putovi (%{count}) + way_paginated: Putovi(%{x}-%{y} od %{count}) + closed: Zatvoreno + closed_by_html: Korisnik %{user} je zatvorio prije %{time} + closed_html: je zatvoreno prije %{time} containing_relation: entry: Relacija %{relation_name} entry_role: Relacija %{relation_name} (kao %{relation_role}) - map: - deleted: Izbrisano - larger: - area: Prikaži područje na većoj karti - node: Prikaži točku na većoj karti - relation: Prikaži relaciju na većoj karti - way: Prikaži put na većoj karti - loading: Učitavanje... - navigation: - all: - next_changeset_tooltip: Slijedeći changeset - next_node_tooltip: Sljedeća točka - next_relation_tooltip: Sljedeća relacija - next_way_tooltip: Sljedeći put - prev_changeset_tooltip: Prethodni changeset - prev_node_tooltip: Prethodna točka - prev_relation_tooltip: Prethodna relacija - prev_way_tooltip: Prethodni put - user: - name_changeset_tooltip: "Prikaži promjene korisnika: %{user}" - next_changeset_tooltip: Slijedeća promjena od %{user} - prev_changeset_tooltip: Prethodno uredio %{user} + created: Stvoreno + created_by_html: Korisnik %{user} je stvorio prije %{time} + created_html: je stvoreno prije %{time} + deleted_by_html: Korisnik %{user} je obrisao prije %{time} + download_xml: Preuzmi XML + edited_by_html: Korisnik %{user} je uredio prije %{time} + in_changeset: Changeset + location: "Lokacija:" + no_comment: (bez komentara) node: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" - download_xml: Preuzimanje XML - edit: uredi - node: Točka - node_title: "Točka: %{node_name}" - view_history: prikaži povijest - node_details: - coordinates: "Koordinate:" - part_of: "Dio od:" - node_history: - download: "%{download_xml_link} ili %{view_details_link}" - download_xml: Preuzimanje XML - node_history: Povijest točke - node_history_title: "Povijest točke: %{node_name}" - view_details: prikaži detalje + history_title: "Povijest točke: %{name}" + title: "Točka: %{name}" not_found: - sorry: Žao mi je, ali %{type} sa ID %{id}, se ne može naći. + sorry: "Nažalost, %{type} #%{id} nije pronađen." type: changeset: changeset node: točka relation: relacija way: put - paging_nav: - of: od - showing_page: Prikazujem stranicu + note: + closed_by: Riješio/la %{user} prije %{when} + closed_by_anonymous: Riješeno anonimno prije %{when} + closed_title: Riješena bilješka broj %{note_name} + commented_by: Komentirao/la %{user} prije %{when} + commented_by_anonymous: Komentirano anonimno prije %{when} + hidden_by: Sakrio/la %{user} prije %{when} + hidden_title: Skrivena bilješka broj %{note_name} + new_note: Nova bilješka + open_by: Zabilježio/la %{user} prije %{when} + open_by_anonymous: Zabilježeno anonimno prije %{when} + open_title: Neriješena bilješka broj %{note_name} + reopened_by: Ponovno aktivirao/la %{user} prije %{when} + reopened_by_anonymous: Ponovno aktivirano anonimno prije %{when} + title: "Bilješka: %{id}" + part_of: Dio od + redacted: + redaction: Redakcija %{id} + type: + node: točka + relation: relacija + way: put relation: - download: "%{download_xml_link} ili %{view_history_link}" - download_xml: Preuzimanje XML - relation: Relacija - relation_title: "Relacija: %{relation_name}" - view_history: prikaži povijest - relation_details: - members: "Članovi:" - part_of: "Dio:" - relation_history: - download: "%{download_xml_link} ili %{view_details_link}" - download_xml: Preuzimanje XML - relation_history: Povijest relacije - relation_history_title: "Povijest relacije: %{relation_name}" - view_details: prikaži detalje + history_title: "Povijest relacije: %{name}" + members: Članovi + title: "Relacija: %{name}" relation_member: entry_role: "%{type} %{name} kao %{role}" type: node: Točka relation: Relacija way: Put - start: - manually_select: Ručno izaberi drugo područje - view_data: Prikaži podatke za trenutni prikaz karte start_rjs: - data_frame_title: Podaci - data_layer_name: Podaci - details: Detalji - drag_a_box: Povuci okvir na karti da bi izabrali područje - edited_by_user_at_timestamp: Uredio [[user]] u [[timestamp]] - hide_areas: Sakrij područja - history_for_feature: Povijest za [[feature]] + feature_warning: Učitavam %{num_features} značajki, što može usporiti ili zaglaviti tvoj internet preglenik. Jesi li siguran/na da želiš prikazati ove podatke? load_data: Učitaj podatke - loaded_an_area_with_num_features: "Učitali ste područje koje sadrži [[num_features]] značajki. Općenito, neki internet preglednici se ne mogu nositi s tolikom količinom podataka. Preglednici najbolje rade kada prikazuju manje od 100 značajki istovremeno: ako radite još nešto, može usporiti preglednik ili ga zblokirati. Ako ste sigurni da želite prikazati ove podtake, možete kliknuti dugme ispod." loading: Učitavanje... - manually_select: Ručno izaberi drugo područje - object_list: - api: Preuzmi ovo područje iz API - back: Prikaži listu objekata - details: Detalji - heading: Lista objekata - history: - type: - node: Točka [[id]] - way: Put [[id]] - selected: - type: - node: Točka [[id]] - way: Put [[id]] - type: - node: Točka - way: Put - private_user: privatni korisnik - show_areas: Prikaži područja - show_history: Prikaži povijest - unable_to_load_size: "Ne mogu učitati: Granični okvir veličine [[bbox_size]] je prevelik (mora biti manji od %{max_bbox_size})" - wait: Pričekajte... - zoom_or_select: Zoomiraj ili izaberi područje karte za pregled tag_details: - tags: "Oznake:" + tags: Oznake wiki_link: key: Opis wiki stranica za oznaku %{key} (tag) tag: Opis wiki stranica za oznaku %{key}=%{value} (tag) @@ -238,38 +179,25 @@ hr: node: točka relation: relacija way: put + version: Inačica + view_details: Prikaži detalje + view_history: Prikaži povijest way: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" - download_xml: Preuzimanje XML - edit: uredi - view_history: prikaži povijest - way: Put - way_title: "Put: %{way_name}" - way_details: also_part_of: - one: također dio puta %{related_ways} - other: također dio puteva %{related_ways} - nodes: "Točke:" - part_of: "Dio od:" - way_history: - download: "%{download_xml_link} ili %{view_details_link}" - download_xml: Preuzimanje XML - view_details: prikaži detalje - way_history: Povijest puta - way_history_title: "Povijest puta: %{way_name}" + one: dio puta %{related_ways} + other: dio putova %{related_ways} + history_title: "Povijest puta: %{name}" + nodes: Točke + title: "Put: %{name}" changeset: changeset: anonymous: Anonimno - big_area: (veliko) - no_comment: (bez komentara) no_edits: (nema promjena) - show_area_box: prikaži okvir područja - still_editing: (još uređuje) view_changeset_details: Prikaži detalje changeseta changeset_paging_nav: next: Slijedeća » previous: « Prethodna - showing_page: Prikazujem stranicu %{page} + showing_page: Stranica %{page} changesets: area: Područje comment: Komentar @@ -277,29 +205,37 @@ hr: saved_at: Spremljeno user: Korisnik list: - description: Nedavne promjene - description_bbox: Changesets unutar %{bbox} - description_user: Changesets od %{user} - description_user_bbox: Changesets od %{user} unutar %{bbox} - heading: Changesets - heading_bbox: Changesets - heading_user: Changesets - heading_user_bbox: Changesets + empty: Nisu pronađeni paketi uređivanja. + empty_area: Nema paketa uređivanja na ovom području. + empty_user: Nema paketa uređivanja ovog korisnika. + load_more: Učitaj više + no_more: Nema više traženih paketa uređivanja. + no_more_area: Nema više paketa uređivanja na ovom području. + no_more_user: Nema više paketa uređivanja ovog korisnika. title: Changesets - title_bbox: Changesets unutar %{bbox} + title_friend: Paketi uređivanja tvojih prijatelja + title_nearby: Paketi uređivanja obližnjih korisnika title_user: Changesets od %{user} - title_user_bbox: Changesets od %{user} unutar %{bbox} timeout: sorry: Nažalost, popis Changeseta (skupa promjena) koje ste zatražili je predugo trajalo za preuzimanje. diary_entry: + comments: + ago: prije %{ago} + comment: Komentar + has_commented_on: "%{display_name} je komentirao sljedeće dnevničke unose" + newer_comments: Noviji komentari + older_comments: Stariji komentari + post: Pošalji + when: Kad diary_comment: comment_from: Komentar od %{link_user} u %{comment_created_at} confirm: Potvrdi hide_link: Sakrij ovaj komentar diary_entry: comment_count: - one: 1 komentar + one: "%{count} komentar" other: "%{count} komentara" + zero: Nema komentara comment_link: Komentiraj ovaj zapis confirm: Potvrdi edit_link: Uredi ovaj zapis @@ -334,8 +270,10 @@ hr: newer_entries: Noviji zapisi no_entries: Nema zapisa u dnevniku older_entries: Stariji zapisi - recent_entries: "Nedavni zapisi u dnevnik:" + recent_entries: Nedavni zapisi u dnevnik title: Dnevnici korisnika + title_friends: Dnevnici prijatelja + title_nearby: Dnevnici obližnjih članova user_title: "%{user}ov dnevnik" location: edit: Uredi @@ -356,6 +294,9 @@ hr: user_title: "%{user}ov dnevnik" editor: default: Zadano (currently %{name}) + id: + description: iD (uređivač u pregledniku) + name: iD potlatch: description: Potlatch 1 (editor unutar web preglednika) name: Potlatch 1 @@ -371,7 +312,7 @@ hr: area_to_export: Područje za export embeddable_html: HTML kod za umetanje export_button: Export - export_details: OpenStreetMap podaci je licencirani pod Creative Commons Attribution-ShareAlike 2.0 dozvolom. + export_details: OpenStreetMap podaci su licencirani pod Open Data Commons Open Database License (ODbL). format: Format format_to_export: Format za Export image_size: Veličina slike @@ -379,36 +320,42 @@ hr: licence: Dozvola longitude: "Lon:" manually_select: Ručno izaberi drukčije područje + map_image: Slika karte (prikazuje standardni sloj) max: max options: Opcije osm_xml_data: OpenStreetMap XML podaci output: Izlaz - paste_html: Zalijepi HTML za ubacivanje na webstranicu + paste_html: Zalijepi HTML za ugrađivanje na web stranicu scale: Mjerilo too_large: - body: Ovo područje je preveliko da bi se izvezlo kao OpenStreetMap XML podaci. Molimo povećajte (zoom) ili odaberite manju površinu. - heading: Područje je preveliko + advice: "Ako gornji izvoz podataka ne uspije, molim pokušaj sa nekim od izvora navedenih ispod:" + body: Ovo područje je preveliko da bi se izvezlo kao OpenStreetMap XML podaci. Molim povećaj prikaz ili odaberi manju površinu ili odaberi jedan od izvora navedenih ispod za preuzimanje velike količine podataka. + geofabrik: + description: "Redovno ažurirani podaci za izvoz: kontinenata, država i odabranih gradova" + title: Geofabrik Downloads + metro: + description: Izvoz za glavne svjetske gradove i njihovih obližnjih područja + title: Metro Extracts + other: + description: Dodatni izvori su navedeni na wiki stranici OpenStreetMap-a + title: Drugi izvori + overpass: + description: Preuzmi iznad odabrano granično područje sa drugog servera na kojem je identična kopija baze podataka OpenStreetMap-a + title: Overpass API + planet: + description: Redovno ažurirane kopije kompletne baze podataka OpenStreetMap-a + title: PlanetOSM zoom: Zoom - start_rjs: - add_marker: Dodaj makrker na kartu - change_marker: Promjeni poziciju markera - click_add_marker: Klikni da dodaš marker na kartu - drag_a_box: Povuci okvir na karti da izabereš područje - export: Export - manually_select: Ručno izaberi drugo područje - view_larger_map: Prikaži veću kartu + title: Izvoz geocoder: description: title: geonames: Lokacija sa GeoNames-a - osm_namefinder: "%{types} sa OpenStreetMap Namefindera" osm_nominatim: Lokacija sa OpenStreetMap Nominatima types: cities: Gradovi places: Mjesta towns: Manji gradovi - description_osm_namefinder: - prefix: "%{distance} %{direction} od %{type}" direction: east: istočno north: sjeverno @@ -429,23 +376,35 @@ hr: title: ca_postcode: Rezultati iz Geocoder.CA geonames: Rezultati iz GeoNames + geonames_reverse: Rezultati sa stranice GeoNames latlon: Rezultati iz Internal - osm_namefinder: Rezultati iz OpenStreetMap Namefinder osm_nominatim: Rezultati sa OpenStreetMap Nominatim + osm_nominatim_reverse: Rezultati sa stranice OpenStreetMap Nominatim uk_postcode: Rezultati iz NPEMap / FreeThe Postcode us_postcode: Rezultati iz Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} od %{parentname})" - suffix_place: ", %{distance} %{direction} od %{placename}" search_osm_nominatim: prefix: + aerialway: + chair_lift: Sedežnica + drag_lift: Sidro/tanjurić + station: Stanica žičare + aeroway: + aerodrome: Zračna luka + apron: Pristanišna platforma + helipad: Heliodrom + runway: Pista + taxiway: Rulnica + terminal: Terminal amenity: + WLAN: Pristup WiFi-u airport: Zračna luka arts_centre: Umjetnički centar + artwork: Umjetnička djela atm: Bankomat auditorium: Auditorij bank: Banka bar: Bar + bbq: Roštilj bench: Klupa bicycle_parking: Biciklistički parking bicycle_rental: Rent a bicikl @@ -518,6 +477,7 @@ hr: social_club: Društveni klub studio: Studio supermarket: Supermarket + swimming_pool: Bazen taxi: Taxi telephone: Telefonska govornica theatre: Kazalište @@ -528,12 +488,19 @@ hr: veterinary: Veterinar village_hall: Seoski Dom waste_basket: Kanta za otpatke - wifi: WiFi pristupna točka + wifi: Pristup WiFi-u youth_centre: Centar za mladež boundary: administrative: Administrativna granica + national_park: Nacionalni park + protected_area: Zaštićeno područje + bridge: + viaduct: Vijadukt + "yes": Most building: "yes": Zgrada + emergency: + fire_hydrant: Hidrant highway: bridleway: Konjička staza bus_guideway: Autobusna traka @@ -577,6 +544,8 @@ hr: building: Zgrada castle: Dvorac church: Crkva + citywalls: Gradske zidine + fort: Tvrđava house: Kuća icon: Ikona manor: Zamak @@ -585,6 +554,7 @@ hr: monument: Spomenik museum: Muzej ruins: Ruševine + tomb: Grob tower: Toranj wayside_cross: Krajputaš wayside_shrine: Usputno svetište @@ -601,6 +571,7 @@ hr: farmland: Polje farmyard: Farma forest: Šuma + garages: Garaže grass: Trava greenfield: Greenfield zemljište industrial: Industrijsko područje @@ -609,6 +580,7 @@ hr: military: Vojno područje mine: Rudnik nature_reserve: Rezervat prirode + orchard: Voćnjak park: Park piste: Pista quarry: Kamenolom @@ -635,12 +607,16 @@ hr: pitch: Sportski teren playground: Igralište recreation_ground: Rekreacijski teren + sauna: Sauna slipway: Navoz sports_centre: Sportski centar stadium: Stadion swimming_pool: Bazen track: Staza za trčanje water_park: Vodeni park + military: + barracks: Barake + bunker: Bunker natural: bay: Zaljev beach: Plaža @@ -649,9 +625,11 @@ hr: channel: Kanal cliff: Litica crater: Krater + dune: Dina feature: Obilježje fell: Brdo fjord: Fjord + forest: Šuma geyser: Gejzir glacier: Glečer heath: Ravnica @@ -671,6 +649,7 @@ hr: scrub: Guštara shoal: Sprud spring: Izvor + stone: Kamen strait: Tjesnac tree: Drvo valley: Dolina @@ -679,6 +658,14 @@ hr: wetland: Močvara wetlands: Močvara wood: Šuma + office: + accountant: Računovođa + architect: Arhitekt + company: Tvrtka + employment_agency: Agencija za zapošljavanje + lawyer: Odvjetnik + ngo: Ured nedržavne organizacije + "yes": Ured place: airport: Zračna luka city: Grad @@ -814,6 +801,8 @@ hr: valley: Dolina viewpoint: Vidikovac zoo: Zoo + tunnel: + "yes": Tunel waterway: boatyard: Brodogradilište canal: Kanal @@ -835,77 +824,138 @@ hr: water_point: Točka vodotoka waterfall: Vodopad weir: Brana + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + welcome: + title: Dobrodošao/la na OSM + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Zatvori + edit_help: Pomakni kartu i povećaj prikaz koji želiš urediti, zatim klikni ovdje. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda karte je dostupna samo za standardni sloj map: base: cycle_map: Biciklistička karta + hot: Humanitarna + standard: Standardni + transport_map: Transportna karta + copyright: © OpenStreetMap doprinositelji + donate_link_text: + layers: + data: Podaci karte + header: Slojevi karte + notes: Bilješke karte + overlays: Uključi dodatne slojeve za otklanjanje grešaka na karti + title: Slojevi + locate: + popup: Udaljen/a si {distance} {unit} od ove točke + title: Pokaži moju lokaciju + zoom: + in: Povećaj prikaz + out: Smanji prikaz + notes: + new: + add: Dodaj bilješku + intro: Kako bi poboljšao/la kartu, informacije koje uneseš su prikazane drugim doprinositeljima karte, zato jasno opiši nedostatak u komentaru i precizno označi mjesto pomičući oznaku tvoje bilješke na točnu poziciju. + show: + anonymous_warning: Ova bilješka sadrži komentare anonimnih korisnika koje bi trebalo (komentare) neovisno provjeriti. + comment: Komentiraj + comment_and_resolve: Komentiraj i razriješi + hide: Sakrij + reactivate: Reaktiviraj + resolve: Razriješi + share: + cancel: Otkaži + center_marker: Centriraj kartu na oznaku + custom_dimensions: Postavi prilagođene dimenzije + download: Preuzmi + embed: HTML + format: "Format:" + image: Slika + image_size: Slika će prikazati standardni sloj na + include_marker: Uključi oznaku + link: Poveznica ili HTML + long_link: Poveznica + paste_html: Zalijepi HTML za ugrađivanje na web stranicu + scale: "Mjerilo:" + short_link: Kratka poveznica + short_url: Kratki URL + title: Podijeli + view_larger_map: Prikaži veću kartu site: + createnote_disabled_tooltip: Povećaj prikaz za dodavanje bilješke na kartu + createnote_tooltip: Dodaj bilješku na kartu edit_disabled_tooltip: Uvećajte za uređivanje karte edit_tooltip: Uredi kartu - edit_zoom_alert: Morate zoomirati da bi uređivali kartu - history_disabled_tooltip: Zoomirajte da biste vidjeli uređivanja za ovo područje - history_tooltip: Prikaži izmjene za ovo područje - history_zoom_alert: Morate zoomirati da bi vidjeli povijest izmjena + map_data_zoom_in_tooltip: Povećaj prikaz da vidiš podatke karte + map_notes_zoom_in_tooltip: Povećaj prikaz da vidiš napomene na karti layouts: + about: O projektu community_blogs: Blogovi zajednice community_blogs_title: Blogovi članova OpenStreetMap zajednice - copyright: Autorska prava & Dozvola - documentation: Dokumentacija - documentation_title: Dokumentacija za projekt + copyright: Autorska prava donate: Podržite OpenStreetMap sa %{link} Hardware Upgrade Fond. - donate_link_text: donacije edit: Uredi edit_with: Uredi s %{editor} export: Izvoz - export_tooltip: Izvoz podataka karte + export_data: Izvezi podatke foundation: Zaklada foundation_title: OpenStreetMap zaklada - gps_traces: GPS trase - gps_traces_tooltip: Upravljaj GPS trasama + gps_traces: GPS tragovi + gps_traces_tooltip: Upravljaj GPS tragovima help: Pomoć - help_centre: Centar pomoći - help_title: Stranice pomoći za projekt history: Povijest - home: dom - home_tooltip: Idi na lokaciju svog doma - inbox: pošta (%{count}) - inbox_tooltip: - one: Imate 1 nepročitanu poruku - other: Imate %{count} nepročitane(ih) poruke(a) - zero: Nema nepročitanih poruka - intro_1: OpenStreetMap je slobodna, promjenjiva karta cijelog svijeta. Napravili su je ljudi slični tebi. - license: - title: OpenStreetMap podaci su objavljeni pod licencom Creative Commons Attribution-Share Alike 2.0 Generic License - log_in: prijava + home: Pokaži moj dom + intro_2_create_account: Stvori korisnički račun + intro_header: Dobrodošao/la na OpenStreetMap! + learn_more: Saznaj više + log_in: Prijavi se log_in_tooltip: Prijavi se sa postojećim korisničkim računom logo: alt_text: OpenStreetMap logotip - logout: odjava - logout_tooltip: Odjava + logout: Odjavi se make_a_donation: text: Donirajte title: Podržite Openstreetmap novčanom donacijom + more: Više osm_offline: OpenStreetMap baza podataka je trenutno nedostupna dok se ne završe važni radovi na održavanju. osm_read_only: Zbog radova na održavanju baze podataka OpenStreetMapa, istu trenutačno nije moguće mijenjati. - sign_up: otvori račun + sign_up: Otvori račun sign_up_tooltip: Otvori korisnički račun za uređivanje - sotm2011: Dođite na Konferenciju OpenStreetMap 2011., The State of the Map, 9.-11. rujna u Denveru! tag_line: Slobodna wiki karta Svijeta user_diaries: Dnevnik user_diaries_tooltip: Prikaži korisničke dnevnike - view: Karta - view_tooltip: Pogledaj na karti - welcome_user: Dobrodošli, %{user_link} - welcome_user_link_tooltip: Tvoja korisnička stranica - wiki: Wiki - wiki_title: Wiki stranice projekta - wiki_url: http://wiki.openstreetmap.org/wiki/Hr:Main_Page?uselang=hr license_page: foreign: english_link: Engleski izvornik text: U slučaju konflikta između ove prevedene stranice i %{english_original_link}, Engleski stranice imaju prednost title: O ovom prijevodu - legal_babble: "

    Autorska prava i Dozvola

    \n

    \n OpenStreetMap su otvoreni podaci, licencirani pod Creative\n Commons Attribution-ShareAlike 2.0 dozvolom (CC BY-SA).\n

    \n

    \n Slobodni ste kopirati, distribuirati, prenositi i adaptirati naše karte\n i podatke, sve dok navodite OpenStreetMap kao izvor i doprinositelje. Ako izmjenite \n ili nadogradite naše karte ili podatke, možete distribuirati rezultate\n samo pod istom licencom. Potpuni tekst objašnjava prava i odgovornosti.\n

    \n\n

    Kako navoditi OpenStreetMap kao izvor

    \n

    \n Ako koristite slike OpenstreetMap karte, zahtjevamo da\n se navede najmanje “© OpenStreetMap\n contributors, CC BY-SA”. Ako koristite samo podatke,\n zahtjevamo “Map data © OpenStreetMap contributors,\n CC BY-SA”.\n

    \n

    \n Gdje je moguće, OpenStreetMap treba biti kao hyperlink na http://www.openstreetmap.org/\n and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. Ako\n koristite medij gdje linkovi nisu mogući (npr. tiskane\n karte), predlažemo da uputite vaše čitatelje na\n www.openstreetmap.org (proširenjem na\n ‘OpenStreetMap’ za ovo punu adresu) i na\n www.creativecommons.org.\n

    \n\n

    Više o

    \n

    \n Čitajte više o korištenju naših podataka na Legal\n FAQ.\n

    \n

    \n OSM korisnici - doprinostielji se podsjećaju da nikada ne dodaju podakte iz bilo kojeg\n izvora zaštićenog autorskim pravima (npr. Google Maps ili tiskane karte) bez izričite dozvole\n vlasnika autorskih prava.\n

    \n

    \n Iako su OpenstreetMap otvoreni podaci, ne možemo pružiti\n besplatni API za kartu za ostale developere.\n\n Vidi našu Politiku korištenja API-a,\n Politiku korištenja pločica\n and Politiku korištenja Nominatim-a.\n

    \n\n

    Naši korisnici - doprinostielji

    \n

    \n Naša CC BY-SA licenca zahtjeva od vas da “ navedete izvor Originala\n razumno prema mediju ili načinima koje koristite”. \n Pojedini OSM maperi ne traže navođenje njih preko ili više od\n “OpenStreetMap korisnici - doprinostielja”, ali gdje su podaci\n iz nacionalne agencije za kartiranje ili nekog drugog glavnog izvora uključeni u\n OpenStreetMap, razumno je navesti i njih direktno\n navodeći ime ili link na njihovu stranicu.\n

    \n\n\n\n
      \n
    • Australija: Sadrži podatke o predgrađima na osnovu podataka Australian Bureau of Statistics.
    • \n
    • Kanada: Sadrži podatke iz\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), i StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Novi Zeland: Sadrži podatke izvorno iz\n Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Poljska: Sadrži podatke iz UMP-pcPL maps. Copyright\n UMP-pcPL contributors.
    • \n
    • Velika Britanija: Sadrži podatke Ordnance\n Survey data © Crown copyright and database right\n 2010.
    • \n
    \n\n

    \n Uvrštenje podataka u OpenStreetMap ne podrazumjeva da se izvorni\n davatelj podataka podržava OpenStreetMap, pruža bilo kakovo jamstvo, ili \n prihvaća bilo kakve obveze.\n

    " + legal_babble: + attribution_example: + title: Primjer doprinosa + contributors_ca_html: "Kanada: Sadrži podatke iz\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), i StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_2_html: " Uvrštenje podataka u OpenStreetMap ne podrazumjeva da se izvorni\n davatelj podataka podržava OpenStreetMap, pruža bilo kakovo jamstvo, ili \n prihvaća bilo kakve obveze." + contributors_gb_html: "Velika Britanija: Sadrži podatke Ordnance\n Survey data © Crown copyright and database right\n 2010-12." + contributors_intro_html: "Sudionici projekta su tisuće individualaca. Projekt također uključuje podatke pod slobodnim licencama od nacionalnih kartografskih agencija i drugih izvora, među kojima su:" + contributors_nz_html: "Novi Zeland: Sadrži podatke izvorno iz\n Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Naši doprinositelji + credit_1_html: "Zahtjevamo da istaknete zasluge “© OpenStreetMap\ncontributors”." + credit_2_html: "Također morate jasno naznačiti da su podaci dostupni po licenci Open Database Licence i, ako koristite naše sličice karte, naznačiti da je kartografija licencirana pod CC BY-SA. Možete to učiniti postavljanjem poveznice na ovu stranicu sa autorskim pravima.\nAlternativno, a kao nužna potreba ako distribuirate OSM samo u obliku podataka, možete postaviti poveznicu izravno na tekst licence/a. Ako oblik medija ne omogućuje korištenje poveznica (npr. printani radovi), predlažemo da uputite Vaše čitatelje na openstreetmap.org (označava točno adresu web stranice umjesto samo ime projekta - 'OpenStreetMap'), na opendatacommons.org i ako je potrebno na creativecommons.org." + credit_title_html: Kako navoditi OpenStreetMap kao izvor + intro_1_html: "OpenStreetMap sadrži slobodne podatke, licencirane pod licencom: \"Open Data\nCommons Open Database License\" (ODbL)." + intro_2_html: Slobodni ste kopirati, distribuirati, prenositi i adaptirati naše podatke, sve dok navodite OpenStreetMap i njegove doprinositelje kao izvor. Ako izmijenite ili nadogradite naše podatke, možete distribuirati rezultate samo pod istom licencom. Puni pravni tekst objašnjava vaša prava i odgovornosti. + intro_3_html: Kartografija koja je prisutna u našim sličicama karte i naša dokumentacija je pod Imenovanje-Dijeli pod istim uvjetima 2.0 licencijom (CC BY-SA). + more_1_html: Pročitaj više o korištenju naših podataka i kako iskazati zasluge na Legal FAQ. + more_2_html: "Iako su podaci karte OpenStreetMap slobodni podaci, ne možemo pružiti besplatni API (aplikacijsko programsko sučelje) za razvojne inženjere treće strane.\nVidi naš API Usage Policy,\nTile Usage Policy\ni Nominatim Usage Policy." + more_title_html: Više o + title_html: Autorska prava i Dozvola native: mapping_link: počnite kartirati native_link: HRVATSKI verzija @@ -917,7 +967,7 @@ hr: inbox: date: Datum from: Od - my_inbox: Moja dolazna pošta + my_inbox: Dolazna pošta no_messages_yet: Još nemate poruka. Zašto nebi stupili u kontakt s nekim ljudima iz okolice %{people_mapping_nearby_link}? outbox: odlazna pošta people_mapping_nearby: obližnji ljudi koji mapiraju @@ -955,12 +1005,9 @@ hr: title: Odlazna pošta to: Za read: - back_to_inbox: Nazad u dolaznu poštu - back_to_outbox: Nazad u odlaznu poštu + back: Natrag date: Datum from: Od - reading_your_messages: Vaše poruke - reading_your_sent_messages: Čitanje tvojih poslanih poruka reply_button: Odgovori subject: Tema title: Pročitaj poruku @@ -971,6 +1018,36 @@ hr: wrong_user: "Prijavljeni ste kao: `%{user}', ali poruka za koju ste zamoljeni da odgovorite nije poslana na tom korisniku. Molimo, prijavite se kao ispravan korisnik kako bi se odgovorili." sent_message_summary: delete_button: Obriši + note: + description: + closed_at_by_html: Razriješio korisnik %{user} prije %{when} + closed_at_html: Razriješeno prije %{when} + commented_at_by_html: Osvježio korisnik %{user} prije %{when} + commented_at_html: Osvježena prije %{when} + opened_at_by_html: Stvorio korisnik %{user} prije %{when} + opened_at_html: Stvorena prije %{when} + reopened_at_by_html: Reaktivirao korisnik %{user} prije %{when} + reopened_at_html: Reaktivirano prije %{when} + entry: + comment: Komentar + full: Cijela bilješka + mine: + ago_html: prije %{when} + created_at: Napravljeno + creator: Tvorac + description: Opis + heading: Bilješke korisnika %{user} + id: Id + last_changed: Zadnji put promijenjeno + subheading: Bilješke stvorio ili komentirao %{user} + title: Bilješke stvorio ili komentirao %{user} + rss: + closed: zatvorena bilješka (blizu %{place}) + commented: novi komentar (blizu %{place}) + description_item: RSS-tok bilješke %{id} + opened: nova bilješka (blizu %{place}) + reopened: reaktivirana bilješka (blizu %{place}) + title: Bilješke OpenStreetMap-a notifier: diary_comment_notification: footer: Možeš pročitati komentare na %{readurl} i komentirati na %{commenturl} ili odgovoriti na %{replyurl} @@ -986,8 +1063,6 @@ hr: email_confirm_plain: click_the_link: Ako si ovo ti, molim klinkni na link ispod da potvrdiš promjene. greeting: Bok, - hopefully_you_1: Netko (nadam se ti) želio bi promjeniti njihove email adrese preko u - hopefully_you_2: "%{server_url} na %{new_address}." friend_notification: befriend_them: Također, možete ih dodati kao prijatelja na %{befriendurl}. had_added_you: "%{user} te je dodao kao prijatelja na OpenStreetMap-u." @@ -1016,55 +1091,37 @@ hr: lost_password_plain: click_the_link: Ako si ovo ti, klikni na link ispod za reset lozinke. greeting: Bok, - hopefully_you_1: Netko (moguće ti) je pitao za reset lozinke na - hopefully_you_2: email adrese openstreetmap.org korisničkog računa. message_notification: - footer1: Možete također pročitiati poruku na %{readurl} - footer2: i možete odgovoriti na %{replyurl} header: "%{from_user} ti je poslao poruku preko OpenStreetMap sa predmetom %{subject}:" hi: Bok %{to_user}, + note_comment_notification: + anonymous: Anonimni korisnik + closed: + commented_note: "%{commenter} je razriješio bilješku koju si komentirao/la. Ta je bilješka u blizini %{place}." + subject_other: "[OpenStreetMap] %{commenter} je razrješio bilješku koja te zanima" + commented: + commented_note: "%{commenter} je ostavio komentar na bilješki koju si ti komentirao/la. Ta bilješka se nalazi blizu %{place}." + subject_own: "[OpenStreetMap] %{commenter} je komentirao na jednu od tvojih bilješki." + your_note: "%{commenter} je ostavio komentar na jednoj od tvojih bilješki blizu %{place}." + greeting: Bok, + reopened: + commented_note: "%{commenter} je reaktivirao bilješku koju si komentirao/la. Ta je bilješka u blizini %{place}." + subject_own: "[OpenStreetMap] %{commenter} je reaktivirao jednu od tvojih bilješki" + your_note: "%{commenter} je reaktivirao jednu od tvojih bilješki blizu %{place}." signup_confirm: - subject: "[OpenStreetMap] potvrdi email adresu" - signup_confirm_html: - ask_questions: Možete postaviti bilo kakva pitanja koja imate o projektu OpenStreetMap na našim stranicama pitanja i odgovora. - click_the_link: Ako si ovo ti, dobrodošao! Molim klikni na link ispod za potvrdu korisničkog računa i čitaj dalje za više informacija o OpenStreetMap-u - current_user: Lista trenutnih korisnika u kategorijama, bazirano gdje su na svijetu, je dostupna s Category:Users_by_geographical_region. - get_reading: Čitajte o OpenStreetMap-u na wiki-ju, budute u toku s zadnjim novostima preko OpenStreetMap bloga ili Twittera, ili pregledajte OpenGeoData blog osnivača OpenStreetMap-a, Stevea Coasta za povijest projekta, gdje imate i podcaste za slušanje! - greeting: Pozdrav! - hopefully_you: Netko (nadam se ti) bi želio stvoriti korisnički račun preko - introductory_video: Možeš pogledati %{introductory_video_link}. - more_videos: Postoji %{more_videos_link}. - more_videos_here: više video snimki ovdje - user_wiki_page: Preporuka je da napravite korisničku wiki stranicu, koja uključuje category oznake, koje označavaju gdje ste, kao npr.[[Category:Users_in_London]]. - video_to_openstreetmap: uvodni video za OpenStreetMap - wiki_signup: Možda se želiš otvoriti račun na OpenStreetMap wiki. - signup_confirm_plain: - ask_questions: "Možete postaviti bilo kakva pitanja koja imate o projektu OpenStreetMap na našim stranicama pitanja i odgovora:" - blog_and_twitter: "Budite u toku s najnovijim vijestima preko OpenstreetMap bloga ili Twittera:" - click_the_link_1: Ako si to ti, dobrodošao! Molim klikni donji link za potvrdu - click_the_link_2: korinički račun i čitaj za više informacija o OpenStreetMap-u. - current_user_1: Lista trenutačnih kategorija, bazirano na lokaciji u svijetu - current_user_2: "oni su dostupni sa:" - greeting: Pozdrav! - hopefully_you: Netko (nadam se ti) bi želio otvoriti korisnički računa na - introductory_video: "Možeš pogledati uvodni video za OpenStreetMap ovdje:" - more_videos: "Ovdje ima više videa:" - opengeodata: "OpenGeoData.org je blog osnivača OpenStreetMap-a, Steva Coasta, i ima podcaste također:" - the_wiki: "Čitaj o OpenStreetMap-u na wiki-ju:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/HR:Beginners_Guide - user_wiki_1: Preporuka je da stvoriš korisničku stranicu na wiki-ju, koja uključuje - user_wiki_2: category oznake koje označavaju odakle si, kao npr.[[Category:Users_in_London]]. - wiki_signup: "Možda želiš otvoriti račun na OpenStreetMap wiki na:" + greeting: Hej! + subject: "[OpenStreetMap] Dobrodošli na OpenStreetMap" oauth: oauthorize: - allow_read_gpx: Pročitaj svoje privatne GPS trase. + allow_read_gpx: čitaj svoje privatne GPS tragove. allow_read_prefs: pročitajte svoje korisničke postavke allow_to: "Dozvoli klijentskoj aplikaciji da:" allow_write_api: izmijeni kartu allow_write_diary: Zapište u dnevnik, komentirajte i stvorite prijatelje. allow_write_gpx: Pošalji GPS trase. + allow_write_notes: izmijeni bilješke. allow_write_prefs: izmjeni korisničke postavke - request_access: Aplikacija %{app_name} zahtjeva pristup vašem korisničkom računu. Provjerite želite li da aplikacija ima te mogućnosti, te odaberite koliko joj želite dopustiti. + request_access: Aplikacija %{app_name} zahtjeva pristup vašem korisničkom računu (%{user}). Provjerite želite li da aplikacija ima te mogućnosti, te odaberite koliko joj želite dopustiti. revoke: flash: Opozvali ste token za %{application} oauth_clients: @@ -1076,11 +1133,12 @@ hr: submit: Uredi title: Uredi svoju aplikaciju form: - allow_read_gpx: pročitaj njihove privatne GPS trase. + allow_read_gpx: čitaj njihove privatne GPS tragove. allow_read_prefs: pročitaj njihove korisničke postavke allow_write_api: izmjeni kartu. allow_write_diary: Napravi zapise u dnevnik, komentiraj i sprijatelji se. allow_write_gpx: Pošalji GPS trase + allow_write_notes: izmijeni bilješke. allow_write_prefs: Izmjeni njihove koriničke postavke. callback_url: Callback URL name: Ime @@ -1106,45 +1164,55 @@ hr: sorry: Žao mi je, da se %{type} ne može naći. show: access_url: "Access Token URL:" - allow_read_gpx: pročitaj njihove privatne GPS trase. + allow_read_gpx: čitaj njihove privatne GPS tragove. allow_read_prefs: pročitaj njihove korisničke postavke allow_write_api: Izmjeni kartu. allow_write_diary: Napravi zapise u dnevnik, komentiraj i sprijatelji se. allow_write_gpx: Otpremi GPS trase. + allow_write_notes: izmijeni bilješke. allow_write_prefs: izmjeni njihove korisničke postavke authorize_url: "Authorise URL:" + confirm: Jesi li siguran/na? edit: Uredi detalje key: "Consumer Key:" requests: "Zahtjevam sijedeće dozvole od korisnika:" secret: "Consumer Secret:" - support_notice: Podržavamo HMAC-SHA1 (preporučeno) kao i obični text u ssl modu. + support_notice: Podržavamo HMAC-SHA1 (preporučuje se) i RSA-SHA1 potpis. title: OAuth detalji za %{app_name} url: "Request Token URL:" update: flash: Informacije o klijentu uspješno ažurirane + redaction: + edit: + description: Opis + new: + description: Opis + show: + confirm: Jesi li siguran/na? + description: "Opis:" + user: "Tvorac:" + update: + flash: Promjene su spremljene. site: edit: anon_edits_link_text: Otkrij zašto je to slučaj. flash_player_required: Trebate Flash player da bi koristili Potlatch, OpenStreetMap Flash editor. Možete preuzeti Abode Flash Player sa Adobe.com. Neke druge mogućnosti su također dostupne za uređivanje OpenStreetMapa. - no_iframe_support: Vaš preglednik ne podržava HTML iframes, koji su potrebni za ovu značajku. + no_iframe_support: Tvoj preglednik ne podržava HTML iframes, koji su potrebni za ovu značajku. not_public: Niste namjestili vaše promjene da budu javne. not_public_description: Ne možete više uređivati kartu dok to ne napravite. Možete namjestiti svoje promjene u javne sa %{user_page}. potlatch2_unsaved_changes: Neke promjene nisu spremljene. (Da biste spremili u Potlatch 2, trebali bi kliknuti Spremi.) 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.) user_page_link: korisnička stranica index: + createnote: Dodaj bilješku js_1: Koristite internet preglednik koji ne podržava JavaScript, ili vam je isključen JavaScript. js_2: OpenStreetMap koristi JavaScript for za slippy kartu. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Licencirano pod %{license_name} licenca %{project_name} i njenih suradnika. - project_name: OpenStreetMap projekt + copyright: Autorska prava pripadaju OpenStreetMap-u i doprinositeljima, pod otvorenom licencijom permalink: Permalink remote_failed: Uređivanje nije uspjelo - provjerite da li je JOSM ili Merkaartor učitan i da je opcija "remote control" omogućena shortlink: Shortlink key: - map_key: Legenda - map_key_tooltip: Legenda karte table: entry: admin: Administrativna granica @@ -1156,7 +1224,7 @@ hr: bridleway: Staza za konje brownfield: Gradilište building: Zgrada - byway: usputna staza + byway: Usputna staza cable: - Kabinska žičara - sedežnica @@ -1190,7 +1258,7 @@ hr: resident: Stambeno područje retail: Maloprodajno područje runway: - - aerodromska pista + - Aerodromska pista - aerodromske ceste (za avione) school: - Škola @@ -1199,7 +1267,7 @@ hr: station: Željeznički kolodvor subway: Podzemna željeznica summit: - - vrh + - Vrh - vrhunac tourist: Turistička atrakcija track: Neasfaltirani put @@ -1209,11 +1277,15 @@ hr: trunk: Brza cesta tunnel: Iscrtkani rubovi = tunel unclassified: Nerazvrstana cesta - unsurfaced: neasfaltirana cesta + unsurfaced: Neasfaltirana cesta wood: Šume (prirodne, neodržavane) + markdown_help: + image: Slika + link: Poveznica + richtext_area: + edit: Uredi search: search: Traži - search_help: "primjer: 'Osijek', 'Zelenjak 52, Zagreb', ili 'kolodvor, Split' više primjera..." submit_text: Idi where_am_i: Gdje sam? where_am_i_title: Opiši trenutnu lokaciju koristeći pretraživač @@ -1242,17 +1314,20 @@ hr: start_coord: "Početna koordinata:" tags: "Oznake:" tags_help: odvojeno zarezima - title: Uređivanje trase %{name} + title: Uređivanje traga %{name} uploaded_at: "Poslano:" visibility: "Vidljivost:" visibility_help: Što ovo znači? + georss: + title: OpenStreetMap GPS tragovi list: - public_traces: Javne GPS trase - public_traces_from: Javne GPS trase korisnika %{user} + empty_html: Ovdje zasad nema ničega. Učitaj novi trag ili nauči više o GPS tragovima na wiki stranici. + public_traces: Javni GPS tragovi + public_traces_from: Javni GPS tragovi korisnika %{user} tagged_with: " označeni sa %{tags}" your_traces: Vaše GPS trase make_public: - made_public: Trase za javnost + made_public: Trag je postao javan offline: heading: GPX spremište Offline message: Sustav za GPX spremanje i upload trenutno nisu u funkciji. @@ -1271,35 +1346,36 @@ hr: pending: U TIJEKU private: PRIVATNI public: JAVNI - trace_details: Detalji trase + trace_details: Vidi detalje traga trackable: TRACKABLE view_map: Prikaži kartu trace_form: - description: Opis + description: "Opis:" help: Pomoć - tags: Oznake + tags: "Oznake:" tags_help: odvojeno zarezom upload_button: Pošalji - upload_gpx: Pošalji GPX datoteku - visibility: Vidljivost + upload_gpx: "Učitaj GPX datoteku:" + visibility: "Vidljivost:" visibility_help: što ovo znači? trace_header: see_all_traces: Prikaži sve trase - see_your_traces: Prikaži sve vlastite trase - traces_waiting: Imate %{count} trasa na čekanju za slanje. Uzmite ovo u obzir, i pričekajte da se završe prije slanja novih trasa, da ne blokirate ostale korisnike. - upload_trace: Pošalji GPS trasu + see_your_traces: Prikaži sve vlastite tragove + traces_waiting: + one: Imaš %{count} trag na čekanju za učitavanje. Molim pričekaj da se ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje tragova drugih korisnika. + other: Imaš %{count} tragova na čekanju za učitavanje. Molim pričekaj da se ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje drugih korisnika. + upload_trace: Pošalji GPS trag trace_optionals: tags: Oznake trace_paging_nav: - next: Slijedeća » - previous: « Prethodna - showing_page: Prikazujem stranicu %{page} + older: Stariji tragovi + showing_page: Stranica %{page} view: delete_track: Izbriši ovu trasu description: "Opis:" - download: preuzimanje + download: preuzmi edit: uredi - edit_track: Uredi ovu trasu + edit_track: Uredi ovaj trag filename: "Ime datoteke:" heading: Prikaz trase %{name} map: karta @@ -1309,29 +1385,32 @@ hr: points: "Točaka:" start_coordinates: "Početna koordinata:" tags: "Oznake:" - title: Prikaz trase %{name} - trace_not_found: Trasa nije pronađena! + title: Prikaz traga %{name} + trace_not_found: Trag nije pronađen! uploaded: "Poslano:" visibility: "Vidljivost:" visibility: - identifiable: Identifiable (prikazane u listi trasa kao identificirajuće, posložene točke sa vremenskom oznakom) + identifiable: Identifcirano (prikazano u listi tragova i kao identificirano, posložene točke sa vremenskom oznakom) private: Privatni (prikazuje se kao anonimne, nespoložene točke) - public: Javni (prikazane kao u listi trasa kao anonimne, neposložene točke) + public: Javno (prikazano u listi tragova i kao anonimno, neuređene točke) trackable: Trackable-može se pratiti (prikazuje se kao anonimne, posložene točke sa vremenskom oznakom) user: account: contributor terms: - agreed: Prihvatili ste nove uvjete doprinositelja. + agreed: Prihvatio/la si nove Uvjete doprinositelja. agreed_with_pd: Također ste proglasili da će vaše izmjene biti u javnom vlasništvu. heading: "Uvjeti doprinositelja:" link text: što je ovo? not yet agreed: Niste još uvijek prihvatili nove uvjete doprinositelja. - review link text: Molimo Vas da slijedite ovaj link kada vam bude prikladno da pregledate i prihvatete nove uvjete doprinositelja. + review link text: Molim slijedi ovu poveznicu kada budeš u prilici za pregled i prihvati nove Uvjete doprinositelja. current email address: "Trenutna E-mail adresa:" delete image: Uklonite trenutnu sliku email never displayed publicly: (nikada se ne prikazuje javno) flash update success: Korisničke informacije su uspješno ažurirane. - flash update success confirm needed: Korisničke informacije su uspješno ažurirane. Provjerite email za porukom za potvrdu nove email adrese. + flash update success confirm needed: Korisničke informacije su uspješno ažurirane. Provjeri email za poruku potvrde nove email adrese. + gravatar: + gravatar: Koristi Gravatar + link text: što je ovo? home location: "Dom:" image: "Slika:" image size hint: (kvadratne slike od barem 100x100 pixela rade najbolje) @@ -1343,6 +1422,10 @@ hr: new email address: "Nova E-mail adresa:" new image: Dodajte sliku no home location: Niste unjeli lokaciju vašeg doma. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: što je ovo? + openid: "OpenID:" preferred editor: "Preferirani editor:" preferred languages: "Željeni jezici:" profile description: "Opis profila:" @@ -1363,13 +1446,11 @@ hr: update home location on click: Ažuriraj lokaciju doma kada kliknem na kartu? confirm: already active: Ovaj račun je već potvrđen. - before you start: Znamo da ste vjerojatno u žurbi za početak mapiranja, ali prije nego što počnete, možda bi željeli ispuniti neke dodatne informacije o sebi u donji obrazac. button: Potvrdi - heading: Potvrdi korisnički račun + heading: Provjeri svoj email! + introduction_1: Poslali smo ti potvrdni email. press confirm button: Pritisni potvrdi da bi aktivirali svoj korisnički račun. - reconfirm: Ako je prošlo neko vrijeme otkad ste se prijavili možda će te morati poslati sebi novu e-poštu potvrde . - success: Tvoj račun je potvrđen , hvala na uključenju! - unknown token: Izgleda da taj token ne postoji. + unknown token: Taj potvrdni kôd je istekao ili ne postoji. confirm_email: button: Potvrdi failure: Email adresa je već potvrđena s ovim token-om. @@ -1378,7 +1459,7 @@ hr: success: Potvrđena je vaša email adresa, hvala za priključenje! confirm_resend: failure: Korisnik %{name} nije pronađen. - success: Poslali smo novu potvrdu na email %{email} a čim potvrdite svoj račun, moći će te početi mapirati.

    Ako koristite antispam sustav koji šalje potvrdu zahtjeva, molimo Vas da provjerite je li webmaster@openstreetmap.org na tzv. "whitelisti", jer nismo u mogućnosti odgovarati na potvrde zahtjeva. + success: Poslali smo novu potvrdu na email %{email}, a čim potvrdiš svoj račun, moći ćeš početi kartirati.

    Ako koristiš antispam sustav koji šalje potvrdu zahtjeva, molim te da provjeriš je li webmaster@openstreetmap.org na tzv. "whitelisti", jer nismo u mogućnosti odgovarati na potvrde zahtjeva. filter: not_an_administrator: Morate biti administrator za izvođenje ovih akcija. go_public: @@ -1389,8 +1470,8 @@ hr: heading: Korisnici hide: Sakrij odabrane korisnike showing: - one: Prikazujem stranicu %{page} (%{first_item} od %{items}) - other: Prikazujem stranicu %{page} (%{first_item}-%{last_item} od %{items}) + one: Stranica %{page} (%{first_item} od %{items}) + other: Stranica %{page} (%{first_item}-%{last_item} od %{items}) summary: "%{name} napravljeno sa %{ip_address} dana %{date}" summary_no_ip: "%{name} napravljeno %{date}" title: Korisnici @@ -1403,7 +1484,7 @@ hr: login_button: Prijava lost password link: Izgubljena lozinka? new to osm: Novi na OpenStreetMap? - notice: Saznajte više o dolazećoj promjeni dozvole za OpenStreetMap (prijevodi) (razgovor) + openid: "%{logo} OpenID:" password: "Lozinka:" register now: Registrirajte se sada remember: "Zapamti me:" @@ -1423,22 +1504,22 @@ hr: title: Izgubljena lozinka make_friend: already_a_friend: Već jesi prijatelj s %{name}. + button: Dodaj u prijatelje failed: Žao mi je, nije uspjelo dodavanje %{name} kao prijatelja. - success: "%{name} je sada tvoj prijatelj." + heading: Dodaj %{user} kao prijatelja? + success: "%{name} je sada tvoj prijatelj!" new: confirm email address: "Potvrdi e-mail:" confirm password: "Potvrdi lozinku:" contact_webmaster: Molim kontaktirajte webmastera da priredi za stvaranje korisničkog računa - pokušati ćemo se pozabaviti s ovime u najkraćem vremenu. - continue: Nastavi + continue: Otvori račun display name: "Korisničko ime:" display name description: Javno prikazano korisničko ime. Možete ga promjeniti i kasnije u postavkama. email address: "Email:" - fill_form: Ispuni formular i i ubrzo će te dobtiti email za aktivaciju korisničkog računa. - flash create success message: Hvala što ste se prijavili! Poslali smo vam e-mail za potvrdu na %{email}, i čim potvrdite svoj račun možete mapirati

    Ako kortstite antispam sustav koji šalje potvrde zahtjeva budite sigurni da je na tzv. "whitelisti" webmaster@openstreetmap.org jer nećemo moći odgovoriti na potvrdni zahtjev. - heading: Otvori korisnički račun - license_agreement: Kada potvrdite vaš račun morati će te pristati na uvjete pridonositelja . + license_agreement: Kada potvrdiš svoj račun trebati ćeš pristati na uvjete pridonositelja. no_auto_account_create: Nažalost nismo u mogućnosti automatski otvarati korisničke račune. not displayed publicly: Nije javno prikazano (vidi privacy policy) + openid: "%{logo} OpenID:" password: "Lozinka:" terms accepted: Hvala za prihvaćanje novih pridonositeljskih uvjeta! title: Otvori račun @@ -1481,40 +1562,49 @@ hr: legale_select: "Molimo odaberite svoju zemlju prebivališta:" read and accept: Molimo Vas pročitajte ugovor ispod i pritisnite tipku za potvrdu da prihvaćate uvjete ovog sporazuma za svoje postojeće i buduće doprinose. title: Uvjeti doprinositelja + you need to accept or decline: Molim pročitaj, a zatim ili prihvati ili odbij nove Uvjete doprinošenja. view: activate_user: aktiviraj ovog korisnika - add as friend: dodaj kao prijatelja + add as friend: Dodaj prijatelja ago: prije (%{time_in_words_ago}) block_history: prikaži dobivene blokade - blocks by me: blokade koje sam postavio - blocks on me: blokade na mene + blocks by me: Blokade koje sam postavio + blocks on me: Osobne blokade + comments: Komentari confirm: Potvrdi confirm_user: potvrdi ovog korisnika create_block: blokiraj ovog korisnika created from: "Napravljeno iz:" + ct accepted: Prihvaćeno prije %{ago} + ct status: "Uvjeti doprinositelja:" deactivate_user: deaktiviraj ovog korisnika delete_user: obriši ovog korisnika description: Opis - diary: dnevnik - edits: promjene + diary: Dnevnik + edits: Promjene email address: "Email adresa:" hide_user: sakrij ovog korisnika - if set location: Ako namjestite svoju lokaciju, zgodna karta i stvari će se pojaviti ispod. Možete namjestiti lokaciju vašeg boravišta na %{settings_link} stranici. + if set location: "Postavi lokaciju svog doma na stranici: %{settings_link}, kako bi vidio/la obližnje korisnike." km away: udaljen %{count}km latest edit: "Najnovija izmjena %{ago}:" m away: "%{count}m daleko" mapper since: "Maper od:" moderator_history: prikaži dane blokade - my diary: moj dnevnik - my edits: moje promjene - my settings: moje postavke - my traces: moje trase + my comments: Moji komentari + my diary: Moj dnevnik + my edits: Moje promjene + my messages: Moje poruke + my notes: Moje bilješke + my profile: Moj profil + my settings: Moje postavke + my traces: Moji tragovi nearby users: Drugi korisnici u blizini new diary entry: novi unos u dnevnik no friends: Nisi dodao niti jednog prijatelja. no nearby users: Još uvijek nema drugih korisnika koji kartiraju-mapiraju u blizini. + notes: Bilješke karte oauth settings: oauth postavke - remove as friend: ukloni kao prijatelja + remove as friend: Prekini prijateljstvo role: administrator: Ovaj korisnik je administrator grant: @@ -1524,11 +1614,11 @@ hr: revoke: administrator: Opozovi pristup administatora moderator: Opozovi pristup moderatora - send message: pošalji poruku + send message: Pošalji poruku settings_link_text: postavke spam score: "Spam ocjena:" status: "Stanje:" - traces: trase + traces: Tragovi unhide_user: otkrij ovog korisnika user location: Lokacija boravišta korisnika your friends: Tvoji prijatelji @@ -1586,11 +1676,14 @@ hr: creator_name: Tvorac display_name: Blokirani korisnik edit: Uredi + next: Slijedeća » not_revoked: (nije opozvano) + previous: « Prethodna reason: Razlog za blokadu revoke: Opozovi! revoker_name: Opozvao show: Prikaži + showing_page: Stranica %{page} status: Status period: one: 1 sat @@ -1638,3 +1731,16 @@ hr: fail: Nemogu opozvati ulogu `%{role}' iz korisnika `%{name}'. Molim provjerite jeli korisnik i uloga ispravno. heading: Potvrdi opoziv uloge title: Potvrdi opoziv uloge + welcome_page: + add_a_note: + paragraph_1_html: Ako želiš samo napraviti malu doradu i nemaš vremena za registraciju i učenje pravila uređivanja, možeš jednostavno dodati bilješku na kartu. + title: Nemaš vremena za uređivanje? Dodaj bilješku! + basic_terms: + tag_html: Oznaka je dodatni podatak (metapodatak) o točki ili putu, npr. ime restorana ili ograničenje brzine. + way_html: Put je linija ili područje, npr. cesta, potok, jezero ili zgrada. + questions: + title: Ima li pitanja? + start_mapping: Počni kartirati + title: Dobrodošli! + whats_on_the_map: + title: Što je na karti diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 6bd01e2ad50..0fbd75c70ff 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -1,8 +1,21 @@ # Messages for Upper Sorbian (hornjoserbsce) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: J budissin # Author: Michawiki hsb: + about_page: + community_driven_html: "Zhromadźenstwo OpenStreetMap je wšelakore, rozpalite a rosće kóždy dźeń.\nNaši sobuskutkowacy su zahorići kartěrowarjo, GIS-profijo, inženjerojo, kotřiž OSM-serwery ćěrja, pomocnicy, kotřiž kónčiny katastrofow kartěruja a wjele wjace.\nZo by wjace wo zhromadźenstwje zhonił, hlej wužiwarske dźeniki, blogi zhromadźenstwa a websydło załožby OSM Foundation" + community_driven_title: Wot zhromadźenstwa spěchowany + copyright_html: © sobuskutkowacy
    OpenStreetMap + lede_text: OpenStreetMap twori so wot zhromadźenstwa kartěrowarjow, kotřiž daty wo hasach, pućach, kofejownjach, dwórnišćach a wjele wjace na cyłym swěće přinošuja a hladaja. + local_knowledge_html: OpenStreetMap kładźe wažnosć na lokalnu wědu. Sobuskutkowacy wužiwaja powětrowe wobrazy, GPS-graty a pólne karty, zo bychu přepruwowali, zo by OSM je dokładny a aktualny. + local_knowledge_title: Lokalna wěda + next: Přichodna + open_data_html: "OpenStreetMap wobsahuje zjawne daty: Móžeš je za kóždy zaměr wužiwać, dołhož OpenStreetMap a jeho sobuskutkowacych naspomnješ. Jeli daty na wěste wašnje změniš abo wutworiš, móžeš wuslědk jenož pod samsnej licencu rozdźělić.Hlej stronu awtorskeho prawa a licency za podrobnosće." + open_data_title: Zjawne daty + partners_title: Partnerojo + used_by: "%{name} staja kartowe daty za sta websydłow, mobilne nałoženja a graty k dispoziciji" activerecord: attributes: diary_comment: @@ -11,7 +24,7 @@ hsb: language: Rěč latitude: Šěrokostnik longitude: Dołhostnik - title: Titul + title: Tema user: Wužiwar friend: friend: Přećel @@ -20,7 +33,7 @@ hsb: body: Tekst recipient: Přijimowar sender: Wotpósłar - title: Titul + title: Tema trace: description: Wopisanje latitude: Šěrokostnik @@ -80,102 +93,62 @@ hsb: blocked: Twój přistup k API je so blokował. Prošu přizjew so do webpowjercha, zo by wjace zhonił. need_to_see_terms: Twój přistup na API je nachwilu wusadźeny. Prošu přizjew so k webpowjerchej, zo by sej wuměnjenja za sobuskutkowacych wobhladał. Njetrjebaš přezjedny być, dyrbiš sej je jenož wobhladać. browse: + anonymous: anonymny changeset: - changeset: "Sadźba změnow: %{id}" + belongs_to: Awtor changesetxml: Sadźba změnow XML - download: "%{changeset_xml_link} abo %{osmchange_xml_link} sćahnyć" feed: title: Sadźba změnow %{id} title_comment: Sadźba změnow %{id} - %{comment} + node: Suki (%{count}) + node_paginated: Suki (%{x}-%{y} z %{count}) osmchangexml: osmChange XML - title: Sadźba změnow - changeset_details: - belongs_to: "Słuša k:" - bounding_box: "Wuběranski wobłuk:" - box: kašćik - closed_at: "Začinjeny:" - created_at: "Wutworjeny:" - has_nodes: - few: "Ma slědowace %{count} suki:" - one: "Ma slědowacy %{count} suk:" - other: "Ma slědowacych %{count} sukow:" - two: "Ma slědowacej %{count} sukaj:" - has_relations: - few: "Ma slědowace %{count} relacije:" - one: "Ma slědowacu %{count} relaciju:" - other: "Ma slědowacych %{count} relacijow:" - two: "Ma slědowacej %{count} relaciji:" - has_ways: - few: "Ma slědowace %{count} puće:" - one: "Ma slědowacy %{count} puć:" - other: "Ma slědowacych %{count} pućow:" - two: "Ma slědowacej %{count} pućej:" - no_bounding_box: Za tutu sadźbu změnow njeje so wuběranski wobłuk składował. - show_area_box: Wobłukowy kašćik pokazać - common_details: - changeset_comment: "Komentar:" - deleted_at: "Zhašany:" - deleted_by: "Zhašany wot:" - edited_at: "Wobdźěłany:" - edited_by: "Wobdźěłany wot:" - in_changeset: "W sadźbje změnow:" - version: "Wersija:" + relation: Relacije (%{count}) + relation_paginated: Relacije (%{x}-%{y} z %{count}) + title: "Sadźba změnow: %{id}" + way: Puće (%{count}) + way_paginated: Puće (%{x}-%{y} z %{count}) + closed: "Začinjeny:" + closed_by_html: Začinjeny před %{time} wot %{user} + closed_html: Začinjeny před %{time} containing_relation: entry: Relacija %{relation_name} entry_role: Relacija %{relation_name} (jako %{relation_role}) - map: - deleted: Zničeny - edit: - area: Wobłuk wobdźěłać - node: Suk wobdźěłać - relation: Relaciju wobdźěłać - way: Puć wobdźěłać - larger: - area: Wobłuk na wjetšej karće pokazać - node: Suk na wjetšej karće pokazać - relation: Relaciju na wjetšej karće pokazać - way: Puć na wjetšej karće pokazać - loading: Začituje so... - navigation: - all: - next_changeset_tooltip: Přichodna sadźba změnow - next_node_tooltip: Přichodny suk - next_relation_tooltip: Přichodna relacija - next_way_tooltip: Přichodny puć - prev_changeset_tooltip: Předchadna sadźba změnow - prev_node_tooltip: Předchadny suk - prev_relation_tooltip: Předchadna relacija - prev_way_tooltip: Předchadny puć - user: - name_changeset_tooltip: Změny wot wužiwarja %{user} pokazać - next_changeset_tooltip: Přichodna změna wot wužiwarja %{user} - prev_changeset_tooltip: Předchadna změna wot wužiwarja %{user} + created: Wutworjeny + created_by_html: Wutworjeny před %{time} wot %{user} + created_html: Wutworjeny před %{time} + deleted_by_html: Zhašany před %{time} wot %{user} + download_xml: XML sćahnyć + edited_by_html: wobdźěłany před %{time} wot %{user} + in_changeset: Sadźba změnow + location: "Městno:" + no_comment: (žadyn komentar) node: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" - download_xml: XML sćahnyć - edit: wobdźěłać - node: Suk - node_title: "Suk: %{node_name}" - view_history: historiju pokazać - node_details: - coordinates: "Koordinaty:" - part_of: "Dźěl wot:" - node_history: - download: "%{download_xml_link} abo %{view_details_link}" - download_xml: XML sćahnyć - node_history: Sukata historija - node_history_title: "Sukata historija: %{node_name}" - view_details: podrobnosće pokazać + history_title: "Sukata historija: %{name}" + title: "Suk: %{name}" not_found: - sorry: Wodaj, %{type} z id %{id} njebu namakany. + sorry: "Wodaj, %{type} #%{id} njebu namakany." type: changeset: sadźba změnow node: suk relation: relacija way: puć - paging_nav: - of: wot - showing_page: Pokazuje so strona + note: + closed_by: Sčinjeny wot %{user} před %{when} + closed_by_anonymous: Sčinjeny wot anonymneho před %{when} + closed_title: "Sčinjena pokazka #%{note_name}" + commented_by: Komentar wot %{user} před %{when} + commented_by_anonymous: Komentar wot anonymneho před %{when} + hidden_by: Schowany wot %{user} před %{when} + hidden_title: "Schowana pokazka #%{note_name}" + new_note: Nowa pokazka + open_by: Wutworjeny wot %{user} před %{when} + open_by_anonymous: Wutworjeny wot anonymneho před %{when} + open_title: "Njesčinjena pokazka #%{note_name}" + reopened_by: Reaktiwizowany wot %{user} před %{when} + reopened_by_anonymous: Reaktiwizowany wot anonymneho před %{when} + title: "Suk: %{id}" + part_of: "Dźěl wot:" redacted: message_html: Wersija %{version} tutoho %{type}a njeda so pokazać, dokelž je so hižo redigowała. Prošu, hlej %{redaction_link} za podronosće. redaction: Redakcija %{id} @@ -184,63 +157,19 @@ hsb: relation: relacija way: puć relation: - download: "%{download_xml_link} abo %{view_history_link}" - download_xml: XML sćahnyć - relation: Relacija - relation_title: "Relacija: %{relation_name}" - view_history: historiju pokazać - relation_details: - members: "Čłonojo:" - part_of: "Dźěl wot:" - relation_history: - download: "%{download_xml_link} abo %{view_details_link}" - download_xml: XML sćahnyć - relation_history: Relaciska historija - relation_history_title: "Relaciska historija: %{relation_name}" - view_details: podrobnosće pokazać + history_title: "Historija relacije: %{name}" + members: Čłonojo + title: "Relacija: %{name}" relation_member: entry_role: "%{type} %{name} jako %{role}" type: node: Suk relation: Relacija way: Puć - start: - manually_select: Druhi wobłuk manuelnje wubrać - view_data: Daty za aktualny kartowy napohlad pokazać start_rjs: - data_frame_title: Daty - data_layer_name: Kartowe daty přepytać - details: Podrobnosće - drag_a_box: Ramik na kartu ćahnyć, zo by so wobłuk wubrał - edited_by_user_at_timestamp: Wobdźěłany wot wužiwarja [[user]] dnja [[timestamp]] - hide_areas: Kónčiny schować - history_for_feature: Historija za [[feature]] + feature_warning: "%{num_features} funkcijow so začituje, štož móže twój wobhladowak spomalić abo přećežić. Chceš tute daty zwobraznić?" load_data: Daty začitać - loaded_an_area_with_num_features: Sy wobłuk začitał, kotryž [[num_features]] přiznamjenjow wobsahuje. Powšitkownje někotre wobhladowaki maja problemy ze zwobraznjenju tajkeho mnóstwa datow. Powšitkownje wobhladowaki najlěpje funguja, hdyž mjenje hač 100 přiznamjenjow naraz zwobraznjeja; hewak so wobhladowak spomali abo samo hižo njereaguje. Jeli chceš tute daty woprawdźe zwobraznić, klikń deleka na tłóčatko. loading: Začituje so... - manually_select: Druhi wobłuk manuelnje wubrać - object_list: - api: Tutón wobłuk wot API wotwołać - back: Objektowu lisćinu zwobraznić - details: Podrobnosće - heading: Objektowa lisćina - history: - type: - node: Suk [[id]] - way: Puć [[id]] - selected: - type: - node: Suk [[id]] - way: Puć [[id]] - type: - node: Suk - way: Puć - private_user: priwatny wužiwar - show_areas: Kónčiny pokazać - show_history: Historiju pokazać - unable_to_load_size: "Njeje móžno začitać: Wulkosć [[bbox_size]] wobłuka je přewulka ((dyrbi mjenje hač %{max_bbox_size} być)" - wait: Čakać... - zoom_or_select: Wobłuk karty powjetšić abo wubrać tag_details: tags: "Atributy:" wiki_link: @@ -254,40 +183,27 @@ hsb: node: suk relation: relacija way: puć + version: Wersija + view_details: Podrobnosće pokazać + view_history: Historiju pokazać way: - download: "%{download_xml_link}, %{view_history_link} abo %{edit_link}" - download_xml: XML sćahnyć - edit: wobdźěłać - view_history: historiju pokazać - way: Puć - way_title: "Puć: %{way_name}" - way_details: also_part_of: - few: tež dźěl pućow %{related_ways} - one: tež dźěl puća %{related_ways} - other: tež dźěl pućow %{related_ways} - two: tež dźěl pućow %{related_ways} - nodes: "Suki:" - part_of: "Dźěl wot:" - way_history: - download: "%{download_xml_link} abo %{view_details_link}" - download_xml: XML sćahnyć - view_details: podrobnosće pokazać - way_history: Pućna historija - way_history_title: "Pućna historija: %{way_name}" + few: dźěl pućow %{related_ways} + one: dźěl puća %{related_ways} + other: dźěl pućow %{related_ways} + two: dźěl pućow %{related_ways} + history_title: "Historija puća: %{name}" + nodes: Suki + title: "Puć: %{name}" changeset: changeset: anonymous: Anonymny - big_area: (wulki) - no_comment: (žadyn) no_edits: (žane změny) - show_area_box: wobłuk pokazać - still_editing: (wobdźěłuje so hišće) view_changeset_details: Podrobnosće sadźby změnow pokazać changeset_paging_nav: next: Přichodna » previous: « Předchadna - showing_page: Pokazuje so strona %{page} + showing_page: Strona %{page} changesets: area: Wobłuk comment: Komentar @@ -295,24 +211,17 @@ hsb: saved_at: Datum składowanja user: Wužiwar list: - description: Aktualne změny - description_bbox: Sadźby změnow znutřka %{bbox} - description_friend: Změny twojich přećelow - description_nearby: Sadźby změnow wužiwarjow w bliskosći - description_user: Sadźby změnow wot %{user} - description_user_bbox: Sadźby změnow wot %{user} znutřka %{bbox} - heading: Sadźby změnow - heading_bbox: Sadźby změnow - heading_friend: Sadźby změnow - heading_nearby: Sadźby změnow - heading_user: Sadźby změnow - heading_user_bbox: Sadźby změnow + empty: Žane sadźby změnow namakane. + empty_area: Žane sadźby změnow w tutym wobłuku. + empty_user: Žane sadźby změnow wot tutoho wužiwarja. + load_more: Wjace začitać + no_more: Žane dalše sadźby změnow namakane. + no_more_area: Žane dalše sadźby změnow w tutym wobłuku. + no_more_user: Žane dalše sadźby změnow wot tutoho wužiwarja. title: Sadźby změnow - title_bbox: Sadźby změnow znutřka %{bbox} title_friend: Změny twojich přećelow title_nearby: Sadźby změnow wužiwarjow w bliskosći title_user: Sadźby změnow wot %{user} - title_user_bbox: Sadźby změnow wot %{user} znutřka %{bbox} timeout: sorry: Bohužel je předołho trało, skupiny změny, kotrež sy požadał, wotwołać. diary_entry: @@ -331,9 +240,10 @@ hsb: diary_entry: comment_count: few: "%{count} komentary" - one: 1 komentar + one: Jedyn komentar other: "%{count} komentarow" two: "%{count} komentaraj" + zero: Žane komentary comment_link: Komentar k tutomu zapiskej confirm: Wobkrućić edit_link: Tutón zapisk wobdźěłać @@ -368,7 +278,7 @@ hsb: newer_entries: Nowše zapiski no_entries: Žane zapiski w dźeniku older_entries: Starše zapiski - recent_entries: "Najnowše dźenikowe zapiski:" + recent_entries: Najnowše dźenikowe zapiski title: Dźeniki wužiwarjow title_friends: Dźeniki přećelow title_nearby: Dźeniki wužiwarjow w bliskosći @@ -392,6 +302,9 @@ hsb: user_title: dźenik wužiwarja %{user} editor: default: Standard (tuchwilu %{name} + id: + description: iD (we wobhladowaku zasadźeny editor) + name: iD potlatch: description: Potlatch 1 (editor za wobdźěłowanje we wobhladowaku) name: Potlatch 1 @@ -407,7 +320,7 @@ hsb: area_to_export: Wobłuk za eksport embeddable_html: Zasadźujomny HTML export_button: Eksport - export_details: Daty OpenStreetMap su pod licencu Creative Commons Attribution-ShareAlike 2.0 licencowane. + export_details: Daty OpenStreetMap su pod licencu Open Data Commons Open Database (ODbL). format: "Format:" format_to_export: Format za eksport image_size: "Wobrazowa wulkosć:" @@ -423,29 +336,42 @@ hsb: paste_html: HTML-kod kopěrować, zo by so do websydła zasunył scale: Měritko too_large: - body: Tutón wobłuk je přewulki za eksportowanje jako XML-daty OpenStreetMap. Prošu powjetš abo wubjer mjeńši wobłuk. - heading: Wobłuk přewulki + advice: "Jeli horni eksport so njeradźi, prošu wuwaž, hač wužiwaš jednu ze slědowacych lisćinow:" + body: "Tutón wobłuk je přewulki za eksportowanje jako XML-daty OpenStreetMap. Prošu powjetš abo wubjer mjeńši wobłuk abo wužij jedne ze slědowacych žórłow za sćehnjenje wulkich mnóstwow datow:" + geofabrik: + description: Prawidłownje zaktualizowane wućahi kontinentow, krajow a wubranych městow + title: Geofabrik Downloads + metro: + description: Wućahi za najwjetše swětowe města a jich wokoliny + title: Metro Extracts + other: + description: Přidatne žórła nalistowane na wikiju OpenStreetMap + title: Druhe žórła + overpass: + description: Tutón wobłuk ze špiheloweho serwera datoweje banki OpenStreetMap sćahnyć + title: Overpass API + planet: + description: Prawidłownje zaktualizowane kopije dospołneje datoweje banki OpenStreetMap + title: Planet OSM zoom: Skalowanje - start_rjs: - add_marker: Karće marku přidać - change_marker: Poziciju marki změnić - click_add_marker: Na kartu klikný, zo by so marka přidała - drag_a_box: Ramik na karće rozćahać, zo by so wobłuk wubrał - export: Eksport - manually_select: Druhi wobłuk manuelnje wubrać - view_larger_map: Wjetšu kartu pokazać + title: Eksportować + fixthemap: + how_to_help: + join_the_community: + title: Do zhromadźenstwa zastupić + title: Kak móžeš pomhać + other_concerns: + title: Druhe naležnosće + title: Problem zdźělić / Kartu poprawić geocoder: description: title: geonames: Městno wot from GeoNames - osm_namefinder: "%{types} wot OpenStreetMap Namefinder" osm_nominatim: Městno z OpenStreetMap Nominatim types: cities: Wulkoměsta places: Městna towns: Města - description_osm_namefinder: - prefix: "%{distance} %{direction} wot %{type}" direction: east: wuchod north: sewjer @@ -466,16 +392,26 @@ hsb: title: ca_postcode: Wuslědki wot Geocoder.CA geonames: Wuslědki wot GeoNames + geonames_reverse: Wuslědki wot GeoNames latlon: Wuslědki wot Internal - osm_namefinder: Wuslědki wot OpenStreetMap Namefinder osm_nominatim: Wuslědki z OpenStreetMap Nominatim + osm_nominatim_reverse: Wuslědki z OpenStreetMap Nominatim uk_postcode: Wuslědki wot NPEMap / FreeThe Postcode us_postcode: Wuslědki wot Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} wot %{parentname})" - suffix_place: ", %{distance} %{direction} z %{placename}" search_osm_nominatim: + admin_levels: + level10: Předměstowa hranica + level2: Statna hranica + level4: Krajna hranica + level5: Regionowa hranica + level6: Wokrjesowa hranica + level8: Měsćanska hranica + level9: Hranica měšćanskeho dźěla prefix: + aerialway: + chair_lift: Sydłowy lift + drag_lift: Wlečny lift + station: Gondlowa stacija aeroway: aerodrome: Lětanišćo apron: Lětanske předpolo @@ -569,6 +505,7 @@ hsb: shower: Duša social_centre: Socialne srjedźišćo social_club: Towarstwo + social_facility: Socialne zarjadnišćo studio: Studijo supermarket: Superwiki swimming_pool: Płuwanišćo @@ -597,6 +534,9 @@ hsb: "yes": Móst building: "yes": Twarjenje + emergency: + fire_hydrant: Wohnjowy hydrant + phone: Nuzowy telefon highway: bridleway: Jěchanski puć bus_guideway: Trolejbusowy milinowód @@ -618,6 +558,7 @@ hsb: platform: Platforma primary: Dróha prěnjeho rjada primary_link: Dróha prěnjeho rjada + proposed: Planowana dróha raceway: Pista residential: Bydlenska hasa rest_area: Wotpočnišćo @@ -629,6 +570,7 @@ hsb: speed_camera: Błyskadło steps: Schodźenki stile: Płótne stupadło + street_lamp: Nadróžna latarnja tertiary: Dróha třećeho rjada tertiary_link: Dróha třećeho rjada track: Pólny puć @@ -644,6 +586,7 @@ hsb: building: Twarjenje castle: Hród church: Cyrkej + citywalls: Měšćanske murje fort: Fort house: Dom icon: Ikona @@ -653,6 +596,7 @@ hsb: monument: Pomnik museum: Muzej ruins: Rozpadanki + tomb: Row tower: Wěža wayside_cross: Pućny křiž wayside_shrine: Stołp @@ -720,6 +664,8 @@ hsb: airfield: Wojerske lětanišćo barracks: Kaserna bunker: Bunker + mountain_pass: + "yes": Hórski přesmyk natural: bay: Zaliw beach: Přibrjóh @@ -757,7 +703,7 @@ hsb: tree: Štom valley: Doł volcano: Wulkan - water: Wodźizny + water: wodźizna wetland: Łučina wetlands: Łučiny wood: Lěs @@ -789,6 +735,7 @@ hsb: locality: Sydlišćo moor: Bahno municipality: Gmejna + neighbourhood: Bydlenski wobwod postcode: Postowe wodźenske čisło region: Region sea: Morjo @@ -814,8 +761,10 @@ hsb: narrow_gauge: Wuskokolijata železnica platform: Železniske nastupišćo preserved: Muzejowa železnica + proposed: Planowana železniska čara spur: Přizamkowe kolije station: Dwórnišćo + stop: Železniske zastanišćo subway: Metrowa stacija subway_entrance: Zachod do podzemskeje železnicy switch: Wuhibka @@ -831,6 +780,7 @@ hsb: beverages: Napojowe wiki bicycle: Wobchod za kolesa books: Kniharnja + boutique: Butika butcher: Rěznik car: Awtosalon car_parts: Awtowe narunanki @@ -844,6 +794,7 @@ hsb: convenience: Miniwiki copyshop: Kopěrowanski wobchod cosmetics: Kosmetikowy wobchod + deli: Delikatesowy wobchod department_store: Kupnica discount: Wobchod za tunje artikle doityourself: Paslerska potrjeba @@ -880,17 +831,21 @@ hsb: organic: Biowobchod outdoor: Wobchod pod hołym njebjom pet: Coowobchod + pharmacy: Lěkarnja photo: Fotograf salon: Salon + second_hand: Nakupowanišćo shoes: Wobchod črijow shopping_centre: Nakupowanišćo sports: Sportowy wobchod stationery: Papjernistwo supermarket: Superwiki + tailor: Krawcownja toys: Wobchod za hrajki travel_agency: Pućowanski běrow video: Widejowobchod wine: Wobchod za spirituozy + "yes": Wobchod tourism: alpine_hut: Hórska bawda artwork: Wuměłska twórba @@ -913,6 +868,7 @@ hsb: viewpoint: Wuhladnišćo zoo: Coo tunnel: + culvert: Wotwódny kanal "yes": Tunl waterway: artificial: Kumštna wodowa dróha @@ -931,74 +887,122 @@ hsb: rapids: Rěčne prohi river: Rěka riverbank: Rěčny brjóh - stream: Wulkorěka + stream: rěčka wadi: Wadi water_point: Wódne městno waterfall: Wodopad weir: Spušćadło + help_page: + help: + description: Prašej so něčeho abo pytaj za wotmołwami na stronje prašenjow a wotmołwow OpenStreetMap. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap ma wšelake resursy za zeznaće projekta, prašenja a wotmołwy wo něčim a zhromadnu diskusiju a dokumentowanje kartěrowanskich temow. + title: Wo pomoc prosyć + welcome: + description: Započ z tutym spěšnym nawodom, kotryž zakłady OpenStreetMap wobsahuje. + title: Witaj k OSM + url: /welcome + wiki: + description: Přepytaj wiki za nadrobnej OSM-dokumentaciju + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Začinić + edit_help: Přesuń kartu do městna, kotrež chceš wobdźěłać, powjetš tam a klikń potom tu. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda jenož za standardnu runinu k dispoziciji steji map: base: cycle_map: Kolesowa karta + hot: Sobuskutkowacy humanitarneje pomocy mapquest: MapQuest Open standard: Standard transport_map: Wobchadna karta + copyright: © Sobuskutkowarjo OpenStreetMap + donate_link_text: + layers: + data: Kartowe daty + header: Kartowe runiny + notes: Pokazki + overlays: Woršty za pytanje za zmylkami na karće zmóžnić + title: Runiny + locate: + popup: Sy znutřka {distance} {unit} wokoło tutoho dypka + title: Aktualne městno pokazać + zoom: + in: Powjetšić + out: Pomjeńšić + notes: + new: + add: Pokazku přidać + intro: Zo by so karta polěpšiła, so informacije, kotrež zapodawaš, druhim kartěrowarjam pokazuja, podaj je tuž prošu tak wuprajiwje a dokładnje kaž móžno, hdyž marku ke korektnej poziciji přesuwaš a swoju pokazku deleka zapodawaš. + show: + anonymous_warning: Tuta pokazka wobsahuje komentary wot anonymnych wužiwarjow, kotrež měli so njewotwisnje přepruwować. + comment: Komentar + comment_and_resolve: Komentować a sčinić + hide: Schować + reactivate: Znowa aktiwizować + resolve: Sčinjeny + share: + cancel: Přetorhnyć + center_marker: Kartu na marce centrować + custom_dimensions: Swójske wotměry nastajić + download: Sćahnyć + embed: HTML + format: "Format:" + image: Wobraz + image_size: Wobraz pokaza standardnu runinu pola + include_marker: Kartowu marku stajić + link: Wotkaz abo HTML + long_link: Wotkaz + paste_html: HTML-kod kopěrować, zo by so do websydła zasadźił + scale: "Měritko:" + short_link: Krótki wotkaz + short_url: Krótki URL + title: Dźělić + view_larger_map: Wjetšu kartu pokazać site: + createnote_disabled_tooltip: Powjetš kartu, zo by pokazku přidał + createnote_tooltip: Karće pokazku přidać edit_disabled_tooltip: Za wobdźěłowanje karty powjetšić edit_tooltip: Kartu wobdźěłać - edit_zoom_alert: Dyrbiš powjetšić, zo by kartu wobdźěłał - history_disabled_tooltip: Za zwobraznjenje změnow za tutón wobłuk powjetšić - history_tooltip: Změny za tutón wobłuk pokazać - history_zoom_alert: Dyrbiš powjetšić, zo by wobdźěłowansku historiju widźał + map_data_zoom_in_tooltip: Powjetš kartu, zo by daty widźał + map_notes_zoom_in_tooltip: Powjetš kartu, zo by pokazki widźał layouts: + about: Wo community: Zhromadźenstwo community_blogs: Blogi zhromadźenstwa community_blogs_title: Blogi čłonow zhromadźenstwa OpenStreetMap - copyright: Awtorske prawo a licenca - documentation: Dokumentacija - documentation_title: Dokumentacija za projekt + copyright: Awtorske prawo + data: Daty donate: Podpěraj OpenStreetMap přez %{link} k fondsej aktualizacije hardwary. - donate_link_text: Darjenje edit: Wobdźěłać edit_with: Z %{editor} wobdźěłać export: Eksport - export_tooltip: Kartowe daty eksportować + export_data: Daty eksportować foundation: Załožba foundation_title: Załožba OpenStreetMap gps_traces: GPS-ćěrje gps_traces_tooltip: GPS-ćěrje zrjadować help: Pomoc - help_centre: Srjedźišćo pomocy - help_title: Sydło pomocy za projekt history: Historija - home: domoj - home_tooltip: Domoj hić - inbox: póst (%{count}) - inbox_tooltip: - few: Twój póstowy kašćik wobsahuje %{count} njepřečitane powěsće - one: Twój póstowy kašćik 1 njepřečitanu powěsć wobsahuje - other: Twój póstowy kašćik wobsahuje %{count} njepřečitanych powěsćow - two: Twój póstowy kašćik wobsahuje %{count} njepřečitanej powěsći - zero: Twój póstowy kašćik žane njepřečitane powěsće njewobsahuje. - intro_1: OpenStreetMap je swobodna wobdźěłujomna karta cyłeho swěta. Bu za ludźi kaž wy wutworjena. + home: K domjacemu stejnišću intro_2_create_account: Załož wužiwarske konto - intro_2_download: sćahnyć - intro_2_html: Móžeš daty darmo %{download} a pod %{license} %{use}. %{create_account}, zo by kartu polěpšił. - intro_2_license: zjawnej licencu - intro_2_use: wužiwać - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - alt: CC by-sa 2.0 - title: Daty OpenStreetMap licencuja so pod licencu Creative Commons Attribution-Share Alike 2.0 Generic - log_in: přizjewić + intro_header: Witaj k OpenStreetMap! + intro_text: OpenStreetMap je karta swěta, wutworjena wot ludźi kaž ty a hodźi so swobodnje pod wotewrjenej licencu wužiwać. + learn_more: Dalše informacije + log_in: Přizjewić log_in_tooltip: Do eksistowaceho konta so přizjewić logo: alt_text: OpenStreetMap logo - logout: wotzjewić - logout_tooltip: Wotzjewić + logout: Wotzjewić make_a_donation: text: Darić title: OpenStreetMap z pjenježnym darom podpěrać + more: Wjace osm_offline: Datowa banka OpenStreetMap je tuchwilu offline, dokelž so wažne wobhladowankse dźěła na datowej bance přewjedu. osm_read_only: Datowa banka OpenStreetMap je tuchwilu jenož čitajomna, dokelž so wažne wothladowanske dźěła na datowej bance přewjedu. partners_bytemark: Bytemark Hosting @@ -1007,24 +1011,47 @@ hsb: partners_partners: partnerow partners_ucl: z UCL VR Centre partners_url: http://wiki.openstreetmap.org/wiki/Partners - sign_up: registrować + sign_up: Registrować sign_up_tooltip: Konto za wobdźěłowanje załožić - sotm2011: Dojědźće do konferency OpenStreetMap 2011, "The State of the Map", 9. - 11. septembra w Denverje! + start_mapping: Kartěrowanje započeć tag_line: Swobodna swětowa karta user_diaries: Dźeniki user_diaries_tooltip: Wužiwarske dźeniki čitać - view: Karta - view_tooltip: Kartu pokazać - welcome_user: Witaj, %{user_link} - welcome_user_link_tooltip: Twoja wužiwarska strona - wiki: Wiki - wiki_title: Wikisydło za projekt license_page: foreign: english_link: jendźelskim originalom text: W padźe konflikta mjez přełoženej stronje a %{english_original_link}, jendźelska strona dyrbi prioritatu měć title: Wo tutym přełožku - legal_babble: "

    Awtorske prawo a licenca

    \n

    \nOpenStreetMap wobsteji ze zjawnych datow, licencowanych pod licencu Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \nMóžeš naše karty a daty kopěrować, rozdźělić, přenjesć a přiměrić, tak dołho kaž OpenStreetMap a jich sobuskutkowacych naspominaš. Jeli změniš naše karty abo daty abo zepěraš so na nje, móžeš wuslědk jenož pod samsnej licencu rozdźělić. Dospołny prawniski kod wujasnja twoje prawa a zamołwitosće.

    \n\n

    Kak awtorstwo OpenStreetMap naspomnić

    \n

    \nJeli kartowe wobrazy z OpenStreetMap wužiwaš, žadamy sej, zo znajmjeńša podawaš “© OpenStreetMap a sobuskutkowacych, CC BY-SA”. Jeli jenož kartowe daty wužiwaš, dyrbiš “kartowe daty © OpenStreetMap a sobuskutkowacych, CC BY-SA” podać.\n

    \n

    Hdźež je móžno, OpenStreetMap měł wotkaz do http://www.openstreetmap.org/ a CC BY-SA do http://creativecommons.org/licenses/by-sa/2.0/ měć. Jeli medij wužiwaš, hdźež wotkazy móžno njejsu (na př. wućišćane dźěło), namjetujemy, zo pokazuješ swojich čitarjow na www.openstreetmap.org a na www.creativecommons.org.\n

    \n\n

    Dalše informacije

    \n

    \nČitaj wjace wo wužiwanju našich datow Huste prawniske prašenja.\n

    \n

    \nSobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow, kotrež su přez awtorske prawo škitane (na př. z Google Maps abo z wućišćanych kartow) bjez wurazneje dowolnosće awtorow njepřidawaja.

    \n

    \nHačrunjež OpenStreetMap wobsteji ze zjawnych datow, njemóžemy darmotny kartowy API za wuwiwarjow třećich poskićić. \n\nHlej naše prawidła za wužiwanje API, Prawidła za wužiwanje polow a Prawidła za wužiwanje Nominatim.

    \n\n

    Naši sobuskutkowacy

    \n

    \nNaša licenca CC BY-SA žada sej, zo “daš prěnjotnemu awtorej dźak přiměrjeny medijej abo srědkej, kotryž wužiwaš”. Jednotliwi kartěrowarjo OSM nježadaja sej přidatne dźakprajenje k “sobuskutkowarjam OpenStreetMap”, ale hdyž so daty z narodneho kartěrowanskeho předewzaća abo z druheho wuznamneho žórła w OpenStreetMap zapřijimaja, je přiměrjene, jim přez direktne přewzaće jich dźakprajenja abo přez wotkazowanje na njo na tutej stronje dźak prajić.\n

    \n\n\n \n
      \n
    • Awstralska: Wobsahuje předměšćanske daty na zakładźe datow Awstralskeho zarjada za statistiku (Australian Bureau of Statistics).
    • \n
    • Awstriska: Wobsahuje daty z Stadt Wien (pod CC BY), Land Vorarlberg a\n Land Tirol (pod CC-BY AT ze změnami).
    • \n
    • Francoska: Wobsahuje daty z Direction Générale des Impôts.
    • \n
    • Južna Afrika: Wobsahuje daty z Chief Directorate:\n National Geo-Spatial Information, Statne awtorske prawo wuměnjene.
    • \n
    • Kanada: Wobsahuje daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada).
    • \n
    • Nižozemska: Wobsahuje daty © AND data, 2007\n (www.and.com)
    • \n
    • Nowoseelandska: Wobsahuje daty ze žórłow wot Land Information New Zealand. Awtorske prawo wuměnjene.
    • \n
    • Pólska: Wobsahuje daty z UMP-pcPL maps. Awtorske prawo sobuskutkowacych UMP-pcPL. \n \n Wjace wo wužiwanju UMP-datow w OSM
    • \n
    • Zjednoćene kralestwo: Wobsahuje daty z Ordnance Survey (Zarjadniske krajměrjenstwo) © Awtorske prawo a prawo za datowe banki 2010.
    • \n
    \n\n

    \nZapřijimanje datow do OpenStreetMap njerěka, zo poskićowar originalnych datow OpenStreetMap připóznawa, někajku garantiju dodawa abo rukowanje přewozmje.\n

    " + legal_babble: + attribution_example: + alt: Přikład, kak so na webstronje na OpenStreetMap pokazuje + title: Připokazanski přikład + contributors_at_html: "Awstriska: Wobsahuje daty z Stadt Wien (pod CC BY), Land Vorarlberg a Land Tirol (pod CC-BY AT ze změnami)." + contributors_ca_html: "Kanada: Wobsahuje daty z GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), a StatCan (Geography Division, Statistics Canada)." + contributors_fi_html: "Finska: Wobsahuje daty z topografiskeje datoweje banki National Land Survey of Finland a druhich datowych sadźbow, pod NLSFI-licencustronu sobuskutkowarjow na wikiju OpenStreetMap. + contributors_footer_2_html: Zapřijimanje datow do OpenStreetMap njerěka, zo poskićowar originalnych datow OpenStreetMap připóznawa, někajku garantiju dodawa abo rukowanje přewozmje. + contributors_fr_html: "Francoska: Wobsahuje daty z Direction Générale des Impôts." + contributors_gb_html: "Zjednoćene kralestwo: Wobsahuje daty z Ordnance Survey (Zarjadniske krajměrjenstwo) © Awtorske prawo a prawo za datowe banki 2010-2012." + contributors_intro_html: "Naši sobuskutkowacy su tysacy wosobow. Zapřijimamy tež daty wotewrjeneje licency z narodnych kartowanskich předewzaćow a druhich žórłow, mjez nimi:" + contributors_nl_html: "Nižozemska: Wobsahuje daty © AND data, 2007 (www.and.com)" + contributors_nz_html: "Nowoseelandska: Wobsahuje daty ze žórłow wot Land Information New Zealand. Awtorske prawo wuměnjene." + contributors_title_html: Naši sobuskutkowacy + contributors_za_html: "Južna Afrika: Wobsahuje daty z Chief Directorate: National Geo-Spatial Information, Statne awtorske prawo wuměnjene." + credit_1_html: Žadamy sej, zo podawaš sobuskutkowarjow “© OpenStreetMap”. + credit_2_html: Dyrbiš tež wujasnić, zo daty steja pod licencu Open Database, a, jeli so naše kartowe kachlicy wužiwaja, zo kartografija so pod CC-BY-SA licencuje. Móžeš to činić, wotkazujo do tuteje strony awtorskeho prawa. Alternatiwnje, a jako žadanje, jeli rozdźěluješ OSM w datowym formje, móžeš direktnje k licencam mjenować a wotkazać. W medijach, hdźež wotkazy móžno njejsu (na př. wućišćane dźěła), namjetujemy ći, twojich čitarjow na openstreetmap.org (snadź rozšěrjejo 'OpenStreetMap' k tutej połnej adresy), na opendatacommons.org a, jeli to je relewantne, na creativecommons.org skedźbnić. + credit_3_html: "Za přepytujomnu elektronisku kartu měło so dźakprajenje w róžku karty jewić. Na přikład:" + credit_title_html: Kak awtorstwo OpenStreetMap naspomnić + infringement_1_html: Sobuskutkowacych OSM namołwjamy, zo ženje daty ze žórłow, kotrež su přez awtorske prawo škitane (na př. z Google Maps abo z wućišćanych kartow) bjez wurazneje dowolnosće awtorow njepřidawaja. + infringement_2_html: Jeli měniš, zo awtorskoprawnisce škitany material je so datowej bance OpenStreetMap abo tutomu sydłu bjez dowolnosće přidał, poćahuj so prošu na naše postupowanje za wotstronjenje wobsahaabo zdźěl to direktnje na našej formularnej stronje. + infringement_title_html: Přeńdźenje awtorskeho prawa + intro_1_html: "OpenStreetMap su zjawne daty, licencowane pod licencu Open Data\nCommons Open Database (ODbL)." + intro_2_html: Móžeš naše daty kopěrować, rozdźělić, přenjesć a přiměrić, tak dołho kaž OpenStreetMap a jich sobuskutkowacych naspominaš. Jeli změniš naše daty abo zepěraš so na nje, móžeš wuslědk jenož pod samsnej licencu rozdźělić. Dospołny prawniski kod wujasnja twoje prawa a zamołwitosće. + intro_3_html: Kartografija w našich kartowych kachličkach a naša dokumentacija stej pod licencu Creative Commons Attribution-ShareAlike 2.0 (CC-BY-SA) licencowanej. + more_1_html: Čitaj wjace wo wužiwanju našich datow a kak hodźi so nas připóznać, pod Huste prawniske prašenja. + more_2_html: "Hačrunjež OpenStreetMap wobsteji ze zjawnych datow, njemóžemy darmotny kartowy API za wuwiwarjow třećich poskićić. \nHlej naše prawidła za wužiwanje API, Prawidła za wužiwanje polow a Prawidła za wužiwanje Nominatim." + more_title_html: Dalše informacije + title_html: Awtorske prawo a licenca native: mapping_link: kartěrowanje započeć native_link: hornjoserbskej wersiji @@ -1090,12 +1117,9 @@ hsb: title: Pósłany to: Komu read: - back_to_inbox: Wróćo k póstowemu kašćikej - back_to_outbox: Wróćo k pósłanym powěsćam + back: Wróćo date: Datum from: Wot - reading_your_messages: Twoje powěsće čitać - reading_your_sent_messages: Twoje pósłane powěsće čitać reply_button: Wotmołwić subject: Temowe nadpismo title: Powěsć čitać @@ -1106,6 +1130,37 @@ hsb: wrong_user: Sy jako `%{user}' přizjewjeny, ale powěsć, na kotruž chcyše wotmołwić, njebu na toho wužiwarja pósłana. Prošu přizjew so jako korektny wužiwar, zo by wotmołwił. sent_message_summary: delete_button: Zničić + note: + description: + closed_at_by_html: Před %{when} wot %{user} rozrisany + closed_at_html: Před %{when} rozrisany + commented_at_by_html: Před %{when} wot %{user} zaktualizowany + commented_at_html: Před %{when} zaktualizowany + opened_at_by_html: Před %{when} wot %{user} wutworjeny + opened_at_html: Před %{when} wutworjeny + reopened_at_by_html: Před %{when} wot %{user} znowa aktiwizowany + reopened_at_html: Před %{when} znowa aktiwizowany + entry: + comment: Komentar + full: Dospołna pokazka + mine: + ago_html: před %{when} + created_at: "Wutworjeny:" + creator: Tworićel + description: Wopisanje + heading: Pokazki wužiwarja %{user} + id: ID + last_changed: Posledni raz změnjeny + subheading: Pokazki, kotrež su so wot %{user} dali abo komentowali + title: Pokazki, kotrež su so wot %{user} dali abo komentowali + rss: + closed: začinjena pokazka (blisko %{place}) + commented: nowy komentar (blisko %{place}) + description_area: Lisćina pokazkow, kotrež su so za twój wobwod [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] zdźělili, komentowali abo sčinili + description_item: RSS-kanal za pokazku %{id} + opened: nowa pokazka (blisko %{place}) + reopened: reaktiwizowana pokazka (blisko %{place}) + title: Pokazki OpenStreetMap notifier: diary_comment_notification: footer: Móžeš tež komentar na %{readurl} čitać a na %{commenturl} komentować abo na %{replyurl} wotmołwić @@ -1121,8 +1176,7 @@ hsb: email_confirm_plain: click_the_link: Jeli sy to ty, prošu klikń na slědowacy wotkaz, zo by změnu wobkrućił. greeting: Witaj, - hopefully_you_1: Něchtó (najskerje ty) chce swoju e-mejlowu adresu - hopefully_you_2: na %{server_url} do %{new_address} změnić. + hopefully_you: Něchtó (nadźijomnje ty) chce swoju e-mejlowu adresu na %{server_url} do %{new_address} změnić friend_notification: befriend_them: Móžeš jich na %{befriendurl} jako přećelow přidać. had_added_you: "%{user} je će na OpenStreetMap jako přećela přidał." @@ -1151,54 +1205,56 @@ hsb: lost_password_plain: click_the_link: Jeli ty to sy, klikń prošu na slědowacy wotkaz, zo by swoje hesło wróćo stajił. greeting: Witaj, - hopefully_you_1: Něchtó (najskerje ty) je požadał hesło za konto - hopefully_you_2: openstreetmap.org tuteje e-mejloweje adresy wróćo stajić. + hopefully_you: Něchtó (najskerje ty) je požadał hesło za konto openstreetmap.org tuteje e-mejloweje adresy wróćo stajić. message_notification: - footer1: Móžeš tež powěsć na %{readurl} čitać - footer2: a móžeš na %{replyurl} wotmołwić + footer_html: Móžeš powěsć pod %{readurl} čitać a móžeš pod %{replyurl} wotmołwić header: "%{from_user} je ći přez OpenStreetMap powěsć z temowym nadpismom %{subject} pósłał:" hi: Witaj %{to_user}, + note_comment_notification: + anonymous: Anonymny wužiwar + closed: + commented_note: "%{commenter} je kartowu pokazku wobkedźował, kotruž sy komentował. Pokazka je blisko %{place}." + subject_other: "[OpenStreetMap] %{commenter} je pokazku wobkedźbował, za kotruž so zajimuješ" + subject_own: "[OpenStreetMap] %{commenter} je jednu z twojich pokazkow rozrisał" + your_note: "%{commenter} je jednu z twojich kartowych pokazkow blisko %{place} wobkedźbował." + commented: + commented_note: "%{commenter} je komentar wo kartowej pokazce zawostajił, kotruž sy komentował. Pokazka je blisko %{place}." + subject_other: "[OpenStreetMap] %{commenter} je pokazku komentował, za kotruž so zajimuješ" + subject_own: "[OpenStreetMap] %{commenter} je jednu z twojich pokazkow komentował" + your_note: "%{commenter} je komentar wo jednej z twojich pokazkow blisko %{place} zawostajił." + details: Dalše podrobnosće wo pokazce móžeš pod %{url} namakać. + greeting: Witaj, + reopened: + commented_note: "%{commenter} je kartowu pokazku reaktiwizował, kotruž sy komentował. Pokazka je blisko %{place}." + subject_other: "[OpenStreetMap] %{commenter} je pokazku reaktiwizował, za kotruž so zajimuješ" + subject_own: "[OpenStreetMap] %{commenter} je jednu z twojich pokazkow reaktiwizował" + your_note: "%{commenter} je jednu z twojich kartowych pokazkow blisko %{place} reaktiwizował." signup_confirm: - subject: "[OpenStreetMap] Twoju e-mejlowu adresu wobkrućić" - signup_confirm_html: - ask_questions: Móžeš so za něčim wo OpenStreetMap na našim sydle Prašenja a wotmołwy prašeć. - click_the_link: Jeli ty to sy, witaj! Klikń prošu na slědowacy wotkaz, zo by konto wobkrućił a čitaj potom dalše informacije wo OpenStreetMap - current_user: Lisćina tuchwilnych wužiwarjow po jich stejnišću w swěće steji na Lisćina wužiwarjow po geografiskim regionje k dispoziciji. - get_reading: Čitaj wo OpenStreetMap na wikiju, wobstaraj sej najnowše powěsće přez blog OpenStreetMap abo Twitter, abo přečitaj blog OpenGeoData załožerja OpenStreetMap Steve Coast za historiju projekta, kotryž ma tež podcasty! - greeting: Witaj! - hopefully_you: Něchtó (najskerje ty) chce konto załožić za - introductory_video: Móžeš sej widejo %{introductory_video_link} wobhladać. - more_videos: Je hišće wjace %{more_videos_link}. - more_videos_here: dalše wideja tu - user_wiki_page: Poruča so, zo załožuješ wužiwarsku wikistronu, kotraž kategorijowe atributy wobsahuje, kotrež woznamjenjeja, hdźež sy, na přikład [[Category:Users_in_Budyšin]]. - video_to_openstreetmap: zawodne widejo wo OpenStreetMap - wiki_signup: Móžeš so tež w wikiju OpenStreetMap registrować. - signup_confirm_plain: - ask_questions: "Móžeš so za něčim wo OpenStreetMap na našim sydle Prašenja a wotmołwy prašeć:" - blog_and_twitter: "Wobstaraj sej najnowše powěsće přez blog OpenStreetMap abo Twitter:" - click_the_link_1: Jeli sy to ty, witaj! Prošu klikń na slědowacy wotkaz, zo by swoje - click_the_link_2: konto wobkrućił a čitaj potom dalše informacije wo OpenStreetMap. - current_user_1: Lisćina tuchwilnych wužiwarjow w kategorijach po jich stejnišću w swěće - current_user_2: "tu k dispoziciji steji:" + confirm: "Prjedy hač něšto činimy, dyrbimy wobkrućić, zo tute naprašowanje wote tebje přińdźe, jeli tomu tak je, klikń prošu na slědowacy wotkaz, zo by swoje konto wobkrućił:" + created: Něchtó (nadźijamy so ty) je runje konto na %{site_url} załožił. greeting: Witaj! - hopefully_you: Něchtó (najskerje ty) chce konto załožić na - introductory_video: "Zawodny widejo wo OpenStreetMap móžeš sej tu wobhladać:" - more_videos: "Tu su hišće dalše wideja:" - opengeodata: "OpenGeoData.org je blog załožerja OpenStreetMap Steve Coast a ma tež podkasty:" - the_wiki: "Informacije wo OpenStreetMap namakaš na wiki:" - user_wiki_1: Poruča so, zo wutworješ wužiwarsku wikistronu, kotraž wobsahuje - user_wiki_2: kategorijowe atributy, kotrež woznamjenjeja, hdźež sy, na př. [[Category:Users_in_London]]. - wiki_signup: "Móžeš so tež za wiki OpenStreetMap registrować:" + subject: "[OpenStreetMap] Witaj do OpenStreetMap" + welcome: Po tym zo by swoje konto wobkrućił, budźemy tebi přidatne informacije za prěnje kroki dać. oauth: oauthorize: allow_read_gpx: twoje priwatne GPS-ćěrje čitać. allow_read_prefs: twoje wužiwarske nastajenja čitać. - allow_to: "Aplikaciji dowolić:" + allow_to: "Dowól nałoženju:" allow_write_api: kartu změnić. allow_write_diary: dźenikowe zapiski a komentary spisać a přećelow zapisać. allow_write_gpx: GPS-ćěrje nahrać. + allow_write_notes: pokazki změnić. allow_write_prefs: twoje wužiwarske nastajenja změnić. request_access: Aplikacija %{app_name} prosy wo přistup na twoje konto, %{user}. Prošu rozsudź, hač aplikacija ma slědowace prawa měć. Móžeš wšě abo jenož někotre z nich wubrać. + title: Přistup na twoje konto awtorizować + oauthorize_failure: + denied: Sy přistup nałoženja %{app_name} na twoje konto wotpokazał. + invalid: Awtorizaciski token płaćiwy njeje. + title: Awtorizowanske napřašowanje je so njeporadźiło + oauthorize_success: + allowed: Sy přistup nałoženja %{app_name} na twoje konto dowolił. + title: Awtorizowanske naprašowanje dowolene + verification: Přepruwowanski kod je %{code}. revoke: flash: Sy token za %{application} anulował. oauth_clients: @@ -1215,6 +1271,7 @@ hsb: allow_write_api: kartu změnić. allow_write_diary: dźenikowe zapiski a komentary spisać a přećelow zapisać. allow_write_gpx: GPS-ćěrje nahrać. + allow_write_notes: pokazki změnić. allow_write_prefs: jich wužiwarske nastajenja změnić. callback_url: URL wróćowołanja name: Mjeno @@ -1245,15 +1302,16 @@ hsb: allow_write_api: kartu změnić. allow_write_diary: dźenikowe zapiski a komentar spisać a přećelow zapisać. allow_write_gpx: GPS-ćěrje nahrać. + allow_write_notes: změnjenje pokazkow. allow_write_prefs: jich wužiwarske nastajenja změnić. authorize_url: "URL awtorizować:" confirm: Sy sej wěsty? delete: Klient zhašeć edit: Podrobnosće wobdźěłać key: "Kluč přetrjebowarja:" - requests: "Požadanje slědowacych prawow wot wužiwarja:" + requests: "Požadanje lědowacych prawow wot wužiwarja:" secret: "Potajnstwo přetrjebowarja:" - support_notice: Podpěrujemy HMAC-SHA1 (poručeny) kaž tež luty tekst w modusu ssl. + support_notice: Podpěrujemy HMAC-SHA1 (poručeny) kaž tež signatury RSA_SH1. title: Podrobnosće OAuth za %{app_name} url: URL za naprašowanski token update: @@ -1293,6 +1351,7 @@ hsb: edit: anon_edits_link_text: Zwěsćić, čehoždla je tomu tak. flash_player_required: 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. + id_not_configured: iD njeje so konfigurował no_iframe_support: Twó wobhladowak njepodpěruje iframe-elementy, kotrež su za tutu funkciju trěbne. not_public: Njejsy swoje změny jako zjawne markěrowane. not_public_description: Njemožeš hižo kartu wobźěłać, chibazo činiš to. Móžeš swoje změny na swojej %{user_page} jako zjawne markěrować. @@ -1301,18 +1360,15 @@ hsb: 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. user_page_link: wužiwarskej stronje index: + createnote: Pokazku přidać js_1: Pak wužiwaš wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript znjemóžnił. js_2: OpenStreetMap JavaScript za slippy map wužiwa. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Licencowany pod licencu %{license_name} přez %{project_name} a jeho sobuskutkowacych. - project_name: Projekt OpenStreetMap + copyright: Copyright OpenStreetMap a sobuskutkowarjo, pod wotewrjenej licencu permalink: Trajny wotkaz remote_failed: Wobdźěłowanje je so njeporadźiło - zawěsć, zo JOSM abo Merkaartor je začitany a dalokowodźenska opcija je zmóžnjena shortlink: Krótki wotkaz key: - map_key: Legenda - map_key_tooltip: Legenda za kartu table: entry: admin: Zarjadniska hranica @@ -1398,7 +1454,6 @@ hsb: preview: Přehlad search: search: Pytać - search_help: "přikłady: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', abo 'post offices near Lünen' dalše přikłady..." submit_text: Dźi where_am_i: Hdźe sym? where_am_i_title: Aktualne městno z pomocu pytawy wopisać @@ -1414,6 +1469,13 @@ hsb: upload_trace: GPS-ćěr nahrać delete: scheduled_for_deletion: Čara předwidźana za zničenje + description: + description_with_count: + few: GPX-dataja z %{count} dypkami wot %{user} + one: GPX-dataja z %{count} dypkom wot %{user} + other: GPX-dataja z %{count} dypkami wot %{user} + two: GPX-dataja z %{count} dypkomaj wot %{user} + description_without_count: GPX-dataja wot %{user} edit: description: "Wopisanje:" download: sćahnyć @@ -1431,7 +1493,11 @@ hsb: uploaded_at: "Nahraty dnja:" visibility: "Widźomnosć:" visibility_help: što to woznamjenja? + georss: + title: OpenStreetMap GPS-slědy list: + description: Najnowše nahraća GPS-čarow přepytać + empty_html: Ničo tu njeje. Nahraj nowu ćěr abo wukń wjace wo GPS-slědowanju na wikijowej stronje. public_traces: Zjawne GPS-ćěrje public_traces_from: Zjawne GPS-ćěrje wot %{user} tagged_with: Markěrowane přez %{tags} @@ -1471,14 +1537,16 @@ hsb: trace_header: see_all_traces: Wšě ćěrje pokazać see_your_traces: Wšě twoje ćěrje pokazać - traces_waiting: Maš %{count} ćěrjow, kotrež na nahraće čakaja. Prošu čakaj, doniž njejsu nahrate, prjedy hač dalše nahrawaš, zo njeby so čakanski rynk za druhich wužiwarjow blokował. + traces_waiting: + one: Maš %{count} ćěrjow, kotrež na nahraće čakaja. Prošu čakaj, doniž njejsu nahrate, prjedy hač dalše nahrawaš, zo njeby so čakanski rynk za druhich wužiwarjow blokował. + other: Maš %{count} ćěrjow, kotrež na nahraće čakaja. Prošu čakaj, doniž njejsu nahrate, prjedy hač dalše nahrawaš, zo njeby so čakanski rynk za druhich wužiwarjow blokował. upload_trace: Ćěr nahrać trace_optionals: tags: Atributy trace_paging_nav: - next: Přichodny » - previous: « Předchadny - showing_page: Pokazuje so strona %{page} + newer: Nowše ćěrje + older: Starše ćěrje + showing_page: Strona %{page} view: delete_track: Tutu čaru zničić description: "Wopisanje:" @@ -1517,6 +1585,10 @@ hsb: email never displayed publicly: (njeje ženje zjawnje widźomna) flash update success: Wužiwarske informacije wuspěšnje zaktualizowane. flash update success confirm needed: Wužiwarske informacije wuspěšnje zaktualizowane. Dóstanješ e-mejl z namołwu, swoju nowu e-mejlowu adresu wobkrućić. + gravatar: + gravatar: Gravatar wužiwać + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: Što to je? home location: "Domjace stejnišćo:" image: "Wobraz:" image size hint: (kwadratiske wobrazy z wulkosću wot znajmjeńša 100x100 najlěpje funguja) @@ -1552,13 +1624,13 @@ hsb: update home location on click: Domjace stejnišćo při kliknjenju na kartu aktualizować? confirm: already active: Tute konto bu hižo wobkrućene. - before you start: Wěmy, zo najskerje njemóžeš dočakać kartěrowanje započeć, ale ty měł najprjedy někotre informacije wo sebje w slědowacym formularje podać. button: Wobkrućić - heading: Wužiwarske konto wobkrućić + heading: Přepruwuj swoju e-mejl! + introduction_1: Smy ći wobkrućensku e-mejlku pósłali. + introduction_2: Wobkruć swoje konto kliknjo na wotkaz w e-mejlce a móžeš kartěrowanje započeć. press confirm button: Klikni deleka na wobkrućenske tłóčatko, zo by swoje konto aktiwizował. - reconfirm: Jeli je hižo něšto časa zašło, wot toho zo sy zregistrował, dyrbiš ewentuelnje sam nowu wobkrućensku e-mejl pósłać. - success: Twoje konto bu wobkrućene, dźakujemy so za registrowanje! - unknown token: Zda so, zo token njeeksistuje. + reconfirm_html: Jeli dyrbiš nam wobkrućensku e-mejlku znowa pósłać, klikń tu. + unknown token: Wobkrućenski kod je spadnjeny abo njeeksistuje. confirm_email: button: Wobkrućić failure: E-mejlowa adresa je hižo z tutym kodom wobkrućena. @@ -1578,8 +1650,8 @@ hsb: heading: Wužiwarjo hide: Wubranych wužiwarjow schować showing: - one: Pokazuje so strona %{page} (%{first_item} z %{items}) - other: Pokazuje so strona %{page} (%{first_item}-%{last_item} z %{items}) + one: Strona %{page} (%{first_item} z %{items}) + other: Strona %{page} (%{first_item}-%{last_item} z %{items}) summary: "%{name} wot %{ip_address} dnja %{date} wutworjeny" summary_no_ip: "%{name} dnja %{date} wutworjeny" title: Wužiwarjo @@ -1594,8 +1666,6 @@ hsb: lost password link: Swoje hesło zabył? new to osm: Nowy w OpenStreetMap? no account: Nimaš žane konto? - notice: Wjace wo bórzomnej licencnej změnje OpenStreetMap (přełožki) (diskusija) - notice_terms: OpenStreetMap přeńdźe 1. apryla 2012 k nowej licency. Je tež swobodna kaž aktualna, ale prawniske wuměnjenja hodźa so lěpje k našej kartowej datowej bance. Bychmy rady twoje přinoški w OpenStreetMap wobchowali, ale móžemy to jenož činić, jeli sy přezjedny, zo twoje přinoški pod nowej licencu rozšěrjemy. Hewak dyrbimy je z datoweje banki wotstronić.

    Prošu wozjew so, bjer sej potom něšto sekundow časa, zo by nowe wuměnjenja přepruwował a akceptował. Wulki dźak! openid: "%{logo} OpenID:" openid invalid: Zda so, zo twój OpenID je njepłaćiwy openid missing provider: Bohužel njemóžachmy z twojim OpenID-poskićowarjom zwjazać. @@ -1640,19 +1710,21 @@ hsb: title: Hesło zabyte make_friend: already_a_friend: Sy hižo přećel wužiwarja %{name}. + button: Jako přećela přidać failed: Wodaj, %{name} njeda so jako přećel přidać. - success: "%{name} je nětko twój přećel." + heading: "%{user} jako přećela přidać?" + success: "%{name} je nětko twój přećel!" new: + about: + header: Swobodny a wobdźěłujomny + html: "

    Na rozdźěl wot druhich kartow, so OpenStreetMap dospołnje wot ludźi kaž ty twori, a kóždy móže ju korigować, aktualizować, sćahnyć a wužiwać.

    \n

    Zregistruj so a skutkuj sobu. Budźemy ći e-mejlku słać, zo bychmy twoje konto wobkrućili." confirm email address: "E-mejlowu adresu wobkrućić:" confirm password: "Hesło wobkrućić:" contact_webmaster: Prošu staj so z webmasterom do zwiska, zo by so konto załožiło - budźemy pospytać naprašowanje tak spěšnje kaž móžno wobdźěłać. - continue: Dale + continue: Registrować display name: "Wužiwarske mjeno:" display name description: Sy wužiwarske mjeno zjawnje pokazał. Móžeš to pozdźišo w nastajenjach změnić. email address: "E-mejlowa adresa:" - fill_form: Wupjelń formular a budźemy ći hnydom e-mejl słać, zo by swoje konto aktiwizował. - flash create success message: Dźakujemy so za registrowanje. Smy wobkrućenski e-mejl na %{email} póslali a tak ruče hač swoje konto wobkrućiš, móžeš kartěrowanje započeć.

    Jeli přećiwospamowy system wužiwaš, kotryž wobkrućenske naprašowanja sćele, přewzmi adresu webmaster@openstreetmap.org do swojeje běłeje lisćiny, dokelž njemóžemy na wobkrućenske naprašowanja wotmołwić. - heading: Wužiwarske konto załožić license_agreement: Hdyž swoje konto wubkrućeš, dyrbiš wuměnjenjam za sobuskutkowarjow přihłosować. no_auto_account_create: Bohužel njemóžemy tuchwilu žane konto za tebje awtomatisce załožić. not displayed publicly: Njepokazuje so zjawnje (hlej Prawidła priwatnosće) @@ -1662,7 +1734,7 @@ hsb: password: "Hesło:" terms accepted: Dźakujemy so, zo sy nowe wuměnjenja za sobuskutkowarjow akceptował! terms declined: Wobžarujemy, zo sy so rozsudźił, nowe wužiwarske wuměnjenja njeakceptować. Za dalše informacije hlej prošu tutu wikistronu. - title: Konto załožić + title: Registrować use openid: Alternatiwnje OpenID z %{logo} přizjewić no_such_user: body: Bohužel žadyn wužiwar z mjenom %{user} njeje. Prošu skontroluj prawopis, abo wotkaz, na kotryž sy kliknył, je njepłaćiwy. @@ -1673,6 +1745,8 @@ hsb: nearby mapper: Kartěrowar w bliskosći your location: Twoje městno remove_friend: + button: Přećela wotstronić + heading: "%{user} jako přećela wotstronić?" not_a_friend: "%{name} twój přećel njeje." success: "%{name} je so jako přećel wotstronił." reset_password: @@ -1707,11 +1781,11 @@ hsb: you need to accept or decline: Prošu přečitaj nowe wužiwarske wuměnjenja a akceptuj abo wotpokazaj je, prjedy hač dale činiš. view: activate_user: tutoho wužiwarja aktiwizować - add as friend: jako přećela přidać + add as friend: Přećela přidać ago: (před %{time_in_words_ago}) - block_history: Dóstane blokowanja pokazać - blocks by me: blokowanja wote mnje - blocks on me: blokowanja přećiwo mi + block_history: Dóstane blokowanja + blocks by me: Date blokowanja + blocks on me: Dostane blokowanja comments: Komentary confirm: Wobkrućić confirm_user: tutoho wužiwarja wobkrućić @@ -1724,31 +1798,35 @@ hsb: deactivate_user: tutoho wužiwarja znjemóžnić delete_user: tutoho wužiwarja zničić description: Wopisanje - diary: dźenik - edits: změny + diary: Dźenik + edits: Změny email address: "E-mejlowa adresa:" - friends_changesets: Sadźby změnow twojich přećelow přepytać - friends_diaries: Wšě dźenikowe zapiski přećelow přepytać + friends_changesets: Sadźby změnow twojich přećelow + friends_diaries: Dźenikowe zapiski přećelow hide_user: tutoho wužiwarja schować - if set location: Jeli sy swoje stejnišćo podał, budźetej so deleka rjana karta a druhe material jewić. Móžeš swoje domjace stejnišćo na swojej stronje %{settings_link} nastajić. + if set location: Podaj swoje stejnišćo na boku %{settings_link}, zo by wužiwarjow w swojej bliskosći widźał. km away: "%{count} km zdaleny" latest edit: "Najnowša změna %{ago}:" m away: "%{count} m zdaleny" mapper since: "Kartěrowar wot:" - moderator_history: Date blokowanja pokazać - my comments: moje komentary - my diary: mój dźenik - my edits: moje změny - my settings: moje nastajenja - my traces: moje ćěrje + moderator_history: Date blokowanja + my comments: Moje komentary + my diary: Mój dźenik + my edits: Moje změny + my messages: Moje powěsće + my notes: Moje pokazki + my profile: Mój profil + my settings: Moje nastajenja + my traces: Moje ćěrje nearby users: Druzy wužiwarjo w bliskosći - nearby_changesets: Wšě sadźby změnow wužiwarjow w bliskosći přepytać - nearby_diaries: Wšě dźenikowe zapiski wužiwarjow w bliskosći přepytać + nearby_changesets: sadźby změnow wužiwarjow w bliskosći + nearby_diaries: dźenikowe zapiski wužiwarjow w bliskosći new diary entry: nowy dźenikowy zapisk no friends: Hišće njejsy přećelow přidał. no nearby users: Njejsu druzy wužiwarjo, kotřiž w bliskosći kartěruja. + notes: Pokazki oauth settings: OAUTH-nastajenja - remove as friend: jako přećela wotstronić + remove as friend: Přećela wotstronić role: administrator: Tutón wužiwar je administrator grant: @@ -1758,11 +1836,11 @@ hsb: revoke: administrator: Prawa administratora preč wzać moderator: Prawa moderatora preč wzać - send message: powěsć pósłać + send message: Powěsć pósłać settings_link_text: nastajenja spam score: "Spamowe hódnoćenje:" status: "Status:" - traces: ćěrje + traces: Ćěrje unhide_user: tutoho wužiwarja pokazaś user location: Wužiwarske stejnišćo your friends: Twoji přećeljo @@ -1820,11 +1898,14 @@ hsb: creator_name: Blokowar display_name: Zablokowany wužiwar edit: Wobdźěłać + next: Přichodny » not_revoked: (njezběhnjeny) + previous: « Předchadny reason: Přičina za blokowanje revoke: Zběhnyć! revoker_name: Zběhnjene wot show: Pokazać + showing_page: Strona %{page} status: Status period: few: "%{count} hodźiny" @@ -1874,3 +1955,25 @@ hsb: fail: Njebě móžno rólu "%{role} wužiwarjej "%{name}" preč wzać. Prošu skontroluj, hačj wužiwar kaž tež róla stej płaćiwej. heading: Zebranje róle wobkrućić title: Zebranje róle wobkrućić + welcome_page: + add_a_note: + paragraph_1_html: Jeli chceš jenož drobnosć korigować a nimaš chwile, zo by so zregistrował a wuknył, kak so wobdźěłuje, móžeš prosće pokazku přidać. + paragraph_2_html: "Dźi prosće na kartu a klikń na symbol pokazki:\n. Tón přida karće marku, kotruž móžeš přesunyć. Přidaj swoju zdźělenku, klikń potom na Składować a druzy kartěrowarjo budu so wěcy wěnować." + title: Nimaš chwile za wobdźěłowanje? Přidaj pokazku! + basic_terms: + editor_html: Editor je program abo websydło, kotrež móžeš wužiwać, zo by kartu wobdźěłał. + node_html: Suk je dypk na karće, na př. hosćenc abo štom. + paragraph_1_html: OpenStreetMap někotre wosebite zapřijeća wužiwa. Tu su někotre z nich, kotrež móhli ći wužitne być. + tag_html: Atribut je datowa kajkosć wo suku abo puću, na přikład mjeno hosćenca abo najwyša spěšnosć na hasy. + title: Zakładne zapřijeća za kartěrowanje + way_html: Puć je linija abo płonina, na př. dróha, rěka, jězor abo twarjenje. + introduction_html: Witaj k OpenstreetMap, swobodnej a wobdźěłujomnej karće swěta. Nětko, po tym zo sy so zregistrował, móžeš so do kartěrowanja dać. Tu je krótki nawod z najwažnišimi informacijemi, kotrež dyrbiš wědźeć. + questions: + paragraph_1_html: "OpenStreetMap ma wšelake resursy za zeznaće projekta, prašenja a wotmołwy wo něčim a zhromadnu diskusiju a dokumentowanje kartěrowanske temy.\nPomoc." + title: Maš hišće prašenja? + start_mapping: Kartěrowanje započeć + title: Witaj! + whats_on_the_map: + off_html: Štož njema wobsahować, su subjektiwne daty kaž pohódnoćenja, historiske abo hypotetiske funkcije a daty z přez awtorske prawo škitanych žórłow. Njekopěruju z online- abo papjernych kartow, chibazo maš wosebitu dowolnosć. + on_html: OpenStreetMap je městno za kartěrowanje wěcow, kotrež su realne a aktualne - wobsahuje miliony twarjenjow, pućow a druhe podrobnosće wo městnach. Móžeš kartěrować, štožkuli će we woprawdźitym swěće zajimuje. + title: Štož na kartu słuša diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 04402b5f488..10faa8033ed 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -6,11 +6,16 @@ # Author: Dani # Author: Dj # Author: Glanthor Reviol +# Author: Grin +# Author: Kempelen # Author: Leiric # Author: Misibacsi +# Author: Nemo bis # Author: R-Joe # Author: Sucy hu: + about_page: + next: Következő activerecord: attributes: diary_comment: @@ -88,86 +93,39 @@ hu: blocked: Az API-hoz való hozzáférésed blokkolva lett. Jelentkezz be a webes felületen a részletek megtekintéséhez. need_to_see_terms: Az API-hoz való hozzáférésed ideiglenesen felfüggesztésre került. Jelentkezz be a webes felületen a közreműködési feltételek megtekintéséhez. Ezt nem kell elfogadnod, de meg kell tekintened. browse: + anonymous: névtelen changeset: - changeset: "Módosításcsomag: %{id}" + belongs_to: Szerző changesetxml: Changeset XML - download: "%{changeset_xml_link} vagy %{osmchange_xml_link} letöltése" feed: title: "Módosításcsomag: %{id}" title_comment: "Módosításcsomag: %{id} - %{comment}" + node: Pontok (%{count}) + node_paginated: Pontok (%{x}-%{y} összesen %{count}) osmchangexml: osmChange XML - title: Módosításcsomag - changeset_details: - belongs_to: "Tulajdonos:" - bounding_box: "Határolónégyzet:" - box: határoló - closed_at: "Lezárva:" - created_at: "Készült:" - has_nodes: - one: "A következő %{count} pontot tartalmazza:" - other: "A következő %{count} pontot tartalmazza:" - has_relations: - one: "A következő %{count} kapcsolatot tartalmazza:" - other: "A következő %{count} kapcsolatot tartalmazza:" - has_ways: - one: "A következő %{count} vonalat tartalmazza:" - other: "A következő %{count} vonalat tartalmazza:" - no_bounding_box: Nincs eltárolva határoló ehhez a módosításcsomaghoz. - show_area_box: Területhatároló megtekintése - common_details: - changeset_comment: "Megjegyzés:" - deleted_at: "Törölve ekkor:" - deleted_by: "Törölte:" - edited_at: "Szerkesztve:" - edited_by: "Szerkesztette:" - in_changeset: "Módosításcsomag:" - version: "Verzió:" + relation: Kapcsolatok (%{count}) + relation_paginated: Kapcsolatok (%{x}-%{y} összesen %{count}) + title: "Módosításcsomag: %{id}" + way: Vonalak (%{count}) + way_paginated: Vonalak (%{x}-%{y} összesen %{count}) + closed: Lezárva + closed_by_html: Lezárva %{time} %{user} által + closed_html: Lezárva %{time} containing_relation: entry: "Kapcsolat: %{relation_name}" entry_role: "Kapcsolat: %{relation_name} (mint %{relation_role})" - map: - deleted: Törölve - edit: - area: Terület szerkesztése - node: Pont szerkesztése - relation: Kapcsolat szerkesztése - way: Vonal szerkesztése - larger: - area: Terület megtekintése nagyobb térképen - node: Pont megtekintése nagyobb térképen - relation: Kapcsolat megtekintése nagyobb térképen - way: Vonal megtekintése nagyobb térképen - loading: Betöltés… - navigation: - all: - next_changeset_tooltip: Következő módosításcsomag - next_node_tooltip: Következő pont - next_relation_tooltip: Következő kapcsolat - next_way_tooltip: Következő vonal - prev_changeset_tooltip: Előző módosításcsomag - prev_node_tooltip: Előző pont - prev_relation_tooltip: Előző kapcsolat - prev_way_tooltip: Előző vonal - user: - name_changeset_tooltip: "%{user} szerkesztéseinek megtekintése" - next_changeset_tooltip: "%{user} következő szerkesztése" - prev_changeset_tooltip: "%{user} előző szerkesztése" + created: Létrehozva + created_by_html: Létrehozve %{time} %{user} által + created_html: Létrehozva %{time} + deleted_by_html: Törölve %{time} %{user} által + download_xml: XML letöltése + edited_by_html: Szerkesztve %{time} %{user} által + in_changeset: Módosításcsomag + location: "Hely:" + no_comment: (nincs hozzászólás) node: - download: "%{download_xml_link}, %{view_history_link} vagy %{edit_link}" - download_xml: XML letöltése - edit: szerkesztés - node: Pont - node_title: "Pont: %{node_name}" - view_history: előzmények megtekintése - node_details: - coordinates: "Koordináták:" - part_of: "Része:" - node_history: - download: "%{download_xml_link} vagy %{view_details_link}" - download_xml: XML letöltése - node_history: Pont előzményei - node_history_title: "Pont előzményei: %{node_name}" - view_details: részletek megtekintése + history_title: "Pont történet: %{name}" + title: "Pont: %{name}" not_found: sorry: Sajnálom, a(z) %{id} azonosítójú %{type} nem található. type: @@ -175,74 +133,41 @@ hu: node: pont relation: kapcsolat way: vonal - paging_nav: - of: "összesen:" - showing_page: "Jelenlegi oldal:" + note: + closed_by: Megoldva %{user} által %{when} + closed_by_anonymous: Megoldva ismeretlen által %{when} + closed_title: "Megoldott jegyzet: %{note_name}" + hidden_by: Elrejtve %{user} által %{when} + hidden_title: Rejtett jegyzet %{note_name} + new_note: Új jegyzet + open_by: Létrehozva %{user} által %{when} + open_by_anonymous: Létrehozva ismeretlen által %{when} + open_title: "Megoldatlan jegyzet: %{note_name}" + reopened_by: Újraaktiválva %{user} által %{when} + reopened_by_anonymous: Újraaktiválva ismeretlen által %{when} + title: "Jegyzet: %{id}" redacted: + message_html: A %{type} %{version} verzióját nem lehet megjeleníteni, mert el lett távolítva. További részletekért lásd %{redaction_link} + redaction: Eltávolítás %{id} type: node: pont relation: kapcsolat way: vonal relation: - download: "%{download_xml_link} vagy %{view_history_link}" - download_xml: XML letöltése - relation: Kapcsolat - relation_title: "Kapcsolat: %{relation_name}" - view_history: előzmények megtekintése - relation_details: - members: "Tagok:" - part_of: "Része:" - relation_history: - download: "%{download_xml_link} vagy %{view_details_link}" - download_xml: XML letöltése - relation_history: Kapcsolat előzményei - relation_history_title: "Kapcsolat előzményei: %{relation_name}" - view_details: részletek megtekintése + history_title: "Kapcsolat történet: %{name}" + members: Tagok + title: Kapcsolat:%{name} relation_member: entry_role: "%{type} %{name} mint %{role}" type: node: "Pont:" relation: "Kapcsolat:" way: "Vonal:" - start: - manually_select: Más terület kézi kijelölése - view_data: Adatok megtekintése a térkép jelenlegi nézetéhez start_rjs: - data_frame_title: Adatok - data_layer_name: Térképadatok böngészése - details: Részletek - drag_a_box: Terület kijelöléséhez rajzolj egy négyzetet a térképen - edited_by_user_at_timestamp: "[[user]] szerkesztette ekkor: [[timestamp]]" - hide_areas: Területek elrejtése - history_for_feature: "[[feature]] előzményei" load_data: Adatok betöltése - loaded_an_area_with_num_features: "Olyan területet töltöttél be, amely [[num_features]] elemet tartalmaz. Néhány böngésző lehet, hogy nem birkózik meg ekkora mennyiségű adattal. Általában a böngészők egyszerre kevesebb mint 100 elem megjelenítésével működnek a legjobban: minden más esetben a böngésző lelassulhat/nem válaszolhat. Ha biztos vagy benne, hogy meg szeretnéd jeleníteni ezeket az adatokat, megteheted ezt az alábbi gombra kattintva." loading: Betöltés… - manually_select: Más terület kézi kijelölése - object_list: - api: Ezen terület letöltése API-ból - back: Objektumlista megjelenítése - details: Részletek - heading: Objektumlista - history: - type: - node: Pont [[id]] - way: Vonal [[id]] - selected: - type: - node: Pont [[id]] - way: Vonal [[id]] - type: - node: Pont - way: Vonal - private_user: ismeretlen felhasználó - show_areas: Területek megjelenítése - show_history: Előzmények megjelenítése - unable_to_load_size: "Nem tölthető be: a határolónégyzet mérete ([[bbox_size]]) túl nagy. (%{max_bbox_size}-nél kisebbnek kell lennie.)" - wait: Várj... - zoom_or_select: Közelíts rá vagy jelölj ki egy területet a térképen a megtekintéshez tag_details: - tags: "Címkék:" + tags: Címkék wiki_link: key: Wiki leírás oldal a %{key} címkéhez tag: Wiki leírás oldal a %{key}=%{value} címkéhez @@ -254,38 +179,22 @@ hu: node: pont relation: kapcsolat way: vonal + version: Verzió + view_details: Részletek megtekintése + view_history: Előzmények megjelenítése way: - download: "%{download_xml_link}, %{view_history_link} vagy %{edit_link}" - download_xml: XML letöltése - edit: szerkesztés - view_history: előzmények megtekintése - way: Vonal - way_title: "Vonal: %{way_name}" - way_details: - also_part_of: - one: szintén része a(z) %{related_ways} vonalnak - other: szintén része a(z) %{related_ways} vonalaknak - nodes: "Pontok:" - part_of: "Része:" - way_history: - download: "%{download_xml_link} vagy %{view_details_link}" - download_xml: XML letöltése - view_details: részletek megtekintése - way_history: Vonal előzményei - way_history_title: "Vonal előzményei: %{way_name}" + history_title: "Vonal történet: %{name}" + nodes: Pontok + title: "Vonal: %{name}" changeset: changeset: anonymous: Névtelen - big_area: (nagy) - no_comment: (nincs) no_edits: (nincs szerkesztés) - show_area_box: területhatároló megjelenítése - still_editing: (szerkesztés alatt) view_changeset_details: Módosításcsomag részleteinek megtekintése changeset_paging_nav: next: következő » previous: « előző - showing_page: "Jelenlegi oldal: %{page}" + showing_page: "%{page} oldal" changesets: area: Terület comment: Megjegyzés @@ -293,28 +202,22 @@ hu: saved_at: Mentve user: Felhasználó list: - description: Legutóbbi módosítások - description_bbox: "Módosításcsomagok ezen belül: %{bbox}" - description_friend: Ismerőseid módosításcsomagjai - description_nearby: Közeli felhasználók módosításcsomagjai - description_user: "%{user} módosításcsomagjai" - description_user_bbox: "%{user} módosításcsomagjai ezen belül: %{bbox}" - heading: Módosításcsomagok - heading_bbox: Módosításcsomagok - heading_friend: Módosításcsomagok - heading_nearby: Módosításcsomagok - heading_user: Módosításcsomagok - heading_user_bbox: Módosításcsomagok + empty: Nincs módosításcsomag + empty_area: Nincs módosításcsomag erre a területre. + empty_user: Nincs módosításcsomag ettől a felhasználótól. + load_more: További betöltése + no_more: Nem található módosításcsomag + no_more_area: Nincs több módosításcsomag ezen a területen. + no_more_user: Nincs több módosításcsomag ettől a felhasználótól. title: Módosításcsomagok - title_bbox: "Módosításcsomagok ezen belül: %{bbox}" title_friend: Ismerőseid módosításcsomagjai title_nearby: Közeli felhasználók módosításcsomagjai title_user: "%{user} módosításcsomagjai" - title_user_bbox: "%{user} módosításcsomagjai ezen belül: %{bbox}" timeout: sorry: Sajnálom, az általad kért módosításcsomagok listájának lekérése túl sokáig tartott. diary_entry: comments: + ago: "%{ago}" comment: Megjegyzés has_commented_on: "%{display_name} hozzászólt az alábbi naplóbejegyzésekhez" newer_comments: Úabb hozzászólások @@ -327,8 +230,9 @@ hu: hide_link: Hozzászólás elrejtése diary_entry: comment_count: - one: 1 hozzászólás + one: Egy hozzászólás other: "%{count} hozzászólás" + zero: Nincs hozzászólás comment_link: Hozzászólás ehhez a bejegyzéshez confirm: Megerősítés edit_link: Ezen bejegyzés szerkesztése @@ -363,7 +267,7 @@ hu: newer_entries: Újabb bejegyzések no_entries: Nincsenek naplóbejegyzések older_entries: Régebbi bejegyzések - recent_entries: "Legutóbbi naplóbejegyzések:" + recent_entries: Legutóbbi naplóbejegyzések title: Felhasználók naplói title_friends: Ismerősök naplói title_nearby: Közeli felhasználók naplói @@ -387,6 +291,9 @@ hu: user_title: "%{user} naplója" editor: default: Alapértelmezett (jelenleg %{name}) + id: + description: iD (böngészőben futó szerkesztő) + name: iD potlatch: description: Potlatch 1 (böngészőn belüli szerkesztő) name: Potlatch 1 @@ -402,7 +309,7 @@ hu: area_to_export: Exportálandó terület embeddable_html: Beágyazható HTML export_button: Exportálás - export_details: Az OpenStreetMap adatokra a Creative Commons Nevezd meg!-Így add tovább! 2.0 licenc vonatkozik. + export_details: Az OpenStreetMap adatokra az Open Data Commons Open Database licenc vonatkozik. (ODbL) format: "Formátum:" format_to_export: Exportálás formátuma image_size: "Képméret:" @@ -418,29 +325,23 @@ hu: paste_html: Webhelyekbe való beágyazáshoz illeszd be a HTML kódot scale: Méretarány too_large: - body: Ez a terület túl nagy ahhoz, hogy exportálásra kerüljön OpenStreetMap XML adatként. Közelíts, vagy jelölj ki kisebb területet. - heading: Túl nagy terület + advice: Ha a fenti exportálás sikertelen lenne, próbáld meg az alábbi listából valamelyik lehetőséget. + body: Ez a terület túl nagy ahhoz, hogy exportálásra kerüljön OpenStreetMap XML adatként. Közelíts, vagy jelölj ki kisebb területet. Esetleg használd az alábbi listából valamelyik nagy adatmennyiségek letöltését támogató módszert. + other: + title: Más források + planet: + description: A teljes OpenStreetMap adatbázis rendszeresen frissített másolatai zoom: Nagyítási szint - start_rjs: - add_marker: Jelölő hozzáadása a térképhez - change_marker: Jelölő helyének módosítása - click_add_marker: Jelölő hozzáadásához kattints a térképre - drag_a_box: Terület kijelöléséhez rajzolj egy négyzetet a térképen - export: Exportálás - manually_select: Más terület kézi kijelölése - view_larger_map: Nagyobb térkép megtekintése + title: Exportálás geocoder: description: title: geonames: Helyek a GeoNamesről - osm_namefinder: "%{types} az OpenStreetMap Namefinderről" osm_nominatim: Helyek az OpenStreetMap Nominatimtól types: cities: Nagyvárosok places: Helyek towns: Városok - description_osm_namefinder: - prefix: "%{type}: %{distance}-re %{direction}" direction: east: keletre north: északra @@ -462,17 +363,20 @@ hu: ca_postcode: Eredmények a Geocoder.CA-ről geonames: Eredmények a GeoNamesről latlon: Eredmények az Internalról - osm_namefinder: Eredmények az OpenStreetMap Namefinderről osm_nominatim: Eredmények az OpenStreetMap Nominatimtól uk_postcode: Eredmények a NPEMap / FreeThe Postcode-ról us_postcode: Eredmények a Geocoder.us-ról - search_osm_namefinder: - prefix: "%{type}:" - suffix_parent: "%{suffix} (%{parentdistance}-re %{parentdirection} innen: %{parentname})" - suffix_place: " %{distance}-re %{direction} innen: %{placename}" - suffix_suburb: "%{suffix} (%{parentname})" search_osm_nominatim: + admin_levels: + level2: Országhatár + level4: Államhatár + level5: Régióhatár + level6: Megyehatár + level8: Városhatár prefix: + aerialway: + chair_lift: Libegő + drag_lift: Sífelvonó aeroway: aerodrome: Repülőtér apron: Forgalmi előtér @@ -522,6 +426,7 @@ hu: ferry_terminal: Kompkikötő fire_hydrant: Tűzcsap fire_station: Tűzoltóság + food_court: Ételudvar fountain: Szökőkút fuel: Benzinkút grave_yard: Kis temető @@ -565,6 +470,7 @@ hu: shower: Zuhanyzó social_centre: Szociális központ social_club: Társasági klub + social_facility: Szociális létesítmény studio: Stúdió supermarket: Szupermarket swimming_pool: Úszómedence @@ -593,6 +499,9 @@ hu: "yes": Híd building: "yes": Épület + emergency: + fire_hydrant: Tűzcsap + phone: Segélyhívó highway: bridleway: Lovaglóút bus_guideway: Buszsín @@ -614,6 +523,7 @@ hu: platform: Peron primary: Főút primary_link: Főút + proposed: Tervezett út raceway: Versenypálya residential: Lakóövezeti út rest_area: Pihenési terület @@ -625,6 +535,7 @@ hu: speed_camera: Sebességmérő kamera steps: Lépcső stile: Lépcsős átjáró + street_lamp: Utcai lámpa tertiary: Bekötőút tertiary_link: Bekötőút track: Földút @@ -640,6 +551,7 @@ hu: building: Épület castle: Vár church: Templom + citywalls: Városfal fort: Erőd house: Ház icon: Ikon @@ -649,6 +561,7 @@ hu: monument: Műemlék museum: Múzeum ruins: Rom + tomb: Sírkő tower: Torony wayside_cross: Útszéli kereszt wayside_shrine: Útszéli kegyhely @@ -690,6 +603,7 @@ hu: wood: Erdő leisure: beach_resort: Tengerparti üdülőhely + bird_hide: Madárles common: Közös terület fishing: Horgászterület fitness_station: Fitneszterem @@ -714,6 +628,8 @@ hu: airfield: Katonai repülőtér barracks: Laktanya bunker: Bunker + mountain_pass: + "yes": Hegyszoros natural: bay: Öböl beach: Part @@ -808,6 +724,7 @@ hu: narrow_gauge: Keskeny nyomközű vasút platform: Vasúti peron preserved: Megőrzött vasút + proposed: Tervezett vasút spur: Vasúti szárnyvonal station: Vasútállomás subway: Metróállomás @@ -825,6 +742,7 @@ hu: beverages: Italbolt bicycle: Kerékpárbolt books: Könyvesbolt + boutique: Butik butcher: Hentesbolt car: Autókereskedés car_parts: Autóalkatrészbolt @@ -838,6 +756,7 @@ hu: convenience: Kisbolt copyshop: Fénymásoló bolt cosmetics: Kozmetikai bolt + deli: Delikátesz department_store: Áruház discount: Diszkontárubolt doityourself: Barkácsbolt @@ -874,17 +793,21 @@ hu: organic: Bioélelmiszerbolt outdoor: Túrabolt pet: Állatkereskedés + pharmacy: Gyógyszertár photo: Fotóbolt salon: Szalon + second_hand: Használtcikk kereskedés shoes: Cipőbolt shopping_centre: Bevásárlóközpont sports: Sportbolt stationery: Írószerbolt supermarket: Szupermarket + tailor: Szabó toys: Játékbolt travel_agency: Utazási iroda video: Videókölcsönző wine: Borárusító italbolt + "yes": Bolt tourism: alpine_hut: Alpesi kunyhó artwork: Műalkotás @@ -907,6 +830,7 @@ hu: viewpoint: Kilátó zoo: Állatkert tunnel: + culvert: Áteresz "yes": Alagút waterway: artificial: Mesterséges víziút @@ -937,55 +861,43 @@ hu: mapquest: MapQuest Open standard: Alapértelmezett transport_map: Tömegközlekedési térkép + notes: + new: + intro: A térkép tökéletesítésének érdekében az alábbi jegyzetedet minden térképező látni fogja ezért fogalmazz olyan érthetően amennyire lehetséges, a lehető legpontosabban helyezd el a jelölőt. + show: + anonymous_warning: Ez a jegyzet anonim felhasználók megjegyzéseit is tartalmazza melyeket ellenőrizni szükséges. site: + createnote_disabled_tooltip: Nagyíts térképes jegyzet hozzáadásához + createnote_tooltip: Jegyzet hozzáadása a térképhez edit_disabled_tooltip: Közelíts a térkép szerkesztéséhez edit_tooltip: Térkép szerkesztése - edit_zoom_alert: Közelítened kell a térkép szerkesztéséhez - history_disabled_tooltip: Közelíts ahhoz, hogy lásd a szerkesztéseket ezen a területen. - history_tooltip: Szerkesztések megtekintése ezen a területen - history_zoom_alert: Közelítened kell a szerkesztési előzmények megtekintéséhez layouts: + about: Névjegy community: Közösség community_blogs: Közösségi blogok community_blogs_title: Blogok az OpenStreetMap közösség tagjaitól copyright: Szerzői jog és licenc - documentation: Dokumentáció - documentation_title: Dokumentáció a projekthez + data: Adatok donate: Támogasd az OpenStreetMapot a Hardverfrissítési Alapba történő %{link}sal. - donate_link_text: adományozás edit: Szerkesztés edit_with: "Szerkesztés a következővel: %{editor}" export: Exportálás - export_tooltip: Térképadatok exportálása + export_data: Adatok exportálása foundation: Alapítvány foundation_title: Az „OpenStreetMap Foundation” gps_traces: Nyomvonalak gps_traces_tooltip: GPS nyomvonalak kezelése help: Súgó - help_centre: Súgóközpont - help_title: A projekt sugóoldala history: Előzmények home: otthon - home_tooltip: Ugrás otthonra - inbox: postaláda (%{count}) - inbox_tooltip: - one: A postaláda 1 olvasatlan üzenetet tartalmaz - other: A postaláda %{count} olvasatlan üzenetet tartalmaz - zero: A postaláda nem tartalmaz olvasatlan üzenetet - intro_1: Az OpenStreetMap egy szabadon szerkeszthető térkép az egész világról. Olyan emberek készítik, mint Te. intro_2_create_account: Felhasználói fiók létrehozása - intro_2_download: letöltés - intro_2_html: Az adatok %{download} és%{use} ingyenes és korlátozásoktól mentes. Hozzon létre %{create_account} a térképek szerkesztéséhez. - intro_2_license: open license - intro_2_use: használata - license: - title: Az OpenStreetMap adatokra a Creative Commons Nevezd meg!-Így add tovább! 2.0 Általános Licenc vonatkozik + intro_header: Üdvözöljük az OpenStreetMap-en! + learn_more: További info log_in: bejelentkezés log_in_tooltip: Bejelentkezés egy meglévő felhasználói fiókkal logo: alt_text: OpenStreetMap logó logout: kijelentkezés - logout_tooltip: Kijelentkezés make_a_donation: text: Adományozz title: Támogasd az OpenStreetMapot pénzadománnyal @@ -998,22 +910,44 @@ hu: partners_ucl: az UCL VR központ sign_up: regisztráció sign_up_tooltip: Új felhasználói fiók létrehozása szerkesztéshez - sotm2011: Gyere a 2011-es OpenStreetMap Konferenciára, a The State of the Mapra, szeptember 9-11. között Denverbe! + start_mapping: Térképezés indítása tag_line: A szabad világtérkép user_diaries: Naplók user_diaries_tooltip: Felhasználói naplók megtekintése - view: Térkép - view_tooltip: Térkép megjelenítése - welcome_user: Üdvözlünk %{user_link} - welcome_user_link_tooltip: Felhasználói oldalad - wiki: wiki - wiki_title: A projekt wiki oldala license_page: foreign: english_link: az eredeti angol nyelvű text: Abban az esetben, ha ez a lefordított oldal és %{english_original_link} eltér egymástól, akkor az angol nyelvű oldal élvez elsőbbséget title: Erről a fordításról - legal_babble: "

    Szerzői jog és licenc

    \n

    \n Az OpenStreetMap egy szabad adathalmaz, amelyre a Creative\n Commons Nevezd meg! - Így add tovább! 2.0 licenc (CC BY-SA) vonatkozik.\n

    \n

    \n Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod térképünket\n és adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és\n közreműködőit. Ha módosítod vagy felhasználod térképünket vagy adatainkat, akkor\n az eredményt is csak azonos licenccel terjesztheted. A\n teljes jogi\n szöveg ismerteti a jogaidat és kötelezettségeidet.\n

    \n\n

    Hogyan kell feltüntetned az OpenStreetMapot?

    \n

    \n Ha az OpenStreetMap térkép képeit használod, kérünk, hogy\n legyen feltüntetve legalább az “© OpenStreetMap\n közreműködői, CC BY-SA” szöveg. Ha csak a térkép adatait használod,\n akkor a “Térképadatok © OpenStreetMap közreműködői,\n CC BY-SA” feltüntetését kérjük.\n

    \n

    \n Ahol lehetséges, ott az OpenStreetMapnak hiperhivatkoznia kell a http://www.openstreetmap.org/,\n a CC BY-SA-nak pedig a http://creativecommons.org/licenses/by-sa/2.0/ webhelyre. Ha\n olyan médiumot használsz, ahol a hivatkozás nem lehetséges (pl. egy\n nyomtatott munka), javasoljuk, hogy irányítsd az olvasóidat a\n www.openstreetmap.org (esetleg az\n ‘OpenStreetMap’ szöveg kibővítésével erre a teljes címre) és a\n www.creativecommons.org webhelyre.\n

    \n\n

    Tudj meg többet!

    \n

    \n További információ adataink használatáról a Jogi\n GYIK-ben.\n

    \n

    \n Az OSM közreműködői emlékeztetve lettek arra, hogy soha ne adjanak hozzá adatokat egyetlen\n szerzői jogvédett forrásból (pl. Google Térkép vagy nyomtatott térképek) se a\n szerzői jog tulajdonosának kifejezett engedélye nélkül.\n

    \n

    \n Bár az OpenStreetMap szabad adathalmaz, nem tudunk biztosítani\n ingyenes térkép API-t külső fejlesztőknek.\n\n Lásd a API-használati irányelveket,\n a Csempehasználati irányelveket\n és a Nominatim használati irányelveit.\n

    \n\n

    Közreműködőink

    \n

    \n A CC BY-SA licencünk előírja, hogy “az eredeti szerzőt\n a médiumnak vagy a használt eszköznek megfelelően fel kell\n tüntetni”. Az egyéni térképszerkesztők nem kérik\n feltüntetésüket az “OpenStreetMap közreműködői” szövegen\n felül, de ahol az OpenStreetMap nemzeti térképészeti\n ügynökségtől vagy más jelentős forrásból származó adatokat tartalmaz,\n ott ésszerű lehet feltüntetni azokat közvetlenül,\n vagy hivatkozva erre az oldalra.\n

    \n\n\n\n
      \n
    • Ausztrália: tartalmaz külvárosi adatokat az\n Ausztrál Statisztikai Hivatal adatain alapulva.
    • \n
    • Ausztria: adatokat tartalmaz a következő forrásból:\n Stadt Wien\n CC BY licenc alatt.
    • \n
    • Kanada: adatokat tartalmaz a következő forrásokból:\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada).
    • \n
    • France: adatokat tartalmaz a következő forrásból:\n Direction Générale des Impôts.
    • \n
    • Új-Zéland: adatokat tartalmaz a következő forrásból:\n Land Information New Zealand. Szerzői jog fenntartva.
    • \n
    • Lengyelország: adatokat tartalmaz a következő forrásból: UMP-pcPL maps. Copyright\n UMP-pcPL közreműködői.
    • \n
    • Egyesült Királyság: tartalmaz Ordnance\n Survey adatokat © Szerzői és adatbázisjog\n 2010.
    • \n
    \n\n

    \n Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti\n adatszolgáltató támogatja az OpenStreetMapot, nyújt garanciát vagy\n vállal rá felelősséget.\n

    " + legal_babble: + attribution_example: + alt: Példa arra, hogyan jelenjen meg az OpenStreetMap-re való hivatkozás egy weboldalon + title: Példa egy hivatkozásra + contributors_at_html: "Ausztria: adatokat tartalmaz a következő forrásból:\n Bécs városa\n CC BY licenc alatt." + contributors_ca_html: "Kanada: adatokat tartalmaz a következő forrásokból:\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: "További részletekért, és az OpenStreetMap javításához használt más forrásokról,\nkérjük, olvassa el a hozzájárulók oldalát\naz OpenStreetMap wikin." + contributors_footer_2_html: " Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti\n adatszolgáltató támogatja az OpenStreetMapot, nyújt garanciát vagy\n vállal rá felelősséget." + contributors_fr_html: "France: adatokat tartalmaz a következő forrásból:\n Direction Générale des Impôts." + contributors_gb_html: "Egyesült Királyság: Térképészeti Szolgálat adatokat © Királyi szerzői és adatbázisjog \n2010 - 12." + contributors_intro_html: "Többszáz egyéni közreműködőnk van. További, szabadon elérhető adatokat is felhasználunk nemzeti térkép intézetektől és más forrásokból, többek között:" + contributors_nl_html: "Hollandia: adatokat tartalmaz innen: Automotive Navigation Data, 2007\n(www.and.com)" + contributors_nz_html: "Új-Zéland: adatokat tartalmaz a következő forrásból:\n Land Information New Zealand. Szerzői jog fenntartva." + contributors_title_html: Közreműködőink + contributors_za_html: "Dél-Afrika: tartalmaz olyan adatokat, amik a\nChief Directorate:\nNational Geo-Spatial Information-tól származnak, az állami szerzői jogok fenntartva." + credit_1_html: " Ha az OpenStreetMap térkép képeit használod, kérjük \n legyen feltüntetve legalább az “© OpenStreetMap\n közreműködői, CC BY-SA” szöveg. Ha csak a térkép adatait használod,\n akkor a “Térképadatok © OpenStreetMap közreműködői,\n CC BY-SA” feltüntetését kérjük." + credit_2_html: Azt is egyértelművé kell tenned, hogy az adatok az Open Database Licenc alatt elérhetőek, illetve ha a mi térkép csempéinket használod akkor azt, hogy a grafikai megjelenítés a CC-BY-SA licenc feltételeivel használható. Ezt megteheted egy erre a copyright oldalra való hivatkozással. Alternatívaként, ha az OSM-et adatokként terjeszted, akkor fel kell tüntetned a nevet és linket közvetlenül a licencre. Ha a formátum a linkelést nem teszi lehetővé (pl. nyomtatásban), javasoljuk, hogy a felhasználókat irányítsd az openstreetmap.org címre (esetlegesen az "OpenStreetMap" szót kiegészítve erre a teljes címre), és az opendatacommons.org címre, illetve - ha szükséges - a creativecommons.org címre. + credit_3_html: "Böngészhető elektronikus térkép esetén a forrásra vonatkozó hivatkozás jelenjen meg a térkép sarkában.\nPéldául:" + credit_title_html: Hogyan kell feltüntetned az OpenStreetMapot? + infringement_1_html: " Az OSM közreműködői emlékeztetve lettek arra, hogy soha ne adjanak hozzá adatokat egyetlen\n szerzői jogvédett forrásból se (pl. Google Térkép vagy nyomtatott térképek) a\n szerzői jog tulajdonosának kifejezett engedélye nélkül." + infringement_2_html: "Ha úgy gondolod, hogy jogvédett anyag került jogszerűtlenül az OpenStreetMap adatbázisba vagy erre a weblapra, kérjük olvasd el az eltávolítási\nfolyamat leírását vagy jelentsd be közvetlenül az\nonline bejelentő oldalon." + infringement_title_html: Copyright megsértése + intro_1_html: " Az OpenStreetMap egy szabad adathalmaz, amelyre az Open Data\nCommons Open Database License licenc (ODbL) vonatkozik." + intro_2_html: " Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és közreműködőit. Ha módosítod vagy felhasználod az adatainkat, akkor az eredményt is csak azonos licenccel terjesztheted. A teljes jogi\n szabályzat ismerteti a jogaidat és kötelezettségeidet." + intro_3_html: " Az OpenStreetMap térképeire a Creative\n Commons Nevezd meg! - Így add tovább! 2.0 licenc (CC BY-SA) vonatkozik." + more_1_html: "További információ adataink használatáról a Jogi\n GYIK-ban." + more_2_html: "Habár az OpenStreetMap egy nyílt adatforrás, nem tudunk ingyenes térkép API elérést biztosítani külső fejlesztőknek.\n\nLásd az API Felhasználási Irányelveinket, a Csempe Felhasználási Irányelveinket és a Nominatim Felhasználási Irányelveinket." + more_title_html: Tudj meg többet! + title_html: Szerzői jog és licenc native: mapping_link: kezdheted a térképezést native_link: magyar nyelvű változatára @@ -1073,12 +1007,9 @@ hu: title: Elküldött üzenetek to: Címzett read: - back_to_inbox: Vissza a beérkezett üzenetekhez - back_to_outbox: Vissza az elküldött üzenetekhez + back: Vissza date: Érkezett from: Feladó - reading_your_messages: Üzenetek olvasása - reading_your_sent_messages: Elküldött üzenetek olvasása reply_button: Válasz subject: Tárgy title: Üzenet olvasása @@ -1089,6 +1020,21 @@ hu: wrong_user: „%{user}” néven jelentkeztél be, de a levelet, amit lekérdeztél válaszolásra, nem ez a felhasználó kapta. Annak érdekében, hogy válaszolhass, jelentkezz be a helyes felhasználóval. sent_message_summary: delete_button: Törlés + note: + description: + closed_at_by_html: "Megoldva: %{when} (%{user})" + closed_at_html: "Megoldva: %{when}" + commented_at_html: "Frissítve: %{when}" + opened_at_html: Létrehozva %{when} + reopened_at_html: "Újra aktiválva: %{when}" + entry: + full: Teljes jegyzet + mine: + ago_html: "%{when}" + heading: "%{user} jegyzetei" + rss: + description_item: RSS hírcsatorna a %{id} jegyzethez + title: OpenStreetMap jegyzetek notifier: diary_comment_notification: footer: "A hozzászólást elolvashatod itt is: %{readurl} és hozzászólhatsz itt: %{commenturl} vagy válaszolhatsz rá itt: %{replyurl}" @@ -1104,8 +1050,7 @@ hu: email_confirm_plain: click_the_link: Ha ez Te vagy, akkor a módosítás megerősítéséhez kattints az alábbi hivatkozásra. greeting: Szia! - hopefully_you_1: "Valaki (remélhetőleg Te) meg szeretné változtatni az e-mail címét erről:" - hopefully_you_2: "%{server_url} erre: %{new_address}." + hopefully_you: "Valaki (remélhetőleg te) szeretné megváltoztatni az e-mail címét a %{server_url} címen, erre: %{new_address}." friend_notification: befriend_them: "Felveheted őt barátnak is itt: %{befriendurl}." had_added_you: "%{user} felvett a barátai közé az OpenStreetMapon." @@ -1134,45 +1079,36 @@ hu: lost_password_plain: click_the_link: Ha ez Te vagy, akkor a jelszó alaphelyzetbe állításához kattints az alábbi hivatkozásra. greeting: Szia! - hopefully_you_1: Valaki (esetleg Te) kérte, hogy az ehhez az e-mail címhez tartozó - hopefully_you_2: openstreetmap.org felhasználói fiók jelszava kerüljön alaphelyzetbe. + 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. message_notification: - footer1: "Az üzenetet elolvashatod itt is: %{readurl}" - footer2: "és válaszolhatsz rá itt: %{replyurl}" + footer_html: "Az üzenet a %{readurl} címen is elolvashatod, vagy válaszolhatsz rá itt: %{replyurl}" header: "%{from_user} küldött neked egy üzenetet az OpenStreetMapon keresztül %{subject} tárggyal:" hi: Szia %{to_user}! - signup_confirm: - subject: "[OpenStreetMap] E-mail cím megerősítése" - signup_confirm_html: - ask_questions: Ha bármilyen kérdésed merülne fel az OpenStreetMappal kapcsolatban, felteheted azt a mi kérdés és válasz oldalunkon. - click_the_link: Ha ez Te vagy, üdvözlünk! Kattints az alábbi hivatkozásra a felhasználói fiókod megerősítéséhez és további információk olvasásához az OpenStreetMapról. - current_user: "A jelenlegi felhasználók listája kategóriákban, annak megfelelően, hogy hol vannak a világban, elérhető innen: Category:Users_by_geographical_region." - get_reading: Olvass az OpenStreetMapról a wikiben, kövesd a legfrissebb híreket az OpenStreetMap blogon vagy Twitteren, vagy böngészd az OpenStreetMap alapító Steve Coast OpenGeoData blogját a projekt történetéről, amin vannak hallgatható podcastok is! + note_comment_notification: + anonymous: Egy névtelen felhasználó + closed: + commented_note: "%{commenter} megoldotta az egyik jegyzetet amelyhez hozzászóltál, %{place} közelében." + subject_other: "[OpenStreetMap] %{commenter} megoldotta az egyik jegyzetet, amelyet te is figyelsz" + subject_own: "[OpenStreetMap] %{commenter} megoldotta az egyik jegyztetedet" + your_note: "[OpenStreetMap] %{commenter} megoldotta az egyik jegyzetedet %{place} közelében." + commented: + commented_note: "%{commenter} hozzászólt az egyik jegyzethez, amelyhez te is, %{place} közelében." + subject_other: "[OpenStreetMap] %{commenter} hozzászólt az egyik jegyzethez, amelyet te is figyelsz" + subject_own: "[OpenStreetMap] %{commenter} hozzászólt az egyik jegyzetedhez" + your_note: "%{commenter} hozzászólt az egyik jegyzetedhez, %{place} közelében." + details: "A jegyzetről további információk: %{url}." greeting: Szia! - hopefully_you: "Valaki (remélhetőleg Te) készítene egy felhasználói fiókot itt:" - introductory_video: Megnézhetsz egy %{introductory_video_link}. - more_videos: "%{more_videos_link}." - more_videos_here: További videók itt - user_wiki_page: Ajánlott, hogy készíts egy wiki oldalt, ami tartalmaz kategóriacímkéket annak megfelelően, ahol vagy. Például [[Category:Users_in_Budapest]]. - video_to_openstreetmap: bevezető videót az OpenStreetMaphoz - wiki_signup: Szintén regisztrálhatsz az OpenStreetMap wikibe. - signup_confirm_plain: - ask_questions: "Ha bármilyen kérdésed merülne fel az OpenStreetMappal kapcsolatban, felteheted azt a mi kérdés és válasz oldalunkon:" - blog_and_twitter: "Kövesd a legfrissebb híreket az OpenStreetMap blogon vagy Twitteren:" - click_the_link_1: Ha ez Te vagy, üdvözlünk! Kattints az alábbi hivatkozásra a felhasználói - click_the_link_2: fiókod megerősítéséhez és további információk olvasásához az OpenStreetMapról. - current_user_1: A jelenlegi felhasználók listája kategóriákban, annak megfelelően, - current_user_2: "hogy hol vannak a világban, elérhető innen:" + reopened: + commented_note: "[OpenStreetMap] %{commenter} újra megnyitotta az egyik jegyzetet amelyhez te is hozzászóltál, %{place} közelében." + subject_other: "[OpenStreetMap] %{commenter} újra megnyitotta az egyik jegyzetet, amelyet te is figyelsz" + subject_own: "[OpenStreetMap] %{commenter} újra megnyitotta az egyik jegyzetedet" + your_note: "[OpenStreetMap] %{commenter} újra megnyitotta az egyik jegyzetedet %{place} közelében." + signup_confirm: + confirm: "Mielőtt folytathatnánk, meg kell bizonyosodnunk arról, hogy ez a kérés tőled származik. Ha igen, akkor kérjük, kattints az alábbi linkre a regisztrációd jóváhagyásárért:" + created: Valaki (remélhetőleg te) most hozott létre egy fiókot az %{site_url}-on. greeting: Szia! - hopefully_you: "Valaki (remélhetőleg Te) készítene egy felhasználói fiókot itt:" - introductory_video: "Megnézhetsz egy bevezető videót az OpenStreetMaphez itt:" - more_videos: "További videókat találsz itt:" - opengeodata: "Az OpenGeoData.org az OpenStreetMap alapító Steve Coast blogja, és vannak podcastjai is:" - the_wiki: "Olvass az OpenStreetMapról a wikiben:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide - user_wiki_1: Ajánlott, hogy készíts egy wiki oldalt, ami tartalmaz kategóriacímkéket - user_wiki_2: annak megfelelően, ahol vagy. Például [[Category:Users_in_Budapest]]. - wiki_signup: "Szintén regisztrálhatsz az OpenStreetMap wikibe itt:" + subject: "[OpenStreetMap] Üdvözlünk az OpenStreetMapnál" + welcome: Miután jóváhagytad a regisztrációt, további hasznos információkat olvashatsz az elinduláshoz. oauth: oauthorize: allow_read_gpx: magán GPS nyomvonalak olvasása. @@ -1181,6 +1117,7 @@ hu: allow_write_api: a térkép módosítása. allow_write_diary: naplóbejegyzések, hozzászólások készítése és barátok hozzáadása. allow_write_gpx: GPS nyomvonalak feltöltése. + allow_write_notes: jegyzet módosítása allow_write_prefs: felhasználói beállítások módosítása. request_access: A(z) %{app_name} alkalmazás hozzáférést kér a felhasználói fiókodhoz, %{user}. Kérlek, jelöld, ha azt szeretnéd, hogy az alkalmazás rendelkezzen a következő képességekkel. Választhatsz olyan sokat vagy keveset, amennyit szeretnél. revoke: @@ -1199,6 +1136,7 @@ hu: allow_write_api: a térkép módosítása. allow_write_diary: naplóbejegyzések, hozzászólások készítése és barátok hozzáadása. allow_write_gpx: GPS nyomvonalak feltöltése. + allow_write_notes: jegyzetek módosítása. allow_write_prefs: felhasználó beállításainak módosítása. callback_url: Visszahívási URL name: Név @@ -1229,6 +1167,7 @@ hu: allow_write_api: a térkép módosítása. allow_write_diary: naplóbejegyzések, hozzászólások készítése és barátok hozzáadása. allow_write_gpx: GPS nyomvonalak feltöltése. + allow_write_notes: jegyzet módosítása. allow_write_prefs: felhasználó beállításainak módosítása. authorize_url: "Felhatalmazási URL:" confirm: Biztos vagy benne? @@ -1237,14 +1176,11 @@ hu: key: "Fogyasztói kulcs:" requests: "A következő engedélyek kérése a felhasználótól:" secret: "Fogyasztói titok:" - support_notice: Támogatjuk a HMAC-SHA1 hitelesítést (ajánlott), valamint a sima szöveget ssl módban. + support_notice: Támogatjuk a HMAC-SHA1 (ajánlott) és az RSA-SHA1 hitelesítést. title: "%{app_name} OAuth részletei" url: "Utalványkérési URL:" update: flash: A kliens információi sikeresen frissítve - printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" redaction: edit: description: Leírás @@ -1252,6 +1188,7 @@ hu: description: Leírás show: confirm: Biztos vagy benne? + description: "Leírás:" user: "Készítő:" update: flash: Változtatások elmentve. @@ -1259,6 +1196,7 @@ hu: edit: anon_edits_link_text: Nézz utána, miért van ez. flash_player_required: 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. + 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. not_public: Nem állítottad a szerkesztéseidet nyilvánossá. not_public_description: Nem szerkesztheted tovább a térképet, amíg nem teszed meg. Nyilvánossá teheted szerkesztéseidet a %{user_page}adról. @@ -1267,20 +1205,15 @@ hu: 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.) user_page_link: felhasználói oldal index: + createnote: Új jegyzet js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet, vagy letiltottad a JavaScriptet. js_2: Az OpenStreetMap JavaScriptet használ a slippy maphoz. license: - license_name: Creative Commons Nevezd meg!-Így add tovább! 2.0 - license_url: http://creativecommons.org/licenses/by-sa/2.0/deed.hu - notice: "%{license_name} licenc alatt az %{project_name} és hozzájárulói által." - project_name: OpenStreetMap projekt - project_url: http://openstreetmap.org + copyright: Copyright OpenStreetMap és közreműködői, egy nyílt licenc alatt permalink: Permalink remote_failed: A szerkesztés nem sikerült. Győződj meg róla, hogy a JOSM vagy a Merkaartor be van töltve, és a távirányító opció engedélyezve van shortlink: Shortlink key: - map_key: Jelmagyarázat - map_key_tooltip: Jelmagyarázat a térképhez table: entry: admin: Közigazgatási határ @@ -1366,7 +1299,6 @@ hu: preview: Előnézet search: search: Keresés - search_help: "példák: 'Szeged', 'Piac utca, Debrecen', 'CB2 5AQ' vagy 'post offices near Kaposvár' további példák..." submit_text: Menj where_am_i: Hol vagyok? where_am_i_title: A jelenlegi helyszín leírása a keresőmotor segítségével @@ -1400,6 +1332,8 @@ hu: visibility: "Láthatóság:" visibility_help: Mit jelent ez? list: + description: Legfrissebb GPS nyomvonalak tallózása + empty_html: Még nincs mit megjeleníteni. Tölts fel új nyomvonalat, vagy olvass bővebben a GPS nyomvonalrögzítésről a wiki lapon. public_traces: Nyilvános GPS nyomvonalak public_traces_from: "%{user} nyilvános GPS nyomvonalai" tagged_with: " %{tags} címkével" @@ -1418,7 +1352,7 @@ hu: edit: szerkesztés edit_map: Térkép szerkesztése identifiable: AZONOSÍTHATÓ - in: "itt:" + in: "címkék:" map: térkép more: tovább pending: FÜGGŐBEN @@ -1444,8 +1378,8 @@ hu: trace_optionals: tags: Címkék trace_paging_nav: - next: Következő » - previous: « Előző + newer: Újabb nyomvonalak + older: Régebbi nyomvonalak showing_page: "Jelenlegi oldal: %{page}" view: delete_track: Ezen nyomvonal törlése @@ -1485,6 +1419,9 @@ hu: email never displayed publicly: (soha nem jelenik meg nyilvánosan) flash update success: Felhasználói információk sikeresen frissítve. flash update success confirm needed: Felhasználói információk sikeresen frissítve. Nézd meg az e-mailjeidet az új e-mail címedet megerősítő levélhez. + gravatar: + gravatar: Gravatar használata + link text: mi ez? home location: "Otthon:" image: "Kép:" image size hint: (legalább 100x100 pixel nagyságú négyzetes kép javasolt) @@ -1520,13 +1457,13 @@ hu: update home location on click: Otthon helyének frissítése, amikor a térképre kattintok? confirm: already active: Ez a fiók már megerősítésre került. - before you start: Tudjuk, hogy valószínűleg sietve kezdenél térképezni, de mielőtt ezt megtennéd, - ha úgy gondolod - megadhatsz magadról néhány további információt az alábbi űrlapon. button: Megerősítés - heading: Felhasználói fiók megerősítése + heading: Nézd meg az e-mailjeidet! + introduction_1: Jóváhagyó e-mailt küldtünk a címedre. + introduction_2: Erősítsd meg a regisztrációt a levélben található linkre kattintva és máris kezdheted a térképezést. press confirm button: Felhasználói fiókod megerősítéséhez nyomd meg az alábbi megerősítés gombot. - reconfirm: Ha már eltelt némi idő azóta, amióta regisztráltál, akkor szükséged lehet arra, hogy küldj magadnak egy új megerősítő emailt. - success: Felhasználói fiókod megerősítve, köszönjük a regisztrációt! - unknown token: Ez az utalvány úgy tűnik, nem létezik. + reconfirm_html: A jóváhagyó link újraküldéséhez kattints ide. + unknown token: Ez a megerősítési kód lejárt vagy nem létezik. confirm_email: button: Megerősítés failure: Egy e-mail cím már megerősítésre került ezzel az utalvánnyal. @@ -1562,8 +1499,6 @@ hu: lost password link: Elfelejtetted a jelszavad? new to osm: Új vagy az OpenStreetMapnál? no account: Nem rendelkezel még felhasználói fiókkal? - notice: Tudj meg többet az OpenStreetMap közelgő licencváltozásáról (fordítások) (vita) - notice_terms: Az OpenStreetMap 2012. április 1-jén új licencre vált. Ez pont olyan szabad lesz, mint a jelenlegi licencünk, de a jogi részek sokkal jobban illeszkednek a mi térképi adatbázisunkhoz. Mi szeretnénk, ha megtartanád hozzájárulásaidat az OpenStreetMapban, de ez csak akkor lehetséges, ha beleegyezel abba, hogy hozzájárulásaidat az új licenc alatt terjesszük. Különben el kell távolítanunk azokat az adatbázisból.

    Kérünk, jelenkezz be, majd szánj néhány percet az új feltételek áttekintésére és elfogadására. Köszönjük! openid: "%{logo} OpenID:" openid invalid: Sajnos úgy tűnik, hogy az OpenID azonosítód hibás openid missing provider: Sajnos nem sikerült kapcsolódni az OpenID szolgáltatódhoz @@ -1608,19 +1543,21 @@ hu: title: Elvesztett jelszó make_friend: already_a_friend: "%{name} már a barátod." + button: Ismerősnek jelölöm failed: Sajnáljuk, sikertelen volt %{name} felvétele barátnak. + heading: "%{user} felhasználó hozzáadása barátként?" success: "%{name} mostantól a barátod." new: + about: + header: Szabad és szerkeszthető + html: "

    Ellentétben más térképekkel, az OpenStreetMapet teljes mértékben hozzád hasonló emberek készítik és bárki szabadon javíthatja, frissítheti, letöltheti vagy felhasználhatja.

    \n

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

    " confirm email address: "E-mail cím megerősítése:" confirm password: "Jelszó megerősítése:" contact_webmaster: Kérlek fordulj a webmesterhez (angolul), hogy lehetővé tegye felhasználói fiók létrehozását - mi igyekszünk olyan gyorsan foglalkozni a kéréssel, amilyen gyorsan csak lehet. - continue: Folytatás + continue: Regisztráció display name: "Megjelenítendő név:" display name description: A nyilvánosan megjelenített felhasználóneved. A beállításaidban később megváltoztathatod. email address: "E-mail cím:" - fill_form: Töltsd ki az űrlapot, és küldünk neked egy gyors e-mailt felhasználói fiókod aktiválásához. - flash create success message: Köszönjük, hogy regisztráltál. Küldtünk egy megerősítő üzenetet a(z) %{email} címre, és amint megerősíted a felhasználói fiókodat, hozzákezdhetsz a térképezéshez.

    Ha használsz olyan antispam rendszert, amely megerősítési kérelmeket küld, akkor győződj meg róla, hogy engedélylistára tetted a webmaster@openstreetmap.org címet, mivel nem tudunk válaszolni megerősítési kérelmekre. - heading: Felhasználói fiók létrehozása license_agreement: Amikor megerősíted a felhasználói fiókodat, el kell fogadnod a hozzájárulási feltételeket. no_auto_account_create: Sajnos jelenleg nem tudunk neked létrehozni automatikusan egy felhasználói fiókot. not displayed publicly: Nem jelenik meg nyilvánosan (lásd adatvédelmi irányelvek) @@ -1641,6 +1578,8 @@ hu: nearby mapper: Közeli térképszerkesztő your location: Helyed remove_friend: + button: barát eltávolítása + heading: "%{user} felhasználó eltávolítása a barátaid közül?" not_a_friend: "%{name} nem tartozik a barátaid közé." success: "%{name} eltávolítva a barátaid közül." reset_password: @@ -1675,48 +1614,50 @@ hu: you need to accept or decline: Kérünk, hogy olvasd el, ezután fogadd vagy utasítsd el az új hozzájárulási feltételeket a folytatáshoz. view: activate_user: felhasználó aktiválása - add as friend: felvétel barátnak + add as friend: Felvétel barátnak ago: (%{time_in_words_ago} óta) block_history: kapott blokkolások megjelenítése - blocks by me: általam kiosztott blokkolások - blocks on me: saját blokkolásaim + blocks by me: Általam kiosztott blokkolások + blocks on me: Saját blokkolásaim comments: Megjegyzések confirm: Megerősítés confirm_user: felhasználó megerősítése create_block: ezen felhasználó blokkolása created from: "Készítve innen:" - ct accepted: Elfogadva %{ago} óta + ct accepted: "Elfogadva: %{ago} óta" ct declined: Elutasítva ct status: "Hozzájárulási feltételek:" ct undecided: Nem eldöntött deactivate_user: felhasználó deaktiválása delete_user: ezen felhasználó törlése description: Leírás - diary: napló - edits: szerkesztések + diary: Napló + edits: Szerkesztések email address: "E-mail cím:" friends_changesets: Ismerőseid módosításcsomagjainak tallózása friends_diaries: A barátok által írt naplóbejegyzések böngészése hide_user: ezen felhasználó elrejtése - if set location: Ha beállítod a helyedet, egy szép térkép fog megjelenni alább. Az otthonodat a %{settings_link}nál állíthatod be. + if set location: Ha beállítod a lakhelyedet a %{settings_link} oldalon, megnézheted a hozzád közeli felhasználókat. km away: "%{count} km-re innen" latest edit: "Utolsó szerkesztés %{ago}:" m away: "%{count} m-re innen" mapper since: "Térképszerkesztő ezóta:" moderator_history: kiosztott blokkolások megjelenítése my comments: Saját megjegyzések - my diary: naplóm - my edits: szerkesztéseim - my settings: beállításaim - my traces: saját nyomvonalak + my diary: Naplóm + my edits: Szerkesztéseim + my notes: Saját jegyzeteim + my settings: Beállításaim + my traces: Saját nyomvonalak nearby users: Egyéb közeli felhasználók nearby_changesets: A közeli felhasználók módosításainak böngészése nearby_diaries: A közeli felhasználók naplóbejegyzéseinek böngészése new diary entry: új naplóbejegyzés no friends: Még nem adtál meg egyetlen barátot sem. no nearby users: Még nincsenek más felhasználók, akik megadták, hogy a közelben szerkesztenek. + notes: Térkép jegyzetek oauth settings: oauth beállítások - remove as friend: barát eltávolítása + remove as friend: Barát eltávolítása role: administrator: Ez a felhasználó adminisztrátor grant: @@ -1726,11 +1667,11 @@ hu: revoke: administrator: Adminisztrátori hozzáférés visszavonása moderator: Moderátori hozzáférés viszzavonása - send message: üzenet küldése + send message: Üzenet küldése settings_link_text: beállítások spam score: "Spam pontszám:" status: "Állapot:" - traces: nyomvonalak + traces: Nyomvonalak unhide_user: felhasználó elrejtésének megszüntetése user location: Felhasználó helye your friends: Barátaid @@ -1788,15 +1729,18 @@ hu: creator_name: Készítő display_name: Blokkolt felhasználó edit: Szerkesztés + next: Következő » not_revoked: (nincs visszavonva) + previous: « Előző reason: Blokkolás indoklása revoke: Visszavonás! revoker_name: "Visszavonta:" show: Megjelenítés + showing_page: "Jelenlegi oldal: %{page}" status: Állapot period: - one: 1 óra - other: "%{count} óra" + one: 1 órája + other: "%{count} órája" revoke: confirm: Biztosan vissza szeretnéd vonni ezt a blokkolást? flash: Ez a blokkolás vissza lett vonva. @@ -1840,3 +1784,25 @@ hu: fail: A '%{role}' szerep nem vonható vissza '%{name}' felhasználótól. Kérlek ellenőrizd, hogy mind a felhasználó, mind a szerep érvényes-e. heading: Szerep visszavonásának megerősítése title: Szerep visszavonásának megerősítése + welcome_page: + add_a_note: + paragraph_1_html: Ha valami apróságot szeretnél kijavíttatni és nincs időd regisztrálni és megtanulni a szerkesztést, nagyon egyszerűen beküldhetsz egy jegyzetet! + paragraph_2_html: "Menj a térképre és kattints a jegyzet ikonra:\n. Ez elhelyez egy jelzést a térképen, amelyet áthúzhatsz a pontos helyére. Majd írd be az üzeneted és nyomd meg az Elküldés gombot, hogy a térképezők megvizsgálhassák." + title: Nincs időd szerkeszteni? Küldj be jegyzetet! + basic_terms: + editor_html: A szerkesztőprogram egy olyan letölthető program vagy weboldal, amellyel a térképet tudod módosítani. + node_html: A pont egy pontszerű objektum a térképen, mint például étterem vagy egy fa. + paragraph_1_html: Az OpenStretMapnek megvan a saját nyelvjárása. Felsorolunk néhány fontosabb kifejezést, amelyek segítenek az elindulásban. + tag_html: A címke egy pici adat egy ponthoz vagy vonalhoz, mint például egy étterem neve vagy egy sebességkorlátozás mértéke. + title: Alapvető kifejezések a térképezéshez + way_html: A vonal egy vonalas vagy terület objektum, mint például egy út, folyó, tó vagy épület. + introduction_html: Üdvözöl az OpenStreetMap - a szabad és szerkeszthető világtérkép - közössége. Most, hogy regisztráltál, máris elkezdheted a térképezést. Itt elérhető egy gyors összefoglaló a legfontosabb tudnivalókkal. + questions: + paragraph_1_html: Ha kérdésed van a térképezéssel kapcsolatban, segítséget és kapcsolatfelvételi lehetőségeket találhatsz a dokumentációban. + title: Kérdésed van? + start_mapping: Térképezés indítása + title: Üdvözlet! + whats_on_the_map: + off_html: Amit nem ábrázolunk azok szubjektív adatok mint például értékelés, történelmi vagy történeti helyek, adatok jogvédett forrásokból. Sose másolj semmit más internetes vagy papír térképekről, hacsak nincs erre külön engedélyed. + on_html: Az OpenStreetMapen olyan dolgokat ábrázolunk, amelyek valódiak és jelenleg is léteznek - épületek milliói, utak és egyéb részletek a különböző helyeken. Bármi olyan, téged érdeklő elemet ábrázolhatsz, ami fizikailag létezik. + title: Mi van a térképen diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 3b0eae6baa8..aac45642748 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: McDutchie +# Author: Nemo bis ia: activerecord: attributes: @@ -81,85 +82,15 @@ ia: need_to_see_terms: Vostre accesso al API ha essite temporarimente suspendite. Per favor aperi session in le interfacie web pro vider le Conditiones de contributor. Non es necessari declarar se de accordo, ma es obligatori haber legite los. browse: changeset: - changeset: "Gruppo de modificationes: %{id}" changesetxml: XML del gruppo de modificationes - download: Discargar %{changeset_xml_link} o %{osmchange_xml_link} feed: title: Gruppo de modificationes %{id} title_comment: Gruppo de modificationes %{id} - %{comment} osmchangexml: XML osmChange title: Gruppo de modificationes - changeset_details: - belongs_to: "Pertine a:" - bounding_box: "Quadro de delimitation:" - box: quadro - closed_at: "Claudite le:" - created_at: "Create le:" - has_nodes: - one: "Ha le sequente %{count} nodo:" - other: "Ha le sequente %{count} nodos:" - has_relations: - one: "Ha le sequente %{count} relation:" - other: "Ha le sequente %{count} relationes:" - has_ways: - one: "Ha le sequente %{count} via:" - other: "Ha le sequente %{count} vias:" - no_bounding_box: Nulle quadro de delimitation ha essite memorisate pro iste gruppo de modificationes. - show_area_box: Monstrar quadro del area - common_details: - changeset_comment: "Commento:" - deleted_at: "Delite a:" - deleted_by: "Delite per:" - edited_at: "Modificate le:" - edited_by: "Modificate per:" - in_changeset: "In le gruppo de modificationes:" - version: "Version:" containing_relation: entry: Relation %{relation_name} entry_role: Relation %{relation_name} (como %{relation_role}) - map: - deleted: Delite - edit: - area: Modificar area - node: Modificar nodo - relation: Modificar relation - way: Modificar via - larger: - area: Vider le area in un carta plus grande - node: Vider le nodo in un carta plus grande - relation: Vider le relation in un carta plus grande - way: Vider le via in un carta plus grande - loading: Cargamento... - navigation: - all: - next_changeset_tooltip: Gruppo de modificationes sequente - next_node_tooltip: Nodo sequente - next_relation_tooltip: Relation sequente - next_way_tooltip: Via sequente - prev_changeset_tooltip: Gruppo de modificationes precedente - prev_node_tooltip: Nodo precedente - prev_relation_tooltip: Relation precedente - prev_way_tooltip: Via precedente - user: - name_changeset_tooltip: Vider modifications per %{user} - next_changeset_tooltip: Modification sequente per %{user} - prev_changeset_tooltip: Modification precedente per %{user} - node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Discargar XML - edit: modificar - node: Nodo - node_title: "Nodo: %{node_name}" - view_history: vider historia - node_details: - coordinates: "Coordinatas:" - part_of: "Parte de:" - node_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Discargar XML - node_history: Historia del nodo - node_history_title: "Historia del nodo: %{node_name}" - view_details: vider detalios not_found: sorry: Pardono, le %{type} con le ID %{id} non ha essite trovate. type: @@ -167,9 +98,10 @@ ia: node: nodo relation: relation way: via - paging_nav: - of: de - showing_page: Monstrante pagina + note: + closed_title: "Nota resolvite: %{note_name}" + open_title: "Nota non resolvite: %{note_name}" + title: Nota redacted: message_html: Le version %{version} de iste %{type} non pote esser monstrate perque illo ha essite obscurate. Vide %{redaction_link} pro detalios. redaction: Obscuration %{id} @@ -177,64 +109,15 @@ ia: node: nodo relation: relation way: via - relation: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Discargar XML - relation: Relation - relation_title: "Relation: %{relation_name}" - view_history: vider historia - relation_details: - members: "Membros:" - part_of: "Parte de:" - relation_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Discargar XML - relation_history: Historia del relation - relation_history_title: "Historia del relation: %{relation_name}" - view_details: vider detalios relation_member: entry_role: "%{type} %{name} como %{role}" type: node: Nodo relation: Relation way: Via - start: - manually_select: Seliger manualmente un altere area - view_data: Vider datos pro le vista actual del carta start_rjs: - data_frame_title: Datos - data_layer_name: Percurrer datos cartographic - details: Detalios - drag_a_box: Designa un quadro super le carta pro seliger un area - edited_by_user_at_timestamp: Modificate per [[user]] le [[timestamp]] - hide_areas: Celar areas - history_for_feature: Historia de [[feature]] load_data: Cargar datos - loaded_an_area_with_num_features: Tu ha cargate un area que contine [[num_features]] elementos. In general, alcun navigatores del web pote haber problemas in presentar un tal quantitate de datos. Generalmente, un navigator functiona melio monstrante minus de [[max_features]] elementos per vice; alteremente, illo pote devenir lente o non responder. Si tu es secur de voler visualisar iste datos, tu pote cliccar super le button a basso. loading: Cargamento... - manually_select: Seliger manualmente un altere area - object_list: - api: Obtener iste area per medio del API - back: Monstrar lista de objectos - details: Detalios - heading: Lista de objectos - history: - type: - node: Nodo [[id]] - way: Via [[id]] - selected: - type: - node: Nodo [[id]] - way: Via [[id]] - type: - node: Nodo - way: Via - private_user: usator private - show_areas: Monstrar areas - show_history: Monstrar historia - unable_to_load_size: "Impossibile cargar: Le dimension del quadro de delimitation [[bbox_size]] es troppo grande (debe esser inferior a %{max_bbox_size})" - wait: Un momento... - zoom_or_select: Face zoom avante o selige un area del carta a visualisar tag_details: tags: "Etiquettas:" wiki_link: @@ -248,38 +131,15 @@ ia: node: nodo relation: relation way: via - way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Discargar XML - edit: modificar - view_history: vider historia - way: Via - way_title: "Via: %{way_name}" - way_details: - also_part_of: - one: tamben parte del via %{related_ways} - other: tamben parte del vias %{related_ways} - nodes: "Nodos:" - part_of: "Parte de:" - way_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Discargar XML - view_details: vider detalios - way_history: Historia del via - way_history_title: "Historia del via: %{way_name}" changeset: changeset: anonymous: Anonyme - big_area: (grande) - no_comment: (nulle) no_edits: (nulle modification) - show_area_box: monstrar quadro del area - still_editing: (ancora in modification) view_changeset_details: Vider detalios del gruppo de modificationes changeset_paging_nav: next: Sequente » previous: « Precedente - showing_page: Pagina %{page} monstrate + showing_page: Pagina %{page} changesets: area: Area comment: Commento @@ -287,24 +147,10 @@ ia: saved_at: Salveguardate le user: Usator list: - description: Modificationes recente - description_bbox: Gruppos de modificationes intra %{bbox} - description_friend: Gruppos de modificationes per tu amicos - description_nearby: Gruppos de modificationes per usatores vicin - description_user: Gruppos de modificationes per %{user} - description_user_bbox: Gruppos de modificationes per %{user} intra %{bbox} - heading: Gruppos de modificationes - heading_bbox: Gruppos de modificationes - heading_friend: Gruppos de modificationes - heading_nearby: Gruppos de modificationes - heading_user: Gruppos de modificationes - heading_user_bbox: Gruppos de modificationes title: Gruppos de modificationes - title_bbox: Gruppos de modificationes intra %{bbox} title_friend: Gruppos de modificationes per tu amicos title_nearby: Gruppos de modificationes per usatores vicin title_user: Gruppos de modificationes per %{user} - title_user_bbox: Gruppos de modificationes per %{user} intra %{bbox} timeout: sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo de tempore pro esser recuperate. diary_entry: @@ -324,6 +170,7 @@ ia: comment_count: one: 1 commento other: "%{count} commentos" + zero: Nulle commento comment_link: Commentar iste entrata confirm: Confirmar edit_link: Modificar iste entrata @@ -358,7 +205,7 @@ ia: newer_entries: Entratas plus recente no_entries: Nulle entrata in diario older_entries: Entratas plus ancian - recent_entries: "Entratas recente de diario:" + recent_entries: Entratas recente del diario title: Diarios de usatores title_friends: Diarios de amicos title_nearby: Diarios de usatores vicin @@ -382,6 +229,9 @@ ia: user_title: Diario de %{user} editor: default: Predefinite (actualmente %{name}) + id: + description: iD (editor in navigator) + name: iD potlatch: description: Potlatch 1 (editor in navigator del web) name: Potlatch 1 @@ -397,7 +247,7 @@ ia: area_to_export: Area a exportar embeddable_html: HTML incorporabile export_button: Exportar - export_details: Le datos de OpenStreetMap es licentiate sub le licentia Attribution-ShareAlike 2.0 de Creative Commons. + export_details: Le datos de OpenStreetMap es licentiate sub le Open Data Commons Open Database License (ODbL). format: "Formato:" format_to_export: Formato de exportation image_size: "Dimension del imagine:" @@ -413,29 +263,29 @@ ia: paste_html: Colla HTML pro incorporar in sito web scale: Scala too_large: - body: Iste area es troppo grande pro esser exportate como datos XML de OpenStreetMap. Per favor face zoom avante o selige un area minor. - heading: Area troppo grande + body: "Iste area es troppo grande pro esser exportate como datos XML de OpenStreetMap. Per favor face zoom avante, o selige un area minor, o usa un del sequente fontes pro discargamento de datos in massa:" + geofabrik: + description: Extractos regularmente actualisate de continentes, paises, e citates seligite + title: Discargamentos de Geofabrik + metro: + description: Extractos de metropoles e lor areas circumvicin + title: Extractos de Metro + other: + description: Fontes additional listate in le wiki de OpenStreetMap + title: Altere fontes + planet: + description: Copias regularmente actualisate del base de datos complete de OpenStreetMap + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Adder un marcator al carta - change_marker: Cambiar le position del marcator - click_add_marker: Clicca super le carta pro adder un marcator - drag_a_box: Designa un quadro super le carta pro seliger un area - export: Exportar - manually_select: Seliger manualmente un altere area - view_larger_map: Vider un carta plus grande geocoder: description: title: geonames: Position de GeoNames - osm_namefinder: "%{types} de OpenStreetMap Namefinder" osm_nominatim: Loco de OpenStreetMap Nominatim types: cities: Citates places: Locos towns: Villages - description_osm_namefinder: - prefix: "%{distance} %{direction} del %{type}" direction: east: est north: nord @@ -456,16 +306,26 @@ ia: title: ca_postcode: Resultatos de Geocoder.CA geonames: Resultatos de GeoNames + geonames_reverse: Resultatos ab GeoNames latlon: Resultatos interne - osm_namefinder: Resultatos de OpenStreetMap Namefinder osm_nominatim: Resultatos de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultatos ab OpenStreetMap Nominatim uk_postcode: Resultatos de NPEMap / FreeThe Postcode us_postcode: Resultatos de Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} al %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} al %{direction} de %{placename}" search_osm_nominatim: + admin_levels: + level10: Limite de suburbio + level2: Frontiera de pais + level4: Frontiera de stato + level5: Frontiera de region + level6: Frontiera de contato + level8: Limite de citate + level9: Limite de village prefix: + aerialway: + chair_lift: Telesedia + drag_lift: Teleski + station: Station de telecabina aeroway: aerodrome: Aerodromo apron: Pista @@ -559,6 +419,7 @@ ia: shower: Ducha social_centre: Centro social social_club: Club social + social_facility: Servicio social studio: Appartamento de un camera supermarket: Supermercato swimming_pool: Piscina @@ -587,6 +448,9 @@ ia: "yes": Ponte building: "yes": Edificio + emergency: + fire_hydrant: Hydrante de incendio + phone: Telephono de emergentia highway: bridleway: Sentiero pro cavallos bus_guideway: Via guidate de autobus @@ -608,6 +472,7 @@ ia: platform: Platteforma primary: Via principal primary_link: Via principal + proposed: Strata proponite raceway: Circuito residential: Residential rest_area: Area de reposo @@ -619,6 +484,7 @@ ia: speed_camera: Detector de velocitate steps: Scalones stile: Scalon o apertura de passage + street_lamp: Lanterna de strata tertiary: Via tertiari tertiary_link: Via tertiari track: Pista @@ -634,6 +500,7 @@ ia: building: Edificio castle: Castello church: Ecclesia + citywalls: Muro del citate fort: Forte house: Casa icon: Icone @@ -643,6 +510,7 @@ ia: monument: Monumento museum: Museo ruins: Ruinas + tomb: Tumba tower: Turre wayside_cross: Cruce juxta le via wayside_shrine: Reliquario juxta le via @@ -710,6 +578,8 @@ ia: airfield: Aerodromo militar barracks: Barracas bunker: Bunker + mountain_pass: + "yes": Passo de montania natural: bay: Baia beach: Plagia @@ -779,6 +649,7 @@ ia: locality: Localitate moor: Landa municipality: Municipalitate + neighbourhood: Quartiero postcode: Codice postal region: Region sea: Mar @@ -804,8 +675,10 @@ ia: narrow_gauge: Ferrovia stricte platform: Platteforma ferroviari preserved: Ferrovia preservate + proposed: Ferrovia proponite spur: Ramification de ferrovia station: Station ferroviari + stop: Halto ferroviari subway: Station de metro subway_entrance: Entrata al metro switch: Agulia @@ -821,6 +694,7 @@ ia: beverages: Boteca de bibitas bicycle: Magazin de bicyclettas books: Libreria + boutique: Boutique butcher: Macelleria car: Magazin de automobiles car_parts: Partes de automobiles @@ -834,6 +708,7 @@ ia: convenience: Magazin de quartiero copyshop: Centro de photocopias cosmetics: Boteca de cosmetica + deli: Boteca de delicatessas fin department_store: Grande magazin discount: Boteca de disconto doityourself: Magazin de bricolage @@ -870,17 +745,21 @@ ia: organic: Boteca de alimentos organic outdoor: Magazin de sport al aere libere pet: Boteca de animales + pharmacy: Pharmacia photo: Magazin de photographia salon: Salon + second_hand: Magazin de secunde mano shoes: Scarperia shopping_centre: Centro commercial sports: Magazin de sport stationery: Papireria supermarket: Supermercato + tailor: Sartor toys: Magazin de joculos travel_agency: Agentia de viages video: Magazin de video wine: Magazin de vinos + "yes": Boteca tourism: alpine_hut: Cabana alpin artwork: Obra de arte @@ -903,6 +782,7 @@ ia: viewpoint: Puncto de vista zoo: Jardin zoologic tunnel: + culvert: Tubo de aqua subterranee "yes": Tunnel waterway: artificial: Via aquatic artificial @@ -933,56 +813,46 @@ ia: mapquest: MapQuest Open standard: Standard transport_map: Carta de transporto + notes: + new: + add: Adder nota + intro: Pro meliorar le carta, le information que tu scribe es monstrate a altere cartographos. Dunque, per favor sia tanto descriptive e precise como possibile quando tu positiona le marcator e scribe tu nota hic infra. + show: + anonymous_warning: Iste nota include commentos de usatores anonyme que debe esser verificate independentemente. + comment: Commento + comment_and_resolve: Commentar e resolver + hide: Celar + reactivate: Reactivar + resolve: Resolver site: + createnote_disabled_tooltip: Face zoom avante pro adder un nota al carta + createnote_tooltip: Adder un nota al carta edit_disabled_tooltip: Face zoom avante pro modificar le carta edit_tooltip: Modificar le carta - edit_zoom_alert: Tu debe facer zoom avante pro modificar le carta - history_disabled_tooltip: Face zoom avante pro vider le modificationes de iste area - history_tooltip: Vider le modificationes de iste area - history_zoom_alert: Tu debe facer zoom avante pro vider le historia de modification layouts: community: Communitate community_blogs: Blogs del communitate community_blogs_title: Blogs de membros del communitate de OpenStreetMap copyright: Copyright & Licentia - documentation: Documentation - documentation_title: Documentation pro le projecto + data: Datos donate: Supporta OpenStreetMap per %{link} al Fundo de Actualisation de Hardware. - donate_link_text: donation edit: Modificar edit_with: Modificar con %{editor} export: Exportar - export_tooltip: Exportar datos cartographic + export_data: Exportar datos foundation: Fundation foundation_title: Le fundation OpenStreetMap gps_traces: Tracias GPS gps_traces_tooltip: Gerer tracias GPS help: Adjuta - help_centre: Centro de adjuta - help_title: Sito de adjuta pro le projecto history: Historia - home: initio - home_tooltip: Ir al position de origine - inbox: cassa de entrata (%{count}) - inbox_tooltip: - one: Tu cassa de entrata contine 1 message non legite - other: Tu cassa de entrata contine %{count} messages non legite - zero: Tu cassa de entrata non contine messages non legite - intro_1: OpenStreetMap es un carta libere e modificabile del mundo integre. Illo es facite per gente como tu. + home: Vader al position de initio intro_2_create_account: Crea un conto de usator - intro_2_download: discargar - intro_2_html: Le datos es libere pro %{download} e %{use} sub lor %{license}. %{create_account} pro meliorar le carta. - intro_2_license: licentia aperte - intro_2_use: usar - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - title: Le datos de OpenStreetMap es disponibile sub le licentia Attribution-Share Alike 2.0 Generic de Creative Commons log_in: aperir session log_in_tooltip: Aperir un session con un conto existente logo: alt_text: Logo de OpenStreetMap - logout: clauder session - logout_tooltip: Clauder session + logout: Clauder session make_a_donation: text: Facer un donation title: Supporta OpenStreetMap con un donation monetari @@ -996,22 +866,43 @@ ia: partners_url: http://wiki.openstreetmap.org/wiki/Partners sign_up: inscriber se sign_up_tooltip: Crear un conto pro modification - sotm2011: Veni al conferentia de OpenStreetMap de 2011, "Le stato del carta", del 9 al 11 de septembre in Denver! tag_line: Le wiki-carta libere del mundo user_diaries: Diarios de usatores user_diaries_tooltip: Leger diarios de usatores - view: Vider - view_tooltip: Vider le carta - welcome_user: Benvenite, %{user_link} - welcome_user_link_tooltip: Tu pagina de usator - wiki: Wiki - wiki_title: Sito wiki pro le projecto license_page: foreign: english_link: le original in anglese text: In caso de un conflicto inter iste pagina traducite e %{english_original_link}, le pagina in anglese prevalera. title: A proposito de iste traduction - legal_babble: "

    Copyright e Licentia

    \n

    \n OpenStreetMap es datos aperte, disponibile sub le licentia\n Creative\n Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \n Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n contributores. Si vos altera o extende nostre cartas e datos, vos\n pote distribuer le resultato solmente sub le mesme licentia. Le\n complete codice\n legal explica vostre derectos e responsabilitates.\n

    \n\n

    Como dar recognoscentia a OpenStreetMap

    \n

    \n Si vos usa imagines cartographic de OpenStreetMap, nos requesta que\n vostre recognoscentia indica al minus “© Contributores de\n OpenStreetMap, CC BY-SA”. Si vos usa solmente datos cartographic,\n nos requesta “Datos cartographic © Contributores de OpenStreetMap,\n CC BY-SA”.\n

    \n

    \n Si possibile, le parola OpenStreetMap debe esser un hyperligamine a http://www.openstreetmap.org/\n e le termino CC BY-SA debe ligar a http://creativecommons.org/licenses/by-sa/2.0/. Si\n vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un\n obra imprimite), nos suggere que vos dirige vostre lectores a\n www.openstreetmap.org (forsan per inserer iste adresse\n complete in loco del parola ‘OpenStreetMap’) e a\n www.creativecommons.org.\n

    \n\n

    Pro saper plus

    \n

    \n Lege plus super le uso de nostre datos al FAQ\n Legal.\n

    \n

    \n Nos rememora al contributores de OSM de nunquam adder datos de alcun\n fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)\n sin explicite permission del titulares del derecto de autor.\n

    \n

    \n Ben que OpenStreetMap es datos aperte, nos non pote fornir un\n API cartographic gratuite pro altere disveloppatores.\n\n Vide nostre politica pro le uso del API,\n politica pro le uso de tegulas\n e politica pro le uso de Nominatim.\n

    \n\n

    Nostre contributores

    \n

    \n Nostre licentia CC BY-SA require que vos “recognosce le Autor\n Original de maniera rationabile pro le medio que Vos\n utilisa”. Le cartographos individual de OSM non requesta un\n recognoscentia excedente illo del “Contributores de\n OpenStreetMap”, sed ubi datos de un agentia cartographic\n national o altere fonte major ha essite includite in\n OpenStreetMap, il pote esser rationabile recognoscer les per\n directemente reproducer lor recognoscentia o per ligar a illo in iste pagina.\n

    \n\n\n\n
      \n
    • Australia: Contine datos de suburbios a base\n de datos del Australian Bureau of Statistics.
    • \n
    • Austria: Contine datos ab le\n Citate de Vienna licentiate sub\n CC BY.
    • \n
    • Canada: Contine datos ab\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), e StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Francia: Contine datos fornite per le\n Direction Générale des Impôts.
    • \n
    • Nove Zelandia: Contine datos proveniente de\n Land Information New Zealand. Crown Copyright reservate.
    • \n
    • Polonia: Contine datos cartographic ex UMP-pcPL. Copyright\n contributores de UMP-pcPL.\n \n Information super como OSM usa le datos de UMP
    • \n
    • Africa del Sud: Contine datos proveniente del\n Chief Directorate:\n National Geo-Spatial Information, copyright del Stato reservate.
    • \n
    • Regno Unite: Contine datos de Ordnance\n Survey © copyright del Corona e derecto de base de datos\n 2010.
    • \n
    \n\n

    \n Le inclusion de datos in OpenStreetMap non implica que le fornitor\n original del datos indorsa OpenStreetMap, forni alcun garantia, o\n accepta alcun responsabilitate.\n

    " + legal_babble: + attribution_example: + alt: Exemplo de como recognoscer OpenStreetMap in un pagina web + title: Exemplo de recognoscentia + contributors_at_html: "Austria: Contine datos ab le\n Citate de Vienna licentiate sub\n CC BY." + contributors_ca_html: "Canada: Contine datos ab\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), e StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: "Pro ulterior detalios de iste e altere fontes que ha essite usate\npro adjutar a meliorar OpenStreetMap, vide le pagina\nde contributores in le wiki de OpenStreetMap." + contributors_footer_2_html: " Le inclusion de datos in OpenStreetMap non implica que le fornitor\n original del datos indorsa OpenStreetMap, forni alcun garantia, o\n accepta alcun responsabilitate." + contributors_fr_html: "Francia: Contine datos fornite per le\n Direction Générale des Impôts." + contributors_gb_html: "Regno Unite: Contine datos de Ordnance\n Survey © copyright del Corona e derecto de base de datos\n 2010-12." + contributors_intro_html: "Nostre contributores es milles de personas. Nos include anque le datos sub licentia aperte de agentias cartographic national e de altere fontes, inter le quales:" + contributors_nl_html: "Nederlandia: Contine datos © AND, 2007\n(www.and.com)" + contributors_nz_html: "Nove Zelandia: Contine datos proveniente de\n Land Information New Zealand. Crown Copyright reservate." + contributors_title_html: Nostre contributores + contributors_za_html: "Africa del Sud: Contine datos proveniente del\n Chief Directorate:\n National Geo-Spatial Information, copyright del Stato reservate." + credit_1_html: "Nos require que vos usa le recognoscentia “© OpenStreetMap\ncontributors”." + credit_2_html: Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a iste pagina de copyright. Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote nominar e ligar directemente al licentia(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a www.openstreetmap.org (forsan per inserer iste adresse complete in loco del parola ‘OpenStreetMap’), a www.opendatacommosn.org, e (si relevante) a www.creativecommons.org. + credit_3_html: "Pro un carta electronic navigabile, le recognoscentia debe apparer in le angulo del carta. Per exemplo:" + credit_title_html: Como dar recognoscentia a OpenStreetMap + infringement_1_html: " Nos rememora al contributores de OSM de nunquam adder datos de alcun\n fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)\n sin explicite permission del titulares del derecto de autor." + infringement_2_html: Si vos crede que material sub copyright ha essite inserite inappropriatemente in le base de datos de OpenStreetMap o in iste sito, per favor consulta nostre procedura de remotion o submitte un plancto immediate usante nostre formulario in linea. + infringement_title_html: Violation de copyright + intro_1_html: "OpenStreetMap es datos aperte, licentiate sub le Open Data\nCommons Open Database License (ODbL)." + intro_2_html: " Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n contributores. Si vos altera o extende nostre cartas e datos, vos\n pote distribuer le resultato solmente sub le mesme licentia. Le\n complete codice\n legal explica vostre derectos e responsabilitates." + intro_3_html: "Le cartographia in nostre tegulas de carta, e nostre documentation, son\npublicate sub licentia Creative\nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." + more_1_html: " Lege plus super le uso de nostre datos, e como recognoscer nos, al FAQ\n Legal." + more_2_html: "Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro disveloppatores tertie. Vide nostre politica pro le uso del API,\npolitica pro le uso de tegulas\ne politica pro le uso de Nominatim." + more_title_html: Pro saper plus + title_html: Copyright e Licentia native: mapping_link: comenciar le cartographia native_link: version in interlingua @@ -1071,12 +962,9 @@ ia: title: Cassa de exito to: A read: - back_to_inbox: Retornar al cassa de entrata - back_to_outbox: Retornar al cassa de exito + back: Retornar date: Data from: De - reading_your_messages: Lectura de tu messages - reading_your_sent_messages: Lectura de tu messages inviate reply_button: Responder subject: Subjecto title: Leger message @@ -1087,6 +975,34 @@ ia: wrong_user: Tu es authenticate como "%{user}", ma le message al qual tu vole responder non ha essite inviate a iste usator. Per favor aperi un session como le usator correcte pro poter responder. sent_message_summary: delete_button: Deler + note: + description: + closed_at_by_html: Resolvite %{when} retro per %{user} + closed_at_html: Resolvite %{when} retro + commented_at_by_html: Actualisate %{when} retro per %{user} + commented_at_html: Actualisate %{when} retro + opened_at_by_html: Create %{when} retro per %{user} + opened_at_html: Create %{when} retro + reopened_at_by_html: Reactivate %{when} retro per %{user} + reopened_at_html: Reactivate %{when} retro + entry: + comment: Commento + full: Nota complete + mine: + ago_html: "%{when} retro" + created_at: Create a + creator: Creator + description: Description + heading: Notas de %{user} + id: ID + last_changed: Ultime modification + subheading: Notas submittite o commentate per %{user} + title: Notas submittite o commentate per %{user} + rss: + closed: nota claudite (a presso de %{place}) + description_area: Un lista de notas reportate, commentate o claudite in tu area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Syndication RSS pro le nota %{id} + title: Notas de OpenStreetMap notifier: diary_comment_notification: footer: Tu pote tamben leger le commento a %{readurl} e tu pote commentar a %{commenturl} o responder a %{replyurl} @@ -1102,8 +1018,7 @@ ia: email_confirm_plain: click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro confirmar le alteration. greeting: Salute, - hopefully_you_1: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail a - hopefully_you_2: "%{server_url} a %{new_address}." + hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail in %{server_url} a %{new_address}. friend_notification: befriend_them: Tu pote equalmente adder le/la como amico a %{befriendurl}. had_added_you: "%{user} te ha addite como amico in OpenStreetMap." @@ -1132,44 +1047,35 @@ ia: lost_password_plain: click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro reinitialisar tu contrasigno. greeting: Salute, - hopefully_you_1: Alcuno (possibilemente tu) ha demandate de reinitialisar le contrasigno del - hopefully_you_2: conto openstreetmap.org con iste adresse de e-mail. + hopefully_you: Alcuno (probabilemente tu) ha demandate que le contrasigno del conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate. message_notification: - footer1: Tu pote tamben leger le message at %{readurl} - footer2: e tu pote responder a %{replyurl} + footer_html: Tu pote anque leger le message a %{readurl} e tu pote responder a %{replyurl} header: "%{from_user} te ha inviate un message per OpenStreetMap con le subjecto %{subject}:" hi: Salute %{to_user}, + note_comment_notification: + anonymous: Un usator anonyme + closed: + commented_note: "%{commenter} ha resolvite un nota de carta que tu ha commentate. Le nota es in le vicinitate de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha resolvite un nota que te interessa" + subject_own: "[OpenStreetMap] %{commenter} ha resolvite un de tu notas" + your_note: "%{commenter} ha resolvite un de tu notas de carta in le vicinitate de %{place}." + commented: + commented_note: "%{commenter} ha lassate un commento sur un nota de carta que tu ha commentate. Le nota es in le vicinitate de %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha commentate un nota que te interessa" + subject_own: "[OpenStreetMap] %{commenter} ha commentate un de tu notas" + your_note: "%{commenter} ha lassate un commento sur un de tu notas de carta in le vicinitate de %{place}." + details: Plus detalios sur le nota pote esser trovate a %{url}. + greeting: Salute, + reopened: + subject_other: "[OpenStreetMap] %{commenter} ha reactivate un nota de tu interesse" + subject_own: "[OpenStreetMap] %{commenter} ha reactivate un de tu notas" + your_note: "%{commenter} ha reactivate un de tu notas de carta in le vicinitate de %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirma tu adresse de e-mail" - signup_confirm_html: - ask_questions: Tu pote poner qualcunque questiones super OpenStreetMap a nostre sito de questiones e responsas. - click_the_link: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar iste conto e continua a leger pro ulterior informationes super OpenStreetMap - current_user: Un lista de usatores actual in categorias, a base de lor position geographic, es disponibile de Category:Users_by_geographical_region. - get_reading: Informa te super OpenStreetMap per leger le wiki, tene te al currente con le ultime novas via le blog de OpenStreetMap o con Twitter, o percurre le blog OpenGeoData del fundator de OpenStreetMap Steve Coast pro le historia compendiose del projecto, le qual include tamben podcasts a ascoltar! - greeting: Salute! - hopefully_you: Alcuno (sperabilemente tu) vole crear un conto in - introductory_video: Tu pote reguardar un %{introductory_video_link}. - more_videos: Il ha %{more_videos_link}. - more_videos_here: plus videos hic - user_wiki_page: Es recommendate que tu crea un pagina wiki de usator, que include etiquettas de categoria indicante ubi tu es, como [[Category:Users_in_London]]. - video_to_openstreetmap: video de introduction a OpenStreetMap - wiki_signup: Considera tamben inscriber te al wiki de OpenStreetMap. - signup_confirm_plain: - ask_questions: "Tu pote poner qualcunque questiones super OpenStreetMap a nostre sito de questiones e responsas:" - blog_and_twitter: "Tene te al currente con le ultime novas al blog de OpenStreetMap o con Twitter:" - click_the_link_1: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar tu - click_the_link_2: conto. Continua a leger pro plus informationes a proposito de OpenStreetMap. - current_user_1: Un lista actual de usatores in categorias, a base de lor localisation in le mundo, - current_user_2: "es disponibile de:" - greeting: Salute! - hopefully_you: Alcuno (sperabilemente tu) vole crear un conto a - introductory_video: "Tu pote reguardar un video de introduction a OpenStreetMap hic:" - more_videos: "Il ha plus videos hic:" - opengeodata: "OpenGeoData.org es le blog del fundator de OpenStreetMap, Steve Coast, e illo include tamben podcasts:" - the_wiki: "Informa te super OpenStreetMap al wiki:" - user_wiki_1: Es recommendate crear un pagina wiki de usator, que include - user_wiki_2: etiquettas de categoria que indica tu localisation, como [[Category:Users_in_London]]. - wiki_signup: "Considera tamben crear un conto al wiki de OpenStreetMap a:" + confirm: "Ante de facer altere cosa, nos debe confirmar que iste requesta proveniva de te. Dunque, si tu lo faceva, per favor clicca sur le ligamine sequente pro confirmar tu conto:" + created: Un persona (probabilemente tu) ha justo create un conto a %{site_url}. + greeting: Bon die! + subject: "[OpenStreetMap] Benvenite a OpenStreetMap" + welcome: Benvenite! Ecce alcun information supplementari pro adjutar te a comenciar. oauth: oauthorize: allow_read_gpx: leger tu tracias GPS private. @@ -1178,6 +1084,7 @@ ia: allow_write_api: modificar le carta. allow_write_diary: crear entratas de diario, commentos e adder amicos. allow_write_gpx: incargar tracias GPS. + allow_write_notes: modificar notas. allow_write_prefs: modificar tu preferentias de usator. request_access: Le application %{app_name} requesta accesso a tu conto "%{user}". Per favor verifica si tu vole que le application ha le sequente possibilitates. Tu pote seliger tantes o si poches como tu vole. revoke: @@ -1196,6 +1103,7 @@ ia: allow_write_api: modificar le carta. allow_write_diary: crear entratas de diario, commentos e adder amicos. allow_write_gpx: incargar tracias GPS. + allow_write_notes: modificar notas. allow_write_prefs: modificar su preferentias de usator. callback_url: URL de retorno name: Nomine @@ -1226,6 +1134,7 @@ ia: allow_write_api: modificar le carta. allow_write_diary: crear entratas de diario, commentos e adder amicos. allow_write_gpx: incargar tracias GPS. + allow_write_notes: modificar notas. allow_write_prefs: modificar su preferentias de usator. authorize_url: "URL de autorisation:" confirm: Es tu secur? @@ -1234,7 +1143,7 @@ ia: key: "Clave de consumitor:" requests: "Le sequente permissiones es requestate del usator:" secret: "Secreto de consumitor:" - support_notice: Nos supporta HMAC-SHA1 (recommendate) e texto simple in modo SSL. + support_notice: Nos supporta le signaturas HMAC-SHA1 (recommendate) e RSA-SHA1. title: Detalios OAuth pro %{app_name} url: "URL del indicio de requesta:" update: @@ -1274,6 +1183,7 @@ ia: edit: anon_edits_link_text: Lege proque isto es le caso. flash_player_required: 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. + id_not_configured: iD non ha essite configurate no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro iste functionalitate. not_public: Tu non ha configurate tu modificationes pro esser public. not_public_description: Tu non potera plus modificar le carta si tu non lo face. Tu pote configurar tu modificationes como public a partir de tu %{user_page}. @@ -1282,18 +1192,15 @@ ia: 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.) user_page_link: pagina de usator index: + createnote: Adder un nota js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate JavaScript. js_2: OpenStreetMap usa JavaScript pro su carta glissante. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Publicate sub licentia %{license_name} per le %{project_name} e su contributores. - project_name: Projecto OpenStreetMap + copyright: Copyright OpenStreetMap e contributores, sub licentia aperte permalink: Permaligamine remote_failed: Modification fallite - assecura te que JOSM o Merkaartor es cargate e que le plug-in de controlo remote es activate shortlink: Ligamine curte key: - map_key: Legenda - map_key_tooltip: Legenda del carta table: entry: admin: Limite administrative @@ -1379,7 +1286,6 @@ ia: preview: Previsualisation search: search: Cercar - search_help: "exemplos: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', o 'post offices near Lünen' altere exemplos..." submit_text: Va where_am_i: Ubi es io? where_am_i_title: Describer le position actual per medio del motor de recerca @@ -1413,6 +1319,8 @@ ia: visibility: "Visibilitate:" visibility_help: que significa isto? list: + description: Percurrer le tracias GPS incargate recentemente + empty_html: Ancora nihil a vider hic. Incarga un nove tracia o lege plus sur le traciamento GPS in le pagina wiki. public_traces: Tracias GPS public public_traces_from: Tracias GPS public de %{user} tagged_with: " etiquettate con %{tags}" @@ -1452,14 +1360,16 @@ ia: trace_header: see_all_traces: Vider tote le tracias see_your_traces: Vider tote tu tracias - traces_waiting: Tu ha %{count} tracias attendente incargamento. Per favor considera attender le completion de istes ante de incargar alteres, pro non blocar le cauda pro altere usatores. + traces_waiting: + one: Tu ha %{count} tracia attendente incargamento. Per favor considera attender le completion de iste ante de incargar alteres, pro non blocar le cauda pro altere usatores. + other: Tu ha %{count} tracias attendente incargamento. Per favor considera attender le completion de istes ante de incargar alteres, pro non blocar le cauda pro altere usatores. upload_trace: Incargar un tracia trace_optionals: tags: Etiquettas trace_paging_nav: - next: Sequente » - previous: « Precedente - showing_page: Pagina %{page} monstrate + newer: Tracias plus nove + older: Tracias plus ancian + showing_page: Pagina %{page} view: delete_track: Deler iste tracia description: "Description:" @@ -1498,6 +1408,9 @@ ia: email never displayed publicly: (nunquam monstrate publicamente) flash update success: Informationes del usator actualisate con successo. flash update success confirm needed: Informationes del usator actualisate con successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail. + gravatar: + gravatar: Usar Gravatar + link text: que es isto? home location: "Position de origine:" image: "Imagine:" image size hint: (imagines quadrate de al minus 100×100 functiona melio) @@ -1533,12 +1446,9 @@ ia: update home location on click: Actualisar le position de origine quando io clicca super le carta? confirm: already active: Iste conto ha ja essite confirmate. - before you start: Nos sape que tu es probabilemente impatiente de comenciar le cartographia, ma antea tu vole forsan inserer plus information super te in le formulario hic infra. button: Confirmar heading: Confirmar un conto de usator press confirm button: Preme le button de confirmation ci infra pro activar tu conto. - reconfirm: Si alcun tempore passava post que tu creava le conto, pote esser que tu debe facer inviar te un nove e-mail de confirmation. - success: Tu conto ha essite confirmate, gratias pro inscriber te! unknown token: Iste indicio non pare exister. confirm_email: button: Confirmar @@ -1559,8 +1469,8 @@ ia: heading: Usatores hide: Celar usatores seligite showing: - one: Presentation del pagina %{page} (%{first_item} de %{items}) - other: Presentation del pagina %{page} (%{first_item}-%{last_item} de %{items}) + one: Pagina %{page} (%{first_item} de %{items}) + other: Pagina %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} create ab %{ip_address} le %{date}" summary_no_ip: "%{name} create le %{date}" title: Usatores @@ -1575,8 +1485,6 @@ ia: lost password link: Tu perdeva le contrasigno? new to osm: Nove a OpenStreetMap? no account: Non ha un conto? - notice: Informa te super le imminente cambio de licentia de OpenStreetMap (traductiones) (discussion) - notice_terms: OpenStreetMap cambia a un nove licentia le 1 de april 2012. Iste licentia es tanto aperte como le actual, ma le stipulationes legal es multo plus apte pro nostre base de datos cartographic. Nos appreciarea multo poter retener tu contributiones in OpenStreetMap, ma nos pote facer isto solmente si tu consenti a lor distribution sub le nove licentia. Alteremente, nos debera remover los del base de datos.

    Per favor aperi session, e prende alcun secundas pro revider e acceptar le nove conditiones. Gratias! openid: "OpenID de %{logo}:" openid invalid: Infortunatemente tu OpenID pare esser mal formate. openid missing provider: Infortunatemente nos non poteva contactar tu providitor de OpenID. @@ -1621,8 +1529,10 @@ ia: title: Contrasigno perdite make_friend: already_a_friend: Tu es ja amico de %{name}. + button: Adder como amico failed: Pardono, non poteva adder %{name} como amico. - success: "%{name} es ora tu amico." + heading: Adder %{user} como amico? + success: "%{name} es ora tu amico!" new: confirm email address: "Confirmar adresse de e-mail:" confirm password: "Confirmar contrasigno:" @@ -1631,9 +1541,6 @@ ia: display name: "Nomine public:" display name description: Tu nomine de usator monstrate publicamente. Tu pote cambiar lo plus tarde in le preferentias. email address: "Adresse de e-mail:" - fill_form: Completa le formulario e nos te inviara promptemente un e-mail pro activar tu conto. - flash create success message: Gratias pro crear un conto. Nos ha inviate un message de confirmation a %{email} e si tosto que tu confirma le conto, tu potera comenciar a cartographiar.

    Si tu usa un systema anti-spam que invia requestas de confirmation, alora per favor assecura te de adder webmaster@openstreetmap.org al lista blanc, post que nos non pote responder a requestas de confirmation. - heading: Crear un conto de usator license_agreement: Quando tu confirma tu conto, tu debera acceptar le conditiones de contributor. no_auto_account_create: Infortunatemente in iste momento non es possibile crear un conto pro te automaticamente. not displayed publicly: Non monstrate publicamente (vide le politica de confidentialitate) @@ -1654,6 +1561,8 @@ ia: nearby mapper: Cartographo vicin your location: Tu position remove_friend: + button: Remover amico + heading: Remover %{user} como amico? not_a_friend: "%{name} non es un de tu amicos." success: "%{name} ha essite removite de tu amicos." reset_password: @@ -1688,9 +1597,9 @@ ia: you need to accept or decline: Per favor lege e postea accepta o declina le nove Conditiones del Contributor pro continuar. view: activate_user: activar iste usator - add as friend: adder como amico + add as friend: adder amico ago: (%{time_in_words_ago} retro) - block_history: vider blocadas recipite + block_history: blocadas recipite blocks by me: blocadas per me blocks on me: blocadas super me comments: commentos @@ -1708,28 +1617,30 @@ ia: diary: diario edits: modificationes email address: "Adresse de e-mail:" - friends_changesets: Percurrer tote le gruppos de modificationes per amicos - friends_diaries: Navigar per tote le articulos de diario per amicos + friends_changesets: gruppos de modificationes de tu amicos + friends_diaries: articulos de diario de tu amicos hide_user: celar iste usator - if set location: Si tu ha definite tu position, il apparera ci infra un elegante carta e altere cosas. Tu pote definir tu position de origine in tu pagina de %{settings_link}. + if set location: Defini tu position de origine in le %{settings_link} pro vider le usatores a proximitate. km away: a %{count} km de distantia latest edit: "Ultime modification %{ago}:" m away: a %{count} m de distantia mapper since: "Cartographo depost:" - moderator_history: vider blocadas date + moderator_history: blocadas date my comments: mi commentos my diary: mi diario my edits: mi modificationes + my notes: mi notas de carta my settings: mi configurationes my traces: mi tracias nearby users: Altere usatores vicin - nearby_changesets: Navigar per tote le gruppos de modificationes per usatores vicin - nearby_diaries: Navigar per tote le articulos de diario per usatores vicin + nearby_changesets: gruppos de modificationes de usatores a proximitate + nearby_diaries: articulos de diario per usatores a proximitate new diary entry: nove entrata de diario no friends: Tu non ha ancora addite alcun amico. no nearby users: Il non ha ancora altere cartographos in le vicinitate. + notes: notas de carta oauth settings: configuration oauth - remove as friend: remover como amico + remove as friend: remover amico role: administrator: Iste usator es un administrator grant: @@ -1801,11 +1712,14 @@ ia: creator_name: Creator display_name: Usator blocate edit: Modificar + next: Sequente » not_revoked: (non revocate) + previous: « Precedente reason: Motivo del blocada revoke: Revocar! revoker_name: Revocate per show: Monstrar + showing_page: Pagina %{page} status: Stato period: one: 1 hora @@ -1853,3 +1767,20 @@ ia: fail: Impossibile revocar le rolo `%{role}' del usator `%{name}'. Verifica que e le usator e le rolo es valide. heading: Confirmar le revocation del rolo title: Confirmar le revocation del rolo + welcome_page: + basic_terms: + editor_html: Un editor es un programma o sito web que tu pote usar pro modificar le carta. + node_html: Un nodo es un puncto sur le carta, como un restaurante o un arbore individual. + paragraph_1_html: OpenStreetMap ha un jargon proprie. Ecce alcun parolas clave que te essera utile. + tag_html: Un etiquetta es un unitate de information sur un nodo o via, como le nomine de un restaurante o le limite de velocitate de un strata. + title: Vocabulario de base pro le cartographia + way_html: Un via es un linea o area, como un strata, fluxo, laco o edificio. + introduction_html: Bevenite a OpenStreetMap, le carta libere e modificabile del mundo. Ora que tu te ha inscribite, tu es preste a comenciar a cartographiar. Ecce un guida curte con le cosas le plus importante a saper. + questions: + title: Questiones? + start_mapping: comenciar le cartographia + title: Benvenite! + whats_on_the_map: + off_html: Illo non include datos subjective como punctos de appreciation, elementos historic o hypothetic. Le datos ab fontes sub copyright es equalmente excludite; non copia cosas ab cartas in linea o de papiro sin permission special! + on_html: OpenStreetMap es un loco pro cartographiar cosas real e actual; illo include milliones de edificios, stratas e altere detalios sur locos. Tu pote cartographiar qualcunque elemento del mundo real que te interessa. + title: Que es sur le carta? diff --git a/config/locales/id.yml b/config/locales/id.yml new file mode 100644 index 00000000000..f14d122f3b6 --- /dev/null +++ b/config/locales/id.yml @@ -0,0 +1,1756 @@ +# Messages for Indonesian (Bahasa Indonesia) +# Exported from translatewiki.net +# Export driver: syck-pecl +# Author: Dewisulistio +# Author: Emirhartato +# Author: Farras +# Author: HarryMahar +# Author: Irwangatot +# Author: Iwan Novirion +# Author: Vasanthi +# Author: Wulankhairunisa +# Author: 아라 +id: + activerecord: + attributes: + diary_comment: + body: Isi + diary_entry: + language: Bahasa + latitude: Garis Lintang + longitude: Garis Bujur + title: Judul + user: Pengguna + friend: + friend: Teman + user: Pengguna + message: + body: Isi + recipient: Penerima + sender: Pengirim + title: Judul + trace: + description: Deskripsi + latitude: Garis Lintang + longitude: Garis Bujur + name: Nama + public: Publik + size: Ukuran + user: Pengguna + visible: Terlihat + user: + active: Aktif + description: Keterangan + display_name: Nama Tampilan + email: Email + languages: Bahasa + pass_crypt: Kata Sandi + models: + acl: Daftar Kontrol Akses + changeset: Set Perubahan + changeset_tag: Tag Set Perubahan + country: Negara + diary_comment: Komentar pada Catatan Harian + diary_entry: Entri Catatan harian + friend: Teman + language: Bahasa + message: Pesan + node: Node/Titik + node_tag: Tag node/titik + notifier: Pemberitahuan + old_node: Node/Titik Lama + old_node_tag: Tag Node/Titik Lama + old_relation: Relasi Lama + old_relation_member: Anggota Relasi Lama + old_relation_tag: Tag Relasi Lama + old_way: Way/Garis Lama + old_way_node: Node/Titik dari garis lama + old_way_tag: Tag way/garis lama + relation: Relasi + relation_member: Anggota Relasi + relation_tag: Tag Relasi + session: Sesi + trace: Digitasi + tracepoint: Titik Digitasi + tracetag: Tag Dijitasi + user: Pengguna + user_preference: Preferensi Pengguna + user_token: Token Pengguna + way: Garis + way_node: Node/Titik dari garis + way_tag: Tag way/garis + application: + require_cookies: + cookies_needed: Anda tampaknya memiliki cookies yang tidak aktif - mohon aktifkan cookies pada browser anda sebelum melanjutkan. + require_moderator: + not_a_moderator: Anda perlu menjadi moderator untuk melakukan tindakan ini. + setup_user_auth: + blocked: Akses Anda ke API telah diblokir. Silahkan log-in ke antarmuka web untuk mengetahui lebih lanjut. + need_to_see_terms: Akses Anda ke API untuk sementara ditangguhkan. Silahkan log-in ke antarmuka web untuk melihat persyaratan kontributor. Anda tidak perlu untuk setuju, tapi Anda harus melihat mereka. + browse: + changeset: + changesetxml: Set Perubahan XML + feed: + title: Set Perubahan %{id} + title_comment: Set Perubahan %{id} - %{comment} + osmchangexml: osmChange XML + title: Set Perubahan + containing_relation: + entry: Relasi %{relation_name} + entry_role: Relasi %{relation_name} (as %{relation_role}) + not_found: + sorry: Maaf, %{type} dengan id %{id}, tidak dapat ditemukan. + type: + changeset: Set perubahan + node: node/titik + relation: relasi + way: way/garis + note: + closed_title: "Catatan diselesaikan: %{note_name}" + open_title: "Catatan belum terselesaikan: %{note_name}" + title: Catatan + redacted: + message_html: Versi %{version} %{type} ini tidak dapat ditampilkan karena telah diedit. Silahkan lihat %{redaction_link} untuk rincian. + redaction: Redaksi %{id} + type: + node: node/titik + relation: relasi + way: way/garis + relation_member: + entry_role: "%{type} %{name} sebagai %{role}" + type: + node: Node/Titik + relation: Relasi + way: Way/Garis + start_rjs: + load_data: Memuat Data + loading: Memuat... + tag_details: + tags: "Tag:" + wiki_link: + key: Deskripsi halaman wiki untuk tag %{key} + tag: Deskripsi halaman wiki untuk %{key}=%{value} tag + wikipedia_link: Artikel %{page} di Wikipedia + timeout: + sorry: Maaf, data untuk %{type} dengan id %{id}, terlalu lama untuk dibuka. + type: + changeset: set perubahan + node: node/titik + relation: relasi + way: way/garis + changeset: + changeset: + anonymous: Anonim + no_edits: (tidak ada edit) + view_changeset_details: Lihat detail dari set perubahan + changeset_paging_nav: + next: Berikutnya » + previous: « Sebelumnya + showing_page: Halaman %{page} + changesets: + area: Area + comment: Komentar + id: ID + saved_at: Disimpan di + user: Pengguna + list: + title: Set perubahan + title_friend: Set perubahan oleh teman Anda + title_nearby: Set perubahan oleh pengguna terdekat + title_user: Set perubahan oleh %{user} + timeout: + sorry: Maaf, daftar kumpulan set perubahan yang Anda minta terlalu lama untuk diambil. + diary_entry: + comments: + ago: "%{ago} yang lalu" + comment: Komentar + has_commented_on: "%{display_name} telah mengomentari entri catatan harian berikut" + newer_comments: Komentar Baru + older_comments: Komentar Lama + post: Artikel + when: Kapan + diary_comment: + comment_from: Komentar dari %{link_user} pada %{comment_created_at} + confirm: Konfirmasi + hide_link: Sembunyikan komentar ini + diary_entry: + comment_count: + one: "%{count} komentar" + other: "%{count} komentar" + zero: Tidak ada komentar + comment_link: Komentar pada entri ini + confirm: Konfirmasi + edit_link: Edit entri ini + hide_link: Sembunyikan entri ini + posted_by: Dipost oleh %{link_user} pada %{created} dalam %{language_link} + reply_link: Balasan untuk entri ini + edit: + body: "Isi:" + language: "Bahasa:" + latitude: Lintang + location: Lokasi + longitude: Bujur + marker_text: Lokasi entri catatan harian + save_button: Simpan + subject: Subjek + title: Edit entri catatan harian + use_map_link: Gunakan peta + feed: + all: + description: Entri catatan harian terbaru dari pengguna OpenStreetMap + title: Entri catatan harian OpenStreetMap + language: + description: Entri catatan harian terbaru dari pengguna OpenStreetMap dalam %{language_name} + title: Entri catatan harian OpenStreetMap dalam %{language_name} + user: + description: Entri catatan harian OpenStreetMap terbaru dari %{user} + title: Entri catatan harian OpenStreetMap untuk %{user} + list: + in_language_title: Entri catatan harian dalam %{language} + new: Entri baru catatan harian + new_title: Buat entri baru dalam catatan harian Anda + newer_entries: Entri baru + no_entries: Tidak ada entri catatan harian + older_entries: Entri Lama + recent_entries: "Entri buku harian terbaru:" + title: Catatan harian pengguna + title_friends: Catatan harian teman + title_nearby: Catatan harian pengguna terdekat + user_title: Catatan harian %{user} + location: + edit: Edit + location: "Lokasi:" + view: Lihat + new: + title: Entri Baru Catatan Harian + no_such_entry: + body: Maaf, tidak ada catatan harian atau komentar dengan id %{id}. Harap memeriksa ejaan, atau mungkin Anda mengklik link yang salah. + heading: "Tidak ada entri dengan id: %{id}" + title: Tidak ada entri catatan harian tersebut + view: + leave_a_comment: Tinggalkan komentar + login: Masuk + login_to_leave_a_comment: "%{login_link} untuk meninggalkan komentar" + save_button: Simpan + title: Catatan harian %{user} | %{title} + user_title: Catatan harian %{user} + editor: + default: Standar (saat ini %{name}) + id: + description: iD (editor di dalam browser internet) + name: iD + potlatch: + description: Potlatch 1 (editor di dalam browser) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (editor di dalam browser) + name: Potlatch 2 + remote: + description: Remote Control (JOSM atau Merkaartor) + name: Pengendali Jarak Jauh + export: + start: + add_marker: Tambahkan penanda ke peta + area_to_export: Wilayah untuk diekspor + embeddable_html: HTML yang terkait + export_button: Ekspor + export_details: Data OpenStreetMap memiliki lisensi Open Data Commons Open Database License (ODbL). + format: Format + format_to_export: Format untuk diekspor + image_size: Ukuran gambar + latitude: "Lintang:" + licence: Lisensi + longitude: "Bujur:" + manually_select: Pilih wilayah berbeda secara manual + map_image: Gambar Peta (menunjukkan layer standar) + max: Maks + options: Pilihan + osm_xml_data: Data XML OpenStreetMap + output: Hasil + paste_html: Salin HTML untuk menyimpan di website + scale: Skala + too_large: + body: Wilayah ini terlalu besar untuk diekspor sebagai data XML OpenStreetMap. Silahkan perbesar atau pilih wilayah yang lebih kecil. + zoom: Perbesar + geocoder: + description: + title: + geonames: Lokasi dari GeoNames + osm_nominatim: Lokasi dari OpenStreetMap Nominatim + types: + cities: Kota (jamak) + places: Tempat (jamak) + towns: Kota Kecil (jamak) + direction: + east: timur + north: utara + north_east: timur laut + north_west: barat laut + south: selatan + south_east: tenggara + south_west: barat daya + west: barat + distance: + one: sekitar 1km + other: about km %{count} + zero: kurang daripada 1km + results: + more_results: Hasil lainnya + no_results: Tidak ada hasil yang ditemukan + search: + title: + ca_postcode: Hasil dari Geocoder.CA + geonames: Hasil dari GeoNames + latlon: Hasil dari Internal + osm_nominatim: Hasil dari OpenStreetMap Nominatim + uk_postcode: Hasil dari NPEMap / FreeThe Postcode + us_postcode: Hasil dari Geocoder.us + search_osm_nominatim: + admin_levels: + level10: Batas kota pinggiran + level2: Batas Negara + level4: Batas Negara Bagian + level5: Batas Wilayah + level6: Batas Provinsi + level8: Batas Kota/Kabupaten + level9: Batas Desa + prefix: + aeroway: + aerodrome: Lapangan Terbang + apron: Landasan Pesawat + gate: Gerbang + helipad: Helipad + runway: Landasan pacu + taxiway: Jalur taxi + terminal: Terminal + amenity: + WLAN: Akses WiFi + airport: Bandara + arts_centre: Pusat Kesenian + artwork: Karya Seni + atm: ATM + auditorium: Auditorium + bank: Bank + bar: Bar + bbq: BBQ + bench: Bangku + bicycle_parking: Parkir Sepeda + bicycle_rental: Penyewaan Sepeda + biergarten: Beer Garden + brothel: Bordil + bureau_de_change: Penukaran Valuta Asing + bus_station: Terminal Bus + cafe: Kafe + car_rental: Penyewaan Mobil + car_sharing: Penyewaan Mobil (per jam) + car_wash: Tempat Cuci Mobil + casino: Kasino + charging_station: Stasiun Pengisian + cinema: Bioskop + clinic: Klinik + club: Klub + college: Perguruan Tinggi + community_centre: Gedung Serbaguna + courthouse: Gedung Pengadilan + crematorium: Tempat Kremasi (Pembakaran Mayat) + dentist: Dokter Gigi + doctors: Dokter + dormitory: Asrama + drinking_water: Air Minum + driving_school: Sekolah Mengemudi + embassy: Kedutaan Besar + emergency_phone: Telepon Darurat + fast_food: Makanan Cepat Saji + ferry_terminal: Terminal Kapal Feri + fire_hydrant: Hidran/Keran Kebakaran + fire_station: Stasiun Pemadam Kebakaran + food_court: Tempat Makan + fountain: Air Mancur + fuel: Stasiun Pengisian Bahan Bakar + grave_yard: Kuburan + gym: Pusat Kebugaran / Gym + hall: Aula/Gedung Pertemuan + health_centre: Pusat Kesehatan + hospital: Rumah Sakit + hotel: Hotel + hunting_stand: Pos Berburu + ice_cream: Es Krim + kindergarten: Taman Kanak-Kanak + library: Perpustakaan + market: Pasar + marketplace: Pasar + mountain_rescue: Penyelamat Gunung (SAR) + nightclub: Klub Malam + nursery: Pendidikan Anak Usia Dini (PAUD) + nursing_home: Panti Jompo + office: Kantor + park: Taman + parking: Parkir + pharmacy: Apotek + place_of_worship: Tempat Ibadah + police: Polisi + post_box: Kotak Pos + post_office: Kantor Pos + preschool: Pra-sekolah + prison: Penjara + pub: Pub + public_building: Bangunan Publik + public_market: Pasar Publik + reception_area: Area Bagian Penerima Tamu + recycling: Titik Daur Ulang + restaurant: Restoran + retirement_home: Rumah Jompo + sauna: Sauna + school: Sekolah + shelter: Tempat Berlindung + shop: Toko + shopping: Pusat Perbelanjaan + shower: Tempat Pemandian Umum + social_centre: Pusat Sosial + social_club: Klub Sosial + studio: Studio + supermarket: Supermarket + swimming_pool: Kolam Renang + taxi: Taxi + telephone: Telepon Umum + theatre: Teater + toilets: Toilet + townhall: Balai Kota + university: Universitas + vending_machine: Mesin Penjual + veterinary: Bedah Hewan + village_hall: Balai Desa + waste_basket: Keranjang Sampah + wifi: Akses WiFi + youth_centre: Pusat Pemuda + boundary: + administrative: Batas Administratif + census: Batas Sensus + national_park: Taman Nasional + protected_area: Kawasan lindung + bridge: + aqueduct: Saluran Air + suspension: Jembatan Suspensi + swing: Jembatan Gantung + viaduct: Jembatan Viaduct + "yes": Jembatan + building: + "yes": Bangunan + highway: + bridleway: Jalan Tanah + bus_guideway: Jalur Bus Terpandu + bus_stop: Halte Bus + byway: Jalan Kampung + construction: Jalan raya sedang dalam perbaikan + cycleway: Jalur Sepeda + emergency_access_point: Titik Akses Darurat + footway: Jalan setapak + ford: Arungan + living_street: Jalan Permukiman + milestone: Patok Batu Batas Wilayah + minor: Jalan Kecil + motorway: Jalan Tol + motorway_junction: Persimpangan Jalan Tol + motorway_link: Jalan Tol + path: Jalan Setapak + pedestrian: Jalur Pejalan Kaki + platform: Peron + primary: Jalam Primer + primary_link: Jalan Primer + raceway: Lintasan Balap + residential: Jalan Permukiman + rest_area: Area Peristirahatan + road: Jalan + secondary: Jalan Sekunder + secondary_link: Jalan Sekunder + service: Jalan Pelayanan + services: Pelayanan Jalan Tol + speed_camera: Kamera Pendeteksi Kecepatan + steps: Langkah-langkah + stile: Pijakan kaki pada pagar + tertiary: Jalan Tersier + tertiary_link: Jalan Tersier + track: Trek + trail: Jejak + trunk: Jalan Utama Bukan Tol + trunk_link: Jalan Utama Bukan Tol + unclassified: Jalan Tidak Terklasifikasi + unsurfaced: Jalan Tanpa Permukaan + historic: + archaeological_site: Situs arkeologi + battlefield: Medan perang + boundary_stone: Batu Pembatas + building: Bangunan + castle: Kastil + church: Gereja + fort: Benteng + house: Rumah + icon: Ikon + manor: Tanah Bangsawan + memorial: Memorial + mine: Tambang + monument: Monumen + museum: Museum + ruins: Reruntuhan + tower: Menara + wayside_cross: Pinggir persimpangan + wayside_shrine: Kuil pinggir jalan + wreck: Rongsokan + landuse: + allotments: Tanah garap + basin: Cekungan + brownfield: Lahan industri + cemetery: Pemakaman + commercial: Wilayah Komersial + conservation: Konservasi + construction: Konstruksi + farm: Pertanian + farmland: Lahan Pertanian + farmyard: Lahan Peternakan + forest: Hutan + garages: Garasi + grass: Rumput + greenfield: Lahan Perkebunan + industrial: Wilayah Industri + landfill: Tempat Pembuangan Akhir + meadow: Padang rumput + military: Kawasan militer + mine: Tambang + nature_reserve: Cagar Alam + orchard: Kebun buah-buahan + park: Taman + piste: Piste + quarry: Tempat Penggalian + railway: Rel Kereta + recreation_ground: Taman Rekreasi + reservoir: Wilayah Serapan (Reservoir) + reservoir_watershed: DAS reservoir + residential: Wilayah Permukiman + retail: Wilayah Perdagangan + road: Wilayah Jalan + village_green: Desa Hijau + vineyard: Kebun anggur + wetland: Lahan Basah + wood: Kayu + leisure: + beach_resort: Resort Pantai + bird_hide: Tempat Observasi Burung + common: Lahan Publik + fishing: Tempat Pemancingan + fitness_station: Stasiun Kebugaran + garden: Kebun + golf_course: Taman Golf + ice_rink: Gelanggang Es (Ice Rink) + marina: Pantai + miniature_golf: Mini Golf + nature_reserve: Cagar Alam + park: Taman + pitch: Lapangan Olahraga + playground: Taman Bermain + recreation_ground: Taman Rekreasi + sauna: Sauna + slipway: Tempat Peluncuran Kapal + sports_centre: Pusat Olahraga + stadium: Stadion + swimming_pool: Kolam Renang + track: Trek Lari + water_park: Taman Air + military: + airfield: Lapangan Udara Militer + barracks: Barak + bunker: Bunker + mountain_pass: + "yes": Perlintasan Pegunungan + natural: + bay: Teluk + beach: Pantai + cape: Tanjung + cave_entrance: Pintu Masuk Gua + channel: Kanal + cliff: Tebing + crater: Kawah + dune: Bukit Pasir + feature: Fitur + fell: Tebangan + fjord: Arungan + forest: Hutan + geyser: Mata air panas + glacier: Gletser + heath: Padang Rumpur + hill: Bukit + island: Pulau + land: Lahan + marsh: Rawa + moor: Tegalan + mud: Lumpur + peak: Puncak + point: Titik + reef: Batu Karang + ridge: Punggung Bukit + river: Sungai + rock: Batu + scree: Kerikil + scrub: Semak Belukar + shoal: Beting + spring: Mata Air + stone: Batu + strait: Selat + tree: Pohon + valley: Lembah + volcano: Gunung berapi + water: Air + wetland: Lahan Basah + wetlands: Lahan Basah (jamak) + wood: Kayu + office: + accountant: Akuntan + architect: Arsitek + company: Perusahaan + employment_agency: Badan Tenaga Kerja + estate_agent: Agen Pengurus Pertanahan + government: Kantor Pemerintah + insurance: Kantor Asuransi + lawyer: Pengacara + ngo: Kantor LSM + telecommunication: Kantor Telekomunikasi + travel_agent: Agen Perjalanan + "yes": Kantor + place: + airport: Bandara + city: Kota + country: Negara + county: Provinsi + farm: Pertanian + hamlet: Desa + house: Rumah + houses: Rumah (jamak) + island: Pulau + islet: Pulau Kecil + isolated_dwelling: Daerah Terisolasi + locality: Lokal + moor: Tegalan + municipality: Kotamadya/Kabupaten + postcode: Kode Pos + region: Wilayah + sea: Laut + state: Negara Bagian + subdivision: Cabang + suburb: Pinggiran kota + town: Kota + unincorporated_area: Wilayah lepas + village: Desa + railway: + abandoned: Rel kereta yang diabaikan + construction: Rel kereta yang diperbaiki + disused: Rel kereta yang bekas + disused_station: Bekas Stasiun Kereta + funicular: Trem yang digerakan dengan kabel + halt: Pemberhentian kereta + historic_station: Stasiun Kereta Bersejarah + junction: Persimpangan Rel + level_crossing: Perlintasan Bertingkat + light_rail: Kereta api cepat + miniature: Miniatur Kereta Api + monorail: Monorel + narrow_gauge: Sepur Sempit + platform: Peron Kereta + preserved: Jalur Kereta Terlindungi + spur: Sepur Kereta + station: Stasiun Kereta Api + subway: Stasiun Kereta Bawah Tanah + subway_entrance: Pintu Masuk Kereta Bawah Tanah + switch: Titik Kereta Api + tram: Jalur Trem + tram_stop: Perhentian Trem + yard: Emplasemen + shop: + alcohol: Pub (di Inggris) + antiques: Toko Benda Antik + art: Toko Kerajinan Tangan + bakery: Toko Roti + beauty: Toko Kecantikan + beverages: Toko Minuman + bicycle: Toko Sepeda + books: Toko Buku + butcher: Toko Daging + car: Showroom Mobil + car_parts: Toko Onderdil Mobil + car_repair: Bengkel Mobil + carpet: Toko Karpet + charity: Toko Amal + chemist: Toko Kimia + clothes: Toko Baju + computer: Toko Komputer + confectionery: Toko Konfeksi + convenience: Toko Serba Ada (Kecil) + copyshop: Fotokopi + cosmetics: Toko Kosmetik + department_store: Toko serba ada + discount: Toko Barang Obral + doityourself: Toko Perkakas + dry_cleaning: Dry Cleaning + electronics: Toko Elektronik + estate_agent: Agen Properti + farm: Toko Pertanian + fashion: Toko Mode + fish: Toko Ikan + florist: Toko Bunga + food: Toko Makanan + funeral_directors: Penyelenggara Pemakaman + furniture: Toko Meubel + gallery: Galeri + garden_centre: Pusat Kebun + general: Toko Umum + gift: Toko Hadiah + greengrocer: Toko Sayuran + grocery: Toko Sembako + hairdresser: Penata Rambut + hardware: Toko Perangkat Keras + hifi: Hi-Fi + insurance: Asuransi + jewelry: Toko Perhiasan + kiosk: Kios/Warung + laundry: Binatu + mall: Mall + market: Pasar + mobile_phone: Toko Handphone + motorcycle: Toko Sepeda Motor + music: Toko Musik + newsagent: Agen Surat Kabar + optician: Optik + organic: Toko Makanan Organik + outdoor: Toko Barang-Barang Outdoor + pet: Toko Hewan + photo: Studio Foto + salon: Salon + shoes: Toko Sepatu + shopping_centre: Pusat Perbelanjaan + sports: Toko Olahraga + stationery: Toko Alat Tulis + supermarket: Supermarket + toys: Toko Mainan + travel_agency: Agen Perjalanan + video: Toko Video + wine: Lisensi Toko Minuman Beralkohol + tourism: + alpine_hut: Gubuk Pegunungan + artwork: Karya Seni + attraction: Atraksi + bed_and_breakfast: Penginapan untuk Tidur dan Sarapan + cabin: Kabin + camp_site: Perkemahan + caravan_site: Tempat Karavan + chalet: Vila + guest_house: Rumah Tamu + hostel: Hostel + hotel: Hotel + information: Informasi + lean_to: Beristirahat + motel: Motel + museum: Museum + picnic_site: Tempat Piknik + theme_park: Taman Hiburan + valley: Lembah + viewpoint: Sudut Pandang + zoo: Kebun Binatang + tunnel: + "yes": Terowongan + waterway: + artificial: Jalur Air Buatan + boatyard: Halaman Kapal + canal: Kanal + connector: Penghubung Jalur Air + dam: Bendungan + derelict_canal: Kanal Air Terlantar + ditch: Parit + dock: Dermaga + drain: Saluran Air + lock: Pintu Air + lock_gate: Gerbang Pintu Air + mineral_spring: Mata Air Mineral + mooring: Sandaran Kapal + rapids: Jeram + river: Sungai + riverbank: Bantaran Sungai + stream: Arus + wadi: Sungai Kering + water_point: Titik Air + waterfall: Air Terjun + weir: Tanggul Sungai + javascripts: + close: Tutup + key: + title: Tombol Kunci + tooltip: Tombol Kunci + map: + base: + cycle_map: Peta Sepeda + standard: Standar + transport_map: Peta Transportasi + layers: + data: Data Peta + header: Layer Peta + notes: Catatan Peta + overlays: Mengaktifkan overlay untuk penyelesaian masalah peta + zoom: + in: Perbesar + out: Perkecil + notes: + new: + add: Tambah Catatan + intro: Dalam rangka meningkatkan informasi peta yang Anda masukkan untuk pemeta lainnya, jadi harap mendeskripsikan sedetail dan setepat mungkin ketika memindahkan penanda ke posisi yang benar dan masukan catatan Anda di bawah ini. + show: + anonymous_warning: Catatan ini termasuk komentar dari pengguna anonim yang harus diverifikasi secara independen. + comment: Komentar + comment_and_resolve: Komentar & Selesaikan + hide: Sembunyikan + reactivate: Aktifkan kembali + resolve: Selesaikan + share: + cancel: Batal + link: Tautan + long_link: Tautan Panjang + short_link: Tautan Pendek + title: Bagikan + site: + createnote_disabled_tooltip: Perbesar untuk menambahkan catatan pada peta + createnote_tooltip: Tambahkan catatan pada peta + edit_disabled_tooltip: Perbesar untuk mengedit peta + edit_tooltip: Edit peta + layouts: + community: Komunitas + community_blogs: Blog Komunitas + community_blogs_title: Blog dari anggota komunitas OpenStreetMap + copyright: Hak Cipta & Lisensi + donate: Dukung OpenStreetMap %{link} untuk biaya upgrade Hardware. + edit: Edit + edit_with: Edit menggunakan %{editor} + export: Ekspor + foundation: Foundation (Yayasan) + foundation_title: Yayasan OpenStreetMap + gps_traces: Trek GPS + gps_traces_tooltip: Mengatur trek GPS + help: Bantuan + history: Riwayat + home: Halaman Utama + intro_2_create_account: Buat Akun + log_in: Masuk + log_in_tooltip: Masuk dengan akun yang sudah ada + logo: + alt_text: logo OpenStreetMap + logout: Keluar + make_a_donation: + text: Menyumbang + title: Dukung OpenStreetMap dengan donasi finansial + osm_offline: Database OpenStreetMap saat ini sedang dimatikan karena sedang dilakukan pekerjaan pemeliharaan database penting. + osm_read_only: OpenStreetMap database saat ini adalah pada mode read-only (hanya dapat dilihat) sementara pekerjaan pemeliharaan database penting sedang dilakukan. + partners_bytemark: Hosting Bytemark + partners_html: Hosting didukung oleh %{ucl}, %{ic} dan %{bytemark} dan %{partners} lainnya. + partners_ic: Imperial College London + partners_partners: mitra + partners_ucl: Pusat UCL VR + sign_up: Mendaftar + sign_up_tooltip: Buat akun untuk mengedit + tag_line: Peta Dunia Wiki Gratis + user_diaries: Catatan Harian Pengguna + user_diaries_tooltip: Lihat catatan harian pengguna + license_page: + foreign: + english_link: Bahasa Inggris asli + text: Saat terjadi konflik antara halaman diterjemahkan dan %{english_original_link}, halaman bahasa Inggris akan diutamakan + title: Tentang terjemahan ini + legal_babble: + attribution_example: + alt: Contoh tentang bagaimana memberikan atribusi untuk OpenStreetMap pada halaman web + title: Contoh atribusi + contributors_at_html: "Austria: Berisi data dari\nStadt Wien (lisensi\nCC BY),\nLand Vorarlberg dan\nLand Tirol (lisensi CC-BY AT dengan perubahan)." + contributors_ca_html: "Kanada: Berisi data dari\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), dan StatCan (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: "Untuk rincian lebih lanjut, dan sumber-sumber lainnya yang telah digunakan untuk meningkatkan OpenStreetMap, silahkan lihat Kontributor halaman pada Wiki OpenStreetMap." + contributors_footer_2_html: Dimasukkannya data dalam OpenStreetMap tidak berarti bahwa penyedia data yang asli mendukung OpenStreetMap, menyediakan jaminan, atau menerima tanggung jawab apapun. + contributors_fr_html: "Perancis: Berisi data yang bersumber dari\nDirection Générale des Impôts." + contributors_gb_html: "Britania Raya: Berisi data Ordnance\nSurvey © Hak cipta dan basis data milik Kerajaan\n2010-12." + contributors_intro_html: "Kontributor kami terdiri dari ribuan orang. Kami juga memasukkan data dengan lisensi terbuka yang didapat dari badan-badan pemetaan nasional dan sumber lainnya, diantaranya:" + contributors_nl_html: "Belanda: Berisi © data AND, 2007\n(www.and.com)" + contributors_nz_html: "Selandia Baru: Berisi data yang bersumber dari\nLand Information New Zealand. Hak cipta milik Kerajaan." + contributors_title_html: Kontributor kami + contributors_za_html: "Afrika Selatan: Berisi data yang bersumber dari\nChief Directorate:\nNational Geo-Spatial Information, hak cipta milik negara." + credit_1_html: "Kami meminta anda untunk menggunakan kredit “© Kontributor OpenStreetMap\n”." + credit_2_html: Anda juga harus memperjelas bahwa data tersedia di bawah Lisensi Database Terbuka, dan jika menggunakan tiles peta kami, kartografi berlisensi sebagai CC-BY-SA. Anda dapat melakukannya dengan menghubungkan ke halaman hak cipta. Alternatifnya, dan sebagai sebuah persyaratan jika Anda mendistribusikan OSM dalam bentuk data, Anda dapat menamakan dan menghubungkannya langsung pada lisensinya. Pada media dimana tautan tidak dimungkinkan (misalnya hasil 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_html: "Untuk peta elektronik dapat ditelusuri, kredit harus muncul di sudut peta.\nSebagai contoh:" + credit_title_html: Cara memberikan kredit pada OpenStreetMap + infringement_1_html: Kontributor OSM diingatkan untuk tidak menambahkan data dari sumber yang memiliki hak cipta sendiri (misalnya, Google Maps atau peta cetak) tanpa izin eksplisit dari pemegang hak cipta. + infringement_2_html: "Jika Anda percaya bahwa materi berhak cipta telah tidak tepat\n ditambahkan ke OpenStreetMap database atau situs ini, silakan lihat prosedur takedown kami atau kirimkan file langsung pada\npengajuan halaman on-line." + infringement_title_html: Pelanggaran hak cipta + intro_1_html: Data OpenStreetMap memiliki lisensi Open Data Commons Open Database License (ODbL). + intro_2_html: "Anda dibebaskan untuk menyalin, mendistribusikan, mentransfer dan mengadaptasi data kami,\nselama Anda menyertakan OpenStreetMap dan kontributornya. Jika anda merubah atau membangun\ndata kami, Anda harus mendistribusikan hasilnya dalam lisensi yang sama.\nkode legal\ncode akan menjelaskan hak dan kewajiban Anda" + intro_3_html: "Kartografi dalam tampilan peta dan dokumentasi kami\n berlisensi di bawah Creative\nCommons Attribution-ShareAlike 2.0 lisensi (CC-BY-SA)." + more_1_html: "Baca lebih lanjut tentang menggunakan data kami, dan cara kredit kita, di Pertanyaan Legal yang sering diajukan (FAQ)" + more_2_html: "Meskipun OpenStreetMap merupakan data yang terbuka, kami tidak dapat menyediakan API peta gratis bagi pengembang (developer) pihak ketiga.\nLihat Kebijakan Penggunaan API,\nKebijakan Penggunaan Tile\ndan Kebijakan Penggunaan Nominatim." + more_title_html: Mengetahui lebih lanjut + title_html: Hak Cipta & Lisensi + native: + mapping_link: memulai pemetaan + native_link: Versi Bahasa Indonesia + text: Anda melihat versi bahasa Inggris dari halaman hak cipta. Anda dapat kembali ke %{native_link} dari Halaman ini atau Anda dapat berhenti membaca tentang hak cipta dan %{mapping_link}. + title: Tentang Halaman ini + message: + delete: + deleted: Pesan dihapus + inbox: + date: Tanggal + from: Dari + messages: Anda memiliki %{new_messages} dan %{old_messages} + my_inbox: Kotak Masuk Saya + new_messages: + one: "%{count} pesan baru" + other: "%{count} pesan baru" + no_messages_yet: Anda belum memiliki pesan. Mengapa tidak berhubungan dengan beberapa %{people_mapping_nearby_link}? + old_messages: + one: "%{count} pesan lama" + other: "%{count} pesan lama" + outbox: Kotak keluar + people_mapping_nearby: orang-orang disekitar Anda yang melakukan pemetaan + subject: Subyek + title: Kotak Masuk + mark: + as_read: Pesan ditandai sebagai telah dibaca + as_unread: Pesan ditandai sebagai belum dibaca + message_summary: + delete_button: Hapus + read_button: Tandai sudah dibaca + reply_button: Balas + unread_button: Tandai belum dibaca + new: + back_to_inbox: Kembali ke kotak masuk + body: Isi Pesan + limit_exceeded: Anda telah mengirim banyak sekali pesan baru akhir-akhir ini. Silahkan tunggu sebentar sebelum mencoba mengirimkan lagi. + message_sent: Pesan terkirim + send_button: Kirim + send_message_to: Kirim pesan baru ke %{name} + subject: Subyek + title: Kirim Pesan + no_such_message: + body: Maaf tidak ada pesan dengan id tersebut. + heading: Tidak ada pesan + title: Tidak ada pesan + outbox: + date: Tanggal + inbox: kotak masuk + messages: + one: Anda memiliki %{count} pesan terkirim + other: Anda memiliki %{count} pesan terkirim + my_inbox: "%{inbox_link} saya" + no_sent_messages: Anda belum memiliki pesan. Mengapa tidak berhubungan dengan beberapa %{people_mapping_nearby_link}? + outbox: kotak keluar + people_mapping_nearby: orang-orang disekitar Anda yang melakukan pemetaan + subject: Subjek + title: Kotak keluar + to: Kepada + read: + date: Tanggal + from: Dari + reply_button: Balas + subject: Subjek + title: Baca pesan + to: Kepada + unread_button: Tandai belum dibaca + wrong_user: Anda login sebagai '%{user}' tetapi pesan yang anda balas tidak dikirim oleh atau untuk pengguna tersebut. Silahkan login sebagai pengguna yang benar untuk membacanya. + reply: + wrong_user: Anda login sebagai '%{user}' tapi pesan yang Anda balas tidak terkirim ke pengguna. Silahkan login sebagai pengguna yang benar untuk membalas. + sent_message_summary: + delete_button: Hapus + note: + description: + closed_at_by_html: Diselesaikan %{when} yang lalu oleh %{user} + closed_at_html: Diselesaikan %{when} yang lalu + commented_at_by_html: Diperbarui %{when} yang lalu oleh %{user} + commented_at_html: Diperbarui %{when} yang lalu + opened_at_by_html: Dibuat %{when} yang lalu oleh %{user} + opened_at_html: Dibuat %{when} yang lalu + reopened_at_by_html: Diaktifkan kembali %{when} yang lalu oleh %{user} + reopened_at_html: Diaktifkan kembali %{when} yang lalu + entry: + comment: Komentar + full: Catatan lengkap + mine: + ago_html: "%{when} yang lalu" + created_at: Dibuat pada + creator: Pembuat + description: Deskripsi + heading: catatan oleh %{user} + id: Id + last_changed: Terakhir diubah + subheading: Catatan dimasukkan atau dikomentari oleh %{user} + title: Catatan dimasukkan atau dikomentari oleh %{user} + rss: + closed: catatan ditutup (near %{place}) + commented: komentar baru (near %{place}) + description_area: Daftar catatan, laporan, komentar atau ditutup di daerah Anda [( %{min_lat}|%{min_lon})--( %{max_lat}|%{max_lon})] + description_item: Sebuah rss feed untuk catatan %{id} + opened: catatan baru (near %{place}) + reopened: catatan yang diaktifkan kembali (near %{place}) + title: Catatan OpenStreetMap + notifier: + diary_comment_notification: + footer: Anda juga dapat membaca komentar pada %{readurl} dan Anda juga dapat berkomentar pada %{commenturl} atau membalas pada %{replyurl} + header: "%{from_user} mengomentari entri terbaru dari catatan harian OpenStreetMap Anda dengan subjek %{subject}:" + hi: Halo %{to_user}, + subject: "[OpenStreetMap] %{user} mengomentari entri catatan harian Anda" + email_confirm: + subject: "[OpenStreetMap] Konfirmasi alamat email Anda" + email_confirm_html: + click_the_link: Jika ini adalah Anda, silahkan klik link di bawah ini untuk mengkonfirmasi perubahan. + greeting: Halo, + hopefully_you: Seseorang (semoga saja Anda) ingin mengubah alamat email pada %{server_url} menjadi %{new_address}. + email_confirm_plain: + click_the_link: Jika ini adalah Anda, silahkan klik link di bawah ini untuk mengkonfirmasi perubahan. + greeting: Halo, + hopefully_you: Seseorang (semoga saja Anda) ingin mengubah alamat email pada %{server_url} menjadi %{new_address}. + friend_notification: + befriend_them: Anda juga dapat menambahkannua sebagai teman di %{befriendurl}. + had_added_you: "%{user} telah menambahkan Anda sebagai teman pada OpenStreetMap." + see_their_profile: Anda dapat melihat profilnya pada %{userurl}. + subject: "[OpenStreetMap] %{user} menambahkan Anda sebagai teman" + gpx_notification: + and_no_tags: dan tanpa tag. + and_the_tags: "dan tag berikut:" + failure: + failed_to_import: "gagal melakukan impor. Berikut ini adalah kesalahannya:" + more_info_1: Informasi lebih lanjut mengenai kegagalan mengimpor GPX dan bagaimana menghindarinya + more_info_2: "dapat ditemukan pada:" + subject: "[OpenStreetMap] gagal impor GPX" + greeting: Halo, + success: + loaded_successfully: telah berhasil dengan %{trace_points} dari %{possible_points} titik yang mungkin. + subject: "[OpenStreetMap] impor GPX sukses" + with_description: dengan deskripsi + your_gpx_file: Kelihatannya ini file GPX Anda + lost_password: + subject: "[OpenStreetMap] Permintaan atur ulang sandi" + lost_password_html: + click_the_link: Jika ini Anda, silahkan klik link di bawah ini untuk menyetel ulang kata sandi. + greeting: Halo, + hopefully_you: Seseorang (kemungkinan Anda) telah meminta untuk mengatur ulang password pada alamat email dari akun openstreetmap.org ini. + lost_password_plain: + click_the_link: Jika ini Anda, silahkan klik link di bawah ini untuk menyetel ulang kata sandi. + greeting: Halo, + hopefully_you: Seseorang (kemungkinan Anda) telah meminta untuk mengatur ulang password pada alamat email dari akun openstreetmap.org ini. + message_notification: + header: "%{from_user} telah mengirim sebuah pesan kepada Anda melalui OpenStreetMap dengan subjek %{subject}:" + hi: Halo %{to_user}, + note_comment_notification: + anonymous: Seorang pengguna anonim + closed: + commented_note: "%{commenter} telah meninggalkan komentar pada peta catatan yang Anda komentari. Catatan ini dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah menyelesaikan sebuah catatan yang Anda minati" + subject_own: "[OpenStreetMap] %{commenter} telah menyelesaikan salah satu catatan Anda" + your_note: "%{commenter} telah menyelesaikan salah satu catatan peta Anda dekat %{place}." + commented: + commented_note: "%{commenter} memberi komentar pada catatan peta yang Anda komentari. Catatan ini dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah berkomentar pada catatan yang Anda minati" + subject_own: "[OpenStreetMap] %{commenter} memberikan komentar di salah satu catatan Anda" + your_note: "%{commenter} telah meninggalkan komentar pada salah satu catatan peta Anda dekat %{place}." + details: Rincian lebih lanjut mengenai catatan dapat ditemukan di %{url}. + greeting: Halo, + reopened: + commented_note: "%{commenter} telah meninggalkan komentar pada catatan peta yang Anda komentari. Catatan ini dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah mengaktifkan kembali catatan yang Anda minati" + subject_own: "[OpenStreetMap] %{commenter} telah mengaktifkan kembali salah satu catatan Anda" + your_note: "%{commenter} telah mengaktifkan kembali salah satu catatan peta Anda dekat %{place}." + signup_confirm: + confirm: "Sebelum kita melakukan hal lainnya, kita perlu melakukan konfirmasi bahwa permintaan ini datang dari Anda, jadi bila benar silahkan Anda klik link di bawah ini untuk melakukan konfirmasi akun Anda:" + created: Seseorang (mudah-mudahan Anda) baru saja membuat sebuah akun pada %{site_url}. + greeting: Halo! + subject: "[OpenStreetMap] Selamat datang di OpenStreetMap" + welcome: Kami ingin menyambut Anda dan memberikan Anda beberapa informasi tambahan agar Anda dapat segera memulainya. + oauth: + oauthorize: + allow_read_gpx: baca trek GPS pribadi Anda. + allow_read_prefs: baca pengaturan pengguna anda. + allow_to: "Memungkinkan klien aplikasi untuk:" + allow_write_api: memodifikasi peta. + allow_write_diary: membuat entri buku harian, komentar dan berteman. + allow_write_gpx: Upload trek GPS + allow_write_notes: memodifikasi catatan. + allow_write_prefs: modifikasi pengaturan pengguna anda. + request_access: Aplikasi %{app_name} akan meminta akses ke akun, %{user}. Periksa apakah Anda ingin aplikasi untuk memiliki kemampuan berikut. Anda dapat memilih sebanyak atau sesedikit yang Anda inginkan. + revoke: + flash: Anda telah menolak token untuk %(application} + oauth_clients: + create: + flash: Informasi telah terdaftar dengan sukses. + destroy: + flash: Registrasi aplikasi klien telah dibatalkan. + edit: + submit: Edit + title: Edit aplikasi Anda + form: + allow_read_gpx: baca trek GPS pribadi mereka + allow_read_prefs: Baca pengaturan mereka sebagai pengguna. + allow_write_api: modifikasi peta + allow_write_diary: membuat entri buku harian, komentar dan buat pertemanan. + allow_write_gpx: upload trek GPS + allow_write_notes: memodifikasi catatan. + allow_write_prefs: memodifikasi pengaturan mereka sebagai pengguna. + callback_url: Panggilan kembali URL + name: Nama + requests: "Meminta izin berikut dari pengguna:" + required: Diperlukan + support_url: URL Dukungan + url: URL Aplikasi utama + index: + application: Nama aplikasi + issued_at: Diterbitkan di + list_tokens: "Token berikut telah dikeluarkan untuk aplikasi untuk nama Anda:" + my_apps: Aplikasi klien saya + my_tokens: Aplikasi yang telah saya setujui + no_apps: Apakah anda memiliki aplikasi yang ingin didaftarkan untuk digunakan dengan menggunakan standar %{oauth}? Anda harus mendaftar aplikasi web Anda sebelum dapat membuat permintaan OAuth untuk layanan ini. + register_new: Daftarkan aplikasi anda + registered_apps: "Anda memiliki aplikasi klien terdaftar berikut:" + revoke: Batalkan! + title: Rincian OAuth saya + new: + submit: Daftar + title: Daftar aplikasi baru + not_found: + sorry: Maaf, %{type} tidak dapat ditemukan. + show: + access_url: "Akses URL Token:" + allow_read_gpx: baca trek GPS pribadi mereka + allow_read_prefs: Baca pengaturan mereka sebagai pengguna. + allow_write_api: modifikasi peta. + allow_write_diary: membuat entri buku harian, komentar dan membuat pertemanan. + allow_write_gpx: upload trek GPS. + allow_write_notes: memodifikasi catatan. + allow_write_prefs: memodifikasi pengaturan mereka sebagai pengguna. + authorize_url: "Otorisasi URL:" + confirm: Apakah Anda yakin? + delete: Menghapus klien + edit: Edit Rincian + key: "Key konsumen:" + requests: "Meminta izin berikut dari pengguna:" + secret: "Rahasia konsumen:" + support_notice: Kami mendukung tanda tangan HMAC-SHA1 (disarankan) dan RSA-SHA1 + title: Rincian OAuth untuk %{app_name} + url: "Minta URL Token:" + update: + flash: Informasi klien telah sukses diperbarui. + redaction: + create: + flash: Redaksi dibuat. + destroy: + error: Ada kesalahan menghancurkan Redaksi ini. + flash: Redaksi dihancurkan. + not_empty: Redaksi tidak kosong. Silakan tidak-menyusun semua versi milik redaksi ini sebelum merusaknya. + edit: + description: Deskripsi + heading: Mengedit Redaksi + submit: Simpan Redaksi + title: Mengedit Redaksi + index: + empty: Tidak ada redaksi untuk menunjukkan. + heading: Daftar redaksi + title: Daftar redaksi + new: + description: Deskripsi + heading: Masukkan informasi untuk redaksi baru + submit: Membuat Redaksi + title: Membuat redaksi baru + show: + confirm: Apakah Anda yakin? + description: "Deskripsi:" + destroy: Menghapus Redaksi ini + edit: Mengedit Redaksi ini + heading: Menampilkan Redaksi "%{title}" + title: Menampilkan Redaksi + user: "Pembuat:" + update: + flash: Perubahan telah disimpan. + site: + edit: + anon_edits_link_text: Cari tahu mengapa hal ini terjadi. + flash_player_required: Anda membutuhkan Flash player untuk menggunakan Potlatch, editor OpenStreetMap berbasis Flash. Anda dapat men-download Flash Player dari Adobe.com. Beberapa opsi lain juga tersedia untuk mengedit OpenStreetMap. + id_not_configured: iD belum dikonfigurasikan + no_iframe_support: Browser Anda tidak mendukung iframes HTML yang diperlukan untuk fitur ini. + not_public: Anda belum mengatur hasil edit Anda menjadi publik. + not_public_description: Anda tidak dapat mengedit peta kecuali Anda melakukannya. Anda dapat mengatur editan Anda sebagai umum dari halaman %{user_page}. + potlatch2_not_configured: Potlatch 2 belum dikonfigurasi - silakan lihat http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 untuk informasi lebih lanjut + potlatch2_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk menyimpannya dengan Potlatch 2, Anda dapat klik simpan.) + 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.) + user_page_link: halaman pengguna + index: + createnote: Tambahkan catatan + js_1: Anda menggunakan browser yang tidak mendukung JavaScript, atau Anda telah menonaktifkan JavaScript. + js_2: OpenStreetMap menggunakan JavaScript untuk slippy map nya. + license: + copyright: Hak cipta dan kontributor OpenStreetMap, di bawah lisensi terbuka + permalink: Permalink + remote_failed: Gagal melakukan edit - pastikan JOSM atau Merkaartor telah termuat dan opsi remote control telah diaktifkan + shortlink: Shortlink + key: + table: + entry: + admin: Batas administrasi + allotments: Tanah garap + apron: + - Tempat Parkir Pesawat + - terminal + bridge: Black casing = jembatan + bridleway: Jalan Tanah + brownfield: Lahan kosong + building: Bangunan Penting + byway: Jalan Kampung + cable: + - Kereta Kabel + - Kereta Gantung + cemetery: Pemakaman + centre: Pusat Olahraga + commercial: Area komersial + common: + - Umum + - Padang rumput + construction: Jalan sedang diperbaiki + cycleway: Jalur Sepeda + destination: Akses Tujuan + farm: Pertanian + footway: Jalan Setapak + forest: Hutan + golf: Lapangan Golf + heathland: Semak + industrial: Kawasan industri + lake: + - Danau + - Wilayah Serapan (Reservoir) + military: Kawasan militer + motorway: Jalan Tol + park: Taman + permissive: Akses Permisif + pitch: Lapangan Olahraga + primary: Jalan Primer + private: Akses pribadi + rail: Rel Kereta + reserve: Cagar Alam + resident: Area Permukiman + retail: Area pertokoan retail + runway: + - Landasan bandara + - Jalur taxi + school: + - Sekolah + - universitas + secondary: Jalan Sekunder + station: Stasiun Kereta Api + subway: Kereta bawah tanah + summit: + - Puncak + - puncak + tourist: Objek wisata + track: Trek + tram: + - Kereta listrik + - trem + trunk: Jalan Utama Bukan Tol + tunnel: Dashed Casing = terowongan + unclassified: Jalan Tidak Terklasifikasi + unsurfaced: Jalan Tanpa Permukaan + wood: Kayu + markdown_help: + alt: Teks Alternatif + first: Objek pertama + heading: Judul + headings: Judul + image: Gambar + link: Tautan + ordered: Daftar terurut + second: Objek kedua + subheading: Subjudul + text: Teks + title_html: Diurai dengan Markdown + unordered: Daftar tak berurut + url: URL + richtext_area: + edit: Edit + preview: Tinjauan + search: + search: Pencarian + submit_text: Lanjut + where_am_i: Di mana saya? + where_am_i_title: Deskripsikan lokasi Anda saat ini menggunakan mesin pencari + sidebar: + close: Tutup + search_results: Hasil Pencarian + time: + formats: + friendly: "%e %B %Y pada %H:%M" + trace: + create: + trace_uploaded: File GPX Anda telah di-upload dan menunggu penyisipan dalam database. Ini biasanya akan membutuhkan waktu setengah jam, dan sebuah email akan dikirim kepada Anda ketika sudah selesai. + upload_trace: Upload trek GPS + delete: + scheduled_for_deletion: Trek yang dijadwalkan untuk dihapus + edit: + description: "Deskripsi:" + download: download + edit: edit + filename: "Nama File:" + heading: Mengedit dijitasi %{name} + map: peta + owner: "Pemilik:" + points: "Poin/Titik:" + save_button: Simpan Perubahan + start_coord: "Koordinat awal:" + tags: "Tags:" + tags_help: dipisahkan oleh koma + title: Mengedit jejak %{name} + uploaded_at: "Diupload:" + visibility: Visibilitas + visibility_help: apa artinya ini? + list: + description: Telusuri hasil upload trek GPS terbaru + empty_html: Belum ada apapun di sini. Meng-upload trek GPS baru atau belajar lebih banyak tentang trek GPS pada halaman wiki. + public_traces: Trek GPS umum + public_traces_from: Trek GPS umum dari %{user} + tagged_with: di tag dengan %{tags} + your_traces: Trek GPS Anda + make_public: + made_public: Trek GPS yang dipublikasikan + offline: + heading: Penyimpanan GPX Offline + message: Sistem upload dan penyimpanan file GPX saat ini tidak tersedia. + offline_warning: + message: Sistem upload file GPX saat ini tidak tersedia + trace: + ago: "%{time_in_words_ago} yang lalu" + by: oleh + count_points: "%{count} titik" + edit: edit + edit_map: Edit Peta + identifiable: DIIDENTIFIKASI + in: dalam + map: peta + more: selebihnya + pending: TERTUNDA + private: PRIBADI + public: UMUM + trace_details: Lihat rincian trek + trackable: DILACAK + view_map: Lihat peta + trace_form: + description: Deskripsi + help: Bantuan + tags: "Tags:" + tags_help: dipisahkan oleh koma + upload_button: Upload + upload_gpx: "Upload File GPX:" + visibility: Visibilitas + visibility_help: apa artinya ini? + trace_header: + see_all_traces: Lihat semua dijitasi + see_your_traces: Melihat dijitasi Anda + traces_waiting: + one: "Anda memiliki trek GPS %{count} yang menunggu untuk diupload. Harap pertimbangkan proses ini untuk diselesaikan sebelum meng-upload lagi, sehingga Anda tidak memblokir antrian untuk %{count} pengguna lain. " + other: Anda memiliki %{count} trek GPS yang menunggu untuk diupload. Harap pertimbangkan proses ini untuk diselesaikan sebelum meng-upload lagi, sehingga Anda tidak memblokir antrian untuk %{count} pengguna lain. + upload_trace: Upload trek GPS + trace_optionals: + tags: "Tags:" + trace_paging_nav: + newer: Trek-trek terbaru + older: Trek-trek lama + showing_page: Halaman %{page} + view: + delete_track: Hapus trek ini + description: "Deskripsi:" + download: download + edit: edit + edit_track: "Edit trek ini:" + filename: "Nama File:" + heading: Melihat trek %{name} + map: peta + none: Tidak ada + owner: "Pemilik:" + pending: TERTUNDA + points: "Poin/Titik:" + start_coordinates: Koordinat Awal + tags: "Tag:" + title: Melihat trek %{name} + trace_not_found: Trek tidak ditemukan! + uploaded: "Diupload:" + visibility: Visibilitas + visibility: + identifiable: Dapat Diidentifikasi (ditampilkan dalam daftar jejak dan sebagai diidentifikasi, mengatur poin dengan waktu pengambilan) + private: Pribadi (hanya berbagi sebagai anonim, poin tidak berurut) + public: Publik (ditampilkan dalam daftar jejak dan sebagai anonim, poin tidak berurut) + trackable: Dapat Dilacak (hanya berbagi sebagai anonim, memerintahkan poin dengan cap waktu) + user: + account: + contributor terms: + agreed: Anda telah menyetujui Persyaratan Kontributor yang baru. + agreed_with_pd: Anda juga telah menyatakan bahwa Anda mempertimbangkan suntingan Anda berada dalam Domain publik. + heading: "Syarat-syarat Kontributor:" + link text: Apa ini? + not yet agreed: Anda belum menyetujui Persyaratan Kontributor yang baru. + review link text: Silahkan ikuti link ini untuk kenyamanan Anda untuk meninjau dan menyetujui Persyaratan Kontributor yang baru. + current email address: "Alamat Email Saat Ini:" + delete image: Hapus gambar saat ini + email never displayed publicly: (jangan pernah ditampilkan ke publik) + flash update success: Informasi mengenai pengguna sudah berhasil diperbarui. + flash update success confirm needed: Informasi pengguna telah berhasil diperbarui. Periksa email untuk melakukan konfirmasi alamat email. + gravatar: + gravatar: Gunakan Gravatar + link text: apa ini? + home location: "Lokasi Beranda:" + image: "Gambar:" + image size hint: (kotak gambar yang dapat bekerja terbaik paling tidak berukuran 100x100) + keep image: Gunakan gambar saat ini + latitude: "Garis Lintang:" + longitude: "Garis Bujur:" + make edits public button: Membuat seluruh suntingan saya menjadi publik + my settings: Pengaturan saya + new email address: "Alamat Email Baru:" + new image: Tambahkan gambar + no home location: Anda telah memasukkan lokasi rumah Anda. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: Apa ini? + openid: "OpenID:" + preferred editor: "Editor yang Dipilih:" + preferred languages: "Bahasa yang Dipilih:" + profile description: "Deskripsi Profil:" + public editing: + disabled: Dinonaktifkan dan tidak dapat mengedit data, seluruh hasil edit sebelumnya anonim. + disabled link text: mengapa saya tidak bisa mengedit? + enabled: Diaktifkan. Tidak anonim dan dapat mengedit data. + enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link text: Apa ini? + heading: "Mengedit secara publik:" + public editing note: + heading: Mengedit secara publik + text: Saat ini suntingan Anda adalah tanpa nama dan orang tidak dapat mengirimkan pesan atau melihat lokasi Anda. Untuk menunjukkan apa yang Anda telah edit dan memungkinkan orang menghubungi Anda melalui situs web, klik tombol di bawah ini. Sejak perubahan ke API 0.6 , hanya pengguna umum yang dapat mengedit data peta. (Cari tahu mengapa).
    • Alamat email Anda akan tidak dipublikasikan apabila anda menjadi pengguna umum.
    • Tindakan ini tidak dapat dikembalikan dan semua pengguna baru akan diatur sebagai pengguna umum secara standar.
    + replace image: Ganti gambar saat ini + return to profile: Kembali ke profil + save changes button: Simpan Perubahan + title: Edit akun + update home location on click: Memperbarui lokasi rumah ketika saya klik pada peta? + confirm: + already active: Akun ini telah dikonfirmasi. + button: Konfirmasi + heading: Konfirmasi akun pengguna + press confirm button: Tekan tombol konfirmasi di bawah ini untuk mengaktifkan akun Anda. + unknown token: Token tersebut tampaknya tidak ada. + confirm_email: + button: Konfirmasi + failure: Sebuah alamat email telah dikonfirmasikan dengan token ini. + heading: Konfirmasi perubahan alamat email + press confirm button: Tekan tombol konfirmasi di bawah ini untuk melakukan konfirmasi alamat email baru Anda. + success: Mengkonfirmasi alamat email Anda, terima kasih telah mendaftar! + confirm_resend: + failure: Pengguna %{name} tidak ditemukan. + success: Kami telah mengirim catatan konfirmasi baru ke %{email} dan setelah Anda mengkonfirmasi akun, Anda akan dapat mulai melakukan pemetaan.

    Jika Anda menggunakan sistem anti spam yang mengirimkan permintaan konfirmasi silahkan pastikan Anda memasukkan webmaster@openstreetmap.org ke dalam daftar putih karena kami tidak dapat membalas permintaan konfirmasi Anda. + filter: + not_an_administrator: Anda harus merupakan administrator untuk melakukan tindakan ini. + go_public: + flash success: Semua hasil edit Anda sekarang sudah publik, dan Anda diperbolehkan untuk mengedit. + list: + confirm: Konfirmasi Pengguna yang Dipilih + empty: Tidak ditemukan pengguna yang sesuai + heading: Pengguna + hide: Sembunyikan Pengguna yang Dipilih + showing: + one: Page %{page} (%{first_item} dari %{items}) + other: Page %{page} (%{first_item}-%{last_item} of %{items}) + summary: "%{name} dibuat dari %{ip_address} pada %{date}" + summary_no_ip: "%{name} dibuat pada %{date}" + title: Pengguna + login: + account is suspended: Maaf, akun Anda telah dihentikan karena adanya aktivitas mencurigakan.
    Silahkan kontak/hubungiwebmaster jika Anda ingin mendiskusikannya. + account not active: Maaf, akun Anda belum aktif.
    Silahkan gunakan link pada email konfirmasi untuk mengaktifkan akun Anda, atau minta email konfirmasi yang baru. + auth failure: Maaf, tidak bisa login dengan rincian tersebut. + create account minute: Buat sebuah akun. Hanya membutuhkan satu menit. + email or username: "Alamat Email atau Nama Pengguna:" + heading: Login + login_button: Login + lost password link: Kehilangan kata sandi Anda? + new to osm: Baru di OpenStreetMap? + no account: Belum memiliki akun? + openid: "%{logo} OpenID:" + openid invalid: Maaf, OpenID Anda tampaknya cacat. + openid missing provider: Maaf, tidak bisa menghubungi penyedia OpenID Anda + openid_logo_alt: Login dengan OpenID + openid_providers: + aol: + alt: Login dengan AOL OpenID + title: Login dengan AOL + google: + alt: Login dengan Google OpenID + title: Login dengan Google + myopenid: + alt: Login dengan myOpenID OpenID + title: Login dengan myOpenID + openid: + alt: Login menggunakan URL OpenID + title: Login dengan OpenID + wordpress: + alt: Login dengan Wordpress OpenID + title: Login dengan Wordpress + yahoo: + alt: Login dengan Yahoo OpenID + title: Login dengan Yahoo + password: "Kata Sandi:" + register now: Daftar sekarang + remember: Inget saya + title: Login + to make changes: Untuk membuat perubahan data OpenStreetMap, Anda harus memiliki sebuah akun. + with openid: "Sebagai alternatif silahkan gunakan OpenID Anda untuk melakukan login:" + with username: "Sudah memiliki akun OpenStreetMap? Silahkan login menggunakan nama pengguna dan kata sandi Anda:" + logout: + heading: Logout dari OpenStreetMap + logout_button: Logout + title: Logout + lost_password: + email address: "Alamat Email:" + heading: Lupa Kata Sandi? + help_text: Masukkan alamat email yang Anda gunakan untuk mendaftar, kami akan mengirim link ke alamat tersebut yang dapat Anda gunakan untuk menyetel ulang kata sandi Anda. + new password button: Setel ulang kata sandi + notice email cannot find: Tidak dapat menemukan alamat email tersebut, maaf. + notice email on way: Maaf sudah hilang :-( namun sebuah email telah dikirimkan agar Anda dapat segera mengatur ulang. + title: Kehilangan kata sandi + make_friend: + already_a_friend: Anda sudah berteman dengan %{name}. + button: Tambahkan sebagai teman + failed: Maaf, gagal menambahkan %{name} sebagai teman. + heading: Tambahkan %{user} sebagai teman? + success: "%{name} sekarang adalah teman Anda!" + new: + confirm email address: "Konfirmasi Alamat Email:" + confirm password: "Konfirmasi Kata Sandi:" + contact_webmaster: Silahkan kontak webmaster untuk mengatur sebuah akun untuk dibuat - kami akan mencoba menangani permintaan ini secepat mungkin. + continue: Lanjut + display name: "Tampilan Nama:" + display name description: Username Anda yang ditampilkan pada publik. Anda dapat mengubahnya dalam pengaturan. + email address: "Alamat Email:" + license_agreement: Ketika Anda mengkonfirmasi akun Anda, Anda harus setuju dengan persyaratan kontributor. + no_auto_account_create: Sayangnya saat ini kami tidak dapat membuatkan akun secara otomatis untuk Anda. + not displayed publicly: Tidak dipajangkan secara umum (Lihat kebijakan privasi) + openid: "%{logo} OpenID:" + openid association: "

    OpenID Anda belum diasosiasikan dengan akun OpenStreetMap.

    \n
      \n
    • Jika Anda baru di OpenStreetMap, silahkan buat sebuah akun baru menggunakan formulir di bawah ini.
    • \n
    • \n Jika Anda telah memiliki akun, Anda dapat login ke akun Anda\n menggunakan username (nama pengguna) dan kata sandi kemudian asosiasikan akun tersebut\n dengan OpenID Anda pada pegaturan pengguna.\n
    • \n
    " + openid no password: Dengan OpenID, kata sandi tidak diperlukan, namun untuk beberapa alat tambahan atau server mungkin masih membutuhkannya. + password: "Kata Sandi:" + terms accepted: Terima kasih telah menerima persyaratan kontributor yang baru! + terms declined: Kami mohon maaf Anda tidak menerima Persyaratan Kontributor baru. Untuk informasi lebih lanjut, silahkan lihat this wiki page. + title: Buat akun + use openid: Atau gunakan %{logo} OpenID untuk login + no_such_user: + body: Maaf, tidak ada pengguna dengan nama %{user}. Silahkan cek kembali ejaan, atau mungkin link yang Anda klik salah. + heading: Pengguna %{user} tidak dapat ditemukan + title: Pengguna tersebut tidak ditemukan + popup: + friend: Teman + nearby mapper: Pembuat peta disekitar Anda + your location: Lokasi Anda + remove_friend: + button: Hapus sebagai teman + heading: Hapus %{user} sebagai teman? + not_a_friend: "%{name} bukanlah salah satu dari teman Anda." + success: "%{name} telah dihapus dari daftar teman Anda." + reset_password: + confirm password: "Konfirmasi Kata Sandi:" + flash changed: Kata sandi Anda telah diubah. + flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin? + heading: Setel ulang kata sandi untuk %{user} + password: "Kata Sandi:" + reset: Setel Ulang Kata Sandi + title: Setel ulang kata sandi + set_home: + flash success: Lokasi rumah berhasil disimpan + suspended: + body: "

    \n Maaf, akun Anda telah ditangguhkan secara otomatis dikarenakan \n aktivitas yang mencurigakan. \n

    \n

    \n Keputusan ini akan ditinjau ulang oleh seorang administrator sesaat lagi, atau\n anda dapat menghubungi %{webmaster} jika Anda ingin mendiskusikannya.\n

    " + heading: Akun Ditangguhkan + title: Akun Ditangguhkan + webmaster: webmaster + terms: + agree: Setuju + consider_pd: Sebagai tambahan perjanjian di atas, saya menganggap kontribusi saya berada di dalam Domain Publik + consider_pd_why: Apa ini? + decline: Tolak + guidance: "Informasi untuk membantu Anda memahami persyaratan ini: sebuah ringkasan yang mudah dibaca dan beberapa terjemahan informal" + heading: Persyaratan Kontributor + legale_names: + france: Perancis + italy: Italia + rest_of_world: Bagian Lainnya dari Dunia + legale_select: "Silahkan pilih negara tempat tinggal Anda:" + read and accept: Silahkan baca perjanjian di bawah dan tekan tombol setuju untuk mengkonfirmasi bahwa Anda menerima persyaratan dari perjanjian ini untuk kontribusi Anda yang sudah ada dan di masa yang akan datang. + title: Persyaratan Kontributor + you need to accept or decline: Silahkan baca dan setujui atau tolak Persyaratan Kontributor yang baru untuk melanjutkan. + view: + activate_user: aktifkan pengguna ini + add as friend: tambahkan sebagai teman + ago: (%{time_in_words_ago} yang lalu) + block_history: blok diterima + blocks by me: blokir oleh saya + blocks on me: blokir pada saya + comments: komentar + confirm: Konfirmasi + confirm_user: konfirmasi pengguna ini + create_block: Blokir pengguna ini + created from: "Dibuat pada:" + ct accepted: Telah diterima %{ago} yang lalu + ct declined: Tolak + ct status: "Syarat-syarat kontributor:" + ct undecided: Belum diputuskan + deactivate_user: nonaktifkan pengguna ini + delete_user: hapus pengguna ini + description: Deskripsi + diary: catatan harian + edits: hasil edit + email address: "Alamat email:" + friends_changesets: Telusuri semua set perubahan yang dibuat oleh teman-teman + friends_diaries: Telusuri seluruh entri catatan harian oleh teman-teman + hide_user: sembunyikan pengguna ini + if set location: Menyetel lokasi rumah %{settings_link} untuk melihat pengguna terdekat + km away: sejauh %{count}km + latest edit: "Hasil edit terakhir %{ago}:" + m away: sejauh %{count} meter + mapper since: "Melakukan pemetaan sejak:" + moderator_history: blok yang diberikan + my comments: komentar saya + my diary: catatan harian saya + my edits: hasil edit saya + my notes: Catatan peta saya + my settings: pengaturan saya + my traces: trek saya + nearby users: Pengguna lain terdekat + nearby_changesets: Telusuri seluruh set perubahan oleh pengguna terdekat + nearby_diaries: Telurusi seluruh entri catatan harian oleh pengguna terdekat + new diary entry: Entri baru catatan harian + no friends: Anda belum menambahkan teman. + no nearby users: Tidak ada pengguna lain yang mengaku untuk melakukan pemetaan terdekat. + notes: catatan peta + oauth settings: Pengaturan oauth + remove as friend: hapus sebagai teman + role: + administrator: Pengguna ini merupakan administrator + grant: + administrator: Memberikan akses administrator + moderator: Memberikan akses moderator + moderator: Pengguna ini adalah moderator + revoke: + administrator: Mencabut akses administrator + moderator: Mencabut akses moderator + send message: kirim pesan + settings_link_text: pengaturan + spam score: "Jumlah Spam:" + status: "Status:" + traces: trek + unhide_user: munculkan kembali pengguna ini + user location: Lokasi pengguna + your friends: Teman Anda + user_block: + blocks_by: + empty: "%{name} belum membuat blokir apapun." + heading: Daftar blokir oleh %{name} + title: Blokir oleh %{name} + blocks_on: + empty: "%{name} belum diblokir." + heading: Daftar blokir pada %{name} + title: Diblokir pada %{name} + create: + flash: Telah melakukan blokir pada pengguna %{name}. + try_contacting: Silahkan coba untuk menghubungi pengguna sebelum memblokir mereka dan memberi waktu yang wajar bagi mereka untuk menanggapi. + try_waiting: Cobalah berikan waktu yang wajar bagi pengguna untuk merespon sebelum memblokir mereka. + edit: + back: Lihat semua blokir + heading: Mengedit blokir pada %{name} + needs_view: Apakah pengguna harus login sebelum blokirnya dihapus? + period: Berapa lama, mulai dari sekarang, pengguna akan diblokir dari API. + reason: Alasan mengapa %{name} diblokir. Harap tenang, berikan detail sebanyak mungkin dan masuk akal mengenai situasi Anda. Perlu diingat bahwa tidak semua pengguna memahami jargon masyarakat, jadi silakan coba untuk menggunakan istilah-istilah laymans. + show: Lihat blokir ini + submit: Perbarui blokir + title: Mengedit blokir pada %{name} + filter: + block_expired: Blokir sudah kadaluwarsa dan tidak bisa diedit. + block_period: Periode blokir harus merupakan salah satu nilai yang dapat dipilih dari daftar drop-down atau pilihan. + helper: + time_future: Berakhir pada %{time}. + time_past: Berakhir %{time} yang lalu. + until_login: Aktif sampai pengguna melakukan log in. + index: + empty: Belum ada blokir yang dibuat. + heading: Daftar blokir oleh pengguna + title: Blokir oleh pegguna + model: + non_moderator_revoke: Harus merupakan moderator untuk mencabut blokir. + non_moderator_update: Harus merupakan moderator untuk membuat atau memperbarui blokir. + new: + back: Lihat semua blokir + heading: Membuat blokir pada %{name} + needs_view: Pengguna perlu log in sebelum blokir ini dihapus + period: Berapa lama, mulai dari sekarang, pengguna akan diblokir dari API. + reason: Alasan mengapa %{name} diblokir. Harap tenang, berikan detail sebanyak mungkin dan masuk akal mengenai situasi Anda, mengingat bahwa persan akan terlihat oleh umum. Perlu diingat bahwa tidak semua pengguna memahami jargon masyarakat, jadi silakan coba untuk menggunakan istilah-istilah laymans. + submit: Buat blokir + title: Membuat blokir pada %{name} + tried_contacting: Saya telah menghubungi pengguna tersebut dan memintanya untuk berhenti. + tried_waiting: Saya telah memberi jumlah waktu yang wajar kepada pengguna untuk menanggapi komunikasi tersebut. + not_found: + back: Kembali ke indeks + sorry: Maaf, blokir pengguna dengan ID %{id} tidak dapat ditemukan. + partial: + confirm: Apakah Anda yakin? + creator_name: Pencipta + display_name: Pengguna yang Diblokir + edit: Edit + next: Berikutnya » + not_revoked: (tidak dicabut) + previous: « Sebelumnya + reason: Alasan untuk blokir + revoke: Batalkan! + revoker_name: Dibatalkan oleh + show: Tampilkan + showing_page: Halaman %{page} + status: Status + period: + one: 1 hour + other: "%{count} hours" + revoke: + confirm: Apakah Anda yakin untuk membatalkan blokir ini? + flash: Blokir ini telah dibatalkan. + heading: Membatalkan blokir pada %{block_on} oleh %{block_by} + past: Blokir ini telah berakhir %{time} yang lalu dan tidak dapat dibatalkan kembali sekarang. + revoke: Batalkan! + time_future: Blokir ini akan berakhir pada %{time}. + title: Membatalkan lokir pada %{block_on} + show: + back: Lihat semua blokir + confirm: Apakah Anda yakin? + edit: Edit + heading: "%{block_on} diblokir oleh %{block_by}" + needs_view: Pengguna harus log in sebelum blokir ini dihapus. + reason: "Alasan untuk blokir:" + revoke: Batalkan! + revoker: "Pembatal:" + show: Tampilkan + status: Status + time_future: Berakhir dalam %{time} + time_past: Berakhir %{time} yang lalu + title: "%{block_on} diblokir oleh %{block_by}" + update: + only_creator_can_edit: Hanya moderator yang membuat blokir ini yang dapat mengeditnya. + success: Blokir diperbarui. + user_role: + filter: + already_has_role: Pengguna telah memiliki peran %{role}. + doesnt_have_role: Pengguna tidak memiliki peran %{role}. + not_a_role: String `%{role}' bukan merupakan peran yang valid. + not_an_administrator: Hanya administrator yang dapat melakukan peran manajemen pengguna, dan Anda bukan administrator. + grant: + are_you_sure: Apakah Anda yakin ingin memberikan peran `%{role}' kepada pengguna `%{name}'? + confirm: Konfirmasi + fail: Tidak bisa memberikan peran `%{role}' kepada pengguna `%{name}'. Silahkan periksa bahwa pengguna dan perannya valid. + heading: Konfirmasi pemberian peran + title: Konfirmasi pemberian peran + revoke: + are_you_sure: Apakah Anda yakin Anda ingin mencabut peran `%{role}' dari pengguna `%{name}'? + confirm: Konfirmasi + fail: Tidak dapat mencabut peran `%{role}' dari pengguna `%{name}'. Silahkan periksa bahwa pengguna dan perannya valid. + heading: Konfirmasi pencabutan peran + title: Konfirmasi pencabutan peran diff --git a/config/locales/is.yml b/config/locales/is.yml index 4f0ccee165d..9d1f98aacfa 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1,6 +1,7 @@ # Messages for Icelandic (íslenska) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Nemo bis # Author: Snævar # Author: Ævar Arnfjörð Bjarmason is: @@ -79,78 +80,15 @@ is: blocked: Aðgangur þinn að forritunarviðmótinu hefur verið bannaður. Skráðu þig inn í vefviðmótið fyrir frekari upplýsingar. browse: changeset: - changeset: "Breytingarsett: %{id}" changesetxml: Breytingarsetts XML sniði - download: Sækja breytinguna á %{changeset_xml_link} eða á %{osmchange_xml_link} feed: title: Breytingarsett %{id} title_comment: Breytingarsett %{id} - %{comment} osmchangexml: osmChange XML sniði title: Breytingarsett - changeset_details: - belongs_to: "Höfundur:" - bounding_box: "Svæðismörk:" - box: svæðismörk - closed_at: "Lokað:" - created_at: "Búið til:" - has_nodes: - one: "Inniheldur %{count} hnút:" - other: "Inniheldur %{count} hnúta:" - has_relations: - one: "Inniheldur %{count} vensl:" - other: "Inniheldur %{count} vensl:" - has_ways: - one: "Inniheldur %{count} veg:" - other: "Inniheldur %{count} vegi:" - no_bounding_box: Engin svæðismörk voru vistuð ásamt þessu breytingarsetti. - show_area_box: Sýna svæðismörk á aðalkorti - common_details: - changeset_comment: "Athugasemd:" - edited_at: "Breytt:" - edited_by: "Breytt af:" - in_changeset: "Í breytingarsetti:" - version: "Útgáfa:" containing_relation: entry: Venslunum %{relation_name} entry_role: Venslunum %{relation_name} (sem „%{relation_role}“) - map: - deleted: Eytt - larger: - area: Skoða þetta svæði á stærra korti - node: Skoða þennan hnút á stærra korti - relation: Skoða þessi vensl á stærra korti - way: Skoða þennan veg á stærra korti - loading: Hleð... - navigation: - all: - next_changeset_tooltip: Næsta breytingarsett - next_node_tooltip: Næsti hnútur - next_relation_tooltip: Næstu vensl - next_way_tooltip: Næsti hnútur - prev_changeset_tooltip: Fyrra breytingarsett - prev_node_tooltip: Fyrri hnútur - prev_relation_tooltip: Fyrri vensl - prev_way_tooltip: Fyrri vegur - user: - name_changeset_tooltip: Skoða breytingarsett eftir %{user} - next_changeset_tooltip: Næsta breytingarsett eftir %{user} - prev_changeset_tooltip: Fyrri breytingarsett eftir %{user} - node: - download: "%{download_xml_link} eða %{view_history_link} eða %{edit_link}" - download_xml: Sækja hnútinn á XML sniði - edit: breyta - node: Hnútur - node_title: "Hnútur: %{node_name}" - view_history: sýna breytingarsögu - node_details: - coordinates: "Hnit:" - part_of: "Hluti af:" - node_history: - download: "%{download_xml_link} eða %{view_details_link}" - download_xml: Sækja hnútinn ásamt breytingaskrá á XML sniði - node_history: Breytingarskrá hnúts - node_history_title: "Breytingarskrá hnúts: %{node_name}" - view_details: sýna breytingarsögu not_found: sorry: Því miður %{type} með kennitöluna %{id}. type: @@ -158,65 +96,15 @@ is: node: fannst ekki hnútur relation: fundust ekki vensli way: fannst ekki vegur - paging_nav: - of: af - showing_page: Sýni síðu - relation: - download: "%{download_xml_link} eða %{view_history_link}" - download_xml: Sækja á XML sniði - relation: Vensl - relation_title: "Vensl: %{relation_name}" - view_history: sýna breytingarsögu - relation_details: - members: "Stök:" - part_of: "Hluti af:" - relation_history: - download: "%{download_xml_link} eða %{view_details_link}" - download_xml: Sækja venslin ásamt breytingaskrá á XML sniði - relation_history: Breytingarskrá vensla - relation_history_title: "Breytingarskrá vensla: %{relation_name}" - view_details: sýna breytingarsögu relation_member: entry_role: "%{type} %{name} sem „%{role}“" type: node: Hnúturinn relation: Venslin way: Vegurinn - start: - manually_select: Velja svæði á kortinu - view_data: Sýna gögn fyrir núverandi kortasýn start_rjs: - data_frame_title: Gögn - data_layer_name: Gögn - details: Nánar - drag_a_box: Teiknaðu kassa á kortið til að velja svæði - edited_by_user_at_timestamp: Breytt af [[user]] klukkan [[timestamp]] - history_for_feature: Breytingarskrá fyrir [[feature]] load_data: Hlaða inn gögnum - loaded_an_area_with_num_features: Þú hefur valið svæði sem á eru [[num_features]] hlutir. Sumir vafrar höndla illa fleiri en 100 hluti í einu, en þú getur hlaðið þeim inn þrátt fyrir það ef þú telur þig geta höndlað það. loading: Hleð inn gögnum... - manually_select: Velja annað svæði á kortinu - object_list: - api: Sækja þetta svæði úr forritunarviðmótinu - back: Aftur á listann yfir hluti á þessu svæði - details: Nánar - heading: Hlutir - history: - type: - node: hnút [[id]] - way: veg [[id]] - selected: - type: - node: Hnútur [[id]] - way: Vegur [[id]] - type: - node: Hnúturinn - way: Vegurinn - private_user: ónafngreindum - show_history: Sýna breytingarsögu - unable_to_load_size: "Gat ekki hlaðið gögnum: Svæði af stærðinni [[bbox_size]] er of stórt, svæðið verður að vera minna en %{max_bbox_size}" - wait: Augnablik... - zoom_or_select: Þú verður að þysja að eða velja svæði á kortinu tag_details: tags: "Eigindi:" wiki_link: @@ -230,33 +118,10 @@ is: node: hnútinn relation: venslin way: veginn - way: - download: "%{download_xml_link} eða %{view_history_link} eða %{edit_link}" - download_xml: Sækja veginn á XML sniði - edit: breyta - view_history: sýna breytingarsögu - way: Vegur - way_title: "Vegur: %{way_name}" - way_details: - also_part_of: - one: einnig hluti af %{related_ways} - other: einnig hluti af %{related_ways} - nodes: "Hnútar:" - part_of: "Hluti af:" - way_history: - download: "%{download_xml_link} eða %{view_details_link}" - download_xml: Sækja veginn ásamt breytingaskrá á XML sniði - view_details: sýna breytingarsögu - way_history: Breytingarskrá vegs - way_history_title: "Breytingarskrá vegs: %{way_name}" changeset: changeset: anonymous: Ónafngreindur - big_area: (stórt) - no_comment: (engin) no_edits: (engar breytingar) - show_area_box: sýna svæðismörk - still_editing: (enn að breyta) view_changeset_details: Skoða breytingarsett changeset_paging_nav: next: Næsta » @@ -269,18 +134,8 @@ is: saved_at: Vistað user: Notandi list: - description: Nýlegar breytingar - description_bbox: Breytingar innan %{bbox} - description_user: Breytingar eftir %{user} - description_user_bbox: Breytingar eftir %{user} innan %{bbox} - heading: Breytingarsett - heading_bbox: Breytingarsett - heading_user: Breytingarsett - heading_user_bbox: Breytingarsett title: Breytingarsett - title_bbox: Breytingar innan %{bbox} title_user: Breytingar eftir %{user} - title_user_bbox: Breytingar eftir %{user} innan %{bbox} diary_entry: diary_comment: comment_from: Athugasemd eftir %{link_user} sett inn %{comment_created_at} @@ -366,28 +221,16 @@ is: scale: Skali too_large: body: Svæðið sem þú ert að reyna að setja inn á OpenStreetMap á XML formi er of stórt. Vinsamlegast þysjaðu inn eða veldu smærra svæði. - heading: Svæðið er of stórt zoom: Þys - start_rjs: - add_marker: Bæta við punkt á kortið - change_marker: Breyta staðsetningu punktsins - click_add_marker: Smelltu á kortið til að bæta við punkti - drag_a_box: Teiknaðu kassa á kortið til að velja svæði - export: Niðurhala - manually_select: Velja annað svæði á kortinu - view_larger_map: Skoða á stærra korti geocoder: description: title: geonames: Staðsetning frá GeoNames - osm_namefinder: "%{types} frá OpenStreetMap Namefinder" osm_nominatim: Staðsetning frá OpenStreetMap Nominatim types: cities: Borgir places: Staðir towns: Bæir - description_osm_namefinder: - prefix: "%{distance} %{direction} af%{type}" direction: east: austur north: norður @@ -409,13 +252,9 @@ is: ca_postcode: Niðurstöður frá Geocoder.CA geonames: Niðurstöður frá GeoNames latlon: Niðurstöður frá Internal - osm_namefinder: Niðurstöður frá OpenStreetMap Namefinder osm_nominatim: Niðurstöður frá OpenStreetMap Nominatim uk_postcode: Niðurstöður frá NPEMap / FreeThe Postcode us_postcode: Niðurstöður frá Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} af %{parentname})" - suffix_place: ", %{distance} %{direction} af %{placename}" search_osm_nominatim: prefix: amenity: @@ -593,37 +432,20 @@ is: map: base: cycle_map: Hjólakort - overlays: - maplint: Villulag - site: - edit_zoom_alert: Þú verður að þysja inn á smærra svæði til að breyta gögnunum - history_zoom_alert: Þú verður að þysja inn á smærra svæði til að sjá breytingarskránna layouts: copyright: Höfundaréttur & leyfi donate: Hjálpaðu OpenStreetMap verkefninu með %{link} í vélbúnaðarsjóðinn. - donate_link_text: fjárframlagi edit: Breyta export: Niðurhala - export_tooltip: Niðurhala kortagögnum á hinum ýmsu sniðum gps_traces: GPS ferlar gps_traces_tooltip: Sjá alla GPS ferla history: Breytingaskrá home: heim - home_tooltip: Færa kortasýnina á þína staðsetningu - inbox: innhólf (%{count}) - inbox_tooltip: - one: Það eru ein skilaboð í innhólfinu þínu - other: Það eru %{count} skilaboð í innhólfinu þínu - zero: Það eru engin skilaboð í innhólfinu þínu - intro_1: OpenStreetMap er frjálst heimskort sem hver sem er getur breytt. Líka þú! - license: - title: OpenStreetMap gögnin eru gefin út undir Creative Commons Attribution-Share Alike 2.0 leyfinu log_in: innskrá log_in_tooltip: Skráðu þig inn með aðgangi sem er þegar til logo: alt_text: OpenStreetMap merkið logout: útskrá - logout_tooltip: Útskrá make_a_donation: text: Fjárframlagssíða title: Hjálpaðu OpenStreetMap verkefninu með fjárframlagi @@ -634,16 +456,15 @@ is: tag_line: Frjálsa wiki heimskortið user_diaries: Blogg notenda user_diaries_tooltip: Sjá blogg notenda - view: Kort - view_tooltip: Kortasýn - welcome_user: Hæ %{user_link} - welcome_user_link_tooltip: Notandasíðan þín license_page: foreign: english_link: ensku útgáfuna text: "Stangist þessi þýðing á við %{english_original_link} gildir\nhin síðari fram yfir íslenskuna." title: Um þessa þýðingu - legal_babble: "

    Höfundaréttur og leyfi

    \n

    \n OpenStreetMap er frjáls kortagrunnur undir Creative\n Commons Attribution-ShareAlike 2.0 leyfi. (CC BY-SA).\n

    \n

    \n  Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninnn\n  og gögn hans, gegn því að þú viðurkennir rétt OpenStreetMap\n og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum\n eða gögnum hans, þá verður þú að gefa niðurstöðuna út með\n sama leyfi. Leyfistextinn\n útskýrir réttindi þín og skyldur.\n

    \n

    Frekari upplýsingar

    \n\n

    \n Frekari upplýsingar má nálgast í ensku\n útgáfu þessa skjals.\n

    " + legal_babble: + intro_1_html: "OpenStreetMap er frjáls kortagrunnur undir Open Data\nCommons Open Database leyfi. (ODbL)." + intro_2_html: " Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninnn\n og gögn hans, gegn því að þú viðurkennir rétt OpenStreetMap\n og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum\n eða gögnum hans, þá verður þú að gefa niðurstöðuna út með\n sama leyfi. Leyfistextinn\n útskýrir réttindi þín og skyldur." + title_html: Höfundaréttur og leyfi native: mapping_link: farið að kortleggja native_link: íslensku útgáfuna @@ -696,12 +517,8 @@ is: title: Úthólf to: Til read: - back_to_inbox: Aftur í innhólf - back_to_outbox: Aftur í úthólf date: Dags from: Frá - reading_your_messages: Les móttekin skilaboð - reading_your_sent_messages: Les send skilaboð reply_button: Svara subject: Titill title: Les skilaboð @@ -724,8 +541,6 @@ is: email_confirm_plain: click_the_link: Ef þú óskaðir eftir þessari breytingu fylgdu tenglinum hér fyrir neðan til að staðfesta breytinguna. greeting: Hæ, - hopefully_you_1: Einhver (vonandi þú) vill breyta netfanginu sínu á - hopefully_you_2: "%{server_url} í %{new_address}." friend_notification: had_added_you: Notandinn %{user} hefur bætt þér við sem vini á OpenStreetMap. see_their_profile: Þú getur séð notandasíðu notandans á %{userurl} og jafnvel bætt honum við sem vini líka. @@ -754,44 +569,11 @@ is: lost_password_plain: click_the_link: Ef þú óskaðir eftir þessari endurstillingu fylgdu tenglinum hér fyrir neðan til að staðfesta breytinguna. greeting: Hæ, - hopefully_you_1: Einhver (vonandi þú) hefur beðið um að endurstilla lykilorðið á reikningnum - hopefully_you_2: með þetta netfang á openstreetmap.org message_notification: - footer1: Þú getur einnig lesið skilaboðin á %{readurl} - footer2: og svarað á %{replyurl} header: "%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:" hi: Hæ %{to_user}, signup_confirm: subject: "[OpenStreetMap] Staðfestu netfangið þitt" - signup_confirm_html: - click_the_link: Ef þetta ert þú þá vertu velkomin(n)! vinsamlegast fylgdu tenglinum til að staðfesta reikningin þinn og haltu áfrám að lesa til að fá frekari upplýsingar um OpenStreetMap. - current_user: Í flokkakerfinu getur þú einnig séð hvar í heiminum OpenStreetMap notendur eru staðsettir. - get_reading: "Þú getur lesið um OpenStreetMap verkefnið á wiki-síðunni okkar eða OpenGeoData blogginu þar sem einnig er að finna hljóðvarp.\n\nEinnig er hægt að fylgjast með OpenStreetMap á Twitter eða skoða almennan bloggstraum fyrir verkefnið." - greeting: Hæ! - hopefully_you: "Einhver (vonandi þú) vill búa til notanda á þessari vefsíðu:" - introductory_video: Þú getur horft á %{introductory_video_link}. - more_videos: Fleiri myndbönd er %{more_videos_link}. - more_videos_here: hægt að finna hér - user_wiki_page: Það er mælt með því að þú búir ttil notandasíðu á wiki-inu þar sem tengt er í flokk sem gefur til kynna hvar þú ert, t.d. [[Category:Users_in_Iceland]]. - video_to_openstreetmap: kynningarmyndband um OpenStreetMap - wiki_signup: Kannski viltu einnig skrá þig á wiki-síðuna. - signup_confirm_plain: - blog_and_twitter: "Fylgdust með fréttum á OpenStreetMap blogginu eða á Twitter:" - click_the_link_1: Ef þetta ert þú þá vertu velkomin(n)! vinsamlegast fylgdu tenglinum til að staðfesta - click_the_link_2: reikningin þinn og haltu áfrám að lesa til að fá frekari upplýsingar um OpenStreetMap. - current_user_1: Í flokkakerfinu getur þú séð hvar í heiminum OpenStreetMap notendur eru. - current_user_2: "Hér er tengill á rótina á notendaflokkunum:" - greeting: Hæ! - hopefully_you: "Einhver (vonandi þú) vill búa til notanda á þessari vefsíðu:" - introductory_video: "Þú getur horft á kynningarmyndband um OpenStreetMap hér:" - more_videos: "Og fleiri kynningarmyndbönd er að finna hér:" - opengeodata: "OpenGeoData.org er OpenStreetMap blog Steve Coast sem stofnaði OpenStreetMap, þar er líka hljóðvarp:" - the_wiki: "Þú getur lesið um OpenStreetMap verkefnið á wiki-síðunni okkar:" - the_wiki_url: http://wiki.openstreetmap.org/index.php?uselang=is&title=Beginners%27_Guide - user_wiki_1: Það er mælt með því að þú búir til notandasíðu á wiki-inu - user_wiki_2: og takir fram hvar þú ert, t.d. með því að bæta við á hana [[Category:Users_in_Iceland]]. - wiki_signup: "Kannski viltu einnig skrá þig á wiki-síðuna:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Fors%C3%AD%C3%B0a&uselang=is oauth: oauthorize: allow_read_prefs: Lesa notandastillingarnar þínar. @@ -846,15 +628,9 @@ is: index: js_1: Þú ert annaðhvort að nota vafra sem styður ekki JavaScript eða hefur slökkt á JavaScript stuðning. js_2: OpenStreetMap notar JavaScript til að útfæra gagnvirk kort. - license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Gefið út undir %{license_name} leyfinu af þáttakendum í %{project_name}. - project_name: OpenStreetMap verkefninu permalink: Varanlegur tengill shortlink: Varanlegur smátengill key: - map_key: Kortaskýringar - map_key_tooltip: Kortaútskýringar fyrir mapnik útgáfuna af kortinu á þessu þys-stigi table: entry: admin: Stjórnsýslumörk @@ -923,7 +699,6 @@ is: wood: Náttúrulegur skógur search: search: Leita - search_help: "dæmi: „Akureyri“, „Laugavegur, Reykjavík“ eða „post offices near Lünen“. Sjá einnig leitarhjálpina." submit_text: Ok where_am_i: Hvar er ég? where_am_i_title: Notar leitarvélina til að lýsa núverandi staðsetningu á kortinu @@ -1001,8 +776,6 @@ is: trace_optionals: tags: Tögg trace_paging_nav: - next: Næsta » - previous: « Fyrri showing_page: Sýni síðu %{page} view: delete_track: Eyða @@ -1069,7 +842,6 @@ is: button: Staðfesta heading: Staðfesta notanda press confirm button: Hér getur þú staðfest að þú viljir búa til notanda.. - success: Notandinn þinn hefur verið staðfestur. confirm_email: button: Staðfesta failure: Netfang hefur þegar verið staðfest með þessum lykli. @@ -1131,9 +903,6 @@ is: display name: "Sýnilegt nafn:" display name description: Nafn þitt sem aðrir notendur sjá, þú getur breytt því síðar í stillingunum þínum. email address: "Netfang:" - fill_form: Filltu út þetta form og við munum senda þér póst svo þú getir virkjað reikninginn þinn. - flash create success message: Nýr notandi var búinn til fyrir þig og staðfestingarpóstur sendur á netfangið sem þú gafst upp.

    Þú muntu ekki geta innskráð þig fyrr en þú ert búin(n) að fylgja leiðbeiningunum í staðfestingarpóstinum.

    Ef þú notar spamkerfi sem sendir staðfestingarbeðnir þegar það verður vart við nýja sendendur þarft þú að bæta webmaster@openstreetmap.org á hvítlista. Það netfang getur ekki svarað staðfestingarbeiðnum. - heading: Nýskrá license_agreement: Með því að búa til reikning samþykkiru að öll framlög þín til verkefnisins falli undir Creative Commons Attribution-Share Alike (BY-SA) leyfið. no_auto_account_create: Því miður getum við eki búið til reikning fyrir þig sjálfkrafa. not displayed publicly: Ekki sýnt opinberlega (sjá meðferð persónuupplýsinga) diff --git a/config/locales/it.yml b/config/locales/it.yml index 224686c0424..e03be9eac6f 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -4,22 +4,43 @@ # Author: Alessioz # Author: Bellazambo # Author: Beta16 +# Author: Darth Kule # Author: Davalv # Author: Davio +# Author: Dieterdreist +# Author: Efred # Author: Gianfranco +# Author: Isiond +# Author: Kaitu # Author: Karika +# Author: Lollo # Author: LucioGE +# Author: Massimo itaca # Author: McDutchie # Author: Nemo bis # Author: Od1n +# Author: Ontsed # Author: Paolopoz # Author: Raoli # Author: Rippitippi +# Author: Shirayuki # Author: Simone # Author: SimoneSVC # Author: Ximo17 # Author: ZioNicco it: + about_page: + community_driven_html: La comunità di OpenStreetMap è diversa, appassionante, e cresce ogni giorno. I nostri contributori includono mapper entusiasti, professionisti GIS, ingegneri che gestiscono i server di OSM, mapping umanitario di aree soggette a disastri e molto altro. Per ulteriori informazioni sulla comunità, consultare i diari degli utenti, il blog della comunità, e il sito OSM Foundation. + community_driven_title: Guidato dalla Comunità + copyright_html: ©OpenStreetMap
    contributors + lede_text: OpenStreetMap è costruito da una comunità di mappatori che contribuiscono e mantengono i dati sulle strade, sentieri, caffè, stazioni ferroviarie e molto altro ancora, in tutto il mondo. + local_knowledge_html: OpenStreetMap enfatizza la conoscenza locale. I contributori usano immagini aeree, dispositivi GPS e mappe sul campo low-tech per verificare che OSM sia accurato e aggiornato. + local_knowledge_title: Conoscenza locale + next: Successivo + open_data_html: "OpenStreetMap è open data: sei libero di usarla per qualsiasi scopo a patto di attribuirla a OpenstreetMap e ai suoi contributori. Se alteri o sviluppi sulla base dei dati in un certo modo, puoi distribuire il risultato solo mediante la stessa licenza. Consultare Copyright per i dettagli." + open_data_title: Open Data + partners_title: Partner + used_by: "%{name} fornisce dati geografici su centinaia di siti web, app mobili e dispositivi hardware" activerecord: attributes: diary_comment: @@ -28,7 +49,7 @@ it: language: Lingua latitude: Latitudine longitude: Longitudine - title: Titolo + title: Soggetto user: Utente friend: friend: Amico @@ -37,7 +58,7 @@ it: body: Corpo del messaggio recipient: Recipiente sender: Mittente - title: Titolo + title: Soggetto trace: description: Descrizione latitude: Latitudine @@ -97,90 +118,62 @@ it: blocked: Il tuo accesso alle API è stato bloccato. Si prega di fare log-in all'interfaccia web per saperne di più. need_to_see_terms: Il tuo accesso alle API è temporaneamente sospeso. Si prega di accedere all'interfaccia web per visualizzare i termini di contribuzione. Non c'è bisogno che tu aderisca, però è necessario che tu li legga. browse: + anonymous: anonimo changeset: - changeset: "Gruppo di modifiche: %{id}" - changesetxml: gruppo di modifiche XML - download: Scarica il %{changeset_xml_link} oppure le %{osmchange_xml_link} + belongs_to: Autore + changesetxml: Gruppo di modifiche XML feed: title: Gruppo di modifiche %{id} title_comment: Gruppo di modifiche %{id} - %{comment} + node: Nodi (%{count}) + node_paginated: Nodi (%{x}-%{y} di %{count}) osmchangexml: modificheOsm XML - title: Gruppo di modifiche - changeset_details: - belongs_to: "Appartiene a:" - bounding_box: "Riquadro di selezione:" - box: riquadro - closed_at: "Chiuso il:" - created_at: "Creato il:" - has_nodes: "Possiede i seguenti %{count} nodi:" - has_relations: "Possiede le seguenti %{count} relazioni:" - has_ways: "Possiede i seguenti %{count} percorsi:" - no_bounding_box: Per questo gruppo di modifiche non è stato memorizzato alcun riquadro di selezione. - show_area_box: Mostra il riquadro dell'area - common_details: - changeset_comment: "Commento:" - deleted_at: "Cancellato il:" - deleted_by: "Cancellato da:" - edited_at: "Modificato il:" - edited_by: "Modificato da:" - in_changeset: "Nel gruppo di modifiche:" - version: "Versione:" + relation: Relazioni (%{count}) + relation_paginated: Relazioni (%{x}-%{y} di %{count}) + title: "Gruppo di modifiche: %{id}" + way: Ways (%{count}) + way_paginated: Ways (%{x}-%{y} di %{count}) + closed: Chiuso + closed_by_html: Chiuso %{time} fa da %{user} + closed_html: Chiuso %{time} fa containing_relation: entry: Relazione %{relation_name} entry_role: Relazione %{relation_name} (come %{relation_role}) - map: - deleted: Eliminato - edit: - area: Modifica area - node: Modifica nodo - relation: Modifica relazione - way: Modifica percorso - larger: - area: Visualizza l'area in una mappa più grande - node: Visualizza il nodo in una mappa più grande - relation: Visualizza la relazione in una mappa più grande - way: Visualizza la way in una mappa più grande - loading: Caricamento in corso... - navigation: - all: - next_changeset_tooltip: Gruppo di modifiche successivo - next_node_tooltip: Nodo successivo - next_relation_tooltip: Relazione successiva - next_way_tooltip: Percorso successivo - prev_changeset_tooltip: Gruppo di modifiche precedente - prev_node_tooltip: Nodo precedente - prev_relation_tooltip: Relazione precedente - prev_way_tooltip: Percorso precedente - user: - name_changeset_tooltip: Visualizza le modifiche di %{user} - next_changeset_tooltip: Modifica successiva di %{user} - prev_changeset_tooltip: Modifica precedente di %{user} + created: Creato + created_by_html: Creato %{time} fa da %{user} + created_html: Creato %{time} fa + deleted_by_html: Cancellato %{time} fa da %{user} + download_xml: Scarica XML + edited_by_html: Modificato %{time} fa da %{user} + in_changeset: Gruppo di modifiche + location: "Posizione:" + no_comment: (nessun commento) node: - download: "%{download_xml_link} oppure %{view_history_link}" - download_xml: Scarica XML - edit: modifica - node: Nodo - node_title: "Nodo: %{node_name}" - view_history: visualizza lo storico - node_details: - coordinates: "Coordinate:" - part_of: "Parte di:" - node_history: - download: "%{download_xml_link} oppure %{view_details_link}" - download_xml: Scarica XML - node_history: Storico del nodo - node_history_title: "Storico del nodo: %{node_name}" - view_details: visualizza i dettagli + history_title: "Cronologia nodo: %{name}" + title: "Nodo: %{name}" not_found: - sorry: Spiacenti, non è stato possibile trovare il %{type} con l'identificativo %{id}. + sorry: "Spiacenti, %{type} #%{id} non può essere trovato." type: changeset: gruppo di modifiche node: nodo relation: relazione way: percorso - paging_nav: - of: di - showing_page: Visualizzata la pagina + note: + closed_by: Risolta da %{user} %{when} fa + closed_by_anonymous: Risolta da anonimo %{when} fa + closed_title: "Nota risolta #%{note_name}" + commented_by: Commento da %{user} %{when} fa + commented_by_anonymous: Commento da anonimo %{when} fa + hidden_by: Nascosta da %{user} %{when} fa + hidden_title: "Note nascosta #%{note_name}" + new_note: Nuova nota + open_by: Creato da %{user} %{when} fa + open_by_anonymous: Creato da anonimo %{when} fa + open_title: "Nota irrisolta: %{note_name}" + reopened_by: Riattivata da %{user} %{when} fa + reopened_by_anonymous: Riattivata da anonimo %{when} fa + title: "Nota: %{id}" + part_of: Parte di redacted: message_html: La versione %{version} di questo %{type} non può essere mostrata in quanto è stata redatta. Per favore, fai riferimento a %{redaction_link} per i dettagli. redaction: Redazione %{id} @@ -189,65 +182,21 @@ it: relation: relazione way: percorso relation: - download: "%{download_xml_link} oppure %{view_history_link}" - download_xml: Scarica XML - relation: Relazione - relation_title: "Relazione: %{relation_name}" - view_history: visualizza lo storico - relation_details: - members: "Membri:" - part_of: "Parte di:" - relation_history: - download: "%{download_xml_link} oppure %{view_details_link}" - download_xml: Scarica XML - relation_history: Storico della relazione - relation_history_title: "Storico della relazione: %{relation_name}" - view_details: visualizza dettagli + history_title: "Cronologia relazione: %{name}" + members: Membri + title: "Relazione: %{name}" relation_member: entry_role: "%{type} %{name} come %{role}" type: node: Nodo relation: Relazione way: Percorso - start: - manually_select: Seleziona manualmente un'area differente - view_data: Mostra i dati per la visualizzazione attuale della mappa start_rjs: - data_frame_title: Dati - data_layer_name: Esplora Dati Mappa - details: Dettagli - drag_a_box: Tracciare un riquadro sulla mappa per selezionare un'area - edited_by_user_at_timestamp: Modificato da [[user]] il [[timestamp]] - hide_areas: Nascondi le aree - history_for_feature: Storico per [[feature]] + feature_warning: Caricamento di %{num_features} caratteristiche, che possono rendere il tuo browser lento o che non risponde. Sei sicuro di voler visualizzare questi dati? load_data: Carica dati - loaded_an_area_with_num_features: "E' stata caricata un'area che contiene [[num_features]] caratteristiche. In generale, alcuni browser potrebbero non visualizzare correttamente questa quantità di dati. Generalmente i browser lavorano al meglio se si visualizzano meno di 100 caratteristiche alla volta: se si fa qualcos'altro il proprio browser potrebbe diventare lento o non rispondere più. Se si è sicuri di voler visualizzare questi dati, allora si può premere il pulsante sottostante." loading: Caricamento in corso... - manually_select: Seleziona manualmente un'area differente - object_list: - api: Ottieni quest'area dalle API - back: Visualizza la lista degli oggetti - details: Dettagli - heading: Lista degli oggetti - history: - type: - node: Nodo [[id]] - way: Percorso [[id]] - selected: - type: - node: Nodo [[id]] - way: Percorso [[id]] - type: - node: Nodo - way: Percorso - private_user: utente privato - show_areas: Mostra le aree - show_history: Visualizza storico - unable_to_load_size: "Impossibile caricare: la dimensione del riquadro di selezione di [[bbox_size]] è troppo grande (deve essere minore di %{max_bbox_size})" - wait: Attendere... - zoom_or_select: Ingrandire oppure selezionare l'area della mappa che si desidera visualizzare tag_details: - tags: "Etichette:" + tags: Tag wiki_link: key: La pagina wiki per la descrizione del tag %{key} tag: La pagina wiki per la descrizione del tag %{key}=%{value} @@ -259,38 +208,25 @@ it: node: nodo relation: relazione way: percorso + version: Versione + view_details: Visualizza dettagli + view_history: Visualizza cronologia way: - download: "%{download_xml_link} oppure %{view_history_link}" - download_xml: Scarica XML - edit: modifica - view_history: visualizza lo storico - way: Percorso - way_title: "Percorso: %{way_name}" - way_details: also_part_of: - one: anche parte del percorso %{related_ways} - other: anche parte dei percorsi %{related_ways} - nodes: "Nodi:" - part_of: "Parte di:" - way_history: - download: "%{download_xml_link} oppure %{view_details_link}" - download_xml: Scarica XML - view_details: visualizza i dettagli - way_history: Storico del percorso - way_history_title: "Storico del percorso: %{way_name}" + one: parte di way %{related_ways} + other: parte di way %{related_ways} + history_title: "Cronologia way: %{name}" + nodes: Nodi + title: "Way: %{name}" changeset: changeset: anonymous: Anonimo - big_area: (grande) - no_comment: (nessuno) no_edits: (nessuna modifica) - show_area_box: visualizza il riquadro dell'area - still_editing: (ancora in modifica) view_changeset_details: Visualizza i dettagli del gruppo di modifiche changeset_paging_nav: next: Successivo » previous: « Precedente - showing_page: Visualizzata la pagina %{page} + showing_page: Pagina %{page} changesets: area: Area comment: Commento @@ -298,31 +234,24 @@ it: saved_at: Salvato il user: Utente list: - description: Ultime modifiche - description_bbox: Gruppi di modifiche all'interno di %{bbox} - description_friend: Insieme di modifiche dei tuoi amici - description_nearby: Gruppi di modifiche da parte di utenti nelle vicinanze - description_user: Modifiche dell'utente %{user} - description_user_bbox: Gruppi di modifiche dell'utente %{user} all'interno di %{bbox} - heading: Gruppi di modifiche - heading_bbox: Gruppi di modifiche - heading_friend: Gruppi di modifiche - heading_nearby: Gruppi di modifiche - heading_user: Gruppi di modifiche - heading_user_bbox: Gruppi di modifiche + empty: Nessun gruppo di modifiche trovato. + empty_area: Nessun gruppo di modifiche in quest'area. + empty_user: Nessun gruppo di modifiche da questo utente. + load_more: Caricane altri + no_more: Nessun gruppo di modifiche trovato. + no_more_area: Nessun gruppo di modifiche in quest'area. + no_more_user: Nessun gruppo di modifiche da questo utente. title: Gruppi di modifiche - title_bbox: Modifiche all'interno di %{bbox} title_friend: Insieme di modifiche dei tuoi amici title_nearby: Gruppi di modifiche da parte di utenti nelle vicinanze title_user: Gruppi di modifiche di %{user} - title_user_bbox: Modifiche dell'utente %{user} all'interno di %{bbox} timeout: sorry: Siamo spiacenti, l'elenco delle modifiche che hai richiesto necessitava di troppo tempo per poter essere recuperato. diary_entry: comments: ago: "%{ago} fa" comment: Commento - has_commented_on: "% {display_name} ha commentato le seguenti voci di diario" + has_commented_on: "%{display_name} ha commentato le seguenti voci di diario" newer_comments: Commenti più recenti older_comments: Commenti più vecchi post: Scrivi @@ -333,8 +262,9 @@ it: hide_link: Nascondi questo commento diary_entry: comment_count: - one: 1 commento + one: "%{count} commento" other: "%{count} commenti" + zero: Nessun commento comment_link: Commento su questa voce confirm: Conferma edit_link: Modifica questa voce @@ -369,7 +299,7 @@ it: newer_entries: Voci più recenti no_entries: Nessuna voce nel diario older_entries: Voci più vecchie - recent_entries: "Voci del diario recenti:" + recent_entries: Voci del diario recenti title: Diari degli utenti title_friends: Diari degli amici title_nearby: Diari degli utenti nelle vicinanze @@ -393,6 +323,9 @@ it: user_title: Diario dell'utente %{user} editor: default: Predefinito (al momento %{name}) + id: + description: iD (editor nel browser) + name: iD potlatch: description: Potlatch 1 (editor nel browser) name: Potlatch 1 @@ -408,7 +341,7 @@ it: area_to_export: Area da esportare embeddable_html: HTML incapsulabile export_button: Esporta - export_details: I dati di OpenStreetMap sono rilasciati sotto la licenza Creative Commons Attribution-ShareAlike 2.0. + export_details: I dati OpenStreetMap sono rilasciati con licenza Open Data Commons Open Database (ODbL). format: Formato format_to_export: Formato di esportazione image_size: Dimensione immagine @@ -424,29 +357,40 @@ it: paste_html: Incolla l'HTML per incapsulare nel sito web scale: Scala too_large: - body: Quest'area è troppo grande per essere esportata come Dati XML di OpenStreetMap. Si prega di zoomare o di selezionare un'area più piccola. - heading: Area troppo grande + advice: "Se le esportazioni riportate sopra non riescono, prova con una delle fonti elencate di seguito:" + body: "Quest'area è troppo grande per essere esportata come Dati XML di OpenStreetMap. Si prega di zoomare, di selezionare un'area più piccola o di utilizzare una delle seguenti fonti per il download di massa dei dati:" + geofabrik: + description: Estratti aggiornati regolarmente di continenti, paesi, e città selezionata + title: Geofabrik Downloads + metro: + description: Estratti per le principali città del mondo e le loro aree circostanti + title: Metro Extracts + other: + description: Ulteriori fonti elencate sul wiki di OpenStreetMap + title: Altre fonti + overpass: + description: Scarica questo riquadro di selezione da un mirror del database di OpenStreetMap + title: Overpass API + planet: + description: Copie aggiornate regolarmente del database OpenStreetMap completo + title: Pianeta OSM zoom: Ingrandimento - start_rjs: - add_marker: Aggiungi un marcatore alla mappa - change_marker: Cambia la posizione del marcatore - click_add_marker: Clicca sulla mappa per aggiungere un marcatore - drag_a_box: Traccia un riquadro sulla mappa per selezionare un'area - export: Esporta - manually_select: Seleziona manualmente un'area differente - view_larger_map: Visualizza una mappa più ampia + title: Esporta + fixthemap: + how_to_help: + join_the_community: + title: Entra nella comunità + title: Come aiutare + title: Segnala un problema / Correggi la mappa geocoder: description: title: geonames: Località da GeoNames - osm_namefinder: "%{types} da OpenStreetMap Namefinder" osm_nominatim: Località da OpenStreetMap Nominatim types: cities: Città places: Luoghi towns: Città - description_osm_namefinder: - prefix: "%{distance} a %{direction} di %{type}" direction: east: est north: nord @@ -467,24 +411,34 @@ it: title: ca_postcode: Risultati da Geocoder.CA geonames: Risultati da GeoNames + geonames_reverse: Risultati da GeoNames latlon: Risultati da Internal - osm_namefinder: Risultati da OpenStreetMap Namefinder osm_nominatim: Risultati restituiti da OpenStreetMap Nominatim + osm_nominatim_reverse: Risultati restituiti da OpenStreetMap Nominatim uk_postcode: Risultati da NPEMap / FreeThe Postcode us_postcode: Risultati da Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} a %{parentdirection} di %{parentname})" - suffix_place: ", %{distance} a %{direction} di %{placename}" search_osm_nominatim: + admin_levels: + level10: Confine Quartiere + level2: Confine di paese + level4: Confine di stato + level5: Confine regionale + level6: Confine di Contea + level8: Confine di Città + level9: Confine Paese prefix: + aerialway: + chair_lift: Seggiovia + drag_lift: Sciovia + station: Stazione funivia aeroway: aerodrome: Aerodromo - apron: Grembiule - gate: Gate aeroportuale + apron: Piazzale di sosta + gate: Gate helipad: Elisuperficie runway: Pista taxiway: Pista di rullaggio - terminal: Terminal aeroportuale + terminal: Terminal amenity: WLAN: Punto di accesso WiFi airport: Aeroporto @@ -511,7 +465,7 @@ it: cinema: Cinema clinic: Clinica club: Club - college: Scuola superiore + college: Accademia community_centre: Centro civico courthouse: Tribunale crematorium: Crematorio @@ -542,7 +496,7 @@ it: market: Mercato marketplace: Mercato mountain_rescue: Soccorso alpino - nightclub: Locale notturno + nightclub: Night Club nursery: Asilo nido nursing_home: Asilo nido office: Ufficio @@ -564,12 +518,13 @@ it: retirement_home: Casa di Riposo sauna: Sauna school: Scuola - shelter: Pensilina/ricovero + shelter: Pensilina shop: Negozio shopping: Acquisti shower: Doccia social_centre: Centro sociale social_club: Centro Sociale + social_facility: Struttura sociale studio: Studio supermarket: Supermercato swimming_pool: Piscina @@ -598,45 +553,50 @@ it: "yes": Ponte building: "yes": Edificio + emergency: + fire_hydrant: Idrante + phone: Telefono di emergenza highway: bridleway: Percorso per equitazione - bus_guideway: Autobus guidato - bus_stop: Fermata autobus + bus_guideway: Corsia autobus a guida vincolata + bus_stop: Fermata dell'autobus byway: Byway (UK) construction: Strada in costruzione cycleway: Percorso ciclabile emergency_access_point: Colonnina SOS footway: Percorso pedonale ford: Guado - living_street: Strada pedonale + living_street: Living Street milestone: Pietra miliare - minor: Strada secondaria - motorway: Autostrada/tangenziale - motorway_junction: Svincolo + minor: Strada minore + motorway: Autostrada + motorway_junction: Uscita autostradale motorway_link: Autostrada path: Sentiero pedestrian: Percorso pedonale platform: Piattaforma - primary: Strada di importanza nazionale - primary_link: Strada principale + primary: Strada primaria + primary_link: Strada primaria + proposed: Strada proposta raceway: Pista - residential: Strada residenziale + residential: Residenziale rest_area: Area di Sosta road: Strada generica - secondary: Strada di importanza regionale + secondary: Strada secondaria secondary_link: Strada secondaria service: Strada di servizio services: Stazione di servizio speed_camera: Autovelox fissi steps: Scala stile: Scaletta - tertiary: Strada di importanza locale - tertiary_link: Strada di importanza locale + street_lamp: Lampione + tertiary: Strada terziaria + tertiary_link: Strada terziaria track: Strada forestale o agricola trail: Percorso escursionistico trunk: Superstrada trunk_link: Superstrada - unclassified: Strada minore + unclassified: Strada non classificata unsurfaced: Strada non pavimentata historic: archaeological_site: Sito archeologico @@ -645,6 +605,7 @@ it: building: Edificio castle: Castello church: Chiesa + citywalls: Mura della città fort: Forte house: Casa storica icon: Icona @@ -654,6 +615,7 @@ it: monument: Monumento museum: Museo ruins: Rovine + tomb: Tomba tower: Torre wayside_cross: Croce wayside_shrine: Edicola votiva @@ -721,6 +683,8 @@ it: airfield: Aeroporto militare barracks: Caserma bunker: Bunker + mountain_pass: + "yes": Passo di montagna natural: bay: Baia beach: Spiaggia @@ -790,6 +754,7 @@ it: locality: Località (luogo con nome, non popolato) moor: Molo municipality: Comune + neighbourhood: Quartiere postcode: CAP region: Provincia sea: Mare @@ -798,27 +763,29 @@ it: suburb: Quartiere town: Paese unincorporated_area: Area non inclusa - village: Piccolo paese + village: Frazione railway: - abandoned: Linea ferroviaria abbandonata + abandoned: Ferrovia abbandonata construction: Ferrovia in costruzione - disused: Linea ferroviaria dismessa - disused_station: Stazione ferroviaria dismessa + disused: Ferrovia in disuso + disused_station: Stazione ferroviaria in disuso funicular: Funicolare halt: Fermata del treno - historic_station: Storica stazione ferroviaria - junction: Collegamento ferroviario + historic_station: Stazione ferroviaria storica + junction: Nodo ferroviario level_crossing: Passaggio a livello - light_rail: Ferrovia leggera + light_rail: Metropolitana leggera miniature: Ferrovia in miniatura monorail: Monorotaia narrow_gauge: Ferrovia a scartamento ridotto platform: Banchina ferroviaria preserved: Ferrovia storica - spur: Ferrovia per società o ente + proposed: Ferrovia proposta + spur: Diramazione ferroviaria breve station: Stazione ferroviaria + stop: Fermata ferroviaria subway: Stazione della metropolitana - subway_entrance: Ingresso alla metropolitana + subway_entrance: Ingresso metropolitana switch: Punti ferroviari tram: Tramvia tram_stop: Fermata del tram @@ -832,6 +799,7 @@ it: beverages: Negozio bevande bicycle: Negozio biciclette books: Libreria + boutique: Boutique butcher: Macellaio car: Concessionaria car_parts: Autoricambi @@ -845,6 +813,7 @@ it: convenience: Minimarket copyshop: Copisteria cosmetics: Negozio cosmetici + deli: Specialità gastronomiche department_store: Grande magazzino discount: Discount doityourself: Fai da-te @@ -881,17 +850,21 @@ it: organic: Negozio di prodotti naturali ed ecologici outdoor: Negozio di articoli per sport all'aperto pet: Negozio animali + pharmacy: Farmacia photo: Articoli fotografici salon: Salone + second_hand: Negozio oggetti usati shoes: Negozio di calzature shopping_centre: Centro commerciale sports: Articoli sportivi stationery: Cartoleria supermarket: Supermercato + tailor: Sarto toys: Negozio di giocattoli travel_agency: Agenzia di viaggi video: Videoteca wine: Alcolici + "yes": Negozio tourism: alpine_hut: Rifugio alpino artwork: Opera d'arte @@ -914,6 +887,7 @@ it: viewpoint: Punto panoramico zoo: Zoo tunnel: + culvert: Canale sotterraneo "yes": Galleria waterway: artificial: Corso d'acqua artificiale @@ -937,65 +911,117 @@ it: water_point: Punto di ristoro waterfall: Cascata weir: Sbarramento idrico + help_page: + help: + description: Fai una domanda o cerca risposte sul sito di domande e risposte di OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap ha diverse risorse per imparare a conoscere il progetto, chiedendo e rispondendo alle domande, discutendo collaborativamente e documentando gli argomenti di mappatura. + title: Come ottenere aiuto + welcome: + description: Inizia con questa guida rapida che copre le basi di OpenStreetMap. + title: Benvenuti a OSM + url: /welcome + wiki: + description: Sfoglia il wiki per la documentazione approfondita di OSM. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Chiudi + edit_help: Sposta la mappa e usa lo zoom sulla posizione che vuoi modificare, quindi clicca qui. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: La legenda è disponibile solo per il livello Standard map: base: - cycle_map: Open Cycle Map + cycle_map: Mappa ciclabile + hot: Umanitario mapquest: MapQuest Open - standard: Predefinito + standard: Standard transport_map: Mappa dei trasporti + copyright: © OpenStreetMap contributors + donate_link_text: + layers: + data: Dati della mappa + header: Livelli mappa + notes: Note sulla mappa + overlays: Abilita sovrapposizioni per la risoluzione dei problemi della mappa + title: Livelli + locate: + popup: Ti trovi a {distanza} {unità} da questo punto + title: Mostra la mia posizione + zoom: + in: Zoom avanti + out: Zoom indietro + notes: + new: + add: Aggiungi la nota + intro: Per migliorare la mappa, le informazioni che inserisci vengono mostrate agli altri mappatori. Sei pregato di essere il più possibile preciso e descrittivo nello spostare il puntatore sulla posizione corretta e nell'inserire la nota qui sotto. + show: + anonymous_warning: Questa nota include commenti da parte di utenti anonimi che devono essere verificati in modo indipendente. + comment: Commenta + comment_and_resolve: Commenta e chiudi + hide: Nascondi + reactivate: Riattiva + resolve: Risolta + share: + cancel: Annulla + center_marker: Centra la mappa sul marcatore + custom_dimensions: Imposta dimensioni personalizzate + download: Scarica + embed: HTML + format: "Formato:" + image: Immagine + image_size: L'immagine mostrerà il livello standard a + include_marker: Includi il marcatore + link: Link o HTML + long_link: Link + paste_html: Incolla l'HTML per incorporarlo nel sito web + scale: "Scala:" + short_link: Link breve + short_url: URL breve + title: Condividi + view_larger_map: Visualizza mappa ingrandita site: + createnote_disabled_tooltip: Ingrandisci la mappa per aggiungere una nota + createnote_tooltip: Aggiungi una nota sulla mappa edit_disabled_tooltip: Zooma per modificare la mappa edit_tooltip: Modifica la mappa - edit_zoom_alert: Devi ingrandire per modificare la mappa - history_disabled_tooltip: Devi ingrandire per vedere le modifiche per quest'area - history_tooltip: Visualizza le modifiche per quest'area - history_zoom_alert: Devi ingrandire per vedere la cronologia delle modifiche + map_data_zoom_in_tooltip: Zooma per vedere i dati della mappa + map_notes_zoom_in_tooltip: Zooma per vedere le note della mappa layouts: + about: Informazioni community: Comunità community_blogs: Blog della comunità community_blogs_title: Blog dei membri della comunità OpenStreetMap - copyright: Copyright e Licenza - documentation: Documentazione - documentation_title: Documentazione sul progetto + copyright: Copyright + data: Dati donate: Supporta OpenStreetMap %{link} al fondo destinato all'aggiornamento dell'hardware. - donate_link_text: donando edit: Modifica edit_with: Modifica con %{editor} export: Esporta - export_tooltip: Esporta i dati della mappa + export_data: Esporta Dati foundation: Fondazione foundation_title: La Fondazione OpenStreetMap gps_traces: Tracciati GPS gps_traces_tooltip: Gestisci i tracciati GPS help: Aiuto - help_centre: Aiuto - help_title: Sito di aiuto per il progetto - history: Storico - home: posizione iniziale - home_tooltip: Vai alla posizione iniziale - inbox: in arrivo (%{count}) - inbox_tooltip: - one: La tua posta in arrivo contiene 1 messaggio non letto - other: La tua posta in arrivo contiene %{count} messaggi non letti - zero: La tua posta in arrivo contiene solo messaggi già letti - intro_1: OpenStreetMap è una mappa liberamente modificabile dell'intero pianeta. E' fatta da persone come te. + history: Cronologia + home: Vai alla posizione di casa intro_2_create_account: Crea un account utente - intro_2_download: scaricati - intro_2_html: I dati possono essere %{download} liberamente e %{use} in accordo alla %{license}. %{create_account} per aiutare a migliorare la mappa. - intro_2_license: licenza libera - intro_2_use: utilizzati - license: - title: I dati di OpenStreetMap sono distribuiti secondo la licenza Creative Commons Attribution-Share Alike 2.0 Generic - log_in: entra + intro_header: Benvenuti in OpenStreetMap! + intro_text: OpenStreetMap è una mappa del mondo, creata da persone come te e libera di utilizzare sotto licenza aperta. + learn_more: Ulteriori informazioni + log_in: Accedi log_in_tooltip: Accedi con un profilo utente esistente logo: alt_text: Logo OpenStreetMap - logout: esci - logout_tooltip: Esci + logout: Esci make_a_donation: text: Fai una donazione title: Aiuta OpenStreetMap con una donazione in denaro + more: Altro osm_offline: Il database di OpenStreetMap è al momento non in linea per pemettere lo svolgimento di alcuni lavori essenziali su di esso. osm_read_only: Il database di OpenStreetMap è al momento in modalità sola-lettura per pemettere lo svolgimento di alcuni lavori essenziali su di esso. partners_bytemark: Bytemark Hosting @@ -1003,24 +1029,47 @@ it: partners_ic: Imperial College (Londra) partners_partners: partner partners_ucl: UCL VR Centre - sign_up: iscriviti + sign_up: Registrati sign_up_tooltip: Crea un profilo utente per apportare modifiche - sotm2011: Vieni alla conferenza di OpenStreetMap 2011, The State of the Map, il 9-11 Settembre a Denver! - tag_line: La wiki-mappa Libera del Mondo + start_mapping: Inizia a mappare + tag_line: La wiki-mappa libera del mondo user_diaries: Diari degli utenti user_diaries_tooltip: Visualizza diari utente - view: Visualizza - view_tooltip: Visualizza la mappa - welcome_user: Benvenuto, %{user_link} - welcome_user_link_tooltip: Pagina utente personale - wiki: Wiki - wiki_title: Wiki del progetto license_page: foreign: english_link: l'originale in inglese text: In caso di incoerenza fra questa pagina di traduzione e %{english_original_link}, fa fede la pagina in inglese title: A proposito di questa traduzione - legal_babble: "

    Copyright e licenza

    \n

    \n OpenStreetMap è un database aperto, rilasciato in base alla licenza \n Creative Commons Attribuzione-Condividi allo stesso modo 2.0 (CC BY-SA).\n

    \n

    \n Sei libero di copiare, distribuire, trasmettere e adattare le nostre mappe\n e dati, finchè lo attribuisci a OpenStreetMap e i suoi\n contributori. Se tu alteri o ti basi sulle nostre mappe o dati,\n è possibile distribuire il risultato solo sotto la stessa licenza. Il \n codice legale completo legale\n illustra i tuoi diritti e le tue responsabilità.\n

    \n\n

    Come si attribuisce a OpenStreetMap

    \n

    \n Se utilizzi le immagini della mappa di OpenStreetMap, si richiede che\n l'attribuzione abbia almeno scritto “© OpenStreetMap\n contributors, CC BY-SA”. Se utilizzi solo i dati della mappa\n si richiede “Map data © OpenStreetMap contributors,\n CC BY-SA”.\n

    \n

    \n Ove possibile, OpenStreetMap dovrebbe essere un collegamento ipertestuale a http://www.openstreetmap.org/\n e CC BY-SA a http://creativecommons.org/licenses/by-sa/2.0/. Se\n utilizzi un mezzo dove il link non sono possibili (per esempio un\n opera stampata), suggeriamo di indirizzare i lettori a\n www.OpenStreetMap.org (forse scrivendo\n ‘OpenStreetMap’ a questo indirizzo completo) e a\n www.creativecommons.org.\n

    \n\n

    Per saperne di più

    \n

    \n Approfonisci su come utilizzare i nostri dati presso le Domande\n legali frequenti.\n

    \n

    \n Ai contributori OSM si ricorda di non aggiungere dati da qualsiasi\n fonte protetta da copyright (ad esempio Google Maps o mappe stampate) senza\n esplicita autorizzazione dei titolare del copyright.\n

    \n

    \n Anche se i dati OpenStreetMap sono aperti, non possiamo fornire una\n mappa API esente dalle tasse per gli sviluppatori di terze parti.\n\n Vedi la nostra Politica di utilizzo API, la\n Politica di utilizzo dei riquadri mappa\n e la Politica di utilizzo Nominatim.\n

    \n\n

    Nostri collaboratori

    \n

    \n La nostra licenza CC BY-SA richiede di “dare la ragionevole\n attribuzione dell'autore originale al mezzo o ai mezzi che stai\n utilizzando”. I mappatori individuali OSM non richiedono\n un'attribuzione al di là che per i “contributori\n OpenStreetMap”, ma, dove i dati forniti da un' agenzia cartografica\n nazionale o altra fonte importante sono stati inclusi in OpenStreetMap,\n può essere congrua l'attribuzione a loro, riproducendo direttamente\n la loro attribuzione o l'indirizzamento a questa pagina.\n

    \n\n\n\n
      \n
    • Australia: Contiene i dati della periferia basati\n sui dati dell'Australian Bureau of Statistics.
    • \n
    • Austria: Contiene i dati della\n Stadt Wien (sotto\n CC BY),\n Land Vorarlberg e\n Land Tirol (sotto CC-BY AT con emendamenti).
    • \n
    • Canada: Contiene i dati della\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), e della StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Francia: Contiene dati provenienti dalla\n Direction Générale des Impôts.
    • \n
    • Olanda: Contiene dati © AND, 2007\n (www.and.com)
    • \n
    • Nuova Zelanda: Contiene i dati provenienti dalla\n Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polonia: Contiene i dati dalle mappe UMP-pcPL. Copyright dei\n contributori di UMP-pcPL.\n \n Altre informazioni sull'uso dei dati di UMP da parte di OSM
    • \n
    • Sud Africa: Contiene i dati provenienti dalla\n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved.
    • \n
    • Regno Unito: Contiene i dati della\n Ordnance Survey © Crown copyright and database right\n 2010.
    • \n
    \n\n

    \n L'inserimento dei dati in OpenStreetMap non implica che l'originale\n provider di dati appoggi OpenStreetMap, fornisca alcuna garanzia o\n accetti qualsiasi responsabilità.\n

    " + legal_babble: + attribution_example: + alt: Esempio di come attribuire ad OpenStreetMap su una pagina web + title: Esempio di attribuzione + contributors_at_html: "Austria: contiene i dati della\nStadt Wien (sotto\nCC BY),\nLand Vorarlberg e\nLand Tirol (sotto CC-BY AT con emendamenti)." + contributors_ca_html: "Canada: contiene i dati della\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), e della StatCan (Geography Division,\nStatistics Canada)." + contributors_fi_html: "Finlandia: Contiene dati dal\nNational Land Survey of Finland's Topographic Database\ne di altri set di dati, in base alla\nlicensa NLSFI." + contributors_footer_1_html: "Per ulteriori dettagli di queste e altre fonti che sono state utilizzate\nper aiutare a migliorare OpenStreetMap, consulta la pagina dei\ncollaboratori sul wiki di OpenStreetMap." + contributors_footer_2_html: "L'inserimento dei dati in OpenStreetMap non implica che il fornitore\noriginale dei dati appoggi OpenStreetMap, fornisca alcuna garanzia o\naccetti qualsiasi responsabilità." + contributors_fr_html: "Francia: contiene dati provenienti dalla\nDirection Générale des Impôts." + contributors_gb_html: "Regno Unito: contiene i dati della\nOrdnance Survey © Crown copyright and database right\n2010-12." + contributors_intro_html: "I nostri contributori sono migliaia di individui. Includiamo anche dati distribuiti sotto licenze aperte provenienti da agenzie cartografiche nazionali o di altra fonte, tra cui:" + contributors_nl_html: "strong>Olanda
    : contiene dati © AND, 2007\n(www.and.com)" + contributors_nz_html: "Nuova Zelanda: contiene i dati provenienti dalla\nLand Information New Zealand. Crown Copyright reserved." + contributors_title_html: Nostri collaboratori + contributors_za_html: "Sud Africa: contiene i dati provenienti dalla\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: Si richiede che l'attribuzione sia “© OpenStreetMap contributors ”. + credit_2_html: "Inoltre devi specificare chiaramente che i dati sono disponibili sotto la Open Database Licese e, se usi le nostre tavole, che la cartografia è pubblicata con licenza CC-BY-SA. Puoi fare ciò mettendo un collegamento URL a questa pagina di copyright.\nIn alternativa, e necessariamente se stai distribuendo OSM sotto forma di dati, puoi citare e creare un collegamento diretto alle licenze. In mezzi di comunicazione dove i collegamenti URL non sono possibili (per esempio un'opera stampata), ti suggeriamo di indirizzare i lettori verso openstreetmap.org (magari esplicitando 'OpenStreetMap' come nome completo), verso opendatacommons.org e, se necessario, verso creativecommons.org." + credit_3_html: "In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa.\nAd esempio:" + credit_title_html: Come si attribuisce a OpenStreetMap + infringement_1_html: Ai contributori OSM si ricorda di non aggiungere dati da qualsiasi fonte protetta da copyright (ad esempio Google Maps o mappe stampate) senza esplicita autorizzazione dei titolare del copyright. + infringement_2_html: "Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra\n procedura di rimozione per violazione del copyright o segnalacelo direttamente alla nostra\npagina di segnalazione on-line." + infringement_title_html: Violazione del copyright + intro_1_html: "OpenStreetMap è un database aperto, rilasciato in base alla licenza Open Data Commons Open Database License (ODbL)." + intro_2_html: "Sei libero di copiare, distribuire, trasmettere e adattare i nostri dati, finché lo attribuisci a OpenStreetMap e ai suoi contributori. Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo sotto la stessa licenza. Il \ncodice\nlegale completo illustra i tuoi diritti e le tue responsabilità." + intro_3_html: "La cartografia contenuta nelle nostre tavole, e la nostra documentazione, sono rilasciate sotto licenza Creative \nCommons Attribuzione - Condividi allo stesso modo 2.0 (CC-BY-SA)." + more_1_html: "Per saperne di più su come utilizzare i nostri dati, e come accreditarci, consulta\nle Domande\nlegali frequenti." + more_2_html: "Anche se i dati OpenStreetMap sono aperti, non possiamo fornire accesso alle API della mappa gratuitamente per gli sviluppatori di terze parti.\nVedi la nostra Politica di utilizzo delle API, la\nPolitica di utilizzo delle tavole della mappa\ne la Politica di utilizzo di Nominatim." + more_title_html: Per saperne di più + title_html: Copyright e licenza native: mapping_link: inizia a mappare native_link: versione in italiano @@ -1033,7 +1082,7 @@ it: date: Data from: Da messages: Hai %{new_messages} e %{old_messages} - my_inbox: I miei messaggi in arrivo + my_inbox: Posta in arrivo new_messages: one: "%{count} nuovo messaggio" other: "%{count} nuovi messaggi" @@ -1041,20 +1090,20 @@ it: old_messages: one: "%{count} vecchio messaggio" other: "%{count} messaggi vecchi" - outbox: in uscita + outbox: posta in uscita people_mapping_nearby: persone che mappano nelle vicinanze subject: Oggetto - title: In arrivo + title: Posta in arrivo mark: as_read: Messaggio marcato come già letto as_unread: Messaggio marcato come non letto message_summary: delete_button: Elimina - read_button: Marca come già letto + read_button: Segna come già letto reply_button: Rispondi - unread_button: Marca come non letto + unread_button: Segna come non letto new: - back_to_inbox: Ritorna ai messaggi in arrivo + back_to_inbox: Ritorna alla posta in arrivo body: Corpo limit_exceeded: Recentemente hai inviato molti messaggi. Si prega di attendere un momento prima di inviarne altri. message_sent: Messaggio inviato @@ -1068,34 +1117,62 @@ it: title: Nessun messaggio del genere outbox: date: Data - inbox: in arrivo + inbox: posta in arrivo messages: one: Hai %{count} messaggio inviato other: Hai %{count} messaggi inviati - my_inbox: Messaggi %{inbox_link} + my_inbox: Mia %{inbox_link} no_sent_messages: Non ci sono ancora messaggi inviati. Perché non contatti qualcuno di questi %{people_mapping_nearby_link}? - outbox: in uscita + outbox: posta in uscita people_mapping_nearby: persone che mappano nelle vicinanze subject: Oggetto - title: In uscita + title: Posta in uscita to: A read: - back_to_inbox: Ritorna ai messaggi in arrivo - back_to_outbox: Ritorna ai messaggi in uscita + back: Indietro date: Data from: Da - reading_your_messages: Lettura dei propri messaggi - reading_your_sent_messages: Lettura dei propri messaggi inviati reply_button: Rispondi subject: Oggetto title: Leggi messaggio to: A - unread_button: Marca come non letto + unread_button: Segna come non letto wrong_user: Sei loggato come `%{user}', ma il messaggio che hai chiesto di leggere non era diretto a quell'utente. Se vuoi leggerlo, per favore loggati con l'utenza interessata. reply: wrong_user: Sei loggato come `%{user}', ma il messaggio al quale hai chiesto di rispondere non era diretto a quell'utente. Se vuoi rispondere, per favore loggati con l'utenza interessata. sent_message_summary: delete_button: Elimina + note: + description: + closed_at_by_html: Chiusa %{when} fa da %{user} + closed_at_html: Chiusa %{when} fa + commented_at_by_html: Aggiornata %{when} fa da %{user} + commented_at_html: Aggiornata %{when} fa + opened_at_by_html: Creata %{when} fa da %{user} + opened_at_html: Creata %{when} fa + reopened_at_by_html: Riaperta %{when} fa da %{user} + reopened_at_html: Riaperta %{when} fa + entry: + comment: Commento + full: Nota completa + mine: + ago_html: "%{when} fa" + created_at: Creata il + creator: Autore + description: Descrizione + heading: Note dell'utente %{user} + id: Identificativo + last_changed: Modificata per l'ultima volta + subheading: Note inserite o commentate da %{user} + title: Note inserite o commentate da %{user} + rss: + closed: nota chiusa (vicino a %{place}) + commented: nuovo commento (vicino a %{place}) + description_area: Una lista di note inserite, commentate o chiuse nella tua area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Feed rss per la nota %{id} + opened: nuova nota (vicino a %{place}) + reopened: nota riattivata (vicino a %{place}) + title: Note di OpenStreetMap notifier: diary_comment_notification: footer: Puoi anche leggere il commento su %{readurl} e puoi commentare su %{commenturl} oppure rispondere su %{replyurl} @@ -1111,8 +1188,7 @@ it: email_confirm_plain: click_the_link: Se questo sei proprio tu, per favore clicca sul collegamento sottostante per confermare il cambiamento. greeting: Ciao, - hopefully_you_1: Qualcuno (si spera proprio tu) vuole modificare il tuo indirizzo di posta elettronica su - hopefully_you_2: "%{server_url} con il nuovo indirizzo %{new_address}." + hopefully_you: Qualcuno (si spera proprio tu) vuole modificare il tuo indirizzo di posta elettronica su %{server_url} con il nuovo indirizzo %{new_address}. friend_notification: befriend_them: Puoi anche aggiungerli come amici in %{befriendurl}. had_added_you: "%{user} ti ha aggiunto come suo amico su OpenStreetMap." @@ -1141,44 +1217,36 @@ it: lost_password_plain: click_the_link: Se sei tu, per favore clicca sul link sotto per resettare la password greeting: Ciao, - hopefully_you_1: Qualcuno (probabilmente tu stesso) ha richiesto che la password sia impostata nuovamente su questo - hopefully_you_2: indirizzo di posta elettronica associato al profilo utente di openstreetmap.org. + 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. message_notification: - footer1: Puoi leggere il messaggio anche su %{readurl} - footer2: e puoi rispondere a %{replyurl} + footer_html: Puoi anche leggere il messaggio al %{readurl} e puoi rispondere al %{replyurl} header: "%{from_user} ti ha inviato un messaggio tramite OpenStreetMap con l'oggetto %{subject}:" hi: Ciao %{to_user}, + note_comment_notification: + anonymous: Un utente anonimo + closed: + commented_note: "%{commenter} ha chiuso una nota sulla mappa da te commentata. La nota è vicina a %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha chiuso una nota cui sei interessato" + subject_own: "[OpenStreetMap] %{commenter} ha chiuso una delle tue note" + your_note: "%{commenter} ha chiuso una delle tue note sulla mappa vicina a %{place}." + commented: + commented_note: "%{commenter} ha lasciato un commento su una nota sulla mappa da te commentata. La nota è vicina a %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha commentato una delle note cui sei interessato" + subject_own: "[OpenStreetMap] %{commenter} ha commentato una delle tue note" + your_note: "%{commenter} ha lasciato un commento su una delle tue note sulla mappa vicina a %{place}." + details: Ulteriori dettagli sulla nota possono essere trovati su %{url}. + greeting: Ciao, + reopened: + commented_note: "%{commenter} ha riattivato una nota che avevi commentato. La nota si trova vicino a %{place}." + subject_other: "[OpenStreetMap] %{commenter} ha riattivato una nota a cui eri interesssato" + subject_own: "[OpenStreetMap] %{commenter} ha riattivato una delle tue note" + your_note: "%{commenter}ha riattivato una delle tue note vicino a %{place}." signup_confirm: - subject: "[OpenStreetMap] Conferma il tuo indirizzo email" - signup_confirm_html: - ask_questions: E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte. - click_the_link: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap. - current_user: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui essi operano, è disponibile su Category:Users_by_geographical_region. - get_reading: Leggi di OpenStreetMap sul wiki, non perdere le ultime notizie sul blog di OpenStreetMap o su Twitter, oppure sfoglia il blog OpenGeoData di Steve Coast, fondatore di OpenStreetMap, per una storia completa del progetto; ci sono anche dei podcast da ascoltare! - greeting: Benvenuto! - hopefully_you: Qualcuno (si spera proprio tu) vuole creare un profilo - introductory_video: Puoi guardare un %{introductory_video_link}. - more_videos: Ci sono %{more_videos_link}. - more_videos_here: ulteriori video qui - user_wiki_page: E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria che si riferiscano al luogo in cui si opera, come ad esempio [[Category:Users_in_London]]. - video_to_openstreetmap: video introduttivo su OpenStreetMap - wiki_signup: Ci si può anche iscrivere al wiki di OpenStreetMap. - signup_confirm_plain: - ask_questions: "E' possibile fare qualsiasi domanda relativa ad OpenStreetMap sul nostro sito di domande e risposte:" - blog_and_twitter: "Ottieni le ultime notizie tramite il blog di OpenStreetMap oppure Twitter:" - click_the_link_1: Se questo qualcuno sei tu, benvenuto! Clicca sul collegamento sottostante - click_the_link_2: per confermare il tuo profilo ed avere ulteriori informazioni su OpenStreetMap. - current_user_1: Una lista degli utenti attuali nelle categorie, basate sul luogo in cui - current_user_2: "essi operano, è disponibile su:" - greeting: Benvenuto! - hopefully_you: Qualcuno (si spera proprio tu) vuole creare un profilo - introductory_video: "Puoi guardare un video introduttivo su OpenStreetMap qui:" - more_videos: "Ci sono ulteriori video qui:" - opengeodata: "OpenGeoData.org è il blog del fondatore di OpenStreetMap, Steve Coast, che mette a disposizione anche dei podcast:" - the_wiki: "Puoi avere altre informazioni su OpenStreetMap sul wiki:" - user_wiki_1: E' consigliato creare una pagina utente sul wiki, che includa delle etichette di categoria - user_wiki_2: che si riferiscano al luogo in si opera, come ad esempio [[Category:Users_in_Friuli-Venezia_Giulia]]. - wiki_signup: "Ci si può anche iscrivere al wiki di OpenStreetMap a:" + confirm: "Prima di qualsiasi altra cosa, abbiamo bisogno di confermare che tale richiesta è effettivamente venuta da te, quindi se è così clicca sul link qui sotto per confermare il tuo account:" + created: Qualcuno (si spera che sia tu) ha appena creato un account in %{site_url}. + greeting: Ehilà! + subject: "[OpenStreetMap] Benvenuti su OpenStreetMap" + welcome: Dopo che avrai confermato il tuo account, ti forniremo alcune informazioni aggiuntive per consentirti di iniziare. oauth: oauthorize: allow_read_gpx: Visualizza i tuoi tracciati GPS @@ -1187,8 +1255,18 @@ it: allow_write_api: modifica la mappa. allow_write_diary: creare pagine di diario, commenti e fare amicizia. allow_write_gpx: carica tracciati GPS. + allow_write_notes: modificare le note. allow_write_prefs: modificare le tue preferenze utente. - request_access: L'applicazione %{app_name} sta richiedendo l'accesso al tuo profilo, %{user}. Si prega di verificare se si desidera che l'applicazione abbia le seguenti funzionalità. E' possibile scegliere a piacere. + request_access: L'applicazione %{app_name} sta richiedendo l'accesso al tuo profilo, %{user}. Si prega di verificare se si desidera che l'applicazione abbia le seguenti capacità. È possibile scegliere a piacere. + title: Autorizzare l'accesso al tuo account + oauthorize_failure: + denied: Hai negato l'accesso all'applicazione %{app_name} al tuo account. + invalid: Il token di autorizzazione non è valido. + title: Richiesta di autorizzazione non riuscita + oauthorize_success: + allowed: Hai consentito l'accesso all'applicazione %{app_name} al tuo account. + title: Richiesta di autorizzazione consentita + verification: Il codice di verifica è %{code}. revoke: flash: Hai revocato il token per %{application} oauth_clients: @@ -1205,6 +1283,7 @@ it: allow_write_api: modifica la mappa. allow_write_diary: crea pagine di diario, commenti e fai amicizia. allow_write_gpx: carica tracciati GPS. + allow_write_notes: modificare le note. allow_write_prefs: modifica le loro preferenze utente. callback_url: URL di richiamata name: Nome @@ -1235,6 +1314,7 @@ it: allow_write_api: modifica la mappa. allow_write_diary: crea pagine di diario, commenti e fai amicizia. allow_write_gpx: carica tracciati GPS. + allow_write_notes: modificare le note. allow_write_prefs: modifica le sue preferenze utente. authorize_url: "Autorizza URL:" confirm: Sei sicuro? @@ -1243,7 +1323,7 @@ it: key: "Chiave del consumatore:" requests: "Richieste le seguenti autorizzazioni da parte dell'utente:" secret: "Codice segreto dell'utilizzatore:" - support_notice: Supportiamo HMAC-SHA1 (consigliato), così come testo normale in modalità SSL. + support_notice: Supportiamo HMAC-SHA1 (consigliato) e firme RSA-SHA1. title: Dettagli OAuth per %{app_name} url: "URL del token di richiesta:" update: @@ -1282,7 +1362,8 @@ it: site: edit: anon_edits_link_text: Leggi il perché. - flash_player_required: E' 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. + flash_player_required: È 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. + id_not_configured: iD non è stato configurato no_iframe_support: Il proprio browser non supporta gli iframe HTML, necessari per questa funzionalità. not_public: Non si sono impostate come pubbliche le proprie modifiche. not_public_description: Non è possibile modificare la mappa finché non lo si fa. Si possono impostare come pubbliche le proprie modifiche dalla propria %{user_page}. @@ -1291,18 +1372,15 @@ it: 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.) user_page_link: pagina utente index: + createnote: Aggiungi una nota js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato disabilitato JavaScript. js_2: OpenStreetMap utilizza JavaScript per le sua mappa. license: - license_name: Creative Commons Attribuzione-Condividi allo stesso modo 2.0 - notice: Rilasciato sotto la licenza %{license_name} dal %{project_name} ed i suoi contributori. - project_name: progetto OpenStreetMap + copyright: Copyright OpenStreetMap e collaboratori, sotto una licenza aperta permalink: Link permanente remote_failed: Modifica non riuscita - assicurarsi che JOSM o Merkaartor sia avviato e che l'opzione di controllo remoto sia abilitata - shortlink: Collegamento breve + shortlink: Link breve key: - map_key: Legenda - map_key_tooltip: Legenda table: entry: admin: Confine amministrativo @@ -1341,7 +1419,7 @@ it: park: Parco permissive: Accesso permissivo pitch: Campo sportivo - primary: Strada di importanza nazionale + primary: Strada primaria private: Accesso privato rail: Ferrovia reserve: Riserva naturale @@ -1353,7 +1431,7 @@ it: school: - Scuola - Università - secondary: Strada di importanza regionale + secondary: Strada secondaria station: Stazione ferroviaria subway: Metropolitana summit: @@ -1362,11 +1440,11 @@ it: tourist: Attrazione turistica track: Strada forestale o agricola tram: - - Metropolitana di superficie - - Tram + - Metropolitana leggera + - tram trunk: Superstrada tunnel: Linea tratteggiata = tunnel - unclassified: Strada minore + unclassified: Strada non classificata unsurfaced: Strada non pavimentata wood: Bosco markdown_help: @@ -1388,7 +1466,6 @@ it: preview: Anteprima search: search: Cerca - search_help: "esempi: 'Trieste', 'Via Dante Alighieri, Trieste', 'CB2 5AQ', oppure 'post offices near Trieste' altri esempi..." submit_text: Vai where_am_i: Dove sono? where_am_i_title: Descrivi la posizione attuale usando il motore di ricerca @@ -1404,6 +1481,11 @@ it: upload_trace: Carica tracciato GPS delete: scheduled_for_deletion: Tracciato in attesa di essere eliminato + description: + description_with_count: + one: File GPX con %{count} punto da %{user} + other: File GPX con %{count} punti da %{user} + description_without_count: File GPX da %{user} edit: description: "Descrizione:" download: scaricati @@ -1421,7 +1503,11 @@ it: uploaded_at: "Caricato il:" visibility: "Visibilità:" visibility_help: che cosa significa questo? + georss: + title: Tracce GPS di OpenStreetMap list: + description: Naviga fra i tracciati GPS caricati recentemente + empty_html: Ancora niente qui. Carica una nuova traccia o leggi ulteriori informazioni sul tracciamento GPS nella pagina wiki. public_traces: Tracciati GPS pubblici public_traces_from: Tracciati GPS pubblici di %{user} tagged_with: " etichettati con %{tags}" @@ -1461,14 +1547,16 @@ it: trace_header: see_all_traces: Vedi tutti i tracciati see_your_traces: Vedi tutti i tuoi tracciati - traces_waiting: Ci sono %{count} tracciati in attesa di caricamento. Si consiglia di aspettare il loro completamento prima di caricarne altri, altrimenti si blocca la lista di attesa per altri utenti. + traces_waiting: + one: C'è %{count} tracciato in attesa di caricamento. Si consiglia di aspettare il C'è %{count} tracciato completamento prima di caricarne altri, altrimenti si blocca la lista di attesa per altri utenti. + other: Ci sono %{count} tracciati in attesa di caricamento. Si consiglia di aspettare il Ci sono %{count} tracciati completamento prima di caricarne altri, altrimenti si blocca la lista di attesa per altri utenti. upload_trace: Carica un tracciato trace_optionals: tags: Etichette trace_paging_nav: - next: Successivo » - previous: « Precedente - showing_page: Visualizzata la pagina %{page} + newer: Tracce più recenti + older: Tracce più vecchie + showing_page: Pagina %{page} view: delete_track: Elimina questo tracciato description: "Descrizione:" @@ -1489,17 +1577,17 @@ it: uploaded: "Caricato il:" visibility: "Visibilità:" visibility: - identifiable: Identificabile (visualizzato nella lista dei tracciati come identificabile, punti ordinati con marcature temporali) + identifiable: Identificabile (visualizzato nella lista dei tracciati come identificabile, punti ordinati con marche temporali) private: Privato (condiviso solamente come anonimo, punti non ordinati) public: Pubblico (visualizzato nella lista dei tracciati come anonimo, punti non ordinati) - trackable: Tracciabile (soltanto condiviso come anonimo, punti ordinati con marcature temporali) + trackable: Tracciabile (soltanto condiviso come anonimo, punti ordinati con marche temporali) user: account: contributor terms: agreed: Hai accettato le nuove regole per contribuire. agreed_with_pd: Hai anche dichiarato di considerare le tue modifiche di Pubblico Dominio. heading: "Regole per contribuire:" - link text: cos'è questo? + link text: che cos'è questo? not yet agreed: Non hai ancora accettato le nuove regole per contribuire. review link text: Quando puoi segui per favore questo link per leggere ed accettare le nuove regole per contribuire. current email address: "Indirizzo e-mail attuale:" @@ -1507,6 +1595,9 @@ it: email never displayed publicly: (mai visualizzato pubblicamente) flash update success: Informazioni sull'utente aggiornate con successo. flash update success confirm needed: Informazioni sull'utente aggiornate con successo. Controllare la propria email per la conferma del nuovo indirizzo di posta elettronica. + gravatar: + gravatar: Usa Gravatar + link text: che cos'è questo? home location: "Posizione:" image: "Immagine:" image size hint: (immagini quadrate di almeno 100x100 funzionano meglio) @@ -1514,13 +1605,13 @@ it: latitude: "Latitudine:" longitude: "Longitudine:" make edits public button: Rendi pubbliche tutte le mie modifiche - my settings: Impostazioni personali + my settings: Impostazioni new email address: "Nuovo indirizzo e-mail:" new image: Aggiungi un'immagine no home location: Non si è inserita la propria posizione. openid: link: http://wiki.openstreetmap.org/wiki/IT:OpenID - link text: Che cos'è questo? + link text: che cos'è questo? openid: "OpenID:" preferred editor: "Editor preferito:" preferred languages: "Lingua preferita:" @@ -1530,7 +1621,7 @@ it: disabled link text: perché non posso modificare? enabled: Abilitate. Non anonimo con il permesso di modificare i dati. enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits - enabled link text: cos'è questo? + enabled link text: che cos'è questo? heading: "Modifiche pubbliche:" public editing note: heading: Modifica pubblica @@ -1542,22 +1633,22 @@ it: update home location on click: Aggiorna la posizione quando clicco sulla mappa? confirm: already active: Questo profilo è stato già confermato. - before you start: Sappiamo che probabilmente hai fretta di iniziare a mappare, ma prima dovresti inserire alcune informazioni su di te nel modulo sottostante. button: Conferma - heading: Conferma un profilo utente + heading: Controlla la tua e-mail! + introduction_1: Ti abbiamo inviato una email di conferma. + introduction_2: Conferma il tuo account cliccando sul link presente nella mail e sarai in grado di avviare la mappatura. press confirm button: Premere sul pulsante di conferma sottostante per attivare il proprio profilo utente. - reconfirm: Se è passato un po' di tempo dall'ultimo accesso potrebbe essere necessario inviare una nuova email di conferma. - success: Il profilo utente è stato confermato, grazie per l'iscrizione! - unknown token: Questo token non sembra esistere. + reconfirm_html: Per richiedere nuovamente una email di conferma, Clicca qui. + unknown token: Questo codice di conferma è scaduto oppure non esiste. confirm_email: button: Conferma - failure: E' stato già confermato un indirizzo email con questo codice. + failure: Un indirizzo email con questo codice è già stato confermato. heading: Conferma una variazione di indirizzo email press confirm button: Premere sul pulsante di conferma sottostante per confermare il nuovo indirizzo email. success: L'indirizzo email è stato confermato, grazie per l'iscrizione! confirm_resend: failure: Utente %{name} non trovato. - success: E' stato spedito un nuovo messaggio di conferma all'indirizzo %{email} e non appena verrà confermato il proprio profilo si sarà in grado di mappare.

    Se si utilizzano dei filtri antispam che spediscono richieste di conferma assicurarsi di inserire l'indirizzo webmaster@openstreetmap.org nella whitelist, altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma. + success: È stato spedito un nuovo messaggio di conferma all'indirizzo %{email} e non appena verrà confermato il proprio profilo si sarà in grado di mappare.

    Se si utilizzano dei filtri antispam che spediscono richieste di conferma assicurarsi di inserire l'indirizzo webmaster@openstreetmap.org nella whitelist, altrimenti non siamo in grado di rispondere ad alcuna richiesta di conferma. filter: not_an_administrator: Bisogna essere amministratori per poter eseguire questa azione. go_public: @@ -1584,8 +1675,6 @@ it: lost password link: Persa la password? new to osm: Sei nuovo su OpenStreetMap? no account: Non hai un account? - notice: Leggi i dettagli sull'imminente cambio di licenza di OpenStreetMap ( traduzioni) (discussione ) - notice_terms: OpenStreetMap si sta muovendo per avere una nuova licenza per il 1° aprile 2012. È ''open'' come quella attuale, ma le restrizioni legali sono molto più indicate per il nostro database cartografico. Ci piacerebbe mantenere i vostri contributi in OpenStreetMap, ma possiamo farlo solo se accosentite a farceli redistribuire sotto una nuova licenza. In caso contrario, purtroppo, dovremo rimuoverli dal database.

    Per favore accedi, poi prenditi pochi secondi per leggere e ad accettare i nuovi termini. Grazie! openid: "%{logo} OpenID:" openid invalid: Spiacente, sembra il che tuo OpenID non sia valido openid missing provider: Siamo spiacenti, impossibile contattare il provider OpenID @@ -1630,19 +1719,21 @@ it: title: password persa make_friend: already_a_friend: Sei già amico di %{name}. + button: Aggiungi agli amici failed: Spiacenti, non è stato possibile aggiungere %{name} come un amico. - success: "%{name} è ora tuo amico." + heading: Aggiungere %{user} agli amici? + success: "%{name} è ora tuo amico!" new: + about: + header: Libero ed editabile + html: "

    A differenza di altre mappe, OpenStreetMap è completamente creato da persone come te\n ed è libero per chiunque per correggerlo, aggiornarlo, scaricarlo ed usarlo.

    \n

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

    " confirm email address: "Conferma indirizzo email:" confirm password: "Conferma password:" contact_webmaster: Si prega di contattare il webmaster affinchè faccia in modo di creare un profilo. Tenteremo di soddisfare la richiesta il più rapidamente possibile. - continue: Continua + continue: Registrati display name: "Nome visualizzato:" display name description: Il proprio nome utente visualizzato pubblicamente. Può essere modificato più tardi nelle preferenze. email address: "Indirizzo email:" - fill_form: Riempi il modulo e noi ti invieremo velocemente una email per attivare il tuo profilo. - flash create success message: Grazie per l'iscrizione. Abbiamo spedito un messaggio di conferma all'indirizzo %{email} e non appena sarà confermato il proprio profilo sarà possibile mappare.

    Se si utilizzano dei filtri antispam che inviano delle richieste di conferma assicurarsi che l'indirizzo webmaster@openstreetmap.org sia nella whitelist, altrimenti non saremo in grado di rispondere ad alcuna richiesta di conferma. - heading: Crea un profilo utente license_agreement: Quando confermi il tuo profilo devi accettare le regole per contribuire. no_auto_account_create: Sfortunatamente in questo momento non è possibile creare automaticamente per te un profilo. not displayed publicly: Non visualizzato pubblicamente (vedi le norme sulla privacy) @@ -1652,7 +1743,7 @@ it: password: "Password:" terms accepted: Grazie di aver accettato le nuove regole per contribuire! terms declined: Siamo spiacenti che tu abbia deciso di non accettare i nuovi termini di contribuzione. Per ulteriori informazioni consultare questa pagina del wiki. - title: Crea profilo + title: Registrati use openid: In alternativa utilizza %{logo} OpenID per accedere no_such_user: body: Spiacenti, non c'è alcun utente con il nome %{user}. Controllare la digitazione, o che il collegamento sul quale hai cliccato non sia errato. @@ -1663,6 +1754,8 @@ it: nearby mapper: Mappatore vicino your location: Propria posizione remove_friend: + button: Rimuovi dagli amici + heading: Rimuovere ${user} dagli amici? not_a_friend: "%{name} non è uno dei tuoi amici." success: "%{name} è stato rimosso dai tuoi amici." reset_password: @@ -1672,7 +1765,7 @@ it: heading: Reimposta password per %{user} password: "Password:" reset: Reimposta password - title: reimposta la password + title: Reimposta password set_home: flash success: Posizione personale salvata con successo suspended: @@ -1683,7 +1776,7 @@ it: terms: agree: Accetto consider_pd: In aggiunta al contratto di cui sopra, considero che i miei contributi sono in Pubblico Dominio - consider_pd_why: cos'è questo? + consider_pd_why: che cos'è questo? decline: Non accetto guidance: "Informazioni utili a capire questi termini: un riassunto leggibile ed alcune traduzioni informali" heading: Regole per contribuire @@ -1697,12 +1790,12 @@ it: you need to accept or decline: Si prega di leggere e poi accettare o rifiutare i nuovi termini di contribuzione per continuare. view: activate_user: attiva questo utente - add as friend: aggiungi come amico + add as friend: Aggiungi amico ago: (%{time_in_words_ago} fa) - block_history: vedi i blocchi ricevuti - blocks by me: blocchi applicati da me - blocks on me: blocchi su di me - comments: commenti + block_history: blocchi ricevuti + blocks by me: Blocchi applicati da me + blocks on me: Blocchi su di me + comments: Commenti confirm: Conferma confirm_user: conferma questo utente create_block: blocca questo utente @@ -1714,31 +1807,35 @@ it: deactivate_user: disattiva questo utente delete_user: elimina questo utente description: Descrizione - diary: diario - edits: modifiche + diary: Diario + edits: Modifiche email address: "Indirizzo email:" - friends_changesets: Visualizza tutti i gruppi di modifica degli amici - friends_diaries: Sfoglia tutte le note dei diari degli amici + friends_changesets: gruppi di modifiche degli amici + friends_diaries: note dei diari degli amici hide_user: nascondi questo utente - if set location: Se si imposta una propria posizione, una bella mappa ed altre informazioni compariranno di seguito. E' possibile impostare la propria posizione sulla pagina delle %{settings_link}. + if set location: Puoi impostare la tua posizione sulla pagina delle %{settings_link} per vedere gli utenti nelle vicinanze. km away: distante %{count} km latest edit: "Ultima modifica %{ago}:" m away: "%{count}m di distanza" mapper since: "Mappatore dal:" - moderator_history: vedi i blocchi applicati - my comments: miei commenti - my diary: diario personale - my edits: modifiche personali - my settings: impostazioni personali - my traces: tracciati personali + moderator_history: blocchi applicati + my comments: Miei commenti + my diary: Il mio diario + my edits: Mie modifiche + my messages: Miei messaggi + my notes: Mie note + my profile: Il mio profilo + my settings: Impostazioni + my traces: Miei tracciati nearby users: Altri utenti nelle vicinanze - nearby_changesets: Sfoglia tutti i gruppi di modifiche da parte degli utenti nelle vicinanze - nearby_diaries: Sfoglia tutte le note dei diari degli utenti nelle vicinanze + nearby_changesets: gruppi di modifiche da parte degli utenti nelle vicinanze + nearby_diaries: note dei diari degli utenti nelle vicinanze new diary entry: nuova voce del diario no friends: Non ci sono ancora amici. no nearby users: Non ci sono ancora altri utenti che ammettono di mappare nelle vicinanze. + notes: Note sulla mappa oauth settings: impostazioni oauth - remove as friend: rimuovi come amico + remove as friend: Rimuovi amico role: administrator: Questo utente è un amministratore grant: @@ -1748,11 +1845,11 @@ it: revoke: administrator: Revoca l'accesso come amministratore moderator: Revoca l'accesso come moderatore - send message: spedisci messaggio + send message: Spedisci messaggio settings_link_text: impostazioni spam score: "Punteggio Spam:" status: "Stato:" - traces: tracciati + traces: Tracciati unhide_user: mostra questo utente user location: Luogo dell'utente your friends: Amici personali @@ -1766,7 +1863,7 @@ it: heading: Lista dei blocchi su %{name} title: Blocchi su %{name} create: - flash: E' stato imposto un blocco sull'utente %{name}. + flash: È stato imposto un blocco sull'utente %{name}. try_contacting: Per favore prova a contattare l'utente prima di bloccarlo e forniscigli un tempo ragionevole per rispondere. try_waiting: Per favore fornisci all'utente un tempo ragionevole per rispondere prima di bloccarlo. edit: @@ -1810,11 +1907,14 @@ it: creator_name: Autore display_name: Utente bloccato edit: Modifica + next: Successivo » not_revoked: (non revocato) + previous: « Precedente reason: Motivo del blocco revoke: Revoca! revoker_name: Revocato da show: Mostra + showing_page: Pagina %{page} status: Stato period: one: 1 ora @@ -1862,3 +1962,25 @@ it: fail: Impossibile revocare il ruolo `%{role}' dall'utente `%{name}'. Si prega di controllare che utente e ruolo siano entrambi validi. heading: Conferma la revoca del ruolo title: Conferma la revoca del ruolo + welcome_page: + add_a_note: + paragraph_1_html: Se pensi che ci debba essere una piccola correzione, ma non hai abbastanza tempo da registrarti e imparare a modificare, puoi aggiungere semplicemente una nota. + paragraph_2_html: "Vai alla mappa e clicca sull'icona della nota:\n. Questo aggiungerà un marker alla mappa, che potrai muovere trascinandolo. Aggiungi il tuo messaggio, quindi fare clic su Salva e altri Mappers daranno un'occhiata." + title: Non hai tempo per editare? Aggiungi una nota! + basic_terms: + editor_html: Un editor è un programma o un sito internet che puoi utilizzare per modificare la mappa. + node_html: Un nodo è un punto sulla mappa, come un singolo ristorante o un albero. + paragraph_1_html: OpenStreetMap ha un proprio "gergo". Eccoti qualche parola che potrebbe tornarti utile. + tag_html: Un tag include alcuni dati su un punto o una strada, come il nome di un ristorante o i limiti di velocità di una strada. + title: Condizioni basilari per il Mapping + way_html: Una via è una linea o una zona, come una strada, un fiume, lago o edificio. + introduction_html: Benvenuti in OpenStreetMap, la mappa del mondo libera e modificabile. Ora che ti sei registrato, sei pronto a iniziare ad editare la mappa. Ecco una guida rapida con le cose più importanti che dovresti sapere. + questions: + paragraph_1_html: "OpenStreetMap ha diverse risorse per imparare a conoscere il progetto, chiedendo e rispondendo alle domande, discutendo collaborativamente e documentando gli argomenti di mappatura.\nOttieni aiuto." + title: Domande? + start_mapping: Inizia a mappare + title: Benvenuto! + whats_on_the_map: + off_html: Ciò che non comprende dati opinabili come valutazioni, caratteristiche storiche o ipotetiche e dati da fonti coperte da copyright. A meno che non si abbiano particolari permessi, non bisogna copiare dalle mappe online o da quelle cartacee. + on_html: "OpenStreetMap è un luogo per la mappatura delle cose che sono sia vere che attuali - comprende milioni di edifici, strade e altri dettagli sui luoghi. Puoi mappare\nqualsiasi cosa che nel mondo reale ti interessa." + title: Cosa c'è sulla mappa diff --git a/config/locales/ja.yml b/config/locales/ja.yml index adbcfdc8ad0..e4b11861587 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -3,19 +3,35 @@ # Export driver: syck-pecl # Author: Atysn # Author: Fryed-peach +# Author: Hayashi # Author: Higa4 # Author: Hosiryuhosi # Author: Iwai.masaharu # Author: Mage Whopper +# Author: Mfuji # Author: Miya # Author: Nabetaro # Author: Nazotoko +# Author: OKANO Takayoshi # Author: Schu # Author: Shirayuki # Author: Tombi-aburage # Author: Wrightbus # Author: 青子守歌 +# Author: 아라 ja: + about_page: + community_driven_html: "OpenStreetMapのコミュニティは多様で、情熱的で、毎日成長しています。\n協力者には地図作りマニア、GISの専門家、OSMサーバーを稼働させている技術者、被災地の地図作りをする人道主義者などを含みます。\nコミュニティについて詳しくは、ユーザーの日記コミュニティのブログOSM財団のウェブサイトをご覧ください。" + community_driven_title: コミュニティ主導 + copyright_html: ©OpenStreetMap
    への協力者 + lede_text: OpenStreetMapは、道路、通路、カフェ、鉄道駅など、世界中にあるすべてのものについてのデータを提供・メンテナンスしているマッパーのコミュニティによって構築されました。 + local_knowledge_html: OpenStreetMapは地域の知識を増幅します。協力者は航空写真やGPS機器、ローテクのフィールド地図を使用して、OSMが正確で最新の状態であることを確認しています。 + local_knowledge_title: 地元の情報 + next: 次へ + open_data_html: OpenStreetMapはオープンデータです。あなたはOpenStreetMapと協力者を著作権表示すれば、いかなる目的でも無料で利用することができます。もし何らかの方法でデータを変更したり二次データを作成したりした場合も、同じライセンス条件下でのみ結果を配布できます。詳しくは、著作権とライセンスをご覧ください。 + open_data_title: オープン データ + partners_title: パートナー + used_by: "%{name} は、数多くのウェブ サイト、モバイル アプリ、ハードウェア機器で利用されています" activerecord: attributes: diary_comment: @@ -24,16 +40,16 @@ ja: language: 言語 latitude: 緯度 longitude: 経度 - title: タイトル - user: ユーザ + title: 件名 + user: ユーザー friend: friend: 友達 - user: ユーザ + user: ユーザー message: body: 本文 recipient: 受信者 sender: 送信者 - title: タイトル + title: 件名 trace: description: 説明 latitude: 緯度 @@ -41,7 +57,7 @@ ja: name: 名前 public: 公開 size: サイズ - user: ユーザ + user: ユーザー visible: 表示 user: active: アクティブ @@ -53,7 +69,7 @@ ja: models: acl: 通行制限リスト changeset: 変更セット - changeset_tag: 変更セット タグ + changeset_tag: 変更セットのタグ country: 国 diary_comment: 日記コメント diary_entry: 日記エントリ @@ -76,107 +92,79 @@ ja: relation_tag: リレーションのタグ session: セッション trace: トレース - tracepoint: トレース ポイント - tracetag: トレース タグ - user: ユーザ - user_preference: ユーザ設定 - user_token: ユーザ トークン + tracepoint: トレースの点 + tracetag: トレースのタグ + user: ユーザー + user_preference: ユーザー設定 + user_token: ユーザー トークン way: ウェイ way_node: ウェイのノード way_tag: ウェイのタグ application: require_cookies: - cookies_needed: ブラウザのクッキーが無効になっているようです。続行する前にブラウザのクッキーをonにしてください。 + cookies_needed: ブラウザーの Cookie が無効になっているようです。続行する前にブラウザーの Cookie を有効にしてください。 require_moderator: - not_a_moderator: その動作にはモデレータ権限が必要です。 + not_a_moderator: モデレーター権限が必要な操作です。 setup_user_auth: blocked: APIへのアクセスがブロックされました。Web インターフェイスからログインし直して詳細を確認してください。 - need_to_see_terms: あなたは一時的にAPIの利用を保留されています。ウェブインターフェイスにログインして投稿規約(Contributor Terms)をご覧ください。同意しなくてもかまいませんが、必ずご覧ください。 + need_to_see_terms: あなたは一時的にAPIの利用を停止されています。ウェブインターフェイスにログインして協力者規約をご覧ください。同意しなくてもかまいませんが、必ずご覧ください。 browse: + anonymous: 匿名 changeset: - changeset: 変更セット:%{id} - changesetxml: 変更セットXML - download: "%{changeset_xml_link} または %{osmchange_xml_link} をダウンロード" + belongs_to: 著者 + changesetxml: 変更セット XML feed: title: 変更セット %{id} title_comment: 変更セット %{id} - %{comment} - osmchangexml: osm変更XML - title: 変更セット - changeset_details: - belongs_to: ユーザ: - bounding_box: 境界囲み: - box: ボックス - closed_at: 完了日時: - created_at: 作成日時: - has_nodes: "以下の %{count} ノードで構成されています:" - has_relations: "次の%{count} 個のリレーションを持ちます:" - has_ways: "次の %{count} ウェイを持ちます:" - no_bounding_box: この変更セットを格納する境界囲みは存在しません。 - show_area_box: 領域範囲表示 - common_details: - changeset_comment: "コメント:" - deleted_at: "削除日:" - deleted_by: "削除者:" - edited_at: "編集日:" - edited_by: "編集者:" - in_changeset: "変更セット:" - version: "バージョン:" + node: ノード (%{count}) + node_paginated: ノード (%{x}-%{y} / %{count}) + osmchangexml: OSM 差分 XML + relation: リレーション (%{count}) + relation_paginated: リレーション (%{x}-%{y} / %{count}) + title: "変更セット: %{id}" + way: ウェイ (%{count}) + way_paginated: ウェイ (%{x}-%{y} / %{count}) + closed: クローズ + closed_by_html: "%{user}さんが%{time}前にクローズ" + closed_html: %{time}前にクローズ containing_relation: entry: リレーション %{relation_name} - entry_role: リレーション %{relation_name} (ロール %{relation_role}で) - map: - deleted: 削除済み - edit: - area: 領域を編集 - node: ノードを編集 - relation: リレーションを編集 - way: ウェイを編集 - larger: - area: 範囲を大きい地図で表示 - node: ノードを大きい地図で表示 - relation: このリレーションを大きい地図で見る - way: ウェイを大きい地図で表示 - loading: 読み込み中... - navigation: - all: - next_changeset_tooltip: 次の変更セット - next_node_tooltip: 次のノード - next_relation_tooltip: 次のリレーション - next_way_tooltip: 次のウェイ - prev_changeset_tooltip: 前の変更セット - prev_node_tooltip: 前のノード - prev_relation_tooltip: 前のリレーション - prev_way_tooltip: 前のウェイ - user: - name_changeset_tooltip: "%{user}による編集を表示" - next_changeset_tooltip: 次の編集 (%{user} による) - prev_changeset_tooltip: 前の編集 (%{user} による) + entry_role: リレーション %{relation_name} (%{relation_role} として) + created: 作成 + created_by_html: "%{user}さんが%{time}前に作成" + created_html: %{time}前に作成 + deleted_by_html: "%{user}さんが%{time}前に削除" + download_xml: XML をダウンロード + edited_by_html: "%{user}さんが%{time}前に編集" + in_changeset: 変更セット + location: "場所:" + no_comment: (コメントなし) node: - download: "%{download_xml_link}、%{view_history_link}、または、%{edit_link}" - download_xml: XMLをダウンロード - edit: 編集 - node: ノード - node_title: "ノード: %{node_name}" - view_history: 履歴表示 - node_details: - coordinates: "座標:" - part_of: "次の一部:" - node_history: - download: "%{download_xml_link}、または、%{view_details_link}" - download_xml: XMLダウンロード - node_history: ノードの履歴 - node_history_title: "ノードの履歴: %{node_name}" - view_details: 詳細表示 + history_title: "ノードの履歴: %{name}" + title: "ノード: %{name}" not_found: - sorry: ID %{id} の %{type} は見つかりません。 + sorry: "%{type} #%{id} は見つかりませんでした。" type: changeset: 変更セット node: ノード relation: リレーション way: ウェイ - paging_nav: - of: 中 - showing_page: ページ表示 + note: + closed_by: "%{user}さんが%{when}前に解決" + closed_by_anonymous: 誰かが%{when}前に解決 + closed_title: "解決済のメモ #%{note_name}" + commented_by: "%{user}さんによる%{when}前のコメント" + commented_by_anonymous: 誰かによる%{when}前のコメント + hidden_by: "%{user}さんが%{when}前に非表示化" + hidden_title: "非表示のメモ #%{note_name}" + new_note: 新しいメモ + open_by: "%{user}さんが%{when}前に作成" + open_by_anonymous: 誰かが%{when}前に作成 + open_title: "未解決のメモ #%{note_name}" + reopened_by: "%{user}さんが%{when}前に再開" + reopened_by_anonymous: 誰かが%{when}前に再開 + title: "メモ: %{id}" + part_of: 以下の一部 redacted: message_html: この %{type} の %{version} 版は、改訂されたため表示できません。詳細は %{redaction_link} をご覧ください。 redaction: 改訂 %{id} @@ -185,140 +173,75 @@ ja: relation: リレーション way: ウェイ relation: - download: "%{download_xml_link} または %{view_history_link}" - download_xml: XML をダウンロード - relation: リレーション - relation_title: "関連: %{relation_name}" - view_history: 履歴表示 - relation_details: - members: "メンバー:" - part_of: "次の一部:" - relation_history: - download: "%{download_xml_link} または %{view_details_link}" - download_xml: XML をダウンロード - relation_history: 関連の履歴 - relation_history_title: "リレーションの履歴: %{relation_name}" - view_details: 詳細を表示 + history_title: "リレーションの履歴: %{name}" + members: メンバー + title: "リレーション: %{name}" relation_member: - entry_role: "%{type}で、%{role}の%{name}" + entry_role: "%{type} %{name} (%{role} として)" type: node: ノード relation: リレーション way: ウェイ - start: - manually_select: 別の領域を手動で選択 - view_data: 現在のマップのデータを表示 start_rjs: - data_frame_title: データ - data_layer_name: 地図データを参照 - details: 詳細 - drag_a_box: ボックスをマップにドラッグして領域を選択 - edited_by_user_at_timestamp: "[[user]]による[[timestamp]]時点の編集" - hide_areas: 領域を隠す - history_for_feature: "[[feature]]の履歴" + feature_warning: "%{num_features} 件の地物を読み込むことで、お使いのブラウザーが遅くなったり反応がなくなったりするおそれがあります。このデータを本当に表示しますか?" load_data: データの読み込み - loaded_an_area_with_num_features: "[[num_features]]個の地物を含む領域を読み込みました。一般に、一部のブラウザーでは、この量のデータ表示をうまく処理できないことがあるようです。通常、ブラウザは一度に100未満の地物を表示させるとよいようです: 何かすると、ブラウザが遅くなったり、反応しなくなったりします。それでも、このデータを表示したいならば、以下のボタンをクリックしてください。" loading: 読み込み中... - manually_select: 別の領域を手動で選択 - object_list: - api: API でこの領域を取得 - back: オブジェクト一覧を表示 - details: 詳細 - heading: オブジェクト一覧 - history: - type: - node: ノード [[id]] - way: ウェイ [[id]] - selected: - type: - node: ノード [[id]] - way: ウェイ [[id]] - type: - node: ノード - way: ウェイ - private_user: 非公開ユーザ - show_areas: 領域を表示 - show_history: 履歴表示 - unable_to_load_size: "読み込みできません: 境界囲みのサイズ [[bbox_size]]が大きすぎます。(%{max_bbox_size}より小さい必要があります)" - wait: お待ちください... - zoom_or_select: ズームアップするか、表示する領域を選択 tag_details: - tags: "タグ:" + tags: タグ wiki_link: - key: "%{key} タグの wiki での説明ページ" - tag: "%{key}=%{value} タグの wiki での説明ページ" + key: "%{key} タグのウィキでの説明ページ" + tag: "%{key}=%{value} タグのウィキでの説明ページ" wikipedia_link: ウィキペディアの %{page} 記事 timeout: - sorry: すみません、ID %{id} の %{type} のデータは大きすぎるため取得できません。 + sorry: 申し訳ありませんが、ID %{id} の %{type} のデータは大きすぎるため取得できません。 type: changeset: 変更セット node: ノード relation: リレーション way: ウェイ + version: バージョン + view_details: 詳細を表示 + view_history: 履歴を表示 way: - download: "%{download_xml_link}、%{view_history_link}、または、%{edit_link}" - download_xml: XML をダウンロード - edit: 編集 - view_history: 履歴表示 - way: ウェイ - way_title: "ウェイ: %{way_name}" - way_details: also_part_of: - one: ウェイ「%{related_ways}」の一部でもあります - other: ウェイ「%{related_ways}」の一部でもあります - nodes: "ノード:" - part_of: "変更セット:" - way_history: - download: "%{download_xml_link}、または、%{view_details_link}" - download_xml: XMLダウンロード - view_details: 詳細表示 - way_history: ウェイの履歴 - way_history_title: "ウェイの履歴: %{way_name}" + other: ウェイ %{related_ways} の一部 + history_title: "ウェイの履歴: %{name}" + nodes: ノード + title: "ウェイ: %{name}" changeset: changeset: anonymous: 匿名 - big_area: (大) - no_comment: (コメントがありません) - no_edits: (編集がありません) - show_area_box: 領域境界を表示 - still_editing: (まだ編集中です) - view_changeset_details: 変更セットの詳細表示 + no_edits: (編集がありません) + view_changeset_details: 変更セットの詳細を閲覧 changeset_paging_nav: next: 次へ » previous: « 前へ - showing_page: ページ %{page} 表示中 + showing_page: ページ %{page} changesets: area: 領域 comment: コメント id: ID saved_at: 保存日時 - user: ユーザ + user: ユーザー list: - description: 最近の変更 - description_bbox: "%{bbox} 内の変更セット" - description_friend: 友達による変更セット - description_nearby: 周辺のユーザによる変更セット - description_user: "%{user} による変更セット" - description_user_bbox: "%{bbox} 範囲内の %{user} の変更セット" - heading: 変更セット - heading_bbox: 変更セット - heading_friend: 変更セット - heading_nearby: 変更セット - heading_user: 変更セット - heading_user_bbox: 変更セット + empty: 変更セットが見つかりません。 + empty_area: この領域には変更セットはありません。 + empty_user: このユーザーによる変更セットはありません。 + load_more: 続きを読み込む + no_more: 変更セットはこれ以上ありません。 + no_more_area: この領域には変更セットはこれ以上ありません。 + no_more_user: このユーザーによる変更セットはこれ以上ありません。 title: 変更セット - title_bbox: "%{bbox} 範囲内の変更セット" title_friend: 友達による変更セット - title_nearby: 周辺のユーザによる変更セット - title_user: "%{user} の変更セット" - title_user_bbox: "%{bbox} 内の %{user} による変更セット" + title_nearby: 周辺のユーザーによる変更セット + title_user: "%{user} による変更セット" timeout: - sorry: すみません、あなたが要求した変更セットの一覧は大きすぎて取得に失敗しました。 + sorry: 申し訳ありませんが、要求した変更セットの一覧は大きすぎるため取得できませんでした。 diary_entry: comments: ago: "%{ago}前" comment: コメント - has_commented_on: "%{display_name} が以下の日記エントリにコメントしました" + has_commented_on: "%{display_name} は以下の日記エントリにコメントしました" newer_comments: 新しいコメント older_comments: 古いコメント post: 投稿 @@ -329,17 +252,18 @@ ja: hide_link: このコメントを隠す diary_entry: comment_count: - one: 1コメント + one: "%{count} コメント" other: "%{count} コメント" - comment_link: このエントリへのコメント + zero: コメントなし + comment_link: このエントリにコメント confirm: 確認 edit_link: この記事の編集 hide_link: このエントリを隠す - posted_by: "%{link_user} による %{created}(%{language_link})の投稿。" + posted_by: "%{link_user} が %{created} に投稿 (%{language_link})" reply_link: このエントリに返信 edit: body: "本文:" - language: 言語: + language: "言語:" latitude: "緯度:" location: "地域:" longitude: "経度:" @@ -350,34 +274,34 @@ ja: use_map_link: 地図を使用 feed: all: - description: OpenStreetMap ユーザの最近の日記エントリ - title: OpenStreetMap 日記エントリ + description: OpenStreetMap ユーザーの最近の日記エントリ + title: OpenStreetMap ユーザーの日記エントリ language: - description: "%{language_name} の OpenStreetMap ユーザの最近の日記エントリ" - title: "%{language_name} の OpenStreetMap 日記エントリ" + description: "%{language_name} の OpenStreetMap ユーザーの最近の日記エントリ" + title: "%{language_name} の OpenStreetMap ユーザーの日記エントリ" user: description: "%{user} さんの最近の OpenStreetMap 日記エントリ" - title: "%{user} さんの最近のOpenStreetMap 日記エントリ" + title: "%{user} さんの OpenStreetMap 日記エントリ" list: in_language_title: "%{language} の日記エントリ" - new: 新規日記入力 - new_title: あなたの日記に新規エントリを作成 - newer_entries: 新しいエントリ - no_entries: 日記の項目がありません - older_entries: 古いエントリ - recent_entries: "最近の日記エントリ:" - title: ユーザの日記 + new: 日記エントリを新規作成 + new_title: 自分の日記にエントリを新規作成 + newer_entries: 以降のエントリ + no_entries: 日記エントリはありません + older_entries: 以前のエントリ + recent_entries: 最近の日記エントリ + title: ユーザーの日記 title_friends: 友達の日記 - title_nearby: 周辺のユーザの日記 + title_nearby: 周辺のユーザーの日記 user_title: "%{user} の日記" location: edit: 編集 location: "場所:" view: 表示 new: - title: 新しい日記の入力 + title: 日記エントリの新規作成 no_such_entry: - body: ID が %{id} のコメントや日記は存在しません。URLにスペルミスが無いか確認をしてください。もしくはリンク元が間違ってます。 + body: ID が %{id} のコメントや日記は存在しません。URLにスペルミスがないか確認をしてください。またはリンク元が間違っています。 heading: ID %{id} にコメントはまだありません。 title: そのような日記エントリはありません view: @@ -385,58 +309,76 @@ ja: login: ログイン login_to_leave_a_comment: コメントを書くには%{login_link}してください save_button: 保存 - title: "%{user}の日記 | %{title}" + title: "%{user} の日記 | %{title}" user_title: "%{user} の日記" editor: - default: 規定値 (現在は %{name}) + default: 既定 (現在は %{name}) + id: + description: iD (ブラウザー内エディター) + name: iD potlatch: - description: Potlatch 1 (ブラウザ内エディタ) + description: Potlatch 1 (ブラウザー内エディター) name: Potlatch 1 potlatch2: - description: Potlatch 2 (ブラウザ内エディタ) + description: Potlatch 2 (ブラウザー内エディター) name: Potlatch 2 remote: description: 遠隔制御 (JOSM または Merkaartor) name: 遠隔制御 export: start: - add_marker: 地図にマーカーを追加する - area_to_export: エクスポートする範囲 - embeddable_html: 埋め込みHTML + add_marker: マーカーを地図に追加 + area_to_export: エクスポートする領域 + embeddable_html: 埋め込み HTML export_button: エクスポート - export_details: OpenStreetMap のデータは クリエイティブコモンズ 表示-継承 2.0 (Creative Commons Attribution-ShareAlike 2.0).によって提供されています。 - format: "ファイル形式:" + export_details: OpenStreetMap のデータは Open Data Commons Open Database License (ODbL) の下にライセンスされています。 + format: ファイル形式 format_to_export: エクスポートするファイル形式 - image_size: 画像サイズ: - latitude: 緯度: + image_size: 画像サイズ + latitude: "緯度:" licence: ライセンス - longitude: 経度: - manually_select: 別の領域を指定する - map_image: 地図画像 (標準レイヤを表示) + longitude: "経度:" + manually_select: ドラッグして別の領域を選択 + map_image: 地図画像 (標準レイヤーを表示) max: 最大 options: オプション - osm_xml_data: OSM XMLデータ + osm_xml_data: OpenStreetMap XML データ output: 出力 paste_html: 以下の HTML をあなたのサイトに貼り付けてください scale: 縮尺 too_large: - body: このエリアは OpenStreetMap XML データとしてエクスポートするには大きすぎます。拡大するか、もっと小さなエリアを選択してください。 - heading: エリアが大きすぎます + advice: "上のエクスポートが失敗した場合は、以下に列挙した情報源のいずれかの使用を検討してください:" + body: 領域が大きすぎて OpenStreetMap XML データとしてエクスポートできません。拡大するか、領域を小さくするか、以下に列挙したソースから一括データダウンロードを使用するかしてください。 + geofabrik: + description: 大陸、国、および選択した都市を抽出したもので、定期的に更新されます + title: Geofabrik のダウンロード + metro: + description: 世界の主要都市とその周辺地域を抽出します + title: Metro Extracts + other: + description: OpenStreetMap ウィキに記載されている追加の情報源 + title: 他の情報源 + overpass: + description: OpenStreetMapデータベースのミラーからこの範囲をダウンロード + title: Overpass API + planet: + description: 定期的に更新される、OpenStreetMap データベースの完全な複製 + title: Planet OSM zoom: ズーム - start_rjs: - add_marker: マーカーを地図に追加する - change_marker: マーカーの位置を変更する - click_add_marker: マーカーを追加する位置をクリック - drag_a_box: 地図の選択したい範囲をマウスをドラッグしてください - export: エクスポート - manually_select: 別の範囲を手動選択 - view_larger_map: 大きな地図を表示... + title: エクスポート + fixthemap: + how_to_help: + add_a_note: + instructions_html: " をクリックするか、または地図上の同じアイコンをクリックしてください。\n地図にマーカーが追加されます。マーカーはドラッグで移動できます。\nメッセージを追加して保存をクリックすると、他のマッパーたちが調査します。" + join_the_community: + title: コミュニティへの参加 + title: 支援する方法 + title: 問題点の報告 / 地図の修正 geocoder: description: title: - geonames: GeoNamesからの結果 - osm_namefinder: OpenStreetMap Namefinderからの%{types} - osm_nominatim: OpenStreetMap Nominatimからの位置 + geonames: GeoNames からの位置 + osm_nominatim: OpenStreetMap Nominatim からの位置 types: cities: 都市 places: 場所 @@ -451,43 +393,53 @@ ja: south_west: 南西 west: 西 distance: - one: 約1キロメートル - other: 約%{count}キロメートル - zero: 1キロメートル以下 + one: 約 1 km + other: 約 %{count} km + zero: 1 km 未満 results: more_results: その他の結果 - no_results: 見つかりませんでした。 + no_results: 該当するものはありません search: title: ca_postcode: Geocoder.CAからの結果 - geonames: GeoNamesからの結果 + geonames: GeoNames からの結果 + geonames_reverse: GeoNames からの結果 latlon: Internalからの結果 - osm_namefinder: OpenStreetMap Namefinderからの結果 osm_nominatim: OpenStreetMap Nominatim からの結果 + osm_nominatim_reverse: OpenStreetMap Nominatim からの結果 uk_postcode: NPEMap / FreeThe Postcodeからの結果 us_postcode: Geocoder.usからの結果 - search_osm_namefinder: - suffix_parent: "%{suffix}(%{parentname} から%{parentdirection}に %{parentdistance})" - suffix_place: "%{placename} から%{direction}に %{distance}" search_osm_nominatim: + admin_levels: + level10: 街区境 + level2: 国境 + level4: 道州境 + level5: 行政境界 + level6: 都道府県境 + level8: 市区町村境 + level9: 村境 prefix: + aerialway: + chair_lift: チェアリフト + drag_lift: 牽引リフト + station: 索道駅 aeroway: aerodrome: 飛行場 - apron: エプロン(空港ランプ) + apron: 空港のエプロン gate: 門 helipad: ヘリポート runway: 滑走路 taxiway: 空港誘導路 terminal: ターミナル amenity: - WLAN: WiFiアクセスポイント + WLAN: Wi-Fiアクセスポイント airport: 空港 - arts_centre: アートセンター + arts_centre: アート センター artwork: 芸術作品 atm: ATM auditorium: 講堂 bank: 銀行 - bar: バー (立ち飲み屋) + bar: バー bbq: バーベキュー bench: ベンチ bicycle_parking: 駐輪場 @@ -552,7 +504,7 @@ ja: pub: パブ public_building: 公共建築物 public_market: 公設市場 - reception_area: レセプション エリア + reception_area: レセプションエリア recycling: リサイクル場 restaurant: レストラン retirement_home: 老人ホーム @@ -564,6 +516,7 @@ ja: shower: シャワー social_centre: 社会センター social_club: 社交クラブ + social_facility: 公共施設 studio: スタジオ supermarket: スーパーマーケット swimming_pool: 水泳用プール @@ -577,12 +530,13 @@ ja: veterinary: 獣医外科 village_hall: 役場 waste_basket: ごみ箱 - wifi: WiFiアクセスポイント + wifi: Wi-Fiアクセスポイント youth_centre: 青少年センター boundary: administrative: 行政境界 census: 国勢調査の境界 national_park: 国立公園 + protected_area: 保護された領域 bridge: aqueduct: 水道橋 suspension: 吊り橋 @@ -591,6 +545,9 @@ ja: "yes": 橋 building: "yes": 建造物 + emergency: + fire_hydrant: 消火栓 + phone: 緊急電話 highway: bridleway: 乗馬道 bus_guideway: 路面バス専用車線 @@ -598,30 +555,39 @@ ja: byway: 路地 construction: 建設中の高速道路 cycleway: 自転車道 + emergency_access_point: 緊急アクセスポイント footway: 歩道 ford: 砦 living_street: 住宅街 - milestone: マイルス トーン + milestone: マイルストーン minor: 補助道路 motorway: 高速道路 motorway_junction: 高速道路ジャンクション + motorway_link: 高速道路 path: パス pedestrian: 歩行者用通路 platform: プラットフォーム - primary: 幹線道路 - primary_link: 幹線道路 + primary: 主要地方道 + primary_link: 主要地方道 + proposed: 計画中の道路 + raceway: 競技コース + residential: 住宅 rest_area: 休憩所 road: 道路 - secondary: 一般道路 - secondary_link: 一般道路 + secondary: 一般県道 + secondary_link: 一般県道 service: 取付道路 + services: 高速道路のSA speed_camera: 高速度カメラ steps: 階段 + stile: 踏み越し段 + street_lamp: 街灯 tertiary: 周辺道路 tertiary_link: 周辺道路 - track: Track (農道・林道) + track: 農道・林道 + trail: 小道 trunk: 国道 - trunk_link: 幹線道路 + trunk_link: 国道 unclassified: 未分類の道路 unsurfaced: 未舗装道路 historic: @@ -631,6 +597,7 @@ ja: building: ビル castle: 城 church: 教会 + citywalls: 城壁 fort: 砦 house: 住宅 icon: アイコン @@ -640,36 +607,50 @@ ja: monument: 記念碑 museum: 博物館 ruins: 廃墟 + tomb: 墓地 tower: 塔 + wayside_cross: 道路際の十字架 + wayside_shrine: 道祖神 wreck: 沈没船 landuse: allotments: 家庭菜園 + basin: 盆地 + brownfield: 褐色地 cemetery: 墓地 - commercial: 商業地域 + commercial: オフィス地域 conservation: 保全 construction: 工事中 farm: 農場 farmland: 農地 + farmyard: 農場 forest: 森林 garages: ガレージ grass: 草地 - industrial: 工業地帯 + greenfield: 未開発地域 + industrial: 工業地域 landfill: 埋め立て地 meadow: 牧草地 military: 軍用地域 mine: 鉱山 + nature_reserve: 自然保護区 orchard: 果樹園 park: 公園 + piste: スキー滑降コース quarry: 採石場 railway: 鉄道 + recreation_ground: 遊園地 reservoir: 貯水池 - residential: 住宅街 + reservoir_watershed: 貯水池流域 + residential: 住宅地 retail: 小売店 + road: 道路エリア + village_green: 緑地広場 vineyard: Vineyard wetland: 湿地帯 wood: 森林 leisure: - beach_resort: ビーチリゾート + beach_resort: ビーチ リゾート + bird_hide: 観察小屋 common: 共有地 fishing: 釣り場 fitness_station: フィットネス ステーション @@ -677,7 +658,7 @@ ja: golf_course: ゴルフ場 ice_rink: アイススケート場 marina: マリーナ - miniature_golf: ミニチュアゴルフ + miniature_golf: ミニチュア ゴルフ nature_reserve: 自然保護区 park: 公園 pitch: 運動場 @@ -694,6 +675,8 @@ ja: airfield: 軍用飛行場 barracks: バラック bunker: 貯蔵庫 + mountain_pass: + "yes": 山道 natural: bay: 入り江 beach: 砂浜 @@ -752,7 +735,7 @@ ja: airport: 空港 city: 市 country: 国 - county: 国 + county: 郡 farm: 牧場 hamlet: 村 house: 住宅 @@ -763,6 +746,7 @@ ja: locality: 地域 moor: 沼地 municipality: 市町村 + neighbourhood: 小字 postcode: Postcode region: 地域 sea: 海 @@ -770,26 +754,36 @@ ja: subdivision: 区分 suburb: 郊外 town: 町 + unincorporated_area: 国有地 village: 村 railway: abandoned: 廃止鉄道 construction: 建設中の鉄道 disused: 廃線跡 + disused_station: 廃駅 funicular: ケーブル鉄道 halt: 列車停止 + historic_station: 廃駅 junction: 鉄道連絡駅 level_crossing: 踏切 light_rail: ライトレール + miniature: ミニ鉄道 monorail: モノレール narrow_gauge: 狭軌鉄道 platform: 鉄道プラットフォーム + preserved: 保存鉄道 + proposed: 計画中の鉄道 + spur: 支線 station: 鉄道駅 + stop: 鉄道駅 subway: 地下鉄駅 subway_entrance: 地下鉄駅入口 + switch: 鉄道の分岐器 tram: 路面軌道 tram_stop: トラム停留所 yard: 車両基地 shop: + alcohol: 酒屋 antiques: 骨董品 art: アート ショップ bakery: パン屋 @@ -797,34 +791,42 @@ ja: beverages: 飲料ショップ bicycle: 自転車販売店 books: 書店 + boutique: ブティック butcher: 肉屋 car: 自動車販売店 car_parts: 自動車部品販売店 car_repair: 自動車修理 carpet: カーペット店 charity: チャリティ ショップ - chemist: 化学者 + chemist: 薬局 clothes: 洋服店 computer: コンピューターショップ + confectionery: 駄菓子屋 convenience: コンビニエンス ストア + copyshop: コピー店 cosmetics: 化粧品販売店 + deli: デリ department_store: デパート discount: 安売り店 doityourself: 日曜大工 dry_cleaning: クリーニング electronics: 電気製品販売店 estate_agent: 不動産代理店 + farm: 農産物店 fashion: ファッション ショップ fish: 鮮魚販売店 florist: 花屋 food: 食品販売店 + funeral_directors: 葬儀屋 furniture: 家具店 gallery: ギャラリー + garden_centre: 園芸用品店 general: 雑貨屋 gift: ギフト ショップ greengrocer: 八百屋 grocery: 食料品店 hairdresser: 美容室 + hardware: ホームセンター hifi: 高級オーディオ insurance: 保険 jewelry: 宝石店 @@ -840,17 +842,23 @@ ja: organic: 有機食材店 outdoor: アウトドア ショップ pet: ペット ショップ + pharmacy: 薬局 photo: 写真屋 salon: サロン + second_hand: 中古品店 shoes: 靴屋 shopping_centre: ショッピング センター sports: スポーツ用品専門店 stationery: 文房具店 supermarket: スーパーマーケット + tailor: 洋服店 toys: 玩具店 travel_agency: 旅行代理店 video: ビデオ ショップ + wine: 酒屋 + "yes": 店舗 tourism: + alpine_hut: 高山小屋 artwork: 芸術作品 attraction: アトラクション bed_and_breakfast: 民宿(B&B) @@ -862,17 +870,22 @@ ja: hostel: ホステル hotel: ホテル information: 案内所 + lean_to: 東屋 motel: モーテル museum: 博物館 picnic_site: ピクニック サイト theme_park: テーマパーク valley: 谷 + viewpoint: 景勝地 zoo: 動物園 tunnel: + culvert: 暗渠 "yes": トンネル waterway: + artificial: 人工的な水路 boatyard: ボートヤード canal: 運河 + connector: 水路コネクタ dam: ダム derelict_canal: 遺棄運河 ditch: 溝 @@ -890,92 +903,168 @@ ja: water_point: 給水所 waterfall: 滝 weir: ダム + help_page: + help: + description: OSM の質問回答サイトで質問したり回答を検索したりする。 + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMapにはプロジェクトについて学んだり、質疑応答したり、共同で議論したり、マッピングについての知識を文書化したりするさまざまなリソースがあります。 + title: ヘルプの取得 + welcome: + description: OpenStreetMap の基礎を網羅しているこのクイック ガイドから始めましょう。 + title: OSM へようこそ + url: /welcome + wiki: + description: OSMの詳細な説明が書かれたWikiを参照してください。 + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/JA:Main_Page javascripts: + close: 閉じる + edit_help: 編集したい位置に移動してズームインしてから、ここをクリックしてください。 + key: + title: 凡例 + tooltip: 凡例 + tooltip_disabled: 凡例(標準レイヤーのみ利用可) map: base: - cycle_map: 自転車地図 + cycle_map: サイクリングマップ + hot: Humanitarian standard: 標準 - transport_map: 輸送地図 + transport_map: 交通マップ + copyright: © OpenStreetMapへの協力者 + donate_link_text: + layers: + data: 地図データ + header: 地図のレイヤー + notes: 地図メモ + overlays: トラブルシューティング用の地図オーバーレイ + title: レイヤー + locate: + popup: あなたはこの位置から{distance}{unit}以内にいます + title: 現在地を表示 + zoom: + in: 拡大 + out: 縮小 + notes: + new: + add: メモを追加 + intro: マップを改善するために、あなたが入力した情報は他のマッパーに表示されます。そのため、マーカーを正しい位置に動かしたりメモを以下に書き込む際は、できるだけ分かりやすく詳細に記述してください。 + show: + anonymous_warning: このメモは匿名ユーザーによるコメントも含んでいるため、別途確認してください。 + comment: コメント + comment_and_resolve: コメント & 解決 + hide: 隠す + reactivate: 再有効化 + resolve: 解決 + share: + cancel: キャンセル + center_marker: マーカーを地図の中心にする + custom_dimensions: 独自の寸法を設定 + download: ダウンロード + embed: HTML + format: "形式:" + image: 画像 + image_size: イメージの表示は標準レイヤー上で + include_marker: マーカーを含める + link: リンクまたは HTML + long_link: リンク + paste_html: 以下の HTML をあなたのサイトに貼り付けてください + scale: "縮尺:" + short_link: 短縮 URL + short_url: 短縮 URL + title: 共有 + view_larger_map: 大きな地図を表示 site: + createnote_disabled_tooltip: メモを地図に追加するには拡大してください + createnote_tooltip: 今後の修正のために地図にメモを残す edit_disabled_tooltip: 地図を編集するには拡大してください edit_tooltip: 地図を編集 - edit_zoom_alert: 地図を編集するには拡大してください - history_disabled_tooltip: 編集履歴を表示するには拡大してください - history_tooltip: この範囲の編集履歴を表示 - history_zoom_alert: 編集履歴を表示するには拡大してください + map_data_zoom_in_tooltip: 地図データを閲覧するには拡大してください + map_notes_zoom_in_tooltip: 地図メモを閲覧するには拡大してください layouts: + about: このサイトについて community: コミュニティ community_blogs: コミュニティ ブログ community_blogs_title: OpenStreetMap コミュニティのメンバーからのブログ - copyright: 著作権とライセンス - documentation: ドキュメント - documentation_title: プロジェクトのドキュメント + copyright: 著作権 + data: データ donate: ハードウェア アップグレード基金への%{link}で、OpenStreetMap を支援します。 - donate_link_text: 寄付 edit: 編集 edit_with: "%{editor} で編集" export: エクスポート - export_tooltip: 地図データのエクスポート + export_data: データをエクスポート foundation: 財団 foundation_title: OpenStreetMap 財団 - gps_traces: GPSトレース + gps_traces: GPS トレース gps_traces_tooltip: トレースの管理 help: ヘルプ - help_centre: ヘルプ センター - help_title: プロジェクトのヘルプサイト history: 履歴 - home: ホーム - home_tooltip: ホームに戻る - inbox: 受信箱 (%{count}) - inbox_tooltip: - one: 受信箱には1通の未読メッセージがあります - other: 受信箱には %{count} 通の未読メッセージがあります - zero: 受信箱に未読メッセージはありません - intro_1: OpenStreetMap は自由に編集できる世界地図です。あなたのような人々が作りました。 - intro_2_create_account: ユーザ アカウントを作成 - intro_2_download: ダウンロード - intro_2_html: データはその%{license}のもとで自由に%{download}および%{use}できます。地図を改良するには%{create_account}してください。 - intro_2_license: オープン ライセンス - intro_2_use: 使用 - license: - title: OpenStreetMapのデータは、クリエイティブコモンズ表示 - 継承2.0一般 でライセンスされています + home: ホーム地点に移動 + intro_2_create_account: ユーザー アカウントを作成 + intro_header: OpenStreetMap へようこそ! + intro_text: OpenStreetMap は、あなたのような人々が作成した世界地図であり、オープン ライセンスの下で自由に利用できます。 + learn_more: 詳細 log_in: ログイン log_in_tooltip: 自分のアカウントでログイン logo: alt_text: OpenStreetMap ロゴ logout: ログアウト - logout_tooltip: ログアウト make_a_donation: text: 寄付 title: 金銭を寄贈して OpenStreetMap を支援 + more: その他 osm_offline: OpenStreetMap のデータベースはメンテナンスのため一時的に停止しています。 - osm_read_only: OpenStreetMap のデータベースはメンテナンスのため一時的に読み込み専用モードになっています。 + osm_read_only: OpenStreetMap のデータベースは、メンテナンスのため一時的に読み取り専用モードになっています。 partners_bytemark: バイトマーク ホスティング - partners_html: ホスティング支援:%{ucl}、%{ic}、%{bytemark}、その他の%{partners} + partners_html: "ホスティング支援者: %{ucl}、%{ic}、%{bytemark}、その他の%{partners}" partners_ic: インペリアル カレッジ ロンドン partners_partners: パートナー partners_ucl: UCL VR センター - sign_up: 登録 + sign_up: ユーザー登録 sign_up_tooltip: 編集のためのアカウントを作成 - sotm2011: 2011年 OpenStreetMap カンファレンス State of the Map は 9月9日-11日 デンバーで開かれます。おいでください! + start_mapping: マッピングを開始 tag_line: 自由なウィキ世界地図 user_diaries: 日記 - user_diaries_tooltip: ユーザの日記を見る - view: 閲覧 - view_tooltip: 地図を見る - welcome_user: "%{user_link} さん、ようこそ。" - welcome_user_link_tooltip: あなたの個人ページ - wiki: ウィキ - wiki_title: プロジェクトの Wiki サイト + user_diaries_tooltip: ユーザーの日記を閲覧する license_page: foreign: english_link: 英語の原文 - text: 翻訳したページと、%{english_original_link} の間で競合が発生しました。英語版の内容が優先されるでしょう。 + text: この翻訳版のページと%{english_original_link}の間で競合が発生した場合は、英語版の内容が優先されます title: この翻訳について + legal_babble: + attribution_example: + alt: ウェブページに OpenStreetMap を記述する方法の例 + title: 権利表示の例 + contributors_at_html: "オーストリア: Stadt Wien (ライセンス CC BY)、Land Vorarlberg、Land Tirol (ライセンス CC BY AT with amendments) によるデータを含みます。" + contributors_ca_html: "カナダ: GeoBase®、GeoGratis (© Department of Natural Resources Canada)、CanVec (© Department of Natural Resources Canada)、StatCan (Geography Division, Statistics Canada) によるデータを含みます。" + contributors_fi_html: "フィンランド: NLSFI Licenseに基づき、National Land Survey of Finland's Topographic Database及びその他のデータセットのデータを含んでいます。" + contributors_footer_1_html: これらの詳細について、またOpenStreetMapの向上に使用されたその他のソースについては、OpenStreetMap Wikiの協力者ページをご覧ください。 + contributors_footer_2_html: OpenStreetMapのデータに含めることは、元データの提供者がOpenStreetMapを支持したり、何かしらの保証を行ったり、何かしらの責任を負ったりすることを意味するものではありません。 + contributors_fr_html: "フランス: Direction Générale des Impôts によるデータを含みます。" + contributors_gb_html: "イギリス: 陸地測量データ © Crown copyright and database right 2010-12 を含みます。" + contributors_intro_html: 協力者は数千人もの個人です。それに加え、国立の地図作成組織や、次のようなその他の情報源による公開できるライセンスによるデータを含みます。 + contributors_nl_html: "オランダ: © AND データ、2007 (www.and.com) を含みます。" + contributors_nz_html: "ニュージーランド: Land Information New Zealand によるデータを含みます。Crown が著作権を保持します。" + contributors_title_html: 協力者 + contributors_za_html: "南アフリカ: Chief Directorate: National Geo-Spatial Information, State によるデータを含み、著作権を保持します。" + credit_1_html: 「© OpenStreetMapへの協力者」のクレジットを必ず使用してください。 + credit_2_html: あなたはデータが Open Database License に基づいて提供されていること、そして地図タイルを使用する場合は、地図製作が CC BY-SA としてライセンスされていることを明確にしなければなりません。著作権表示ページにリンクすることでこれを表現することができます。また、データの形式でOSMを配布する場合の要件として、名前を表示の上、ライセンスに直接リンクすることができます。リンクを張れないメディア(印刷など)の場合は、openstreetmap.org(OpenStreetMapをアドレスとして展開した形)、opendatacommons.org、あと関連があれば、creativecommons.orgに誘導することをお勧めします。 + credit_3_html: "閲覧可能な電子地図の場合は、地図の隅にクレジットを表示してください。\n例:" + credit_title_html: OpenStreetMap のクレジット表記の仕方 + infringement_1_html: "OSMの協力者は、著作権者から明確な許諾を得ずに、著作権のある情報源 (例: Google マップや印刷された地図) からデータを持ち込まないよう注意するものとします。" + infringement_2_html: もし著作権のある素材がOpenStreetMapのデータベースや本サイトに不正に追加されたとお考えの場合は、却下手順をお読みになるか、on-line filing pageから直接申し立てを行ってください。 + infringement_title_html: 著作権侵害 + intro_1_html: "OpenStreetMap はオープンデータであり、Open Data Commons Open Database License (ODbL) の下にライセンスされています。" + intro_2_html: OpenStreetMapとその協力者をクレジットすれば、データを自由にコピー、配布、送信、利用することができます。変更したり翻案したりしたデータは、同じライセンスに従って提供することができます。あなたの権利と責任は、ライセンス契約の全文で説明しています。 + intro_3_html: "地図タイルの作成法やドキュメントは、Creative\nCommons Attribution-ShareAlike 2.0 ライセンス (CC BY-SA) に基づいてライセンスされます。" + more_1_html: "データの利用についてやクレジット方法について、詳細はLegal\nFAQをお読みください。" + more_2_html: OpenStreetMap はオープンデータですが、サードパーティーの開発者のための無料の地図 API は提供できません。 API Usage PolicyTile Usage PolicyNominatim Usage Policyをお読みください。 + more_title_html: 詳細を見る + title_html: 著作権とライセンス native: mapping_link: マッピングを開始 - native_link: THIS_LANGUAGE_NAME_HERE バージョン - text: あなたは英語版の著作権情報のページを閲覧しています。%{native_link} から戻る事ができます。または %{mapping_link} からマッピングに戻れます。 + native_link: 日本語版 + text: 閲覧中のこのページは著作権情報ページの英語版です。このページの%{native_link}に戻れます。または%{mapping_link}からマッピングに戻れます。 title: このページについて message: delete: @@ -986,11 +1075,9 @@ ja: messages: "%{new_messages}、%{old_messages}があります" my_inbox: 自分の受信箱 new_messages: - one: "%{count} 件の新着メッセージ" other: "%{count} 件の新着メッセージ" no_messages_yet: まだメッセージがありません。%{people_mapping_nearby_link}とお近づきになってはいかがですか? old_messages: - one: "%{count} 件の古いメッセージ" other: "%{count} 件の古いメッセージ" outbox: 送信箱 people_mapping_nearby: 近所でマッピングしている人々 @@ -1010,20 +1097,19 @@ ja: limit_exceeded: 短い間隔で大量のメッセージを送っていますね。次を送る前にしばらくお待ちください。 message_sent: 送信したメッセージ send_button: 送信 - send_message_to: "%{name}に新しいメッセージを送信" + send_message_to: "%{name} への新規メッセージ送信" subject: タイトル title: メッセージの送信 no_such_message: - body: すみません、その ID のメッセージはありません。 - heading: そのようなメッセージはありません - title: そのようなメッセージはありません + body: 申し訳ありませんが、この ID のメッセージはありません。 + heading: 存在しないメッセージです + title: 存在しないメッセージです outbox: date: 日付 inbox: 受信箱 messages: - one: "%{count} 件の送信済みメッセージがあります" other: "%{count} 件の送信済みメッセージがあります" - my_inbox: 私の%{inbox_link} + my_inbox: 自分の%{inbox_link} no_sent_messages: 送信したメッセージはまだありません。%{people_mapping_nearby_link}とお近づきになってはいかがですか? outbox: 送信箱 people_mapping_nearby: 近所でマッピングしている人々 @@ -1031,54 +1117,82 @@ ja: title: 送信箱 to: 宛先 read: - back_to_inbox: 受信箱に戻る - back_to_outbox: 送信箱に戻る + back: 戻る date: 日付 from: 差出人 - reading_your_messages: メッセージを読む - reading_your_sent_messages: 送信したメッセージを読む reply_button: 返信 subject: 件名 title: メッセージを読む to: 宛先 unread_button: 未読にする - wrong_user: あなたは「%{user}」としてログインしていますが、あなたが読もうとしたメッセージは、そのユーザーが送信したものでも、そのユーザー宛てのものでもありません。メッセージを読むには、正しいユーザでログインしてください。 + wrong_user: あなたは「%{user}」としてログインしていますが、読もうとしたメッセージは、このユーザーが送信したものでも、このユーザー宛てのものでもありません。メッセージを読むには、正しいユーザーとしてログインしてください。 reply: - wrong_user: あなたは「%{user}」としてログインしていますが、あなたが返信しようとしたメッセージは、そのユーザー宛てのものではありません。返信するには、正しいユーザでログインしてください。 + wrong_user: あなたは「%{user}」としてログインしていますが、返信しようとしたメッセージはこのユーザー宛てのものではありません。返信するには、正しいユーザーとしてログインしてください。 sent_message_summary: delete_button: 削除 + note: + description: + closed_at_by_html: "%{when}前に%{user}が解決" + closed_at_html: "%{when}前に解決" + commented_at_by_html: "%{when}前に%{user}が更新" + commented_at_html: "%{when}前に更新" + opened_at_by_html: "%{when}前に%{user}が作成" + opened_at_html: "%{when}前に作成" + reopened_at_by_html: "%{user}さんが%{when}に再開" + reopened_at_html: "%{when}前に再開" + entry: + comment: コメント + full: メモ全文 + mine: + ago_html: "%{when}前" + created_at: 作成日時 + creator: 作成者 + description: 説明 + heading: "%{user} のメモ" + id: ID + last_changed: 最終変更 + subheading: "%{user} さんが投稿またはコメントしたメモ" + title: "%{user} さんが投稿またはコメントしたメモ" + rss: + closed: クローズされたメモ (%{place} 付近) + commented: 新しいコメント (%{place} 付近) + description_area: あなたのエリア [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] でレポート、コメント、またはクローズされたメモの一覧 + description_item: メモ %{id} の RSS フィード + opened: 新しいメモ (%{place} 付近) + reopened: 再開されたメモ(%{place}付近) + title: OpenStreetMap メモ notifier: diary_comment_notification: footer: "%{readurl}でコメントを読むことができ、%{commenturl} でコメントするか、%{replyurl} で返信できます。" - header: あなたが最近入力した OpenStreetMap 日記エントリ(タイトル:%{subject})に対して、%{from_user} がコメントしました。 - hi: やあ、%{to_user} さん + header: "あなたの最近の OpenStreetMap 日記エントリ (タイトル: %{subject}) に、%{from_user} がコメントしました。" + hi: こんにちは、%{to_user} さん。 subject: "[OpenStreetMap] %{user} さんがあなたの日記エントリにコメントしました" email_confirm: subject: "[OpenStreetMap] あなたのメール アドレスの確認" email_confirm_html: click_the_link: これがあなたであれば、以下のリンクをクリックして変更を確認してください。 greeting: こんにちは、 - hopefully_you: 誰か(おそらくあなた)が %{server_url} で、メールアドレスを %{new_address} に変更しようとしています。 + hopefully_you: 誰か (おそらくあなた) が %{server_url} で、メール アドレスを %{new_address} に変更しようとしています。 email_confirm_plain: click_the_link: この要求を出したのがあなたなら、下のリンクをクリックして、変更の認証をしてください。 greeting: こんにちは。 - hopefully_you_1: "誰か(おそらくあなた)が彼らのメール アドレスを変更しようとしています。変更先:" - hopefully_you_2: "%{server_url}から%{new_address}へ。" + hopefully_you: 誰か (おそらくあなた) が %{server_url} で、メール アドレスを %{new_address} に変更しようとしています。 friend_notification: - had_added_you: "%{user} さんが、あなたを OpenStreetMapの友達に登録しました。" - see_their_profile: %{userurl} でプロファイルを見ることができます。 - subject: "[OpenStreetMap] %{user} さんが、あなたを友達に加えました。" + befriend_them: "%{befriendurl} で友達になることができます。" + had_added_you: OpenStreetMap で %{user} さんがあなたを友達に追加しました。 + see_their_profile: "%{userurl} でプロフィールを閲覧できます。" + subject: "[OpenStreetMap] %{user} さんがあなたを友達に追加しました。" gpx_notification: and_no_tags: とタグなし。 - and_the_tags: "と次のタグ:" + and_the_tags: "と以下のタグ:" failure: failed_to_import: "インポートするのに失敗しました。エラーはここです。:" - more_info_1: GPX インポートの失敗とどうやったら避けられるかについての詳しいことは、 - more_info_2: "それらはここにあります:" + more_info_1: GPX インポートの失敗を避ける方法についての詳細情報は + more_info_2: "こちらにあります:" subject: "[OpenStreetMap] GPX のインポートが失敗" greeting: こんにちは、 success: - loaded_successfully: 得られた%{possible_points} 点のうち、%{trace_points}点がロードに成功しました。 + loaded_successfully: 得られた %{possible_points} 点のうち、%{trace_points} 点の読み込みに成功しました。 subject: "[OpenStreetMap] GPX のインポートが成功" with_description: 説明付き your_gpx_file: これはあなたの GPX ファイルのようです @@ -1087,141 +1201,174 @@ ja: lost_password_html: click_the_link: これがあなたであれば、以下のリンクをクリックしてパスワードをリセットしてください。 greeting: こんにちは、 - hopefully_you: 誰か(おそらくあなた)が、このメール アドレスの openstreetmap.org アカウントに対して、パスワードをリセットするように依頼しました。 + hopefully_you: 誰か (おそらくあなた) が、このメール アドレスの openstreetmap.org アカウントに対するパスワードをリセットするように依頼しました。 lost_password_plain: click_the_link: これがあなたであれば、以下のリンクをクリックしてパスワードをリセットしてください。 greeting: こんにちは、 - hopefully_you_1: 誰か(おそらくあなた)がこの openstreetmap.org アカウントのメール アドレスに対する - hopefully_you_2: パスワードをリセットするように依頼しました。 + hopefully_you: 誰か (おそらくあなた) が、このメール アドレスの openstreetmap.org アカウントに対するパスワードをリセットするように依頼しました。 message_notification: - footer1: "%{readurl} でメッセージを読むこともできます。" - footer2: また、%{replyurl} で返信することができます。 - header: "%{from_user} さんが OpenStreetMap であなたに、件名 %{subject} でメッセージを送信しました:" - hi: やあ %{to_user} さん、 + footer_html: メッセージを読むにはこちら %{readurl}、返信するにはこちら %{replyurl} + header: "%{from_user} さんが、OpenStreetMap であなたに件名 %{subject} のメッセージを送信しました:" + hi: こんにちは、%{to_user} さん。 + note_comment_notification: + anonymous: 匿名ユーザー + closed: + commented_note: "%{commenter}さんが、あなたがコメントした地図上の%{place}付近にあるメモを解決しました。" + subject_other: "[OpenStreetMap] %{commenter}さんが、あなたが関心を持っているメモを解決しました" + subject_own: "[OpenStreetMap] %{commenter} さんがあなたのメモを解決しました" + your_note: "%{commenter}さんが%{place}付近にあるあなたの地図メモの1つを解決しました。" + commented: + commented_note: "%{commenter}さんがあなたがコメントした地図上の%{place}付近にあるメモにコメントしました。" + subject_other: "[OpenStreetMap] %{commenter}さんがあなたが関心を持っているメモにコメントしました" + subject_own: "[OpenStreetMap] %{commenter} さんがあなたのメモにコメントしました" + your_note: "%{commenter}さんが%{place}付近にあるあなたの地図メモの1つにコメントを残しました。" + details: メモについての詳細は %{url} を参照。 + greeting: こんにちは。 + reopened: + commented_note: "%{commenter}さんが、%{place}付近にあるあなたがコメントした地図メモを再開しました。" + subject_other: "[OpenStreetMap] %{commenter}さんがあなたが関心を持っているメモを再開しました" + subject_own: "[OpenStreetMap] %{commenter}さんがあなたのメモの1つを再開しました" + your_note: "%{commenter}さんが%{place}付近にあるあなたの地図メモの1つを再開しました。" signup_confirm: - subject: "[OpenStreetMap] あなたのメール アドレスの確認" - signup_confirm_html: - ask_questions: 質疑用サイトでは、OpenStreetMap について何でもご質問いただけます : - get_reading: まずは、OpenStreetMap について知るために、ウィキを読みましょう。そして、最新ニュースをOpenStreetMap ブログTwitterで追いかけましょう。また、OpenStreetMap 創設者 Steve Coast のOpenGeoData ブログを見て、このプロジェクトの歴史を味わってみましょう。これは、podcastsで聞くこともできます。(英語です) - greeting: やあ、皆さん! - hopefully_you: "誰か(おそらくあなた)がここでアカウントを作りたいようです:" - introductory_video: "%{introductory_video_link} で動画をご覧いただけます。" - more_videos: ビデオがあります。%{more_videos_link}. - more_videos_here: その他の動画はこちら - user_wiki_page: ユーザ wiki ページを作成して、あなたがどこにいるかを示すカテゴリ タグを入れることをお勧めします。例えば、[[Category:Users_in_Tokyo]]などです。 - video_to_openstreetmap: OpenStreetMap の紹介動画 - wiki_signup: また、OpenStreetMap wikのサインアップもしておくとよいでしょう。 - signup_confirm_plain: - ask_questions: "質疑用サイトでは、OpenStreetMap について何でもご質問いただけます:" - blog_and_twitter: "OpenStreetMap ブログや Twitter では最新のニュースをご覧いただけます:" + confirm: 私たちが他に何かする前に、この要求があなたのものであることを確認する必要がありますので、その後であなたのアカウントを確認するために下のリンクをクリックしてください。 + created: 誰か (おそらくあなた) が %{site_url} でアカウントを作成しました。 greeting: やあ、皆さん! - introductory_video: "OpenStreetMap の紹介動画をこちらでご覧いただけます:" - more_videos: "その他の動画がこちらにあります:" - opengeodata: OpenGeoData.org は OpenStreetMap の創設者 Steve Coast さんのブログであり、ポッドキャストもされています: - the_wiki_url: http://wiki.openstreetmap.org/wiki/Ja:Beginners%27_Guide - wiki_signup: OpenStreetMap wiki にサインアップしたい場合は: - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page&uselang=ja + subject: "[OpenStreetMap] OpenStreetMapへようこそ" + welcome: アカウントを確認したあと、開始するための追加情報を提供します。 oauth: oauthorize: - allow_read_gpx: あなたの非公開GPSトレースを読み込む。 - allow_read_prefs: あなたのユーザ設定を読み込みます。 - allow_to: "クライアントアプリケーションに以下の操作を許可する:" - allow_write_api: 地図を修正します。 - allow_write_diary: 日記エントリを作成したり、コメントしたり、友達を作ったりします。 - allow_write_gpx: GPSトレースをアップロードする。 - allow_write_prefs: あなたのユーザ設定を変更します。 + allow_read_gpx: 自分の非公開 GPS トレースを読み込む。 + allow_read_prefs: 自分のユーザー設定を読み込む。 + allow_to: "クライアント アプリケーションに以下の操作を許可する:" + allow_write_api: 地図を変更する。 + allow_write_diary: 日記エントリを作成する、コメントする、友達を作る。 + allow_write_gpx: GPS トレースをアップロードする。 + allow_write_notes: メモを変更する。 + allow_write_prefs: 自分のユーザー設定を変更する。 request_access: アプリケーション %{app_name} があなたのアカウント、%{user} への接続許可を求めています。そのアプリケーションに許可してもよいかどうかを確認してください。複数のアプリケーションに許可を与えることもできます。 + title: あなたのアカウントへのアクセスの認証 + oauthorize_failure: + denied: アプリケーション %{app_name} によるあなたのアカウントへのアクセスを拒否しました。 + invalid: 認証トークンが有効ではありません。 + title: 認証リクエストに失敗しました + oauthorize_success: + allowed: アプリケーション %{app_name} によるあなたのアカウントへのアクセスを許可しました。 + title: 認証リクエストが成功しました + verification: 検証コードは %{code} です。 revoke: flash: "%{application} へのトークンを失効しました。" oauth_clients: create: flash: 正常に登録完了しました。 destroy: - flash: 破棄されたクライアントアプリケーションの登録 + flash: 破棄されたクライアント アプリケーションの登録 edit: submit: 編集 - title: アプリケーションを編集 + title: アプリケーションの編集 form: - allow_read_gpx: 非公開 GPS トレースを読み込みます。 - allow_read_prefs: ユーザ設定を読み込みます。 - allow_write_api: 地図を修正します。 - allow_write_diary: 日記エントリやコメントを作成し、友達を作ります。 - allow_write_gpx: GPS トレースをアップロードします。 - allow_write_prefs: ユーザ設定を変更します。 - callback_url: コールバックURL + allow_read_gpx: 非公開 GPS トレースを読み込む。 + allow_read_prefs: ユーザー設定を読み込む。 + allow_write_api: 地図を変更する。 + allow_write_diary: 日記エントリを作成する、コメントする、友達を作る。 + allow_write_gpx: GPS トレースをアップロードする。 + allow_write_notes: メモを変更する。 + allow_write_prefs: ユーザー設定を変更する。 + callback_url: コールバック URL name: 名前 - requests: "ユーザから以下の許可をリクエスト:" + requests: "ユーザーからの以下の許可のリクエスト:" required: 必須 - support_url: サポートURL - url: メインアプリケーションのURL + support_url: サポート URL + url: メイン アプリケーションの URL index: application: アプリケーション名 - issued_at: 発行 + issued_at: 発行日時 list_tokens: "アプリケーションに対してあなたの名前で以下のトークンが許可されています:" my_apps: クライアント アプリケーション my_tokens: 認証を許可したアプリケーション no_apps: OSMのサイトで使用するアプリケーションを新しく %{oauth} で登録するにはOAuthリクエストの前にあらかじめwebから登録しておく必要があります。 register_new: アプリケーションの登録 - registered_apps: 以下のクライアントアプリケーションを登録しています。 - revoke: 失効! - title: OAuthの詳細 + registered_apps: "以下のクライアント アプリケーションが登録済みです:" + revoke: 取り消す! + title: 自分の OAuth の詳細 new: submit: 登録 - title: 新しいアプリケーションを登録 + title: アプリケーションの新規登録 not_found: - sorry: すみません、その %{type} は見つかりませんでした。 + sorry: 申し訳ありませんが、この %{type} は見つかりませんでした。 show: access_url: "アクセス トークン URL:" - allow_read_gpx: 非公開 GPS トレースを読み込みます。 - allow_read_prefs: ユーザ設定を読み込む。 - allow_write_api: 地図を修正します。 - allow_write_diary: 日記エントリやコメントを作成し、友達を作ります。 - allow_write_gpx: GPS トレースをアップロードします。 - allow_write_prefs: ユーザ設定を変更します。 + allow_read_gpx: 非公開 GPS トレースを読み込む。 + allow_read_prefs: ユーザー設定を読み込む。 + allow_write_api: 地図を変更する。 + allow_write_diary: 日記エントリを作成する、コメントする、友達を作る。 + allow_write_gpx: GPS トレースをアップロードする。 + allow_write_notes: メモを変更する。 + allow_write_prefs: ユーザー設定を変更する。 authorize_url: "承認 URL:" - confirm: よろしいですか? + confirm: 本当によろしいですか? + delete: クライアントを削除 edit: 詳細を編集 - key: "コンシューマ キー:" - requests: "ユーザが以下の許可をリクエストしています:" - secret: "コンシューマ シークレット:" - support_notice: SSLモードでの平文方式だけでなく、HMAC-SHA1方式(推奨)にも対応しています。 - title: "%{app_name} の OAuth 詳細" + key: "コンシューマー キー:" + requests: "ユーザーが以下の許可をリクエストしています:" + secret: "コンシューマー シークレット:" + support_notice: HMAC-SHA1 署名 (推奨) および RSA-SHA1 署名に対応しています。 + title: "%{app_name} の OAuth の詳細" url: "リクエスト トークン URL:" update: flash: クライアント情報の更新が正常に終了しました redaction: + create: + flash: 改訂を作成しました。 + destroy: + error: この改訂を破壊する際にエラーが発生しました。 + flash: 改訂を破壊しました。 + not_empty: 改訂が空ではありません。破壊する前に、この改訂に属するすべてのバージョンを再改訂してください。 edit: description: 説明 + heading: 改訂の編集 + submit: 改訂を保存 + title: 改訂の編集 + index: + empty: 表示できる改訂はありません。 + heading: 改訂一覧 + title: 改訂一覧 new: description: 説明 + heading: 新しい改訂の情報の入力 + submit: 改訂を作成 + title: 改訂の新規作成 show: - confirm: よろしいですか? - description: 説明: + confirm: 本当によろしいですか? + description: "説明:" + destroy: この改訂を削除 + edit: この改訂を編集 + heading: 改訂「%{title}」の表示 + title: 改訂の表示 user: "作成者:" update: flash: 変更を保存しました。 site: edit: - flash_player_required: OpenStreetMap エディタの Potlatch を使うには、Flash Player が必要です。Flash Player はAdobe.comからダウンロードできます。OpenStreetMapを編集する他の方法もあります。 + anon_edits_link_text: なぜこれれが事例なのかを見る。 + flash_player_required: Flash 版 OpenStreetMap エディターである Potlatch を使用するには、Flash Player が必要です。Flash Player はAdobe.com でダウンロードできます。OpenStreetMap を編集する他の方法もあります。 + id_not_configured: iDが設定されていません。 no_iframe_support: あなたのブラウザーは、この機能に必須の HTML iframe に未対応です。 not_public: あなたの編集結果を公開できません。 - potlatch2_not_configured: Potlatch 2 が設定されていません - 詳細情報はこちらをご覧ください:http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 - potlatch2_unsaved_changes: 保存していない変更があります。(Potlatch 2 で保存するには、保存をクリックする必要があります。) - 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.) - user_page_link: ユーザページ + not_public_description: このようなことをしない限り、あなたは地図を編集できます。あなたは%{user_page}から編集内容を公開できます。 + potlatch2_not_configured: "Potlatch 2 が設定されていません - 詳細情報はこちらをご覧ください: http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2" + potlatch2_unsaved_changes: 保存していない変更があります。(Potlatch 2 では、保存をクリックして保存する必要があります。) + potlatch_unsaved_changes: 保存していない変更があります。(Potlatch では、一覧モードで編集している場合、ウェイや点の選択を解除する必要があります。または、保存ボタンをクリックして保存してください。) + user_page_link: ユーザーページ index: - js_1: JavaScriptをサポートしていないブラウザを使用しているか、JavaScriptを使用不可に設定しています。 - js_2: OpenStreetMapは、地図表示にJavaScriptを使用しています。 + createnote: メモを追加 + js_1: JavaScript に対応していないブラウザーを使用しているか、JavaScript を無効にしているかのどちらかです。 + js_2: OpenStreetMap は地図の表示に JavaScript を使用します。 license: - license_name: クリエイティブコモンズ 表示-継承 2.0 - notice: " %{project_name}とその貢献者により、%{license_name} ライセンスの元提供されています。" - project_name: OpenStreetMapプロジェクト - permalink: パーマリンク - remote_failed: 編集に失敗しました - JOSM または Merkaartor がロードされており、リモート制御オプションが有効になっていることを確認してください。 - shortlink: ショートリンク + copyright: Copyright OpenStreetMapおよび協力者、オープンライセンスの下で + permalink: 固定リンク + remote_failed: 編集に失敗しました - JOSM または Merkaartor が読み込まれていること、遠隔制御オプションが有効になっていることを確認してください + shortlink: 短縮リンク key: - map_key: 凡例 - map_key_tooltip: マップのキー table: entry: admin: 行政境界 @@ -1230,16 +1377,16 @@ ja: - 空港ビル - 空港ターミナル bridge: 黒枠 = 橋梁 - bridleway: 馬道 - brownfield: Brownfield サイト(廃工場地域) + bridleway: 乗馬道 + brownfield: 褐色地 building: 重要建造物 byway: 路地 cable: - ケーブルカー - - リフト + - チェアリフト cemetery: 墓地 centre: スポーツセンター - commercial: 商業地域 + commercial: オフィス地域 common: - 共有地 - 牧草地 @@ -1260,53 +1407,53 @@ ja: park: 公園 permissive: 許可制通行 pitch: 運動場 - primary: 幹線道路 + primary: 主要地方道 private: 私的通行 rail: 鉄道 - reserve: 自然保護地区 - resident: 住宅街 - retail: 商業地区 + reserve: 自然保護区 + resident: 住宅地 + retail: 小売業地域 runway: - 空港滑走路 - 空港誘導路 school: - 学校 - 大学 - secondary: 一般道路 + secondary: 一般県道 station: 鉄道駅 subway: 地下鉄 summit: - 山脈 - 山頂 tourist: 観光名所 - track: Track (農道・林道) + track: 農道・林道 tram: - 軽便鉄道 - 路面電車 - trunk: Trunk道 (国道) + trunk: 国道 tunnel: 点線の枠 = トンネル unclassified: 未分類の道路 unsurfaced: 未舗装道路 wood: 森林 markdown_help: alt: 代替テキスト - first: 最初の項目 + first: 項目 1 heading: 見出し headings: 見出し image: 画像 link: リンク - ordered: 順序付きリスト - second: 2 番目の項目 + ordered: 番号付きリスト + second: 項目 2 subheading: 小見出し text: テキスト - unordered: 順序なしリスト + title_html: Markdown で構文解析されます + unordered: 番号なしリスト url: URL richtext_area: edit: 編集 preview: プレビュー search: search: 検索 - search_help: "例: '名古屋城'、'名寄市'、'New York'、'皇居' など その他の例..." submit_text: 行く where_am_i: いまどこ? where_am_i_title: 検索エンジンを使用して現在の場所を記述 @@ -1315,49 +1462,59 @@ ja: search_results: 検索結果 time: formats: - friendly: "%Y年 %B %e日 %H:%M" + friendly: "%Y年%B%e日 %H:%M" trace: create: - trace_uploaded: GPX ファイルがアップロードされました。データベースへの登録に多少時間がかかります。通常この作業は30分ほどで完了し、そのことをお知らせするメールをあなたに送信します。 + trace_uploaded: GPX ファイルをアップロードしました。データベースへの登録に多少時間がかかります。通常この作業は 30 分以内に完了し、それをお知らせするメールをお送りします。 upload_trace: GPS トレースのアップロード delete: - scheduled_for_deletion: トラックの削除準備を行いました + scheduled_for_deletion: トレースの削除準備を行いました + description: + description_with_count: + other: "%{user} による %{count} 地点を含む GPX ファイル" + description_without_count: "%{user} による GPX ファイル" edit: description: "詳細:" download: ダウンロード edit: 編集 filename: "ファイル名:" - heading: トレース %{name} を編集 + heading: トレース %{name} の編集 map: 地図 - owner: "アップロードしたユーザ:" - points: "ポイント数:" + owner: "所有者:" + points: "点の個数:" save_button: 変更を保存 start_coord: "開始座標:" tags: "タグ:" tags_help: カンマ区切り - title: トレース %{name} を編集 + title: トレース %{name} の編集 uploaded_at: "アップロード日時:" visibility: "可視性:" - visibility_help: これはどういう意味? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Ja:Visibility_of_GPS_traces + visibility_help: これはどういう意味? + visibility_help_url: http://wiki.openstreetmap.org/wiki/JA:Visibility_of_GPS_traces + georss: + title: OpenStreetMap GPS トレース list: - public_traces: 公開GPSトレース - public_traces_from: "%{user}からの公開GPSトレース" - tagged_with: "%{tags}でタグ付けされた" - your_traces: あなたのGPSトレース + description: 最近のGPSトラックのアップロードを参照 + empty_html: ここにはまだ何もありません。新しくトレースをアップロードするか、ウィキ ページで GPS トレースの詳細情報をお読みください。 + public_traces: 公開 GPS トレース + public_traces_from: "%{user} による公開 GPS トレース" + tagged_with: (タグ %{tags} が付いているもの) + your_traces: あなたの GPS トレース make_public: - made_public: トラックを公開しました + made_public: トレースを公開しました offline: - heading: GPXのストレージが利用できません - message: GPXファイルのストレージとアップロードシステムは現在使用できません。 + heading: GPX のストレージが利用できません + message: GPX ファイルのストレージとアップロード システムは現在利用できません。 offline_warning: - message: GPXファイルアップロードシステムは現在利用できません + message: GPX ファイルのアップロード システムは現在利用できません trace: ago: "%{time_in_words_ago}前" - count_points: "%{count} ポイント" + by: "投稿者:" + count_points: "%{count} 個の点" edit: 編集 edit_map: 地図を編集 identifiable: 識別可能 + in: "タグ:" map: 地図 more: 詳細 pending: 処理中 @@ -1367,146 +1524,150 @@ ja: trackable: 追跡可能 view_map: 地図で表示 trace_form: - description: 説明: + description: "説明:" help: ヘルプ - help_url: http://wiki.openstreetmap.org/wiki/Ja:Upload - tags: タグ: + help_url: http://wiki.openstreetmap.org/wiki/JA:Upload?uselang=ja + tags: "タグ:" tags_help: カンマ区切り upload_button: アップロード - upload_gpx: GPXファイルのアップロード: - visibility: 可視性: - visibility_help: これはどういう意味? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Ja:Visibility_of_GPS_traces + upload_gpx: "アップロードする GPX ファイル:" + visibility: "可視性:" + visibility_help: これはどういう意味? + visibility_help_url: http://wiki.openstreetmap.org/wiki/JA:Visibility_of_GPS_traces trace_header: see_all_traces: すべてのトレースを見る - see_your_traces: あなたのトレースを全て見る - traces_waiting: あなたの %{count} 件のトレースがアップロード待ち中です。これらのアップロードの完了までお待ちください。他のユーザのアップロードが制限されてしまいます。 + see_your_traces: 自分のトレースをすべて見る + traces_waiting: + other: あなたの %{count} 件のトレースがアップロード待ち中です。これらのアップロードが完了するまでお待ちください。他のユーザーのアップロードが制限されてしまいます。 upload_trace: トレースをアップロード trace_optionals: - tags: タグ(複数可) + tags: タグ trace_paging_nav: - next: 次へ » - previous: « 前へ - showing_page: " %{page} ページ" + newer: 以降のトレース + older: 以前のトレース + showing_page: ページ %{page} view: - delete_track: このトラックを削除 + delete_track: このトレースを削除 description: "詳細:" download: ダウンロード edit: 編集 - edit_track: このトラックを編集 + edit_track: このトレースを編集 filename: "ファイル名:" - heading: トレース%{name}の表示 + heading: トレース %{name} の表示 map: 地図 none: なし - owner: "アップロードしたユーザ:" + owner: "所有者:" pending: アップロード中 - points: "ポイント数:" + points: "点の個数:" start_coordinates: "開始座標:" - tags: タグ - title: "%{name} のトレースを見る。" + tags: "タグ:" + title: トレース %{name} の表示 trace_not_found: トレースが見つかりません! uploaded: "アップロード日時:" visibility: "可視性:" visibility: - identifiable: 識別可能 (トレースリストに公表していて、常に持ち主を識別可能な状態。点の順序がタイムスタンプ付きでわかる。) - private: 非公開 (匿名、順不同の点としての共有のみ) - public: 公開 (トレースリストに表示する。匿名の状態では点の順序はわからない。) - trackable: 追跡可能 (匿名でのみ共有されるが、点の順序はタイムスタンプ付きでわかる。) + identifiable: 識別可能 (トレース一覧に識別可能な状態で表示。点は順序通りでタイムスタンプ付き) + private: 非公開 (匿名、点は順不同) + public: 公開 (トレース一覧に匿名で表示、点は順不同) + trackable: 追跡可能 (匿名、点は順序通りでタイムスタンプ付き) user: account: contributor terms: - agreed: あなたは、新しい投稿規約を承諾しています。 + agreed: あなたは、新しい協力者規約を承諾しています。 agreed_with_pd: また、あなたは、自分の編集結果がパブリックドメインにあるべきだと考えているということも宣言しています。 - heading: "投稿規約:" - link text: これは何ですか? + heading: "協力者規約:" + link text: これは何ですか? not yet agreed: あなたはまだ新しい投稿規約を承諾していません。 - review link text: ご都合の良い時にこのリンクをクリックして新しい投稿規約をレビューの上、同意してください。 + review link text: ご都合の良い時にこのリンクをクリックして新しい協力者規約を確認の上、同意してください。 current email address: "現在のメール アドレス:" delete image: 現在の画像を削除 email never displayed publicly: (非公開) - flash update success: ユーザ情報を更新しました。 - flash update success confirm needed: ユーザ情報を更新しました。新しいメール アドレスを確認するためにメールを確認してください。 + flash update success: ユーザー情報を更新しました。 + flash update success confirm needed: ユーザー情報を更新しました。新しいメール アドレスを検証するため、新着メールを確認してください。 + gravatar: + gravatar: Gravatar を使用 + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: これは何ですか? home location: "活動地域:" image: "画像:" image size hint: (100x100 以下の正方形の画像が最適) keep image: 現在の画像を保持 latitude: "緯度:" longitude: "経度:" - make edits public button: 私の編集を全て公開する - my settings: 私の設定 + make edits public button: 自分の編集をすべて公開する + my settings: 設定 new email address: "新しいメール アドレス:" new image: 画像を追加 - no home location: あなたはまだ活動地域を登録していません。 + no home location: あなたはまだホーム地点を登録していません。 openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: http://wiki.openstreetmap.org/wiki/JA:OpenID?uselang=ja link text: これは何ですか? - openid: OpenID: - preferred editor: 優先エディタ: - preferred languages: "言語設定:" - profile description: "ユーザ情報の詳細:" + openid: "OpenID:" + preferred editor: "優先エディター:" + preferred languages: "優先言語:" + profile description: "プロフィールの説明:" public editing: disabled: 無効。データを編集できず、これまでの編集はすべて匿名です。 disabled link text: なぜ編集できないのですか? enabled: 有効。匿名ではなく、データを編集できます。 - enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link: http://wiki.openstreetmap.org/wiki/JA:Anonymous_edits?uselang=ja enabled link text: これは何ですか? heading: "公開編集:" public editing note: heading: 公開編集 - text: 現在、あなたの編集作業は匿名扱いであるため、他の人々があなたにメッセージを送信したり、あなたの場所を見たりすることはできません。あなたの編集結果を表示できるようにして、他の人々がウェブサイト経由であなたに連絡できるようにするためには、下のボタンをクリックしてください。API 0.6版以降では、地図データを編集できるのは公開ユーザーのみです。その理由
    • 公開扱いに変更しても、あなたのメールアドレスが暴露されることはありません。
    • この変更は取り消せません。なお新しいユーザーは、既定で公開扱いとなります。
    + text: 現在、あなたの編集作業は匿名扱いであるため、他の人々があなたにメッセージを送信したり、あなたの場所を見たりすることはできません。あなたの編集結果を表示できるようにして、他の人々がウェブサイト経由であなたに連絡できるようにするためには、下のボタンをクリックしてください。API 0.6 版以降では、地図データを編集できるのは公開ユーザーのみです。 (その理由)
    • 公開扱いに変更しても、あなたのメール アドレスが暴露されることはありません。
    • この変更は取り消せません。なお新しいユーザーは、既定で公開扱いとなります。
    replace image: 現在の画像を置換 return to profile: プロフィールに戻る save changes button: 変更を保存 - title: アカウントを編集 - update home location on click: 地図上のクリックした地点をあなたの活動地域として更新しますか? + title: アカウントの編集 + update home location on click: ホーム地点を、地図上のクリックした地点に変更 confirm: already active: このアカウントは確認済みです。 - before you start: マッピングを開始するのをお急ぎだと思いますが、以下のフォームであなたの情報をいくつか記入してください。 button: 確認 - heading: ユーザ アカウントを確認 + heading: メールを確認してください + introduction_1: 確認メールをお送りしました。 + introduction_2: メール内のリンクをクリックしてアカウントの確認をすれば、マッピングを始められます。 press confirm button: アカウントを有効にして良ければ、以下の確認ボタンを押してください。 - success: アカウントを確認しました。登録ありがとうございます! - unknown token: このトークンは存在しないようです。 + reconfirm_html: 確認メールを再送する必要がある場合は、ここをクリックしてください。 + unknown token: この確認コードは期限切れ、または存在しません。 confirm_email: button: 確認 - failure: このメールアドレス確認トークンは既に確認が済んでいます。 + failure: このトークンは、メール アドレスの確認に使用済みです。 heading: メール アドレスの変更を確認 press confirm button: 新しいメール アドレスを確認するために確認ボタンを押してください。 success: メール アドレスを確認しました。登録ありがとうございます! confirm_resend: failure: "%{name}というアカウントは登録されていません。" - success: " %{email}に確認メッセージを再送信しました。メールを確認してアカウントを有効にし次第、編集を開始できます。

    あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っている場合は webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。" + success: " %{email}に確認メッセージを再送信しました。メールを確認してアカウントを有効にし次第、編集を開始できます。

    あなたの指定したアドレスに確認メールが届くまであなたはログインできません。メールボックスでスパムフィルターを使用している場合は webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。" filter: not_an_administrator: この作業を行うには、管理者になる必要があります。 go_public: - flash success: あなたの全ての編集は公開されます。今から編集できます。 + flash success: あなたの編集はすべて公開され、あなたは編集できるようになりました。 list: - confirm: 選択したユーザを確認 - empty: 条件に一致するユーザがいません - heading: ユーザ - hide: 選択したユーザを隠す + confirm: 選択したユーザーを確認 + empty: 該当するユーザーが見つかりません + heading: ユーザー + hide: 選択したユーザーを隠す showing: - one: ページ %{page} (%{items} 件中 %{first_item} 件目) を表示中 - other: ページ %{page} (%{items} 件中 %{first_item}-%{last_item} 件目を表示中) + one: ページ %{page} (%{items} 件中 %{first_item} 件目) + other: ページ %{page} (%{items} 件中 %{first_item}-%{last_item} 件目) summary: "%{name} は %{ip_address}から%{date}に作成されました。" summary_no_ip: "%{name} は%{date}に作成されました。" - title: ユーザ + title: ユーザー login: account is suspended: 申し訳ありませんが、不審な活動のため、あなたのアカウントは一時停止されております。
    本件についてご相談がある場合は ウェブマスターにご連絡ください。 - account not active: すみません、あなたのアカウントはまだ有効ではありません。
    アカウント確認メール内のリンクをクリックするか、新しい確認メールを要求をしてください。 - auth failure: すみません、以下の理由によりログインできませんでした。 + account not active: 申し訳ありませんが、あなたのアカウントはまだ有効ではありません。
    アカウント確認メール内のリンクをクリックするか、新しい確認メールを要求をしてください。 + auth failure: 申し訳ありませんが、以下の理由によりログインできませんでした。 create account minute: アカウントを作成します。1分でできます。 - email or username: "メール アドレスまたはユーザ名:" + email or username: "メール アドレスまたはユーザー名:" heading: ログイン login_button: ログイン - lost password link: パスワードを忘れましたか? - new to osm: OpenStreetMapは初めてですか? + lost password link: パスワードを忘れた場合はこちら + new to osm: OpenStreetMap は初めてですか? no account: アカウントを持っていませんか? - notice: 今後行う OpenStreetMap のライセンス変更についてお読みください (翻訳) (議論) - notice_terms: OpenStreetMap は2012年4月1日に新しいライセンスに移行しました。オープンさは現在のものとほぼ同等ですが、はるかに地図データベースに適した法的条件になっています。 あなたの貢献をOpenStreetMap に残しておくためには、新しいライセンス条件で配布することに同意いただく必要があります。 同意いただけない場合には、あなたの貢献をデータベースから除去するほかなくなります。

    ログインして、新しい条件を軽く確認し、承認願います。よろしくお願いします。 - openid: "%{logo} OpenID:" - openid invalid: すみません、あなたの OpenID は正しくないようです - openid missing provider: すみません、OpenID プロバイダに接続できませんでした + openid: "%{logo} OpenID:" + openid invalid: 申し訳ありませんが、あなたの OpenID は正しくないようです + openid missing provider: 申し訳ありませんが、OpenID プロバイダーに接続できませんでした openid_logo_alt: OpenID でログイン openid_providers: aol: @@ -1526,71 +1687,76 @@ ja: title: WordPress でログイン yahoo: alt: Yahoo の OpenID でログイン - title: Yahoo ID でログ​​イン + title: Yahoo ID でログイン password: "パスワード:" register now: 今すぐ登録 - remember: パスワードを記憶 + remember: ログイン状態を保持 title: ログイン to make changes: OpenStreetMap データを変更するには、アカウントが必要です。 - with openid: "代わりに OpenID を使用してログインしてください:" - with username: "OpenStreetMap アカウントを既にお持ちですか? ユーザ名とパスワードでログインしてください:" + with openid: "OpenID でもログインできます:" + with username: "OpenStreetMap アカウントを既にお持ちですか? 自分のユーザー名とパスワードでログインしてください:" logout: heading: OpenStreetMap からログアウト logout_button: ログアウト title: ログアウト lost_password: email address: "メール アドレス:" - heading: パスワードを忘れましたか? - help_text: サインアップに使用したメール アドレスを入力してください。そのアドレス宛にあなたのパスワードをリセットするためのリンクを送信します。 - new password button: 新しいメールを送ってください - notice email cannot find: すみません、そのメール アドレスは見つかりません。 - notice email on way: すみません、なくしてしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。 + heading: パスワードを忘れた場合はこちら + help_text: ユーザー登録に使用したメール アドレスを入力してください。そのアドレス宛に、パスワードを再設定するためのリンクをお送りします。 + new password button: パスワードを再設定 + notice email cannot find: 申し訳ありませんが、このメール アドレスは見つかりません。 + notice email on way: すみません。紛失してしまいました :-( しかし、メールをお送りしたので、すぐにリセットできるでしょう。 title: パスワードを忘れた make_friend: already_a_friend: あなたは %{name} と既に友達です。 + button: 友達に追加 failed: "%{name} を友達と登録できませんでした。" - success: "%{name} はあなたの友達になりました。" + heading: "%{user} を友達に追加しますか?" + success: "%{name} と友達になりました!" new: + about: + header: フリー、編集可能 + html: "

    他の地図とは異なり、OpenStreetMapは完全にあなたのような人々によって作成され、だれでも自由に修正、更新、ダウンロード、利用することができます。

    \n

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

    " confirm email address: "メール アドレスの確認:" confirm password: "パスワードの確認:" contact_webmaster: アカウントを作成できるよう、webmasterに連絡してください。 できるだけ早期に、あなたの希望に対応するように努めます。 - continue: 続行 + continue: ユーザー登録 display name: "表示名:" - display name description: あなたの公開ユーザ名です。これはあとで設定で変更できます。 + display name description: 自分の公開ユーザー名です。あとで設定ページで変更できます。 email address: "メール アドレス:" - fill_form: 以下のフォームを埋めてください。登録すると、あなたのアカウントを有効化するためにあなたにメールをお送りします。 - flash create success message: "%{email} に確認メッセージを送信しました。メールを確認してアカウントを有効にし次第、編集を開始できます。

    あなたの指定したアドレスに確認メールが届くまであなたはログインすることはできません。メールボックスでスパムフィルタを使っているときには webmaster@openstreetmap.org からの確認メールを受信できるようホワイトリストを設定してください。" - heading: ユーザ アカウントを作成 - license_agreement: アカウントを確認するときには contributor terms に同意する必要があります。 + license_agreement: アカウントを確認するときには協力者規約に同意する必要があります。 no_auto_account_create: 残念ながら、現在、自動ではアカウントを作成できません。 - not displayed publicly: 非公開です。(詳細は プライバシー ポリシーを御覧下さい) - openid: "%{logo} OpenID:" - openid association: "

    あなたの OpenID は、まだ OpenStreetMap のどのアカウントとも関連付けられていません。

    \n
      \n
    • OpenStreetMap が初めての場合は、下のフォームで新規アカウントを作成してください。
    • \n
    • \n 既にアカウントを持っている場合は、あなたのユーザー名とパスワードでログインしてください。\n ログイン後、ユーザ設定であなたの OpenID と関連付けることができます。\n
    • \n
    " + not displayed publicly: 非公開です (詳細は プライバシー ポリシーを参照してください) + openid: "%{logo} OpenID:" + openid association: "

    あなたの OpenID は、まだ OpenStreetMap のどのアカウントとも関連付けられていません。

    \n
      \n
    • OpenStreetMap が初めての場合は、下のフォームで新規アカウントを作成してください。
    • \n
    • \n 既にアカウントを持っている場合は、あなたのユーザー名とパスワードでログインしてください。\n ログイン後、ユーザー設定であなたの OpenID と関連付けることができます。\n
    • \n
    " openid no password: OpenID ではパスワードは不要ですが、特殊なツール/サーバーでは必要な場合があります。 password: "パスワード:" - terms accepted: 新しい投稿規約に同意いただき、ありがとうございます! - terms declined: 新しい投稿規約に同意いただけず残念です。詳しい情報は、このウィキページをご覧ください。 - title: アカウントを作成 + terms accepted: 新しい協力者規約に同意いただき、ありがとうございます! + terms declined: 新しい協力者規約に同意いただけず残念です。詳しい情報は、このウィキページをご覧ください。 + terms declined url: http://wiki.openstreetmap.org/wiki/JA:Contributor_Terms_Declined + title: ユーザー登録 use openid: 代わりに、%{logo} OpenID を使用してログイン no_such_user: - body: すみません、%{user} という名前のユーザは存在しません。スペルミスをチェックしてください。もしくはクリックしたリンクが間違っています。 - heading: "%{user} というユーザは存在しません。" - title: ユーザが存在しません + body: 申し訳ありませんが、%{user} という名前のユーザーは存在しません。スペルを確認してください。またはクリックしたリンクが間違っている可能性があります。 + heading: ユーザー %{user} は存在しません + title: 存在しないユーザーです popup: friend: 友達 nearby mapper: 周辺のマッパー - your location: あなたの位置 + your location: 自分の場所 remove_friend: - not_a_friend: "%{name} はあなたの友達ではありません。" - success: "%{name} はあなたの友達から外しました。" + button: 友達を解除 + heading: "%{user} との友達を解除しますか?" + not_a_friend: "%{name} は友達ではありません。" + success: "%{name} との友達を解除しました。" reset_password: confirm password: "パスワードの確認:" flash changed: あなたのパスワードは変更されました。 flash token bad: キーワードが見つかりません。URL を確認してください。 - heading: "%{user}のパスワードを初期化" + heading: "%{user} のパスワードのリセット" password: "パスワード:" reset: パスワードを初期化 - title: パスワードをリセット + title: パスワードの再設定 set_home: flash success: 活動地域を保存しました。 suspended: @@ -1600,79 +1766,84 @@ ja: webmaster: ウェブマスター terms: agree: 同意 - consider_pd: 私の投稿をパブリックドメインとします(著作権、著作隣接権を放棄し、著作人格権の行使を行いません) + consider_pd: 私の投稿をパブリック ドメインとします (著作権、著作隣接権を放棄し、著作人格権を行使しません) consider_pd_why: これは何ですか? decline: 拒否 - guidance: この規約を理解するための情報として、要約(英語)非公式の翻訳 をごらんください。 - heading: 投稿規約 + declined: http://wiki.openstreetmap.org/wiki/JA:Contributor_Terms_Declined + guidance: この規約の理解を助ける情報として、要約 (英語)非公式の翻訳 をご覧ください。 + heading: 協力者規約 legale_names: france: フランス italy: イタリア rest_of_world: それ以外の国 - legale_select: "お住まいの国もしくは地域を選択してください:" - read and accept: 下記の同意書を読み、あなたの既存および将来の投稿のために本同意書の条項を承諾することを確認するために同意ボタンを押してください。 - title: 投稿規約 - you need to accept or decline: 続行するには新しい投稿規約を読んで同意または拒否してください。 + legale_select: "お住まいの国:" + read and accept: 同意書を読み、あなたの既存および将来の協力のために本同意書の条項を承諾することを確認するために同意ボタンを押してください。 + title: 協力者規約 + you need to accept or decline: 続行するには新しい協力者規約を読んで同意または拒否してください。 view: - activate_user: このユーザを有効にする - add as friend: 友達に追加 - ago: (%{time_in_words_ago}前) - block_history: 受信したブロックを表示 - blocks by me: 私によるブロック - blocks on me: 私へのブロック + activate_user: このユーザーを有効にする + add as friend: 友達として追加 + ago: (%{time_in_words_ago}前) + block_history: 受けたブロック + blocks by me: 自分が実行したブロック + blocks on me: 自分に与えられたブロック comments: コメント confirm: 確認 - confirm_user: このユーザを確認 - create_block: このユーザをブロック + confirm_user: このユーザーを確認 + create_block: このユーザーをブロック created from: "作成日:" ct accepted: "%{ago}前に承認" ct declined: 拒否 - ct status: "投稿規約:" + ct status: "協力者規約:" ct undecided: 未決定 - deactivate_user: このユーザを無効にする - delete_user: このユーザを削除 + deactivate_user: このユーザーを無効にする + delete_user: このユーザーを削除 description: 説明 diary: 日記 edits: 編集 email address: "メール アドレス:" - friends_changesets: 友達によるすべての変更セットを参照 - friends_diaries: 友達の日記エントリをすべて参照 - hide_user: このユーザを隠す - if set location: 活動地域を指定すると、この下に周辺の地図と、近くで活動するマッパーが表示されます。%{settings_link} から設定をしてください。 - km away: 距離 %{count}km + friends_changesets: 友達による変更セット + friends_diaries: 友達の日記エントリ + hide_user: このユーザーを隠す + if set location: "%{settings_link}ページから活動地域を指定すると、近くで活動しているユーザーを見ることができます。" + km away: 距離 %{count} km latest edit: "最終編集 %{ago}:" - m away: 距離 %{count}m + m away: 距離 %{count} m mapper since: "マッパー歴:" - moderator_history: 与えられたブロックを表示 - my comments: 私のコメント - my diary: 私の日記 - my edits: 私の編集 + moderator_history: 実行したブロック + my comments: 自分のコメント + my diary: 自分の日記 + my edits: 自分の編集 + my messages: 自分のメッセージ + my notes: 自分のメモ + my profile: 自分のプロフィール my settings: 設定 - my traces: 私のトレース - nearby users: 周辺のその他のユーザ - nearby_changesets: ユーザーの周辺のすべての変更セットを参照 - nearby_diaries: ユーザの周辺のすべての日記エントリを参照 + my traces: 自分のトレース + nearby users: 周辺のその他のユーザー + nearby_changesets: 周辺のユーザーの変更セット + nearby_diaries: 周辺のユーザーの日記エントリ new diary entry: 新しい日記エントリ - no friends: あなたは誰も友達として登録されていません。 + no friends: あなたはまだ誰も友達として登録していません。 no nearby users: あなたの活動地域周辺に他のマッパーはいないようです。 - oauth settings: OAuth設定 - remove as friend: 友達から削除 + notes: 地図メモ + oauth settings: OAuth 設定 + remove as friend: 友達を解除 role: - administrator: このユーザは管理者です + administrator: このユーザーは管理者です grant: - administrator: 管理者アクセスを許可 - moderator: モデレータ権限を許可 - moderator: このユーザはモデレータです + administrator: 管理者権限を許可 + moderator: モデレーター権限を許可 + moderator: このユーザーはモデレーターです revoke: administrator: 管理者権限を剥奪 - moderator: モデレータ権限を剥奪 - send message: メッセージ送信 + moderator: モデレーター権限を剥奪 + send message: メッセージを送信 settings_link_text: 設定 - spam score: スパム評価: + spam score: "スパム評価:" status: "状態:" traces: トレース - unhide_user: このユーザを再表示 - user location: ユーザの位置 + unhide_user: このユーザーを再表示 + user location: ユーザーの場所 your friends: あなたの友達 user_block: blocks_by: @@ -1684,68 +1855,73 @@ ja: heading: "%{name} のブロックのリスト" title: "%{name} がされたブロック" create: - flash: ユーザ %{name} をブロックしました。 + flash: ユーザー %{name} をブロックしました。 try_contacting: ブロックする前にユーザーにご連絡し、ユーザーが対処するための十分な時間を確保するようにしてください。 try_waiting: ブロックする前に、ユーザーが対処するための十分な時間を確保するようにしてください。 edit: - back: すべてのブロックを表示 - heading: "%{name} のブロックを編集" + back: すべてのブロックを閲覧 + heading: "%{name} のブロックの編集" + needs_view: このブロックを解消する前に、ユーザーがログインする必要がありますか? period: ユーザーが今からどれくらいの間、APIからブロックされるか。 - reason: "%{name} さんがブロックされている理由です。メッセージは多くの人の目にふれることになりますから、できるだけ冷静かつ合理的になり、できるだけ丁寧に状況を説明するようにしてください。すべてのユーザーがコミュニティ内での隠語を理解しているわけではありませんので、分かりやすい用語を使うように努めてください。" + reason: "%{name} さんがブロックされている理由です。できるだけ冷静かつ理性的になり、できるだけ丁寧に状況を説明するようにしてください。すべてのユーザーがコミュニティ内での隠語を理解しているわけではないため、分かりやすい用語を使うように努めてください。" show: このブロックを閲覧 submit: ブロックを更新 - title: "%{name} のブロックを編集" + title: "%{name} のブロックの編集" filter: block_expired: このブロック期間は既に終了しており、変更できません。 block_period: ブロック期間はドロップダウンリストから一つ選択してください。 helper: time_future: "%{time} に終了します。" time_past: "%{time}前に終了しました。" - until_login: ユーザがログインするまでアクティブです。 + until_login: ユーザーがログインするまでアクティブです。 index: empty: ブロックはまだ行われていません。 - heading: ユーザ ブロックの一覧 - title: ユーザ ブロック + heading: ユーザー ブロックの一覧 + title: ユーザーのブロック model: - non_moderator_revoke: ブロックを解除するにはモデレータ権限が必要です。 - non_moderator_update: ブロックを編集するにはモデレータ権限が必要です。 + non_moderator_revoke: ブロックの取り消しにはモデレーター権限が必要です。 + non_moderator_update: ブロックの作成/更新にはモデレーター権限が必要です。 new: - back: 全てのブロックを表示 - heading: "%{name} をブロック" + back: すべてのブロックを表示 + heading: "%{name} のブロックの作成" needs_view: ブロックを解除するにはログインし直す必要があります。 period: ユーザーが今からどれくらいの間、APIからブロックされるか。 - reason: "%{name} さんがブロックされている理由です。メッセージは多くの人の目にふれることになりますから、できるだけ冷静かつ合理的になり、できるだけ丁寧に状況を説明するようにしてください。すべてのユーザーがコミュニティ内での隠語を理解しているわけではありませんので、分かりやすい用語を使うように努めてください。" + reason: "%{name} さんがブロックされている理由です。メッセージは多くの人の目にふれることになるため、できるだけ冷静かつ理性的になり、できるだけ丁寧に状況を説明するようにしてください。すべてのユーザーがコミュニティ内での隠語を理解しているわけではないため、分かりやすい用語を使うように努めてください。" submit: ブロックを作成 - title: "%{name} をブロック" - tried_contacting: ユーザに連絡し、それらをやめるよう依頼しました。 + title: "%{name} のブロックの作成" + tried_contacting: ユーザーに連絡して、それらをやめるよう依頼しました。 + tried_waiting: 私はユーザーとの対話に応じるために、合理的な時間を費やしました。 not_found: back: 索引に戻る - sorry: すみません、ID %{id} のユーザ ブロックはありませんでした。 + sorry: 申し訳ありませんが、ID %{id} のユーザー ブロックは見つかりませんでした。 partial: - confirm: 確かですか? - creator_name: 製作者 - display_name: ブロックされたユーザ + confirm: 本当によろしいですか? + creator_name: 作成者 + display_name: ブロックされているユーザー edit: 編集 + next: 次へ » not_revoked: (取り消されていません) + previous: « 前へ reason: ブロックされた理由 revoke: 取り消す! - revoker_name: "取り消し者:" + revoker_name: 取り消し者 show: 表示する + showing_page: ページ %{page} status: 状態 period: "%{count} 時間" revoke: - confirm: このブロックを取り消してよろしいですか? + confirm: このブロックを本当に取り消しますか? flash: このブロックは取り消されました。 heading: ブロックは %{block_on} に %{block_by} によって取り消されました。 - past: このブロックは%{time}前に終了しました。もう取り消すことはできません。 - revoke: 取消し + past: このブロックは%{time}前に終了したため、もう取り消せません。 + revoke: 取り消す! time_future: このブロックは %{time} に終了します。 - title: "%{block_on} のブロックを取消し" + title: "%{block_on} のブロックの取り消し" show: back: すべてのブロックを表示 confirm: 本当によろしいですか? edit: 編集 - heading: "%{block_on} %{block_by} がブロックしました" + heading: "%{block_by} が %{block_on} をブロックしました" needs_view: ブロックを解除する前に、ログインし直す必要があります。 reason: "ブロックの理由:" revoke: 取り消す! @@ -1754,25 +1930,47 @@ ja: status: 状態 time_future: "%{time} に終了" time_past: "%{time}前に終了しました" - title: "%{block_on} %{block_by} がブロックしました" + title: "%{block_by} が %{block_on} をブロックしました" update: - only_creator_can_edit: このブロックを編集するにはモデレータ権限が必要です。 + only_creator_can_edit: このブロックを編集するにはモデレーター権限が必要です。 success: ブロックを更新しました。 user_role: filter: - already_has_role: ユーザーはすでに %{role} 権限を付与されています。 + already_has_role: ユーザーは %{role} 権限を既に付与されています。 doesnt_have_role: ユーザーに %{role} 権限が付与されていません。 not_a_role: 文字列「%{role}」は、有効な権限ではありません。 not_an_administrator: ユーザー権限の管理を行えるのは管理者だけですが、あなたは管理者ではありません。 grant: - are_you_sure: あなたはユーザー「%{name}」に「%{role}」権限を与えようとしています。よろしいですか? + are_you_sure: ユーザー「%{name}」に「%{role}」権限を本当に与えますか? confirm: 確認 fail: ユーザー「%{name}」に「%{role}」権限を付与できませんでした。ユーザーおよび権限が両方とも正しいか確認してください。 - heading: 権限付与を確定 - title: 権限付与を確定 + heading: 権限付与の確認 + title: 権限付与の確認 revoke: - are_you_sure: あなたはユーザー「%{name}の「%{role}」権限を取り消そうとしています。よろしいですか? + are_you_sure: ユーザー「%{name}」の「%{role}」権限を本当に取り消しますか? confirm: 確認 fail: ユーザー「%{name}」の「%{role}」権限を取り消せませんでした。ユーザーおよび権限が両方とも正しいか確認してください。 - heading: 権限取り消しを確定 - title: 権限取り消しを確定 + heading: 権限取り消しの確認 + title: 権限取り消しの確認 + welcome_page: + add_a_note: + paragraph_1_html: "些細な修正だけをしたいが、サインアップしたり編集の仕方を勉強する時間がない場合は、\n簡単にメモを追加できます。" + paragraph_2_html: 地図に移動してメモアイコン()をクリックするだけです。これで地図上に印が追加され、ドラッグして移動させることができます。あなたのメッセージを追加し、保存をクリックすれば、他のマッパーが調査するでしょう。 + title: 編集する時間がないためメモを残します + basic_terms: + editor_html: エディターは、地図を編集できるプログラムやウェブサイトです。 + node_html: ノードは地図上の点です。1 軒のレストランや 1 本の樹木が該当します。 + paragraph_1_html: OpenStreetMap には独自の用語がいくつかあります。ここでは手早く、いくつかのキーワードを紹介しましょう。 + tag_html: タグはノードやウェイについて補足するデータです。レストランの名前、道路の制限速度などが該当します。 + title: マッピングのための基本的な用語 + way_html: ウェイは線または領域です。道路、水路、湖、建物などが該当します。 + introduction_html: フリーで編集可能な世界地図、OpenStreetMapへようこそ。サインアップしたので、マッピングの準備はすべて整いました。知っておかなければならない重要事項を簡単に説明します。 + questions: + paragraph_1_html: "OpenStreetMapにはプロジェクトについて学んだり、質疑応答したり、共同で議論したり、マッピングについての知識を文書化したりするさまざまなリソースがあります。\nここからヘルプを得ましょう。" + title: 何か質問はありますか? + start_mapping: マッピングを開始 + title: ようこそ! + whats_on_the_map: + off_html: 含めてはいけないものは、評価のような主観的なデータ、歴史的または仮想的なもの、著作権のある情報源からのデータです。特別な許可がない場合は、オンラインや紙の地図からコピーをしてはいけません。 + on_html: OpenStreetMapは現実かつ現存のもの――数々の建物、道路、場所に関するその他の詳細をマッピングする場所です。あなたは関心のある現実世界のものを何でもマッピングできます。 + title: 地図上にあるもの diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 53c947505ad..7f787577b39 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -61,78 +61,14 @@ ka: way_node: გზის კვანძი browse: changeset: - changeset: "ცვლილებების პაკეტი: %{id}" changesetxml: ცვლილებების პაკეტის XML - download: გადმოწერა %{changeset_xml_link}, ან %{osmchange_xml_link} feed: title: ცვლილებების პაკეტი %{id} title_comment: ცვლილებების პაკეტი %{id} - %{comment} title: ცვლილებების პაკეტი - changeset_details: - belongs_to: "ეკუთვნის:" - bounding_box: "საზღვრები:" - box: საზღვარი - closed_at: "დაკეტილია:" - created_at: "შექმნილია:" - has_nodes: - one: "შეიცავს %{count} წერტილს:" - other: "შეიცავს %{count} წერტილს:" - has_ways: - one: "შეიცავს %{count} ხაზს:" - other: "შეიცავს %{count} ხაზს:" - show_area_box: მონიშნული რეგიონის ჩვენება - common_details: - changeset_comment: "კომენტარი:" - deleted_at: "წაიშალა:" - deleted_by: "წაიშალა:" - edited_at: "დაარედაქტირა:" - edited_by: "მომხმარებელი:" - version: "ვერსია:" containing_relation: entry: ურთიერთობა %{relation_name} entry_role: ურთიერთობა %{relation_name} (როგორც %{relation_role}) - map: - deleted: წაშლილია - edit: - area: ტერიტორიის რედაქტირება - node: წერტილის რედაქტირება - relation: ურთიერთობის რედაქტირება - way: გზის რედაქტირება - larger: - area: რეგიონის ნახვა დიდი ზომის რუკაზე - node: კვანძის ნახვა დიდი ზომის რუკაზე - relation: ურთიერთობის ნახვა დიდი ზომის რუკაზე - way: გზის ნახვა დიდი ზომის რუკაზე - loading: იტვირთება... - navigation: - all: - next_changeset_tooltip: შემდეგი ცვლილებების პაკეტი - next_node_tooltip: შემდეგი კვანძი - next_relation_tooltip: შემდეგი ურთიერთობა - next_way_tooltip: შემდეგი გზა - prev_changeset_tooltip: წინა ცვლილებების პაკეტი - prev_node_tooltip: წინა კვანძი - prev_relation_tooltip: წინა ურთიერთობა - prev_way_tooltip: წინა გზა - user: - name_changeset_tooltip: "%{user} შესწორებების ხილვა" - next_changeset_tooltip: შემდეგი შესწორება %{user} - prev_changeset_tooltip: წინა შესწორება %{user} - node: - download: "%{download_xml_link}, %{view_history_link} ან %{edit_link}" - download_xml: გადმოწერა XML - edit: რედაქტირება - node: კვანძი - node_title: "კვანძი: %{node_name}" - view_history: ისტორიის ნახვა - node_details: - coordinates: "კოორდინატები:" - node_history: - download: "%{download_xml_link} ან %{view_details_link}" - download_xml: გადმოწერა XML - node_history: კვანძის ისტორია - node_history_title: "კვანძის ისტორია: %{node_name}" - view_details: ვრცლად not_found: sorry: უკაცრავად, %{type} იდენტიფიკატორით %{id}, ვერ მოიძებნა. type: @@ -140,65 +76,22 @@ ka: node: კვანძი relation: ურთიერთობა way: გზა - paging_nav: - of: დან - showing_page: გვერდის ჩვენება + note: + title: შენიშვნა redacted: type: + node: კვანძი + relation: ურთიერთობა way: გზა - relation: - download: "%{download_xml_link} ან %{view_history_link}" - download_xml: გადმოწერა XML - relation: ურთიერთობა - relation_title: "ურთიერთობა: %{relation_name}" - view_history: ისტორიის ნახვა - relation_details: - members: "წევრები:" - relation_history: - download: "%{download_xml_link} ან %{view_details_link}" - download_xml: გადმოწერა XML - relation_history: ურთიერთობის ისტორია - relation_history_title: "ურთიერთობის ისტორია: %{relation_name}" - view_details: ვრცლად relation_member: entry_role: "%{type} %{name} როგორც %{role}" type: node: კვანძი relation: ურთიერთობა way: გზა - start: - manually_select: სხვა ტერიტორიის გამოყოფა ხელით start_rjs: - data_frame_title: მონაცემები - data_layer_name: რუკის მონაცემების ნახვა - details: დეტალები - drag_a_box: რეგიონის ასარჩევად რუკაზე გაწელეთ ჩარჩო - edited_by_user_at_timestamp: შეცვალა [[user]] [[timestamp]]-ში - hide_areas: ტერიტორიების დამალვა - history_for_feature: ისტორია [[feature]]-თვის load_data: მონაცემების ატვირთვა loading: იტვირთება... - manually_select: სხვა რეგიონის გამოყოფა ხელით - object_list: - back: ობიექტების სიის გამოსახვა - details: დეტალები - heading: ობიექტების სია - history: - type: - node: კვანძი [[id]] - way: გზა [[id]] - selected: - type: - node: კვანძი [[id]] - way: გზა [[id]] - type: - node: კვანძი - way: გზა - private_user: კერძო მომხმარებელი - show_areas: ტერიტორიების ჩვენება - show_history: ისტორიის ჩვენება - wait: მოითმინეთ... - zoom_or_select: გაადიდეთ ან აირჩიეთ რეგიონი სანახავად tag_details: wikipedia_link: სტატია %{page} ვიკიპედიაში timeout: @@ -208,31 +101,10 @@ ka: node: კვანძი relation: ურთიერთობა way: გზა - way: - download: "%{download_xml_link}, %{view_history_link} ან %{edit_link}" - download_xml: გადმოწერა XML - edit: რედაქტირება - view_history: ისტორიის ნახვა - way: გზა - way_title: "გზა: %{way_name}" - way_details: - also_part_of: - one: აგრეთვე გზის ნაწილი %{related_ways} - other: აგრეთვე გზების ნაწილი %{related_ways} - nodes: "კვანძები:" - way_history: - download: "%{download_xml_link} ან %{view_details_link}" - download_xml: გადმოწერა XML - view_details: ვრცლად - way_history: გზის ისტორია - way_history_title: "გზის ისტორია: %{way_name}" changeset: changeset: anonymous: ანონიმი - big_area: (დიდი) - no_comment: (არა) no_edits: (რედაქტირება არ არის) - still_editing: (რედაქტირდება) changeset_paging_nav: next: შემდეგი → previous: ← წინა @@ -244,14 +116,6 @@ ka: saved_at: შენახულია როგორც user: მომხმარებელი list: - description: ბოლო ცვლილებები - description_user: მომხმარებელ %{user} ცვლილებათა პაკეტები - heading: ცვლილებების პაკეტი - heading_bbox: ცვლილებების პაკეტი - heading_friend: ცვლილებების პაკეტები - heading_nearby: ცვლილებების პაკეტები - heading_user: ცვლილებების პაკეტი - heading_user_bbox: ცვლილებების პაკეტი title: ცვლილებების პაკეტი diary_entry: comments: @@ -266,8 +130,9 @@ ka: hide_link: ამ კომენტარის დამალვა diary_entry: comment_count: - one: 1 კომენტარი + one: "%{count} კომენტარი" other: "%{count} კომენტარი" + zero: არ არის კომენტარი comment_link: კომენტარი confirm: დადასტურება edit_link: ჩანაწერის რედაქტირება @@ -337,16 +202,7 @@ ka: osm_xml_data: OpenStreetMap XML–ის მონაცემები output: შედეგი scale: მასშტაბი - too_large: - heading: ტერიტორია ძალიან დიდია zoom: გადიდება - start_rjs: - add_marker: რუკაზე ნიშნულის დასმა - change_marker: ნიშნულის მდებარეობის შეცვლა - click_add_marker: ნიშნულის დასასმელად დააწკაპუნეთ რუკაზე - export: ექსპორტი - manually_select: სხვა რეგიონის გამოყოფა ხელით - view_larger_map: გადიდებული რუკის ხილვა geocoder: description: title: @@ -356,8 +212,6 @@ ka: cities: ქალაქები places: ადგილები towns: დაბები - description_osm_namefinder: - prefix: "%{distance} %{direction} %{type}" direction: east: აღმოსავლეთი north: ჩრდილოეთი @@ -379,12 +233,9 @@ ka: ca_postcode: Geocoder.CA–ს შედეგები geonames: GeoNames–ის შედეგები latlon: შიდა შედეგები - osm_namefinder: OpenStreetMap Namefinder–ის შედეგები osm_nominatim: OpenStreetMap Nominatim–ის შედეგები uk_postcode: NPEMap / FreeThe Postcode–ის შედეგები us_postcode: Geocoder.us–ის შედეგები - search_osm_namefinder: - suffix_place: ", %{distance} %{direction} %{placename}–დან" search_osm_nominatim: prefix: aeroway: @@ -547,6 +398,7 @@ ka: brownfield: მიტოვებული ადგილი cemetery: სასაფლაო commercial: კომერციული ტერიტორია + conservation: კონსერვაცია construction: მშენებლობა farm: ფერმა farmland: სავარგული @@ -567,6 +419,7 @@ ka: recreation_ground: რეკრეაციული ზონა reservoir: წყალსაცავი residential: საცხოვრებელი ტერიტორია + retail: სავაჭრო ტერიტორია village_green: მწვანე სოფელი vineyard: ვენახი wetland: ჭარბტენიანი ტერიტორია @@ -700,18 +553,24 @@ ka: cosmetics: კოსმეტიკის მაღაზია electronics: ელექტროტექნიკის მაღაზია estate_agent: უძრავი ქონების აგენტი + fashion: მოდური ტანსაცმლის მაღაზია fish: თევზების მაღაზია florist: ყვავილების მაღაზია + food: საკვების მაღაზია furniture: ავეჯი gallery: გალერეა gift: საჩუქრების მაღაზია jewelry: საიუველირო მაღაზია kiosk: ჯიხური laundry: სამრეცხაო + mall: მოლი market: ბაზარი mobile_phone: მობილური ტელეფონების მაღაზია + motorcycle: მოტოციკლეტების მაღაზია music: მუსიკალური მაღაზია + newsagent: საგაზეთო ჯიხური optician: ოპტიკა + organic: ორგანული საკვების მაღაზია pet: ზოომაღაზია photo: ფოტომაღაზია salon: სალონი @@ -753,42 +612,34 @@ ka: cycle_map: ველოსიპედისტების რუკა standard: სტანდარტული transport_map: ტრანსპორტის რუკა + notes: + new: + add: შენიშვნის დამატება + show: + comment: კომენტარი + hide: დამალვა site: + createnote_tooltip: რუკაზე შენიშვნის დამატება edit_disabled_tooltip: რედაქტირებისათვის გაზარდეთ რუკის მასშტაბი edit_tooltip: რუკის რედაქტირება - edit_zoom_alert: რედაქტირებისათვის, საჭიროა რუკის მასშტაბის გაზრდა - history_disabled_tooltip: გაზარდეთ რუკის მასშტაბი, რათა შეძლოთ ამ ტერიტორიის რედაქტირებების ხილვა - history_tooltip: ამ ტერიტორიის რედაქტირებების ხილვა - history_zoom_alert: რედაქტირებების ისტორიის სანახავად საჭიროა რუკის მასშტაბის გაზრდა layouts: community: თანასაზოგადოება community_blogs: თანასაზოგადოების ბლოგები copyright: საავტორო უფლები და ლიცენზია - documentation: დოკუმენტაცია edit: რედაქტირება edit_with: რედაქტირება %{editor} export: ექსპორტი - export_tooltip: რუკის მონაცემების ექსპორტირება foundation: ფონდი foundation_title: ფონდი OpenStreetMap gps_traces: GPS გზები help: დახმარება - help_centre: დახმარების ცენტრი history: ისტორია home: სახლი - home_tooltip: საწყის მდებარეობაზე დაბრუნება - inbox: შემომავალი (%{count}) - intro_1: OpenStreetMap არის მსოფლიოს თავისუფალი რუკა, შექმნილი თქვენნაირი ადამიანების მიერ. intro_2_create_account: მომხმარებლის ანგარიშის შექმნა - intro_2_download: გადმოწერა - intro_2_license: თავისუფალი ლიცენზია - intro_2_use: გამოყენება - intro_2_use_url: http://wiki.openstreetmap.org/wiki/KA:Using_OpenStreetMap log_in: შესვლა logo: alt_text: OpenStreetMap-ის ლოგო logout: გასვლა - logout_tooltip: გასვლა make_a_donation: text: პროექტის დახმარება partners_partners: პარტნიორები @@ -797,14 +648,11 @@ ka: tag_line: თავისუფალი ვიკი-რუკა user_diaries: მომხმარებლების დღიურები user_diaries_tooltip: მომხმარებლების დღიურების ნახვა - view: იხილეთ - view_tooltip: რუკის ხილვა - welcome_user: კეთილი იყოს თქვენი მობრძანება, %{user_link} - welcome_user_link_tooltip: თქვენი მომხმარებლის გვერდი - wiki: ვიკი license_page: foreign: english_link: ინგლისური ორიგინალი + legal_babble: + title_html: საავტორო უფლებები და ლიცენზია native: mapping_link: კარტოგრაფირების დაწყება native_link: ქართული ვერსია @@ -863,12 +711,8 @@ ka: title: გაგზავნილი to: ვის read: - back_to_inbox: მიღებულებში დაბრუნება - back_to_outbox: გაგზავნილებში დაბრუნება date: თარიღი from: გამომგზავნი - reading_your_messages: შეტყობინებების წაკითხვა - reading_your_sent_messages: გაგზავნილი შეტყობინებების წაკითხვა reply_button: პასუხი subject: თემა title: შეტყობინების წაკითხვა @@ -879,6 +723,18 @@ ka: wrong_user: თქვენ შეხვედით როგორც `%{user}' მაგრამ პასუხი თქვენ კითხვაზე არ გაიგზავნა ამ მომხმარებელთან. გთხოვთ, შეხვიდეთ, როგორც შესაბამისი მოთხოვნის გამკეთებელი მომხმარებელი, რათა იხილოთ პასუხი. sent_message_summary: delete_button: წაშლა + note: + description: + commented_at_by_html: განაახლა %{when} წინ მომხმარებელმა %{user} + commented_at_html: განახლდა %{when} წინ + opened_at_by_html: შექმნა %{when} წინ მომხმარებელმა %{user} + opened_at_html: შეიქმნა %{when} წინ + entry: + comment: კომენტარი + mine: + ago_html: "%{when} წინ" + creator: შემქმნელი + description: აღწერა notifier: diary_comment_notification: hi: გამარჯობა %{to_user}, @@ -899,14 +755,12 @@ ka: greeting: გამარჯობა, message_notification: hi: გამარჯობა %{to_user}, + note_comment_notification: + anonymous: ანონიმური მომხმარებელი + greeting: გამარჯობა, signup_confirm: - subject: "[OpenStreetMap] დაადასტურეთ ელ.ფოსტის მისამართი" - signup_confirm_html: - greeting: გამარჯობა! - more_videos: აქ არის %{more_videos_link}. - more_videos_here: მეტი ვიდეო აქ - signup_confirm_plain: greeting: გამარჯობა! + subject: "[OpenStreetMap] მოგესალმებით OpenStreetMap-ში" oauth: oauthorize: allow_write_api: რუკის შეცვლა. @@ -918,6 +772,7 @@ ka: name: სახელი required: სავალდებულოა index: + application: აპლიკაციის სახელი revoke: განბლოკვა! new: submit: რეგისტრაცია @@ -928,21 +783,20 @@ ka: redaction: edit: description: აღწერა + new: + description: აღწერა show: + confirm: დარწმუნებული ხართ? description: "აღწერა:" user: "შემქმნელი:" site: edit: user_page_link: მომხმარებლის გვერდი index: - license: - license_name: Creative Commons Attribution-Share Alike 2.0 - project_name: პროექტი OpenStreetMap + createnote: შენიშვნის დამატება permalink: მუდმივი ბმული shortlink: მოკლე ბმული key: - map_key: პირობითი აღნიშვნები - map_key_tooltip: რუკის ლეგენდა table: entry: admin: ადმინისტრაციული საზღვარი @@ -997,9 +851,11 @@ ka: second: მეორე ელემენტი text: ტექსტი url: URL + richtext_area: + edit: რედაქტირება + preview: წინასწარი გადახედვა search: search: ძიება - search_help: "მაგალითები: 'ახმეტა', 'რუსთაველის გამზირი, თბილისი', 'გორის ჰოსპიტალი', ან 'მანავის ციხე' მეტი მაგალითი..." submit_text: Ok where_am_i: სად ვარ მე? sidebar: @@ -1045,9 +901,7 @@ ka: visibility: "ხილვადობა:" visibility_help: ეს რას ნიშნავს? trace_paging_nav: - next: შემდეგი » - previous: « წინა - showing_page: ნაჩვენებია გვერდი %{page} + showing_page: გვერდი %{page} view: description: "აღწერა:" download: გადმოწერა @@ -1066,6 +920,8 @@ ka: contributor terms: link text: რა არის ეს? current email address: "ელ-ფოსტის ამჟამინდელი მისამართი:" + gravatar: + link text: ეს რა არის? home location: "ჩემი ადგილსამყოფელი:" image: "სურათი:" latitude: "განედი:" @@ -1135,13 +991,16 @@ ka: email address: "ელ. ფოსტის მისამართი:" heading: დაგავიწყდათ პაროლი? title: პაროლის აღდგენა + make_friend: + button: მეგობრებში დამატება + heading: დავამატო %{user} მეგობრებში? + success: "%{name} ახლა უკვე თქვენი მეგობარია!" new: confirm email address: "ელ. ფოსტის მისამართის დადასტურება:" confirm password: "პაროლის დადასტურება:" continue: გაგრძელება display name: "სახელი ეკრანზე:" email address: "ელ. ფოსტის მისამართი:" - heading: მომხმარებლის ანგარიშის შექმნა openid: "%{logo} OpenID:" password: "პაროლი:" title: ანგარიშის შექმნა @@ -1150,6 +1009,9 @@ ka: popup: friend: მეგობარი your location: თქვენი ადგილმდებარეობა + remove_friend: + button: მეგობრებიდან წაშლა + heading: წავშალო მეგობრებიდან %{user}? reset_password: confirm password: "პაროლის დადასტურება:" flash changed: თქვენი პაროლი შეიცვალა. @@ -1167,7 +1029,7 @@ ka: legale_select: "გთხოვთ, აირჩიეთ თქვენი ქვეყანა:" view: activate_user: ამ მომხმარებლის აქტივაცია - add as friend: დაამატე მეგობარი + add as friend: მეგობრებში დამატება comments: კომენტარები confirm: დადასტურება confirm_user: ამ მომხმარებლის დადასტურება @@ -1231,11 +1093,14 @@ ka: creator_name: შემქმნელი display_name: დაბლოკილი მომხმარებელი edit: რედაქტირება + next: შემდეგი » not_revoked: (არ არის განბლოკილი) + previous: « წინა reason: დაბლოკვის მიზეზი revoke: განბლოკვა! revoker_name: განბლოკილია show: ჩვენება + showing_page: გვერდი %{page} status: სტატუსი period: one: 1 საათი diff --git a/config/locales/km.yml b/config/locales/km.yml index e064a943f0c..3741759a730 100644 --- a/config/locales/km.yml +++ b/config/locales/km.yml @@ -139,18 +139,18 @@ km: start_rjs: data_frame_title: ទិន្នន័យ​ data_layer_name: ទិន្នន័យ​ - edited_by_user_at_timestamp: បានកែប្រែដោយ [[user]] នៅ [[timestamp]] - history_for_feature: ប្រវត្តិ​សម្រាប់ [[feature]] + edited_by_user_at_timestamp: បានកែប្រែដោយ %{user} នៅ %{timestamp} + history_for_feature: ប្រវត្តិ​សម្រាប់ %{feature} load_data: ផ្ទុកទិន្នន័យ​ loading: កំពុងផ្ទុក​... object_list: details: ព័ត៌មានលម្អិត​ history: type: - way: ផ្លូវ​ [[id]] + way: ផ្លូវ​ %{id} selected: type: - way: ផ្លូវ​ [[id]] + way: ផ្លូវ​ %{id} type: way: ផ្លូវ​ private_user: អ្នកប្រើប្រាស់​ឯកជន​ diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 15043951188..ff71c9f74b2 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1,13 +1,31 @@ # Messages for Korean (한국어) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: B891202 # Author: Freebiekr +# Author: Hym411 +# Author: Kwj2772 +# Author: Priviet +# Author: Stleamist # Author: Wrightbus +# Author: 아라 ko: + about_page: + community_driven_html: "OpenStreetMap의 공동체는 다양하고, 열정적이며, 매일 자라고 있습니다.\n우리의 기여자는 열광하는 매퍼, GIS 전문가, OSM 서버를 실행하는 기술자,\n재해 피해를 입은 지역을 매핑하는 인도주의자, 그리고 더 많은 기여자를\n포함합니다.\n공동체에 대해 더 알아보려면, 사용자 일기,\n공동체 블로그와, OSM 재단 웹사이트를 참고하세요." + community_driven_title: 공동체 주도 + copyright_html: ©OpenStreetMap
    기여자 + lede_text: "OpenStreetMap은 전 세계에 걸쳐, 도로, 산책로, 카페, 기차역과 훨씬 많은 데이터를\n기여하고 유지하는 매퍼 공동체에 의해 구축됩니다." + local_knowledge_html: "OpenStreetMap은 지역 지식을 강조합니다. 기여자는 OSM이 정확하고\n최신으로 검증하기 위해 항공 영상, GPS 장치와, 낮은 기술 분야 지도를\n사용합니다." + local_knowledge_title: 지역 지식 + next: 다음 + open_data_html: "OpenStreetMap은 오픈 데이터입니다: OpenStreetMap과 기여자를 제작진으로\n어떤 목적으로도 자유롭게 사용할 수 있습니다. 특정 방법으로 바꾸거나\n데이터에 빌드한다면, 동일한 라이선스에 따라 결과를 배포할 수 있습니다.\n자세한 내용은 저작권 및 라이선스 페이지를\n참고하세요." + open_data_title: 오픈 데이터 + partners_title: 파트너 + used_by: "%{name}은 수 많은 웹 사이트, 모바일 앱과 하드웨어 장치에 지도 데이터를 공급합니다" activerecord: attributes: diary_comment: - body: 내용 + body: 본문 diary_entry: language: 언어 latitude: 위도 @@ -18,7 +36,7 @@ ko: friend: 친구 user: 사용자 message: - body: 내용 + body: 본문 recipient: 받는 사람 sender: 보낸 사람 title: 제목 @@ -34,327 +52,1913 @@ ko: user: active: 활성 description: 설명 - display_name: 표시 이름 - email: 전자 우편 + display_name: 보여줄 이름 + email: 이메일 languages: 언어 - pass_crypt: 암호 + pass_crypt: 비밀번호 models: - acl: 접근 조절 목록 - changeset: 변경세트 - changeset_tag: 변경세트 태그 + acl: 통행 제한 목록 + changeset: 바뀜집합 + changeset_tag: 바뀜집합 태그 country: 국가 - diary_comment: 일지 댓글 - diary_entry: 일지 항목 + diary_comment: 일기 덧글 + diary_entry: 일기 항목 friend: 친구 language: 언어 - message: 쪽지 + message: 메시지 node: 노드 node_tag: 노드 태그 notifier: 알림자 - old_node: 옛 노드 - old_node_tag: 옛 노드 태그 - old_relation: 옛 관계 - old_relation_member: 옛 관계 멤버 - old_relation_tag: 옛 관계 태그 + old_node: 이전 노드 + old_node_tag: 이전 노드 태그 + old_relation: 이전 관계 + old_relation_member: 이전 관계 구성원 + old_relation_tag: 이전 관계 태그 + old_way: 이전 길 + old_way_node: 이전 길 노드 + old_way_tag: 이전 길 태그 relation: 관계 - relation_member: 관계 멤버 + relation_member: 관계 구성원 relation_tag: 관계 태그 session: 세션 - trace: 발자취 - tracepoint: 발자취 지점 - tracetag: 발자취 태그 + trace: 추적 + tracepoint: 추적 지점 + tracetag: 추적 태그 user: 사용자 - user_preference: 사용자 환경 + user_preference: 사용자 환경 설정 user_token: 사용자 토큰 way: 길 - way_node: 길노드 - way_tag: 길태그 + way_node: 길 노드 + way_tag: 길 태그 + application: + require_cookies: + cookies_needed: 쿠키를 비활성화한 것으로 보입니다 - 계속하기 전에 브라우저에서 쿠키를 활성화하세요. + require_moderator: + not_a_moderator: 해당 동작을 수행하려면 운영자 권한이 필요합니다. + setup_user_auth: + blocked: API에 대한 접근을 차단했습니다. 자세한 내용을 알아보려면 웹 인터페이스에 로그인하세요. + need_to_see_terms: API에 대한 접근을 일시적으로 중지했습니다. 기여자 약관을 보려면 웹 인터페이스에 로그인하세요. 기여자 약관에 동의 할 필요는 없습니다만 기여자 약관을 보아야 합니다. browse: + anonymous: 익명 changeset: - changeset: "변경셋: %{id}" - changesetxml: 변경셋 XML - download: 내려받기 %{changeset_xml_link} 혹은 %{osmchange_xml_link} - title: 변경셋 - changeset_details: - belongs_to: "소속:" - bounding_box: "경계:" - closed_at: "종료일:" - created_at: "생성일:" - has_nodes: "는(은) 다음 %{count} 개의 노드를 가지고 있습니다:" - has_relations: "는(은) 다음 %{count} 개의 관계를 가지고 있습니다:" - has_ways: "는(은) 다음 %{count} 개의 길을 가지고 있습니다:" - no_bounding_box: 이 변경셋을 위해 저장된 경계가 없습니다. - show_area_box: 영역 표시 - common_details: - edited_at: "편집일:" - edited_by: "편집자:" - version: "버젼:" + belongs_to: 저자 + changesetxml: 바뀜집합 XML + feed: + title: 바뀜집합 %{id} + title_comment: 바뀜집합 %{id} - %{comment} + node: 노드 (%{count}) + node_paginated: 노드 (%{count} 중 %{x}-%{y}) + osmchangexml: osm바뀜 XML + relation: 관계 (%{count}) + relation_paginated: 관계 (%{count} 중 %{x}-%{y}) + title: "바뀜집합: %{id}" + way: 길 (%{count}) + way_paginated: 길 (%{count} 중 %{x}-%{y}) + closed: 닫힘 + closed_by_html: %{time} 전에 %{user} 사용자가 닫음 + closed_html: %{time} 전에 닫힘 containing_relation: entry: 관계 %{relation_name} - entry_role: 관계 %{relation_name} (as %{relation_role}) - map: - deleted: 삭제됨 - loading: 불러 오는 중... + entry_role: (%{relation_role}로서) 관계 %{relation_name} + created: 만들어짐 + created_by_html: %{time} 전에 %{user} 사용자가 만듦 + created_html: %{time} 전에 만들어짐 + deleted_by_html: %{time} 전에 %{user} 사용자가 삭제함 + download_xml: XML 다운로드 + edited_by_html: %{time} 전에 %{user} 사용자가 편집함 + in_changeset: 바뀜집합 + location: "위치:" + no_comment: (덧글 없음) node: - download: "%{download_xml_link} or %{view_history_link}" - download_xml: XML 내려받기 - node: 노드 - node_title: "노드: %{node_name}" - view_history: 이력 보기 - node_details: - coordinates: "좌표:" - node_history: - download_xml: XML 내려받기 - node_history: 노드 이력 - view_details: 세부 사항 표시 + history_title: "노드 역사: %{name}" + title: "노드: %{name}" not_found: - sorry: 죄송합니다. %{id}인 %{type}를 발견하지 못 했습니다. + sorry: "죄송하지만, %{type} #%{id}(을)를 찾지 못했습니다." + type: + changeset: 바뀜집합 + node: 노드 + relation: 관계 + way: 길 + note: + closed_by: "%{user} 사용자가 %{when} 전에 해결함" + closed_by_anonymous: 익명이 %{when} 전에 해결함 + closed_title: "해결된 참고 #%{note_name}" + commented_by: "%{user} 사용자가 %{when} 전에 덧글을 남김" + commented_by_anonymous: 익명이 %{when} 전에 덧글을 남김 + hidden_by: "%{user} 사용자가 %{when} 전에 숨김" + hidden_title: "숨겨진 참고 #%{note_name}" + new_note: 새 참고 + open_by: "%{user} 사용자가 %{when} 전에 만듦" + open_by_anonymous: 익명이 %{when} 전에 만듦 + open_title: "해결되지 않은 참고 #%{note_name}" + reopened_by: "%{user} 사용자가 %{when} 전에 다시 활성화함" + reopened_by_anonymous: 익명이 %{when} 전에 다시 활성화함 + title: "참고: %{id}" + part_of: "다음의 부분:" + redacted: + message_html: 이 %{type}의 %{version} 판은 수정한 판으로 볼 수 없습니다. 자세한 내용은 %{redaction_link}(을)를 참고하세요. + redaction: 개정 %{id} type: node: 노드 relation: 관계 way: 길 relation: - download_xml: XML 내려받기 - relation: 관계 - relation_title: "관계: %{relation_name}" - view_history: 이력 보기 - relation_history: - relation_history: 관계 이력 - relation_history_title: "관계 이력: %{relation_name}" - start: - manually_select: 다른 지역 수동 선택 - view_data: 현재 지도 표기로 정보 보기 + history_title: "관계 역사: %{name}" + members: 구성원 + title: "관계: %{name}" + relation_member: + entry_role: "%{type}에서 %{role}의 %{name}" + type: + node: 노드 + relation: 관계 + way: 길 start_rjs: - details: 세부 사항 - drag_a_box: 지역을 보기 위해 지도로 끌어 놓으세요. - edited_by_user_at_timestamp: "[[timestamp]]에 [[user]]가 수정" - history_for_feature: "[[feature]]의 이력" - load_data: 정보 불러 오기 - loaded_an_area_with_num_features: 당신은 [[num_features]] 개의 특성을 가진 지역을 로드하였습니다. 경우에 따라, 어떤 브라우저에서는 이 데이터를 모두 처리하지 못 할 수도 있습니다. 일반적으로, 브라우저들은 대게 100개 이하의 특성을 처리하여 보여줄 수 있습니다. 그렇지 않은 경우, 브라우저의 속도가 저하되거나 브라우저의 반응이 느려질 수 있습니다. 여전히 이 데이터를 표시하려면, 아래의 버튼을 클릭하여 주십시오. - loading: 불러 오는 중... - manually_select: 다른 지역 선택 - object_list: - api: API로부터 이 지역 회수 - back: 개체 목록 표시 - details: 세부 사항 - heading: 개체 목록 - history: - type: - node: 노드 [[id]] - way: 길 [[id]] - selected: - type: - node: 노드 [[id]] - way: 길 [[id]] - type: - node: 노드 - way: 길 - private_user: 개인 유저 - show_history: 이력 보기 - unable_to_load_size: "불러 오기 실패: 표시하려는 지역([[bbox_size]])의 설정 박스가 너무 큽니다. %{max_bbox_size}까지 표시할 수 있습니다." - wait: 잠시만 기다려 주세요... - zoom_or_select: 확대 또는 보고 싶은 지도의 지역을 선택하세요 + feature_warning: 기능 %{num_features}개를 불러오고 있으며, 브라우저가 느려지거나 응답하지 않을 수 있습니다. 이 데이터를 보여줄까요? + load_data: 데이터 불러오기 + loading: 불러오는 중... tag_details: - tags: "태그들:" + tags: 태그 + wiki_link: + key: "%{key} 태그에 대한 위키 설명 문서" + tag: "%{key}=%{value} 태그에 대한 위키 설명 문서" + wikipedia_link: 위키백과의 %{page} 문서 + timeout: + sorry: 죄송합니다, %{id} id와 %{type}에 대한 데이터를 얻는데 너무 오래 걸립니다. + type: + changeset: 바뀜집합 + node: 노드 + relation: 관계 + way: 길 + version: 판 + view_details: 자세한 내용 보기 + view_history: 역사 보기 way: - download: "%{download_xml_link} or %{view_history_link}" - download_xml: XML 내려받기 - view_history: 이력 보기 - way: 길 - way_title: "길이력: %{way_name}" - way_details: also_part_of: - one: "%{related_ways}의 일부" - other: "%{related_ways}의 일부" - nodes: "노드:" - part_of: "포함되는 길:" - way_history: - download_xml: XML 내려받기 - view_details: 세부 사항 표시 - way_history: 길 이력 - way_history_title: "길 이력: %{way_name}" + one: "%{related_ways} 길의 부분" + other: "%{related_ways} 길의 부분" + history_title: "길 역사: %{name}" + nodes: 노드 + title: "길: %{name}" changeset: changeset: anonymous: 익명 - big_area: (큰 지역) - no_comment: (없음) - no_edits: (수정 없음) - show_area_box: 지역 박스 보기 - still_editing: (현재 수정 중) - view_changeset_details: 변경셋 세부 사항 보기 + no_edits: (편집 없음) + view_changeset_details: 바뀜집합 자세한 사항 보기 + changeset_paging_nav: + next: 다음 » + previous: « 이전 + showing_page: 페이지 %{page} changesets: area: 지역 comment: 설명 + id: ID saved_at: 저장 시간 user: 사용자 + list: + empty: 찾은 바뀜집합이 없습니다. + empty_area: 이 지역에 바뀜집합이 없습니다. + empty_user: 이 사용자의 바뀜집합이 없습니다. + load_more: 더 불러오기 + no_more: 찾은 바뀜집합이 더 없습니다. + no_more_area: 이 지역에서 바뀜집합이 더 없습니다. + no_more_user: 이 사용자의 바뀜집합이 더 없습니다. + title: 바뀜집합 + title_friend: 내 친구의 바뀜집합 + title_nearby: 근처 사용자의 바뀜집합 + title_user: "%{user} 사용자의 바뀜집합" + timeout: + sorry: 죄송합니다, 요청하는 바뀜집합 목록을 얻는데 너무 오래 걸립니다. diary_entry: + comments: + ago: "%{ago} 전" + comment: 덧글 + has_commented_on: "%{display_name} 사용자가 다음 일기 항목에 덧글을 남겼습니다" + newer_comments: 새 덧글 + older_comments: 이전 덧글 + post: 게시물 + when: 날짜 diary_comment: - hide_link: 이 댓글 숨기기 + comment_from: "%{comment_created_at}에 %{link_user}에 대한 덧글" + confirm: 확인 + hide_link: 이 덧글 숨기기 diary_entry: comment_count: - one: 댓글 한 개 - other: 댓글 %{count} 개 - comment_link: 이 항목에 댓글 남기기 + one: 덧글 %{count}개 + other: 덧글 %{count}개 + zero: 덧글 없음 + comment_link: 이 항목에 덧글 남기기 + confirm: 확인 edit_link: 이 항목 수정 + hide_link: 이 항목 숨기기 + posted_by: "%{link_user} 사용자가 %{language_link}로 %{created}에 게시함" reply_link: 이 항목에 답변하기 edit: - body: "내용:" + body: "본문:" language: "언어:" latitude: "위도:" location: "위치:" longitude: "경도:" - marker_text: 일지 항목 위치 + marker_text: 일기 항목 위치 save_button: 저장 subject: "제목:" - title: 일지 항목 수정 + title: 일기 항목 수정 use_map_link: 지도 사용 + feed: + all: + description: OpenStreetMap의 사용자의 최근 일기 항목 + title: OpenStreetMap 일기 항목 + language: + description: "%{language_name}로 된 OpenStreetMap 최근 일기 항목" + title: "%{language_name}의 OpenStreetMap 일기 항목" + user: + description: "%{user} 사용자의 최근 OpenStreetMap 일기 항목" + title: "%{user} 사용자에 대한 OpenStreetMap 일기 항목" list: - in_language_title: "%{language} 일지 항목" - new: 새 일지 항목 - newer_entries: 다음 항목들 - older_entries: 이전 항목들 - title: 사용자 일지 - user_title: "%{user} 일지" + in_language_title: "%{language}의 일기 항목" + new: 새 일기 항목 + new_title: 사용자 일기에 새 항목 작성 + newer_entries: 다음 항목 + no_entries: 일기 항목이 없습니다 + older_entries: 이전 항목 + recent_entries: 최근 일기 항목 + title: 사용자의 일기 + title_friends: 친구의 일기 + title_nearby: 근처 사용자의 일기 + user_title: "%{user}의 일기" + location: + edit: 편집 + location: "위치:" + view: 보기 new: - title: 새 일지 항목 + title: 새 일기 항목 + no_such_entry: + body: 죄송합니다, %{id} id로 된 일기 항목이나 덧글이 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요. + heading: "id에 항목 없음: %{id}" + title: 이러한 일기 항목이 없음 view: - leave_a_comment: 댓들 남기기 + leave_a_comment: 덧글 남기기 login: 로그인 - login_to_leave_a_comment: 댓글을 남기려면 로그인해야 합니다. %{login_link} + login_to_leave_a_comment: 덧글을 남기려면 로그인해야 합니다. %{login_link} save_button: 저장 - title: 사용자 일지 | %{user} - user_title: "%{user} 일지" + title: "%{user}의 일기 | %{title}" + user_title: "%{user}의 일기" + editor: + default: 기본 값 (현재 %{name}) + id: + description: iD (브라우저 내 편집기) + name: iD + potlatch: + description: Potlatch 1 (브라우저 내 편집기) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (브라우저 내 편집기) + name: Potlatch 2 + remote: + description: 원격 제어 (JOSM 또는 Merkaartor) + name: 원격 제어 export: start: - area_to_export: 지역 추출 - export_button: 추출 - export_details: OpenStreetMap의 정보는 Creative Commons Attribution-ShareAlike 2.0 license 에 의거합니다.. - format: 포맷 - format_to_export: 추출 포맷 + add_marker: 지도에 표시 추가 + area_to_export: 지역 내보내기 + embeddable_html: 내장된 HTML + export_button: 내보내기 + export_details: OpenStreetMap 데이터는 오픈 데이터 커먼즈 오픈 데이터베이스 라이선스(ODbL)에 따라 사용할 수 있습니다. + format: 형식 + format_to_export: 내보내기 형식 image_size: 이미지 크기 latitude: "위도:" - licence: 라이센스 + licence: 라이선스 longitude: "경도:" manually_select: 다른 지역 선택 + map_image: 지도 그림 (표준 레이어 보이기) max: 최대 - options: 선택사항 + options: 설정 + osm_xml_data: OpenStreetMap XML 데이터 output: 출력 + paste_html: HTML을 붙여 넣어 웹사이트에 포함시키세요 scale: 축척 - zoom: 줌 - start_rjs: - export: 추출 - manually_select: 다른 지역 선택 - view_larger_map: 큰 지도 보기 + too_large: + advice: "위의 내보내기가 실패하면, 아래에 나열된 원본 중 하나를 사용하는 것을 고려해주세요:" + body: "이 지역은 OpenStreetMap XML 데이터로 내보내는 데 너무 넓습니다. 확대하거나 작은 지역을 선택하거나, 대량 데이터 다운로드에 대한 다음 소스 중 하나를 사용하세요:" + geofabrik: + description: 대륙, 국가 및 선택한 도시가 정기적으로 업데이트되는 추출본 + title: Geofabrik 다운로드 + metro: + description: 세계 주요 도시와 그 주변 지역에 대한 추출본 + title: 대도시 추출본 + other: + description: OpenStreetMap 위키에 나와있는 추가 원본 + title: 다른 원본 + overpass: + description: OpenStreetMap 데이터베이스의 미러에서 이 테두리 상자를 다운로드 + title: Overpass API + planet: + description: 완전한 OpenStreetMap 데이터베이스가 정기적으로 업데이트되는 복사본 + title: 플래닛 OSM + zoom: 확대 + title: 내보내기 + fixthemap: + how_to_help: + title: 돕는 방법 + title: 문제 보고/지도 수정 geocoder: + description: + title: + geonames: GeoNames에서의 위치 + osm_nominatim: OpenStreetMap Nominatim에서의 위치 + types: + cities: 도시 + places: 장소 + towns: 마을 + direction: + east: 동 + north: 북 + north_east: 북동 + north_west: 북서 + south: 남 + south_east: 남동 + south_west: 남서 + west: 서 + distance: + one: 다음 1km + other: 다음 %{count}km + zero: 1km보다 가까움 + results: + more_results: 더 많은 결과 보기 + no_results: 결과가 없습니다 + search: + title: + ca_postcode: Geocoder.CA에서의 결과 + geonames: GeoNames에서의 결과 + geonames_reverse: GeoNames에서의 결과 + latlon: 내부 결과 + osm_nominatim: OpenStreetMap Nominatim에서의 결과 + osm_nominatim_reverse: OpenStreetMap Nominatim에서의 결과 + uk_postcode: NPEMap / FreeThe Postcode에서의 결과 + us_postcode: Geocoder.us에서의 결과 search_osm_nominatim: + admin_levels: + level10: 교외 경계 + level2: 국가 경계 + level4: 주 경계 + level5: 지역 경계 + level6: 군 경계 + level8: 시 경계 + level9: 마을 경계 prefix: + aerialway: + chair_lift: 체어 리프트 + drag_lift: 드래그 리프트 + station: 삭도장 + aeroway: + aerodrome: 비행장 + apron: 에이프런 + gate: 문 + helipad: 헬기 착륙장 + runway: 활주로 + taxiway: 유도로 + terminal: 터미널 amenity: + WLAN: 와이파이 액세스 + airport: 공항 + arts_centre: 예술 회관 + artwork: 예술 작품 + atm: ATM + auditorium: 강당 + bank: 은행 + bar: 주점 + bbq: BBQ + bench: 벤치 + bicycle_parking: 자전거 주차장 + bicycle_rental: 자전거 대여 + biergarten: 비어 가든 + brothel: 매음굴 + bureau_de_change: 환전소 + bus_station: 버스 정류장 + cafe: 카페 + car_rental: 자동차 대여 + car_sharing: 카 셰어링 + car_wash: 세차장 + casino: 카지노 + charging_station: 충전 스테이션 + cinema: 영화관 + clinic: 진료소 + club: 클럽 + college: 전문대학 + community_centre: 커뮤니티 센터 + courthouse: 법원 + crematorium: 화장장 + dentist: 치과 + doctors: 의원 + dormitory: 기숙사 + drinking_water: 식수 + driving_school: 운전 학교 + embassy: 대사관 + emergency_phone: 긴급 전화 + fast_food: 패스트 푸드 + ferry_terminal: 페리 부두 + fire_hydrant: 소화전 + fire_station: 소방서 + food_court: 푸드코트 + fountain: 분수대 + fuel: 주유소 + grave_yard: 묘지 + gym: 피트니스 센터 / 체육관 + hall: 홀 + health_centre: 보건소 + hospital: 병원 + hotel: 호텔 + hunting_stand: 사냥 스탠드 + ice_cream: 아이스크림 + kindergarten: 유치원 + library: 도서관 + market: 시장 + marketplace: 시장 + mountain_rescue: 산악 구조대 + nightclub: 나이트 클럽 + nursery: 보육원 + nursing_home: 복지관 + office: 사무실 + park: 공원 + parking: 주차장 + pharmacy: 약국 + place_of_worship: 예배당 + police: 경찰서 + post_box: 우체통 + post_office: 우체국 + preschool: 유치원 + prison: 교도소 + pub: 술집 + public_building: 공공 건물 + public_market: 공공 시장 + reception_area: 리셉션 지역 + recycling: 재활용장 + restaurant: 음식점 + retirement_home: 노인정 + sauna: 사우나 + school: 학교 + shelter: 쉼터 + shop: 상점 + shopping: 상점 + shower: 샤워 + social_centre: 사회 센터 + social_club: 사교 클럽 + social_facility: 공공 시설 + studio: 스튜디오 + supermarket: 슈퍼마켓 + swimming_pool: 수영장 + taxi: 택시 정류장 + telephone: 공중 전화 + theatre: 극장 + toilets: 화장실 + townhall: 마을 회관 + university: 대학교 + vending_machine: 자동 판매기 + veterinary: 동물병원 + village_hall: 주민센터 + waste_basket: 쓰레기통 + wifi: 와이파이 액세스 + youth_centre: 청소년 센터 + boundary: + administrative: 행정 구역 경계 + census: 국세 조사 경계 + national_park: 국립 공원 + protected_area: 보호 구역 + bridge: + aqueduct: 수도교 + suspension: 현수교 + swing: 선회교 + viaduct: 고가 다리 + "yes": 다리 + building: + "yes": 건물 + emergency: fire_hydrant: 소화전 + phone: 긴급 전화 + highway: + bridleway: 승마로 + bus_guideway: 가이드 버스 차선 + bus_stop: 버스 정류장 + byway: 옆길 + construction: 건설 중인 고속도로 + cycleway: 자전거 경로 + emergency_access_point: 긴급 접근 지점 + footway: 보도 + ford: 여울 + living_street: 주택가 + milestone: 이정표 + minor: 보조 도로 + motorway: 고속도로 + motorway_junction: 고속도로 교차점 + motorway_link: 고속도로 + path: 경로 + pedestrian: 보행자 길 + platform: 플랫폼 + primary: 주요 도로 + primary_link: 주요 도로 + proposed: 제안 도로 + raceway: 경마장 + residential: 주택 + rest_area: 휴게소 + road: 도로 + secondary: 보조 도로 + secondary_link: 보조 도로 + service: 취부 도로 + services: 고속도로 휴게소 + speed_camera: 속도 카메라 + steps: 계단 + stile: 회전식 문 + street_lamp: 가로등 + tertiary: 3차 도로 + tertiary_link: 3차 도로 + track: 추적 + trail: 샛길 + trunk: 간선 도로 + trunk_link: 간선 도로 + unclassified: 분류하지 않은 도로 + unsurfaced: 비포장 도로 + historic: + archaeological_site: 고고학장 + battlefield: 전쟁터 + boundary_stone: 경계석 + building: 건물 + castle: 성 + church: 교회 + citywalls: 성벽 + fort: 성채 + house: 주택 + icon: 아이콘 + manor: 장원 + memorial: 기념관 + mine: 광산 + monument: 기념물 + museum: 박물관 + ruins: 유적 + tomb: 무덤 + tower: 탑 + wayside_cross: 도로변의 십자가 + wayside_shrine: 길가의 신사 + wreck: 난파선 + landuse: + allotments: 텃밭 + basin: 분지 + brownfield: 재개발지역 + cemetery: 묘지 + commercial: 상업 지역 + conservation: 보존 + construction: 공사중 + farm: 농장 + farmland: 농토 + farmyard: 농지 + forest: 숲 + garages: 차고 + grass: 잔디 + greenfield: 미개발지역 + industrial: 산업 지역 + landfill: 매립지 + meadow: 목초지 + military: 군사지 + mine: 광산 + nature_reserve: 자연 보호구 + orchard: 과수원 + park: 공원 + piste: 스키 활강 코스 + quarry: 채석장 + railway: 철도 + recreation_ground: 놀이 공원 + reservoir: 저수지 + reservoir_watershed: 저수지 유역 + residential: 주거 지역 + retail: 소매점 + road: 도로 지역 + village_green: 녹색 마을 + vineyard: 포도밭 + wetland: 습지 + wood: 산림 + leisure: + beach_resort: 해수욕장 + bird_hide: 조류 관찰지 + common: 공유지 + fishing: 낚시터 + fitness_station: 피트니스 스테이션 + garden: 정원 + golf_course: 골프장 + ice_rink: 아이스링크 + marina: 마리나 + miniature_golf: 미니어처 골프 + nature_reserve: 자연 보호구 + park: 공원 + pitch: 운동장 + playground: 놀이터 + recreation_ground: 놀이 공원 + sauna: 사우나 + slipway: 슬립 웨이 + sports_centre: 스포츠 센터 + stadium: 경기장 + swimming_pool: 수영장 + track: 육상 트랙 + water_park: 워터파크 + military: + airfield: 군용 비행장 + barracks: 막사 + bunker: 벙커 + mountain_pass: + "yes": 산길 + natural: + bay: 만 + beach: 해변 + cape: 곶 + cave_entrance: 동굴 입구 + channel: 수로 + cliff: 절벽 + crater: 크레이터 + dune: 모래 언덕 + feature: 지물 + fell: 황야 + fjord: 피요르드 + forest: 숲 + geyser: 간헐천 + glacier: 빙하 + heath: 황무지 + hill: 언덕 + island: 섬 + land: 토지 + marsh: 습지 + moor: 습지 + mud: 진흙 + peak: 산정상 + point: 지점 + reef: 암초 + ridge: 산등성이 + river: 강 + rock: 바위 + scree: 급사면 + scrub: 우거진 숲 + shoal: 얕은 곳 + spring: 온천 + stone: 암석 + strait: 해협 + tree: 나무 + valley: 골짜기 + volcano: 화산 + water: 물 + wetland: 습지 + wetlands: 습지 + wood: 산림 + office: + accountant: 회계 사무소 + architect: 건축사 + company: 회사 + employment_agency: 직업 소개소 + estate_agent: 부동산 중개 + government: 관청 + insurance: 보험 사무소 + lawyer: 변호사 사무실 + ngo: NGO 사무실 + telecommunication: 통신 사무실 + travel_agent: 여행사 + "yes": 사무실 place: airport: 공항 + city: 시 + country: 국가 + county: 군 + farm: 농장 + hamlet: 작은 마을 + house: 주택 + houses: 주택 + island: 섬 + islet: 작은 섬 + isolated_dwelling: 독립 주택 + locality: 지역 + moor: 습지 + municipality: 시정촌 + neighbourhood: 인근 지역 + postcode: 우편 번호 + region: 지역 + sea: 바다 + state: 시/도/주 + subdivision: 구분 + suburb: 교외 + town: 마을 + unincorporated_area: 비법인 지역 + village: 마을 + railway: + abandoned: 폐지된 철도 + construction: 건설 중인 철도 + disused: 폐선된 철도 + disused_station: 폐선된 철도역 + funicular: 케이블 카 + halt: 기차 정지 + historic_station: 역사적인 철도역 + junction: 철도 분기점 + level_crossing: 건널목 + light_rail: 경전철 + miniature: 미니어처 철도 + monorail: 모노레일 + narrow_gauge: 협궤 철도 + platform: 철도 플랫폼 + preserved: 보존된 철도 + proposed: 제안 철도 + spur: 지선 + station: 철도역 + stop: 철도 정거장 + subway: 지하철역 + subway_entrance: 지하철 입구 + switch: 철도 분기 + tram: 전차 + tram_stop: 전차 정거장 + yard: 철도 기지 shop: + alcohol: 주점 + antiques: 골동품 상점 + art: 예술 상점 + bakery: 제과점 + beauty: 미용실 + beverages: 음료 가게 + bicycle: 자전거 가게 + books: 서점 + boutique: 부티크 + butcher: 정육점 + car: 자동차 판매점 + car_parts: 자동차 부품점 + car_repair: 자동차 수리점 + carpet: 카펫 가게 + charity: 자선 가게 + chemist: 화학품점 + clothes: 의류 상점 + computer: 컴퓨터 상점 + confectionery: 과자 가게 + convenience: 편의점 + copyshop: 복사점 + cosmetics: 화장품 상점 + deli: 델리 + department_store: 백화점 + discount: 할인점 + doityourself: Do-It-Yourself + dry_cleaning: 드라이 클리닝 + electronics: 전자 제품 가게 + estate_agent: 공인 중개사 + farm: 농장 가게 + fashion: 패션 상점 + fish: 생선 가게 + florist: 꽃집 + food: 음식 가게 + funeral_directors: 장례식장 + furniture: 가구점 + gallery: 갤러리 + garden_centre: 원예 용품점 + general: 일반 상점 + gift: 선물 가게 + greengrocer: 청과상 + grocery: 식료품 상점 + hairdresser: 이발소 + hardware: 철물점 + hifi: 고급 오디오 insurance: 보험 + jewelry: 보석 상점 + kiosk: 키오스크 숍 + laundry: 세탁소 + mall: 쇼핑몰 + market: 시장 + mobile_phone: 휴대폰 상점 + motorcycle: 모터사이클 상점 + music: 음반 가게 + newsagent: 신문 판매소 + optician: 안경점 + organic: 유기농 식품 상점 + outdoor: 아웃도어 상점 + pet: 애완 동물 가게 + pharmacy: 약국 + photo: 사진관 + salon: 가게 + second_hand: 중고품 가게 + shoes: 신발 가게 + shopping_centre: 쇼핑 센터 + sports: 스포츠 상점 + stationery: 문구점 + supermarket: 수퍼마켓 + tailor: 양복점 + toys: 완구점 + travel_agency: 여행사 + video: 비디오 가게 + wine: 주점 + "yes": 상점 + tourism: + alpine_hut: 고산장 + artwork: 예술 작품 + attraction: 견인 + bed_and_breakfast: 잠자기와 아침 식사(민박) + cabin: 오두막 + camp_site: 캠프장 + caravan_site: 캐러밴 사이트 + chalet: 별장 + guest_house: 게스트 하우스 + hostel: 호스텔 + hotel: 호텔 + information: 안내소 + lean_to: 오두막 + motel: 모텔 + museum: 박물관 + picnic_site: 피크닉 사이트 + theme_park: 테마 파크 + valley: 골짜기 + viewpoint: 경승지 + zoo: 동물원 + tunnel: + culvert: 암거 + "yes": 터널 + waterway: + artificial: 인공 수로 + boatyard: 보트야드 + canal: 운하 + connector: 수로 연결로 + dam: 댐 + derelict_canal: 버려진 운하 + ditch: 구거 + dock: 부두 + drain: 배수로 + lock: 갑문 + lock_gate: 수문 + mineral_spring: 온천장 + mooring: 계선 + rapids: 급류 + river: 강 + riverbank: 강가 + stream: 개울 + wadi: 와디 + water_point: 급수소 + waterfall: 폭포 + weir: 어량 + help_page: + help: + description: OSM의 질문 및 답변 사이트에서 질문하거나 답변을 찾아보세요. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: "OpenStreetMap은 프로젝트에 대해 배우고, 질문을 묻고 답하고,\n매핑 주제를 협력하여 토론하고 문서하기 위한 여러 자료가 있습니다." + title: 도움말 얻기 + welcome: + description: OpenStreetMap 기초를 다루는 이 퀵 가이드로 시작합니다. + title: OSM에 오신 것을 환영합니다 + url: /welcome + wiki: + description: 깊이 있는 OSM 설명문서에 대해서는 위키를 찾아보세요. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ + javascripts: + close: 닫기 + edit_help: 편집하려는 위치에 지도를 이동하고 확대한 다음, 여기를 클릭하세요. + key: + title: 지도 키 + tooltip: 지도 키 + tooltip_disabled: 지도 키는 표준 레이어에서만 사용할 수 있습니다 + map: + base: + cycle_map: 사이클 지도 + hot: 인도주의 + standard: 표준 + transport_map: 교통 지도 + copyright: © OpenStreetMap 기여자 + donate_link_text: + layers: + data: 지도 데이터 + header: 지도 레이어 + notes: 지도 참고 + overlays: 지도 문제를 해결하기 위해 오버레이를 활성화 + title: 레이어 + locate: + popup: 이 지점의 {distance} {unit} 안에 있습니다 + title: 내 위치 보기 + zoom: + in: 확대 + out: 축소 + notes: + new: + add: 참고 추가 + intro: 지도를 개선하기 위해 입력한 정보가 다른 매퍼에 보입니다. 따라서 올바른 위치에 표시를 이동하고 아래에 참고를 입력할 때 가능하면 알기 쉽고 정확하게 적어주세요. + show: + anonymous_warning: 익명 사용자의 참고도 있으므로 별도로 확인해야 합니다. + comment: 덧글 + comment_and_resolve: 덧글 & 해결 + hide: 숨기기 + reactivate: 다시 활성화 + resolve: 해결 + share: + cancel: 취소 + center_marker: 표시의 가운데 지도 + custom_dimensions: 사용자 지정 치수 설정 + download: 다운로드 + embed: HTML + format: "형식:" + image: 그림 + image_size: "그림은 다음 크기로 표준 레이어로 보입니다:" + include_marker: 표시 포함 + link: 링크 또는 HTML + long_link: 링크 + paste_html: HTML을 붙여 넣어 웹사이트에 포함시키세요 + scale: "축척:" + short_link: 짧은 링크 + short_url: 짧은 URL + title: 공유 + view_larger_map: 큰 지도 보기 + site: + createnote_disabled_tooltip: 지도에 참고를 추가하려면 확대 + createnote_tooltip: 지도에 참고 추가 + edit_disabled_tooltip: 지도를 편집하려면 확대 + edit_tooltip: 지도 편집 + map_data_zoom_in_tooltip: 지도 데이터를 보려면 확대 + map_notes_zoom_in_tooltip: 지도 참고를 보려면 확대 layouts: - donate_link_text: 기부 + about: 소개 + community: 커뮤니티 + community_blogs: 커뮤니티 블로그 + community_blogs_title: OpenStreetMap 커뮤니티의 구성원에서의 블로그 + copyright: 저작권 + data: 데이터 + donate: 하드웨어 업데이트 기금에서 %{link}에 의해 OpenStreet를 지원합니다. edit: 편집 - export: 추출 - export_tooltip: 맵 정보 추출 + edit_with: "%{editor}(으)로 편집" + export: 내보내기 + export_data: 데이터 내보내기 + foundation: 재단 + foundation_title: OpenStreetMap 재단 gps_traces: GPS 추적 - gps_traces_tooltip: 추적 설정 - history: 이력 - inbox: 받은 쪽지함 (%{count}) - inbox_tooltip: - one: 한 개의 읽지 않은 쪽지가 있습니다. - other: "%{count} 개의 읽지 않은 쪽지가 있습니다." - zero: 읽지 않은 쪽지가 없습니다 + gps_traces_tooltip: GPS 추적 관리 + help: 도움말 + history: 역사 + home: 집 위치로 가기 + intro_2_create_account: 사용자 계정을 만드세요 + intro_header: OpenStreetMap에 오신 것을 환영합니다! + intro_text: OpenStreetMap은 여러분과 같은 사람이 만들고 자유롭게 오픈 라이선스에 따라 사용할 수 있는, 세계 지도입니다. + learn_more: 더 알아보기 log_in: 로그인 log_in_tooltip: 기존 계정으로 로그인 - logout: 로그 아웃 - logout_tooltip: 로그 아웃 + logo: + alt_text: OpenStreetMap 로고 + logout: 로그아웃 make_a_donation: text: 기부하기 - osm_offline: 데이터베이스 점검을 위해 OpenStreetMap 의 데이터가 현재 오프라인입니다. - osm_read_only: 데이터베이스 점검을 위해 OpenStreetMap 의 데이터가 현재 읽기 전용입니다. + title: 금전적인 기부와 OpenStreetMap 지원 + more: 더 보기 + osm_offline: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 오프라인입니다. + osm_read_only: 데이터베이스 점검을 위해 OpenStreetMap의 데이터가 현재 읽기 전용입니다. + partners_bytemark: 바이트마크 호스팅 + partners_html: 호스팅은 %{ucl}, %{ic}와 %{bytemark}, 그리고 다른 %{partners}에 의해 지원합니다. + partners_ic: 임페리얼 칼리지 런던 대학 + partners_partners: 파트너 + partners_ucl: UCL VR 센터 sign_up: 가입하기 - sign_up_tooltip: 수정가능한 계좌 신규 등록 - user_diaries: 사용자 일지 - user_diaries_tooltip: 사용자 일지 보기 - view: 보기 - view_tooltip: 지도 보기 - welcome_user: "%{user_link}님 환영합니다." + sign_up_tooltip: 편집을 위한 계정 만들기 + start_mapping: 매핑 시작 + tag_line: 우리 모두의 위키 세계 지도 + user_diaries: 사용자 일기 + user_diaries_tooltip: 사용자 일기 보기 + license_page: + foreign: + english_link: 영어 원본 + text: 이 번역한 문서와 %{english_original_link} 사이에 상충하는 경우 영어 문서가 우선합니다 + title: 이 번역에 대한 정보 + legal_babble: + attribution_example: + alt: 웹페이지에 OpenStreetMap에 표시하는 방법의 예 + title: 권리 표시 예 + contributors_at_html: "오스트리아: Stadt Wien\n(CC BY에 따름),\nLand Vorarlberg와\nLand Tirol (개정된 CC-BY AT에 따름)에서의\n데이터를 포함합니다." + contributors_ca_html: "캐나다: GeoBase®, GeoGratis\n(© 캐나다 천연자원부),\nCanVec (© 캐나다\n천연자원부)과 StatCan (캐나다 연방통계청,\n지리부)에서의 데이터를 포함합니다." + contributors_fi_html: "핀란드: NLSFI 라이선스에\n따른, National Land Survey of Finland's Topographic Database와\n다른 데이터집합에서의 데이터를 포함합니다." + contributors_footer_1_html: "자세한 내용과 OpenStreetMap을 개선하는 데 도움이 되는 데 사용한\n기타 자료에 대해서는 OpenStreetMap 위키에 있는 기여자 문서\n를 참고하세요." + contributors_footer_2_html: "OpenStreetMap에 포함된 데이터는 원래 데이터 제공자가\nOpenStreetMap을 보증하거나 어떠한 보증도 제공하거나\n어떠한 책임도 진다는 것을 의미하지 않습니다." + contributors_fr_html: "프랑스: Direction Générale des Impôts에서의\n데이터를 포함합니다." + contributors_gb_html: "연합 왕국: 육지 측량 데이터\n© Crown 저작권 및 데이터베이스 권리\n2010-12를 포함합니다." + contributors_intro_html: "우리의 기여자는 수천 명의 개인입니다. 또한 국립지도 제작 기관과\n같은 다른 소스의 공개 가능한 라이센스의 데이터를 포함합니다:" + contributors_nl_html: "네덜란드: © AND 데이터, 2007년\n(www.and.com)을 포함합니다." + contributors_nz_html: "뉴질랜드: Land Information New Zealand에서의\n데이터를 포함합니다. Crown이 저작권을 소유합니다." + contributors_title_html: 우리의 기여자 + contributors_za_html: "남아프리카 공화국: Chief Directorate:\nNational Geo-Spatial Information에서의 데이터를\n포함합니다. State가 저작권을 소유합니다." + credit_1_html: "“© OpenStreetMap 기여자”로 제작진을 넣어야\n합니다." + credit_2_html: "또한 명확하게 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며,\n지도 제작은 지도 타일을 사용할 때에 CC-BY-SA로 허가합니다.\n이 저작권 문서로\n링크하여 이렇게 할 수 있습니다.\n또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과\n라이선스에 직접 링크를 할 수 있습니다. 링크할 수 없는\n매체(예를 들어 인쇄 작업)에서는 opendatacommons.org와\nopenstreetmap.org('OpenStreetMap'을 전체 주소로 확장)로\n독자에 직접 알려주세요. 관련 있다면 creativecommons.org로 알려주세요." + credit_3_html: "찾아볼 수 있는 전자 지도에 대해서는 제작진은 지도의 모서리에 보여야만 합니다.\n예를 들어:" + credit_title_html: OpenStreetMap 제작진 넣는 방법 + infringement_1_html: "OSM 기여자는 저작권 소유자로부터 명시적 허가 없이\n저작권이 있는 자료(예를 들어 Google 지도 또는 인쇄된 지도)에서\n데이터를 반입하지 않도록 주의하여야 합니다." + infringement_2_html: "저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에\n추가되었다고 생각하면 게시\n중단 절차를 참고하거나 온라인\n신고 페이지에서 직접 제출하세요." + infringement_title_html: 저작권 침해 + intro_1_html: "OpenStreetMap은 오픈 데이터오픈 데이터\n커먼즈 오픈 데이터베이스 라이선스(ODbL)에 따라 사용할 수 있습니다." + intro_2_html: "당신은 가능하면 OpenStreetMap 제작진과 기여로\n자유롭게 복사, 배포, 전송 및 데이터를 적용할 수 있습니다.\n데이터를 바꾸거나 데이터에 기초로 할 때는 오로지\n같은 라이선스에 따라서만 결과를 배포할 수 있습니다.\n전문은\n당신의 권리와 책임을 설명합니다." + intro_3_html: "지도 타일의 지도 제작과 설명서는\n크리에이티브\n커먼즈 저작자표시-동일조건변경허락 2.0 라이선스(CC-BY-SA)에 따라 사용할 수 있습니다." + more_1_html: "데이터를 사용하는 방법과 제작진을 표시하는 방법에 대해서는 법적\nFAQ를 자세히 읽으세요." + more_2_html: "OpenStreetMap은 오픈 데이터이지만 타사 개발자를 위한\n지도 API는 무료로 제공할 수 없습니다.\nAPI 사용 정책,\n타일 사용 정책과\nNominatim(이름) 사용 정책를 참고하세요." + more_title_html: 자세히 찾기 + title_html: 저작권 및 라이선스 + native: + mapping_link: 매핑을 시작 + native_link: 한국어 버전 + text: 저작권 문서의 영어 버전을 보고 있습니다. 이 문서의 %{native_link}으로 돌아갈 수 있으며 또는 저작권을 읽는 것을 멈추고 %{mapping_link}할 수 있습니다. + title: 이 문서에 대한 정보 message: + delete: + deleted: 메시지가 삭제됨 inbox: date: 날짜 - my_inbox: 내 쪽지함 - no_messages_yet: 받은 쪽지가 없습니다. %{people_mapping_nearby_link}에서 친구를 찾아보세요. + from: 보낸 사람 + messages: "%{new_messages}와 %{old_messages}가 있습니다" + my_inbox: 내 받은 쪽지함 + new_messages: + one: 새 메시지 %{count}개 + other: 새 메시지 %{count}개 + no_messages_yet: 아직 메시지가 없습니다. %{people_mapping_nearby_link}에서 마음에 드는 친구를 찾아보는 것은 어떨까요? + old_messages: + one: 오래된 메시지 %{count}개 + other: 오래된 메시지 %{count}개 outbox: 보낸 쪽지함 - people_mapping_nearby: 근처를 지도 입력한 사람들 + people_mapping_nearby: 근처에 매핑한 사람 subject: 제목 title: 받은 쪽지함 - you_have: "%{new_count} 개의 새 쪽지와 %{old_count} 개의 읽은 쪽지가 있습니다." + mark: + as_read: 메시지를 읽은 것으로 표시 + as_unread: 메시지를 읽지 않은 것으로 표시 message_summary: + delete_button: 삭제 read_button: 읽음으로 표시 reply_button: 답장 unread_button: 읽지 않음으로 표시 new: - back_to_inbox: 쪽지함으로 돌아가기 - body: 내용 - message_sent: 쪽지가 전송되었습니다. + back_to_inbox: 받은 쪽지함으로 돌아가기 + body: 본문 + limit_exceeded: 최근에 많은 메시지를 보냈습니다. 더 보내려면 잠시 기다려주세요. + message_sent: 보낸 메시지 send_button: 보내기 - send_message_to: "%{name}에게 새 쪽지 보내기" + send_message_to: "%{name}에게 새 메시지 보내기" subject: 제목 - title: 새 쪽지 - no_such_user: - body: 죄송합니다. 그런 아이디 또는 이름의 사용자가 쪽지를 찾을 수 없습니다. - heading: 사용자 또는 쪽지를 찾을 수 없습니다 - title: 사용자 또는 쪽지를 찾을 수 없습니다 + title: 메시지 보내기 + no_such_message: + body: 죄송합니다 해당 id로 된 메시지가 없습니다. + heading: 메시지가 없습니다. + title: 메시지가 없습니다. outbox: date: 날짜 - inbox: 받은 편지함 - no_sent_messages: 받은 쪽지가 없습니다. %{people_mapping_nearby_link}에서 친구를 찾아보세요. - outbox: 보낸 편지함 - people_mapping_nearby: 근처를 지도 입력한 사람들 + inbox: 받은 쪽지함 + messages: + one: 메시지 %{count}개를 보냈습니다 + other: 메시지 %{count}개를 보냈습니다 + my_inbox: 내 %{inbox_link} + no_sent_messages: 아직 보낸 메시지가 없습니다. %{people_mapping_nearby_link}에서 마음에 드는 친구를 찾아보는 것은 어떨까요? + outbox: 보낸 쪽지함 + people_mapping_nearby: 근처에 매핑한 사람 subject: 제목 title: 보낸 쪽지함 - you_have_sent_messages: "%{count} 개의 쪽지를 보냈습니다." + to: 받는 사람 + read: + back: 뒤로 + date: 날짜 + from: 보낸 사람 + reply_button: 답글 + subject: 제목 + title: 메시지 읽기 + to: 받는 사람 + unread_button: 읽지 않음으로 표시 + wrong_user: "'%{user}' 사용자로 로그인하고 있지만 읽기를 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 읽으려면 올바른 사용자로 로그인하세요." + reply: + wrong_user: "'%{user}' 사용자로 로그인하고 있지만 답장을 요청한 메시지가 해당 사용자에게 보내지지 않았습니다. 답장을 하려면 올바른 사용자로 로그인하세요." + sent_message_summary: + delete_button: 삭제 + note: + description: + closed_at_by_html: "%{user} 사용자가 %{when} 전에 해결함" + closed_at_html: "%{when} 전에 해결함" + commented_at_by_html: "%{user} 사용자가 %{when} 전에 바꿈" + commented_at_html: "%{when} 전에 바꿈" + opened_at_by_html: "%{user} 사용자가 %{when} 전에 만듦" + opened_at_html: "%{when} 전에 만듦" + reopened_at_by_html: "%{user} 사용자가 %{when} 전에 다시 활성화함" + reopened_at_html: "%{when} 전에 다시 활성화함" + entry: + comment: 덧글 + full: 전체 참고 + mine: + ago_html: "%{when} 전" + created_at: 만든 날짜 + creator: 만든이 + description: 설명 + heading: "%{user}의 참고" + id: ID + last_changed: 마지막으로 바뀜 + subheading: "%{user} 사용자가 제출했거나 덧글을 남긴 참고" + title: "%{user} 사용자가 제출했거나 덧글을 남긴 참고" + rss: + closed: 닫힌 참고 (%{place} 근처) + commented: 새 덧글 (%{place} 근처) + description_area: 내 지역[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]에 참고, 덧글 또는 닫힌 참고 목록 + description_item: "%{id} 참고에 대한 RSS 피드" + opened: 새 참고 (%{place} 근처) + reopened: 다시 활성된 참고 (%{place} 근처) + title: OpenStreetMap 참고 notifier: diary_comment_notification: - footer: "%{readurl}에서도 댓글을 확인할 수 있습니다. %{commenturl}에서 댓글을 남기거나 %{replyurl}에서 답글을 남길 수 있습니다." - header: "%{from_user} 님이 %{subject} 제목의 OpenStreetMap 일지 항목에 댓글을 남겼습니다.:" + footer: "%{readurl}에서도 덧글을 확인할 수 있습니다. %{commenturl}에서 덧글을 남기거나 %{replyurl}에서 답글을 남길 수 있습니다." + header: "%{from_user}님이 %{subject} 제목의 OpenStreetMap 일기 항목에 덧글을 남겼습니다:" hi: "%{to_user}님 안녕하세요." - subject: "[OpenStreetMap] %{user} 님이 당신의 일지 항목에 댓글을 남겼습니다." + subject: "[OpenStreetMap] %{user}님이 당신의 일기 항목에 덧글을 남겼습니다" + email_confirm: + subject: "[OpenStreetMap] 이메일 주소 확인" + email_confirm_html: + click_the_link: 만약 당신이라면 바뀜을 확인하기 위해 아래 링크를 클릭하세요. + greeting: 안녕하세요, + hopefully_you: 누군가가 아마 자신이 %{server_url} 에 %{new_address} 로 이메일 주소를 바꾸고 싶습니다. + email_confirm_plain: + click_the_link: 만약 당신이라면 바뀜을 확인하기 위해 아래 링크를 클릭하세요. + greeting: 안녕하세요, + hopefully_you: 누군가가 아마 자신이 %{server_url} 에 %{new_address} 로 이메일 주소를 바꾸고 싶습니다. friend_notification: - had_added_you: "%{user} 님이 당신을 OpenStreetMap 친구로 추가하였습니다." + befriend_them: 또한 %{befriendurl}에서 친구로 추가할 수 있습니다. + had_added_you: "%{user}님이 당신을 OpenStreetMap 친구로 추가했습니다." see_their_profile: "%{userurl} 에서 프로필을 확인하고 원하면 친구로 등록할 수 있습니다." - subject: "[OpenStreetMap] %{user} 님이 당신을 친구로 추가하였습니다." + subject: "[OpenStreetMap] %{user}님이 당신을 친구로 추가했습니다" gpx_notification: + and_no_tags: 태그가 없습니다. + and_the_tags: "다음 태그가 있습니다:" + failure: + failed_to_import: "가져오기에 실패했습니다. 오류는 다음과 같습니다:" + more_info_1: 더 많은 GPX 가져오기 실페에 대한 정보와 방지하는 방법에 대해서는 + more_info_2: "다음에서 찾을 수 있습니다:" + subject: "[OpenStreetMap] GPX 가져오기 실패" + greeting: 안녕하세요, success: - loaded_successfully: "loaded successfully with %{trace_points} out of a possible\n%{possible_points} points." + loaded_successfully: 가능한 %{possible_points} 지점 중 %{trace_points} 지점을 성공적으로 불러왔습니다. + subject: "[OpenStreetMap] GPX 가져오기 성공" + with_description: 설명과 함께 + your_gpx_file: GPX 파일 같아 보이고 + lost_password: + subject: "[OpenStreetMap] 비밀번호 재설정 요청" + lost_password_html: + click_the_link: 만약 당신이라면 비밀번호를 재설정하기 위해 아래 링크를 클릭하세요. + greeting: 안녕하세요, + hopefully_you: 누군가가 아마 자신이 이 이메일 계정의 openstreetmap.org 계정에서 재설정할 비밀번호를 요청했습니다. + lost_password_plain: + click_the_link: 만약 당신이라면 비밀번호를 재설정하기 위해 아래 링크를 클릭하세요. + greeting: 안녕하세요, + hopefully_you: 누군가가 아마 자신이 이 이메일 계정의 openstreetmap.org 계정에서 재설정할 비밀번호를 요청했습니다. message_notification: - footer1: "%{readurl} 에서도 쪽지를 확인할 수 있습니다." - footer2: "%{replyurl} 에서 답장하실 수 있습니다." - header: "%{from_user} 님이 OpenStreetMap을 통해 %{subject} 쪽지를 보냈습니다." + footer_html: 또한 %{readurl}에서 메시지를 읽을 수 있고 %{replyurl}에서 회신할 수 있습니다. + header: "%{from_user}님이 OpenStreetMap을 통해 %{subject} 제목으로 된 메시지를 보냈습니다:" hi: "%{to_user}님 안녕하세요." + note_comment_notification: + anonymous: 익명 사용자 + closed: + commented_note: "%{commenter} 사용자가 당신이 덧글을 남긴 지도 참고를 해결했습니다. 참고는 %{place} 근처에 있습니다." + subject_other: "[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고를 해결했습니다" + subject_own: "[OpenStreetMap] %{commenter} 사용자가 당신의 참고 중 하나를 해결했습니다" + your_note: "%{commenter} 사용자가 %{place} 근처의 당신의 지도 참고 중 하나를 해결했습니다." + commented: + commented_note: "%{commenter} 사용자가 당신이 덧글을 남긴 지도 참고에 덧글을 남겼습니다. 참고는 %{place} 근처에 있습니다." + subject_other: "[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고에 덧글을 남겼습니다" + subject_own: "[OpenStreetMap] %{commenter} 사용자가 당신의 참고에 덧글을 남겼습니다" + your_note: "%{commenter} 사용자가 %{place} 근처의 당신의 지도에 덧글을 남겼습니다." + details: 참고에 대한 자세한 사항은 %{url} 에서 찾을 수 있습니다. + greeting: 안녕하세요, + reopened: + commented_note: "%{commenter} 사용자가 당신이 덧글을 남긴 지도 참고를 다시 활성했습니다. 참고는 %{place} 근처에 있습니다." + subject_other: "[OpenStreetMap] %{commenter} 사용자가 당신이 관심 있는 참고를 다시 활성했습니다" + subject_own: "[OpenStreetMap] %{commenter} 사용자가 당신의 참고 중 하나를 다시 활성했습니다" + your_note: "%{commenter} 사용자가 %{place} 근처의 당신의 지도 참고 중 하나를 다시 활성했습니다." + signup_confirm: + confirm: "무엇을 하기 전에 당신에게 온 요청을 확인해야 하며 만약 당신에게 온 요청이 맞다면 계정을 확인하기 위해 아래 링크를 클릭하세요:" + created: 누군가가 아마도 자신이 %{site_url} 에 계정을 만들었습니다. + greeting: 안녕하세요! + subject: "[OpenStreetMap] OpenStreetMap에 오신 것을 환영합니다" + welcome: 계정을 확인하고 나서, 시작하는 데 몇 가지 추가 정보를 제공합니다. + oauth: + oauthorize: + allow_read_gpx: 비공개 GPS 추적을 읽습니다. + allow_read_prefs: 사용자 환경 설정을 읽습니다. + allow_to: "다음 클라이언트 애플리케이션을 허용합니다:" + allow_write_api: 지도를 수정합니다. + allow_write_diary: 일기 항목을 만들고 덧글을 달고 친구를 만듭니다. + allow_write_gpx: GPS 추적을 올립니다. + allow_write_notes: 참고를 수정합니다. + allow_write_prefs: 사용자 환경 설정을 수정합니다. + request_access: "%{app_name} 애플리케이션이 %{user} 계정에 접근을 요청합니다. 애플리케이션이 다음 기능을 수행할 것인지 확인하세요. 원하는 만큼 많거나 적게 선택할 수 있습니다." + title: 내 계정에 접근 인증 + oauthorize_failure: + denied: 내 계정에 %{app_name} 애플리케이션 접근이 거부되었습니다. + invalid: 인증 토큰이 올바르지 않습니다. + title: 인증 요청이 실패됨 + oauthorize_success: + allowed: 내 계정에 %{app_name} 애플리케이션 접근이 부여되었습니다. + title: 인증 요청이 허가됨 + verification: 인증 코드는 %{code}입니다. + revoke: + flash: "%{application}에 대한 토큰을 해제했습니다" + oauth_clients: + create: + flash: 성공적으로 정보를 등록했습니다 + destroy: + flash: 클라이언트 애플리케이션 등록을 파기했습니다 + edit: + submit: 편집 + title: 내 애플리케이션 편집 + form: + allow_read_gpx: 비공개 GPS 추적을 읽습니다. + allow_read_prefs: 사용자 환경 설정을 읽습니다. + allow_write_api: 지도를 수정합니다. + allow_write_diary: 일기 항목을 만들고 덧글을 달고 친구를 만듭니다. + allow_write_gpx: GPS 추적을 올립니다. + allow_write_notes: 참고를 수정합니다. + allow_write_prefs: 사용자 환경 설정을 수정합니다. + callback_url: 연락 URL + name: 이름 + requests: "사용자가 다음 권한을 요청합니다:" + required: 필수 + support_url: 지원 URL + url: 주요 애플리케이션 URL + index: + application: 응용 프로그램 이름 + issued_at: 발행 + list_tokens: "다음 토큰이 내 이름으로 애플리케이션에 발급했습니다:" + my_apps: 내 클라이언트 애플리케이션 + my_tokens: 내 인증한 애플리케이션 + no_apps: "%{oauth} 표준을 사용하여 OpenStreetMap과 함께 사용하기 위해 등록할 애플리케이션이 있습니까? 이 서비스에 OAuth를 요청하기 전에 웹 애플리케이션을 등록해야 합니다." + register_new: 내 애플리케이션 등록 + registered_apps: "등록한 다음 클라이언트 응용 프로그램이 있습니다:" + revoke: 해제! + title: 내 OAuth 자세한 정보 + new: + submit: 등록 + title: 새 응용 프로그램 등록 + not_found: + sorry: 죄송합니다, 해당 %{type}(을)를 찾을 수 없습니다. + show: + access_url: "접근 토큰 URL:" + allow_read_gpx: 비공개 GPS 추적을 읽습니다. + allow_read_prefs: 사용자 환경 설정을 읽습니다. + allow_write_api: 지도를 수정합니다. + allow_write_diary: 일기 항목을 만들고 덧글을 달고 친구를 만듭니다. + allow_write_gpx: GPS 추적을 올립니다. + allow_write_notes: 참고를 수정합니다. + allow_write_prefs: 사용자 환경 설정을 수정합니다. + authorize_url: "요청 URL:" + confirm: 확실합니까? + delete: 클라이언트 삭제 + edit: 자세한 사항 편집 + key: "컨슈머 키:" + requests: "사용자가 다음 권한을 요청합니다:" + secret: "컨슈머 비밀 값:" + support_notice: HMAC-SHA1(권장)과 RSA-SHA1 서명을 지원합니다. + title: "%{app_name}에 데한 OAuth 자세한 정보" + url: "요청 토큰 URL:" + update: + flash: 성공적으로 클라이언트 정보를 업데이트했습니다 + redaction: + create: + flash: 교정을 만들었습니다. + destroy: + error: 이 교정을 파기하는 중에 오류가 발생했습니다. + flash: 교정을 파기했습니다. + not_empty: 교정이 비어 있지 않습니다. 파기하기 전에 이 교정에 속하는 모든 판을 교정 취소하세요. + edit: + description: 설명 + heading: 교정 편집 + submit: 교정 저장 + title: 교정 편집 + index: + empty: 보여줄 교정이 없습니다. + heading: 교정 목록 + title: 교정 목록 + new: + description: 설명 + heading: 새 교정에 대한 정보 입력 + submit: 교정 만들기 + title: 새 교정 만들기 + show: + confirm: 확실합니까? + description: "설명:" + destroy: 이 교정 제거 + edit: 이 교정 편집 + heading: "\"%{title}\" 교정 보기" + title: 교정 보기 + user: "만든이:" + update: + flash: 바뀜을 저장했습니다. site: 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.) + anon_edits_link_text: 왜 이러한지 알아보세요. + flash_player_required: OpenStreetMap 플래시 편집기인 Potlatch를 사용하려면 플래시 플레이어가 필요합니다. Adobe.com에서 플래시 플레이어를 다운로드할 수 있습니다. 몇 가지 다른 설정 또한 OpenStreetMap 편집을 위해 사용할 수 있습니다. + id_not_configured: iD가 설정되지 않았습니다 + no_iframe_support: 브라우저가 이 기능에 필요한 HTML iframe을 지원하지 않습니다. + not_public: 공개할 편집을 설정하지 않았습니다. + not_public_description: 이렇게 하지 않으면 더 이상 지도를 편집할 수 없습니다. %{user_page}에서 공개로 편집을 설정할 수 있습니다. + potlatch2_not_configured: Potlatch 2가 설정되지 않았습니다 - 자세한 정보는 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 를 참고하세요 + potlatch2_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch 2에서 저장하려면 저장을 클릭해야 합니다.) + potlatch_unsaved_changes: 바뀜을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는 경우, 현재의 방식이나 지점을 선택을 해제하거나 저장 버튼이 있다면 저장을 클릭해야 합니다.) + user_page_link: 사용자 문서 index: + createnote: 참고 추가 js_1: 자바스크립트를 지원하지 않는 브라우저이거나, 자바스크립트가 활성화 되어 있지 않습니다. + js_2: OpenStreetMap은 매끄러운 지도를 위해 자바스크립트를 사용합니다. + license: + copyright: 저작권 OpenStreetMap과 기여자, 오픈 라이선스로 배포 + permalink: 고유링크 + remote_failed: 편집을 실패했습니다 - JOSM이나 Merkaartor를 불러왔고 원격 제어 설정이 활성화되어 있는지 확인하세요 + shortlink: 짧은링크 + key: + table: + entry: + admin: 행정 구역 경계 + allotments: 텃밭 + apron: + - 공항 에이프런 + - 터미널 + bridge: 검은 테두리 = 다리 + bridleway: 승마로 + brownfield: 재개발구역 + building: 중요한 건물 + byway: 옆길 + cable: + - 케이블 카 + - 체어 리프트 + cemetery: 묘지 + centre: 스포츠 센터 + commercial: 상업 지역 + common: + - 공유지 + - 목초지 + construction: 공사 중인 도로 + cycleway: 자전거 도로 + destination: 목적 통행 + farm: 농장 + footway: 보도 + forest: 숲 + golf: 골프장 + heathland: 황무지 + industrial: 산업 지역 + lake: + - 호수 + - 저수지 + military: 군사지 + motorway: 고속도로 + park: 공원 + permissive: 허용 통행 + pitch: 운동장 + primary: 주요 도로 + private: 개인 통행 + rail: 철도 + reserve: 자연 보호구 + resident: 주거 지역 + retail: 소매 지역 + runway: + - 공항 활주로 + - 공항 유도로 + school: + - 학교 + - 대학교 + secondary: 보조 도로 + station: 철도역 + subway: 지하철 + summit: + - 산꼭대기 + - 산정상 + tourist: 관광 명소 + track: 추적 + tram: + - 경전철 + - 노면 전차 + trunk: 간선 도로 + tunnel: 점선 테두리 = 터널 + unclassified: 분류하지 않은 도로 + unsurfaced: 비포장 도로 + wood: 산림 + markdown_help: + alt: 대체 텍스트 + first: 첫째 항목 + heading: 문단 제목 + headings: 문단 제목 + image: 그림 + link: 링크 + ordered: 순서 있는 목록 + second: 둘째 항목 + subheading: 하위 문단 제목 + text: 텍스트 + title_html: 마크다운으로 구문 분석됩니다 + unordered: 순서 없는 목록 + url: URL + richtext_area: + edit: 편집 + preview: 미리 보기 search: - search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near L체nen' more examples..." + search: 검색 + submit_text: 가기 + where_am_i: 내가 어디있나요? + where_am_i_title: 검색 엔진을 사용하여 현재 위치를 나타냅니다 + sidebar: + close: 닫기 + search_results: 검색 결과 + time: + formats: + friendly: "%Y년 %B %e일 %H:%M" trace: + create: + trace_uploaded: GPX 파일을 올리고 있으며 데이터베이스에 삽입을 기다리고 있습니다. 이 작업은 보통 반 시간 내에 수행하며 완료되면 이메일을 보낼 것입니다. + upload_trace: GPS 추적 올리기 + delete: + scheduled_for_deletion: 삭제 예정 추적 + description: + description_with_count: + one: "%{user}에서의 %{count} 지점으로 된 GPX 파일" + other: "%{user}에서의 %{count} 지점으로 된 GPX 파일" + description_without_count: "%{user}에서의 GPX 파일" + edit: + description: "설명:" + download: 다운로드 + edit: 편집 + filename: "파일 이름:" + heading: "%{name} 경로 편집" + map: 지도 + owner: "소유자:" + points: "지점:" + save_button: 바뀐 사항 저장 + start_coord: "시작 좌표:" + tags: "태그:" + tags_help: 쉼표로 구분 + title: "%{name} 경로 편집" + uploaded_at: "올려짐:" + visibility: "공개 여부:" + visibility_help: 이게 무슨 의미입니까? + georss: + title: OpenStreetMap GPS 추적 + list: + description: 최근 GPS 추적 올리기 찾아보기 + empty_html: 여기에 아직 아무 것도 없습니다. 새 추적을 올리거나 위키 문서에 GPS 추적에 대한 자세한 내용을 알아보세요. + public_traces: 공개 GPS 추적 + public_traces_from: "%{user} 사용자의 공중 GPS 추적" + tagged_with: "%{tags}로 태그함" + your_traces: 내 GPS 추적 + make_public: + made_public: 추적이 공개적으로 만들어짐 + offline: + heading: GPX 저장소 오프라인 + message: GPX 파일 저장소와 올리기 시스템은 현재 사용할 수 없습니다. + offline_warning: + message: GPX 파일 올리기 시스템은 현재 사용할 수 없습니다 + trace: + ago: "%{time_in_words_ago} 전" + by: 사용자 + count_points: "%{count} 지점" + edit: 편집 + edit_map: 지도 편집 + identifiable: 식별 가능 + in: 위치 + map: 지도 + more: 더 보기 + pending: 보류 중 + private: 비공개 + public: 공개 + trace_details: 추적 자세한 정보 보기 + trackable: 추적 가능 + view_map: 지도 보기 + trace_form: + description: "설명:" + help: 도움말 + tags: "태그:" + tags_help: 쉼표로 구분 + upload_button: 올리기 + upload_gpx: "GPX 파일 올리기:" + visibility: "공개 여부:" + visibility_help: 이게 무슨 의미입니까? + trace_header: + see_all_traces: 모든 추적 보기 + see_your_traces: 내 추적 보기 + traces_waiting: + one: 올리기를 기다리는 추적 %{count}개가 있습니다. 이 올리기가 완료될 때까지 기다리는 것을 고려하세요. 다른 사용자의 올리기가 제한되어 버립니다. + other: 올리기를 기다리는 추적 %{count}개가 있습니다. 이 올리기가 완료될 때까지 기다리는 것을 고려하세요. 다른 사용자의 올리기가 제한되어 버립니다. + upload_trace: 추적 올리기 + trace_optionals: + tags: 태그 + trace_paging_nav: + newer: 다음 추적 + older: 이전 추적 + showing_page: 페이지 %{page} view: - tags: Tags + delete_track: 이 추적 삭제 + description: "설명:" + download: 다운로드 + edit: 편집 + edit_track: 이 추적 편집 + filename: "파일 이름:" + heading: "%{name} 경로 보기" + map: 지도 + none: 없음 + owner: "소유자:" + pending: 보류 중 + points: "지점:" + start_coordinates: "시작 좌표:" + tags: "태그:" + title: "%{name} 경로 보기" + trace_not_found: 추적을 찾을 수 없습니다! + uploaded: "올려짐:" + visibility: "공개 여부:" + visibility: + identifiable: 식별 가능 (식별 가능한 추적 목록 보임, 시간 기록으로 정렬한 지점) + private: 비공개 (익명으로만 공유, 정렬하지 않은 지점) + public: 공개 (익명으로 추적 목록 보임, 정렬하지 않은 지점) + trackable: 추적 가능 (익명으로만 공유, 시간 기록으로 정렬한 지점) user: account: + contributor terms: + agreed: 새 기여자 약관에 동의했습니다. + agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다. + heading: "기여자 약관:" + link text: 이게 뭐죠? + not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다. + review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요. + current email address: "현재 이메일 주소:" + delete image: 현재 이미지 제거 + email never displayed publicly: (절대 공개하지 않습니다) + flash update success: 사용자 정보를 성공적으로 업데이트했습니다. + flash update success confirm needed: 사용자 정보를 성공적으로 업데이트했습니다. 새 이메일 주소를 확인하기 위해 이메일을 확인하세요. + gravatar: + gravatar: Gravatar 사용 + link text: 이게 뭐죠? + home location: "집 위치:" + image: "그림:" + image size hint: (100x100 이하의 정사각형 그림이 최적) + keep image: 현재 이미지를 유지 + latitude: "위도:" + longitude: "경도:" + make edits public button: 내 편집을 공개하기 + my settings: 내 설정 + new email address: "새 이메일 주소:" + new image: 그림 추가 + no home location: 집 위치를 입력하지 않았습니다. + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: 이게 뭐죠? + openid: "OpenID:" + preferred editor: "주로 사용하는 편집기:" + preferred languages: 주로 사용하는 언어 + profile description: "프로필 설명:" public editing: + disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명으로 됩니다. + disabled link text: 왜 편집할 수 없나요? + enabled: 활성화했습니다. 익명이 아닌 사용자는 데이터를 편집할 수 있습니다. enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link text: 이게 뭐죠? + heading: "공개 편집:" + public editing note: + heading: 공개 편집 + text: 현재 편집은 익명이고 사람이 당신에게 메시지를 보내거나 위치를 볼 수 없습니다. 당신이 편집한 것으로 나타내고 사람이 웹 사이트를 통해 연락을 허용하려면 아래 버튼을 클릭하세요. 0.6 API 역전 이후 공개 새용자만 지도 데이터를 편집할 수 있습니다. (이유 알아보기).
    • 이메일 주소는 공개함으로서 추가로 공개하지 않습니다.
    • 이 작업을 되돌릴 수 없고 모든 새 사용자는 지금 기본값으로 공개입니다.
    + replace image: 현재 이미지 대체 + return to profile: 프로필로 돌아가기 + save changes button: 바뀐 사항 저장 + title: 계정 편집 + update home location on click: 지도에서 클릭하면 집 위치로 업데이트할까요? + confirm: + already active: 이 계정은 이미 확인했습니다. + button: 확인 + heading: 이메일을 확인하세요! + introduction_1: 확인 이메일을 보냈습니다. + introduction_2: 이메일에 있는 링크를 클릭하여 계정을 확인하면 매핑을 시작할 수 있습니다. + press confirm button: 계정을 활성화하려면 아래 확인 버튼을 누르세요. + reconfirm_html: 확인 이메일을 다시 보낼 필요가 있다면, 여기를 클릭하세요. + unknown token: 확인 코드가 만료되었거나 존재하지 않습니다. + confirm_email: + button: 확인 + failure: 이메일 주소는 이미 이 토큰으로 확인했습니다. + heading: 이메일 주소 바꾸기 확인 + press confirm button: 새 이메일 주소를 확인하여면 아래에 확인 버튼을 누르세요. + success: 이메일 계정을 확인했습니다, 가입해주셔서 감사합니다! + confirm_resend: + failure: "%{name} 사용자를 찾을 수 없습니다." + success: "%{email} 로 새 확인 쪽지를 보냈는데 즉시 계정을 확인하는 대로 매핑을 할 수 있습니다.

    확인 요청을 보낼 때 스팸 방지 시스템을 사용한다면 어떤 확인 요청에 답변할 수 없으므로 화이트리스트에 webmaster@openstreetmap.org 가 있는지 확인하세요." + filter: + not_an_administrator: 해당 동작을 수행하려면 관리자 권한이 필요합니다. + go_public: + flash success: 지금 모든 편집을 공개하고, 편집을 허용하지 않습니다. + list: + confirm: 선택한 사용자 확인 + empty: 일치하는 사용자를 찾을 수 없습니다 + heading: 사용자 + hide: 선택한 사용자 숨기기 + showing: + one: 페이지 %{page} (%{items} 중 %{first_item}) + other: 페이지 %{page} (%{items} 중 %{first_item}-%{last_item}) + summary: "%{name}(이)가 %{date}에 %{ip_address}에서 만들어짐" + summary_no_ip: "%{name}(이)가 %{date}에 만들어짐" + title: 사용자 + login: + account is suspended: 죄송합니다, 의심스러운 활동으로 인해 계정이 일시 중지되었습니다.
    이 문제를 토론하려면 웹마스터에게 문의하세요. + account not active: 죄송합니다, 계정을 아직 활성화하지 않았습니다.
    계정을 활성화하려면 계정 확인 이메일에 있는 링크를 사용하거나 새 확인 이메일을 요청하세요. + auth failure: 죄송합니다, 다음 이유로 로그인할 수 없습니다. + create account minute: 계정을 만듭니다. 1분도 걸리지 않습니다. + email or username: "이메일 주소 또는 사용자 이름:" + heading: 로그인 + login_button: 로그인 + lost password link: 비밀번호를 잊으셨나요? + new to osm: OpenStreetMap이 처음이세요? + no account: 계정이 없나요? + openid: "%{logo} OpenID:" + openid invalid: 죄송합니다, OpenID가 잘못된 것 같습니다 + openid missing provider: 죄송합니다, OpenID 제공자에 문의할 수 없습니다 + openid_logo_alt: OpenID로 로그인 + openid_providers: + aol: + alt: AOL OpenID로 로그인 + title: AOL로 로그인 + google: + alt: Google OpenID로 로그인 + title: Google로 로그인 + myopenid: + alt: myOpenID OpenID로 로그인 + title: myOpenID로 로그인 + openid: + alt: OpenID URL로 로그인 + title: OpenID로 로그인 + wordpress: + alt: 워드프레스 OpenID로 로그인 + title: 워드프레스로 로그인 + yahoo: + alt: 야후 OpenID로 로그인 + title: 야후로 로그인 + password: "비밀번호:" + register now: 지금 등록하세요 + remember: 로그인 상태를 기억하기 + title: 로그인 + to make changes: OpenStreetMap 데이터를 바꾸려면 계정이 있어야 합니다. + with openid: "또는 OpenID로 로그인하세요:" + with username: "이미 OpenStreetMap 계정을 가지고 있나요? 계정 이름과 비밀번호로 로그인하세요:" + logout: + heading: OpenStreetMap에서 로그아웃 + logout_button: 로그아웃 + title: 로그아웃 lost_password: - new password button: Send me a new password - title: lost password + email address: "이메일 주소:" + heading: 비밀번호를 잊으셨나요? + help_text: 가입할 때 사용한 이메일 주소를 입력하세요, 비밀번호를 재설정하여 사용할 수 있는 링크를 보내드립니다. + new password button: 비밀번호 재설정 + notice email cannot find: 이메일 주소를 찾지 못해 죄송합니다. + notice email on way: 죄송합니다, 잃어버렸습니다 :-( 곧 재설정을 할 수 있도록 하지만, 이메일을 사용할 수 있습니다. + title: 잊어버진 비밀번호 + make_friend: + already_a_friend: 이미 %{name} 사용자와 친구입니다. + button: 친구 추가 + failed: 죄송합니다, %{name} 사용자를 친구로 추가하는 데 실패했습니다. + heading: "%{user} 사용자를 친구로 추가할까요?" + success: "%{name} 사용자는 이제 친구입니다!" + new: + about: + header: 자유롭고 편집 가능 + html: "

    다른 지도와는 달리, OpenStreetMap은 완전히 여러분과 같은 사람이 만들고,\n누구나 자유롭게 고치고, 업데이트하고, 다운로드하고 사용할 수 있습니다.

    \n

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

    " + confirm email address: "이메일 주소 확인:" + confirm password: "비밀번호 확인:" + contact_webmaster: 계정을 만들 수 있도록 웹마스터에게 문의하세요. 희망에 대응하기 위해 노력하고 가능한 빨리 요청을 처리합니다. + continue: 가입하기 + display name: "보여줄 이름:" + display name description: 공개적으로 보여질 사용자 이름입니다. 나중에 환경 설정에서 바꿀 수 있습니다. + email address: "이메일 주소:" + license_agreement: 계정을 확인하면 당신은 기여자 약관에 동의해야합니다. + no_auto_account_create: 불행하게도 현재로서는 자동으로 계정을 만들 수 없습니다. + not displayed publicly: 공개적으로 보여지지 않습니다 (개인 정보 정책을 참고하세요) + openid: "%{logo} OpenID:" + openid association: "

    OpenID는 아직 OpenStreetMap 계정과 연결되지 않았습니다.

    \n
      \n
    • OpenStreetMap에 새로 가입하려면 아래의 양식을 사용하여 새 계정을 만드세요.
    • \n
    • \n 이미 계정이 있다면 사용자 이름과 비밀번호를 사용해 로그인하고 나서\n 사용자 설정에서 OpenID와 계정을 연결할 수 있습니다.\n
    • \n
    " + openid no password: OpenID로 비밀번호가 필요하지 않지만 몇 가지 추가 도구나 서버는 여전히 비밀번호가 필요할 수 있습니다. + password: "비밀번호:" + terms accepted: 새 기여자 약관에 동의하셔서 감사합니다! + terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 이 위키 문서를 참고하세요. + title: 가입하기 + use openid: 또는 %{logo} OpenID를 사용하여 로그인하세요 + no_such_user: + body: 죄송합니다, %{user} 이름으로 된 사용자가 없습니다. 맞춤법이나 클릭한 링크가 잘못됐는지 확인하세요. + heading: "%{user} 사용자는 존재하지 않습니다" + title: 이러한 사용자는 없습니다 + popup: + friend: 친구 + nearby mapper: 근처 매퍼 + your location: 내 위치 + remove_friend: + button: 친구 제거 + heading: "%{user} 사용자를 친구 제거할까요?" + not_a_friend: "%{name} 사용자는 친구가 아닙니다." + success: "%{name} 사용자를 친구에서 제거했습니다." reset_password: - title: reset password + confirm password: 비밀번호 확인 + flash changed: 비밀번호가 바뀌었습니다. + flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까? + heading: "%{user} 사용자 비밀번호 재설정" + password: "비밀번호:" + reset: 비밀번호 재설정 + title: 비밀번호 재설정 + set_home: + flash success: 집 위치를 성공적으로 저장했습니다 + suspended: + body: "

    \n 죄송합니다, 의심스러운 활동으로 인해 계정이 자동으로\n 일시 중지되었습니다.\n

    \n

    \n 이 결정은 곧 관리자가 검토할 것입니다. 또는\n 이 문제를 토론하려면 %{webmaster}에게 문의할 수 있습니다.\n

    " + heading: 계정 정지 + title: 계정 정지 + webmaster: 웹마스터 terms: + agree: 동의 + consider_pd: 위의 계약뿐만 아니라 내 기여가 퍼블릭 도메인에 있는지 고려하세요 + consider_pd_why: 이게 뭐죠? + decline: 거부 + guidance: "약관을 이해하는 데 유용한 정보: 사람이 읽을 수 있는 요약과 일부 비공식 번역" + heading: 기여자 약관 legale_names: france: 프랑스 italy: 이탈리아 + rest_of_world: 나머지 국가 + legale_select: "거주 국가를 선택하세요:" + read and accept: 아래의 계약을 읽고 기존 및 앞으로의 기여가 계약 약관에 동의했는지 확인하려면 동의 버튼을 누르세요. + title: 기여자 약관 + you need to accept or decline: 계속하려면 새 기여자 약관을 읽고 나서 동의나 거부하세요. + view: + activate_user: 이 사용자 활성화 + add as friend: 친구 추가 + ago: (%{time_in_words_ago} 전) + block_history: 사용자가 차단을 받았습니다 + blocks by me: 나한테 차단 + blocks on me: 나를 차단 + comments: 덧글 + confirm: 확인 + confirm_user: 이 사용자 확인 + create_block: 이 사용자를 차단 + created from: "만든 위치:" + ct accepted: "%{ago} 전에 승인함" + ct declined: 거부됨 + ct status: "기여자 약관:" + ct undecided: 정의되지 않음 + deactivate_user: 이 사용자 비활성화 + delete_user: 이 사용자를 삭제 + description: 설명 + diary: 일기 + edits: 편집 + email address: "이메일 주소:" + friends_changesets: 친구의 바뀜집합 + friends_diaries: 친구의 일기 항목 + hide_user: 이 사용자를 숨기기 + if set location: 근처 사용자를 보려면 %{settings_link} 페이지에 집 위치를 설정하세요. + km away: "%{count}km 거리" + latest edit: "최근 편집 %{ago}:" + m away: "%{count}m 거리" + mapper since: "이후 매퍼:" + moderator_history: 사용자가 차단을 주었습니다 + my comments: 내 덧글 + my diary: 내 일기 + my edits: 내 편집 + my messages: 내 메시지 + my notes: 내 참고 + my profile: 내 프로필 + my settings: 내 설정 + my traces: 내 추적 + nearby users: 기타 근처 사용자 + nearby_changesets: 근처 사용자의 바뀜집합 + nearby_diaries: 근처 사용자의 일기 항목 + new diary entry: 새 일기 항목 + no friends: 아직 어떠한 친구도 추가하지 않았습니다. + no nearby users: 아직 근처에 매핑을 인정하는 다른 사용자가 없습니다. + notes: 지도 참고 + oauth settings: oauth 설정 + remove as friend: 친구 제거 + role: + administrator: 이 사용자는 관리자입니다 + grant: + administrator: 관리자 권한 부여 + moderator: 운영자 권한 부여 + moderator: 이 사용자는 운영자입니다 + revoke: + administrator: 관리자 권한 해제 + moderator: 운영자 권한 해제 + send message: 메시지 보내기 + settings_link_text: 설정 + spam score: "스팸 점수:" + status: "상태:" + traces: 추적 + unhide_user: 이 사용자를 숨기기 취소 + user location: 사용자 위치 + your friends: 내 친구 + user_block: + blocks_by: + empty: "%{name} 사용자는 아직 어떠한 차단도 하지 않았습니다." + heading: "%{name} 사용자에 의한 차단 목록" + title: "%{name} 사용자에 의해 차단" + blocks_on: + empty: "%{name} 사용자는 아직 차단되지 않았습니다." + heading: "%{name} 사용자에 대한 차단 목록" + title: "%{name} 사용자에 대해 차단" + create: + flash: "%{name} 사용자를 차단했습니다." + try_contacting: 차단하기 전에 사용자에게 연락하여 사용자가 대답할 수 있는 충분한 시간을 주세요. + try_waiting: 차단하기 전에 사용자에게 대답할 수 있는 충분한 시간을 주세요. + edit: + back: 모든 차단 보기 + heading: "%{name} 사용자에 대한 차단 편집" + needs_view: 이 차단을 해제하기 전에 사용자가 로그인을 해야 합니까? + period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요. + reason: "%{name} 사용자를 차단한 이유입니다. 상황에 대해 가능한 한 냉정하고 합리적으로 최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요." + show: 이 차단 보기 + submit: 차단 업데이트 + title: "%{name} 사용자에 대한 차단 편집" + filter: + block_expired: 차단은 이미 만료되었고 편집할 수 없습니다. + block_period: 차단 기간은 드롭 다운 목록에서 선택할 수 있는 값 중 하나여야 합니다. + helper: + time_future: "%{time}에 끝납니다." + time_past: "%{time} 전에 끝났습니다." + until_login: 사용자가 로그인할 때까지 활성합니다. + index: + empty: 아직 차단하지 않았습니다. + heading: 사용자 차단 목록 + title: 사용자 차단 + model: + non_moderator_revoke: 차단을 해제하려면 운영자여야 합니다. + non_moderator_update: 차단을 만들거나 바꾸려면 운영자여야 합니다. + new: + back: 모든 차단 보기 + heading: "%{name} 사용자 차단" + needs_view: 차단 해제하기 전에 로그인해야 합니다 + period: 사용자가 지금부터 얼마나 오랫동안 API에서 차단하나요. + reason: "%{name} 사용자를 차단한 이유입니다. 메시지가 대중에 공개적으로 보여지기 때문에, 상황에 대해 가능한 한 냉정하고 합리적으로 최대한 정중하게 상황을 설명하도록 하세요. 모든 사용자가 공동체 내에서의 전문 용어를 이해하고 있는 것인 아니기 때문에 알기 쉬운 용어를 사용하도록 노력하세요." + submit: 차단 만들기 + title: "%{name} 사용자 차단" + tried_contacting: 사용자에게 연락하여 이를 멈추도록 요청했습니다. + tried_waiting: 의사 소통에 대답한 사용자에게 충분한 시간을 주었습니다. + not_found: + back: 색인으로 돌아가기 + sorry: 죄송합니다, %{id} ID로 된 사용자 차단을 찾을 수 없습니다. + partial: + confirm: 확실합니까? + creator_name: 만든이 + display_name: 차단된 사용자 + edit: 편집 + next: 다음 » + not_revoked: (철회하지 않음) + previous: « 이전 + reason: 차단 이유 + revoke: 해제! + revoker_name: 해제자 + show: 보기 + showing_page: 페이지 %{page} + status: 상태 + period: + one: 1시간 + other: "%{count}시간" + revoke: + confirm: 이 차단을 해제하겠습니까? + flash: 이 차단을 해제했습니다. + heading: "%{block_by}에 의해 %{block_on}에 차단 해제함" + past: 이 차단은 %{time} 전에 끝났고 지금 해제할 수 없습니다. + revoke: 해제! + time_future: 이 차단은 %{time}에 끝납니다. + title: "%{block_on}에 차단 해제함" + show: + back: 모든 차단 보기 + confirm: 확실합니까? + edit: 편집 + heading: "%{block_on} 사용자가 %{block_by} 사용자에 의해 차단됨" + needs_view: 차단 해제하기 전에 다시 로그인해야합니다. + reason: "차단 이유:" + revoke: 해제! + revoker: "해제:" + show: 보기 + status: 상태 + time_future: "%{time}에 끝남" + time_past: "%{time} 전에 끝남" + title: "%{block_on} 사용자가 %{block_by} 사용자에 의해 차단됨" + update: + only_creator_can_edit: 이 차단을 한 운영자만 편집할 수 있습니다. + success: 차단이 업데이트되었습니다. + user_role: + filter: + already_has_role: 사용자는 이미 %{role} 역할이 있습니다. + doesnt_have_role: 사용자는 %{role} 역할이 없습니다. + not_a_role: "'%{role}' 문자열은 올바른 역할이 아닙니다." + not_an_administrator: 관리자만 사용자 역할 관리를 수행할 수 있습니다, ​​당신은 관리자가 아닙니다. + grant: + are_you_sure: "'%{name}' 사용자한테 '%{role}' 역할을 부여하겠습니까?" + confirm: 확인 + fail: "'%{name} 사용자에게 '%{role}' 역할을 부여할 수 없습니다. 사용자와 역할이 모두 올바른지 확인하세요." + heading: 역할 부여 확인 + title: 역할 부여 확인 + revoke: + are_you_sure: "'%{name}' 사용자한테 '%{role}' 역할을 해제하겠습니까?" + confirm: 확인 + fail: "'%{name} 사용자에게 '%{role}' 역할을 해제할 수 없습니다. 사용자와 역할이 모두 올바른지 확인하세요." + heading: 역할 해제 확인 + title: 역할 해제 확인 + welcome_page: + add_a_note: + paragraph_1_html: "작은 무언가를 고치기를 원하고 가입하고 편집하는 방법을 배울 시간이 없다면,\n참고를 추가하는 것은 쉽습니다." + paragraph_2_html: "지도로 가고 나서 참고 아이콘을 클릭하세요:\n. 드래그하여 이동할 수 있는 표시가 지도에 추가됩니다.\n메시지를 추가하고 나서, 저장을 클릭하면, 다른 매퍼가 조사할 것입니다." + title: 편집할 시간이 없습니까? 참고를 추가하세요! + basic_terms: + editor_html: 편집기는 지도를 편집하는 데 사용할 수 있는 프로그램이나 웹사이트입니다. + node_html: 노드는 음식점 한 곳이나 나무와 같은, 지도에 있는 지점입니다. + paragraph_1_html: OpenStreetMap은 자신의 용어 중 일부가 있습니다. 여기에 편리하게 사용할 수 있는 몇 가지 핵심 단어가 있습니다. + tag_html: "태그는 음식점의 이름이나 도로의 속도 제한과 같은,\n노드나 길에 대한 보충하는 데이터입니다." + title: 매핑에 대한 기본 용어 + way_html: 은 도로, 개울, 호수나 건물과 같은, 선이나 지역입니다. + introduction_html: "세계의 자유롭고 편집할 수 있는 지도인, OpenStreetMap에 오신 것을 환영합니다. 지금 가입하면,\n시작된 매핑을 얻도록 모두 설정됩니다. 여기에서 알아야 하는 가장 중요한 것들로 된\n빠른 가이드가 있습니다." + questions: + paragraph_1_html: "OpenStreetMap은 프로젝트에 대해 배우고, 질문을 묻고 답하고,\n매핑 주제를 협력하여 토론하고 문서하기 위한 여러 자료가 있습니다.\n여기서 도움을 얻으세요." + title: 질문 있나요? + start_mapping: 매핑 시작 + title: 환영합니다! + whats_on_the_map: + off_html: "평점, 역사적이거나 가설적인 기능, 그리고 저작권이 있는 데이터와 같은\n고집된 데이터는 포함되지 않습니다. 특별한 허가가 없으면,\n온라인이나 종이 지도에서 복사하지 마십시오." + on_html: "OpenStreetMap은 현실과 현재 둘 다를 매핑하기 위한 장소입니다 -\n장소에 대한 건물, 도로와 기타 자세한 수백만 정보를 포함합니다. 흥미있는\n현실 세계 기능은 무엇이든 매핑할 수 있습니다." + title: 지도는 무엇입니까 diff --git a/config/locales/ksh.yml b/config/locales/ksh.yml index 506fbbe2747..86e54522e38 100644 --- a/config/locales/ksh.yml +++ b/config/locales/ksh.yml @@ -77,10 +77,10 @@ ksh: details: Einzelheite history: type: - node: Krüzpungk [[id]] + node: Krüzpungk %{id} selected: type: - node: Krüzpungk [[id]] + node: Krüzpungk %{id} type: node: Krüzpungk wait: Donn waade … diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 9fb4f0e41d4..a513362b82a 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -1,26 +1,38 @@ # Messages for Luxembourgish (Lëtzebuergesch) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Davio +# Author: Les Meloures # Author: Robby +# Author: Soued031 lb: + about_page: + next: Weider + open_data_title: Open Data + partners_title: Partner activerecord: attributes: diary_entry: language: Sprooch - title: Titel + latitude: Geografesch Breet + longitude: Geografesch Längt + title: Sujet user: Benotzer friend: friend: Frënd user: Benotzer message: sender: Sender - title: Titel + title: Sujet trace: description: Beschreiwung + latitude: Geografesch Breet + longitude: Geografesch Längt name: Numm public: Ëffentlech size: Gréisst user: Benotzer + visible: Visibel user: active: Aktiv description: Beschreiwung @@ -43,113 +55,48 @@ lb: user_preference: Benotzerastellung way: Wee browse: + anonymous: anonym changeset: - download: Als %{changeset_xml_link} oder %{osmchange_xml_link} eroflueden. + belongs_to: Auteur osmchangexml: osmChange XML - changeset_details: - belongs_to: "Gehéiert dem:" - box: Këscht - closed_at: "Zougemaach den:" - common_details: - changeset_comment: "Bemierkung:" - deleted_by: "Geläscht vum:" - edited_at: "Geännert den:" - edited_by: "Geännert vum:" - version: "Versioun:" + relation: Relatiounen (%{count}) + relation_paginated: Relatiounen (%{x}-%{y} vu(n) %{count}) + way: Weeër (%{count}) + closed: Zou containing_relation: entry: Relatioun %{relation_name} entry_role: Relatioun %{relation_name} (als %{relation_role}) - map: - deleted: Geläscht - larger: - area: Géigend op méi enger grousser Kaart weisen - node: Knuet op méi enger grousser Kaart weisen - relation: D'Relatioun op méi enger grousser Kaart weisen - way: Wee op méi enger grousser Kaart weisen - loading: Lueden... - navigation: - all: - next_node_tooltip: Nächste Knuet - next_relation_tooltip: Nächst Relatioun - next_way_tooltip: Nächste Wee - prev_node_tooltip: Virege Knuet - prev_relation_tooltip: Vireg Relatioun - prev_way_tooltip: Virege Wee - user: - name_changeset_tooltip: Ännerunge vum %{user} weisen - next_changeset_tooltip: Nächst Ännerung vum %{user} - prev_changeset_tooltip: Vireg Ännerung vum %{user} - node: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" - download_xml: XML eroflueden - edit: änneren - node: Knuet - node_title: "Knuet: %{node_name}" - view_history: Versioune weisen - node_details: - coordinates: "Koordinaten:" - part_of: "Deel vu(n):" - node_history: - download: "%{download_xml_link} oder %{view_details_link}" - download_xml: XML eroflueden - view_details: Detailer weisen + deleted_by_html: Geläscht viru(n) %{time} vum %{user} + download_xml: XML eroflueden + edited_by_html: Geännert viru(n) %{time} vum %{user} + location: "Plaz:" + no_comment: (keng Bemierkung) not_found: - sorry: Pardon, den %{type} mat der Id %{id}, konnt net fonnt ginn. + sorry: Pardon, den %{type}#%{id}, konnt net fonnt ginn. type: node: Knuet relation: Relatioun way: Wee - paging_nav: - of: vu(n) - showing_page: Säit gëtt gewisen + note: + new_note: Nei Notiz + title: "Notiz: %{id}" + part_of: Deel vu(n) redacted: type: + relation: Relatioun way: Wee relation: - download: "%{download_xml_link} oder %{view_history_link}" - download_xml: XML eroflueden - relation: Relatioun - relation_title: "Relatioun: %{relation_name}" - view_history: Versioune weisen - relation_details: - members: "Memberen:" - part_of: "Deel vu(n):" - relation_history: - download: "%{download_xml_link} oder %{view_details_link}" - download_xml: XML eroflueden - view_details: Detailer weisen + members: Memberen + title: "Relatioun: %{name}" relation_member: entry_role: "%{type} %{name} als %{role}" type: node: Knuet relation: Relatioun way: Wee - start: - manually_select: En anere Beräich manuell eraussichen start_rjs: - data_frame_title: Donnéeën - data_layer_name: Donnéeë vun de Kaarten duerchkucken - details: Detailer - edited_by_user_at_timestamp: Vum [[user]] de(n) [[timestamp]] geännert load_data: Donnéeë lueden loading: Lueden... - object_list: - details: Detailer - heading: Lëscht mat Objeten - history: - type: - node: Knuet [[id]] - way: Wee [[id]] - selected: - type: - node: Knuet [[id]] - way: Wee [[id]] - type: - node: Knuet - way: Wee - private_user: private Benotzer - show_history: Versioune weisen - wait: Waart w.e.g. ... tag_details: wiki_link: key: D'Wiki-Beschreiwungssäit fir den %{key}-Tag @@ -160,39 +107,29 @@ lb: node: Knuet relation: Relatioun way: Wee + version: Versioun + view_details: Detailer weisen + view_history: Versioune weisen way: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" - download_xml: XML eroflueden - edit: änneren - view_history: Versioune weisen - way: Wee - way_title: "Wee: %{way_name}" - way_details: - nodes: "Kniet:" - part_of: "Deel vu(n):" - way_history: - download: "%{download_xml_link} oder %{view_details_link}" - download_xml: XML eroflueden - view_details: Detailer weisen + title: "Wee: %{name}" changeset: changeset: anonymous: Anonym - big_area: (grouss) - no_comment: (keen) no_edits: (keng Ännerungen) changeset_paging_nav: next: Nächst » previous: « Vireg - showing_page: D'Säit %{page} gëtt gewisen + showing_page: Säit %{page} changesets: area: Beräich comment: Bemierkung saved_at: Gespäichert de(n) user: Benotzer list: - description: Rezent Ännerungen + load_more: Méi lueden diary_entry: comments: + ago: viru(n) %{ago} comment: Bemierkung newer_comments: Méi nei Bemierkungen older_comments: Méi al Bemierkungen @@ -201,15 +138,24 @@ lb: confirm: Confirméieren hide_link: Dës Bemierkung verstoppen diary_entry: + comment_count: + one: "%{count} Bemierkung" + other: "%{count} Bemierkungen" + zero: Keng Bemierkungen confirm: Confirméieren edit: language: "Sprooch:" + latitude: "Breedegrad:" location: "Plaz:" + longitude: "Längtegrad:" save_button: Späicheren subject: "Sujet:" use_map_link: Kaart benotzen + list: + title: Blogge vun de Benotzer location: edit: Änneren + location: "Plaz:" view: Weisen view: leave_a_comment: Eng Bemierkung maachen @@ -218,17 +164,25 @@ lb: start: export_button: Exportéieren format: Format - image_size: "Gréisst vum Bild:" + image_size: Gréisst vum Bild licence: Lizenz max: max options: Optiounen scale: Maassstab too_large: - heading: Beräich ze grouss + other: + description: Zousätzlech Quelle stinn an der OpenStreetMap Wiki + title: Aner Quellen + planet: + description: Regelméisseg aktualiséiert Kopie vun der kompletter OpenStreetMap Datebank zoom: Zoom - start_rjs: - export: Exportéieren - view_larger_map: Méi grouss Kaart weisen + title: Exportéieren + fixthemap: + how_to_help: + title: Wéi Hëllefen + other_concerns: + title: Aner Uleies + title: E Problem mellen / D'Kaart verbesseren geocoder: description: types: @@ -242,6 +196,10 @@ lb: south_east: südost south_west: südwest west: westlech + distance: + one: ongeféier 1km + other: ongeféier %{count}km + zero: manner wéi 1km results: more_results: Méi Resultater no_results: Näischt fonnt @@ -249,21 +207,26 @@ lb: title: ca_postcode: Resultater vu Geocoder.ca geonames: Resultater vu GeoNames + geonames_reverse: Resultater vun GeoNames latlon: Resultater vun Internal - osm_namefinder: Resultater vun OpenStreetMap Namefinder uk_postcode: Resultater vun NPEMap / FreeThe Postcode us_postcode: Resultater vu Geocoder.us - search_osm_namefinder: - suffix_place: ", %{distance} %{direction} vu(n) %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Fluchhafen amenity: airport: Fluchhafen + artwork: Konschtwierk + atm: Bancomat auditorium: Auditoire bank: Bank + bar: Bar + bench: Bänk bureau_de_change: Wiesselbüro bus_station: Busarrêt cafe: Café + casino: Casino cinema: Kino clinic: Klinik crematorium: Crematoire @@ -296,6 +259,7 @@ lb: sauna: Sauna school: Schoul shop: Geschäft + social_facility: Sozial Ariichtung studio: Studio supermarket: Supermarché taxi: Taxi @@ -307,20 +271,26 @@ lb: vending_machine: Verkaafsautomat veterinary: Déiereklinik bridge: + suspension: Hänkbréck viaduct: Viadukt "yes": Bréck building: "yes": Gebai + emergency: + phone: Noutruff-Telefon highway: footway: Fousswee motorway: Autobunn path: Pad pedestrian: Fousswee + platform: Quai primary: Haaptstrooss primary_link: Haaptstrooss + proposed: Virgeschlo Strooss road: Strooss secondary_link: Niewestrooss steps: Trap + street_lamp: Stroosseluucht historic: archaeological_site: Archeologesche Site battlefield: Schluechtfeld @@ -331,16 +301,21 @@ lb: monument: Monument museum: Musée ruins: Ruinen + tomb: Graf tower: Tuerm wreck: Wrack landuse: cemetery: Kierfecht farm: Bauerenhaff forest: Bësch + garages: Garagen military: Militairegebitt park: Park + piste: Pist + quarry: Steekaul railway: Eisebunn vineyard: Wéngert + wetland: Fiichtgebitt wood: Bësch leisure: garden: Gaart @@ -350,6 +325,7 @@ lb: nature_reserve: Naturschutzgebitt park: Park playground: Spillplaz + sauna: Sauna stadium: Stadion swimming_pool: Schwëmm natural: @@ -357,6 +333,7 @@ lb: channel: Kanal crater: Krater fjord: Fjord + forest: Bësch geyser: Geysir glacier: Gletscher hill: Hiwwel @@ -367,19 +344,30 @@ lb: river: Floss rock: Steng spring: Quell + stone: Steen tree: Bam valley: Dall volcano: Vulkan water: Waasser + wetland: Fiichtgebitt + wetlands: Fiichtgebitter wood: Bësch + office: + architect: Architekt + company: Firma + travel_agent: Reesbüro + "yes": Büro place: airport: Fluchhafen + city: Stad country: Land farm: Bauerenhaff house: Haus houses: Haiser island: Insel municipality: Gemeng + neighbourhood: Noperschaft + postcode: Postcode region: Regioun sea: Mier town: Stad @@ -388,15 +376,18 @@ lb: abandoned: Fréier Eisebunn disused: Fréier Eisebunn miniature: Miniatur-Eisebunn + proposed: Proposéiert Eisebunnslinn station: Gare (Eisebunn) subway: Metro-Statioun - tram: Tram + tram: Tramvia shop: bakery: Bäckerei books: Bichergeschäft + boutique: Boutique car_repair: Garage chemist: Apdikt clothes: Kleedergeschäft + computer: Computergeschäft dry_cleaning: Botzerei fish: Fëschgeschäft florist: Fleurist @@ -406,12 +397,17 @@ lb: insurance: Versécherungsbüro jewelry: Bijouterie laundry: Botzerei + market: Maart optician: Optiker + pharmacy: Apdikt photo: Fotosgeschäft + second_hand: Secondhand-Geschäft shoes: Schonggeschäft sports: Sportsgeschäft supermarket: Supermarché + tailor: Schneider travel_agency: Reesbüro + "yes": Geschäft tourism: artwork: Konschtwierk attraction: Attraktioun @@ -429,36 +425,75 @@ lb: river: Floss wadi: Wadi waterfall: Waasserfall + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + title: Hëllef kréien + welcome: + title: Wëllkomm bäi OSM + url: /welcome + wiki: + url: http://wiki.openstreetmap.org/ javascripts: + close: Zoumaachen + map: + base: + cycle_map: Vëloskaart + hot: Humanitär + donate_link_text: + locate: + popup: Dir sidd {distance} {unit} vun dësem Punkt ewech + title: Weise wou ech sinn + notes: + show: + hide: Verstoppen + reactivate: Reaktivéieren + resolve: Léisen + share: + cancel: Ofbriechen + custom_dimensions: Personaliséiert Dimensiounen astellen + download: Eroflueden + embed: HTML + format: "Format:" + image: Bild + link: Link oder HTML + long_link: Link + scale: "Maassstab:" + short_url: Kuerz URL + view_larger_map: Méi grouss Kaart weisen site: edit_disabled_tooltip: Erazoomen fir d'Kaart z'änneren edit_tooltip: Kaart änneren layouts: - copyright: Copyright & Lizenz - documentation: Dokumentatioun - documentation_title: Dokumentatioun vum Projet - donate_link_text: Don + about: Iwwer + community: Communautéit + copyright: Copyright + data: Donnéeën edit: Änneren export: Exportéieren + export_data: Donnéeën exportéieren foundation: Fondatioun help: Hëllef - home: Doheem + home: Op déi Plaz zréckgoen déi als Doheem definéiert ass + learn_more: Méi wëssen + log_in: Aloggen logo: alt_text: OpenStreetMap Logo - logout_tooltip: Ausloggen + logout: Ausloggen make_a_donation: text: En Don maachen title: Ënnerstëtzt OpenStreetMap mat engem Don + more: Méi partners_partners: Partner user_diaries: Benotzer Bloggen - view_tooltip: Kaart weisen - welcome_user: Wëllkomm, %{user_link} - welcome_user_link_tooltip: Är Benotzersäit - wiki: Wiki license_page: foreign: english_link: den engleschen Original title: Iwwer dës Iwwersetzung + legal_babble: + more_title_html: Fir méi ze wëssen + title_html: Copyright a Lizenz native: native_link: lëtzebuergesch Versioun title: Iwwer dës Säit @@ -468,6 +503,7 @@ lb: inbox: date: Datum from: Vum + messages: Dir hutt %{new_messages} a(n) %{old_messages} subject: Sujet message_summary: delete_button: Läschen @@ -480,18 +516,23 @@ lb: subject: Sujet title: Noriicht schécken no_such_message: - heading: Keen esou ee Message - title: Keen esou ee Message + heading: Kee sou ee Message + title: Kee sou ee Message outbox: date: Datum subject: Sujet read: + back: Zréck date: Datum + from: Vum reply_button: Äntwerten subject: Sujet title: Message liesen sent_message_summary: delete_button: Läschen + note: + rss: + title: OpenStreetMap Notizen notifier: diary_comment_notification: hi: Salut %{to_user}, @@ -509,14 +550,15 @@ lb: lost_password_plain: greeting: Salut, message_notification: - footer1: Dir kënnt de Message och op %{readurl} liesen + footer_html: Dir kënnt de Message och op %{readurl} liesen an Dir kënnt op %{replyurl} äntwerten hi: Salut %{to_user}, - signup_confirm_html: + note_comment_notification: + greeting: Salut, + signup_confirm: greeting: Bonjour ! - more_videos: Et gëtt nach méi %{more_videos_link}. - more_videos_here: méi Videoen hei - signup_confirm_plain: - more_videos: "Hei si méi Videoen:" + oauth: + oauthorize: + allow_write_api: d'Kaart änneren. oauth_clients: edit: submit: Änneren @@ -528,6 +570,7 @@ lb: show: allow_write_api: Kaart änneren confirm: Sidd Dir sécher? + delete: Client läschen edit: Detailer änneren redaction: edit: @@ -542,6 +585,8 @@ lb: site: edit: user_page_link: Benotzersäit + index: + createnote: Eng Notiz derbäisetzen key: table: entry: @@ -569,9 +614,13 @@ lb: 1: Tram wood: Bësch markdown_help: + heading: Iwwerschrëft image: Bild link: Link text: Text + url: URL + richtext_area: + edit: Änneren search: search: Sichen submit_text: Lass @@ -583,6 +632,8 @@ lb: formats: friendly: "%e %B %Y ëm %H:%M" trace: + description: + description_without_count: GPX-Fichier vum %{user} edit: description: "Beschreiwung:" download: eroflueden @@ -618,9 +669,7 @@ lb: visibility: "Visibilitéit:" visibility_help: wat heescht dat? trace_paging_nav: - next: Nächst » - previous: « Vireg - showing_page: D'Säit %{page} gëtt gewisen + showing_page: Säit %{page} view: description: "Beschreiwung:" download: eroflueden @@ -638,15 +687,17 @@ lb: account: contributor terms: link text: wat ass dëst? - current email address: "Aktuell E-Mailadress:" + current email address: "Aktuell E-Mail-Adress:" delete image: Dat aktuellt Bild ewechhuelen email never displayed publicly: (ni ëffentlech gewisen) flash update success: Benotzerinformatioun ass elo aktualiséiert. + gravatar: + link text: wat ass dat? image: "Bild:" keep image: Dat aktuellt Bild behalen make edits public button: All meng Ännerunge ëffentlech maachen my settings: Meng Astellungen - new email address: "Nei E-Mailadress:" + new email address: "Nei E-Mail-Adress:" new image: E Bild derbäisetzen openid: link text: wat ass dat? @@ -662,8 +713,10 @@ lb: confirm: already active: Dëse Kont gouf scho confirméiert. button: Confirméieren - heading: E Benotzerkont confirméieren + heading: Iwwerpréift Är E-Mail! + introduction_1: Mir hunn Iech eng Confirmatiouns-E-Mail geschéckt. press confirm button: Klickt w.e.g. op de Knäppchen confirméieren fir Äre Benotzerkont z'aktivéieren. + unknown token: Dee Confirmatiouns-Code ass ofgelaf oder et gëtt en net. confirm_email: button: Confirméieren heading: Eng Ännerung vun enger E-Mailadress confirméieren @@ -675,16 +728,16 @@ lb: flash success: All Är Ännerunge sinn elo ëffentlech, an Dir däerft elo änneren. list: confirm: Erausgesichte Benotzer confirméieren - empty: Et goufe keng esou Benotzer fonnt + empty: Et goufe keng sou Benotzer fonnt heading: Benotzer hide: Erausgesichte Benotzer vrstoppen title: Benotzer login: - email or username: "E-Mailadress oder Benotzernumm:" + email or username: "E-Mail-Adress oder Benotzernumm:" heading: Umellen login_button: Umellen lost password link: Hutt Dir Äert Passwuert vergiess? - new to osm: Nei bäi OpenStreetMap? + new to osm: Nei bei OpenStreetMap? openid_providers: google: title: Alogge mat Google @@ -698,28 +751,32 @@ lb: logout_button: Ofmellen title: Ofmellen lost_password: - email address: "E-Mailadress:" + email address: "E-Mail-Adress:" heading: Passwuert vergiess? new password button: Passwuert zrécksetzen - notice email cannot find: Déi E-Mailadress konnt net fonnt ginn, pardon + notice email cannot find: Déi E-Mail-Adress konnt net fonnt ginn, pardon title: Passwuert vergiess make_friend: already_a_friend: Dir sidd schonn de Frënd vum %{name}. + button: Als Frënd derbäisetzen failed: Pardon, %{name} konnt net als Frënd derbäigesat ginn. - success: "%{name} ass elo Äre Frënd." + heading: "%{user} als Frënd derbäisetzen?" + success: "%{name} ass elo Äre Frënd!" new: - confirm email address: "E-Mailadress confirméieren:" + about: + header: Fäi a verännerbar + confirm email address: "E-Mail-Adress confirméieren:" confirm password: "Passwuert confirméieren:" - continue: Weider + continue: Mellt Iech un display name: Numm weisen - email address: "E-Mailadress:" - heading: E Benotzerkont uleeën + email address: "E-Mail-Adress:" no_auto_account_create: Leider kënne mir den Ament kee Benotzerkont automatesch fir Iech opmaachen. + openid: "%{logo} OpenID:" password: "Passwuert:" - title: Benotzerkont opmaachen + title: Mellt Iech un no_such_user: heading: De Benotzer %{user} gëtt et net - title: Esou e Benotzer gëtt et net + title: Sou e Benotzer gëtt et net popup: friend: Frënn remove_friend: @@ -744,9 +801,10 @@ lb: legale_select: "Sicht w.e.g. d'Land eraus wou Dir wunnt:" view: activate_user: dëse Benotzer aktivéieren - add as friend: als Frënd derbäisetzen + add as friend: Frënd derbäisetzen ago: (viru(n) %{time_in_words_ago}) - blocks by me: vu mir gespaart + blocks by me: vu Mir Gespaart + comments: Bemierkungen confirm: Confirméieren confirm_user: dëse Benotzer confirméieren create_block: dëse Benotzer spären @@ -755,16 +813,21 @@ lb: description: Beschreiwung diary: Blog edits: Ännerungen - email address: "E-Mailadress:" + email address: "E-Mail-Adress:" hide_user: dëse Benotzer verstoppen km away: "%{count} km ewech" m away: "%{count} m ewech" - my diary: mäi Blog - my edits: meng Ännerungen - my settings: meng Astellungen + my comments: Meng Bemierkungen + my diary: Mäi Blog + my edits: Meng Ännerungen + my messages: Meng Messagen + my notes: Meng Notizen + my profile: Mäi Profil + my settings: Meng Astellungen nearby users: Aner Benotzer nobäi no friends: Dir hutt nach keng Frënn derbäi gesat. - remove as friend: als Frënd ewechhuelen + notes: Notizen op der Kaart + remove as friend: Frënd ewechhuelen role: administrator: Dëse Benotzer ass en Administrateur grant: @@ -774,16 +837,18 @@ lb: revoke: administrator: Administrateur-Zougang ofhuelen moderator: Moderateursrechter ewechhuelen - send message: Noriicht schécken + send message: Message schécken settings_link_text: Astellungen status: "Status:" unhide_user: dëse Benotzer net méi verstoppen your friends: Är Frënn user_block: blocks_by: + heading: Lëscht vun de Spären vum %(name) title: Späre vum %{name} blocks_on: empty: "%{name} gouf bis elo nach net gespaart." + title: Späre vum %{name} edit: back: All Späre weisen show: Dës Spär weisen @@ -799,9 +864,13 @@ lb: confirm: Sidd Dir sécher? display_name: Gespaarte Benotzer edit: Änneren + next: Nächst » + previous: « Vireg reason: Grond fir d'Spär revoke: Ophiewen! show: Weisen + showing_page: Säit %{page} + status: Status period: one: 1 Stonn other: "%{count} Stonnen" @@ -815,6 +884,7 @@ lb: reason: "Grond fir d'Spär:" revoke: Ophiewen! show: Weisen + status: Status title: "%{block_on} gespaart vum %{block_by}" update: success: Spär aktualiséiert @@ -835,3 +905,11 @@ lb: fail: D'Roll '%{role}' konnt met vum Benotzer '%{name}' ewechgeholl ginn. Kuckt w.e.g. no ob de Benotzer an d'Roll allen zwee valabel sinn. heading: Confirméiert d'Zréckzéie vun der Roll title: Confirméiert d'Zréckzéie vun der Roll + welcome_page: + add_a_note: + title: Keng Zäit fir z'änneren? Setzt eng Notiz derbäi! + questions: + title: Nach Froen? + title: Wëllkomm! + whats_on_the_map: + title: Wat ass op der Kaart diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 62f76163613..5ec834be12e 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -2,7 +2,9 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Cyklopas +# Author: Eitvys200 # Author: Garas +# Author: Mantak111 # Author: Matasg # Author: Pauliuz # Author: Pdxx @@ -79,90 +81,22 @@ lt: application: require_cookies: cookies_needed: Panašu, kad išjungėte slapukus. Prieš tęsdami, įjunkite savo naršyklėje slapukus. + require_moderator: + not_a_moderator: Norėdami atlikti šį veiksmą, turite būti administratoriumi. setup_user_auth: blocked: Jūsų prieiga prie API užblokuota. Prisijunkite prie žiniatinklio sąsajos, kad sužinotumėte daugiau. need_to_see_terms: Jūsų priėjimas prie API laikinai pristabdytas. Jūs turite prisiregistruoti prie tinklo sąsajos ir peržiūrėti talkininkų sąlygas. Jūs neprivalote su jomis sutikti, bet perskaityti - privalote. browse: changeset: - changeset: "Pakeitimas: %{id}" changesetxml: Pakeitimo XML - download: Parsisiųsti %{changeset_xml_link} arba %{osmchange_xml_link} feed: title: Pakeitimas %{id} title_comment: Pakeitimas %{id} - %{comment} osmchangexml: osmChange XML title: Pakeitimas - changeset_details: - belongs_to: "Priklauso:" - bounding_box: "Pakeitimo sritis:" - box: sritis - closed_at: "Baigtas:" - created_at: "Sukurta:" - has_nodes: - one: "Pakeitime yra šis %{count} taškas:" - other: "Pakeitime yra šie %{count} taškai:" - has_relations: - one: "Pakeitime yra šis %{count} ryšys:" - other: "Pakeitime yra šie %{count} ryšiai:" - has_ways: - one: "Pakeitime yra šis %{count} kelias:" - other: "Pakeitime yra šie %{count} keliai:" - no_bounding_box: Prie šio pakeitimo sritis nėra nurodyta - show_area_box: Rodyti teritorijos langelį - common_details: - changeset_comment: "Komentaras:" - deleted_at: "Panaikinta:" - deleted_by: "Panaikino:" - edited_at: "Redagavo:" - edited_by: "Redagavo:" - in_changeset: "Pakeitime:" - version: "Versija:" containing_relation: entry: Ryšys %{relation_name} entry_role: Ryšys %{relation_name} (kaip %{relation_role}) - map: - deleted: Panaikintas - edit: - area: Keisti sritį - node: Keisti tašką - relation: Keisti ryšį - way: Keisti kelią - larger: - area: Peržiūrėti sritį ant didesnio žemėlapio - node: Peržiūrėti tašką ant didesnio žemėlapio - relation: Peržiūrėti ryšį ant didesnio žemėlapio - way: Peržiūrėti kelią ant didesnio žemėlapio - loading: Kraunama... - navigation: - all: - next_changeset_tooltip: Kitas pakeitimas - next_node_tooltip: Sekantis taškas - next_relation_tooltip: Sekantis ryšys - next_way_tooltip: Sekantis kelias - prev_changeset_tooltip: Ankstesnis pakeitimas - prev_node_tooltip: Ankstesnis taškas - prev_relation_tooltip: Ankstesnis ryšys - prev_way_tooltip: Ankstesnis kelias - user: - name_changeset_tooltip: Peržiūrėti naudotojo %{user} pakeitimus - next_changeset_tooltip: Kitas naudotojo %{user} pakeitimas - prev_changeset_tooltip: Anksčiau redagavo %{user} - node: - download: "%{download_xml_link}, %{view_history_link} arba %{edit_link}" - download_xml: Atsisiųsti XML - edit: redaguoti - node: Taškas - node_title: "Taškas: %{node_name}" - view_history: Istorija - node_details: - coordinates: "Koordinatės:" - part_of: "Dalis:" - node_history: - download: "%{download_xml_link} arba %{view_details_link}" - download_xml: Atsisiųsti XML - node_history: Taško istorija - node_history_title: "Taško istorija: %{node_name}" - view_details: išsamiau not_found: sorry: Atsiprašome, bet toks %{type}, kurio id %{id}, nerastas. type: @@ -170,74 +104,26 @@ lt: node: taškas relation: ryšys way: kelias - paging_nav: - of: iš - showing_page: Rodomas puslapis + note: + closed_title: "Išspręsta pastaba: %{note_name}" + open_title: "Neišspręsta pastaba: %{note_name}" + title: Pastaba redacted: message_html: Versijos "%{version}" tipas %{type} negali būti rodomas, kai jis buvo redaguotas. Žiūrėkite %{redaction_link} dėl išsamesnės informacijos. - redaction: Redakcija % {id} + redaction: Redakcija %{id} type: node: taškas relation: ryšys way: kelias - relation: - download: "%{download_xml_link} arba %{view_history_link}" - download_xml: Atsisiųsti XML - relation: Ryšys - relation_title: "Ryšys: %{relation_name}" - view_history: istorija - relation_details: - members: "Nariai:" - part_of: "Dalis:" - relation_history: - download: "%{download_xml_link} arba %{view_details_link}" - download_xml: Atsisiųsti XML - relation_history: Ryšio istorija - relation_history_title: "Ryšio istorija: %{relation_name}" - view_details: išsamiau relation_member: entry_role: "%{type} %{name} kaip %{role}" type: node: Taškas relation: Ryšys way: Kelias - start: - manually_select: Rankiniu būdu parinkite kitą plotą - view_data: Peržiūrėti duomenis pasirinktame žemėlapyje start_rjs: - data_frame_title: Duomenys - data_layer_name: Duomenys - details: Detalės - drag_a_box: Tempkite lauką ant žemėlapio, kad pažymėtumėte plotą - edited_by_user_at_timestamp: Keitė [[user]]. Keitimo laikas [[timestamp]] - hide_areas: Slėpti sritis - history_for_feature: Istorija apie [[feature]] load_data: Kraunami duomenys - loaded_an_area_with_num_features: Jūs įkėlėte sritį, kurioje yra [[num_features]] elementų. Dažniausiai naršyklės nelabai gerai susitvarko su tokiu duomenų kiekiu. Paprastai naršyklės kur kas geriau susidoroja, kai elementų yra mažiau nei 100 vienu metu. Bet kokie kiti veiksmai gali stipriai sulėtinti naršyklę. Jei tikrai norite žiūrėti šiuos duomenis, spauskite žemiau esantį mygtuką. loading: Kraunama... - manually_select: Rankiniu būdu pažymėkite kitą teritoriją - object_list: - api: Ištraukti šį rajoną iš API - back: Rodyti objektų sąrašą - details: Detalės - heading: Objektų sąrašas - history: - type: - node: Taškas [[id]] - way: Kelias [[id]] - selected: - type: - node: Taškas [[id]] - way: Kelias [[id]] - type: - node: Taškas - way: Kelias - private_user: privatus vartotojas - show_areas: Rodyti sritis - show_history: Rodyti istoriją - unable_to_load_size: "Nepavyko įkelti: Aprėpties langelio dydis [[bbox_size]] yra per didelis (turi būti mažesnis nei %{max_bbox_size})" - wait: Palaukite ... - zoom_or_select: Rodymui, pasididinkite vaizdą arba pasižymėkite plotą tag_details: tags: "Žymos:" wiki_link: @@ -251,38 +137,15 @@ lt: node: taškas relation: ryšys way: kelias - way: - download: "%{download_xml_link}, %{view_history_link} arba %{edit_link}" - download_xml: Atsisiųsti XML - edit: redaguoti - view_history: rodyti istoriją - way: Kelias - way_title: "Kelias: %{way_name}" - way_details: - also_part_of: - one: taipogi dalis kelio %{related_ways} - other: taipogi dalis kelių %{related_ways} - nodes: "Taškai:" - part_of: "Dalis:" - way_history: - download: "%{download_xml_link} arba %{view_details_link}" - download_xml: Atsisiųsti XML - view_details: išsamiau - way_history: Kelio istorija - way_history_title: "Kelio istorija: %{way_name}" changeset: changeset: anonymous: Anonimiškas - big_area: (didelis) - no_comment: (nėra) no_edits: (nėra pakeitimų) - show_area_box: Rodyti teritorijos langelį - still_editing: (vis dar keičia) view_changeset_details: Žiūrėti pakeitimo detales changeset_paging_nav: next: Kitas » previous: « Ankstesnis - showing_page: Rodomas puslapis %{page} + showing_page: Puslapis %{page} changesets: area: Plotas comment: Komentaras @@ -290,24 +153,10 @@ lt: saved_at: Įrašymo laikas user: Naudotojas list: - description: Paskutiniai pakeitimai - description_bbox: Pakeitimai daryti plote %{bbox} - description_friend: Jūsų draugų pakeitimai - description_nearby: Netoliese esančių naudotojų pakeitimai - description_user: Naudotojo %{user} pakeitimai - description_user_bbox: Naudotojo %{user} pakeitimai srityje %{bbox} - heading: Pakeitimai - heading_bbox: Pakeitimai - heading_friend: Pakeitimai - heading_nearby: Pakeitimai - heading_user: Pakeitimai - heading_user_bbox: Pakeitimai title: Pakeitimai - title_bbox: Pakeitimai daryti plote %{bbox} title_friend: Jūsų draugų pakeitimai title_nearby: Netoliese esančių naudotojų pakeitimai title_user: Naudotojo %{user} pakeitimai - title_user_bbox: Naudotojo %{user} pakeitimai daryti plote %{bbox} timeout: sorry: Atsiprašome, bet jūsų prašytų pakeitimų ištraukimas užtruko per ilgai. diary_entry: @@ -317,14 +166,17 @@ lt: has_commented_on: "%{display_name} pakomentavo vieno iš jūsų dienoraščio įrašų." newer_comments: Naujesni komentarai older_comments: Senesni komentarai + post: Rašyti + when: Kada diary_comment: comment_from: Naudotojo %{link_user} komentaras, parašytas %{comment_created_at} confirm: Patvirtinti hide_link: Slėpti šį komentarą diary_entry: comment_count: - one: 1 komentaras - other: "%{count} komentarai" + one: "%{count} komentaras" + other: "%{count} komentarai (-ų)" + zero: Nėra komentarų comment_link: Komentuoti šį įrašą confirm: Patvirtinti edit_link: Keisti šį įrašą @@ -359,7 +211,7 @@ lt: newer_entries: Naujesni įrašai no_entries: Nėra dienoraščio įrašų older_entries: Senesni įrašai - recent_entries: "Paskutiniai dienoraščio įrašai:" + recent_entries: Paskutiniai dienoraščio įrašai title: Naudotojo dienoraščiai title_friends: Draugų dienoraščiai title_nearby: Netoliese esančių naudotojų dienoraščiai @@ -383,6 +235,9 @@ lt: user_title: "%{user} dienoraštis" editor: default: Numatytasis (šiuo metu %{name}) + id: + description: iD (naršyklės redaktorius) + name: iD potlatch: description: Potlatch 1 (redaktorius naršyklėje) name: Potlatch 1 @@ -390,7 +245,7 @@ lt: description: Potlatch 2 (redaktorius naršyklėje) name: Potlatch 2 remote: - description: nuotoliniu valdymu (JOSM arba Merkaartor) + description: nuotolinį valdymą (JOSM arba Merkaartor) name: nuotoliniu valdymu export: start: @@ -398,7 +253,7 @@ lt: area_to_export: Eksportuotinas plotas embeddable_html: Pritaikomas HTML export_button: Eksportuoti - export_details: OpenStreetMap duomenų licencija - Creative Commons Attribution-ShareAlike 2.0 license. + export_details: OpenStreetMap duomenų licencija - Open Data Commons Open Database License (ODbL). format: Formatas format_to_export: Eksporto formatas image_size: Žemėlapio dydis @@ -406,6 +261,7 @@ lt: licence: Licencija longitude: "Ilg:" manually_select: Rankiniu būdu parinkti kitą sritį + map_image: Žemėlapio vaizdas (rodo standartinį sluoksnį) max: maksimalus options: Parinktys osm_xml_data: OpenStreetMap XML duomenys @@ -414,16 +270,7 @@ lt: scale: Mastelis too_large: body: Ši sritis per didelė, kad būtų galima eksportuoti OpenStreetMap XML duomenis. Parinkite mažesnę sritį. - heading: Per didelis plotas zoom: Padidinti - start_rjs: - add_marker: Pridėti žymeklį žemėlapyje - change_marker: Keisti žymeklio poziciją - click_add_marker: Spauskite ant žemėlapio, kad padėtumėte žymeklį - drag_a_box: Pažymėkite žemėlapyje norimą plotą - export: Eksportuoti - manually_select: Rankiniu būdu parinkti kitą sritį - view_larger_map: Žiūrėti didesnį žemėlapį geocoder: description: title: @@ -454,14 +301,18 @@ lt: ca_postcode: Geocoder.CA rezultatai geonames: GeoNames rezultatai latlon: Vidiniai rezultatai - osm_namefinder: OpenStreetMap Namefinder rezultatai osm_nominatim: OpenStreetMap Nominatim rezultatai uk_postcode: NPEMap / FreeThe Postcode rezultatai us_postcode: Geocoder.us rezultatai - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection}, %{parentname}" - suffix_place: ", %{distance}, į %{direction}, %{placename}" search_osm_nominatim: + admin_levels: + level10: Priemiesčio riba + level2: Šalies sienos + level4: Valstybės sienos + level5: Regiono ribos + level6: Apskrities ribos + level8: Miesto sienos + level9: Kaimo riba prefix: aeroway: aerodrome: Aerodromas @@ -484,7 +335,7 @@ lt: bench: Suoliukas bicycle_parking: Dviračių stovėjimo aikštelė bicycle_rental: Dviračių nuoma - biergarten: Alaus sodas + biergarten: Lauko baras brothel: Viešieji namai bureau_de_change: Valiutos keitimo punktas bus_station: Autobusų stotis @@ -585,23 +436,23 @@ lt: building: "yes": Pastatas highway: - bridleway: Žirgų kelias + bridleway: Jodinėjimo takas bus_guideway: Bėginio autobuso linija bus_stop: Autobusų stotelė byway: Keliukas - construction: Statomas greitkelis + construction: Statomas kelias cycleway: Dviračių takas emergency_access_point: Skubios prieigos punktas - footway: Pėsčiųjų takelis + footway: Pėsčiųjų takas ford: Brasta - living_street: Gyvenamoji gatvė - milestone: Etapinis ženklas + living_street: Gyvenamosios zonos gatvė + milestone: Riboženklis minor: Šalutinis kelias motorway: Automagistralė - motorway_junction: Automagistralės rampa + motorway_junction: Automagistralės nuovaža motorway_link: Automagistralinis kelias - path: Takelis - pedestrian: Pėsčiųjų kelias + path: Takas + pedestrian: Pėsčiųjų gatvė platform: Platforma primary: Pirmosios reikšmės kelias primary_link: Pirmosios reikšmės kelias @@ -627,7 +478,7 @@ lt: historic: archaeological_site: Archeologinė vieta battlefield: Mūšio vieta - boundary_stone: Ribos akmuo + boundary_stone: Pasienio akmuo building: Pastatas castle: Pilis church: Bažnyčia @@ -643,11 +494,11 @@ lt: tower: Bokštas wayside_cross: Pakelės kryžius wayside_shrine: Koplytstulpis - wreck: Paskendęs laivas + wreck: Nuskendęs laivas landuse: - allotments: Sodai + allotments: Sodai/sodininkų bendrijos basin: Baseinas - brownfield: „Rudasis laukas“ + brownfield: Apleista teritorija cemetery: Kapinės commercial: Komercinis plotas conservation: Apsaugos zona @@ -657,15 +508,15 @@ lt: farmyard: Ferma forest: Miškas garages: Garažai - grass: Žolė + grass: Pieva greenfield: „Žaliasis laukas“ industrial: Pramoninė zona landfill: Sąvartynas - meadow: Pieva + meadow: Pievos military: Karinė zona mine: Kasykla - nature_reserve: Gamtos draustinis - orchard: Sodai + nature_reserve: Gamtosaugos draustinis + orchard: vaisių sodas park: Parkas piste: Slidinėjimo trasa quarry: Karjeras @@ -675,17 +526,17 @@ lt: reservoir_watershed: Vandens rezervuaras residential: Gyvenamasis rajonas retail: Mažmeninė prekyba - road: Kelio zona + road: Pakelės village_green: Gyvenvietės žalioji zona vineyard: Vynuogynas wetland: Pelkė - wood: Medžiai + wood: Nedidelis miškas leisure: beach_resort: Pajūrio kurortas bird_hide: paukščių stebėjimo vieta common: Bendra žemė fishing: Žvejybos zona - fitness_station: Fitneso vieta + fitness_station: Fitneso treniruočių vieta garden: Sodas golf_course: Golfo laukas ice_rink: Slidinėjimo vieta (paklojant užšąlantį vandenį) @@ -707,6 +558,8 @@ lt: airfield: Karinis aerodromas barracks: Kareivinės bunker: Bunkeris + mountain_pass: + "yes": Kalnų perėja natural: bay: Įlanka beach: Paplūdimys @@ -767,12 +620,12 @@ lt: country: Šalis county: Apskritis farm: Ūkis - hamlet: Kaimelis (Vienkiemis) + hamlet: Nedidelis kaimas (Vienkiemiai) house: Namas houses: Namai island: Sala islet: Salelė - isolated_dwelling: Izoliuota gyvenamoji zona + isolated_dwelling: Vienkiemis locality: Vietovė moor: Dažnai užliejama vieta municipality: Savivaldybė @@ -780,8 +633,8 @@ lt: region: Regionas sea: Jūra state: Valstija - subdivision: Subdivizija - suburb: Priemiestis + subdivision: Administracinis suskirstymas + suburb: Miesto dalis town: Miestas unincorporated_area: Neįregistruota erdvė village: Kaimas @@ -891,6 +744,7 @@ lt: hostel: Hostelis hotel: Viešbutis information: Informacija + lean_to: Užuovėja motel: Motelis museum: Muziejus picnic_site: Poilsiavietė @@ -901,93 +755,140 @@ lt: tunnel: "yes": Tunelis waterway: + artificial: Dirbtinis vandens kelias + boatyard: Valčių priežiūra canal: Kanalas + connector: Vandens kelių jungtis dam: Užtvanka + derelict_canal: Kanalas ditch: Griovys dock: Dokas drain: Drenažo griovys + lock: Šliuzas + lock_gate: Šliuzo vartai + mineral_spring: Mineralinių vandenų šaltinis mooring: Švartavimas + rapids: Upės slenksčiai river: Upė riverbank: Upės krantas stream: Upeliukas + wadi: Vadis + water_point: Vandens punktas waterfall: Krioklys + weir: Slenkstis javascripts: + close: Uždaryti map: base: cycle_map: Dviračių žemėlapis standard: Standartinis transport_map: Transporto žemėlapis + layers: + notes: Žemėlapio pastabos + locate: + title: Rodyti mano vietą + zoom: + in: Priartinti + out: Nutolinti + notes: + new: + add: Pridėti pastabą + intro: Siekiant pagerinti žemėlapyje įvesta informacija yra rodomas kitiems žymėtojams, todėl prašome būti kaip aprašomasis ir tikslesnis kai perkeliate žymeklį į teisingą padėtį ir į jūsų pastabą žemiau. + show: + anonymous_warning: Ši Pastaba turi komentarų nuo anoniminių vartotojų, kurie turi patikrinti nepriklausomą auditą. + comment: Komentuoti + comment_and_resolve: Komentuoti & išspręsti + hide: Slėpti + reactivate: Iš naujo suaktyvinti + resolve: Išspręsti + share: + cancel: Atšaukti + download: Atsisiųsti + embed: HTML + image: Paveikslas + link: Nuoroda arba HTML + long_link: Nuoroda + title: Dalintis site: + createnote_disabled_tooltip: Priartinkite, jei norite pridėti pastabą prie žemėlapio + createnote_tooltip: Pridėti pastabą prie žemėlapio edit_disabled_tooltip: Norėdami redaguoti, priartinkite edit_tooltip: Redaguoti žemėlapį - edit_zoom_alert: Turite priartinti, kad galėtumėte keisti žemėlapį - history_disabled_tooltip: Priartinkite, kad matytumėte šios srities pakeitimus - history_tooltip: Peržiūrėti pakeitimus šioje srityje - history_zoom_alert: Turite priartinti vaizdą, kad galėtumėte peržiūrėti srities pakeitimus layouts: community: Bendruomenė community_blogs: Dienoraščiai community_blogs_title: OpenStreetMap bendruomenės blogai copyright: Teisės ir licencija - documentation: Dokumentacija - documentation_title: Projekto dokumentacija donate: Paremkite OpenStreetMap %{link} aparatinės įrangos atnaujinimo fondui. - donate_link_text: aukodami lėšų edit: Keisti - edit_with: Redaguoti su %{editor} - export: Eksportas - export_tooltip: Eksportuoti žemėlapio duomenis + edit_with: Redaguoti per %{editor} + export: Eksportuoti foundation: Fondas foundation_title: OpenStreetMap fondas gps_traces: GPS pėdsakai gps_traces_tooltip: Tvarkyti GPS pėdsakus help: Pagalba - help_centre: Pagalbos centras - help_title: Projekto pagalbos svetainė history: Istorija home: namo - home_tooltip: Eiti į namų vietą - inbox: gauti (%{count}) - inbox_tooltip: - one: Jūsų dėžutėje yra viena neperskaityta žinutė - other: Jūsų dėžutėje yra %{count} neperskaitytos žinutės - zero: Jūsų dėžutėje nėra neperskaitytų žinučių - intro_1: OpenStreetMap yra laisvai prieinamas ir keičiamas pasaulio žemėlapis. Jį kuria žmonės, tokie kaip jūs. - intro_2_create_account: Sukurti naudotojo paskyrą - intro_2_download: atsisiųsti - license: - title: OpenStreetMap duomenys yra licencijuoti pagal Creative Commons Attribution-Share Alike 2.0 Generic licenciją + intro_2_create_account: sukurti naudotojo paskyrą log_in: prisijungti log_in_tooltip: Prisijungti prie esamos paskyros logo: alt_text: OpenStreetMap logotipas - logout: atsijungti - logout_tooltip: Atsijungti + logout: Atsijungti make_a_donation: text: Paremkite title: Paremkite OpenStreetMap finansiškai osm_offline: Šiuo metu OpenStreetMap duomenų bazė išjungta, nes vykdomi svarbūs priežiūros darbai. osm_read_only: OpenStreetMap duomenų bazė šiuo metu dirba tik skaitymo režimu, nes vykdomi esminiai priežiūros darbai. + partners_bytemark: Bytemark serveris + partners_html: Serveris palaikomas %{ucl}, %{ic} ir %{bytemark}, ir kiti %{partners}. + partners_ic: Imperial College London partners_partners: partneriai + partners_ucl: UCL VR centras sign_up: užsiregistruoti sign_up_tooltip: Sukurkite paskyrą redagavimui - sotm2011: Atvykite į 2011 metų OpenStreetMap konferenciją „Žemėlapio būsena“, kuri vyks rugsėjo 9-11 dienomis Denveryje! tag_line: Atviras wiki žemėlapis user_diaries: Dienoraščiai user_diaries_tooltip: Peržiūrėti naudotojų dienoraščius - view: Žiūrėti - view_tooltip: Žiūrėti žemėlapį - welcome_user: Sveiki, %{user_link} - welcome_user_link_tooltip: Jūsų naudotojo puslapis - wiki: Wiki - wiki_title: Projekto wiki svetainė license_page: foreign: english_link: anglų originalas + text: Konfliktuojant tarp šio išversto puslapio ir %{english_original_link}, pirmenybė bus teikiama angliškajai versijai. title: Apie šį vertimą + legal_babble: + attribution_example: + alt: Pavyzdys kaip galima priskirti paskyrimus OpenStreetMap svetainėje + title: Priskyrimo pavyzdys + contributors_at_html: "Austrija: Turi duomenis nuo:\nStadt Wien (under\nCC BY),\nLand Vorarlberg and\nLand Tirol (under CC-BY AT su pataisomis)." + contributors_ca_html: "Kanada: Turi duomenis nuo:\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), bei StatCan (Geography Division,\nStatistics Canada)." + contributors_footer_1_html: Kad sužinotumėte daugiau apie tuos, ir kitus šaltinius, kurie buvo naudojami padėti vystyti OpenStreetMap, peržiūrėkite Vystytojų puslapį OpenStreetMap dokumentacijoje + contributors_footer_2_html: Duomenų įtraukimas OpenStreetMap nereiškia, kad originalių duomenų tiekėjas patvirtina OpenStreetMap, nenumatyta jokių garantijų ir neprisiimama jokios atsakomybės. + contributors_fr_html: "Prancūzija: Turi duomenis nuo:\nDirection Générale des Impôts." + contributors_gb_html: "Jungtinė Karalystė: Apima Ordnance\nSurvey data © Karūnos autorinės teisės ir duomenų teisės\n2010-12." + contributors_intro_html: Mūsų autoriai yra tūkstančiai įvairių žmonių. Taip pat apimame ir laisvai prieinamą turinį iš valstybinių kartografijos agentūrų, taip pat ir kitų įvairių šaltinių. + contributors_nl_html: "Nyderlandai: Apima © AND duomenys, 2007\n(www.and.com)" + contributors_nz_html: "Naujoji Zelandija: Turi duomenys nuo\nLand Information New Zealand. Karūnos išsaugotos autorinės teisės." + contributors_title_html: Mūsų autoriai + contributors_za_html: "Pietų Afrika: Turi duomenis nuo:\nChief Directorate:\nNational Geo-Spatial Information, Valstybinės išsaugotos autoriaus teisės." + credit_1_html: "Mes reikalaujame, kad jūs kredituotumėte \"© OpenStreetMap\n autoriai \"." + credit_2_html: Jums turi būti aišku, kad duomenys kurie yra prieinami atvirai, ir jei jūs naudojatės mūsų žemėlapiu, kuri licencijuota pagal CC-BY-SA. Jūs turėtumėte paspausti šią nuorodą, vedančią į šį autorinių teisių puslapį. Kita vertus, ir kaip reikalavimas jei platinate OSM duomenų forma, jūs galite nurodyti licenciją (-as). Žiniasklaidos priemonėse, kur nuorodos pateikimas yra neįmanoma (pvz. spausdinti darbai), mes siūlome jūsų skaitytojus nukreipti į openstreetmap.org (ko gero išplečiant OpenStreetMap iki pilno adreso), į opendatacommons.org ir jei tinka, į creativecommons.org + credit_3_html: "Naršymui po elektroninį žemėlapį, kūrėjų sąrašas turėtų pasirodyti žemėlapio kampe.\n\nPavyzdžiui:" + credit_title_html: Ką pažymėti prisidėjus prie projekto + infringement_1_html: OSM pildytojai primenami niekada nesinaudoti autorių teisėmis apsaugotų šaltinių (pvz. Google Maps ar spausdintų žemėlapių) be leidimo naudoti. + infringement_2_html: Jei manote, kad autorių teisių saugomi darbai buvo netinkamai panaudoti pildant OpenStreetMap duomenų bazę ar šią svetainę, praneškite mums šioje svetainėje arba užpildykite šį pildymų lapą. + infringement_title_html: Autorių teisių pažeidimas + intro_1_html: "OpenStreetMap yra laisvai prieinama, licenzijuota pagal „Open Data\nCommons Open Database License“ (ODbL)." + intro_2_html: "Jūs galite laisvai platinti ir pritaikyti mūsų duomenimis, taip ilgai kiek jūs kredituosite OpenStreetMap ir jos kūrėjus. Jei naudodamiesi mūsų žemėlapiais sukursite savo duomenis, jūsų duomenis turi būti licenzijuoti pagal tą pačią licenziją.\nfull Legalus kodas paaiškins jūsų teises ir atsakomybes." + intro_3_html: "Mūsų žemėlapio žymėjimas, bei mūsų dokumentacija, yra licencijuota pagal Creative\nCommons Attribution-ShareAlike 2.0 licenciją (CC-BY-SA)." + more_1_html: Sužinokite daugiau dėl mūsų duomenų naudojimo, kaip pažymėti prisidėjusius, svetainėje DUK dėl legalumo. + more_2_html: "Nors OpenStreetMap duomenys yra atviri, mes negalime pateikti free-of-charge žemėlapių API trečiųjų šalių vystytojams.\n\nPeržiūrėkite mūsų API naudojimo politiką, bei Nominatim naudojimo politika." + more_title_html: Sužinokite daugiau + title_html: Autorinės teisės ir licencija native: mapping_link: pradėti žymėjimą native_link: Lietuviška versija + text: Jūs žiūrite anglišką autorinių teisių puslapį. Jūs galite sugrįžti prie šio puslapio %{native_link} arba tiesiog baigti skaitymą apie autorines teises ir %{mapping_link}. title: Apie šį puslapį message: delete: @@ -997,7 +898,13 @@ lt: from: Nuo messages: Jūs turite %{new_messages} ir %{old_messages} my_inbox: Mano gauti + new_messages: + one: "%{count} naujas pranešimas" + other: "%{count} nauji pranešimai" no_messages_yet: Jūs dar negavote nei vienos žinutės. Kodėl gi nesusisiekus su %{people_mapping_nearby_link}? + old_messages: + one: "%{count} senas pranešimas" + other: "%{count} seni pranešimai" outbox: išsiųstieji people_mapping_nearby: netoliese žyminčiais naudotojais subject: Tema @@ -1026,6 +933,9 @@ lt: outbox: date: Data inbox: gautieji + messages: + one: Jūs %{count} nusiųstą pranešimą + other: Jūs %{count} nusiųstus(-ų) pranešimus(-ų) my_inbox: Mano %{inbox_link} no_sent_messages: Jūs dar negavote nei vienos žinutės. Kodėl gi nesusisiekus su %{people_mapping_nearby_link}? outbox: išsiųstieji @@ -1034,19 +944,50 @@ lt: title: Išsiųstieji to: Kam read: - back_to_inbox: Atgal į gautus - back_to_outbox: Atgal į išsiųstus + back: Grįžti date: Data from: Nuo - reading_your_messages: Skaitomi jūsų pranešimai - reading_your_sent_messages: Skaitomi jūsų siųsti pranešimai reply_button: Atsakyti subject: Tema title: Skaityti pranešimą to: Kam unread_button: Pažymėti neperskaitytu + wrong_user: Jūs prisijungęs kaip „%{user}“, bet pranešimas, kurį jūsų prašyta perskaityti, nebuvo nusiųstas to ar tam naudotojui. Prisijunkite prie teisingos naudotojo paskyros, jei norite tai perskaityti. + reply: + wrong_user: Jūs prisijungęs kaip „%{user}“, bet pranešimas, kuriuo jūsų prašyta atsakyti, nebuvo nusiųstas tam naudotojui. Prisijunkite prie teisingos naudotojo paskyros, jei norite atsakyti. sent_message_summary: delete_button: Ištrinti + note: + description: + closed_at_by_html: Prieš %{when} išsprendė %{user} + closed_at_html: Išspręsta prieš %{when}\ + commented_at_by_html: Prieš %{when} atnaujino %{user} + commented_at_html: Atnaujinta prieš %{when} + opened_at_by_html: Prieš %{when} sukūrė %{user} + opened_at_html: Sukurta prieš %{when} + reopened_at_by_html: Prieš %{when} iš naujo suaktyvino %{user} + reopened_at_html: Iš naujo suaktyvinta prieš %{when} + entry: + comment: Komentaras + full: Pilna pastaba + mine: + ago_html: prieš %{when} + created_at: Sukurta + creator: Kūrėjas + description: Aprašymas + heading: "%{user} pastabos" + id: Id + last_changed: Paskutinį kartą atnaujinta + subheading: Pastabas pateikė arba komentavo %{user} + title: Pastabas pateikė arba komentavo %{user} + rss: + closed: uždaryta pastaba (netoli %{place}) + commented: naujas komentaras (netoli %{place}) + description_area: sąrašas pastabų, pranešta, pakomentuota arba uždaryta jūsų srityje (%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Rss kanalas pastabai %{id} + opened: nauja pastaba (netoli %{place}) + reopened: aktyvuota pastaba (netoli %{place}) + title: OpenStreetMap pastabos notifier: diary_comment_notification: footer: Taip pat galite perskaityti komentarą adresu %{readurl}, komentuoti galite adresu %{commenturl}, o atsakyti - adresu %{replyurl} @@ -1062,8 +1003,7 @@ lt: email_confirm_plain: click_the_link: Jei tai jūs, spauskite žemiau pateikiamą nuorodą, kad patvirtintumėte pakeitimą. greeting: Sveiki, - hopefully_you_1: Kažkas (tikimės, kad tai jūs) nori pakeisti savo elektroninio pašto adresą - hopefully_you_2: iš %{server_url} į %{new_address}. + hopefully_you: Kažkas (tikimės, kad tai jūs) nori pakeisti savo elektroninio pašto adresą iš %{server_url} į %{new_address}. friend_notification: befriend_them: "Galite pridėti juos prie draugų: %{befriendurl}" had_added_you: "%{user} pridėjo jus į savo OpenStreetMap draugų sąrašą." @@ -1092,44 +1032,35 @@ lt: lost_password_plain: click_the_link: Jei tai jūs, paspauskite žemiau esančią nuorodą, kad iš naujo nustatytumėte slaptažodį. greeting: Sveiki, - hopefully_you_1: Kažkas (tikriausiai jūs) paprašė anuliuoti slaptažodį, susijusį su - hopefully_you_2: šio elektroninio pašto adreso paskyra openstreetmap.org svetainėje. + hopefully_you: Kažkas (tikriausiai jūs) paprašė anuliuoti slaptažodį, susijusį su šio pašto adreso openstreetmap.org paskyra. message_notification: - footer1: Pranešimą taipogi galite perskaityti adresu %{readurl} - footer2: ir atsakyti galite adresu %{replyurl} header: "%{from_user} atsiuntė jums pranešimą per OpenStreetMap su tema „%{subject}“:" hi: Sveiki, %{to_user}, + note_comment_notification: + anonymous: Anoniminis naudotojas + closed: + commented_note: "%{commenter} išsprendė žemėlapio pastabą, kurį jūs pakomentavote. Pastaba yra šalia %{place}." + subject_other: "[OpenStreetMap] %{commenter} išsprendė jūsų dominančia pastaba" + subject_own: "[OpenStreetMap] %{commenter} išsprendė vieną iš jūsų pastabos" + your_note: "%{commenter} išsprendė vieną iš jūsų žemėlapio pastabų šalia %{place}." + commented: + commented_note: "%{commenter} paliko komentarą žemėlapio pastabą kurį jūs komentavote. Pastaba yra šalia %{place}." + subject_other: "[OpenStreetMap] %{commenter} pakomentavo jūsų dominančia pastabą" + subject_own: "[OpenStreetMap] %{commenter} pakomentavo vieną iš jūsų pastabos" + your_note: "%{commenter} paliko komentarą viename iš jūsų žemėlapio pastabų šalia %{place}." + details: Daugiau informacijos apie pastaba galima rasti %{url}. + greeting: Sveiki, + reopened: + commented_note: "%{commenter} aktyvavo žemėlapio pastabą, kurį jūs pakomentavote. Pastaba yra netoli %{place}." + subject_other: "[OpenStreetMap] %{commenter} aktyvavo pastabą, kuriuo jūs susidomėjęs(-usi)" + subject_own: "[OpenStreetMap] %{commenter} aktyvavo vieną iš jūsų pastabų" + your_note: "%{commenter} aktyvavo vieną iš jūsų žemėlapio pastabų netoli %{place}." signup_confirm: - subject: "[OpenStreetMap] Patvirtinkite savo elektroninio pašto adresą" - signup_confirm_html: - ask_questions: Klausimus, susijusius su OpenStreetMap, galite užduoti klausimų ir atsakymų svetainėje. - click_the_link: Jei tai jūs - sveikiname! Paspauskite žemiau esančią nuorodą, kad patvirtintumėte paskyra. Tada paskaitykite daugiau apie OpenStreetMap. - current_user: "Šiuo metu pagal pasaulio vietas sukurtose kategorijose esančių naudotojų sąrašą galite rasti čia: Category:Users_by_geographical_region." - get_reading: Informacijos apie OpenStreetMap rasite wikyje. Sekite naujienas OpenStreetMap dienoraštyje, Twitteryje arba panaršykite po OpenStreetMap įkūrėjo Steve'o Coast'o OpenGeoData dienoraštį, kur rasite projekto istoriją, kurią galite net ir paklausyti! - greeting: Sveiki! - hopefully_you: Kažkas (tikėkimės tai jūs) nori sukurti paskyrą - introductory_video: Galite pažiūrėti %{introductory_video_link} - more_videos: Yra ir %{more_videos_link} - more_videos_here: daugiau vaizdo medžiagos - user_wiki_page: Rekomenduojama sukurti wiki puslapį, kuriame būtų įtrauktos kategorijos žymos, nurodančios, kur jūs esate. Pavyzdžiui [[Category:Users_in_Lithuania]] ir/arba [[Category:Users_in_Vilnius]]. - video_to_openstreetmap: įvadinį klipą apie OpenStreetMap - wiki_signup: Taipogi galite prisiregistruoti prie OpenStreetMap wikio. - signup_confirm_plain: - ask_questions: "Bet kokius klausimus apie OpenStreetMap galite užduoti mūsų klausimų ir atsakymų svetainėje:" - blog_and_twitter: "Sekite paskutines naujienas OpenStreetMap dienoraštyje arba Twitteryje:" - click_the_link_1: Jei tai jūs - sveikiname prisijungus! Spustelėkite žemiau esančią nuorodą, kad patvirtintumėte jūsų - click_the_link_2: paskyrą, tada paskaitykite daugiau apie OpenStreetMap. - current_user_1: Naudotojų kategorijose, nurodančiose kurioje pasaulio vietoje jie yra, sąrašą - current_user_2: "galite rasti čia:" + confirm: Prieš ką nors darant kito, mes turime patvirtinti, kad ši užklausa atėjo nuo tavęs, tai atlikus spauskite nuorodą žemiau, kad patvirtintumėte savo paskyrą + created: "Kažkas (tikimės, kad jūs) sukūrė paskyrą svetainėje: %{site_url}." greeting: Sveiki! - hopefully_you: Kažkas (tikėkimės tai jūs) nori sukurti paskyrą - introductory_video: "Įvadinį vaizdo klipą apie OpenStreetMap rasite čia:" - more_videos: "Daugiau video medžiagos rasite čia:" - opengeodata: "OpenGeoData.org - tai OpenStreetMap įkūrėjo Steve Coast'o dienoraštis, jame taipogi rasite transliacijų:" - the_wiki: "Daugiau informacijos apie OpenStreetMap rasite wikyje:" - user_wiki_1: Rekomenduojama sukurti naudotojo wiki puslapį, kuriame būtų - user_wiki_2: kategorijos žymos, nurodančios, kur esate. Pavyzdžiui [[Category:Users_in_Lithuania]] ir/ar [[Category:Users_in_Vilnius]] - wiki_signup: "Taipogi galite norėti prisiregistruoti prie OpenStreetMap wikio šiuo adresu:" + subject: "[OpenStreetMap] Sveiki atvykę į OpenStreetMap" + welcome: Mes norėtume pasveikinti jus ir suteikti papildomos informacijos nuo ko galėsite pradėti. oauth: oauthorize: allow_read_gpx: skaityti jūsų asmeninius GPS pėdsakus. @@ -1138,7 +1069,11 @@ lt: allow_write_api: keisti žemėlapį. allow_write_diary: kurti dienoraščio įrašus, komentarus ir susirasti draugų. allow_write_gpx: įkelti GPS pėdsakus. + allow_write_notes: modifikuoti pastabas. allow_write_prefs: kaisti jūsų naudotojo nustatymus. + request_access: Programa %{app_name} prašo prieigos prie jūsų paskyros, %{user}. Peržiūrėkite, ar jūs norėtumėte taikyti šias galimybes. Galite pasirinkti tiek kiek jums reikia. + revoke: + flash: Jūs atšaukėte savo ženklą programai %{application} oauth_clients: create: flash: Informacija užregistruota sėkmingai @@ -1153,7 +1088,9 @@ lt: allow_write_api: keisti žemėlapį. allow_write_diary: kurti dienoraščio įrašus, komentarus ir susirasti draugų. allow_write_gpx: įkelti GPS pėdsakus. + allow_write_notes: modifikuoti pastabos. allow_write_prefs: keisti jo naudotojo nustatymus. + callback_url: Atgalinio ryšio nuoroda name: Pavadinimas requests: "Prašyti naudojo leidimo:" required: Privaloma @@ -1173,16 +1110,27 @@ lt: new: submit: Registruotis title: Registruoti naują programą + not_found: + sorry: Atsiprašome, šis %{type} nerastas. show: + access_url: "Prieiga ženklo nuorodai:" allow_read_gpx: skaityti jų asmeninius GPS pėdsakus. allow_read_prefs: skaityti savo naudotojo nustatymus. allow_write_api: keisti žemėlapį. allow_write_diary: kurti dienoraščio įrašus, komentarus ir susirasti draugų. allow_write_gpx: įkelti GPS pėdsakus. + allow_write_notes: modifikuoti pastabos. allow_write_prefs: keisti savo naudotojo nustatymus. + authorize_url: "Leisti nuorodą:" + confirm: Esate tikras? + delete: Pašąlinti klientą edit: Keisti detales + key: "Vartotojo raktas:" requests: Prašoma, kad naudotojas leistų + secret: "Vartotojų paslaptis:" + support_notice: Mes palaikome HMAC-SHA1 (rekomenduojama) ir RSA-SHA1 parašus. title: OAuth informacija programai %{app_name} + url: "Teikti prašymą ženklo nuorodai:" update: flash: Kliento informacija sėkmingai atnaujinta redaction: @@ -1219,31 +1167,40 @@ lt: site: edit: anon_edits_link_text: Sužinokite, kodėl taip yra. + flash_player_required: Jums reikalingas Flash player norint redaguoti su Potlatch (atvirojo žemėlapio Flash redagavimo įrankis). 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. + id_not_configured: iD nesukonfigūruotas no_iframe_support: Jūsų naršyklė nepalaiko HTML iframe'ų, o šiai savybei jie būtini. + not_public: Jūs nenustatėte savo keitimų, kad būtų vieši + not_public_description: Jūs nebegalite keisti žemėlapio, jei jūs tą darysite. Jūs galite nustatyti keitimus,kaip viešus iš savo %{user_page}. potlatch2_not_configured: Potlatch 2 nesukonfigūruotas - daugiau informacijos rasite http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 potlatch2_unsaved_changes: Yra neįrašytų pakeitimų. (Norėdami įrašyti Potlatch 2, turėtumėte spustelėti įrašyti.) + 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'. user_page_link: naudotojo puslapis index: + createnote: Pridėti pastabą js_1: Jūs arba naudojate naršyklę, nepalaikančią JavaScript, arba išjungėte JavaScript palaikymą. js_2: OpenStreetMap naudoja JavaScript savo 'slidžiam' žemėlapiui license: - project_name: OpenStreetMap projektas + copyright: Teisės priklauso OpenStreetMap ir prie projekto prisidėjusiems, pagal atvirą licenciją. permalink: Nuoroda į šią vietą + remote_failed: Redagavimas nepavyko - būkite tikras ar JOSM arba Merkaator užkrautas ir nuotolinio valdymo funkcija įjungta. shortlink: Trumpoji nuoroda key: - map_key: Sutartiniai ženklai - map_key_tooltip: Žemėlapio sutartiniai ženklai table: entry: admin: Administracinės ribos allotments: Sodai apron: - 1: terminalas + - Oro uosto lėktuvų aikštelė + - terminalas bridge: Tamsūs kraštai = tiltas bridleway: Takas galvijams varyti + brownfield: Apleista teritorija building: Didelis pastatas + byway: Keliukas cable: - Lyno keltuvas + - keltuvas cemetery: Kapinės centre: Sporto centras commercial: Komericinis plotas @@ -1252,9 +1209,12 @@ lt: - pieva construction: Statomi keliai cycleway: Dviračių takas + destination: Atvykimo susisiekimas farm: Ūkis footway: Pėsčiųjų takas forest: Miškas + golf: Golfo laukas + heathland: Šilynas industrial: Pramoninė zona lake: - Ežeras @@ -1283,6 +1243,7 @@ lt: - Viršūnė - Viršukalnė tourist: Turistų atrakcija + track: Pėdsakas tram: - Lengvasis geležinkelis - tramvajus @@ -1291,9 +1252,25 @@ lt: unclassified: Neklasifikuotas kelias unsurfaced: Kelias be dangos wood: Miškas + markdown_help: + alt: Alternatyvusis tekstas + first: Pirmasis punktas + heading: Antraštė + headings: Antraštės + image: Paveikslėlis + link: Nuoroda + ordered: Surikiuotas sąrašas + second: Antras punktas + subheading: Paantraštė + text: Tekstas + title_html: Išanalizuota su Markdown + unordered: Nesurikiuotas sąrašas + url: URL + richtext_area: + edit: Redaguoti + preview: Peržiūra search: search: "Paieška:" - search_help: "pavyzdžiai: S.Dariaus ir S.Girėno stadionas, Gedimino pr., Ukmergė, \"Gardino g. 5\" arba \"pašto šalia Lünen\" ir daugiau pavyzdžių ..." submit_text: Rodyti where_am_i: Kur aš dabar? where_am_i_title: Apibūdinti dabartinę poziciją naudojant paieškos variklį @@ -1327,6 +1304,8 @@ lt: visibility: "Matomumas:" visibility_help: ką tai reiškia? list: + description: Peržiūrėti naujausias įkeltas GPS trasas + empty_html: Nieko dar nėra. Įkelkite naują pėdsaką arba sužinokite daugiau apie GPS pėdsakų žymėjimą šiame Dokumentacijos puslapyje. public_traces: Vieši GPS pėdsakai public_traces_from: Vieši naudotojo %{user} pėdsakai tagged_with: " pažymėta žymomis %{tags}" @@ -1334,11 +1313,12 @@ lt: make_public: made_public: Pėdsakas nuo dabar bus viešas offline: + heading: GPX laikmena išjungta message: GPX pėdsakų saugojimo ir įkėlimo sistema šiuo metu neveikia. offline_warning: message: GPX pėdsakų įkėlimo sistema šiuo metu neveikia. trace: - ago: "%{time_in_words_ago} atgal" + ago: Prieš %{time_in_words_ago} by: (emptypage) count_points: "%{count} taškai(-ų)" edit: keisti @@ -1365,13 +1345,16 @@ lt: trace_header: see_all_traces: Rodyti visus pėdsakus see_your_traces: Rodyti visus jūsų pėdsakus + traces_waiting: + one: Jūs turite %{count} pėdsakus laukiant, kad įkrautų. Apsvarstykite savo galimą įkrovos laiką, kad nesukeltumėte didesnių eilių kitų naudotojų, kurie taip pat nori įkelti savo darbus. + other: Jūs turite %{count} pėdsakus laukiant, kad įkrautų. Apsvarstykite savo galimą įkrovos laiką, kad nesukeltumėte didesnių eilių kitų naudotojų, kurie taip pat nori įkelti savo darbus. upload_trace: Įkelti pėdsaką trace_optionals: tags: Žymos trace_paging_nav: - next: Kitas » - previous: « Ankstesnis - showing_page: Rodomas puslapis %{page} + newer: Naujesni pėdsakai + older: Senesni pėdsakai + showing_page: Puslapis %{page} view: delete_track: Naikinti šį pėdsaką description: "Aprašymas:" @@ -1404,10 +1387,15 @@ lt: heading: "Talkininkų sąlygos:" link text: kas tai? not yet agreed: Jūs dar nesutikote su naujomis talkininkų sąlygomis. + review link text: Sekite šią nuorodą, kad peržiūrėkite ir priimkite naujas talkininkų sąlygas. current email address: "Dabartinis e-pašto adresas:" delete image: Pašalintį dabartinę nuotrauką email never displayed publicly: (niekada viešai nerodomas) flash update success: Naudotojo informacija sėkmingai atnaujinta. + flash update success confirm needed: Vartotojo informacija sėkmingai atnaujinta. Patikrinkite savo pašto dėžutę, kuriame turėtų būti atsiųstas pranešimas, kuriame patvirtinkite savo naują el. pašto adresą. + gravatar: + gravatar: Naudoti Gravatar + link text: kas tai? home location: Namų pozicija image: "Nuotrauka:" image size hint: (geriausiai atrodo kvadratinės, ne mažesnės nei 100x100 taškų dydžio nuotraukos) @@ -1420,7 +1408,9 @@ lt: new image: Pridėti nuotrauką no home location: Jūs neįvedėte savo namų pozicijos openid: + link: http://wiki.OpenStreetMap.org/wiki/OpenID link text: kas tai? + openid: "OpenID:" preferred editor: "Pageidautinas redaktorius:" preferred languages: "Pageidautinos kalbos:" profile description: "Profilio aprašymas:" @@ -1433,6 +1423,7 @@ lt: heading: "Viešas keitimas:" public editing note: heading: Viešas keitimas + text: Šiuo metu jūsų keitimai yra anonimiški ir žmonės negali jums siųsti pranešimų ar matyti jūsų vietovės. Parodymui ką jūs keitėte ir galimybei kitiems žmonėms su jumis susisiekti per šią svetainę, spauskit nuorodą žemiau. Nuo 0.6 API pakeitimo, tik vieši naudotojai gali keisti duoemnis. (dėl ko taip padaryta).
    • Jūsų el. pašto adresas nebus atskleistas kol ne taps viešas.
    • Šis veiksmas negalės būti atšauktas ir visi nauji naudotojai dabar yra vieši pagal nutylėjimą.
    replace image: Pakeisti dabartinę nuotrauką return to profile: Grįžti į profilį save changes button: Įrašyti pakeitimus @@ -1442,8 +1433,9 @@ lt: already active: Ši paskyra jau yra patvirtinta. button: Patvirtinti heading: Patvirtinti naudotojo paskyrą. + introduction_1: Mes išsiuntėme jums patvirtinimo laišką. press confirm button: Norėdami aktyvuoti savo paskyrą paspauskite žemiau esantį patvirtinimo mygtuką. - success: Jūsų paskyra patvirtinta. Ačiū už registraciją! + unknown token: Neatrodo, kad šis ženklas egzistuotų confirm_email: button: Patvirtinti failure: Elektroninio pašto adresas jau patvirtintas naudojant šį atpažinimo ženklą. @@ -1452,6 +1444,7 @@ lt: success: Jūsų e-pašto adresas patvirtintas. Ačiū, kad prisiregistravote! confirm_resend: failure: Naudotojas %{name} nerastas. + success: Mes nusiuntėme jums naują patvirtinimo pranešimą į %{email} ir ten patvirtinsite savo paskyrą, kad galėtumėte pradėti žymėti.

    Jei jūs naudojate įvairias programas prieš spam'ą, įtraukite į patikimų adresų sąrašą (Whitelist) webmaster@openstreetmap.org, nes kitaip negalėsime jums nusiųsti jokių patvirtinimo užklausų. filter: not_an_administrator: Norėdami atlikti šį veiksmą, turite būti administratoriumi. go_public: @@ -1461,10 +1454,15 @@ lt: empty: Nerasta atitinkančių naudotojų heading: Naudotojai hide: Slėpti parinktus naudotojus + showing: + one: Puslapis %{page} (%{first_item} visų %{items}) + other: Puslapis %{page} (%{first_item}-%{last_item} visų %{items}) summary: "%{name} sukurta %{ip_address} %{date}" summary_no_ip: "%{name} sukurta %{date}" title: Naudotojai login: + account is suspended: Atsiprašome, jūsų paskyra buvo sustabdyta dėl įtartinos veiklos.
    Prašome kreiptis į administratorių jei norite visą tai aptarti. + account not active: Atsiprašome, jūsų paskyra dar neaktyvuota.
    Prašome pasinaudoti nuoroda, kurią mes nusiuntėme į jūsų el. paštą arba prašykite naujos patvirtinančios nuorodos. auth failure: Atsiprašome, negalite prisijungti su tokiais duomenimis. create account minute: Sukurkite paskyra. Tai užtruks tik minutę. email or username: "E-pašto adresas arba naudotojo vardas:" @@ -1474,6 +1472,8 @@ lt: new to osm: Nesusipažinę su OpenStreetMap? no account: Neturite savo paskyros? openid: "%{logo} OpenID:" + openid invalid: Atsiprašome, bet panašu, kad jūsų OpenID blogai suformuotas + openid missing provider: Atsiprašome, nepavyko susisiekti su OpenID tiekėju openid_logo_alt: Prisijunkite su OpenID openid_providers: aol: @@ -1515,24 +1515,31 @@ lt: title: Pamiršau slaptažodį make_friend: already_a_friend: Jūs jau draugaujate su %{name}. + button: Pridėti kaip draugą failed: Atsiprašome, nepavyko pridėti naudotojo %{name} į draugų sąrašą. + heading: Pridėti „%{user}“ kaip draugą? success: "%{name} dabar jau yra jūsų draugas." new: confirm email address: "Patvirtinkite e-pašto adresą:" confirm password: "Patvirtinkite slaptažodį:" + contact_webmaster: Prašome kreiptis į administratorių, talkinant, kad paskyra būtų sukurta - mes pasižiūrėsime ir susitarsime kaip įmanoma greičiau. continue: Tęsti display name: "Rodomas vardas:" display name description: Jūsų viešai rodomas naudotojo vardas. Jei norėsite, galėsite jį vėliau pakeisti savo nustatymuose. email address: "E-pašto adresas:" - fill_form: Užpildykite formą ir mes atsiųsime jums trumpą laišką, kad aktyvuotumėte savo paskyrą. - heading: Sukurti naudotojo paskyrą license_agreement: Kai patvirtinsite savo paskyrą, turėsite sutikti su talkininkų sąlygomis. no_auto_account_create: Deja šiuo metu negalime jums automatiškai sukurti paskyros. not displayed publicly: Viešai nerodoma (skaitykite privatumo politiką) openid: "%{logo} OpenID:" + openid association: "

    Jūsų OpenID kol kas nėra susieta su OpenStreetMap paskyra

    \n
      \n
    • Jei esi naujas OpenStreetMap, sukurkite naują paskyrą, pasitelkiant forma žemiau
    • \n
    • \n Jei jau turite paskyrą, jūs galite prisijungti prie jūsų pakyros, naudojant savo naudotojo vardą ir slaptažodį ir tada susieti paskyrą su savo OpenID savo naudotojo nustatymuose\n
    • \n
    " + openid no password: Su OpenID slaptažodis nėra būtinas, tačiau kai kurių papildomų įrankių ar serverio gali prireikti. password: "Slaptažodis:" + terms accepted: Ačiū, kad patvirtinote naująsias talkininkų sąlygas! + terms declined: Atsiprašome, jei nesutinkate su naujomis Talkininkų sąlygomis. Daugiau informacijos rasite čia. title: Sukurti paskyrą + use openid: Taip pat galite naudoti %{logo} OpenID prisijungimui no_such_user: + body: Atsiprašome, bet čia nėra jokio naudotojo vardu „%{user}“. Pasitikrinkite rašybą, arba nuoroda, kurią jūs paspaudėte yra klaidinga. heading: Naudotojas %{user} neegzistuoja title: Nėra tokio naudotojo popup: @@ -1540,11 +1547,14 @@ lt: nearby mapper: Šalia esantis žemėlapių kūrėjas your location: Jūsų pozicija remove_friend: + button: Nebedraugauti + heading: Nebedraugauti su naudotoju „%{user}“? not_a_friend: "%{name} nėra jūsų draugas." success: "%{name} pašalintas iš jūsų draugų sąrašo." reset_password: confirm password: "Patvirtinti slaptažodį:" flash changed: Jūsų slaptažodis sėkmingai pakeistas. + flash token bad: Ženklas nerastas, galbūt bloga nuoroda? heading: Iš naujo nustatyti naudotojo %{user} slaptažodį password: "Slaptažodis:" reset: Iš naujo nustatyti slaptažodį @@ -1555,48 +1565,69 @@ lt: body: "

    Atsiprašome, bet jūsų paskyros veikimas buvo pristabdytas dėl įtartinų veiksmų.

    \n

    Šį sprendimą netrukus peržiūrės administratoriai arba jūs galite susisiekti su %{webmaster}, jei norite tai aptarti.

    " heading: Paskyra sustabdyta title: Paskyra sustabdyta + webmaster: administratorius terms: agree: Sutinku + consider_pd: Be pirmiau minėto susitarimo, manau, kad mano indėlis būtų viešo naudojimo consider_pd_why: kas tai? decline: Nesutinku + guidance: "Informacija, kuri padėti suprasti šias sąlygas: Paprasto stiliaus aprašymas ir keletas neoficialių vertimų" heading: Talkininkų sąlygos legale_names: france: Prancūzija italy: Italija rest_of_world: Likęs pasaulis legale_select: "Prašome pasirinkti savo gyvenamąją šalį:" + read and accept: Prašome perskaityti sutartį žemiau ir paspausti patvirtinimo mygtuką, kad patvirtintumėte, kad sutinkate su sutarties sąlygomis dėl jūsų egzistuojančių ir būsimų indėlių į žemėlapį. title: Talkininkų sąlygos - you need to accept or decline: Prašome perskaityti bei sutikti ar nesutikti su Naujo dalyvio sąlygomis. + you need to accept or decline: Prašome perskaityti bei sutikti ar nesutikti su Talkininkų sąlygomis. view: activate_user: aktyvuoti šį naudotoją - add as friend: pridėti kaip draugą - ago: (%{time_in_words_ago} atgal) + add as friend: Pridėti draugą + ago: Prieš %{time_in_words_ago} + block_history: buvę užblokavimai blocks by me: mano sukurti apribojimai blocks on me: apribojimai man + comments: Komentarai confirm: Patvirtinti confirm_user: patvirtinti šį naudotoją create_block: blokuoti šį naudotoją created from: "Sukurta iš:" + ct accepted: Praėjo %{ago} + ct declined: Atmesta + ct status: Talkininkų sąlygos + ct undecided: Nenuspręsta + deactivate_user: aktyvuoti šį naudotoją delete_user: pašalinti šį naudotoją description: Aprašymas - diary: dienoraštis - edits: keitimai + diary: Dienoraštis + edits: Keitimai email address: "E-pašto adresas:" + friends_changesets: draugų keitimai + friends_diaries: draugų dienoraščių įrašai hide_user: slėpti šį naudotoją + if set location: nurodykite jūsų buvimo vietą per %{settings_link} puslapį, norint matyti naudotojus netoliese. km away: Nutolęs %{count}km latest edit: "Paskutinis pakeitimas %{ago}:" m away: nutolęs %{count}m mapper since: "Žymi nuo:" - my comments: mano komentarai - my diary: mano dienoraštis - my edits: mano keitimai - my settings: mano nustatymai - my traces: mano pėdsakai + moderator_history: gauti užblokavimai + my comments: Mano komentarai + my diary: Mano dienoraštis + my edits: Mano keitimai + my notes: Mano žemėlapio pastabos + my profile: Mano profilis + my settings: Mano nustatymai + my traces: Mano pėdsakai nearby users: Kiti greta esantys naudotojai + nearby_changesets: greta esančių naudotojų keitimai + nearby_diaries: greta esančių naudotojų dienoraščių įrašai new diary entry: naujas dienoraščio įrašas no friends: Jūs dar nepridėjote nei vieno draugo. + no nearby users: Dar nėra jokių kitų naudotojų, kurie būtų pakviesti į žemėlapio pildymus. + notes: Žemėlapio pastabos oauth settings: OAuth nustatymai - remove as friend: pašalinti kaip draugą + remove as friend: Nebedraugauti role: administrator: Šis naudotojas yra administratorius grant: @@ -1606,11 +1637,11 @@ lt: revoke: administrator: Atšaukti administratoriaus teises moderator: Atšaukti moderatoriaus teises - send message: siųsti žinutę + send message: Siųsti žinutę settings_link_text: nustatymai spam score: "Šlamšto įvertis:" status: "Būsena:" - traces: pėdsakai + traces: Pėdsakai unhide_user: nebeslėpti šio naudotojo user location: Naudotojo pozicija your friends: Jūsų draugai @@ -1632,6 +1663,7 @@ lt: heading: Keičiamas naudotojo %{name} blokavimas needs_view: Ar naudotojas turi prisiregistruoti, tam kad šis blokavimas būtų panaikintas? period: Kiek laiko, pradedant nuo šios minutės, naudotojui bus uždrausta naudotis API. + reason: Priežastis dėl ko %{name} buvo užblokuotas. Būkite kiek įmanoma ramus ir supratingas, duodamas kuo daugiau informacijos apie susidariusią situaciją. Turėkite omeny, kad ne visi naudotojai supranta bendruomenės žargoną, prašome pamėginti naudoti paprastus, bendrus žodžius. show: Peržiūrėti šį blokavimą submit: Atnaujinti blokavimą title: Keičiamas naudotojo %{name} blokavimas @@ -1653,9 +1685,12 @@ lt: back: Peržiūrėti visus blokavimus heading: Kuriamas naudotojo %{name} blokavimas needs_view: Naudotojas turi prisiregistruoti, kad šis blokavimas būtų atšauktas + period: Kiek laiko, pradedant nuo šios minutės, naudotojui bus uždrausta naudotis API. + reason: Priežastis dėl ko %{name} buvo užblokuotas. Būkite kiek įmanoma ramus ir supratingas, duodamas kuo daugiau informacijos apie susidariusią situaciją, prisimenant, kad pranešimas bus visiems matomas. Turėkite omeny, kad ne visi naudotojai supranta bendruomenės žargoną, prašome pamėginti naudoti paprastus, bendrus žodžius. submit: Sukurti blokavimą title: Kuriamas naudotojo %{name} blokavimas tried_contacting: Aš susisiekiau su naudotoju ir paprašiau, kad jis liautųsi. + tried_waiting: Aš daviau pakankamai laiko, kad naudotojas atsakytų į tuos pranešimus. not_found: back: Atgal į sąrašą sorry: Atsiprašome, bet naudotojo blokavimas, turintis ID %{id} nerastas. @@ -1664,11 +1699,14 @@ lt: creator_name: Kūrėjas display_name: Blokuojamas naudotojas edit: Keisti + next: Kitas » not_revoked: (neatšauktas) + previous: « Ankstesnis reason: Blokavimo priežastis revoke: Atšaukti! revoker_name: Atšaukė show: Rodyti + showing_page: Puslapis %{page} status: Būsena period: one: 1 valanda @@ -1693,7 +1731,7 @@ lt: show: Rodyti status: Būsena time_future: Baigiasi %{time} - time_past: Baigėsi %{time} atgal + time_past: Baigėsi prieš %{time} title: Naudotoją %{block_on} blokuoja %{block_by} update: only_creator_can_edit: Tik šį blokavimą sukūręs moderatorius gali jį keisti. @@ -1707,10 +1745,21 @@ lt: grant: are_you_sure: Ar tikrai norite naudotojui `%{name}' suteikti rolę `%{role}'? confirm: Patvirtinti + fail: Nepavyko suteikti rolės „%{role}“ naudotojui „%{name}“. Patikrinkite, kad tiek naudotojas, tiek rolė įvesta teisingai. heading: Patvirtinkite rolės suteikimą title: Patvirtinkite rolės suteikimą revoke: + are_you_sure: Ar tikrai norite atšaukti `%{role}' nuo naudotojo „%{name}“? confirm: Patvirtinti fail: Nepavyko atimti rolės „%{role}“ iš naudotojo „%{name}“. Patikrinkite, kad tiek naudotojas, tiek rolė įvesta teisingai. heading: Patvirtinkite rolės atšaukimą title: Patvirtinkite rolės atšaukimą + welcome_page: + add_a_note: + title: Neturite laiko redaguoti? Pridėkite pastabą! + questions: + title: Turite klausimų? + start_mapping: Pradėti žymėti + title: Sveiki atvykę! + whats_on_the_map: + title: Kas yra žemėlapyje diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 85e05515a92..fbf30c46ad7 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1,14 +1,30 @@ # Messages for Latvian (latviešu) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Admresdeserv. # Author: Cuu508 # Author: GreenZeb +# Author: Jmg.cmdi # Author: Karlis # Author: Lafriks +# Author: Nemo bis # Author: Papuass +# Author: PeterisP # Author: Raitisx # Author: Ttdnet lv: + about_page: + community_driven_html: "OpenStreetMap kopiena ir daudzveidīga, kaislīga un pieaug katru dienu.\nMūsu ieguldītāji ir entuziastiski kartogrāfi, GIS profesionāļi, inženieri, kuri darbina OSM serverus, humanitārieši, kas kartē apgabalus, kurus skārusi dabas katastrofa un daudzi citi.\nLai uzzinātu vairāk par kopienu, apskati lietotāju dienasgrāmatas,\nkopienu blogus, un\nOSM Fonds mājaslapu." + community_driven_title: Kopienas virzīts + copyright_html: ©OpenStreetMap
    atbalstītāji + lede_text: OpenStreetMap būvē kartētāju kopiena, kuri iegulda un uztur datus par ceļiem, takām, kafejnīcām, dzelzceļa stacijām un daudz ko vairāk visā pasaulē. + local_knowledge_html: OpenStreetMap liek uzsvaru uz vietējo zināšanām. Datu veidotāji lieto satelītbildes, GPS ierīces, un parastas papīra kartes, lai pārliecinātos ka OSM ir precīzs un aktuāls. + local_knowledge_title: Vietējo zināšanas + next: Tālāk + open_data_html: "OpenStreetMap ir atvērti dati: tev ir brīvas tiesības to lietot jebkādam mērķim, kamēr tu ievieto atsauci uz OpenStreetMap un tās veidotājiem. Ja tu maini vai būvē pa virtsu datiem dažādos veidos, tu vai tos izplatīt tikai zem tās pašas licences. Apskati Autortiesību un Licences lapu priekš padziļinātas informācijas." + open_data_title: Atvērti dati + partners_title: Partneri + used_by: "%{name} darbina kartes datus simtiem mājaslapu, mobilajās aplikācijās un aparatūras ierīcēs" activerecord: attributes: diary_comment: @@ -52,7 +68,7 @@ lv: diary_entry: Dienasgrāmatas ieraksts friend: Draugs language: Valoda - message: Ziņojums + message: Ziņa node: Punkts node_tag: Punkta apzīmējums notifier: Paziņotājs @@ -60,10 +76,10 @@ lv: old_node_tag: Vecā punkta birka old_relation: Vecā relācija old_relation_member: Vecās relācijas loceklis - old_relation_tag: Vecās relācijas birka - old_way: Vecā līnija - old_way_node: Vecās līnijas punkts - old_way_tag: Vecās līnijas birka + old_relation_tag: Vecā relācijas birka + old_way: Vecais ceļš + old_way_node: Vecā ceļa punkts + old_way_tag: Vecā ceļa birka relation: Relācija relation_member: Relācijas loceklis relation_tag: Relācijas birka @@ -72,7 +88,7 @@ lv: tracepoint: Trases punkts tracetag: Trases birka user: Lietotājs - user_preference: Lietāja iestatījums + user_preference: Lietotāja iestatījums user_token: Lietotāja tiesības way: Līnija way_node: Līnijas punkts @@ -86,96 +102,62 @@ lv: blocked: Tev ir liegta piekļuve API. Lūdzu autorizējies mājaslapas interfeisā, lai uzzinātu vairāk. need_to_see_terms: Tava piekļuve API un laiku pārtraukta. Lūdzu autorizējies mājaslapas interfeisā, lai apskatītu Veidotāju Noteikumus. Tev nevajag piekrist, bet tev tie ir jāapskata. browse: + anonymous: anonīms changeset: - changeset: "Izmaiņu kopa: %{id}" + belongs_to: Autors changesetxml: Izmaiņu kopas XML - download: Lejupielādēt %{changeset_xml_link} vai %{osmchange_xml_link} feed: title: Izmaiņu kopa %{id} title_comment: Izmaiņu kopa %{id} - %{comment} + node: Punkti (%{count}) + node_paginated: Punkti (%{x}-%{y} no %{count}) osmchangexml: osmChange XML - title: Izmaiņu kopa - changeset_details: - belongs_to: "Pieder:" - bounding_box: "Izgrieztais kvadrants:" - box: kaste - closed_at: "Slēgts:" - created_at: "Izveidots:" - has_nodes: - one: "Ir sekojošais %{count} punkts:" - other: "Ir sekojošie %{count} punkti:" - has_relations: - one: "Ir sekjošā %{count} relācija:" - other: "Ir sekojošās %{count} relācijas:" - has_ways: - one: "Ir sekojošais %{count} ceļš:" - other: "Ir sekojošie %{count} ceļi:" - no_bounding_box: Nav saglabāta rāmja priekš šīs izmaiņu kopas - show_area_box: Rādīt Apgabala Rāmi - common_details: - changeset_comment: "Komentārs:" - deleted_at: "Izdzēsts:" - deleted_by: "Izdzēsis:" - edited_at: "Labots:" - edited_by: "Labojis:" - in_changeset: "Izmaiņu kopā:" - version: "Versija:" + relation: Relācijas (%{count}) + relation_paginated: Relācijas (%{x}-%{y} no %{count}) + title: "Izmaiņu kopa: %{id}" + way: Ceļi (%{count}) + way_paginated: Ceļi (%{x}-%{y} no %{count}) + closed: Aizvērts + closed_by_html: Aizvērts %{time} atpakaļ pēc %{user} + closed_html: Aizvērts %{time} atpakaļ containing_relation: entry: Relācija %{relation_name} entry_role: Relācija %{relation_name} (kā %{relation_role}) - map: - deleted: Dzēsts - edit: - area: Rediģētu apgabalu - node: Rediģēt punktu - relation: Rediģēt relāciju - way: Rediģēt ceļu - larger: - area: Skatīt apgabalu lielākā kartē - node: Skatīt punktu lielākā kartē - relation: Skatīt relāciju lielākā kartē - way: Skatīt līniju lielākā kartē - loading: Ielādē… - navigation: - all: - next_changeset_tooltip: Nākošā izmaiņu kopa - next_node_tooltip: Nākamais punkts - next_relation_tooltip: Nākamā relācija - next_way_tooltip: Nākamā līnija - prev_changeset_tooltip: Iepriekšējā izmaiņu kopa - prev_node_tooltip: Iepriekšējais punkts - prev_relation_tooltip: Iepriekšējā relācija - prev_way_tooltip: Iepriekšējā līnija - user: - name_changeset_tooltip: Skatīt %{user} labojumus - next_changeset_tooltip: Nākamais lietotāja %{user} labojums - prev_changeset_tooltip: Iepriekšējais lietotāja %{user} labojums + created: Izveidots + created_by_html: Izveidots %{time} atpakaļ pēc %{user} + created_html: Izveidots %{time} atpakaļ + deleted_by_html: Dzēsts %{time} atpakaļ pēc %{user} + download_xml: Lejupielādēt XML + edited_by_html: Labots %{time} atpakaļ pēc %{user} + in_changeset: Izmaiņu kopa + location: "Atrašanās vieta:" + no_comment: (nav komentāru) node: - download: "%{download_xml_link}, %{view_history_link} vai %{edit_link}" - download_xml: Lejupielādēt XML - edit: rediģēt - node: Punkts - node_title: "Punkts: %{node_name}" - view_history: skatīt vēsturi - node_details: - coordinates: "Koordinātes:" - part_of: "Daļa no:" - node_history: - download: "%{download_xml_link} vai %{view_details_link}" - download_xml: Lejupielādēt XML - node_history: Punkta vēsture - node_history_title: "Punkta vēsture: %{node_name}" - view_details: skatīt sīkāku informāciju + history_title: "Punkta vēsture: %{name}" + title: "Punkts: %{name}" not_found: - sorry: Atvainojiet, %{type} ar id %{id} nevarēja atrast. + sorry: "Atvainojiet, %{type} ar id #%{id} nevarējām atrast." type: changeset: izmaiņu kopa node: punkts relation: relācija way: līnija - paging_nav: - of: 'no' - showing_page: Rāda lapu + note: + closed_by: Atrisināja %{user} %{when} atpakaļ + closed_by_anonymous: Atrisināja anonīms %{when} atpakaļ + closed_title: "Atrisināta piezīme: #%{note_name}" + commented_by: Komentārs no %{user} %{when} atpakaļ + commented_by_anonymous: Komentārs no anonīma %{when} atpakaļ + hidden_by: Paslēpa %{user} %{when} atpakaļ + hidden_title: "Paslēpta piezīme #%{note_name}" + new_note: Jauna piezīme + open_by: Izveidoja %{user} %{when} atpakaļ + open_by_anonymous: Izveidoja anonīms %{when} atpakaļ + open_title: "Neatrisināta piezīme: #%{note_name}" + reopened_by: Atkal aktivizēja %{user} %{when} atpakaļ + reopened_by_anonymous: Atkal aktivizēja anonīms %{when} atpakaļ + title: "Piezīme: %{id}" + part_of: Daļa no redacted: message_html: Versija %{version} no šī %{type} nevar tikt parādīta, jo tika rediģēta. Lūdzu apskati %{redaction_link} priekš papildus informācijas. redaction: Redakcijas %{id} @@ -184,65 +166,21 @@ lv: relation: relācija way: ceļš relation: - download: "%{download_xml_link} vai %{view_history_link}" - download_xml: Lejupielādēt XML - relation: Relācija - relation_title: "Relācija: %{relation_name}" - view_history: skatīt vēsturi - relation_details: - members: "Locekļi:" - part_of: "Daļa no:" - relation_history: - download: "%{download_xml_link} vai %{view_details_link}" - download_xml: Lejupielādēt XML - relation_history: Relācijas vēsture - relation_history_title: "Relācijas vēsture: %{relation_name}" - view_details: skatīt sīkāku informāciju + history_title: "Relācijas vēsture: %{name}" + members: Lietotāji + title: "Relācija: %{name}" relation_member: entry_role: "%{type} %{name} kā %{role}" type: node: Punkts relation: Relācija way: Līnija - start: - manually_select: Manuāli izvēlēties citu apgabalu - view_data: Skatīt datus pašreizējā kartes skatā start_rjs: - data_frame_title: Dati - data_layer_name: Pārlūkot kartes datus - details: Sīkāka informācija - drag_a_box: Uzvelciet rāmi uz kartes, lai izvēlētos apgabalu - edited_by_user_at_timestamp: Rediģēja [[user]] [[timestamp]] - hide_areas: Paslēpt zonas - history_for_feature: Vēsture [[feature]] + feature_warning: Ielādē %{num_features} objektus, kas var padarīt tavu pārlūku lēnu vai nereaģējošu. Vai esi drošs, ka vēlies parādīt šos datus? load_data: Ielādēt datus - loaded_an_area_with_num_features: "Jūs esat ielādējis apgabalu, kurš satur [[num_features]] iezīmes. Pamatā, daži pārlūki var pārāk labi netikt galā ar šādu lielu datu kvantuma parādīšanu. Parasti, pārlūki tiek galā vislabāk rādot mazāk nekā 100 iezīmes vienlaikus: jebkā cita darīšana tos bremzē. Ja Jūs esat drošs, ka vēlaties attēlot šos datus, Jūs tā varat izdarīt spiežot pogu zemāk." loading: Ielādē… - manually_select: Manuāli izvēlēties citu apgabalu - object_list: - api: Izgūt šo apgabalu no API - back: Parādīt objektu sarakstu - details: Sīkāka informācija - heading: Objektu saraksts - history: - type: - node: Punkts [[id]] - way: Līnija [[id]] - selected: - type: - node: Punkts [[id]] - way: Līnija [[id]] - type: - node: Punkts - way: Līnija - private_user: privāts lietotājs - show_areas: Rādīt apgabalus - show_history: Rādīt vēsturi - unable_to_load_size: "Nevar ielādēt: Apgabala rāmis [[bbox_size]], ir pārāk liels (jābūt mazākam nekā %{max_bbox_size})" - wait: Uzgaidiet ... - zoom_or_select: Tuvini vai atlasi kartes apgabalu, lai skatītu tag_details: - tags: "Birkas:" + tags: Birkas wiki_link: key: Birkas %{key} viki lapa tag: Birkas %{key}=%{value} viki lapa @@ -254,33 +192,20 @@ lv: node: punkts relation: relācija way: līnija + version: Versija + view_details: Skatīt detaļas + view_history: Skatīt vēsturi way: - download: "%{download_xml_link}, %{view_history_link} vai %{edit_link}" - download_xml: Lejupielādēt XML - edit: rediģēt - view_history: skatīt vēsturi - way: Līnija - way_title: "Līnija: %{way_name}" - way_details: also_part_of: - one: arī daļa no ceļa %{related_ways} - other: arī daļa no ceļiem %{related_ways} - nodes: "Punkti:" - part_of: "Daļā no:" - way_history: - download: "%{download_xml_link} vai %{view_details_link}" - download_xml: Lejupielādēt XML - view_details: skatīt sīkāku informāciju - way_history: Līnijas vēsture - way_history_title: "Ceļa Vēsture: %{way_name}" + one: daļa no ceļa %{related_ways} + other: daļa no ceļiem %{related_ways} + history_title: "Ceļa Vēsture: %{name}" + nodes: Punkts + title: "Līnija: %{name}" changeset: changeset: anonymous: Anonīms - big_area: (liels) - no_comment: (nav) no_edits: (nav labojumu) - show_area_box: rādīt rāmi ap apgabalu - still_editing: (vēl rediģē) view_changeset_details: Skatīt sīkāku informāciju par izmaiņu kopu changeset_paging_nav: next: Nākamā » @@ -293,24 +218,17 @@ lv: saved_at: Saglabāts user: Lietotājs list: - description: Pēdējās izmaiņas - description_bbox: Izmaiņu kopas iekš %{bbox} - description_friend: Tavu draugu izmaiņu kopas - description_nearby: Tuvējo lietotāju izmaiņu kopas - description_user: Lietotāja %{user} izmaiņu kopas - description_user_bbox: Lietotāja %{user} izmaiņu kopas iekš %{bbox} - heading: Izmaiņu kopas - heading_bbox: Izmaiņu kopas - heading_friend: Izmaiņu kopas - heading_nearby: Izmaiņu kopas - heading_user: Izmaiņu kopas - heading_user_bbox: Izmaiņu kopas + empty: Nav atrasta neviena izmaiņu kopa. + empty_area: Šajā apgabalā nav izmaiņu kopu. + empty_user: Šim lietotājam nav izmaiņu kopu. + load_more: Ielādēt vairāk + no_more: Vairāk izmaiņu kopu neatrada. + no_more_area: Nav vairāk izmaiņu kopu šajā apgabalā. + no_more_user: Nav vairāk izmaiņu kopu no šī lietotāja. title: Izmaiņu kopas - title_bbox: Izmaiņu kopas iekš %{bbox} title_friend: Tavu draugu izmaiņu kopas title_nearby: Tuvējo lietotāju izmaiņu kopas title_user: Lietotāja %{user} izmaiņu kopas - title_user_bbox: Lietotāja %{user} izmaiņu kopas iekš %{bbox} timeout: sorry: Atvainojiet, jūsu pieprasīto izmaiņu kopu ielāde prasīja pārāk daudz laika. diary_entry: @@ -328,8 +246,9 @@ lv: hide_link: Paslēpt šo komentāru diary_entry: comment_count: - one: 1 komentārs + one: "%{count} komentārs" other: "%{count} komentāri" + zero: Nav komentāru comment_link: Komentēt šo ierakstu confirm: Apstiprināt edit_link: Rediģēt šo ierakstu @@ -364,13 +283,13 @@ lv: newer_entries: Jaunāki ieraksti no_entries: Dienasgrāmatā nav ierakstu older_entries: Vecāki ieraksti - recent_entries: "Pēdējie dienasgrāmatas ieraksti:" + recent_entries: Pēdējie dienasgrāmatas ieraksti title: Lietotāju dienasgrāmatas title_friends: Draugu dienasgrāmatas title_nearby: Tuvumā esošu lietotāju dienasgrāmatas user_title: "%{user} dienasgrāmata" location: - edit: Rediģēt + edit: Labot location: "Atrašanās vieta:" view: Skatīt new: @@ -381,13 +300,16 @@ lv: title: Dienasgrāmatas ieraksts nav atrasts view: leave_a_comment: Ierakstīt komentāru - login: Ieiet + login: Pieslēgties login_to_leave_a_comment: "%{login_link} lai komentētu" save_button: Saglabāt title: "%{user} dienasgrāmata | %{title}" user_title: "%{user} dienasgrāmata" editor: default: Noklusējuma (pašlaik %{name}) + id: + description: iD (pārlūka redaktors) + name: iD potlatch: description: Potlatch 1 (atvērt pārlūkā) name: Potlatch 1 @@ -403,7 +325,7 @@ lv: area_to_export: Kvadrants, kuru eksportēt embeddable_html: Ievietojams HTML kods export_button: Eksportēt - export_details: OpenStreetMap dati ir licencēta saskaņā ar Creative Commons Attribution-ShareAlike 2.0 licenci. + export_details: OpenStreetMap dati ir licencēti saskaņā ar Atvērtās Datu Kopas Atvērtās Datubāzes licenci (ODbL). format: Formāts format_to_export: Eksportēšanas formāts image_size: Attēla izmērs @@ -419,29 +341,34 @@ lv: paste_html: Ielīmēt HTML mājas lapā scale: Mērogs too_large: + advice: "Ja augstāk esošais eksports neizdodas, lūdzu apsver iespēj lietot kādu no zemāk minētajiem avotiem:" body: Šis apgabals ir pārāk liels, lai to eksportētu kā OpenStreetMap XML datus. Lūdzu tuvini vai izvēlies mazāku apgabalu. - heading: Apgabals pārāk liels + geofabrik: + description: Regulāri atjaunoti izgriezumi no kontinentiem, valstīm, un izvēlētām pilsētām + title: Geofabrik Lejupielādes + metro: + description: Izgriezumi lielākajām pasaules pilsētām un to apkārteni + title: Metro Izgriezumi + other: + description: Papildus avoti, kas norādīti OpenStreetMap wiki + title: Citi Avoti + overpass: + description: Lejupielādē šo apgabalu no OpenStreetMap datubāzes spoguļa + title: Overpass API + planet: + description: Regulāri atjauninātas kopijas no pilnās OpenStreetMap datubāzes + title: OSM Planēta zoom: Palielināt - start_rjs: - add_marker: Pievienot atzīmi kartei - change_marker: Mainīt atzīmes pozīciju - click_add_marker: Noklikšķiniet uz kartes, lai pievienotu atzīmi - drag_a_box: Uzvelciet kvadrātu uz kartes, lai izvēlētos teritoriju - export: Eksportēt - manually_select: Manuāli izvēlies citu teritoriju - view_larger_map: Skatīt lielāku karti + title: Eksportēt geocoder: description: title: geonames: Atrašanās vieta no GeoNames - osm_namefinder: "%{types} no OpenStreetMap Namefinder" osm_nominatim: Atrašanās vieta no OpenStreetMap Nominatim types: cities: Pilsētas places: Vietas towns: Pilsētas - description_osm_namefinder: - prefix: "%{distance} %{direction} no %{type}" direction: east: austrumi north: ziemeļi @@ -462,16 +389,26 @@ lv: title: ca_postcode: Rezultāti no Geocoder.CA geonames: Rezultāti no GeoNames + geonames_reverse: Rezultāti no GeoNames latlon: Rezultāti no Iekšējās meklēšanas - osm_namefinder: Rezultāti no OpenStreetMap Namefinder osm_nominatim: Rezultāti no OpenStreetMap Nominatim + osm_nominatim_reverse: Rezultāti no OpenStreetMap Nominatim uk_postcode: Rezultāti no NPEMap / FreeThe Postcode us_postcode: Rezultāti no Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} no %{parentname})" - suffix_place: ", %{distance} %{direction} no %{placename}" search_osm_nominatim: + admin_levels: + level10: Priekšpilsētas robeža + level2: Valsts robeža + level4: Štata robeža + level5: Rajona robeža + level6: Pagasta robeža + level8: Pilsētas robeža + level9: Ciema robeža prefix: + aerialway: + chair_lift: Krēslu Pacēlājs + drag_lift: Vilkšanas Pacēlājs + station: Pacēlāja Stacija aeroway: aerodrome: Lidlauks apron: Perons @@ -565,6 +502,7 @@ lv: shower: Dušas social_centre: Sociālais centrs social_club: Sociālais klubs + social_facility: Sociālā ēka studio: Studija supermarket: Lielveikals swimming_pool: Peldbaseins @@ -593,6 +531,9 @@ lv: "yes": Tilts building: "yes": Ēka + emergency: + fire_hydrant: Hidrants + phone: Telefons ārkārtas situācijai highway: bridleway: Izjādes taka bus_guideway: Vadāmais Autobuss @@ -614,6 +555,7 @@ lv: platform: Platforma primary: Galvenais valsts ceļš primary_link: Galvenais valsts ceļš + proposed: Ieplānots Ceļš raceway: Sacensību trase residential: Dzīvojamā rest_area: Atpūtas zona @@ -625,6 +567,7 @@ lv: speed_camera: Ātruma kamera steps: Pakāpieni stile: Pakāpiens + street_lamp: Ielas Laterna tertiary: Pašvaldību autoceļi tertiary_link: Pašvaldību autoceļš track: Zemesceļš @@ -640,6 +583,7 @@ lv: building: Ēka castle: Pils church: Baznīca + citywalls: Pilsētas Sienas fort: Forts house: Māja icon: Ikona @@ -649,6 +593,7 @@ lv: monument: Piemineklis museum: Muzejs ruins: Drupas + tomb: Kaps tower: Tornis wayside_cross: Krusts ceļmalā wayside_shrine: Ceļmalas svētnīca @@ -716,6 +661,8 @@ lv: airfield: Militārais lidlauks barracks: Barakas bunker: Bunkurs + mountain_pass: + "yes": Kalnu ieleja natural: bay: Līcis beach: Pludmale @@ -785,6 +732,7 @@ lv: locality: Vieta moor: Tīrelis municipality: Pašvaldība + neighbourhood: Pilsētas rajons postcode: Pasta indekss region: Reģions sea: Jūra @@ -810,8 +758,10 @@ lv: narrow_gauge: Šaursliežu dzelzceļš platform: Dzelzceļa perons preserved: Iekonservēts Dzelzceļš + proposed: Ieplānots Dzelzceļš spur: Dzelzceļa Atradze station: Dzelzceļa stacija + stop: Dzelzceļa Pietura subway: Metro stacija subway_entrance: Metro ieeja switch: Dzelzceļa punkti @@ -827,6 +777,7 @@ lv: beverages: Dzērienu veikals bicycle: Velosipēdu veikals books: Grāmatu veikals + boutique: Mazs elitārs veikals butcher: Miesnieks car: Auto veikals car_parts: Automašīnu rezerves daļas @@ -840,6 +791,7 @@ lv: convenience: Stūra Veikals copyshop: Kopētava cosmetics: Kosmētikas veikals + deli: Delikatešu veikals department_store: Universālveikals discount: Atlaižu Veikals doityourself: Dari-pats @@ -876,17 +828,21 @@ lv: organic: Bioloģiskās pārtikas veikals outdoor: Ārtelpu Veikals pet: Zooveikals + pharmacy: Aptieka photo: Fotoveikals salon: Salons + second_hand: Lietoto preču veikals shoes: Apavu veikals shopping_centre: Iepirkšanās centrs sports: Sporta veikals stationery: Kancelejas preču veikals supermarket: Lielveikals + tailor: Drēbnieks toys: Rotaļlietu veikals travel_agency: Tūrisma aģentūra video: Video veikals wine: Alkohola Veikals + "yes": Veikals tourism: alpine_hut: Kalnu būda artwork: Mākslas darbs @@ -909,6 +865,7 @@ lv: viewpoint: Skatu punkts zoo: Zooloģiskais dārzs tunnel: + culvert: Drenāžas caurule "yes": Tunelis waterway: artificial: Mākslīgais ūdensceļš @@ -932,65 +889,116 @@ lv: water_point: Ūdens punkts waterfall: Ūdenskritums weir: Dambis + help_page: + help: + description: Uzdod jautājumu vai atrodi atbildes iekš OSM jautājumu un atbilžu lapas. + title: help.openstreetmap.org + url: http://forum.openstreetmap.org/viewforum.php?id=59 + introduction: OpenStreetMap ir vairāki resursi, lai uzzinātu par projektu, uzdotu un atbildētu uz jautājumiem, un diskutētu un dokumentētu kartēšanas tēmas. + title: Palīdzības saņemšana + welcome: + description: Sāc ar šo īso ceļvedi, kurš aptver OpenStreetMap pamatus. + title: Laipni lūgti iekš OSM + url: /sveicināts + wiki: + description: Caurlūko wiki priekš padziļinātas OSM dokumentācijas. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Aizvērt + edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied šeit. + key: + title: Apzīmējumi + tooltip: Apzīmējumi + tooltip_disabled: Kartes leģenda pieejama tikai Standarta slānim map: base: cycle_map: Velokarte + hot: Humanitārās standard: Standarta transport_map: Transporta karte + copyright: © OpenStreetMap ieguldītāji + donate_link_text: + layers: + data: Kartes dati + header: Kartes slāņi + notes: Kartes piezīmes + overlays: Iespējot pārklājumus, lai novērstu trūkumus kartei + title: Slāņi + locate: + popup: Tu esi {distance} {unit} no šī punkta + title: Rādīt manu atrašanās vietu + zoom: + in: Palielināt + out: Samazināt + notes: + new: + add: Pievienot Piezīmi + intro: Piezīmes domātas, lai norādītu uz kartes kļūdām. Ja vēlies pamēģināt pats ievietot informāciju, zīmēt vai izlabot kļūdu, izmanto pogu "Labot" lapas augšpusē. Piezīmes parādās citiem kartētājiem, tādēļ lūdzu, cik vien iespējams precīzāk un detalizētāk visu izklāsti, kā arī marķieri novieto pēc iespējas pareizākajā pozīcijā. + show: + anonymous_warning: Šī piezīme ietver komentārus no anonīmiem lietotājiem, kurus nepieciešams pārbaudīt neatkarīgi. + comment: Komentēt + comment_and_resolve: Komentēt un Atrisināt + hide: Slēpt + reactivate: Atkal aktivizēt + resolve: Atrisināt + share: + cancel: Atcelt + center_marker: Centrēt karti uz marķieri + custom_dimensions: Uzstādīt pielāgotus izmērus + download: Lejupielādēt + embed: HTML + format: "Formāts:" + image: Bilde + image_size: Bilde tiks rādīta pamata slānī pie + include_marker: Iekļaut marķieri + link: Saite vai HTML + long_link: Saite + paste_html: Ielīmē HTML, lai ievietotu mājaslapā + scale: "Mērogs:" + short_link: Īsā saite + short_url: Īsais URL + title: Dalīties + view_larger_map: Skatīt lielāku karti site: + createnote_disabled_tooltip: Pietuvini karti, lai pievienotu piezīmi + createnote_tooltip: Pievienot piezīmi kartei edit_disabled_tooltip: Pietuvini, lai rediģētu karti edit_tooltip: Rediģēt karti - edit_zoom_alert: Tev ir jāpietuvina, lai rediģētu karti - history_disabled_tooltip: Pietuvini, lai redzētu labojumus šim apgabalam - history_tooltip: Skatīt labojumus šim apgabalam - history_zoom_alert: Tev ir jāpietuvina, lai redzētu labojumus šim apgabalam + map_data_zoom_in_tooltip: Pietuvināt, lai redzētu kartes datus + map_notes_zoom_in_tooltip: Pietuvināt, lai redzētu piezīmes layouts: + about: Par community: Kopiena community_blogs: Kopienas emuāri community_blogs_title: OpenStreetMap kopienas locekļu emuāri - copyright: Autortiesības un licence - documentation: Dokumentācija - documentation_title: Projekta dokumentācija + copyright: Autortiesības + data: Dati donate: Atbalstiet OpenStreetMap, %{link} aparatūras uzlabošanas fondam. - donate_link_text: ziedojot - edit: Rediģēt + edit: Labot edit_with: Rediģēt ar %{editor} export: Eksportēt - export_tooltip: Eksportēt kartes datus + export_data: Eksportēt datus foundation: Fonds foundation_title: OpenStreetMap fonds gps_traces: GPS trases gps_traces_tooltip: Pārvaldīt GPS trases help: Palīdzība - help_centre: Palīdzības centrs - help_title: Projekta palīdzības vietne history: Vēsture - home: sākums - home_tooltip: Doties uz sākumu - inbox: iesūtne (%{count}) - inbox_tooltip: - one: Tavā iesūtnē ir 1 nelasīts ziņojums - other: Tavā iesūtnē ir %{count} nelasīti ziņojumi - zero: Tavā iesūtnē nav nelasītu ziņojumu - intro_1: OpenStreetMap ir atvērta, rediģējama visas pasaules karte. To veido tādi paši cilvēki kā jūs. + home: Doties uz mājas atrašanās vietu intro_2_create_account: Izveidot lietotāja kontu - intro_2_download: lejupielādēt - intro_2_html: Dati ir brīvi %{download} un %{use} zem %{license}. %{create_account}, lai uzlabotu karti. - intro_2_license: Atvērtā licence - intro_2_use: izmanto - intro_2_use_url: http://wiki.openstreetmap.org/wiki/LV:tagging_guidelines - license: - title: OpenStreetMap dati ir licencēti ar Creative Commons Attribution-Share Alike 2.0 Generic licenci - log_in: ieiet + intro_header: Laipni lūdzam OpenStreetMap! + intro_text: OpenStreetMap ir pasaules karte, kuru veido cilvēki kā tu, un tā ir bezmaksas lietošanai zem atvērtas licences. + learn_more: Uzzināt Vairāk + log_in: Ieiet log_in_tooltip: Ieiet ar esošu kontu logo: alt_text: OpenStreetMap logo - logout: iziet - logout_tooltip: Iziet + logout: Iziet make_a_donation: text: Ziedot attīstībai title: Atbalstiet OpenStreetMap ar naudas ziedojumu + more: Vairāk osm_offline: OpenStreetMap datubāze šobrīd nav pieejama, tiek veikti svarīgi datubāzes apkalpošanas darbi. osm_read_only: OpenStreetMap datubāze šobrīd ir pieejama tikai-lasāmā režīmā, jo tiek veikti svarīgi datubāzes apkalpes darbi. partners_bytemark: Bytemark Hosting @@ -999,24 +1007,47 @@ lv: partners_partners: partneri partners_ucl: UCL VR centrs partners_url: http://wiki.openstreetmap.org/wiki/Partners - sign_up: piereģistrēties + sign_up: Piereģistrēties sign_up_tooltip: Izveidot kontu rediģēšanai - sotm2011: Nāciet uz 2011. gada OpenStreetMap konferenci "The State of the Map" 9. - 11. septembrī Denverā! + start_mapping: Sākt Kartēt tag_line: Atvērtā Wiki pasaules karte user_diaries: Lietotāju dienasgrāmatas user_diaries_tooltip: Skatīt lietotāju dienasgrāmatas - view: Skatīt - view_tooltip: Skatīti karti - welcome_user: Laipni lūdzam, %{user_link} - welcome_user_link_tooltip: Tava lietotāja lapa - wiki: Viki - wiki_title: Projekta viki vietne license_page: foreign: english_link: angliskais oriģināls text: Gadījumā, ja šī tulkotā lapa ir nesaskaņā ar %{english_original_link}, vērā jāņem un jāvadās no angliskās lapas title: Par šo tulkojumu - legal_babble: "

    Autortiesības un Licence

    \n

    \n OpenStreetMap ir atvērti dati, licencēti zem Creative\n Commons Attribution-ShareAlike 2.0 licences (CC BY-SA).\n

    \n

    \n Tu vari kopēt, izplatīt, nosūtīt un adaptēt mūsu kartes\n un datus, kamēr tu atsaucies uz OpenStreetMap un tās\n veidotājiem. Ja tu maini vai veido uz mūsu kartēm, tu\n vari izplatīt rezultātu tikai zem tās pašas licences. Pilns\n juridiskais kods izskaidro tavas tiesības un pienākumus.\n

    \n\n

    Kā atsaukties uz OpenStreetMap

    \n

    \n Ja Tu lieto OpenStreetMap kartes bildes, mēs pieprasām ka\n tava atsaucē ir vismaz “© OpenStreetMap\n veidotāji, CC BY-SA”. Ja tu izmanto tikai kartes datus,\n mēs pieprasām “Kartes dati © OpenStreetMap veidotāji,\n CC BY-SA”.\n

    \n

    \n Kur iespējams, OpenStreetMap vajadzētu būt iesaitētam uz http://www.openstreetmap.org/\n un CC BY-SA uz http://creativecommons.org/licenses/by-sa/2.0/. Ja\n tu lieto mediju, kur saites nav iespējamas (piem. \n printēts darbs), mēs iesakām pārsūtīt savus lasītājus uz\n www.openstreetmap.org (piemēram paplašinot\n ‘OpenStreetMap’ uz pilno adresi) un uz\n www.creativecommons.org.\n

    \n\n

    Uzzināt vairāk

    \n

    \n Lasi vairāk par mūsu datu izmantošanu Juridiskajā\n FAQ.\n

    \n

    \n OSM veidotājiem tiek atgādināts nievietot datus no\n ar autortiesībām aizsargātām vietām (piem. Google Maps vai drukātas kartes) bez\n skaidri izteiktas atļaujas no autortiesību turētājiem.\n

    \n

    \n Lai arī OpenStreetMap ir atvērti dati, mēs nevaram piedāvāt\n bezmaksas karšu API trešo pušu izstrādātājiem.\n\n Skatīt mūsu API Lietošanas Politiku,\n Flīžu Lietošanas Politiku\n and Nominatim L:ietošanas Politiku.\n

    \n\n

    Mūsu veidotāji

    \n

    \n Mūsu CC BY-SA licence pieprasa tev “dot Oriģinālajam\n Autoram atsauci saprātīgu līdz vidēju vai veidu, ka Tu lieto\n ”. Individuāli OSM kartētāji nepieprasa\n atsauci pāri “OpenStreetMap\n veidotāji”, bet, kur dati no nacionālas kartēšanas aģentūras\n vai cita nopietna avota ir iekļauti iekš\n OpenStreetMap, varētu būt saprātīgi uz viņiem atsaukties tieši\n reproducējot viņu atsauci vai iesaitējot uz šo lapu.\n

    \n\n\n\n
      \n
    • Austrālija: Ietver pilsētu datus no\n Australian Bureau of Statistics data.
    • \n
    • Austrija: Ietver datus no\n Stadt Wien (zem\n CC BY).
    • \n
    • Kanāda: Ietver datus no\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), un StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Francija: Ietver datus no\n Direction Générale des Impôts.
    • \n
    • Nīderlande: Satur © AND data, 2007\n(www.and.com)
    • \n
    • Jaunzēlande: Ietver datus no\n Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polija: Ietver datus no UMP-pcPL kartes. Autortiesības\n UMP-pcPL veidotāji.\n \n Vairāk par OSM' UMP datu lietojumu
    • \n
    • Dienvidāfrika: Ietver datus no\n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved.
    • \n
    • Apvienotā Karaliste: Satur Ordnance\n Survey datus © Crown copyright and database right\n 2010.
    • \n
    \n\n

    \n Datu ievietošana OpenStreetMap nenozīmē ka oriģinālais\n datu avots sniedz atbalstu OpenStreetMap, dod garantiju, vai\n pieņem jebkādu atbildību.\n

    " + legal_babble: + attribution_example: + alt: Piemērs, kā OpenStreetMap apzīmēt web lapā + title: Atsauces piemērs + contributors_at_html: "Austrija: Ietver datus no\n Stadt Wien (zem\n CC BY)." + contributors_ca_html: "Kanāda: Ietver datus no\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), un StatCan (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Somija: Satur datus no\nSomijas Topogrāfiskās Datubāzes Nacionālās Zemes Dienesta\nun citām datu kopām zem\nNLSFI Licence." + contributors_footer_1_html: "Sīkāku informāciju par šiem, un citiem avotiem, kas izmantoti,\nlai uzlabotu OpenStreetMap, lūdzu apskati Veidotāju\nlapu iekš OpenStreetMap Wiki." + contributors_footer_2_html: " Datu ievietošana OpenStreetMap nenozīmē ka oriģinālais\n datu avots sniedz atbalstu OpenStreetMap, dod garantiju, vai\n pieņem jebkādu atbildību." + contributors_fr_html: "Francija: Ietver datus no\n Direction Générale des Impôts." + contributors_gb_html: "Apvienotā Karaliste: Satur Ordnance\n Survey datus © Kroņa tiesības un datubāze\n 2010-12." + contributors_intro_html: "Mūsu veidotāji ir tūkstošiem cilvēku. Mēs arī ievietojam\natvērti-licencētus datus no nacionālajām kartēšanas aģentūrām\nun citiem avotiem, to skaitā:" + contributors_nl_html: "Nīderlande: Satur © AND data, 2007\n(www.and.com)" + contributors_nz_html: "Jaunzēlande: Ietver datus no\n Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Mūsu veidotāji + contributors_za_html: "Dienvidāfrika: Ietver datus no\n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved." + credit_1_html: "Mēs pieprasām, ka tu izmanto atsauci “© OpenStreetMap\nveidotāji”." + credit_2_html: "Kur iespējams, OpenStreetMap vajadzētu būt iesaitētam uz http://www.openstreetmap.org/\n un CC BY-SA uz http://creativecommons.org/licenses/by-sa/2.0/. Ja\n tu lieto mediju, kur saites nav iespējamas (piem. \n printēts darbs), mēs iesakām pārsūtīt savus lasītājus uz\n www.openstreetmap.org (piemēram paplašinot\n ‘OpenStreetMap.org’ uz pilno adresi) un uz\n www.creativecommons.org." + credit_3_html: "Priekš pārlūkojamas elektroniskās kartes, atsaucei ir jāparādās kartes stūrī. Piemēram:" + credit_title_html: Kā atsaukties uz OpenStreetMap + infringement_1_html: "OSM veidotājiem tiek atgādināts, nekad neizmantot datus no jebkuriem \nar autortiesībām aizsargātiem avotiem (piem. Google Maps vai drukātām kartēm), bez \nprecīzi formulētas atļaujas no autortiesību īpašniekiem." + infringement_2_html: "Ja tu tici, ka ar autortiesībām aizsargāts materiāls ir ticis neatbilstoši\npievienots OpenStreetMap datubāzei vai vietnei, lūdzu atsaucies uz\nmūsu noņemšanas\nprocedūru vai paziņo pa tiešo mums, izmantojot\non-line ziņošanas veidni." + infringement_title_html: Autortiesību pārkāpums + intro_1_html: "OpenStreetMap ir atvērti dati, kad licencēti zem Atvērtās Datu Kopas Atvērtās Datubāzes licences (ODbL)." + intro_2_html: "Tu vari kopēt, izplatīt, nosūtīt un adaptēt mūsu kartes\n un datus, kamēr tu atsaucies uz OpenStreetMap un tās\n veidotājiem. Ja tu maini vai veido uz mūsu kartēm, tu\n vari izplatīt rezultātu tikai zem tās pašas licences. Pilns\n juridiskais kods izskaidro tavas tiesības un pienākumus." + intro_3_html: "Kartogrāfija mūsu karšu flīzēs un mūsu dokumentācija ir licencēti zem Creative\nCommons Attribution-ShareAlike 2.0 licences (CC-BY-SA)." + more_1_html: "Lasi vairāk par mūsu datiem, un kā uz mums atsaukties juridiskajā\n FAQ." + more_2_html: "Lai gan OpenStreetMap ir atvērti dati, mēs nevaram piedāvāt bezmaksas kartes API trešās puses izstrādātājiem.\nApskati mūsu API Lietošanas Politiku,\nFlīžu Lietošanas Politiku\nun Nominatim Lietošanas Politiku." + more_title_html: Uzzināt vairāk + title_html: Autortiesības un Licence native: mapping_link: sākt kartēt native_link: latviskā versija @@ -1076,12 +1107,9 @@ lv: title: izsūtne to: Kam read: - back_to_inbox: Atpakaļ uz iesūtni - back_to_outbox: Atpakaļ uz izsūtni + back: Atpakaļ date: Datums from: 'No' - reading_your_messages: Lasu jūsu ziņas - reading_your_sent_messages: Lasu jūsu nosūtītās ziņas reply_button: Atbilde subject: Temats title: Lasīt ziņu @@ -1092,6 +1120,37 @@ lv: wrong_user: Tu esi autorizējies kā `%{user}', bet ziņojums, kuram tu vēlies atbildēt, nav sūtīts šim lietotājam. Lūdzu autorizējies, kā pareizais lietotājs, lai atbildētu. sent_message_summary: delete_button: Dzēst + note: + description: + closed_at_by_html: "%{user} atrisināja %{when} atpakaļ" + closed_at_html: Atrisināts %{when} atpakaļ + commented_at_by_html: "%{user} atjaunoja %{when} atpakaļ" + commented_at_html: Atjaunots %{when} atpakaļ + opened_at_by_html: Izveidoja %{user} %{when} atpakaļ + opened_at_html: Izveidots %{when} atpakaļ + reopened_at_by_html: "%{user} atkal aktivizēja %{when} atpakaļ" + reopened_at_html: Atkal aktivizēts %{when} atpakaļ + entry: + comment: Komentārs + full: Pilna piezīme + mine: + ago_html: "%{when} pirms" + created_at: Izveidots + creator: Veidotājs + description: Apraksts + heading: "%{user} piezīmes" + id: Id + last_changed: Pēdējā izmaiņa + subheading: Piezīmes, kuras veidojis vai komentējis %{user} + title: Piezīmes, kuras veidojis vai komentējis %{user} + rss: + closed: aizvērta piezīme (netālu no %{place}) + commented: jauns komentārs (tuvu %{place}) + description_area: Piezīmju saraksts, kuras noziņotas, komentētas vai atrisinātas tavā apvidū [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: RSS barotne piezīmei %{id} + opened: jauna piezīme (tuvu %{place}) + reopened: atkal aktivizēta piezīme (tuvu %{place}) + title: OpenStreetMap Piezīmes notifier: diary_comment_notification: footer: Jūs varat izlasīt komentāru saitē %{readurl}, kā arī komentēt saitē %{commenturl} vai atbildēt saitē %{replyurl} @@ -1107,8 +1166,7 @@ lv: email_confirm_plain: 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. greeting: Sveicināti, - hopefully_you_1: Kāds (cerams, jūs) vēlas nomainīt savu e-pasta adresi - hopefully_you_2: "%{server_url} uz %{new_address}." + hopefully_you: Kāds (cerams Tu) vēlas mainīt savu e-pasta adresi %{server_url} uz %{new_address}. friend_notification: befriend_them: Jūs variet viņus arī pievienot par draugiem %{befriendurl}. had_added_you: "%{user} pievienoja jūs kā draugu OpenStreetMap." @@ -1137,44 +1195,36 @@ lv: lost_password_plain: click_the_link: Ja tas esat jūs, lūdzu klikšķiniet uz zemāk esošās saites lai atiestatītu savu paroli. greeting: Sveicināti, - hopefully_you_1: Kāds (iespējams, jūs) ir vēlējies atiestatīt paroli šīs - hopefully_you_2: e-pasta adreses openstreetmap.org kontam. + 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. message_notification: - footer1: Jūs varat izlasīt ziņojumu arī %{readurl} - footer2: un jūs variet atbildēt %{replyurl} + footer_html: Tu arī vari izlasīt ziņojumu iekš %{readurl} un atbildēt iekš %{replyurl} header: "OpenStreetMap lietotājs %{from_user} ir jums nosūtījis ziņu ar tematu %{subject}:" hi: Sveiks %{to_user}, + note_comment_notification: + anonymous: "Anonīms lietotājs:" + closed: + commented_note: "[OpenStreetMap] %{commenter} ir atrisinājis kādu piezīmi, kur esi komentējis. Piezīme ir netālu no %{place}." + subject_other: "[OpenStreetMap] %{commenter} ir atrisinājis kādu piezīmi, kas tevi interesē" + subject_own: "[OpenStreetMap] %{commenter} ir atrisinājis kādu no tavām piezīmēm" + your_note: "[OpenStreetMap] %{commenter} ir atrisinājis kādu no tavām piezīmēm netālu no %{place}." + commented: + commented_note: "%{commenter} ir atstājis komentāru uz kādu no tevis komentētām kartes piezīmēm. Piezīme ir netālu no %{place}." + subject_other: "[OpenStreetMap] %{commenter} ir komentējis kādu no piezīmēm, kas tevi interesē" + subject_own: "[OpenStreetMap] %{commenter} ir komentējis kādu no tavām piezīmēm" + your_note: "%{commenter} ir atstājis komentāru uz kādas no tavām kartes piezīmēm netālu no %{place}." + details: Vairāk informācijas par piezīmēm var atrast %{url}. + greeting: Sveiks, + reopened: + commented_note: "[OpenStreetMap] %{commenter} ir atkal aktivizējis kādu piezīmi, kur esi komentējis. Piezīme ir netālu no %{place}." + subject_other: "[OpenStreetMap] %{commenter} ir atkal aktivizējis kādu piezīmi, kas tevi interesē" + subject_own: "[OpenStreetMap] %{commenter} ir atkal aktivizējis kādu no tavām piezīmēm" + your_note: "[OpenStreetMap] %{commenter} ir atkal aktivizējis kādu no tavām piezīmēm netālu no %{place}." signup_confirm: - subject: "[OpenStreetMap] Apstipriniet savu e-pasta adresi" - signup_confirm_html: - ask_questions: Tu vari jautāt jebkurus jautājumus par OpenStreetMap mūsu jautājumu un atbilžu lapā. - click_the_link: Ja tas esat jūs, laipni aicināti! Lūdzu klikšķiniet uz zemāk esošās saites lai apstiprinātu lietotāja kontu un uzzinātu vairāk par OpenStreetMap - current_user: Saraksts ar pašreizējiem lietotājiem kategorijās, pamatojoties uz to, kur tie atrodas pasaulē, ir pieejams no Category:Users_by_geographical_region. - get_reading: Izlasi par OpenStreetMap iekš wiki, panāc ar jaunākajām ziņām, izmantojot OpenStreetMap blogu vai Twitter, vai pārlūko caur OpenStreetMap dibinātāja Steve Coast's OpenGeoData blogu priekš projekta vēstures, kuram ir podcasti, kurus klausīties! - greeting: Sveicināti! - hopefully_you: Kāds (cerams, jūs) vēlas izveidot lietotāja kontu - introductory_video: Iespējams noskatīties %{introductory_video_link}. - more_videos: Ir vēl citi %{more_videos_link}. - more_videos_here: video šeit - user_wiki_page: Ir ieteicams izveidot lietotāja wiki lapu, kas satur kategoriju birkas, norādot, kur tu esi, piemēram [[Category:Users_in_London]]. - video_to_openstreetmap: video, kas iepazīstina ar OpenStreetMap - wiki_signup: Tu varētu arī vēlēties piereģistrēties OpenStreetMap wiki. - signup_confirm_plain: - ask_questions: "Tu vari jautāt jebkurus jautājumus par OpenStreetMap mūsu jautājumu un atbilžu lapā:" - blog_and_twitter: "Sekojiet jaunumiem OpenStreetMap emuārā un Twitter:" - click_the_link_1: Ja tas esat jūs, laipni aicināti! Lūdzu sekojiet saitei zemāk lai apstiprinātu savu - click_the_link_2: lietotāja kontu un uzzinātu vairāk par OpenStreetMap. - current_user_1: Esošo lietotāju saraksts kategorijās, atkarībā no tā, kur pasaulē - current_user_2: "viņi atrodas, ir pieejama:" + confirm: "Pirms mēs turpinām, mums vajag pārliecināties, ka pieprasījums nāca no tevis, ja tas nāca, lūdzu uzklikšķini uz zemāk redzamās saites, lai aktivizētu savu lietotāju:" + created: Kāds (cerams tu) tikko izveidoja lietotāju %{site_url}. greeting: Sveicināti! - hopefully_you: Kāds (cerams, jūs) vēlas izveidot lietotāja kontu - introductory_video: "Šeit varat noskatīties video, kas iepazīstina ar OpenStreetMap:" - more_videos: "Šeit ir vēl citi video:" - opengeodata: "OpenGeoData.org ir OpenStreetMap dibinātāja Stīva Kousta emuārs, tajā ir arī podraides:" - the_wiki: "Lasiet par OpenStreetMap mūsu viki:" - user_wiki_1: Tas ir ieteicams, ka tu izveido sava lietotāja wiki lapu, kura satur - user_wiki_2: kategoriju tagus, norādot, kas tu esi, kā piemēram [[Category:Users_in_London]]. - wiki_signup: Tu arī varētu vēlēties piereģistrēties mūsu OpenStreetMap wiki, šeit + subject: "[OpenStreetMap] Laipni lūgti OpenStreetMap" + welcome: Kad tu apstiprināsi savu lietotāju, mēs tev dosim papildus informāciju, lai tu varētu sākt kartēt. oauth: oauthorize: allow_read_gpx: lasīt jūsu privātās GPS trases. @@ -1183,8 +1233,18 @@ lv: allow_write_api: mainīt karti. allow_write_diary: izveidot dienasgrāmatas ierakstus, komentārus un norādīt draugus. allow_write_gpx: augšupielādēt GPS trases. + allow_write_notes: labot piezīmes. allow_write_prefs: mainīt jūsu lietotāja iestatījumus. request_access: Aplikācija %{app_name} pieprasa pieeju tavas lietotājam, %{user}. Lūdzu pārbaudi, vai tu vēlies, lai aplikācijai būtu sekojošās iespējas. Tu vari izvēlēties cik daudz vai maz tu vēlies. + title: Atļaut piekļuvi savam kontam + oauthorize_failure: + denied: Tu esi liedzis programmai %{app_name} piekļūt savam lietotājam. + invalid: Autorizācijas kods nav derīgs. + title: Autorizācijas pieprasījums neizdevās + oauthorize_success: + allowed: Tu esi piešķīris tiesības %{app_name} piekļūt tavam lietotājam. + title: Autorizācijas pieprasījums atļauts + verification: Pārbaudes kods ir %{code}. revoke: flash: Tu esi atsaucis pilnvaru priekš %{application} oauth_clients: @@ -1193,7 +1253,7 @@ lv: destroy: flash: Iznīcināja klienta aplikācijas reģistrāciju edit: - submit: Rediģēt + submit: Labot title: Rediģē savu pieteikumu form: allow_read_gpx: lasīt savas privātās GPS trases. @@ -1201,6 +1261,7 @@ lv: allow_write_api: labot karti. allow_write_diary: veidot dienasgrāmatas ierakstus, komentārus un veidot draugus. allow_write_gpx: augšupielādēt GPS trases. + allow_write_notes: labot piezīmes. allow_write_prefs: mainīt viņa lietotāja uzstādījumus. callback_url: Atzvanīšanas URL name: Nosaukums @@ -1231,6 +1292,7 @@ lv: allow_write_api: labot karti. allow_write_diary: veidot dienasgrāmatas ierakstus, komentārus un veidot draugus. allow_write_gpx: augšupielādēt GPS ceļus. + allow_write_notes: labot piezīmes. allow_write_prefs: mainīt lietotāja uzstādījumus. authorize_url: "Autorizēšanas URL:" confirm: Vai esat pārliecināts? @@ -1239,7 +1301,7 @@ lv: key: "Patērētāja atslēga:" requests: "Pieprasīt sekojošās atļaujas no lietotāja:" secret: "Patērētāja noslēpums:" - support_notice: Mēs atbalstām HMAC-SHA1 (ieteicams) kā arī vienkāršu tekstu iekš SSL režīma. + support_notice: Mēs atbalstām HMAC-SHA1 (ieteicams) un RSA-SHA1 paraksti. title: OAuth detaļas %{app_name} url: "Pieprasījuma pilnvaru URL:" update: @@ -1279,6 +1341,7 @@ lv: edit: anon_edits_link_text: Uzzini, kāpēc tā notiek. flash_player_required: 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 . + 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. not_public: Tu neesi iestādījis, lai tavi labojumi būtu publiski. not_public_description: Tu vairs nevari rediģēt karti, ja vien tā neizdari. Tu vari uzstādīt savus labojumus kā publiskus no savas %{user_page}s. @@ -1287,18 +1350,15 @@ lv: 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.) user_page_link: lietotāja lapa index: + createnote: Pievienot piezīmi js_1: Vai nu jūs lietojat pārlūkprogrammu, kas neatbalsta JavaScript, vai arī jūsu pārlūkprogrammā JavaScript ir atslēgts. js_2: OpenStreetMap kartes rādīšanai lieto JavaScript. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Licencēts zem %{license_name} licences, pēc %{project_name} un tā atbalstītājiem. - project_name: OpenStreetMap projekts + copyright: Autortiesības OpenStreetMap un tā veidotāji, zem atvērtas licences permalink: Pastāvīgā saite - remote_failed: Rediģēšana neizdevās - pārbaudi, ka JOSM vai Merkaartor ir ielādēts un attālinātās vadības iespēja ir aktivizēta + remote_failed: Rediģēšana neizdevās - pārbaudi, ka JOSM vai Merkaartor ir ieslēgts un attālinātās vadības iespēja ir aktivizēta shortlink: Īsā saite key: - map_key: Apzīmējumi - map_key_tooltip: Kartes apzīmējumi table: entry: admin: Administratīvā robeža @@ -1384,7 +1444,6 @@ lv: preview: Priekšskatījums search: search: Meklēt - search_help: "piemēri: 'Valmiera', 'Mazā kalna iela, Rīga', 'LV-1010' vai 'post offices near Liepāja' vairāk piemēru..." submit_text: OK where_am_i: Kur es esmu? where_am_i_title: Aprakstiet pašreizējo atrašanās vietu izmantojot meklētāju @@ -1400,10 +1459,15 @@ lv: upload_trace: Augšupielādēt GPS trasi delete: scheduled_for_deletion: Trase atzīmēta dzēšanai + description: + description_with_count: + one: GPX fails ar %{count} punktu no %{user} + other: GPX fails ar %{count} punktiem no %{user} + description_without_count: GPX fails no %{user} edit: description: "Apraksts:" download: lejupielādēt - edit: rediģēt + edit: labot filename: "Faila nosaukums:" heading: Rediģē trasi %{name} map: karte @@ -1417,7 +1481,11 @@ lv: uploaded_at: "Augšupielādēts:" visibility: "Redzamība:" visibility_help: ko tas nozīmē? + georss: + title: OpenStreetMap GPS Trases list: + description: Pārlūkot jaunākas GPS trases augšupielādes. + empty_html: Pašlaik šeit nekā nav. Augšupielādē jaunu trasi vai uzzini vairāk par GPS trasēm iekš wiki lapas. public_traces: Publiskās GPS trases public_traces_from: Publiskas GPS trases no %{user} tagged_with: ar birkām %{tags} @@ -1433,7 +1501,7 @@ lv: ago: pirms %{time_in_words_ago} by: 'no' count_points: "%{count} punkti" - edit: rediģēt + edit: labot edit_map: Rediģēt karti identifiable: IDENTIFICĒJAMS in: iekš @@ -1457,19 +1525,21 @@ lv: trace_header: see_all_traces: Skatīt visas trases see_your_traces: Skatīt tikai jūsu trases - traces_waiting: Tev ir %{count} trases, kuras gaida augšupielādi. Lūdzu apsver uzgaidīšanu pirms augšupielādē vēl, lai nenobloķētu rindu citiem lietotājiem. + traces_waiting: + one: Tev ir %{count} trase, kura gaida augšupielādi. Lūdzu apsver iespēju uzgaidīt, kamēr šī beidz augšupielādēties pirms augšupielādē vēl kādu, lai nenobloķētu rindu pārējiem lietotājiem. + other: Tev ir %{count} trases, kuras gaida augšupielādi. Lūdzu apsver iespēju uzgaidīt līdz augšupielādējas šīs trases, pirms augšupielādē vēl, lai nenobloķētu rindu citiem lietotājiem. upload_trace: Augšupielādēt trasi trace_optionals: tags: Birkas trace_paging_nav: - next: Nākamā » - previous: « Iepriekšējā + newer: Jaunākas Trases + older: Vecākas trases showing_page: Rāda lapu %{page} view: delete_track: Dzēst šo trasi description: "Apraksts:" download: lejupielādēt - edit: rediģēt + edit: labot edit_track: Rediģēt šo trasi filename: "Faila nosaukums:" heading: Trase %{name} @@ -1503,6 +1573,9 @@ lv: email never displayed publicly: (nekad netiek rādīta publiski) flash update success: Lietotāja informācija veiksmīgi atjaunināta. flash update success confirm needed: Lietotāja informācija veiksmīgi atjaunota. Pārbaudi e-pastu, lai apstiprinātu savu jauno e-pasta adresi. + gravatar: + gravatar: Izmantot Gravatar + link text: kas šis ir? home location: "Māju atrašanās vieta:" image: "Attēls:" image size hint: (vislabāk der kvadrātveida attēli vismaz 100x100 izmērā) @@ -1538,13 +1611,13 @@ lv: update home location on click: Atjaunināt māju atrašanās vietu, noklikšķinot uz kartes? confirm: already active: Šis lietotājs jau ir apstiprināts. - before you start: Mēs zinām, ka jūs esat steigā, lai sāktu kartēt, bet pirms tam, Tu varētu vēlēties aizpildīt nedaudz informācijas par sevi formā zemāk. button: Apstiprināt - heading: Apstipriniet lietotāja kontu + heading: Pārbaudiet savu e-pastu! + introduction_1: Mēs nosūtījām jums apstiprinājuma e-pastu. + introduction_2: Apstiprini savu lietotāju nospiežot uz saites e-pastā un tu varēsi sākt kartēt. press confirm button: Spied pieņemšanas pogu zemāk, lai aktivizētu savu lietotāju. - reconfirm: Ja ir pagājis jau kāds laiciņš pirms tu reģistrējies, tev varētu būt nepieciešams atsūtīt jaunu pārbaudes e-pastu. - success: Jūsu e-pasta adrese ir apstiprināta, paldies par reģistrēšanos! - unknown token: Šī pilnvara nepastāv. + reconfirm_html: Ja nepieciešams, lai izsūtam apstiprinājuma e-pastu vēlreiz, spied te. + unknown token: Apstiprinājuma kods ir novecojis, nav derīģs vai neeksistē. confirm_email: button: Apstiprināt failure: E-pasta adrese jau ir apstiprināta ar šo pilnvaru. @@ -1564,8 +1637,8 @@ lv: heading: Lietotāji hide: Paslēpt atlasītos lietotājus showing: - one: Rāda lapu %{page} (%{first_item} no %{items}) - other: Rāda lapu %{page} (%{first_item}-%{last_item} no %{items}) + one: Lapa %{page} (%{first_item} no %{items}) + other: Lapa %{page} (%{first_item}-%{last_item} no %{items}) summary: "%{name} izveidoja no %{ip_address} @ %{date}" summary_no_ip: "%{name} izveidoja @ %{date}" title: Lietotāji @@ -1575,13 +1648,11 @@ lv: auth failure: Diemžēl nevarēja ieiet ar šiem datiem create account minute: Izveidojiet kontu. Tas aizņem mazāk par minūti. email or username: "E-pasta adrese vai lietotājvārds:" - heading: Ieiet - login_button: Ieiet + heading: Pieslēgties + login_button: Pieslēgties lost password link: Aizmirsi paroli? new to osm: Jauns iekš OpenStreetMap? no account: Nav lietotāja? - notice: Uzzini vairāk par OpenStreetMap tuvojošos licences maiņu (tulkojumi) (diskusija) - notice_terms: OpenStreetMap pārceļas uz jaunu licenci 1. aprīlī 2012. gadā. Tā ir tikpat atvērta kā esošā, bet juridiskās detaļas ir labāk saderīgas ar mūsu karšu datubāzi. Mēs vēlētos tavu devumu OpenStreetMap paturēt, bet mēs to varam izdarīt tikai tad, ja Tu ļauj mums tos izplatīt zem jaunās licences. Citādāk, mums nāksies tos noņemt no datubāzes.

    Lūdzu autorizējies, tad atvēli dažas sekundes, lai pārskatītu un pieņemtu jaunos nosacījumus. Paldies! openid: "%{logo} OpenID:" openid invalid: Atvaino, šķiet, ka tavs OpenID ir izkropļots openid missing provider: Atvaino, nevar sazināties ar tavu OpenID sniedzēju @@ -1608,7 +1679,7 @@ lv: password: "Parole:" register now: Reģistrēties remember: "Atcerēties mani:" - title: Ieiet + title: Pieslēgties to make changes: Lai veiktu izmaiņas OpenStreetMap datos, jums jābūt savam kontam. with openid: "Alternatīvi, lūdzu lieto savu OpenID, lai autorizētos:" with username: "Jau ir OpenStreetMap lietotājs? Lūdzu autorizējies ar savu lietotājvārdu un paroli:" @@ -1626,19 +1697,21 @@ lv: title: Aizmirsāt paroli make_friend: already_a_friend: Jūs jau esat draugos ar %{name}. + button: Pievienot kā draugu failed: Atvainojiet, neizdevās pievienot %{name} kā draugu. + heading: Pievienot %{user} kā draugu? success: "%{name} tagad ir jūsu draugs." new: + about: + header: Brīvs un rediģējams + html: "

    Atšķirībā no citām kartēm, OpenStreetMap pilnībā rada cilvēki kā tu, un tā ir bezmaksas jebkuram priekš labošanas, atjaunošanas, lejupielādes un lietošanas.

    \n

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

    " confirm email address: "Apstipriniet e-pasta adresi:" confirm password: "Parole (pārbaudei):" contact_webmaster: Lūdzu kontaktējies ar tīmekļa pārzini, lai organizētu lietotāja izveidi - mēs centīsimies un tiksim galā ar tavu pieprasījumu, cik ātri vien iespējams. - continue: Turpināt + continue: Reģistrēties display name: "Rādāmais vārds:" display name description: Vārds, kas tiks rādīts publiski. Jūs to vēlāk varēsiet izmainīt iestatījumos. email address: "E-pasta adrese:" - fill_form: Aizpildi šo formu un mēs tev nosūtīsim ātru e-pastu, lai aktivizētu tavu lietotāju. - flash create success message: Paldies, ka reģistrējies. Mēs tev nosūtījām pārbaudes e-pastu uz %{email} un tiklīdz tu apstiprināsi savu lietotāju, tu varēsi sākt kartēt.

    Ja tu lieto pretmēstuļu sistēmu, kura nosūta pārbaudes pieprasījumus, tad pārliecinies, ka esi ielicis webmaster@openstreetmap.org baltajā sarakstā, jo mēs nevaram atbildēt uz pārbaudes pieprasījumiem. - heading: Izveidot lietotāja kontu license_agreement: Kad tu apstiprini savu lietotāju, tev būs nepieciešams pieņemt veidotāju noteikumus. no_auto_account_create: Diemžēl mēs šobrīd nevaram izveidot kontu automātiski. not displayed publicly: Netiek rādīts publiski (skati Privātuma politika) @@ -1648,7 +1721,7 @@ lv: password: "Parole:" terms accepted: Paldies, ka pieņēmāt jaunos devuma noteikumus! terms declined: Mums žēl, ka tu izvēlējies nepieņemt jaunos Veidotāju Noteikumus. Priekš vairāk informācijas, apskati šo wiki lapu. - title: Izveidot kontu + title: Reģistrēties use openid: Alternatīvi, lieto %{logo} OpenID, lai autorizētos no_such_user: body: Atvaino, nav lietotāja ar lietotājvārdu %{user}. Lūdzu pārbaudi pareizrakstību, vai varbūt saite, uz kuras Tu uzspiedi, ir nepareiza. @@ -1659,6 +1732,8 @@ lv: nearby mapper: Kartētājs tuvējā apkārtnē your location: Jūsu atrašanās vieta remove_friend: + button: Atcelt draudzību + heading: 'Noņemt %{user} kā draugu?' not_a_friend: "%{name} nav no jūsu draugs." success: "%{name} tika izņemts no jūsu draugiem." reset_password: @@ -1693,12 +1768,12 @@ lv: you need to accept or decline: Lūdzu izlasi un vai nu pieņem vai noraidi jaunos Veidotāju Noteikumus, lai turpinātu. view: activate_user: aktivizēt šo lietotāju - add as friend: pievienot kā draugu + add as friend: Pievienot kā draugu ago: (pirms %{time_in_words_ago}) - block_history: skatīt saņemtos bloķējumus - blocks by me: mani piešķirtie bloki - blocks on me: bloki par mani - comments: komentāri + block_history: saņemtie bloķējumi + blocks by me: Manis piešķirtie Bloki + blocks on me: Bloki uz mani + comments: Komentāri confirm: Apstiprināt confirm_user: apstiprināt šo lietotāju create_block: bloķēt šo lietotāju @@ -1710,8 +1785,8 @@ lv: deactivate_user: deaktivizēt šo lietotāju delete_user: dzēst šo lietotāju description: Apraksts - diary: dienasgrāmata - edits: labojumi + diary: Dienasgrāmata + edits: Labojumi email address: "E-pasta adrese:" friends_changesets: Skatīt visas draugu izmaiņu kopas friends_diaries: Skatīt visus draugu dienasgrāmatu ierakstus @@ -1721,20 +1796,24 @@ lv: latest edit: "Pēdējais labojums %{ago}:" m away: "%{count} m attālumā" mapper since: "Kartētājs kopš:" - moderator_history: skatīt dotos bloķējumus - my comments: mani komentāri - my diary: mana dienasgrāmata - my edits: mani labojumi - my settings: mani iestatījumi - my traces: manas trases + moderator_history: dotie bloķējumi + my comments: Mani komentāri + my diary: Mana Dienasgrāmata + my edits: Mani Labojumi + my messages: Manas Ziņas + my notes: Manas kartes Piezīmes + my profile: Mans Profils + my settings: Mani Iestatījumi + my traces: Manas Trases nearby users: Citi tuvumā esoši lietotāji nearby_changesets: Skatīt visas tuvējo lietotāju izmaiņu kopas nearby_diaries: Skatīt visus tuvējo lietotāju dienasgrāmatu ierakstus new diary entry: jauns dienasgrāmatas ieraksts no friends: Tu vēl neesi pievienojis draugus. no nearby users: Nav citu lietotāju kas tuvumā kartētu. + notes: Kartes piezīmes oauth settings: OAuth uzstādījumi - remove as friend: 'noņemt kā draugu' + remove as friend: Atcelt draudzību role: administrator: Šis lietotājs ir administrators grant: @@ -1744,11 +1823,11 @@ lv: revoke: administrator: Atņemt administratora tiesības moderator: Atņemt moderatora tiesības - send message: nosūtīt ziņojumu + send message: Nosūtīt ziņojumu settings_link_text: uzstādījumi spam score: "Surogātpasta rādītājs:" status: "Statuss:" - traces: trases + traces: Trases unhide_user: parādīt šo lietotāju user location: Lietotāja atrašanās vieta your friends: Jūsu draugi @@ -1805,12 +1884,15 @@ lv: confirm: Vai esat pārliecināts? creator_name: Autors display_name: Bloķēts lietotājs - edit: Rediģēt + edit: Labot + next: Nākamais » not_revoked: (nav atsaukts) + previous: « Iepriekšējais reason: Iemesls liegumam revoke: Atsaukt! revoker_name: Atsaucis show: Rādīt + showing_page: Rāda lapu %{page} status: Statuss period: one: 1 stunda @@ -1826,7 +1908,7 @@ lv: show: back: Skatīt visus bloķējumus confirm: Vai esat pārliecināts? - edit: Rediģēt + edit: Labot heading: "%{block_on} bloķēts pēc %{block_by}" needs_view: Lietotājam ir jāautorizējas, pirms liegums tiks notīrīts. reason: "Bloķēšanas iemesls:" @@ -1858,3 +1940,25 @@ lv: fail: Neizdevās atsaukt lomu `%{role}' no lietotāja `%{name}'. Lūdzu pārbaudi, ka tas lietotājs un loma ir derīgi. heading: Apstiprināt lomu atcelšanu title: Apstiprināt lomu atcelšanu + welcome_page: + add_a_note: + paragraph_1_html: Ja tu vēlies labot ko mazu un nav laika lai piereģistrētos vai iemācītos kā rediģēt, ir iespējams vienkārši atstāt piezīmi. + paragraph_2_html: Vienkārši dodies uz karti un spied uz . Tas pievienos marķieri kartē, kuru tu vari pārvietot pavelkot to. Pievieno savu ziņojumu, tad spied saglabāt, un citi kartētāji varēs izpētīt problēmu. + title: Nav laika labošanai? Pievienojiet piezīmi! + basic_terms: + editor_html: Redaktors ir programma vai mājaslapa, kuru var izmantot, lai labotu karti. + node_html: Punkts ir punkts uz kartes, kā viens restorāns vai koks. + paragraph_1_html: OpenStreetMap ir pašai savs profesionālais žargons. Šeit ir daži atslēgvārdi, kas var noderēt. + tag_html: Birka ir dati par punktu vai ceļu, kā restorāna nosaukums vai ceļa ātruma ierobežojums. + title: Pamatnoteikumi kartēšanai + way_html: Ceļš ir līnija vai laukums, kā ceļš, strauts, ezers vai māja. + introduction_html: Sveicināts OpenStreetMap, bezmaksas un rediģējamā pasaules karte. Tagad, kad esi piereģistrējies, tu vari sākt kartēt. Šeit ir neliela pamācībā ar svarīgākajām lietām, kuras tev jāzina. + questions: + paragraph_1_html: Nepieciešama palīdzība kartējot, vai nav skaidrs kā lietot OpenStreetMap? Atrodi atbildes uz saviem jautājumiem palīdzības lapā. + title: Kādi jautājumi? + start_mapping: Sākt Kartēt + title: Laipni lūdzam! + whats_on_the_map: + off_html: Ko tā neiekļauj ir viedokļa dati kā reitings, vēsture vai hipotētiskas īpašības, un datus no ar autortiesībām aizsargātiem avotiem. Ja vien tev nav speciāla atļauja, nekopē no tiešsaistes vai papīra kartēm. + on_html: OpenStreetMap ir karte, kurā iezīmē lietas, kuras ir reālas un esošas - tā iekļauj miljonus ar namiem, ceļiem un citām detaļām par vietām. Tu vari kartēt jebko no reālās pasaules, kas tev liekas interesants. + title: Kas ir uz kartes diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 72a44f4ee38..d467a1b157d 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -2,7 +2,20 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Bjankuloski06 +# Author: Nemo bis mk: + about_page: + community_driven_html: "Заедницата на OpenStreetMap е разнообразна, посветена и секојдневно расте.\nМеѓу учесниците имаме аматерски картографи, стручњаци во ГИС, технолози што работат со опслужувачите на OSM, \nхуманитарни работници што картираат подрачја погодени \nод катастрофи и разни други.\nПовеќе за заедницата ќе дознаете во корисничките дневници,\nблоговите на заедницата и страниците на\nФондацијата OSM website." + community_driven_title: Проектот го работи заедницата + copyright_html: ©Учесници на
    OpenStreetMap + lede_text: "OpenStreetMap ја гради заедница од учесници што придонесуваат со свои содржини и ги одржуваат податоците\nза патишта, патеки, кафеани, железнички станици и многу друго ширум светот." + local_knowledge_html: "OpenStreetMap полага особена важност на локални сознија. Учесниците користат\nвоздушни снимки, GPS-уреди и пообични теренски карти\nсо цел да се провери исправноста\nи актуелноста на OSM." + local_knowledge_title: Локални сознанија + next: Следно + open_data_html: "OpenStreetMap е проект со отворени податоци: можете слободно да го користите за било која цел\nдоколку ја наведете OpenStreetMap и нејзините учесници. Ако решите да ги менувате податоците или да се надоврзувате на нив, добиеното дело можете да го распространувате исклучиво\nпод истата лиценца. Повеќе ќе најдете на страницата Авторски права и лиценцирање." + open_data_title: Отворени податоци + partners_title: Партнери + used_by: "%{name} обезбедува картографски податоци на стотици мрежни места, мобилни прилози и сметачки уреди" activerecord: attributes: diary_comment: @@ -11,7 +24,7 @@ mk: language: Јазик latitude: Геог. ширина longitude: Геог. должина - title: Наслов + title: Тема user: Корисник friend: friend: Пријател @@ -20,7 +33,7 @@ mk: body: Содржина recipient: Примател sender: Испраќач - title: Наслов + title: Тема trace: description: Опис latitude: Геог. ширина @@ -67,7 +80,7 @@ mk: tracetag: Ознака за трага user: Корисник user_preference: Кориснички прилагодувања - user_token: Кориснички жетон + user_token: Корисничка шифра way: Пат way_node: Јазол на пат way_tag: Ознака на пат @@ -80,96 +93,62 @@ mk: blocked: Пристапот кон API ви е блокиран. Најавете се на посредникот за да дознаете повеќе. need_to_see_terms: Вашиот пристап до приложниот програм (API) е привремено запрен. Најавете се на мрежниот посредник за да ги погледате Условите за учесниците. Нема потреба да се согласувате со услоците, но мора да ги прочитате. browse: + anonymous: анонимен changeset: - changeset: "Измени: %{id}" + belongs_to: Автор changesetxml: XML за измените - download: Преземи %{changeset_xml_link} или %{osmchange_xml_link} feed: title: Измени %{id} title_comment: Измени %{id} - %{comment} + node: Јазли (%{count}) + node_paginated: Јазли (%{x}-%{y} од вкупно %{count}) osmchangexml: osmChange XML - title: Измени - changeset_details: - belongs_to: "Припаѓа на:" - bounding_box: "Рамка:" - box: кутија - closed_at: "Затворено во:" - created_at: Создадено во - has_nodes: - one: "Го има следниов %{count} јазол:" - other: "Ги има следниве %{count} јазли:" - has_relations: - one: "Го има следниов %{count} однос:" - other: "Ги има следниве %{count} односи:" - has_ways: - one: "Го има следниов %{count} пат:" - other: "Ги има следниве %{count} патишта:" - no_bounding_box: Нема зачувано рамка за овие измени. - show_area_box: Прикажи рамка - common_details: - changeset_comment: "Коментар:" - deleted_at: "Избришано во:" - deleted_by: "Избришал:" - edited_at: "Уредено во:" - edited_by: "Уредил:" - in_changeset: "Во измените:" - version: "Верзија:" + relation: Односи (%{count}) + relation_paginated: Односи (%{x}-%{y} од вкупно %{count}) + title: "Измени: %{id}" + way: Патишта (%{count}) + way_paginated: Патишта (%{x}-%{y} од вкупно %{count}) + closed: Затворено + closed_by_html: Затворено пред %{time} од %{user} + closed_html: Затворено пред %{time} containing_relation: entry: Однос %{relation_name} entry_role: Однос %{relation_name} (како %{relation_role}) - map: - deleted: Избришано - edit: - area: Уреди подрачје - node: Уреди јазол - relation: Уреди однос - way: Уреди пат - larger: - area: Погледај го просторот на поголема карта - node: Погледај го јазолот на поголема карта - relation: Вид. односот на поголема карта - way: Погледај го патот на поголема карта - loading: Вчитувам... - navigation: - all: - next_changeset_tooltip: "Следни измени:" - next_node_tooltip: Следен јазол - next_relation_tooltip: Следен однос - next_way_tooltip: Следен пат - prev_changeset_tooltip: "Претходни измени:" - prev_node_tooltip: Претходен јазол - prev_relation_tooltip: Претходен однос - prev_way_tooltip: Претходен пат - user: - name_changeset_tooltip: Погледај уредувања на %{user} - next_changeset_tooltip: Следно уредување на %{user} - prev_changeset_tooltip: Претходно уредување на %{user} + created: Создадено + created_by_html: Создадено пред %{time} од %{user} + created_html: Создадено пред %{time} + deleted_by_html: Избришано пред %{time} од %{user} + download_xml: Преземи XML + edited_by_html: Изменето пред %{time} од %{user} + in_changeset: Измени + location: "Местоположба:" + no_comment: (нема коментари) node: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" - download_xml: Преземи XML - edit: уреди - node: Јазол - node_title: "Јазол: %{node_name}" - view_history: погледај ја историјата - node_details: - coordinates: "Координати:" - part_of: "Дел од:" - node_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Преземи XML - node_history: Историја на јазолот - node_history_title: "Историја на јазолот: %{node_name}" - view_details: погледај подробности + history_title: "Историја на јазолот: %{name}" + title: "Јазол: %{name}" not_found: - sorry: Жалиам, но не најдов %{type} со назнака %{id}. + sorry: Нажалост, не да најдам %{type} со бр. %{id}. type: changeset: измени node: јазол relation: однос way: пат - paging_nav: - of: од - showing_page: Приказ на страница + note: + closed_by: Решено од %{user} пред %{when} + closed_by_anonymous: Решено од анонимен пред %{when} + closed_title: Решена белешка бр. %{note_name} + commented_by: Коментар на %{user} пред %{when} + commented_by_anonymous: Коментар на анонимен пред %{when} + hidden_by: Скриено од %{user} пред %{when} + hidden_title: "Скриена белешка бр. #%{note_name}" + new_note: Нова белешка + open_by: Создадено од %{user} пред %{when} + open_by_anonymous: Создадено од анонимен пред %{when} + open_title: Нерешена белешка бр. %{note_name} + reopened_by: Преактивирано од %{user} пред %{when} + reopened_by_anonymous: Преактивирано од анонимен пред %{when} + title: "Белешка: %{id}" + part_of: Дел од redacted: message_html: Верзијата %{version} на оваа %{type} не може да се прикаже бидејќи е редактирана. Повеќе на %{redaction_link}. redaction: Редакција %{id} @@ -178,65 +157,21 @@ mk: relation: однос way: пат relation: - download: "%{download_xml_link} или %{view_history_link}" - download_xml: Преземи XML - relation: Однос - relation_title: "Однос: %{relation_name}" - view_history: погледај ја историјата - relation_details: - members: "Членови:" - part_of: "Дел од:" - relation_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Преземи XML - relation_history: Историја на односот - relation_history_title: "Историја на односот: %{relation_name}" - view_details: погледај подробности + history_title: "Историја на односот: %{name}" + members: Членови + title: "Однос: %{name}" relation_member: entry_role: "%{type} %{name} како %{role}" type: node: Јазол relation: Однос way: Пат - start: - manually_select: Рачно избери друга површина - view_data: Погледајте податоци за тековниот поглед на картата start_rjs: - data_frame_title: Податоци - data_layer_name: Прелист. податоци за картата - details: Подробно - drag_a_box: Повлечете рамка на картата за да одберете простор - edited_by_user_at_timestamp: Уредено од [[user]] во [[timestamp]] - hide_areas: Скриј подрачја - history_for_feature: Историја за [[feature]] + feature_warning: Вчитувам %{num_features} функции, што може да ви го забави прелистувачот. Дали сте сигурни дека сакате да се прикажат овие податоци? load_data: Вчитај ги податоците - loaded_an_area_with_num_features: "Вчитавте простор кој содржи [[num_features]] елементи. Некои прелистувачи не можат добро да прикажат со волку податоци. Начелно, прелистувачите работат најдобро при помалку од 100 елементи наеднаш: ако правите нешто друго прелистувачот ќе ви биде бавен/пасивен. Ако и покрај тоа сакате да се прикажат овие податоци, кликнете подолу." loading: Вчитувам... - manually_select: Рачно изберете друга површина - object_list: - api: Retrieve this area from the API - back: Прикажи список на предмети - details: Подробно - heading: Список на предмети - history: - type: - node: Јазол [[id]] - way: Пат [[id]] - selected: - type: - node: Јазол [[id]] - way: Пат [[id]] - type: - node: Јазол - way: Пат - private_user: приватен корисник - show_areas: Прикажи подрачја - show_history: Прикажи историја - unable_to_load_size: "Не можам да вчитам: Рамката од [[bbox_size]] е преголема (мора да биде помала од %{max_bbox_size}))" - wait: Почекајте... - zoom_or_select: Приближи и избери простор на картата за преглед tag_details: - tags: "Ознаки:" + tags: Ознакиж wiki_link: key: Вики-страницата за опис на ознаката %{key} tag: Вики-страницата за ознаката %{key}=%{value} @@ -248,39 +183,25 @@ mk: node: јазол relation: однос way: пат + version: Верзија + view_details: Погл. подробности + view_history: Погл. историја way: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" - download_xml: Преземи XML - edit: уреди - view_history: погледај историја - way: Пат - way_title: "Пат: %{way_name}" - way_details: also_part_of: - one: исто така дел и од патот %{related_ways} - other: исто така дел и од патиштата %{related_ways} + one: дел од патот %{related_ways} + other: дел од патиштата %{related_ways} + history_title: "Историја на патот: %{name}" nodes: Јазли - part_of: "Дел од:" - way_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Преземи XML - view_details: погледај подробности - way_history: Историја на патот - way_history_title: "Историја на патот: %{way_name}" + title: "Пат: %{name}" changeset: changeset: anonymous: Анонимен - big_area: (голема) - id: бр. %{id} - no_comment: (нема) no_edits: (нема уредувања) - show_area_box: прикажи рамка на површина - still_editing: (сè уште уредува) view_changeset_details: Преглед на подробности од измените changeset_paging_nav: next: Следно » previous: « Претходно - showing_page: Прикажана е страница %{page} + showing_page: Страница %{page} changesets: area: Површина comment: Коментар @@ -288,24 +209,17 @@ mk: saved_at: Зачувано во user: Корисник list: - description: Скорешни промени - description_bbox: Измени во рамките на %{bbox} - description_friend: Измени на ваши пријатели - description_nearby: Измени од соседни корисници - description_user: Измени на %{user} - description_user_bbox: Измени на %{user} во рамките на %{bbox} - heading: Измени - heading_bbox: Измени - heading_friend: Измени - heading_nearby: Измени - heading_user: Измени - heading_user_bbox: Измени + empty: Не пронајдов збирови од промени. + empty_area: Нема збирови од промени во ова подрачје. + empty_user: Нема збирови на промени од тој корисник. + load_more: Вчитај уште + no_more: Нема повеќе збирови на промени. + no_more_area: Нема повеќе збирови на промени во ова подрчаје. + no_more_user: Нема повеќе збирови на промени од тој корисник. title: Измени - title_bbox: Измени во рамките на %{bbox} title_friend: Измени на ваши пријатели title_nearby: Измени од соседни корисници title_user: Измени на %{user} - title_user_bbox: Измени на %{user} во рамките на %{bbox} timeout: sorry: За жал, на списокот на измени што го побаравте му требаше предолго за да се преземе. diary_entry: @@ -323,8 +237,9 @@ mk: hide_link: Скриј го коментаров diary_entry: comment_count: - one: 1 коментар + one: "%{count} коментар" other: "%{count} коментари" + zero: Нема коментари comment_link: Коментирај на оваа ставка confirm: Потврди edit_link: Уреди ја оваа ставка @@ -359,7 +274,7 @@ mk: newer_entries: Понови ставки no_entries: Нема дневнички ставки older_entries: Постари ставки - recent_entries: "Скорешни дневнички записи:" + recent_entries: Скорешни дневнички записи title: Дневници на корисници title_friends: Дневници на пријателите title_nearby: Дневници на соседните корисници @@ -383,6 +298,9 @@ mk: user_title: дневник на %{user} editor: default: По основно (моментално %{name}) + id: + description: iD (прелистувачки програм за уредување) + name: iD potlatch: description: Potlatch 1 (уредник во прелистувач) name: Potlatch 1 @@ -398,7 +316,7 @@ mk: area_to_export: Простор за извоз embeddable_html: Вметнат HTML код export_button: Извези - export_details: Податоците на OpenStreetMap се нудат под лиценцата Криејтив комонс НаведиИзвор-СподелиПодИстиУслови 2.0. + export_details: Податоците на OpenStreetMap се нудат под Лиценцата за отворени бази на Складиштето на отворени податоци (ODbL, Open Data Commons Open Database License). format: Формат format_to_export: Формат за извоз image_size: Големина на сликата @@ -414,29 +332,46 @@ mk: paste_html: Ископирајте го HTML кодот за да го вметнете во страницата. scale: Размер too_large: - body: Подрачјето е преголемо за да може да се извезе како OpenStreetMap XML податоци. Приближете или изберете помала површина. - heading: Подрачјето е преголемо + advice: "Ако не успее увозот погоре, послужете се со некој од долунаведените извори:" + body: "Подрачјето е преголемо за да може да се извезе како XML-податоци. Приближете или изберете помала површина. Можете и да се послужите со еден од следниве извори за крупно преземање:" + geofabrik: + description: Редовно подновувани извадоци од континенти, земји и избрани градови + title: Geofabrik + metro: + description: Извадоци за поважните градови во свеетот и нивните околни подрачја + title: Метроизвадоци + other: + description: Другите извори се наведени на викито на OpenStreetMap + title: Други извори + overpass: + description: Преземете ја оваа рамка од огледална база на базата на OpenStreetMap + title: Прилог „Надвозник“ + planet: + description: Редовно подновувани примероци на целата база на OpenStreetMap + title: Планетата на OSM zoom: Приближи - start_rjs: - add_marker: Стави бележник на картата - change_marker: Смени позиција на бележникот - click_add_marker: Кликнете на картата за да ставите бележник. - drag_a_box: Повлечете рамка на картата за да изберете површина - export: Извоз - manually_select: Рачно изберете друг простор - view_larger_map: Преглед на поголема карта + title: Извези + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Просто стиснете на или пак на истата икона од приказникот на картата.\nСо ова на неа ќе ставите бележник, кој можете да го преместувате со влечење. Ставете ја пораката, па стиснете да зачувате. Потоа другите картографи ќе го иследат проблемот." + join_the_community: + explanation_html: Ако имате забележано проблем со податоците на нашите карти (на пр. недостасува пат или адреса), најдобро е да се приклучите на заедницата на OpenStreetMap или пак самите да ги исправите податоците. + title: Приклучете се во заедницата + title: Како да помогнете + other_concerns: + explanation_html: "Ако сте загрижени за тоа како се користат нашите податоци или во врска со содржините, повеќе правни информации ќе добиете на\nстраницата за авторски права или обратете се кај соодветната \nработна група на OSMF." + title: Други проблеми + title: Пријава на проблем / Исправка на картата geocoder: description: title: geonames: Местоположба од GeoNames - osm_namefinder: "%{types} од Именикот на OpenStreetMap" osm_nominatim: Местоположба од OpenStreetMap Nominatim types: cities: Градови places: Места towns: Гратчиња - description_osm_namefinder: - prefix: "%{distance} %{direction} од %{type}" direction: east: источно north: северно @@ -457,16 +392,26 @@ mk: title: ca_postcode: Резултати од Geocoder.CA geonames: Резултати од GeoNames + geonames_reverse: Резултати од GeoNames latlon: Внатрешни резултати - osm_namefinder: Резултати од OpenStreetMap Именик osm_nominatim: Резултати од OpenStreetMap Nominatim + osm_nominatim_reverse: Резултати од OpenStreetMap Nominatim uk_postcode: Резултати од NPEMap / FreeThe Postcode us_postcode: Резултати од Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} од %{parentname})" - suffix_place: ", %{distance} %{direction} од %{placename}" search_osm_nominatim: + admin_levels: + level10: Населбена граница + level2: Државна граница + level4: Покраинска граница + level5: Регионална граница + level6: Окружна граница + level8: Градска граница + level9: Селска граница prefix: + aerialway: + chair_lift: Клупна жичарница + drag_lift: Влечна жичарница + station: Гондолска станица aeroway: aerodrome: Аеродром apron: Рампа @@ -560,6 +505,7 @@ mk: shower: Туш social_centre: Социјален центар social_club: Друштвен клуб + social_facility: Општествена постројка studio: Студио supermarket: Супермаркет swimming_pool: Базен @@ -588,6 +534,9 @@ mk: "yes": Мост building: "yes": Градба + emergency: + fire_hydrant: Хидрант + phone: Итен телефон highway: bridleway: Коњски пат bus_guideway: Автобуски шини @@ -609,6 +558,7 @@ mk: platform: Платформа primary: Главен пат primary_link: Главен пат + proposed: Предложен пат raceway: Тркачка патека residential: Станбен rest_area: Одмориште @@ -620,6 +570,7 @@ mk: speed_camera: Брзиноловец steps: Скалила stile: Тарабен премин + street_lamp: Улична светилка tertiary: Третостепен пат tertiary_link: Третостепен пат track: Полски пат @@ -635,6 +586,7 @@ mk: building: Градба castle: Замок church: Црква + citywalls: Градски ѕидини fort: Утврдување house: Куќа icon: Икона @@ -644,13 +596,14 @@ mk: monument: Споменик museum: Музеј ruins: Рушевини + tomb: Гроб tower: Кула wayside_cross: Крајпатен крст wayside_shrine: Параклис wreck: Бродолом landuse: allotments: Парцели - basin: Басен + basin: Котлина brownfield: Угар cemetery: Гробишта commercial: Комерцијално подрачје @@ -711,6 +664,8 @@ mk: airfield: Воено слетувалиште barracks: Касарна bunker: Бункер + mountain_pass: + "yes": Планински превој natural: bay: Залив beach: Плажа @@ -780,6 +735,7 @@ mk: locality: Месност moor: Пустара municipality: Општина + neighbourhood: Соседство postcode: Поштенски број region: Регион sea: Море @@ -805,8 +761,10 @@ mk: narrow_gauge: Теснолинејка platform: Железнички перон preserved: Зачувана железничка линија + proposed: Предложена железница spur: Железнички огранок station: Железничка станица + stop: Железничка постојка subway: Метро станица subway_entrance: Влез во метро switch: Железнички пунктови @@ -822,6 +780,7 @@ mk: beverages: Пијалоци bicycle: Продавница за велосипеди books: Книжарница + boutique: Бутик butcher: Месарница car: Автосалон car_parts: Автоделови @@ -835,6 +794,7 @@ mk: convenience: Бакалница copyshop: Фотокопир cosmetics: Козметика + deli: Гастрономски дуќан department_store: Стоковна куќа discount: Распродажен дуќан doityourself: Направи-сам @@ -871,17 +831,21 @@ mk: organic: Здрава храна outdoor: Дуќан на отворено pet: Домашни миленици + pharmacy: Аптека photo: Фотографски дуќан salon: Салон + second_hand: Половна роба shoes: Обувки shopping_centre: Трговски центар sports: Спортски дуќан stationery: Прибор и репроматеријали supermarket: Супермаркет + tailor: Кројач toys: Продавница за играчки travel_agency: Туристичка агенција video: Видеотека wine: Алкохолни пијалоци + "yes": Дуќан tourism: alpine_hut: Планинска куќарка artwork: Уметничко дело @@ -904,6 +868,7 @@ mk: viewpoint: Видиковец zoo: Зоолошка tunnel: + culvert: Пропусен канал "yes": Тунел waterway: artificial: Вештачки воден пат @@ -915,8 +880,8 @@ mk: ditch: Канач dock: Док drain: Одвод - lock: Каналска брана - lock_gate: Каналска капија + lock: Превојница + lock_gate: Превојничка капија mineral_spring: Минерален извор mooring: Сидриште rapids: Брзак @@ -927,68 +892,119 @@ mk: water_point: Пристап до вода waterfall: Водопад weir: Јаз + help_page: + help: + description: Поставете прашање или побарајте во одговорите на порталот за прашања и одговори на OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: "OpenStreetMap има неколку ресурси каде можете да дознаете за проектот, да поставувате прашања,\nда водите заедничка дискусија и да документирате картографски теми." + title: Помош + welcome: + description: Започнете со овој брз водич низ основите на OpenStreetMap. + title: Добре дојдовте на OSM + url: /welcome + wiki: + description: Прелистајте ја подробната документација за OSM на викито. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/Mk:Main_Page html: dir: ltr javascripts: + close: Затвори + edit_help: Поместете ја картата и приближете во местото што сакате да го уредите, па стиснете тука. + key: + title: Легенда + tooltip: Легенда + tooltip_disabled: Легендата е достапна само во Стандардниот слој map: base: cycle_map: Велосипедска карта + hot: Хуманитарна mapquest: MapQuest Open standard: Стандардна transport_map: Сообраќајна карта + copyright: © Учесници во OpenStreetMap + donate_link_text: + layers: + data: Податоци за картата + header: Слоеви на картата + notes: Белешки на картата + overlays: Овозможи облоги за утврдување грешки + title: Слоеви + locate: + popup: Оддалечени сте {distance} {unit} од оваа точка + title: Прик. моја местоположба + zoom: + in: Приближи + out: Оддалечи + notes: + new: + add: Додај белешка + intro: За да ја подобриме картата, информациите што ги внесувате се прикажува на другите корисници, па затоа бидете што е можно поописни и попрецизни кога го преместувате бележникот на исправното место и кога ја внесувате белешката подолу. + show: + anonymous_warning: Оваа белешка има коментари од анонимни корисници што треба независно да се проверат. + comment: Коментирај + comment_and_resolve: Коментирај и реши + hide: Скриј + reactivate: Реактивирај + resolve: Решена + share: + cancel: Откажи + center_marker: Сосред. картата на бележникот + custom_dimensions: Димензии по ваш избор + download: Преземи + embed: HTML + format: "Формат:" + image: Слика + image_size: Сликата ќе го покаже стандардниот слој при + include_marker: Вклучи го бележникот + link: Врска или HTML + long_link: Врска + paste_html: Ископирајте го HTML-кодот за да го вметнете во страницата. + scale: "Размер:" + short_link: Кратка врска + short_url: Кратка URL + title: Сподели + view_larger_map: Преглед на поголема карта site: + createnote_disabled_tooltip: Приближете за да додадете белешка + createnote_tooltip: Додај белешка на картата edit_disabled_tooltip: Приближете за да ја уредите картата edit_tooltip: Уредување на картата - edit_zoom_alert: Морате да приближите за да можете да ја уредувате картата. - history_disabled_tooltip: Приближете за да ги видите уредувањата за ова подрачје - history_tooltip: Преглед на уредувањата во ова подрачје - history_zoom_alert: Морате да приближите за да можете да ја видите историјата на уредувања + map_data_zoom_in_tooltip: Приближете за да ги видите податоците + map_notes_zoom_in_tooltip: Приближете за да ги видите белешките layouts: + about: За нас community: Заедница community_blogs: Блогови на заедницата community_blogs_title: Блогови од членови на заедницата на OpenStreetMap - copyright: Авторски права и лиценца - documentation: Документација - documentation_title: Документација за проектот + copyright: Авторски права + data: Податоци donate: Поддржете ја OpenStreetMap со %{link} за Фондот за обнова на машинската опрема. - donate_link_text: доброволен прилог edit: Уреди edit_with: Уреди со %{editor} export: Извези - export_tooltip: Извоз на податоци од картата + export_data: Извези податоци foundation: Фондација foundation_title: Фондацијата OpenStreetMap gps_traces: GPS-траги gps_traces_tooltip: Работа со GPS-траги help: Помош - help_centre: Центар за помош - help_title: Помошна страница за проектот history: Историја - home: дома - home_tooltip: Оди на матичната местоположба - inbox: пораки (%{count}) - inbox_tooltip: - one: Имате 1 непрочитана порака во сандачето - other: Имате %{count} непрочитани пораки во сандачето - zero: Немате непрочитани пораки во сандачето - intro_1: OpenStreetMap е слободна уредлива карта на целиот свет. Ја прават луѓе како вас. + home: Оди на матичната местоположба intro_2_create_account: Создајте корисничка сметка - intro_2_download: преземање - intro_2_html: Податоците се слободни за %{download} и %{use} под нивната лиценца %{license}. %{create_account} за да ја подобрите картата. - intro_2_license: отворена лиценца - intro_2_use: употреба - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap?uselang=mk - license: - title: Податоците на OpenStreetMap се под Creative Commons Наведи извор-Сподели под исти услови 2.0 Нелокализирана лиценца + intro_header: Добре дојдовте на OpenStreetMap! + intro_text: OpenStreetMap е карта на светот создадена од луѓе како вас и се нуди за слободна употреба под отворена лиценца. + learn_more: Дознајте повеќе log_in: најави ме log_in_tooltip: Најава со постоечка сметка logo: alt_text: Логотип на OpenStreetMap - logout: одјава - logout_tooltip: Одјава + logout: Одјава make_a_donation: text: Дарувајте title: Поддржете ја OpenStreetMap со паричен прилог + more: Повеќе osm_offline: Базата на податоци на OpenStreetMap моментално е исклучена додека работиме на неопходни одржувања. osm_read_only: Базата на податоци на OpenStreetMap моментално може само да се чита, додека ги извршиме неопходните одржувања. partners_bytemark: вдомителот „Bytemark“ @@ -997,27 +1013,49 @@ mk: partners_partners: партнери partners_ucl: VR-центарот на UCL partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=mk - sign_up: регистрација + sign_up: Регистрација sign_up_tooltip: Создај сметка за уредување - sotm2011: Дојдете на Конференцијата на OpenStreetMap 2011 што се одржува од 9 до 11 септември во Денвер! + start_mapping: Почнете да ги работите картите tag_line: Слободна вики-карта на светот user_diaries: Кориснички дневници user_diaries_tooltip: Види кориснички дневници - view: Карта - view_tooltip: Види карта - welcome_user: Добредојде, %{user_link} - welcome_user_link_tooltip: Ваша корисничка страница - wiki: Вики - wiki_title: Помошна страница за проектот - wiki_url: http://wiki.openstreetmap.org/wiki/Mk:Main_Page license_page: foreign: english_link: англискиот оригинал text: Во случај на спротиставеност помеѓу оваа преведена страница и %{english_original_link}, предност има англиската страница title: За овој превод - legal_babble: "

    Авторски права и лиценца

    \n

    \n OpenStreetMap има отворени податоци, и е лиценциран со Криејтив\n комонс НаведиИзвор-СподелиПодИстиУслови 2.0 (CC BY-SA).\n

    \n

    \n Слободно можете да ги копирате, распространувате, јавно прикажувате и адаптирате нашите карти\n и податоци, под услов да го наведете OpenStreetMap и неговите\n учесници. Ако ги менувате или темелите дела врз нашите карти и податоци\n резултатите можете да ги распространувате само под истата лиценца.\n Во полниот законски\n правилник се објаснети вашите права и должности.\n

    \n\n

    Како да го наведувате OpenStreetMap

    \n

    \n Доколку користите слики од карти на OpenStreetMap, бараме\n наводот да содржи барем “© Учесници на\n OpenStreetMap, CC BY-SA”. Ако користите само податоци од картите,\n бараме наводот да гласи “Картографски податоци © Учесници на OpenStreetMap,\n CC BY-SA”.\n

    \n

    \n Кадешто е можно, OpenStreetMap треба да има хиперврска http://www.openstreetmap.org/\n и CC BY-SA до http://creativecommons.org/licenses/by-sa/2.0/deed.mk. Доколку\n користите медиум кадешто не може да се ставаат врски (како на пр.\n печатено издание), ви препорачуваме да ги наведете корисниците на\n www.openstreetmap.org (на пр. со проширување на\n ‘OpenStreetMap’ со полнава адреса) и до\n www.creativecommons.org.\n

    \n\n

    Како да дознаете повеќе

    \n

    \n Прочитајте повеќе за користењето на нашите податоци на Правните\n ЧПП.\n

    \n

    \n Учесниците во OSM се потсетуваат никогаш да не ставаат податоци од\n извори заштитени со авторски права (на пр. Google Карти или печатени карти) без\n јасна дозвола од имателите на авторските права.\n

    \n

    \n Иако OpenStreetMap има отворени податоци, ние сепак не можеме бесплатно да \n го нудиме картографскиот програм на развивачи кои се трети лица.\n\n Погледајте ги нашите Правила на користење на програмот,\n Правила на користење на полињата\n и Правила на користење на Nominatim.\n

    \n\n

    Нашите учесници

    \n

    \n Нашата лиценца CC BY-SA бара да “го наведете изворниот\n автор разумно за медиумот или средството што го\n користите”. Поединечните картографи на OSM не бараат да\n бидат наведувани посебно, туку само како “Учесници на\n OpenStreetMap”, но онаму кадешто OpenStreetMap содржи податоци\n од некоја државна картографска установа или друг важен извор,\n веројатно би било разумно да ги наведете нив директно,\n наведувајќи ги како што тие обично се наведуваат, или ставајќи врска до нивната страница.\n

    \n\n\n\n
      \n
    • Австралија: Содржи податоци за населби засновани на\n податоци на Австралиската служба за статистика.
    • \n
    • Австрија: Содржи податоци од\n Град Виена (под лиценцата\n CC BY),\n
    • Канада: Содржи податоци од\n GeoBase®, GeoGratis (© Министерство за природни ресурси\n Канада), CanVec (© Министерство за природни ресурси\n Канада) и StatCan (Географско одделение,\n Статистика Канада).
    • \n
    • Франција: Содржи податоци преземени од\n Главната даночна управа.
    • \n
    • Холандија: Содржи © И податоци, 2007 \n (www.and.com)
    • \n
    • Нов Зеланд: Содржи податоци преземени од\n Land Information New Zealand. Крунски авторски права задржани.
    • \n
    • Полска: Содржи податоци од UMP-pcPL карти. Авторски права на\n учесниците на UMP-pcPL.\n \n Повеќе за употребата на податоци од UMP во OSM
    • \n
    • ЈАР: Содржи податоци преземени од\n Главниот директорат:\n Национални геопросторни информации, Државни права задржани.
    • \n
    • Обединето Кралство: Податоци од Ordnance Survey \n © Крунски авторски права и права врз базата на податоци\n 2010.
    • \n
    \n\n

    \n Поставањето на податоци во OpenStreetMap не подразбира дека изворниот \n добавувач на податоци го поддржува и застапува OpenStreetMap, дека дава било каква гаранција, или пак\n дека прифаќа било каква одговорност.\n

    " + legal_babble: + attribution_example: + alt: Пример за тоа како да ја наведете OpenStreetMap на некоја страница + title: Пример за наведување + contributors_at_html: "Австрија: Содржи податоци од\nГрад Виена (под\nCC BY),\nПокраина Предарлска и\nПокраина Тирол (под CC-BY AT со исправки)." + contributors_ca_html: "Canada: Содржи податоци од\nGeoBase®, GeoGratis (© Министерство за природни ресурси на Канада), CanVec (© Министерство за природни ресурси на Канада), and StatCan (Географско одделение,\nСтатистичка служба на Канада)." + contributors_fi_html: "Финска: Содржи податоци од топографската база и други ресурси на Државната геодетска служба на Финска, под лиценцата\nNLSFI." + contributors_footer_1_html: "Повеќе информации за овие и други извори искористени\nза подобрување на OpenStreetMap ќе најдете на страницата Учесници на викито на OpenStreetMap." + contributors_footer_2_html: "Употребата на податоците на OpenStreetMap не подразбира дека добавувачот\nна изворните податоци го застапува или рекламира OpenStreetMap, дава било каква гаранција, или\nдека прифаќа било каква одговорност." + contributors_fr_html: "Франција: Содржи податоци од\nГенералната даночна управа." + contributors_gb_html: "Велика Британија: Содржи податоци\nод Картографскиот завод на Обединетото Кралство© Крунски авторски права и\nправа на базата 2010-12." + contributors_intro_html: "Во нашиот проект учествуваат илјадници поединци. Користиме и\nподатоци со отворена лиценца од државни картографски установи\nи други извори, меѓу кои се:" + contributors_nl_html: "Холандија: Содржи © податоци од AND, 2007\n(www.and.com)" + contributors_nz_html: "Нов Зеланд: Содржи податоци од\nКатастарската служба на Нов Зеланд. Крунски авторски права." + contributors_title_html: Нашите учесници + contributors_za_html: "ЈАР: Содржи податоци од\nГлавната управа:\nНационална катастарска служба, државни авторски права задржани." + credit_1_html: "Задолжително наведувајте нè со “© Учесници на\nOpenStreetMap ”." + credit_2_html: "Исто така мора јасно да истакнете дека податоците се нудат под \nЛиценцата за отворени бази, и, доколку ги користите нашите полиња на картите, дека\nкартографијата е под лиценцата CC-BY-SA. Ова може да го сторите со ставање на врска\nдо оваа страница за авторство. \nДруга можност (задолжителна ако го распространувате OSM во \nподаточен облик) е непосредно да го наведете името на лиценцата и да ставите врска. \nВо медиумите каде врските не се можни are not possible (на пр. печатени дела), предлагаме \nда ги упатите читателите кон openstreetmap.org (можеби со проширување на \n'OpenStreetMap' на оваа полна адреса), кон opendatacommons.org и\n(ако е релевантно) кон creativecommons.org." + credit_3_html: "Кај пребарливата електронска карта, припишувањето треба да се прикаже во аголот од картата.\nНа пример:" + credit_title_html: Како да ја наведете OpenStreetMap + infringement_1_html: "Би сакале да ги потсетиме учесниците на OSM дека никогаш не смеат да ставаат\nподатоци од извори заштитени со авторски права (на пр. Google Карти или печатени карти) без\nизрична дозвола од имателите на тие права." + infringement_2_html: "Доколку сметате дека базата на OpenStreetMap или ова мрежно место\nсодржи бесправно или неисправно поставени податоци, погледајте ја\nпроцедурата \nза отстранување или поднесете жалба на \nоваа наменска страница." + infringement_title_html: Прекршување на авторските права + intro_1_html: "OpenStreetMap има отворени податоци под лиценцата Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Нашите податоци слободно можете да ги умножувате, распространувате, предавате и менувате, \nдоколку ја наведете OpenStreetMap и нејзините\nучесници. Доколку ги измените или дополните податоците,\nдобиеното можете да го распространувате само под истата лиценца. Вашите права и одговорност ќе ги најдете\nво целосниот правен текст." + intro_3_html: "Картографијата во нашите полиња на картите и нашата документација\nсе нудат под лиценцата Криејтив комонс НаведиИзвор-СподелиПодИстиУслови 2.0 (CC-BY-SA)." + more_1_html: "Повеќе за употребата на податоци и како да не наведувате, ќе најдете на Правни ЧПП." + more_2_html: "Иако OpenStreetMap работи со отворени податоци, ние не можеме да понудиме\nбесплатни програмски прилози (API) за карти на трети програмери.\nПогледајте ги правилата за употреба на прилогот,\nправилата за употреба на полињата\nи Nominatim." + more_title_html: Повеќе информации + title_html: Авторски права и лиценца native: - mapping_link: почнете со изработка на карти + mapping_link: почнете да ги работите картите native_link: македонската верзија text: Ја гледате англиската верзија на страницата за авторски права. Можете да се вратите на %{native_link} на оваа страница или пак можете да престанете со читање за авторските права и да %{mapping_link}. title: За страницава @@ -1075,12 +1113,9 @@ mk: title: За праќање to: До read: - back_to_inbox: Назад во добиени - back_to_outbox: Назад во „за праќање“ + back: Назад date: Датум from: Од - reading_your_messages: Читање на пораките - reading_your_sent_messages: Читање на вашите пратени пораки reply_button: Одговори subject: Наслов title: Прочитај ја пораката @@ -1091,6 +1126,37 @@ mk: wrong_user: Најавени сте како „%{user}“, но пораката на којашто побаравте да одговорите не е испратена до тој корисник. Најавете се под правилно корисничко име за да одговорите. sent_message_summary: delete_button: Избриши + note: + description: + closed_at_by_html: Решена пред %{when} од %{user} + closed_at_html: Решена пред %{when} + commented_at_by_html: Подновена пред %{when} од %{user} + commented_at_html: Подновена пред %{when} + opened_at_by_html: Создадена пред %{when} од %{user} + opened_at_html: Создадена пред %{when} + reopened_at_by_html: Повторно отворена пред %{when} од %{user} + reopened_at_html: Повторно отворена пред %{when} + entry: + comment: Коментар + full: Целата белешка + mine: + ago_html: пред %{when} + created_at: Создадена + creator: Создавач + description: Опис + heading: Белешки на %{user} + id: Назнака + last_changed: Изменета + subheading: Белешки создадени или коментирани од %{user} + title: Белешки создадени или коментирани од %{user} + rss: + closed: затворена белешка (кај %{place}) + commented: нова коментар (кај %{place}) + description_area: Список на белешки, создадени, искометирани или затворени, во вашата околина [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: RSS-канал за белешката %{id} + opened: нова белешка (кај %{place}) + reopened: преактивирана белешка (кај %{place}) + title: Белешки на OpenStreetMap notifier: diary_comment_notification: footer: Можете да го прочитате коментарот и на %{readurl} и можете да коментирате на %{commenturl} или да одговорите на %{replyurl} @@ -1100,14 +1166,13 @@ mk: email_confirm: subject: "[OpenStreetMap] Потврдете ја вашата е-поштенска адреса" email_confirm_html: - click_the_link: Ако ова сте вие, кликнете подолу за да ја потврдите измената. + click_the_link: Ако ова сте вие, стиснете подолу за да ја потврдите измената. greeting: Здраво, hopefully_you: Некој (се надеваме, Вие) сака да ја смени е-поштенската адреса на %{server_url} со новата адреса %{new_address}. email_confirm_plain: - click_the_link: Ако ова сте вие, кликнете на врската подолу за да ја потврдите измената. + click_the_link: Ако ова сте вие, стиснете на врската подолу за да ја потврдите измената. greeting: Здраво, - hopefully_you_1: Некој (се надеваме Вие) сака да ја замени е-поштенската адреса на - hopefully_you_2: "%{server_url} со новата адреса %{new_address}." + hopefully_you: Некој (се надеваме, Вие) сака да ја смени е-поштенската адреса на %{server_url} со новата адреса %{new_address}. friend_notification: befriend_them: Можете личноста и да ја додадете како пријател на %{befriendurl}. had_added_you: "%{user} ве додаде како пријател на OpenStreetMap." @@ -1131,53 +1196,43 @@ mk: lost_password: subject: "[OpenStreetMap] Барање за промена на лозинка" lost_password_html: - click_the_link: Ако ова сте вие, тогаш кликнете ја врската подолу за да си ја промените лозинката. + click_the_link: Ако ова сте вие, тогаш стиснете на врската подолу за да си ја промените лозинката. greeting: Здраво, hopefully_you: Некој (можеби Вие) побарал да се промени лозинката на сметката на openstreetmap.org која ѝ припаѓа на оваа адреса. lost_password_plain: - click_the_link: Ако ова сте вие, кликнете на врската подолу за да си ја смените лозинката. + click_the_link: Ако ова сте вие, стиснете на врската подолу за да си ја смените лозинката. greeting: Здраво, - hopefully_you_1: Некој (можеби Вие) има побарано да се смени лозинката на - hopefully_you_2: адресата на оваа openstreetmap.org сметка. + hopefully_you: Некој (можеби Вие) побарал да се промени лозинката на сметката на openstreetmap.org која ѝ припаѓа на оваа адреса. message_notification: - footer1: Можете да ја прочитате пораката и на %{readurl} - footer2: и можете да одговорите на %{replyurl} + footer_html: Можете и да ја прочитате пораката на %{readurl}, и да одговорите на %{replyurl} header: "%{from_user} ви испрати порака преку OpenStreetMap со насловот %{subject}:" hi: Здраво %{to_user}, subject_header: "[OpenStreetMap] — %{subject}" + note_comment_notification: + anonymous: Анонимен корисник + closed: + commented_note: "%{commenter} реши картографска белешка на која вие веќе коментиравте. Белешката се наоѓа кај %{place}." + subject_other: "[OpenStreetMap] %{commenter} реши белешка што ве интересира" + subject_own: "[OpenStreetMap] %{commenter} реши една од вашите белешки" + your_note: "%{commenter} реши една од вашите белешки на картите близу %{place}." + commented: + commented_note: "%{commenter} искоментира на картографска белешка на која вие веќе коментиравте. Белешката се наоѓа кај %{place}." + subject_other: "[OpenStreetMap] %{commenter} искоментира на белешка што ве интересира" + subject_own: "[OpenStreetMap] %{commenter} искоментира на една од вашите белешки" + your_note: "%{commenter} искоментира на една од вашите белешки на картите близу %{place}." + details: Поподробно за белешката на %{url}. + greeting: Здраво, + reopened: + commented_note: "%{commenter} реши картографска белешка на која имате коментирано. Белешката се наоѓа близу %{place}." + subject_other: "[OpenStreetMap] %{commenter} преактивира белешка што ве интересира" + subject_own: "[OpenStreetMap] %{commenter} преактивира една од вашите белешки" + your_note: "[OpenStreetMap] %{commenter} преактивира една од вашите белешки на каритте близу %{place}." signup_confirm: - subject: "[OpenStreetMap] Потврдете ја вашата е-поштенска адреса" - signup_confirm_html: - ask_questions: Можете да поставувате прашања за OpenStreetMap на нашата страница за прашања и одговори. - click_the_link: Ако ова сте вие, добредојдовте! Кликнете на врската подолу за да ја потврдите таа сметка и да прочитате повеќе информации за OpenStreetMap - current_user: На Category:Users_by_geographical_region ќе најдете список на тековни корисници во категории, зависно од нивната местоположба во светот. - get_reading: Читајте за OpenStreetMap на викито, информирајте се за најновите збиднувања преку OpenStreetMap блогот или Twitter, или пак прелистајте гоблогот „OpenGeoData“ на основачот на OpenStreetMap, Стив Коуст за историја на проектот, заедно со под-емитувања! - greeting: Здраво! - hopefully_you: Некој (се надеваме, Вие) сака да отвори сметка на - introductory_video: Можете да погледате %{introductory_video_link}. - more_videos: Имаме %{more_videos_link}. - more_videos_here: повеќе видеоклипови овде - user_wiki_page: Се препорачува да направите корисничка вики-страница, на која ќе стојат ознаки за категории кои ќе го означуваат вашето место на живеење, како да речеме [[Category:Users_in_Skopje]]. - video_to_openstreetmap: воведен видеоклип за OpenStreetMap - wiki_signup: Препорачуваме да се регистрирате на викито на OpenStreetMap. - signup_confirm_plain: - ask_questions: "Можете да поставувате прашања за OpenStreetMap на нашата страница за прашања и одговори:" - blog_and_twitter: "Бидете информирани за најновите збиднувања преку блогот на OpenStreetMap blog или Twitter:" - click_the_link_1: Ако ова сте вие, добредојдовте! Кликнете на врската подолу за да ја потврдите - click_the_link_2: сметка и прочитајте повеќе за дополнителни информации за OpenStreetMap. - current_user_1: Список на тековни корисници во категории, врз основа на нивната местоположба во светот - current_user_2: "местоположба во светот ќе најдете на:" + confirm: "Најнапред треба да потврдиме дека вие сте оној што го поставил барањето. Ако сте вие, тогаш стиснете на долунаведената врска за да ја потврдите сметката:" + created: Некој (се надеваме, вие) штотуку направи сметка на %{site_url}. greeting: Здраво! - hopefully_you: Некој (се надеваме, Вие) сака да отвори сметка на - introductory_video: "Погледајте го воведниот видеоклип за OpenStreetMap тука:" - more_videos: "Повеќе видеоклипови ќе најдете тука:" - opengeodata: "OpenGeoData.org е блогот на основачот на OpenStreetMap, Стив Коуст, а таму има и под-емитувања:" - the_wiki: "Читајте за OpenStreetMap на викито:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/MK:Beginners%27_Guide?uselang=mk - user_wiki_1: Се препорачува да отворите корисничка вики-страница, каде ќе стојат - user_wiki_2: ознаки за категории на кои ќе стои вашето место на живеење, како да речеме [[Category:Users_in_London]]. - wiki_signup: "Препорачуваме да се регистрирате на викито на OpenStreetMap на:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=mk + subject: "[OpenStreetMap] Добредојдовте на OpenStreetMap" + welcome: Откако ќе ја потврдите сметката, ќе ви дадеме уште напатствија како да почнете со уредување. oauth: oauthorize: allow_read_gpx: ви ги чита вашите приватни GPS-траги. @@ -1186,10 +1241,20 @@ mk: allow_write_api: ја менува картата. allow_write_diary: создава ставки во дневникот, пишува коментари и да се спријателува. allow_write_gpx: подига GPS-траги. + allow_write_notes: измена на белешки. allow_write_prefs: ги менува вашите кориснички прилагодувања. request_access: Програмскиот прилог %{app_name} бара пристап до вашата сметка, %{user}. Видете дали би сакале прилогот да ги има следните можности. Можете да одберете колку што сакате. + title: Овластете пристап до вашата сметка + oauthorize_failure: + denied: На прилогот %{app_name} му го одбивте пристапот до вашата сметка. + invalid: Шифрата за овластување е неважечка. + title: Барањето за овластување не успеа + oauthorize_success: + allowed: На прилогот %{app_name} му дадовте пристап до вашата сметка. + title: Барањето за овластување е дозволено + verification: Потврдниот код гласи %{code}. revoke: - flash: Го поништивте жетонот за %{application} + flash: Ja поништивте шифрата за %{application} oauth_clients: create: flash: Информациите се успешно регистрирани @@ -1204,8 +1269,9 @@ mk: allow_write_api: ја менува картата. allow_write_diary: создава ставки во дневници, да коментира, и да се спријателува. allow_write_gpx: подига GPS-траги. + allow_write_notes: измена на белешки. allow_write_prefs: им ги менува корисничките прилагодувања. - callback_url: URL адреса за обратен одзив + callback_url: URL-адреса за одѕив name: Име requests: "Побарај ги следниве дозволи од корисникот:" required: Се бара @@ -1228,12 +1294,13 @@ mk: not_found: sorry: Нажалост, тој %{type} не е пронајден. show: - access_url: "URL адреса на пристапниот жетон:" + access_url: "URL-адреса на пристапата шифра:" allow_read_gpx: им ги чита приватните GPS-траги. allow_read_prefs: им ги чита корисничките прилагодувања. allow_write_api: ја менува картата. allow_write_diary: прави ставки во дневници, да коментира и да се сптијателува. allow_write_gpx: подига GPS-траги. + allow_write_notes: измена на белешки. allow_write_prefs: им ги менува корисничките прилагодувања. authorize_url: "Дозволи URL адреса:" confirm: Дали сте сигурни? @@ -1242,9 +1309,9 @@ mk: key: "Потрошувачки клуч:" requests: Ги барам следните дозволи од корисникот secret: "Потрошувачка тајна:" - support_notice: Поддржуваме hmac-sha1 (препорачано) како и ssl режим со прост текст. + support_notice: Поддржуваме потписи во HMAC-SHA1 (препорачано) и RSA-SHA1. title: OAuth податоци за %{app_name} - url: "Побарај URL адреса на жетонот:" + url: "Побарај URL-адреса на шифрата:" update: flash: Клиентските информации се успешно подновени printable_name: @@ -1253,7 +1320,7 @@ mk: create: flash: Редакцијата е создадена. destroy: - error: Се појави грешна при поништувањето на редакцијата. + error: Се појави грешка при поништувањето на редакцијата. flash: Редакцијата е поништена. not_empty: Редакцијата не е празна. Одредактирајте ги сите верзии што ѝ принадлежат на оваа редакција пред да ја поништите. edit: @@ -1284,26 +1351,24 @@ mk: edit: anon_edits_link_text: Дознајте зошто ова е така. flash_player_required: Ќе ви треба Flash-програм за да го користите Potlatch - Flash-уредник за OpenStreetMap. Можете да го преземете Flash Player од Adobe.com. Имате и неколку други можности за уредување на OpenStreetMap. + id_not_configured: Не му се зададени поставки на уредувачкиот програм „iD“ no_iframe_support: Вашиот прелистувач не поддржува „иРамки“ (iframes) со HTML, без кои оваа можност не може да работи. not_public: Не сте наместиле уредувањата да ви бидат јавни. not_public_description: Повеќе не можете да ја уредувате картата ако не го направите тоа. Можете да наместите уредувањата да ви бидат јавни на вашата %{user_page}. potlatch2_not_configured: Potlatch 2 не е поставен - погледајте ја страницата http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 за повеќе информации potlatch2_unsaved_changes: Имате незачувани промени. (Зачувувањето во Potlatch 2 се врши со стискање на „зачувај“.) - potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или кликнете на „зачувај“ ако го имате тоа копче.) + potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch, треба го одселектирате тековниот пат или точка, ако уредувате во живо, или стиснете на „зачувај“ ако го имате тоа копче.) user_page_link: корисничка страница index: + createnote: Додај белешка js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го оневозможиле тој програм. js_2: OpenStreetMap користи JavaScript за нејзината лизгава карта. license: - license_name: Creative Commons Наведи извор-Сподели под исти услови 2.0 - notice: Под лиценцата %{license_name} од %{project_name} и неговите учесници. - project_name: проектот OpenStreetMap + copyright: Авторски права OpenStreetMap и учесниците, под отворена лиценца permalink: Постојана врска remote_failed: Уредувањето не успеа - проверете дали е вчитан JOSM или Merkaartor и дали е овозможено далечинското управување shortlink: Кратка врска key: - map_key: Легенда - map_key_tooltip: Легенда на картата table: entry: admin: Административна граница @@ -1371,7 +1436,7 @@ mk: unsurfaced: Неасфалтиран пат wood: Шумичка markdown_help: - alt: Алетрн. текст + alt: Алтернативен текст first: Прва ставка heading: Наслов headings: Наслови @@ -1389,7 +1454,6 @@ mk: preview: Преглед search: search: Пребарај - search_help: "примери: 'Струмица', 'Илинденска', 'Regent Street, Cambridge', 'CB2 5AQ' или 'post offices near Lünen' повеќе примери..." submit_text: -> where_am_i: Каде сум? where_am_i_title: Опишете ја моменталната местоположба со помош на пребарувачот @@ -1398,13 +1462,19 @@ mk: search_results: Резултати од пребарувањето time: formats: - friendly: "%e %B %Y во %H:%M ч." + blog: "%e %B %Y г." + friendly: "%e %B %Y г. во %H:%M ч." trace: create: trace_uploaded: Вашата GPX податотека е подигната и чека да биде вметната во базата на податоци. Ова обично се врши во рок од половина час, и откога ќе заврши, ќе ви биде испратена порака по е-пошта. upload_trace: Подигни GPS-трага delete: scheduled_for_deletion: Трагата е закажана за бришење + description: + description_with_count: + one: GPX-податотека со %{count} точка од %{user} + other: GPX-податотеки со %{count} точки од %{user} + description_without_count: GPX-податотека од %{user} edit: description: "Опис:" download: преземи @@ -1423,7 +1493,11 @@ mk: visibility: "Видливост:" visibility_help: што значи ова? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=mk + georss: + title: GPS-траги од OpenStreetMap list: + description: Прелистување на скороподигнати GPS-траги + empty_html: Тука сè уште нема ништо. Подигнете нова трага или дознајте повеќе за GPS-трагите на нивната викстраница. public_traces: Јавни GPS-траги public_traces_from: Јавни GPS-траги од %{user} tagged_with: " означено со %{tags}" @@ -1465,14 +1539,16 @@ mk: trace_header: see_all_traces: Погледајте ги сите траги see_your_traces: Погледајте ги сите траги - traces_waiting: Имате %{count} траги спремни за подигање. Советуваме за ги почекате да завршат пред да подигате други, инаку ќе го блокирате редоследот за други корисници. + traces_waiting: + one: Имате %{count} трага што чека на подигање. Би ве посоветувале да ја почекате да заврши пред да подигате други, за да не ја кочите редицата во која чекаат други корисници. + other: Имате %{count} траги што чекаат на подигање. Би ве посоветувале да ги почекате да завршат пред да подигате други, за да не ја кочите редицата во која чекаат други корисници. upload_trace: Подигни трага trace_optionals: tags: Ознаки trace_paging_nav: - next: Следна » - previous: « Претходна - showing_page: Прикажувам страница %{page} + newer: Понови траги + older: Постари траги + showing_page: Страница %{page} view: delete_track: Избриши ја трагава description: "Опис:" @@ -1512,6 +1588,10 @@ mk: email never displayed publicly: (никогаш не се прикажува јавно) flash update success: Корисничките информации се успешно подновени. flash update success confirm needed: Корисничките информации се успешно подновени. Проверете ја вашата е-пошта за да ја потврдите на адресата. + gravatar: + gravatar: Користи Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar?uselang=mk + link text: што е ова? home location: "Матична местоположба:" image: "Слика:" image size hint: (најдобро работат квадратни слики, барем 100x100) @@ -1539,24 +1619,24 @@ mk: heading: "Јавно уредување:" public editing note: heading: Јавно уредување - text: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат порака или да ви ја видат местоположбата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, кликнете на копчето подолу. По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти. (дознајте зошто).
    • Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.
    • Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.
    + text: Во моментов вашите уредувања се анонимни и луѓето не можат да ви пратат порака или да ви ја видат местоположбата. За да покажете што уредувате и да овозможите корисниците да ве контактираат преку оваа страница, стиснете на копчето подолу. По преодот на 0.6 API, само јавни корисници можат да уредуваат податоци на карти. (дознајте зошто).
    • Ако станете јавен корисник, вашата е-пошта сепак нема да се открие.
    • Оваа постапка не може да се врати, и сите нови корисници сега се автоматски јавни.
    replace image: Замени тековна слика return to profile: Назад кон профилот save changes button: Зачувај ги промените title: Уреди сметка - update home location on click: Подновувај го матичната местоположба кога ќе кликнам на картата + update home location on click: Подновувај ја матичната местоположба кога ќе стиснам на картата confirm: already active: Оваа сметка е веќе потврдена. - before you start: Знаеме дека со нетрпение чекате да почнете со картографска работа, но пред тоа препорачуваме да пополните некои податоци за вас во образецот подолу. button: Потврди - heading: Потврди корисничка сметка + heading: Проверете си ја е-поштата + introduction_1: Ви испративме потврдна порака. + introduction_2: Потврдете ја сметката на долунаведената врска, па потоа ќе можете да почнете со работа на картите. press confirm button: Притиснете го копчето за потврда подолу за да ја активирате сметката. - reconfirm: Ако поминало подолго време од последниот пат кога сте се најавиле, ќе треба да си испратите нова потврдна порака по е-пошта. - success: Вашата сметка е потврдена. Ви благодариме што се регистриравте! - unknown token: Се чини дека тој жетон не постои. + reconfirm_html: Ако сакате повторно да ви ја испратиме потврдната порака, стиснете тука. + unknown token: ПОтврдниот код е истечен или не постои. confirm_email: button: Потврди - failure: Со овој жетон е потврдена веќе една е-поштенска адреса + failure: Со оваа шифра е потврдена веќе една е-поштенска адреса heading: Потврди промена на е-пошта press confirm button: Притиснете го копчето за потврдување за да ја потврдите новата е-поштенска адреса. success: Вашата е-пошта е потврдена. Ви благодариме што се регистриравте! @@ -1573,14 +1653,14 @@ mk: heading: Корисници hide: Скриј одбрани корисници showing: - one: Прикажана е страницата %{page} (%{first_item} од %{items}) - other: Прикажани се страниците %{page} (%{first_item}-%{last_item} од %{items}) + one: Страница %{page} (%{first_item} од %{items}) + other: Страница %{page} (%{first_item}-%{last_item} од %{items}) summary: "%{name} создадено од %{ip_address} на %{date}" summary_no_ip: "%{name} создадено на %{date}" title: Корисници login: account is suspended: Нажалост, вашата сметка е закочена поради сомнителна активност.
    Обратете се кај раководителот ако сакате да продискутирате за проблемот. - account not active: Жалиме, но сметката сè уште не е активна.
    Кликнете на врската наведена во пораката со која ви ја потврдуваме сметката за да ја активирате, или пак побарајте нова потврдна порака. + account not active: Жалиме, но сметката сè уште не е активна.
    Стиснете на врската наведена во пораката со која ви ја потврдуваме сметката за да ја активирате, или пак побарајте нова потврдна порака. auth failure: Жалиме, не можевме да ве најавиме со тие податоци. create account minute: Направете сметка. Ова трае само една минута. email or username: Е-пошта или корисничко име @@ -1589,8 +1669,6 @@ mk: lost password link: Ја заборавивте лозинката? new to osm: За новодојденци на OpenStreetMap no account: Немате сметка? - notice: Дознајте повеќе за престојната промена на лиценцата на OpenStreetMap (преводи) (разговор) - notice_terms: OpenStreetMap добива нова лиценца на 1 април 2012. Оваа лиценца е отворена исто како сегашната, но правните подробности се многу посоодветни на нашата картографска база на податоци. Со задоволство би ги задржале сите ваши придонеси на OpenStreetMap, но ова е можно само доколку согласувате да бидат објавени под условите на новата лиценца. Во спротивно ќе мораме да ги отстраниме од базата.

    Најавете се, прочитајте ги новите услови и видете дали се согласувате со нив. Ви благодариме! openid: "%{logo} OpenID:" openid invalid: Нажалост, вашиот OpenID е погрешно обликуван openid missing provider: Нажалост, не можев да се поврзам со вашиот добавувач на OpenID @@ -1635,19 +1713,21 @@ mk: title: Загубена лозинка make_friend: already_a_friend: Веќе сте пријатели со %{name}. + button: Додај како пријател failed: Жалам, не можев да го додадам корисникот %{name} како пријател. - success: Сега сте пријатели со %{name}. + heading: Да го додадам корисникот %{user} како пријател? + success: Сега сте пријатели со %{name}! new: + about: + header: Слободна и уредлива + html: "

    За разлика од некои други карти, OpenStreetMap во целост ја изработуваат луѓе како вас. Секој слободно може да врши поправки, да ја подновува, да ја презема и користи.

    \n

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

    " confirm email address: "Потврдете ја е-поштата:" confirm password: "Потврдете ја лозинката:" contact_webmaster: Контактирајте го управникот за да побарате создавање на сметка - ќе се потрудиме да ве услужиме во најкраток можен рок. - continue: Продолжи + continue: Регистрација display name: "Име за приказ:" display name description: Вашето јавно прикажано име. Можете да го смените подоцна во прилагодувањата. email address: "Е-пошта:" - fill_form: Пополнете го образецот, и ние ќе ви пратиме кратка порака по е-пошта за да си ја активирате сметката. - flash create success message: Ви благодариме што се пријавивте. Испративме поврдна порака на %{email}, и штом ќе ја потврдите сметката, ќе можете да почнете со картографска работа.

    Ако користите систем против спам кој испраќа барања за потврда, тогаш ќе морате да ја дозволите адресата webmaster@openstreetmap.org бидејќи ние немаме начин да одговараме на такви потврди. - heading: Создајте корисничка сметка license_agreement: Кога ќе ја потврдите вашата сметка, ќе треба да се согласите со условите за учесници. no_auto_account_create: Нажалост моментално не можеме автоматски да ви создадеме сметка. not displayed publicly: Не се прикажува јавно (видете правилникот за приватност) @@ -1658,10 +1738,10 @@ mk: terms accepted: Ви благодариме што ги прифативте новите услови за учество! terms declined: Жалиме што не се согласувате со новите Услови за учество. Повеќе информации ќе најдете на оваа страница. terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined?uselang=mk - title: Направи сметка + title: Регистрација use openid: Во друг случај, најавете се со %{logo} OpenID no_such_user: - body: Жалиме, но не постои корисник по име %{user}. Проверете да не сте згрешиле во пишувањето, или пак да не сте кликнале на погрешна врска. + body: Жалиме, но не постои корисник по име %{user}. Проверете да не сте згрешиле во пишувањето, или пак да не сте стиснале на погрешна врска. heading: Корисникот %{user} не постои. title: Нема таков корисник popup: @@ -1669,12 +1749,14 @@ mk: nearby mapper: Соседен картограф your location: Ваша местоположба remove_friend: + button: Отстрани од пријатели + heading: Да го отстранам корисникот %{user} од пријатели? not_a_friend: "%{name} не е меѓу вашите пријатели." success: Корисникот %{name} е отстранет од вашите пријатели. reset_password: confirm password: "Потврдете ја лозинката:" flash changed: Лозинката ви е сменета. - flash token bad: Не го пронајдов тој жетон. Проверете ја URL адресата. + flash token bad: Не ја пронајдов таа шифра. Проверете ја URL-адресата. heading: Смени лозинка за %{user} password: "Лозинка:" reset: Смени лозинка @@ -1705,12 +1787,12 @@ mk: you need to accept or decline: Прочитајте ги новите Услови за учество, а потоа согласете се или одбијте ги. view: activate_user: активирај го корисников - add as friend: додај како пријател + add as friend: Додај во пријатели ago: (пред %{time_in_words_ago}) - block_history: погледај добиени блокови - blocks by me: извршени болокови - blocks on me: добиени блокови - comments: коментари + block_history: примени блокови + blocks by me: Извршени болокови + blocks on me: Добиени блокови + comments: Коментари confirm: Потврди confirm_user: потврди го корисников create_block: блокирај го корисников @@ -1722,31 +1804,35 @@ mk: deactivate_user: деактивирај го корисников delete_user: избриши го корисников description: Опис - diary: дневник - edits: уредувања + diary: Дневник + edits: Уредувања email address: Е-пошта - friends_changesets: Сите измени на пријателите - friends_diaries: Прелистување на сите дневнички записи на пријателите + friends_changesets: измени на пријателите + friends_diaries: дневнички записи на пријателите hide_user: скриј го корисников - if set location: Ако ја наместите вашата местоположба, под ова ќе ви се појави убава карта и други работи. Матичната местоположба можете да си ја наместите на страницата %{settings_link}. + if set location: Задајте ја вашата местоположба на страницата %{settings_link} за да ги видите соседните корисници околу вас. km away: "%{count} км од вас" latest edit: "Последно уредување %{ago}:" m away: "%{count} м од вас" mapper since: "Картограф од:" - moderator_history: погледај добиени блокови - my comments: мои коментари - my diary: мојот дневник - my edits: мои уредувања - my settings: мои прилагодувања - my traces: мои траги + moderator_history: дадени блокови + my comments: Мои коментари + my diary: Мојот дневник + my edits: Мои уредувања + my messages: Мои пораки + my notes: Мои белешки + my profile: Мојот профил + my settings: Мои нагодувања + my traces: Мои траги nearby users: Други соседни корисници - nearby_changesets: Прелистување на сите измени на соседните корисници - nearby_diaries: Прелистување на сите дневнички записи на соседните корисници + nearby_changesets: измени на соседните корисници + nearby_diaries: дневнички записи на соседн. корисн. new diary entry: нова ставка во дневникот no friends: Сè уште немате додадено пријатели. no nearby users: Сè уште нема други корисници во вашата околина што признаваат дека работат на карти. + notes: Белешки на картата oauth settings: oauth поставки - remove as friend: отстрани од пријатели + remove as friend: Отстрани од пријатели role: administrator: Овој корисник е администратор grant: @@ -1756,11 +1842,11 @@ mk: revoke: administrator: Лиши од администраторски пристап moderator: Лиши од модераторски пристап - send message: испрати порака + send message: Испрати порака settings_link_text: прилагодувања spam score: "Оцена за спам:" status: "Статус:" - traces: траги + traces: Траги unhide_user: покажи го корисникот user location: Местоположба на корисникот your friends: Ваши пријатели @@ -1818,11 +1904,14 @@ mk: creator_name: Создавач display_name: Блокиран корисник edit: Уреди + next: Следна » not_revoked: (не се поништува) + previous: « Претходна reason: Причина за блокирање revoke: Поништи! revoker_name: "Поништил:" show: Прикажи + showing_page: Страница %{page} status: Статус period: one: 1 час @@ -1870,3 +1959,25 @@ mk: fail: Не можев да го лишам корисникот`%{name}' од улогата `%{role}'. Проверете дали корисникот и улогата се важечки. heading: Потврди лишување од улога title: Потврди лишување од улога + welcome_page: + add_a_note: + paragraph_1_html: Ако сакате да направите само поситна поправка и немате време да се зачленувате и обучувате, тогаш просто ставете белешка. + paragraph_2_html: "Едноставно појдете на картата и стиснете на иконата со белешка:\n. Со ова ќе ставите бележник на картата, што потоа можете да го преместувате со влечење. Внесете ја пораката, па зачувајте. Другите кратографи потоа ќе иследат за што станува збор." + title: Немате време да уредувате? Ставете белешка. + basic_terms: + editor_html: Уредник е програм или мрежно место што се користи за уредување на карти. + node_html: Јазол е точка на картата, како на пр. извесен ресторан или дрво. + paragraph_1_html: OpenStreetMap има свој жаргон. Еве некои корисни поими. + tag_html: Ознака е податок за јазол или пат, како на пр. име на ресторан или дозволената брзина на улица. + title: Основни картографски поими + way_html: Пат е линија или подрачје, како пат, поток, езеро или објект (здание). + introduction_html: Добре дојдовте на OpenStreetMap — слободна и уредлива карта на светот. Сега веќе сте регистрирани, што значи дека можете да почнете со работа. Еве мала помош за најважните работи што треба да ги знаете. + questions: + paragraph_1_html: "OpenStreetMap има неколку ресурси каде можете да дознаете за проектот, да поставувате прашања,\nда водите заедничка дискусија и да документирате картографски теми.\nПомош ќе добиете тука." + title: Имате прашања? + start_mapping: Почнете да ги работите картите + title: Добре дојдовте! + whats_on_the_map: + off_html: Она што нема тука да го најдете се судови и вреднувања, историски (поеќе непостоечки) градби, нагаѓања и податоци од извори заштитени со авторски права. Не копирајте и прецртувајте карти од интернет или од книги и атласи, освен ако немате посебна дозвола. + on_html: На OpenStreetMap се ставаат најразчични вистински и тековни нешта — милиони објекти и згради, патишта и други поединости за местата. Можете да ставате сè што постои и што ве интересира. + title: Што има на картата diff --git a/config/locales/mr.yml b/config/locales/mr.yml new file mode 100644 index 00000000000..af6e459848a --- /dev/null +++ b/config/locales/mr.yml @@ -0,0 +1,1384 @@ +# Messages for Marathi (मराठी) +# Exported from translatewiki.net +# Export driver: syck-pecl +# Author: Singleton +# Author: V.narsikar +# Author: Vibhavari +mr: + about_page: + copyright_html: ©ओपनस्ट्रीटमॅप
    योगदाते + local_knowledge_title: स्थानिक ज्ञान + next: पुढील + partners_title: भागीदार + activerecord: + attributes: + diary_comment: + body: मायना + diary_entry: + language: भाषा + latitude: अक्षांश + longitude: रेखांश + title: विषय + user: सदस्य + friend: + friend: मित्र + user: सदस्य + message: + body: मायना + recipient: प्राप्तकर्ता + sender: प्रेषक + title: विषय + trace: + description: वर्णन + latitude: अक्षांश + longitude: रेखांश + name: नाव + public: सार्वजनिक + size: आकार + user: सदस्य + visible: दृश्य + user: + active: सक्रिय + description: वर्णन + display_name: दर्शवायचे नाव + email: ई-मेल + languages: भाषा + pass_crypt: परवलीचा शब्द + models: + acl: पोहोच नियंत्रण यादी + changeset: बदलसंच + changeset_tag: बदलसंचाची खूणपताका + country: देश + diary_comment: अनुदिनीवरील अभिप्राय + diary_entry: अनुदिनीतील नोंद + friend: मित्र + language: भाषा + message: संदेश + node: गाठ + node_tag: गाठीची खूणपताका + notifier: अधिसूचक + old_node: जुनी गाठ + old_node_tag: जून्या गाठीची खूणपताका + old_relation: जुना संबंध + old_relation_member: संबंधाचा जुना सदस्य + old_relation_tag: जून्या संबंधाची खूणपताका + old_way: जुना मार्ग + old_way_node: मार्गातील जुनी गाठ + old_way_tag: जून्या मार्गाची खूणपताका + relation: संबंध + relation_member: संबंधाचा सदस्य + relation_tag: संबंधाची खूणपताका + session: सत्र + trace: अनुरेख + tracepoint: अनुरेख बिंदू + tracetag: अनुरेख खूणपताका + user: सदस्य + user_preference: सदस्याची पसंती + user_token: सदस्य बिल्ला + way: मार्ग + way_node: मार्गातील गाठ + way_tag: मार्ग खूणपताका + browse: + anonymous: अनामिक + changeset: + belongs_to: लेखक + changesetxml: बदलसंच XML + feed: + title: बदलसंच %{id} + title_comment: बदलसंच %{id} - %{comment} + node: गाठी (%{count}) + node_paginated: गाठी (%{x}-%{y}, %{count} पैकी) + osmchangexml: osmChange XML + relation: संबंध (%{count}) + relation_paginated: संबंध (%{x}-%{y}, %{count} पैकी) + title: "बदलसंच: %{id}" + way: मार्ग (%{count}) + way_paginated: मार्ग (%{x}-%{y}, %{count} पैकी) + closed: बंद केले + closed_by_html: %{time} पूर्वी%{user} द्वारे बंद केले + closed_html: %{time} पूर्वी बंद केला + containing_relation: + entry: संबंध %{relation_name} + entry_role: संबंध %{relation_name} (%{relation_role} म्हणून) + created: बनविले + created_by_html: %{time} पूर्वी %{user} द्वारे तयार केले + created_html: %{time} पूर्वी बनविले + deleted_by_html: %{time} पूर्वी%{user} द्वारे गाळले + download_xml: XML उतरवा + edited_by_html: %{time} पूर्वी %{user} द्वारे संपादन केले + in_changeset: बदलसंच + location: "ठिकाण:" + no_comment: (वर्णन नाही) + node: + history_title: "गाठीचा इतिहास: %{name}" + title: "गाठ: %{name}" + not_found: + sorry: "क्षमा असावी, %{type} #%{id} सापडले नाही." + type: + changeset: चा बदलसंच सापडला + node: गाठ + relation: संबंध + way: मार्ग + note: + closed_by: %{when} पूर्वी%{user} ने वियोजित केले + closed_title: "निराकरण झालेली टीप #%{note_name}" + commented_by: %{when} पूर्वी%{user} ची टिप्पणी + hidden_by: %{when} पूर्वी%{user} ने लपविले + hidden_title: "लपविलेली टीप #%{note_name}" + new_note: नवी टीप + open_by: %{when} पूर्वी%{user} ने तयार केले + open_title: "निराकरण न झालेली टीप #%{note_name}" + reopened_by: %{when} पूर्वी%{user} ने सक्रिय केले + title: "टीप: %{id}" + part_of: चा भाग + redacted: + message_html: ह्या %{type}ची आवृत्ती क्र. %{version} दाखविली जाऊ शकत नाही कारण तिचे लोपन करण्यात आले आहे. कृपया तपशीलासाठी %{redaction_link} पहा. + redaction: लोपन %{id} + type: + node: गाठी + relation: संबंध + way: मार्ग + relation: + history_title: "संबंधाचा इतिहास: %{name}" + members: सदस्य + title: "संबंध: %{name}" + relation_member: + entry_role: "%{type} %{name}, %{role} म्हणून" + type: + node: गाठ + relation: संबंध + way: मार्ग + start_rjs: + feature_warning: "%{num_features} प्रारुपाचे प्रभारण करीत आहे ज्याने आपला न्याहाळक मंद अथवा प्रतिसादशून्य होईल.आपणास खात्री आहे काय की आपणास डाटा दर्शवायचा आहे." + load_data: डाटाचे भारण करा + loading: प्रभारण करीत आहे + tag_details: + tags: खूणपताका + wiki_link: + key: "%{key} खूणपताकेसाठी विकी वर्णन पान" + tag: "%{key}=%{value} खूणपताकेसाठी विकी वर्णन पान" + wikipedia_link: विकिपिडियावरील %{page} हा लेख + timeout: + sorry: क्षमा असावी, %{id}असलेला %{type}चा डाटा मिळविण्यास फार वेळ लागला. + type: + changeset: बदलसंच + node: गाठी + relation: संबंध + way: मार्ग + version: आवृत्ती + view_details: तपशील पहा + view_history: इतिहास पहा + way: + also_part_of: + one: "%{related_ways} मार्गाचा भाग" + other: "%{related_ways} मार्गांचा भाग" + history_title: "मार्गाचा इतिहास: %{name}" + nodes: गाठी + title: "मार्ग: %{name}" + changeset: + changeset: + anonymous: अनामिक + no_edits: (संपादने नाहीत) + view_changeset_details: बदलसंचाचा तपशील पहा + changeset_paging_nav: + next: पुढील » + previous: « मागील + showing_page: लेख %{page} + changesets: + area: क्षेत्र + comment: अभिप्राय + id: ओळखसंख्या (आयडी) + saved_at: ला जतन केले + user: सदस्य + list: + empty: बदलसंच सापडले नाहीत. + empty_area: ह्या भागात बदलसंच नाहीत. + empty_user: ह्या सदस्याचे बदलसंच नाहीत. + load_more: अधिक प्रभारण करा + no_more: अधिक बदलसंच सापडले नाहीत. + no_more_area: ह्या भागात अधिक बदलसंच नाहीत. + no_more_user: ह्या सदस्याचे अधिक बदलसंच नाहीत. + title: बदलसंच + title_friend: आपल्या मित्रांचे बदलसंच + title_nearby: जवळपासच्या सदस्यांचे बदलसंच + title_user: "%{user}चे बदलसंच" + timeout: + sorry: क्षमा असावी, आपण मागितलेली बदलसंचाची यादी मिळविण्यास फार वेळ लागला. + diary_entry: + comments: + ago: "%{ago} पूर्वी" + comment: अभिप्राय + has_commented_on: "%{display_name}ने खालील अनुदिनी नोंदींवर अभिप्राय दिले आहेत" + newer_comments: नवे अभिप्राय + older_comments: जुने अभिप्राय + post: पाठवा + when: कधी + diary_comment: + comment_from: "%{link_user}कडून %{comment_created_at}ला अभिप्राय" + confirm: खात्री करा + hide_link: हा अभिप्राय लपवा + diary_entry: + comment_count: + one: "%{count} comment" + other: "%{count} अभिप्राय" + zero: अभिप्राय नाहीत + comment_link: ह्या नोंदीवर अभिप्राय लिहा + confirm: खात्री करा + edit_link: ही नोंद संपादा + hide_link: ही नोंद लपवा + posted_by: "%{link_user}ने %{created} ला %{language_link} भाषेत लिहीले" + reply_link: ह्या नोंदीस उत्तर द्या + edit: + body: "मायना:" + language: "भाषा:" + latitude: "अक्षांश:" + location: "ठिकाण:" + longitude: "रेखांश:" + marker_text: अनुदिनीतील नोंदीचे ठिकाण + save_button: जतन करा + subject: "विषय:" + title: अनुदिनीतील नोंद संपादा + use_map_link: नकाशा वापरा + feed: + all: + description: ओपनस्ट्रीटमॅप सदस्यांकडून अलीकडील अनुदिनी-नोंदी + title: ओपनस्ट्रीटमॅप अनुदिनीतील नोंदी + language: + description: ओपनस्ट्रीटमॅप सदस्यांकडून %{language_name} भाषेतील अलीकडील अनुदिनी-नोंदी + title: "%{language_name} भाषेतील ओपनस्ट्रीटमॅप अनुदिनीतील नोंदी" + user: + description: "%{user}कडून अलीकडील ओपनस्ट्रीटमॅप अनुदिनी-नोंदी" + title: "%{user}कडून ओपनस्ट्रीटमॅप अनुदिनी-नोंदी" + list: + in_language_title: "%{language} भाषेतील अनुदिनीतील नोंदी" + new: अनुदिनीत नवी नोंद + new_title: आपल्या अनुदिनीत नवी नोंद लिहा + newer_entries: नव्या नोंदी + no_entries: रिक्त अनुदिनी + older_entries: जुन्या नोंदी + recent_entries: अनुदिनीतील अलीकडील नोंदी + title: सदस्यांच्या अनुदिनी + title_friends: मित्रांच्या अनुदिनी + title_nearby: जवळपासच्या सदस्यांच्या अनुदिनी + user_title: "%{user}ची अनुदिनी" + location: + edit: संपादन करा + location: "ठिकाण:" + view: पहा + new: + title: अनुदिनीत नवी नोंद + no_such_entry: + body: क्षमा असावी, %{id} क्रमांकाची अनुदिनीतील नोंद किंवा अभिप्राय अस्तित्वात नाही. कृपया आपले वर्णलेखन तपासा, किंवा कदाचित आपण चुकीच्या दुव्यावर टिचकी दिली असेल. + heading: "%{id} क्रमांकाची नोंद अस्तित्वात नाही" + title: अनुदिनीत अशी नोंद नाही + view: + leave_a_comment: टिप्पणी टाका + login: सनोंद-प्रवेश करा + login_to_leave_a_comment: टिप्प्णी लिहिण्यासाठी %{login_link} + save_button: जतन करा + title: "%{user}ची अनुदिनी | %{title}" + user_title: "%{user}ची अनुदिनी" + editor: + default: सामान्यतः (सध्या %{name}) + id: + description: iD (न्याहाळकात चालणारा संपादक) + name: iD + potlatch: + description: पॉटलॅच १ (न्याहाळकात चालणारा संपादक) + name: पॉटलॅच १ + potlatch2: + description: पॉटलॅच २ (न्याहाळकात चालणारा संपादक) + name: पॉटलॅच २ + remote: + description: सुदूर नियंत्रण (JOSM अथवा Merkaartor) + name: सुदूर नियंत्रण + export: + start: + add_marker: नकाशावर दर्शकचिन्ह जोडा + area_to_export: निर्यात करावयाचे क्षेत्र + embeddable_html: अंतःस्थापन करण्याजोगी HTML + export_button: निर्यात + export_details: ओपनस्ट्रीटमॅप डाटा हा परवान्यांतर्गत आहे.ओपन डाटा कॉमन्स ओपन डाटाबेस परवाना (ODbL). + format: आराखडा + format_to_export: निर्यातीचे प्रारुप + image_size: चित्राचा आकार + latitude: "अक्षांश:" + licence: परवाना + longitude: "रेखांश:" + manually_select: वेगळे क्षेत्र निवडा + map_image: नकाशा चित्र (प्रमाणित स्तर दाखविते) + max: कमाल + options: विकल्प + osm_xml_data: ओपनस्ट्रीटमॅप XML डाटा + output: उत्पादन + paste_html: संकेतस्थळावर अंतःस्थापनासाठी HTML चिकटवा + scale: प्रमाण + too_large: + advice: "जर वरील निर्यात करण्यास अपयश आले, तर कृपया खालील स्रोत वापरण्याचा विचार करा :" + body: हे क्षेत्र OpenStreetMap XML Data म्हणून निर्यात करण्यास खूपच मोठे आहे.कृपया लहान करा किंवा लहान क्षेत्र निवडा किंवा मोठ्या प्रमाणात डाटाचे अधिभारणासाठी खालील यादी केलेल्या स्रोतांपैकी एकाचा वापर करा. + geofabrik: + description: नियमितपणे अद्ययावत केले जाणारे खंड, देश, व निवडक शहरांचे उतारे + title: जियोफेब्रिक अधिभारण + metro: + description: जगातील प्रमुख शहरे व त्यांच्या सभोवतालीच्या क्षेत्रांचे उतारे + title: मेट्रो एक्स्ट्रॅक्ट्स् + other: + description: ओपनस्ट्रीटमॅप विकीवर सूचीबद्ध अतिरिक्त स्रोत + title: इतर स्रोत + overpass: + description: ओपनस्ट्रीटमॅप प्रतिमा डाटाबेसमधून बंधनपेटीचे(बाउंडिंग बॉक्स) अधिभारण करा + title: API टाळा + planet: + description: संपूर्ण ओपनस्ट्रीटमॅप डाटाबेसच्या नियमित अद्यतन केलेल्या प्रती + title: प्लॅनेट OSM + zoom: मोठे करा + title: निर्यात + fixthemap: + how_to_help: + title: मदत कशी करावी + title: समस्या नोंदवा/नकाशा नीयत करा + geocoder: + description: + title: + geonames: स्थान जिओनेम्स मार्फत + osm_nominatim: स्थान ओपनस्ट्रीटमॅप नॉमिनॅटिम मार्फत + types: + cities: शहरे + places: ठिकाणे + towns: गावे + direction: + east: पूर्व + north: उत्तर + north_east: ईशान्य + north_west: वायव्य + south: दक्षिण + south_east: आग्नेय + south_west: नैऋत्य + west: पश्चिम + distance: + one: सुमारे १ कि.मी. + other: सुमारे %{count} कि.मी. + zero: १ कि.मी.हून कमी + results: + more_results: अधिक निकाल + no_results: परिणाम सापडले नाही + search: + title: + ca_postcode: निकाल जिओकोडर.सीए + geonames: निकाल जिओनेम्स + geonames_reverse: निकाल जिओनेम्स + latlon: निकाल अंतर्गत + osm_nominatim: निकाल ओपनस्ट्रीटमॅप नॉमिनॅटिम + osm_nominatim_reverse: निकाल ओपनस्ट्रीटमॅप नॉमिनॅटिम + uk_postcode: निकालNPEMap / FreeThe Postcode + us_postcode: निकाल जिओकोडर.यूएस + search_osm_nominatim: + admin_levels: + level10: उपनगर सिमा + level2: देशसीमा + level4: राज्य सिमा + level5: प्रांत सिमा + level6: प्रांत सिमा + level8: शहर सिमा + level9: खेडे सिमा + prefix: + aerialway: + chair_lift: खुर्ची उद्वाहन + drag_lift: खेच उद्वाहन + station: रज्जुमार्ग स्थानक + aeroway: + aerodrome: विमानतळ + apron: भरणतळ + gate: द्वार + helipad: हेलिपॅड + runway: धावपट्टी + taxiway: विमानखेचमार्ग + terminal: अग्र + amenity: + WLAN: वायफाय पोहोच + airport: विमानतळ + arts_centre: कलाकेंद्र + artwork: कलाकृति + atm: एटीएम + auditorium: श्रोतृगृह + bank: बँक + bar: मद्यगृह + bbq: बार्बेक्यू + bench: बाकडे + bicycle_parking: सायकलतळ + bicycle_rental: भाड्याने सायकल + biergarten: बीअर बगिचा + brothel: वेश्यागृह + bureau_de_change: चलन विनिमय + bus_station: बस स्थानक + cafe: कॅफे + car_rental: भाड्याने कार + car_sharing: कार सहभागिता + car_wash: कार धुण्याची जागा + casino: जुगारगृह + charging_station: प्रभारण स्थानक + cinema: चित्रपटगृह + clinic: चिकित्सालय + club: क्लब + college: महाविद्यालय + community_centre: समाज भवन + courthouse: न्यायमंदिर + crematorium: दहनभूमी + dentist: दंतवैद्य + doctors: डॉक्टर + dormitory: शयनागार + drinking_water: पिण्याचे पाणी + driving_school: चालन-शाळा + embassy: दूतावास + emergency_phone: संकटकालीन दूरध्वनी + fast_food: जलदान्न + ferry_terminal: होडी अग्र + fire_hydrant: अग्नि जलोत्सर्गी + fire_station: अग्निशमन केंद्र + food_court: भोजन आवार + fountain: कारंजे + fuel: इंधन + grave_yard: दफनभूमी + gym: व्यायामशाळा + hall: सभागृह + health_centre: आरोग्य केंद्र + hospital: रुग्णालय + hotel: हॉटेल + hunting_stand: मचाण + ice_cream: आईसक्रिम + kindergarten: बालवाडी + library: ग्रंथालय + market: बाजार + marketplace: बाजार + mountain_rescue: पर्वत सुटकामार्ग + nightclub: रात्री क्लब + nursery: बालवाडी + nursing_home: शुश्रुषागृह + office: कार्यालय + park: उद्यान + parking: वाहनतळ + pharmacy: औषधालय + place_of_worship: पूजास्थान + police: पोलिस + post_box: टपालपेटी + post_office: टपाल कार्यालय + preschool: शिशुशाळा + prison: कारागृह + pub: मद्यपानगृह + public_building: सार्वजनिक इमारत + public_market: सार्वजनिक बाजार + reception_area: स्वागत क्षेत्र + recycling: पुनश्चक्रण केंद्र + restaurant: उपाहारगृह + retirement_home: आरामगृह + sauna: सॉना + school: शाळा + shelter: आश्रयस्थान + shop: दुकान + shopping: खरेदी + shower: तुषारक + social_centre: समाज केंद्र + social_club: समाज क्लब + social_facility: सामाजिक सुविधा + studio: कलागृह + supermarket: सुपरमार्केट + swimming_pool: जलतरण तलाव + taxi: टॅक्सी + telephone: सार्वजनिक दूरध्वनी + theatre: नाट्यगृह + toilets: स्वच्छतागृह + townhall: नगरभवन + university: विद्यापीठ + vending_machine: विक्रययंत्र + veterinary: पशू शल्यक्रिया + village_hall: गाव सभागृह + waste_basket: कचरा टोपली + wifi: वायफाय पोहोच + youth_centre: युवक केंद्र + boundary: + administrative: प्रशासकीय सीमा + census: जनगणना सीमा + national_park: राष्ट्रीय उद्यान + protected_area: संरक्षित क्षेत्र + bridge: + aqueduct: जलसेतू + suspension: टांगलेला पूल + swing: झुलता पूल + viaduct: उंच पूल + "yes": पूल + building: + "yes": इमारत + emergency: + fire_hydrant: अग्नि जलोत्सर्गी + phone: संकटकालीन दूरध्वनी + highway: + bridleway: अश्वमार्ग + bus_guideway: गायडेड बस लेन + bus_stop: बस थांबा + byway: उपमार्ग + construction: निर्माणाधीन महामार्ग + cycleway: सायकल मार्ग + emergency_access_point: आकस्मिक पोहोच बिंदू + footway: पदपथ + ford: पाय-उतार + living_street: निवासी रस्ता + milestone: मैलदगड + minor: किरकोळ रस्ता + motorway: मोटारमार्ग + motorway_junction: मोटारमार्ग जंक्शन + motorway_link: मोटारमार्ग रस्ता + path: पथ + pedestrian: पादचारी मार्ग + platform: ओटा + primary: प्राथमिक रस्ता + primary_link: प्राथमिक रस्ता + proposed: प्रस्तावित रस्ता + raceway: शर्यतमार्ग + residential: निवासी + rest_area: आरामक्षेत्र + road: रस्ता + secondary: माध्यमिक रस्ता + secondary_link: माध्यमिक रस्ता + service: सेवा मार्ग + services: मोटरमार्ग सेवा + speed_camera: गतीनोंद कॅमेरा + steps: पायऱ्या + street_lamp: पथ दिवा + track: वाट + trail: पायवाट + trunk: महामार्ग + trunk_link: महामार्ग + unclassified: अवर्गीकृत रस्ता + unsurfaced: कच्चा रस्ता + historic: + archaeological_site: पुरातत्त्व स्थळ + battlefield: युद्धक्षेत्र + boundary_stone: सिमांकन दगड + building: इमारत + castle: गढी + church: चर्च + citywalls: शहराच्या भिंती + fort: किल्ला + house: घर + icon: संकेतचिन्ह + manor: हवेली + memorial: स्मारक + mine: खाण + monument: स्मारक + museum: वस्तुसंग्रहालय + ruins: भग्नावशेष + tomb: थडगे + tower: मनोरा + wayside_shrine: मार्गालगतचे देवालय + wreck: भग्नावशेष + landuse: + allotments: वाटप + basin: खोरे + cemetery: दफनभूमी + commercial: वाणिज्यिक क्षेत्र + conservation: संधारण + construction: बांधकाम + farm: मळा + farmland: शेतजमीन + farmyard: शेतमैदान + forest: वन + garages: गॅरेजेस + grass: गवत + industrial: औद्योगिक क्षेत्र + landfill: भराव + meadow: कुरण + military: सैनिकी क्षेत्र + mine: खाण + nature_reserve: अभयारण्य + orchard: फळबाग + park: उद्यान + piste: स्की उतार + quarry: खुली खाण + railway: लोहमार्ग + recreation_ground: मैदान + reservoir: जलाशय + reservoir_watershed: जलाशयाचे पाणलोट क्षेत्र + residential: निवासी क्षेत्र + retail: विक्री + road: रस्त्याचे क्षेत्र + village_green: गावहिरवळ + vineyard: द्राक्षमळा + wetland: आर्द्र जमिन + wood: जंगल + leisure: + bird_hide: पक्षी आश्रयस्थान + common: सार्वजनिक जागा + fishing: मासेमारी क्षेत्र + fitness_station: व्यायामस्थानक + garden: बगीचा + golf_course: गोल्फ कोर्स + marina: नौकातळ + nature_reserve: अभयारण्य + park: उद्यान + pitch: पटांगण + playground: क्रीडांगण + recreation_ground: करमणुक मैदान + sauna: सॉना + slipway: सरकमार्ग + sports_centre: क्रीडाकेंद्र + stadium: क्रीडागार + swimming_pool: जलतरण तलाव + track: धाव मार्ग + water_park: जलोद्यान + military: + airfield: लष्करी विमानतळ + barracks: बराकी + bunker: विवर + mountain_pass: + "yes": खिंड + natural: + bay: खाडी + beach: किनारा + cape: भूशिर + cave_entrance: गुंफा प्रवेश + channel: जलमार्ग + cliff: कडा + crater: विवर + dune: धन्व + feature: रचना + fell: वृक्ष तोड + forest: वन + geyser: उष्ण झरा + glacier: हिमनदी + heath: माळरान + hill: टेकडी + island: बेट + land: जमीन + marsh: पाणथळ + moor: जीर्ण जमिन + mud: चिखल + peak: शिखर + point: बिंदू + reef: प्रवाली + ridge: पर्वतरांग + river: नदी + rock: खडक + scree: पायथा दगड + scrub: खुरटी झाडी + shoal: धक्का + spring: झरा + stone: दगड + strait: सामुद्रधुनी + tree: झाड + valley: दरी + volcano: ज्वालामुखी + water: पाणी + wetland: आर्द्र जमिन + wetlands: आर्द्र जमिनी + wood: जंगल + office: + accountant: लेखापाल + architect: वास्तुविशारद + company: कंपनी + employment_agency: सेवायोजन केंद्र + estate_agent: स्थावर अभिकर्ता + government: शासकीय कार्यालय + insurance: विमा कार्यालय + lawyer: वकील + ngo: अशासकीय संस्थेचे कार्यालय + telecommunication: दूरसंचार कार्यालय + travel_agent: प्रवास अभिकरण + "yes": कार्यालय + place: + airport: विमानतळ + city: शहर + country: देश + county: तालुका + farm: मळा + hamlet: वाडी + house: घर + houses: घरे + island: बेट + islet: द्वीपक + isolated_dwelling: विलग रहिवास + locality: मोहल्ला + moor: जीर्ण जमिन + municipality: नगरपालिका + neighbourhood: परिसर + postcode: पोस्टसंकेत + region: प्रांत + sea: समुद्र + state: राज्य + subdivision: उपविभाग + suburb: उपनगर + town: गाव + unincorporated_area: असमाविष्ट क्षेत्र + village: खेडे + railway: + abandoned: त्यक्त लोहमार्ग + construction: निर्माणाधीन लोहमार्ग + disused: अनुपयोगीत रेल्वे + disused_station: अनुपयोगीत रेल्वे स्थानक + funicular: रज्जुलोहमार्ग + halt: रेल्वे स्थानक + historic_station: ऐतिहासिक रेल्वे स्थानक + junction: लोहमार्ग संधिस्थान + level_crossing: समतल मार्गपारण + light_rail: हलकी रेल्वे + miniature: लघु रेल + monorail: एकरुळी + narrow_gauge: नॅरो गेज रेल्वे + platform: रेल्वे फलाट + preserved: संरक्षित लोहमार्ग + proposed: प्रस्तावित लोहमार्ग + spur: लोहमार्ग फाटा + station: रेल्वे स्थानक + stop: रेल्वे थांबा + subway: मेट्रो स्थानक + subway_entrance: भूयारी स्थानक प्रवेश + switch: रेल्वे बिंदू + tram: ट्राममार्ग + tram_stop: ट्राम स्थानक + yard: रेल्वे आवार + shop: + alcohol: परवानाबाह्य + antiques: पुरावस्तु + art: कला दुकान + bakery: बेकरी + beauty: प्रसाधन दुकान + beverages: पेय दुकान + bicycle: सायकल दुकान + books: पुस्तकालय + boutique: बुटिक + butcher: खाटीक + car: कार दुकान + car_parts: कार सुटेभाग + car_repair: कार दुरुस्ती + carpet: गालिचाचे दुकान + charity: धर्मदाय दुकान + chemist: औषधविक्रेता + clothes: कपडा दुकान + computer: संगणक दुकान + confectionery: मिठाई दुकान + convenience: सोईस्कर माल दुकान + copyshop: वही दुकान + cosmetics: सौंदर्यप्रसाधनांचे दुकान + department_store: एकछत्री भांडार + discount: सवलतवस्तू दुकान + doityourself: स्वतः करा + dry_cleaning: ड्रायक्लिनींग + electronics: ईलेक्ट्रॉनिक्स दुकान + estate_agent: स्थावर अभिकर्ता + farm: शेत दुकान + fashion: फॅशन दुकान + fish: मत्स्य दुकान + florist: फुलविक्रेता + food: भोजन दुकान + funeral_directors: मयत निर्देशक + furniture: उपस्कर + gallery: दिर्घिका + garden_centre: बगिचा केंद्र + general: फुटकळ दुकान + gift: भेटवस्तु दुकान + greengrocer: भाजीविक्रेता + grocery: किराणा दुकान + hairdresser: केशकर्तनालय + hardware: हार्डवेअर भांडार + insurance: विमा + jewelry: आभूषण दुकान + kiosk: टपरी + laundry: धुलाई केंद्र + mall: मॉल + market: बाजार + mobile_phone: भ्रमणध्वनी दुकान + motorcycle: मोटरसायकल दुकान + music: संगीत दुकान + newsagent: बातमी अभिकर्ता + optician: चश्मेवाला + organic: सेंद्रिय अन्नदुकान + outdoor: खुले दुकान + pet: पाळीवप्राणी दुकान + pharmacy: औषधालय + photo: फोटो दुकान + salon: केशकर्तनालय + second_hand: वापरलेल्या वस्तूंचे दुकान + shoes: जोडे दुकान + shopping_centre: खरेदी केंद्र + sports: क्रिडा दुकान + stationery: लेखनसामग्री दुकान + supermarket: सुपरमार्केट + tailor: शिंपी + toys: खेळणी दुकान + travel_agency: प्रवास अभिकरण + video: व्हीडियो दुकान + wine: परवानाबाह्य + "yes": दुकान + tourism: + alpine_hut: पर्वतीय झोपडी + artwork: कलाकृति + attraction: आकर्षण + bed_and_breakfast: निद्रा व अल्पाहार + cabin: चौकी + camp_site: पडाव स्थळ + caravan_site: काफिला स्थळ + guest_house: अतिथिभवन + hostel: वसतीगृह + hotel: हॉटेल + information: माहिती + motel: मोटेल + museum: वस्तुसंग्रहालय + picnic_site: सहल स्थान + theme_park: सूत्र उद्यान + valley: दरी + viewpoint: देखावाबिंदू + zoo: प्राणीसंग्रहालय + tunnel: + culvert: छोटा पूल + "yes": बोगदा + waterway: + artificial: कृत्रिम जलमार्ग + boatyard: नौकाबांधणी + canal: कालवा + connector: जलमार्ग अनुबंधक + dam: धरण + derelict_canal: त्यक्त कालवा + ditch: चर + dock: गोदी + drain: जलनिष्कास + lock: जलपाश + lock_gate: जलपाशद्वार + mineral_spring: खनिज झरा + mooring: नौबंध + rapids: जलदधारा + river: नदी + riverbank: नदीकाठ + stream: प्रवाह + wadi: मरुघळ + water_point: जल केंद्र + waterfall: धबधबा + weir: बंधारा + help_page: + help: + description: OSMच्या प्रश्नोत्तरासाठीच्या संकेतस्थळावर प्रश्न विचारा किंवा उत्तरे शोधा. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + title: साहाय्य मिळविणे + welcome: + title: ओएसएम वर स्वागत आहे + url: /welcome + wiki: + description: सखोल OSM प्रलेखनासाठी विकी वाचा. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ + javascripts: + close: बंद करा + map: + base: + cycle_map: सायकल नकाशा + transport_map: परिवहन नकाशा + copyright: © OpenStreetMap योगदानकर्ते + donate_link_text: + layers: + data: नकाशावरील माहिती + header: नकाशाचे स्तर + notes: नकाशावरील टीपा + title: स्तर + locate: + popup: आपण या बिंदूपासून {distance}{unit}च्या परिघात आहात + title: माझे ठिकाण दाखवा + notes: + new: + add: टीप जोडा + show: + resolve: निराकरण करा + share: + cancel: रद्द करा + custom_dimensions: पारंपारीक मोजमाप स्थापा + download: अधिभारण करा + embed: HTML + image: चित्र + link: दुवा किंवा HTML + long_link: दुवा + scale: "प्रमाण:" + short_link: लघुदुवा + short_url: लघु-URL + title: सहभाग करा + view_larger_map: मोठा नकाशा पहा + site: + createnote_tooltip: नकाशावर टीप जोडा + edit_tooltip: नकाशा संपादा + layouts: + about: आमच्याबद्दल + community: समुदाय + community_blogs: अनुदिनी + community_blogs_title: ओपनस्ट्रीटमॅप समुदायाच्या सदस्यांच्या अनुदिनी + copyright: प्रताधिकार + data: माहिती + donate: हार्डवेअर अपग्रेड फंडमध्ये योगदानाने%{link} ओपनस्ट्रीटमॅपला साहाय्य करा. + edit: संपादन करा + edit_with: "%{editor} वापरून संपादन करा" + export: निर्यात + export_data: माहिती निर्यात + foundation: प्रतिष्ठान + foundation_title: ओपनस्ट्रीटमॅप फाउंडेशन + gps_traces: GPS अनुरेख + help: साहाय्य + history: इतिहास + home: स्वगृह स्थानावर जा + intro_2_create_account: सदस्यखाते तयार करा + intro_header: ओपनस्ट्रीटमॅपवर स्वागत आहे! + intro_text: ओपनस्ट्रीटमॅप हा जगाचा नकाशा आहे, जो आपल्यासारख्या लोकांनी तयार केला आहे, व जो खुल्या परवान्यांतर्गत वापरास मुक्त आहे. + learn_more: अधिक जाणून घ्या + log_in: सनोंद-प्रवेश + log_in_tooltip: वर्तमान खात्याने सनोंद-प्रवेश करा + logo: + alt_text: ओपनस्ट्रीटमॅप संकेतचित्र + logout: सनोंद-निर्गम + make_a_donation: + text: देणगी द्या + title: आर्थिक देणगी देऊन करुन ओपनस्ट्रीटमॅपला साहाय्य करा. + more: अधिक + osm_offline: डाटाबेसचे आवश्यक देखरेखीचे काम असल्यामुळे ओपनस्ट्रीटमॅप डाटाबेस ही जालावेगळी करण्यात आलेली आहे. + osm_read_only: डाटाबेसचे आवश्यक देखरेखीचे काम असल्यामुळे, ओपनस्ट्रीटमॅप डाटाबेस ही सध्या फक्त वाचू शकता येणार आहे. + partners_bytemark: बाईटमार्क होस्टिंग + partners_ic: इम्पिरियल कॉलेज लंडन + partners_partners: भागीदार + partners_ucl: UCL VR सेंटर + sign_up: नोंदणी करा + sign_up_tooltip: संपादनासाठी खाते उघडा + start_mapping: नकाशा आरेखन सुरु करा + tag_line: मुक्त विकि जागतिक नकाशा + user_diaries: सदस्य अनुदिनी + user_diaries_tooltip: सदस्य अनुदिनी पहा + license_page: + foreign: + english_link: मूळ इंग्लिश + text: या भाषांतरीत पानाच्या व %{english_original_link} यादरम्यान काही वादाचा प्रसंग उद्भवल्यास, मूळ इंग्लिश पानास प्राथमिकता राहील. + title: ह्या भाषांतराबद्दल + legal_babble: + contributors_intro_html: "आमचे योगदानकर्ते हे हजारोंच्या संख्येतील व्यक्ति आहेत.आम्ही मुक्त परवान्यांतर्गत असलेला डाटा हा राष्ट्रीय नकाशा संस्थेंकडून व त्यातील इतर स्रोतांतून घेऊन त्याचा अंतर्भाव करतो:" + contributors_title_html: आमचे योगदाते + credit_title_html: ओपनस्ट्रीटमॅपला श्रेय कसे द्यावे + infringement_title_html: प्रताधिकार भंग + title_html: प्रताधिकार व परवाना + native: + mapping_link: नकाशा आरेखन + native_link: मराठी आवृत्ती + text: आपण प्रताधिकार पानाची इंग्रजी आवृत्ती पाहत आहात. आपण ह्या पानाच्या %{native_link}कडे परत जाऊ शकता, किंवा प्रताधिकाराबद्दल वाचणे थांबवून %{mapping_link} सुरु करू शकता. + title: या पानाबद्दल + message: + delete: + deleted: संदेश वगळला + inbox: + date: दिनांक + from: प्रेषक + messages: आपल्यासाठी %{new_messages} आणि %{old_messages} आहेत + my_inbox: माझी अंतर्पेटी + new_messages: + one: "%{count} नवा संदेश" + other: "%{count} नवे संदेश" + no_messages_yet: आपल्यासाठी अद्याप संदेश नाहीत. %{people_mapping_nearby_link} संपर्क साधावा काय? + old_messages: + one: "%{count} जुना संदेश" + other: "%{count} जुने संदेश" + outbox: बाह्यपेटी + people_mapping_nearby: जवळपासच्या इतर नकाशाकारांशी + subject: विषय + title: अंतर्पेटी + mark: + as_read: संदेश वाचला आहे अशी खूण केली + as_unread: संदेश वाचला नाही अशी खूण केली + message_summary: + delete_button: वगळा + read_button: वाचले अशी खूण करा + reply_button: उत्तर + unread_button: न वाचलेले अशी खूण करा + new: + back_to_inbox: अंतर्पेटीकडे परत + body: मायना + limit_exceeded: आपण नुकतेच अनेक संदेश पाठविले, अधिक पाठविण्यापूर्वी अंमळ थांबा. + message_sent: संदेश पाठविला + send_button: पाठवा + send_message_to: "%{name}ला नवीन संदेश पाठवा" + subject: विषय + title: संदेश पाठवा + no_such_message: + body: त्या ओळखणीचा कोणताही संदेश नाही + heading: असा कोणताही संदेश नाही + title: असा कोणताही संदेश नाही + outbox: + date: दिनांक + inbox: अंतर्पेटी + messages: + one: आपण पाठविलेला %{count} संदेश + other: आपण पाठविलेले %{count} संदेश + no_sent_messages: आपण अद्याप कुठलेही संदेश पाठविलेले नाहीत. %{people_mapping_nearby_link} संपर्क साधावा काय? + outbox: बाह्यपेटी + people_mapping_nearby: जवळपासच्या इतर नकाशाकारांशी + subject: विषय + title: बाह्यपेटी + to: प्रति + read: + back: परत जा + date: दिनांक + from: प्रेषक + reply_button: उत्तर + subject: विषय + title: संदेश वाचा + to: प्रति + unread_button: न वाचलेले अशी खूण करा + wrong_user: आपण '%{user}' म्हणून दाखल झालेले आहात, पण आपण जो संदेश वाचू इच्छिता, तो संदेश वेगळ्या सदस्यास पाठविण्यात आला आहे. कृपया संदेश वाचण्यासाठी बरोबर सदस्य म्हणून दाखल व्हा. + reply: + wrong_user: आपण '%{user}' म्हणून दाखल झालेले आहात, पण आपण ज्या संदेशास उत्तर देऊ इच्छिता, तो संदेश वेगळ्या सदस्यास पाठविण्यात आला आहे. कृपया उत्तर देण्यासाठी बरोबर सदस्य म्हणून दाखल व्हा. + sent_message_summary: + delete_button: वगळा + note: + mine: + ago_html: "%{when} पूर्वी" + notifier: + diary_comment_notification: + subject: "[OpenStreetMap] %{user}ने आपल्या अनुदिनीतील नोंदीवर अभिप्राय दिला" + gpx_notification: + with_description: च्या वर्णनासह + message_notification: + footer_html: आपण %{readurl} येथेही संदेश वाचू शकता, आणि %{replyurl} येथे उत्तर देऊ शकता + header: "%{from_user}ने ओपनस्ट्रीटमॅपद्वारे आपल्याला %{subject} अशा विषयाचा संदेश पाठविला" + note_comment_notification: + details: "%{url} येथे टीपेबद्दल अधिक तपशील मिळू शकेल." + signup_confirm: + welcome: आपण खातेनिश्चिती केल्यावर,सुरुवात करण्यास आम्ही आपणास अधिकची माहिती देउ + oauth_clients: + edit: + submit: संपादन + title: अनुप्रयोग संपादा + form: + name: नाव + requests: "सदस्याकडून खालील परवानग्यांची मागणी करा:" + required: आवश्यक + url: मुख्य अनुप्रयोग URL + index: + register_new: आपल्या अनुप्रयोगाची नोंदणी करा + title: माझे OAuth तपशील + new: + submit: नोंदणी करा + title: नवीन अनुप्रयोगाची नोंदणी करा + show: + access_url: "प्रवेश बिल्ला URL:" + confirm: नक्की आहात? + edit: तपशील संपादा + key: "उपभोक्ता किल्ली:" + secret: "उपभोक्ता गुपित:" + title: "%{app_name}साठी OAuth तपशील" + url: "विनंती बिल्ला URL:" + redaction: + new: + description: वर्णन + show: + confirm: नक्की आहात? + description: "वर्णन:" + user: "निर्माता:" + update: + flash: बदल जतन केले. + site: + edit: + anon_edits_link_text: असे का आहे ते जाणून घ्या. + not_public: आपण आपली संपादने सार्वजनिक ठेवलेली नाहित. + not_public_description: नकाशा संपादण्यासाठी संपादने सार्वजनिक असणे आवश्यक आहे. आपण आपल्या %{user_page}वरून ती सार्वजनिक ठेवू शकता. + user_page_link: सदस्य पाना + index: + createnote: टीप जोडा + js_1: आपण जावास्क्रीप्ट चालवू न शकणारा न्याहाळक वापरत आहात, किंवा जावास्क्रीप्ट निष्क्रिय आहे. + js_2: ओपनस्ट्रीटमॅप सरकत्या नकाशासाठी जावास्क्रीप्टचा वापर करते. + license: + copyright: प्रताधिकार ओपनस्ट्रीटमॅप आणि योगदाते, खुल्या परवान्यांतर्गत + permalink: शाश्वत दुवा + shortlink: लघुदुवा + key: + table: + entry: + admin: प्रशासकीय सीमा + allotments: वाटप + apron: + - विमानतळावरील भरणतळ + - अग्र + bridge: काळी कड = पूल + bridleway: अश्वमार्ग + building: महत्वपूर्ण इमारत + cable: + - रज्जुमार्ग + - खुर्ची उद्वाहन + cemetery: दफनभूमी + centre: क्रीडाकेंद्र + commercial: वाणिज्यिक क्षेत्र + common: + - सार्वजनिक जमीन + - कुरण + construction: निर्माणाधीन रस्ते + cycleway: सायकल मार्ग + destination: केवळ गंतव्यासाठी प्रवेश + farm: मळा + footway: पदपथ + forest: वन + golf: गोल्फ कोर्स + industrial: औद्योगिक क्षेत्र + lake: + - तलाव + - जलाशय + military: लष्करी क्षेत्र + motorway: द्रुतगतीमार्ग + park: उद्यान + permissive: परवानगीने प्रवेश + pitch: खेळमैदान + primary: प्राथमिक रस्ता + private: खाजगी प्रवेश + rail: लोहमार्ग + reserve: अभयारण्य + resident: निवासी क्षेत्र + retail: विक्री क्षेत्र + runway: + - विमानतळ धावपट्टी + - खेचमार्ग + school: + - शाळा + - विद्यापीठ + station: रेल्वे स्थानक + subway: मेट्रो + summit: + - शिखर + - शिखर + tourist: पर्यटन आकर्षण + track: वाट + tram: + - हलकी रेल्वे + - ट्राम + trunk: महामार्ग + tunnel: तुटक कड = बोगदा + unclassified: अवर्गीकृत रस्ता + unsurfaced: कच्चा रस्ता + wood: जंगल + markdown_help: + first: पहिली बाब + heading: मथळा + headings: मथळे + image: चित्र + link: दुवा + ordered: क्रमित यादी + second: दुसरी बाब + subheading: उपमथळा + text: मजकूर + unordered: अक्रमित यादी + url: URL + richtext_area: + edit: संपादन करा + preview: झलक + search: + search: शोधा + submit_text: जा + where_am_i: मी कुठे आहे? + sidebar: + close: बंद करा + search_results: शोध निकाल + time: + formats: + friendly: "%e %B %Y, %H:%M ला" + trace: + create: + upload_trace: GPS अनुरेख चढवा + edit: + description: "वर्णन:" + download: उतरवा + edit: संपादन + filename: "संचिकानाम:" + heading: अनुरेख %{name} संपादन + map: नकाशा + owner: "मालक:" + points: "बिंदू:" + save_button: जतन करा + tags: "खूणपताका:" + tags_help: स्वल्पविरामाने परिसीमित + title: अनुरेख %{name} संपादन + uploaded_at: "चढविले:" + visibility: "दृश्यता:" + visibility_help: ह्याचा अर्थ काय? + trace: + ago: "%{time_in_words_ago} पूर्वी" + count_points: "%{count} बिंदू" + edit: संपादन + edit_map: नकाशा संपादा + more: अधिक + pending: प्रलंबित + trace_details: अनुरेखाचा तपशील पहा + view_map: नकाशा पहा + trace_form: + description: "वर्णन:" + help: साहाय्य + tags: "खूणपताका:" + tags_help: स्वल्पविरामाने परिसीमित + upload_button: चढवा + visibility: "दृश्यता:" + visibility_help: ह्याचा अर्थ काय? + trace_header: + see_all_traces: सर्व अनुरेख पहा + see_your_traces: स्वतःचे अनुरेख पहा + upload_trace: अनुरेख चढवा + trace_optionals: + tags: खूणपताका + trace_paging_nav: + newer: नवे अनुरेख + older: जुने अनुरेख + showing_page: पान %{page} + view: + delete_track: हा अनुरेख वगळा + description: "वर्णन:" + download: अधिभारण करा + edit: संपादन + edit_track: हा अनुरेख संपादा + filename: "संचिकानाम:" + map: नकाशा + none: काहीही नाही + owner: "मालक:" + pending: प्रलंबित + points: "बिंदू:" + tags: "खूणपताका:" + trace_not_found: अनुरेख आढळला नाही! + uploaded: "अपभारण केले:" + user: + account: + contributor terms: + link text: हे काय आहे? + delete image: वर्तमान चित्र काढून टाका + gravatar: + gravatar: Gravatar वापरा + link text: हे काय आहे? + image: "चित्र:" + image size hint: (किमान १००x१०० आकाराची चौरस चित्रे उत्तम) + keep image: वर्तमान चित्र राखा + latitude: "अक्षांश:" + longitude: "रेखांश:" + my settings: माझ्या मांडण्या + new image: चित्र जोडा + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: हे काय आहे? + openid: "OpenID:" + preferred editor: "पसंतीचा संपादक:" + preferred languages: "पसंतीच्या भाषा:" + public editing: + disabled link text: मी संपादन कां करू शकत नाही? + enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link text: हे काय आहे? + replace image: वर्तमान चित्र बदला + save changes button: बदल जतन करा + title: खाते संपादा + confirm: + already active: ह्या खात्याची आधीच निश्चिती झाली आहे. + button: खात्री करा + heading: आपले विपत्र तपासा! + introduction_1: आम्ही आपणास निश्चितीकरणास विपत्र पाठविले आहे. + introduction_2: विपत्रातील दुव्यावर टिचकी मारुन आपली खातेनिश्चिती करा व आपण नकाशा काढणे सुरु करु शकता. + reconfirm_html: जर आपणास आम्ही पुन्हा विपत्र पाठविणे आवश्यक वाटते, तरयेथे टिचकी मारा. + unknown token: तो निश्चिती संकेत कालबाह्य झाला आहे किंवा अस्तित्वात नाही. + confirm_resend: + failure: सदस्य %{name} सापडला नाही. + list: + heading: सदस्य + showing: + one: पान %{page} (%{first_item}, %{items} पैकी) + other: पान %{page} (%{first_item}-%{last_item}, %{items}पैकी) + title: सदस्य + login: + create account minute: खाते उघडा. केवळ एका मिनिटाचे काम आहे. + new to osm: ओपनस्ट्रीटमॅपवर नवीन? + no account: आपले खाते नाही? + register now: आत्ता नोंदणी करा + lost_password: + heading: परवलीचा शब्द विसरला? + new password button: परवलीचा शब्द पुनर्स्थापित करा + new: + about: + header: मुक्त व संपादण्याजोगा + confirm password: "परवलीच्या शब्दाची निश्चिती करा:" + continue: नोंदणी करा + password: "परवलीचा शब्द:" + terms declined: आपण नवीन योगदात्यांसाठी अटी मान्य न करण्याचे निवडल्याचा आम्हाला खेद आहे. अधिक माहितीसाठी कृपया हे विकीपान पहा. + title: नोंदणी करा + no_such_user: + body: क्षमा असावी, %{user} नामक सदस्य अस्तित्वात नाही. कृपया आपले वर्णलेखन तपासा, किंवा कदाचित आपण चुकीच्या दुव्यावर टिचकी दिली असेल. + heading: सदस्य %{user} अस्तित्वात नाही + title: असा सदस्य अस्तित्वात नाही + popup: + friend: मित्र + nearby mapper: जवळपासचे नकाशाकार + your location: आपले ठिकाण + reset_password: + confirm password: "परवलीचा शब्द पुन्हा लिहा:" + flash changed: आपला परवलीचा शब्द बदलण्यात आला आहे. + heading: "%{user}साठी परवलीचा शब्द पुनर्स्थापित करा" + password: "परवलीचा शब्द:" + reset: परवलीचा शब्द पुनर्स्थापित करा + title: परवलीचा शब्द पुनर्स्थापित करा + terms: + agree: मान्य + consider_pd_why: हे काय आहे? + decline: अमान्य + heading: योगदात्यांसाठी अटी + legale_names: + france: फ्रान्स + italy: इटली + rest_of_world: उर्वरित जग + legale_select: "राहण्याचा देश:" + title: योगदात्यांसाठी अटी + view: + ago: (%{time_in_words_ago} पूर्वी) + blocks by me: माझ्याकडून निर्बंध + blocks on me: माझ्यावरील निर्बंध + ct accepted: "%{ago} पूर्वी मान्य" + ct declined: अमान्य + ct status: "योगदात्यांसाठी अटी:" + ct undecided: अनिर्णीत + description: वर्णन + diary: अनुदिनी + edits: संपादने + friends_changesets: मित्रांचे बदलसंच + friends_diaries: मित्रांच्या अनुदिनीतील नोंदी + km away: "%{count} कि.मी. दूर" + latest edit: "नवीनतम संपादन %{ago}:" + m away: "%{count} मी. दूर" + my comments: माझे अभिप्राय + my diary: माझी अनुदिनी + my edits: माझी संपादने + my messages: माझे संदेश + my notes: माझ्या टीपा + my settings: माझ्या मांडण्या + my traces: माझे अनुरेख + nearby users: जवळपासचे इतर सदस्य + nearby_changesets: जवळपासच्या सदस्यांचे बदलसंच + nearby_diaries: जवळपासच्या सदस्यांच्या अनुदिनीतील नोंदी + new diary entry: अनुदिनीत नवी नोंद + notes: नकाशावरील टीपा + oauth settings: oauth प्रस्थापने + send message: संदेश पाठवा + settings_link_text: मांडण्या + status: "स्थिती:" + traces: अनुरेख + your friends: आपले मित्र + user_block: + partial: + confirm: नक्की आहात? + next: पुढील » + previous: « मागील + showing_page: पान %{page} + period: + one: १ तास + other: "%{count} तास" + welcome_page: + add_a_note: + paragraph_1_html: "जर आपणास काही छोटेसेच ठिक करुन हवे आहे व आपल्यापाशी प्रवेशाचा व संपादन शिकण्यास वेळ नाही\n\nतर एक टिप्पणी जोडणे सोपे आहे." + title: संपादन करण्यास वेळ नाही?टिप्पणी जोडा! + basic_terms: + editor_html: संपादक हा एक संगणक अनुप्रयोग किंवा संकेतस्थळ आहे, जे वापरून आपण नकाशाचे संपादन करू शकता. + node_html: गाठ म्हणजे नकाशावरील एक बिंदू, जसे की एक उपाहारगृह किंवा एक झाड. + paragraph_1_html: ओपनस्ट्रीटमॅपची स्वतःची एक बोली आहे. हे काही प्रमुख शब्द आहेत जे कामी येतील. + title: नकाशा आरेखनासाठीच्या मूलभूत संज्ञा + way_html: मार्ग म्हणजे एखादी रेष किंवा एखादे क्षेत्र, जसे की रस्ता, प्रवाह, तलाव किंवा इमारत. + questions: + title: काही प्रश्न? + start_mapping: नकाशा आरेखन सुरु करा + title: सुस्वागतम्‌! + whats_on_the_map: + title: नकाशावर काय आहे diff --git a/config/locales/ms.yml b/config/locales/ms.yml index bd342b20d56..6fbd04028a2 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -2,7 +2,20 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Anakmalaysia +# Author: Nemo bis ms: + about_page: + community_driven_html: "Komuniti OpenStreetMap pelbagai latar belakang, ghairah, dan makin hari makin berkembang. Antara para penyumbang kami termasuklah pemeta yang sekadar penggemar, profesional GIS, jurutera yang mengelola pelayan OSM, pegawai kemanusiaan yang memetakan kawasan terjejas bencana,\ndan ramai lagi.\nUntuk mengetahui lebih lanjut tentang komuniti ini, rujuk diari pengguna,\nblog komuniti, dan laman web\nthe OSM Foundation." + community_driven_title: Didorong oleh Komuniti + copyright_html: ©para penyumbang
    OpenStreetMap + lede_text: OpenStreetMap dibina oleh sekumpulan pemeta yang menyumbangkan dan menyelenggarakan data tentang jalan raya, denai, kedai kopi, stesen keretapi, dan banyak lagi di seluruh dunia. + local_knowledge_html: OpenStreetMap menekankan pengetahuan tempatan. Para penyumbang menggunakan imejan udara, peranti GPS, dan peta lapangan berteknologi rendah untuk mengesahkan bahawa OSM adalah tepat dan mutakhir. + local_knowledge_title: Pengetahuan Tempatan + next: Berikutnya + open_data_html: "OpenStreetMap adalah data terbuka: anda bebas menggunakannya untuk sebarang tujuan asalkan anda memberikan penghargaan kepada OpenStreetMap dan para penyumbangnya. Jika anda mengubah suai atau menokok tambah datanya\ndalam cara-cara tertentu, anda boleh mengedarkan hasilnya di bawah lesen yang sama sahaja. Rujuk halaman Hak Cipta dan Lesen untuk keterangan lanjut." + open_data_title: Data Terbuka + partners_title: Rakan Kongsi + used_by: "%{name} menjana data peta pada ratusan laman web, aplikasi mudah alih dan peranti perkakasan" activerecord: attributes: diary_comment: @@ -11,7 +24,7 @@ ms: language: Bahasa latitude: Garis Lintang longitude: Garis Bujur - title: Tajuk + title: Subjek user: Pengguna friend: friend: Rakan @@ -20,7 +33,7 @@ ms: body: Isi recipient: Penerima sender: Pengirim - title: Tajuk + title: Subjek trace: description: Keterangan latitude: Garis Lintang @@ -80,90 +93,62 @@ ms: blocked: Akses anda kepada API telah disekat. Sila log masuk ke dalam antaramuka web untuk mengetahui lebih lanjut. need_to_see_terms: Akses anda kepada API digantung buat sementara waktu. Sila log masuk ke dalam antaramuka web untuk melihat Terma-Terma Penyumbang. Anda tidak semestinya harus bersetuju, tetapi mesti membacanya. browse: + anonymous: awanama changeset: - changeset: "Set Ubah: %{id}" + belongs_to: Pengarang changesetxml: XML Set Ubah - download: Muat turun %{changeset_xml_link} atau %{osmchange_xml_link} feed: title: Set Ubah %{id} title_comment: Set Ubah %{id} - %{comment} + node: Nod (%{count}) + node_paginated: Nod (%{x}-%{y} / %{count}) osmchangexml: XML osmChange - title: Set Ubah - changeset_details: - belongs_to: "Milik:" - bounding_box: "Petak pembatasan:" - box: petak - closed_at: "Ditutup pada:" - created_at: "Dibuat pada:" - has_nodes: "Mempunyai %{count} nodus yang berikut:" - has_relations: "Mempunyai %{count} hubungan yang berikut:" - has_ways: "Mempunyai %{count} jalan yang berikut:" - no_bounding_box: Tiada petak pembatasan telah ditetapkan untuk set ubah ini. - show_area_box: Tunjukkan Petak Kawasan - common_details: - changeset_comment: Komen - deleted_at: "Dihapuskan pada:" - deleted_by: "Dihapuskan oleh:" - edited_at: "Disunting pada:" - edited_by: "Disunting oleh:" - in_changeset: "Dalam set ubah:" - version: "Versi:" + relation: Hubungan (%{count}) + relation_paginated: Hubungan (%{x}-%{y} / %{count}) + title: "Set Ubah: %{id}" + way: Jalan (%{count}) + way_paginated: Jalan (%{x}-%{y} / %{count}) + closed: Ditutup + closed_by_html: Ditutup %{time} lalu oleh %{user} + closed_html: Ditutup %{time} lalu containing_relation: entry: Hubungan %{relation_name} entry_role: Hubungan %{relation_name} (sebagai %{relation_role}) - map: - deleted: Dihapuskan - edit: - area: Sunting kawasan - node: Sunting nod - relation: Sunting hubungan - way: Sunting jalan - larger: - area: Lihat kawasan pada peta yang lebih besar - node: Lihat nod pada peta yang lebih besar - relation: Lihat hubungan pada peta yang lebih besar - way: Lihat jalan pada peta yang lebih besar - loading: Memuatkan... - navigation: - all: - next_changeset_tooltip: Set ubah berikutnya - next_node_tooltip: Nod berikutnya - next_relation_tooltip: Hubungan berikutnya - next_way_tooltip: Jalan berikutnya - prev_changeset_tooltip: Set ubah sebelumnya - prev_node_tooltip: Nod sebelumnya - prev_relation_tooltip: Hubungan sebelumnya - prev_way_tooltip: Jalan sebelumnya - user: - name_changeset_tooltip: Lihat suntingan oleh %{user} - next_changeset_tooltip: Suntingan berikutnya oleh %{user} - prev_changeset_tooltip: Suntingan sebelumnya oleh %{user} + created: Dicipta + created_by_html: Dicipta %{time} lalu oleh %{user} + created_html: Dicipta %{time} lalu + deleted_by_html: Dihapuskan %{time} lalu oleh %{user} + download_xml: Muat Turun XML + edited_by_html: Disunting %{time} lalu oleh %{user} + in_changeset: Set Ubah + location: "Lokasi:" + no_comment: (tiada komen) node: - download: "%{download_xml_link}, %{view_history_link} atau %{edit_link}" - download_xml: Muat Turun XML - edit: sunting - node: Nod - node_title: "Nod: %{node_name}" - view_history: lihat sejarah - node_details: - coordinates: "Koordinat:" - part_of: "Sebahagian:" - node_history: - download: "%{download_xml_link} atau %{view_details_link}" - download_xml: Muat Turun XML - node_history: Sejarah Nod - node_history_title: "Sejarah Nod: %{node_name}" - view_details: lihat butiran + history_title: "Sejarah Nod: %{name}" + title: "Nod: %{name}" not_found: - sorry: Maaf, %{type} dengan id %{id} tidak dapat dijumpai. + sorry: "Maaf, %{type} #%{id} tidak dapat dijumpai." type: changeset: set ubah node: nod relation: hubungan way: jalan - paging_nav: - of: daripada - showing_page: Memaparkan laman + note: + closed_by: Diselesaikan oleh %{user} %{when} lalu + closed_by_anonymous: Diselesaikan oleh pengguna awanama %{when} lalu + closed_title: "Nota yang telah diselesaikan: #%{note_name}" + commented_by: Komen oleh %{user} %{when} lalu + commented_by_anonymous: Komen oleh pengguna awanama %{when} lalu + hidden_by: Disembunyikan oleh %{user} %{when} lalu + hidden_title: "Nota tersembunyi #%{note_name}" + new_note: Nota Baru + open_by: Dicipta oleh %{user} %{when} lalu + open_by_anonymous: Dicipta oleh pengguna awanama %{when} lalu + open_title: "Nota yang belum diselesaikan: #%{note_name}" + reopened_by: Diaktifkan semula oleh %{user} %{when} lalu + reopened_by_anonymous: Diaktifkan semula oleh pengguna awanama %{when} lalu + title: "Nota: %{id}" + part_of: Sebahagian daripada redacted: message_html: Versi %{version} %{type} ini tidak boleh ditunjukkan kerana ia telah diredaksi. Sila lihat %{redaction_link} untuk perincian. redaction: Redaksi %{id} @@ -172,65 +157,21 @@ ms: relation: hubungan way: jalan relation: - download: "%{download_xml_link} atau %{view_history_link}" - download_xml: Muat Turun XML - relation: Hubungan - relation_title: "Hubungan: %{relation_name}" - view_history: lihat sejarah - relation_details: - members: "Anggota:" - part_of: "Sebahagian:" - relation_history: - download: "%{download_xml_link} atau %{view_details_link}" - download_xml: Muat Turun XML - relation_history: Sejarah Hubungan - relation_history_title: "Sejarah Hubungan: %{relation_name}" - view_details: lihat butiran + history_title: "Sejarah Hubungan: %{name}" + members: Ahli-ahli + title: "Hubungan: %{name}" relation_member: entry_role: "%{type} %{name} sebagai %{role}" type: node: Nod relation: Hubungan way: Jalan - start: - manually_select: Pilih kawasan yang lain secara insani - view_data: Lihat data untuk paparan peta semasa start_rjs: - data_frame_title: Data - data_layer_name: Telusuri Data Peta - details: Butiran - drag_a_box: Seretkan petak di atas peta untuk memilih kawasan - edited_by_user_at_timestamp: Disunting oleh [[user]] pada [[timestamp]] - hide_areas: Sorokkan kawasan - history_for_feature: Sejarah [[feature]] + feature_warning: Sedang memuatkan %{num_features} ciri yang mungkin menjadikan pelayar anda perlahan atau sukar merespon. Adakah anda pasti mahu memaparkan data ini? load_data: Muatkan Data - loaded_an_area_with_num_features: Anda telah memilih satu kawasan yang mengandungi [[num_features]] ciri. Pada umumnya, sesetengah pelayar web tidak mungkin mampu memaparkan sebegini banyak data dengan betul. Lazimnya, pelayar paling berkemampuan apabila memaparkan kurang daripada 100 ciri sekaligus; lebih daripada itu mungkin akan melambatkan pelayar anda atau membuatnya tidak responsif. Jika anda betul-betul ingin memaparkan data ini, anda boleh berbuat demikian dengan mengklik butang di bawah. loading: Memuatkan... - manually_select: Pilih kawasan yang lain secara insani - object_list: - api: Ambil kawasan in dari API - back: Paparkan senarai objek - details: Butiran - heading: Senarai objek - history: - type: - node: Nod [[id]] - way: Jalan [[id]] - selected: - type: - node: Nod [[id]] - way: Jalan [[id]] - type: - node: Nod - way: Jalan - private_user: pengguna persendirian - show_areas: Tunjukkan kawasan - show_history: Tunjukkan Sejarah - unable_to_load_size: "Tidak dapat muat: Saiz petak pembatasan [[bbox_size]] terlalu besar (mesti lebih kecil daripada %{max_bbox_size})" - wait: Tunggu... - zoom_or_select: Zum dekat atau pilih satu kawasan pada peta untuk dilihat tag_details: - tags: "Tag:" + tags: Teg wiki_link: key: Laman wiki keterangan tag %{key} tag: Laman wiki keterangan tag %{key}=%{value} @@ -242,38 +183,25 @@ ms: node: nod relation: hubungan way: jalan + version: Versi + view_details: Lihat Butiran + view_history: Lihat Sejarah way: - download: "%{download_xml_link}, %{view_history_link} atau %{edit_link}" - download_xml: Muat Turun XML - edit: sunting - view_history: lihat sejarah - way: Jalan - way_title: "Jalan: %{way_name}" - way_details: also_part_of: - one: juga sebahagian daripada jalan %{related_ways} - other: juga sebahagian daripada jalan-jalan %{related_ways} - nodes: "Nod:" - part_of: "Sebahagian:" - way_history: - download: "%{download_xml_link} atau %{view_details_link}" - download_xml: Muat Turun XML - view_details: lihat butiran - way_history: Sejarah Jalan - way_history_title: "Sejarah Jalan: %{way_name}" + one: sebahagian daripada jalan %{related_ways} + other: sebahagian daripada jalan-jalan %{related_ways} + history_title: "Sejarah Jalan: %{name}" + nodes: Nod + title: "Jalan: %{name}" changeset: changeset: anonymous: Tanpa nama - big_area: (besar) - no_comment: (tiada) no_edits: (tiada suntingan) - show_area_box: tunjukkan petak kawasan - still_editing: (masih dalam penyuntingan) view_changeset_details: Lihat butiran set ubah changeset_paging_nav: next: Berikutnya » previous: "« Sebelumnya" - showing_page: Memaparkan halaman %{page} + showing_page: Page %{page} changesets: area: Kawasan comment: Komen @@ -281,24 +209,17 @@ ms: saved_at: Disimpan pada user: Pengguna list: - description: Perubahan terkini - description_bbox: Set Ubah di dalam %{bbox} - description_friend: Set ubah oleh kawan anda - description_nearby: Set ubah pengguna berdekatan - description_user: Set Ubah oleh %{user} - description_user_bbox: Set Ubah oleh %{user} di dalam %{bbox} - heading: Set Ubah - heading_bbox: Set Ubah - heading_friend: Set Ubah - heading_nearby: Set ubah - heading_user: Set Ubah - heading_user_bbox: Set Ubah + empty: Tiada set ubah ditemui. + empty_area: Tiada set ubah di kawasan ini. + empty_user: Tiada set ubah oleh pengguna ini. + load_more: Muatkan banyak lagi + no_more: Tiada lagi set ubah ditemui. + no_more_area: Tiada lagi set ubah di kawasan ini. + no_more_user: Tiada lagi set ubah oleh pengguna ini. title: Set Ubah - title_bbox: Set Ubah di dalam %{bbox} title_friend: Set ubah oleh kawan anda title_nearby: Set ubah pengguna berdekatan title_user: Set Ubah oleh %{user} - title_user_bbox: Set Ubah oleh %{user} di dalam %{bbox} timeout: sorry: Maaf, senarai set ubah yang anda pohon itu mengambil masa yang terlalu lama untuk diambil. diary_entry: @@ -315,7 +236,9 @@ ms: confirm: Sahkan hide_link: Sorokkan komen ini diary_entry: - comment_count: "%{count} komen" + comment_count: + other: "%{count} komen" + zero: Tiada komen comment_link: Ulas catatan ini confirm: Sahkan edit_link: Sunting catatan ini @@ -350,7 +273,7 @@ ms: newer_entries: Catatan Terkini no_entries: Tiada catatan diari older_entries: Catatan Terdahulu - recent_entries: "Catatan diari terkini:" + recent_entries: Catatan diari terkini title: Diari pengguna title_friends: Diari kawan title_nearby: Diari pengguna berdekatan @@ -374,6 +297,9 @@ ms: user_title: Diari %{user} editor: default: Asali (kini %{name}) + id: + description: iD (editor dalam pelayar) + name: iD potlatch: description: Potlatch 1 (alat sunting dalam pelayar) name: Potlatch 1 @@ -389,7 +315,7 @@ ms: area_to_export: Kawasan untuk Dieksport embeddable_html: HTML Boleh Benam export_button: Eksport - export_details: Data OpenStreetMap dilesenkan di bawah lesen Creative Commons Pengiktirafan-PerkongsianSerupa 2.0 Umum. + export_details: Data OpenStreetMap dilesenkan di bawah lesen Open Data Commons Open Database License (ODbL). format: Format format_to_export: Format untuk Dieksport image_size: Saiz Imej @@ -405,29 +331,38 @@ ms: paste_html: Tampalkan HTML untuk dibenamkan dalam tapak web scale: Skala too_large: - body: Kawasan ini terlalu besar untuk dieksport dalam bentuk Data XML OpenStreetMap. Sila zum dekat atau pilih kawasan yang lebih kecil. - heading: Kawasan Terlalu Besar + advice: "Jika pengeksportan di atas gagal, sila pertimbangkan untuk menggunakan antara sumber-sumber yang berikut:" + body: "Kawasan ini terlalu besar untuk dieksport dalam bentuk Data XML OpenStreetMap. Sila zum dekat atau pilih kawasan yang lebih kecil, atau gunakan mana-mana sumber yang berikut untuk memuat turun data secara pukal:" + geofabrik: + description: Ekstrak benua, negara dan bandar-bandar terpilih yang sentiasa dikemaskinikan + title: Muat-Turunan Geofabrik + metro: + description: Pengekstrakan untuk bandar-bandar utama di dunia serta kawasan-kawasan sekitar + title: Ekstrak Metro + other: + description: Sumber-sumber lanjutan yang tersenarai di wiki OpenStreetMap + title: Sumber-sumber Lain + overpass: + description: Muat turun petak sempadan ini dari cermin pangkalan data OpenStreetMap + title: Overpass API + planet: + description: Salinan pangkalan data lengkap OpenStreetMap yang sentiasa dikemaskinikan + title: Planet OSM zoom: Zum - start_rjs: - add_marker: Bubuh penanda pada peta - change_marker: Ubah kedudukan penanda - click_add_marker: Klik pada peta untuk membubuh penanda - drag_a_box: Seretkan petak di atas peta untuk memilih kawasan - export: Eksport - manually_select: Pilih kawasan yang lain secara insani - view_larger_map: Lihat Peta yang Lebih Besar + title: Eksport + fixthemap: + how_to_help: + title: Cara Menolong + title: Laporkan masalah / Baiki peta geocoder: description: title: geonames: Lokasi carian GeoNames - osm_namefinder: "%{types} carian OpenStreetMap Namefinder" osm_nominatim: Lokasi carian OpenStreetMap Nominatim types: cities: Bandaraya places: Tempat towns: Pekan - description_osm_namefinder: - prefix: "%{distance} ke %{direction} dari %{type}" direction: east: timur north: utara @@ -448,16 +383,26 @@ ms: title: ca_postcode: Hasil carian Geocoder.CA geonames: Hasil carian GeoNames + geonames_reverse: Hasil daripada GeoNames latlon: Hasil carian dalaman - osm_namefinder: Hasil Carian OpenStreetMap Namefinder osm_nominatim: Hasil Carian OpenStreetMap Nominatim + osm_nominatim_reverse: Hasil daripada OpenStreetMap Nominatim uk_postcode: Hasil carian NPEMap / FreeThe Postcode us_postcode: Hasil carian Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} ke %{parentdirection} dari %{parentname})" - suffix_place: ", %{distance} ke %{direction} dari %{placename}" search_osm_nominatim: + admin_levels: + level10: Sempadan Pinggir Bandar + level2: Sempadan Negara + level4: Sempadan Negeri + level5: Sempadan Kawasan + level6: Sempadan Daerah + level8: Sempadan Bandar + level9: Sempadan Desa prefix: + aerialway: + chair_lift: Lif Kerusi + drag_lift: Lif Seret + station: Stesen Kereta Gantung aeroway: aerodrome: Padang Terbang apron: Apron @@ -551,6 +496,7 @@ ms: shower: Pancuran social_centre: Pusat Sosial social_club: Kelab Sosial + social_facility: Kemudahan Sosial studio: Studio supermarket: Pasar Raya swimming_pool: Kolam Renang @@ -579,6 +525,9 @@ ms: "yes": Jambatan building: "yes": Bangunan + emergency: + fire_hydrant: Pili Bomba + phone: Telefon Kecemasan highway: bridleway: Lorong Kuda bus_guideway: Lorong Bas Berpandu @@ -600,6 +549,7 @@ ms: platform: Platform primary: Jalan Utama primary_link: Jalan Utama + proposed: Jalan Raya yang Dicadangkan raceway: Jalan Lumba residential: Perumahan rest_area: Kawasan Rehat @@ -611,6 +561,7 @@ ms: speed_camera: Kamera Kelajuan steps: Tangga stile: Tangga Pagar + street_lamp: Lampu Jalan tertiary: Jalan Tertier tertiary_link: Jalan Tertier track: Laluan @@ -626,6 +577,7 @@ ms: building: Bangunan castle: Istana church: Gereja + citywalls: Tembok Bandar fort: Kubu house: Rumah icon: Patung @@ -635,6 +587,7 @@ ms: monument: Tugu museum: Muzium ruins: Puing + tomb: Makam tower: Menara wayside_cross: Salib Tepi Jalan wayside_shrine: Tempat Suci Tepi Jalan @@ -702,6 +655,8 @@ ms: airfield: Lapangan Terbang Tentera barracks: Tangsi bunker: Bunker + mountain_pass: + "yes": Genting Gunung natural: bay: Teluk beach: Pantai @@ -771,6 +726,7 @@ ms: locality: Lokaliti moor: Mur municipality: Perbandaran + neighbourhood: Kejiranan postcode: Poskod region: Kawasan sea: Laut @@ -796,8 +752,10 @@ ms: narrow_gauge: Landasan Keretapi Sempit platform: Platform Keretapi preserved: Landasan Keretapi Terpelihara + proposed: Landasan Keretapi yang Dicadangkan spur: Cabang Landasan Keretapi station: Stesen Keretapi + stop: Hentian Keretapi subway: Stesen Bawah Tanah subway_entrance: Pintu Masuk Bawah Tanah switch: Titik Landasan Keretapi @@ -813,6 +771,7 @@ ms: beverages: Kedai Minuman bicycle: Kedai Basikal books: Kedai Buku + boutique: Butik butcher: Kedai Daging car: Kedai Kereta car_parts: Alat Ganti Kereta @@ -826,6 +785,7 @@ ms: convenience: Kedai Mudah Beli copyshop: Kedai Fotokopi cosmetics: Kedai Komestik + deli: Delikatesen department_store: Gedung Serbaneka discount: Kedai Diskaun doityourself: DIY @@ -862,17 +822,21 @@ ms: organic: Kedai Makanan Organik outdoor: Kedai Luaran pet: Kedai Haiwan + pharmacy: Farmasi photo: Kedai Foto salon: Salon + second_hand: Kedai Barangan Terpakai shoes: Kedai Kasut shopping_centre: Pusat Beli-Belah sports: Kedai Sukan stationery: Kedai Alat Tulis supermarket: Pasar Raya + tailor: Kedai Jahit toys: Kedai Mainan travel_agency: Agensi Pelancongan video: Kedai Video wine: Kedai Arak Tanpa Lesen + "yes": Kedai tourism: alpine_hut: Pondok Gunung artwork: Karya Seni @@ -895,6 +859,7 @@ ms: viewpoint: Sudut Pandangan zoo: Taman Haiwan tunnel: + culvert: Pembetung "yes": Terowong waterway: artificial: Jalan Air Buatan @@ -918,65 +883,117 @@ ms: water_point: Titik Jalan Air waterfall: Air Terjun weir: Tebat + help_page: + help: + description: Tanyakan soalan atau cari jawapan di tapak soal jawab OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap menyediakan kemudahan-kemudahan untuk mempelajari tentang projek ini, bersoal jawab, serta bekerjasama membincangkan dan mendokumenkan topik-topik pemetaan. + title: Meminta Bantuan + welcome: + description: Mulakan dengan panduan ringkas ini yang merangkumi asas-asas OpenStreetMap. + title: Selamat datang ke OSM + url: /welcome + wiki: + description: Layari wiki untuk maklumat lanjut tentang OSM. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Tutup + edit_help: Alihkan peta dan zum dekat pada lokasi yang ingin anda sunting, kemudian klik di sini. + key: + title: Petunjuk Peta + tooltip: Petunjuk Peta + tooltip_disabled: Kunci Peta tersedia untuk lapisan Biasa sahaja map: base: cycle_map: Peta Basikal + hot: Kemanusiaan mapquest: MapQuest Dibuka standard: Piawai transport_map: Peta Pengangkutan + copyright: © Penyumbang OpenStreetMap + donate_link_text: + layers: + data: Data Peta + header: Lapisan Peta + notes: Nota Peta + overlays: Bolehkan tindihan untuk mencari masalah dalam peta + title: Lapisan + locate: + popup: Anda berada pada jarak {distance} {unit} dari titik ini + title: Paparkan Lokasi Saya + zoom: + in: Zum Dekat + out: Zum Jauh + notes: + new: + add: Tambah Nota + intro: Demi menambah baik mutu peta, maklumat yang anda masukkan dipaparkan kepada pemeta-pemeta yang lain, jadi sila terangkan dengan sedeskriptif dan setepat yang boleh dalam mengalihkan penanda kepada kedudukan yang betul sambil menulis nota di bawah. + show: + anonymous_warning: Nota ini merangkumi komen-komen daripada pengguna awanama yang wajar ditentusahkan secara bebas. + comment: Komen + comment_and_resolve: Ulas & Selesaikan + hide: Sorokkan + reactivate: Aktifkan semula + resolve: Selesaikan + share: + cancel: Batalkan + center_marker: Ketengahkan peta pada penanda + custom_dimensions: Tetapkan dimensi tersendiri + download: Muat Turun + embed: HTML + format: "Format:" + image: Gambar + image_size: Gambar akan dipaparkan pada + include_marker: Sertakan penanda + link: Pautan atau HTML + long_link: Pautan + paste_html: Tampal HTML untuk menyiratkan laman web + scale: "Skala:" + short_link: URL Ringkas + short_url: URL Ringkas + title: Kongsi + view_larger_map: Lihat Peta yang Lebih Besar site: + createnote_disabled_tooltip: Zum dekat untuk meletakkan nota pada peta + createnote_tooltip: Letak nota pada peta edit_disabled_tooltip: Zum dekat untuk menyunting peta edit_tooltip: Sunting peta - edit_zoom_alert: Anda mesti mengezum dekat untuk menyunting peta ini - history_disabled_tooltip: Zum dekat untuk melihat suntingan bagi kawasan ini - history_tooltip: Lihat suntingan bagi kawasan ini - history_zoom_alert: Anda mesti mengezum dekat untuk melihat suntingan bagi kawasan ini + map_data_zoom_in_tooltip: Zum dekat untuk membaca data peta + map_notes_zoom_in_tooltip: Zum dekat untuk membaca nota peta layouts: + about: Perihal community: Komuniti community_blogs: Blog Komuniti community_blogs_title: Blog-blog ahli komuniti OpenStreetMap - copyright: Hak Cipta & Lesen - documentation: Dokumentasi - documentation_title: Dokumentasi projek + copyright: Hak Cipta + data: Data donate: Sokong OpenStreetMap dengan %{link} kepada Dana Penaiktarafan Perkakas. - donate_link_text: menderma edit: Sunting edit_with: Sunting dengan %{editor} export: Eksport - export_tooltip: Eksport data peta + export_data: Eksport Data foundation: Yayasan foundation_title: Yayasan OpenStreetMap gps_traces: Jejak GPS gps_traces_tooltip: Uruskan jejak GPS help: Bantuan - help_centre: Pusat Bantuan - help_title: Tapak bantuan projek history: Sejarah - home: laman utama - home_tooltip: Pergi ke lokasi rumah - inbox: peti masuk (%{count}) - inbox_tooltip: - one: Peti masuk anda mengandungi sepucuk pesanan yang belum dibaca - other: Peti masuk anda mengandungi %{count} pesanan yang belum dibaca - zero: Peti masuk anda tidak mengandungi sebarang pesanan yang belum dibaca - intro_1: OpenStreetMap ialah peta seluruh dunia yang boleh disunting. Ia dihasilkan oleh insan-insan seperti anda. + home: Pergi ke Lokasi Pangkal intro_2_create_account: Buka akaun pengguna - intro_2_download: dimuat turun - intro_2_html: Data ini boleh %{download} dan %{use} dengan percuma di bawah %{license}nya. %{create_account} untuk memperbaiki peta ini. - intro_2_license: lesen terbuka - intro_2_use: digunakan - license: - title: Data OpenStreetMap dilesenkan di bawah lesen Creative Commons Pengiktirafan-PerkongsianSerupa 2.0 Umum - log_in: log masuk + intro_header: Selamat datang ke OpenStreetMap! + intro_text: OpenStreetMap adalah peta dunia yang diwujudkan oleh insan seperti anda, dan bebas digunakan dengan berlandaskan lesen terbuka. + learn_more: Ketahui Lebih Lanjut + log_in: log Masuk log_in_tooltip: Log masuk dengan akaun yang sedia ada logo: alt_text: Logo OpenStreetMap - logout: log keluar - logout_tooltip: Log keluar + logout: Log Keluar make_a_donation: text: Derma title: Sokonglah OpenStreetMap dengan dermaan dalam bentuk wang + more: Selebihnya osm_offline: Pangkalan data OpenStreetMap kini diputuskan sambungannya sementara kerja penyelenggaran mustahak dilangsungkan. osm_read_only: Pangkalan data OpenStreetMap sekarang ditetapkan pada mod baca sahaja sementara kerja penyelenggaran mustahak dilangsungkan. partners_bytemark: Bytemark Hosting @@ -984,24 +1001,47 @@ ms: partners_ic: Imperial College London partners_partners: rakan-rakan kongsi partners_ucl: Pusat VR UCL - sign_up: daftar diri + sign_up: Daftar sign_up_tooltip: Buka akaun untuk menyunting - sotm2011: "-" + start_mapping: Mulakan Memeta tag_line: Peta Dunia Wiki Bebas user_diaries: Diari Pengguna user_diaries_tooltip: Lihat diari pengguna - view: Lihat - view_tooltip: Lihat peta - welcome_user: Selamat datang, %{user_link} - welcome_user_link_tooltip: Laman pengguna anda - wiki: Wiki - wiki_title: Tapak wiki projek license_page: foreign: english_link: teks asal bahasa Inggeris text: Sekiranya terdapat percanggahan antara halaman yang diterjemah ini dengan %{english_original_link}, maka versi bahasa Inggeris itu akan diberi keutamaan title: Perihal terjemahan ini - legal_babble: "

    Hak Cipta dan Lesen

    \n

    \n OpenStreetMap merupakan data terbuka yang dilesenkan di bawah lesen Pengiktirafan-PerkongsianSerupa 2.0 (CC BY-SA).\n

    \n

    \n Anda diberi kebebasan untuk menyalin, mengedarkan, memancarkan dan mengubah suai peta-peta dan data kami asalkan anda memberikan penghargaan kepada OpenStreetMap dan para penyumbangnya. Sekiranya anda mengubah atau menokok tambah peta-peta atau data kami, anda boleh mengedarkan hasilnya di bawah lesen yang sama sahaja. Hukum undang-undang yang penuh ini menjelaskan hak-hak dan tanggungjawab anda.\n

    \n\n

    Cara memberikan penghargaan kepada OpenStreetMap

    \n

    \n Sekiranya anda menggunakan imej-imej peta OpenStreetMap map images, kami memohon supaya penghargaan anda menyatakan sekurang-kurangnya yang berikut: “© para penyumbang OpenStreetMap, CC BY-SA”. Jika anda menggunakan data peta sahaja, kami memohon “Data peta © penyumbang OpenStreetMap, CC BY-SA”.\n

    \n

    \n Di mana mungkin, OpenStreetMap sewajarnya dihiperpautkan dengan http://www.openstreetmap.org/ dan CC BY-SA dengan http://creativecommons.org/licenses/by-sa/2.0/. Jika anda menggunakan bahantara yang tidak membolehkan pautan (cth. hasil cetakan), kami mencadangkan agar anda melencongkan para pembaca anda kepada www.openstreetmap.org (mungkin dengan mengembangkan ‘OpenStreetMap’ kepada alamat penuh ini) dan juga www.creativecommons.org.\n

    \n\n

    Mengetahui lebih lanjut

    \n

    \n Baca lebih lanjut tentang penggunaan data kami di Soalan Lazim Undang-Undang.\n

    \n

    \n Para penyumbang OSM diingatkan supaya tidak sesekali menambahkan data dari mana-mana sumber yang berhak cipta (cth. Google Maps atau peta cetakan) tanpa kebenaran yang tersurat daripada pemegang hak cipta.\n

    \n

    \n Sungguhpun OpenStreetMap merupakan data terbuka, namun kami tidak boleh menyediakan API peta yang percuma untuk pemaju pihak ketiga.\n\n Bacalah Dasar Penggunaan API, Dasar Penggunaan Jubin dan Dasar Penggunaan Nominatim kami.\n

    \n\n

    Penyumbang kami

    \n

    \n Lesen CC BY-SA kami mengehendaki anda untuk “memberikan penghargaan Pengarang Asal yang berpatutan dengan bahantara atau kaedah yang Anda sedang gunakan”. Setiap seorang pemeta OSM tidak memohon penghargaan yang melebihi penghargaan kepada “para penyumbang OpenStreetMap”, tetapi seandainya data daripada agensi pemetaan kebangsaan atau sebarang sumber utama yang lain telah disertakan dalam OpenStreetMap, maka adalah wajar untuk memberikan penghargaan kepadanya dengan terus mengeluarkan semula penghargaannya atau membubuh pautan kepadanya dalam laman ini.\n

    \n\n\n\n
      \n
    • Afrika Selatan: Mengandungi data yang disumberkan daripada\n Pejabat Ketua Pengarah:\n National Geo-Spatial Information, Hak cipta kerajaan dipelihara.
    • \n
    • Australia: Mengandungi data subbandar berasaskan data Australian Bureau of Statistics.
    • \n
    • Austria: Mengandungi data daripada Stadt Wien (di bawah CC BY) dan Land Vorarlberg, dan Land Tirol (under CC-BY AT dengan pindaan).
    • .\n
    • Belanda: Mendandungi data © AND, 2007\n (www.and.com)
    • \n
    • Kanada: Mengandungi data daripada GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada).
    • \n
    • New Zealand: Mengandungi data yang disumberkan daripada Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Perancis: Mengandungi data yang disumberkan daripada Direction Générale des Impôts.
    • \n
    • Poland: Mengandungi data daripada peta-peta UMP-pcPL. Hak cipta penyumbang UMP-pcPL.\n\n Maklumat lanjut mengenai penggunaan data UMP oleh OSM&
    • \n
    • United Kingdom: Mengandungi data Ordnance Survey data © Crown copyright and database right 2010.
    • \n
    \n\n

    \n Penyertaan data dalam OpenStreetMap tidak bermaksud bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang waranti, atau menerima sebarang tanggungan.\n

    " + legal_babble: + attribution_example: + alt: Contoh mengatribusikan OpenStreetMap pada halaman sesawang + title: Contoh atribusi + contributors_at_html: "Austria: Mengandungi data daripada Stadt Wien (di bawah CC BY) dan Land Vorarlberg, dan Land Tirol (under CC-BY AT dengan pindaan)." + contributors_ca_html: "Kanada: Mengandungi data daripada GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), and StatCan (Geography Division, Statistics Canada)." + contributors_fi_html: "Finland: Mengandungi data dari Pangkalan Data Topografi\nTinjauan Daratan Negara Finland dan lain-lain set data di bawah\nLesen NLSFI." + contributors_footer_1_html: " Untuk keterangan lanjut tentang semua ini, serta sumber-sumber lain yang telah digunakan untuk membantu menambah baik OpenStreetMap, sila rujuk Halaman penyumbang di Wiki OpenStreetMap." + contributors_footer_2_html: " Penyertaan data dalam OpenStreetMap tidak bermaksud bahawa pembekal data asal menyokong OpenStreetMap, menyediakan sebarang waranti, atau menerima sebarang tanggungan." + contributors_fr_html: "Perancis: Mengandungi data yang disumberkan daripada Direction Générale des Impôts." + contributors_gb_html: "United Kingdom: Mengandungi data Ordnance Survey data © Crown copyright and database right 2010-12." + contributors_intro_html: "Penyumbang kami merupakan ribuan individu. Kami turut menyertakan data yang dilesenkan secara terbuka daripada lembaga-lembaga pemetaan kebangsaan dan sumber-sumber yang lain, antaranya:" + contributors_nl_html: "Belanda: Mendandungi data © AND, 2007\n (www.and.com)" + contributors_nz_html: "New Zealand: Mengandungi data yang disumberkan daripada Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Penyumbang kami + contributors_za_html: "Afrika Selatan: Mengandungi data yang disumberkan daripada\n Pejabat Ketua Pengarah:\n National Geo-Spatial Information, Hak cipta kerajaan dipelihara." + credit_1_html: Kami memerlukan anda menggunakan dikenali sebagai “© penyumbang OpenStreetMap” dalam penghargaan. + credit_2_html: "Anda juga mesti memperjelas bahawa data ini tersedia di bawah Open Database License, dan juga kartografinya berada di bawah lesen CC-BY-SA jika jubin peta kami turut digunakan. Anda boleh berbuat demikian dengan membuat pautan ke halaman hak cipta ini.\nSelain itu, dan sebagai kemestian untuk mengedarkan OSM dalam bentuk data, anda boleh menyatakan nama dan membuat pautan secara terus kepada lesen. Untuk media yang tidak membolehkan pautan (cth. bahan cetakan), kami mencadangkan supaya anda menghalakan pembaca-pembaca ke openstreetmap.org (misalnya, dengan meluaskan 'OpenStreetMap' ke alamat penuh ini), ke opendatacommons.org, dan juga creativecommons.org jika berkenaan." + credit_3_html: "Untuk peta elektronik yang boleh disemak imbas, kredit seharusnya disiarkan di sudut peta.\nContoh:" + credit_title_html: Cara memberikan penghargaan kepada OpenStreetMap + infringement_1_html: Penyumbang OSM diingatkan supaya tidak sesekali menambah data dari mana-mana sumber berhak cipta (cth. Google Maps atau peta cetakan) tanpa izin bersurat dari pemegang hak cipta. + infringement_2_html: "Sekiranya anda percaya bahawa bahan berhak cipta telah dtambahkan secara tidak berpatutan ke dalam pangkalan OpenStreetMap atau tapak ini, sila rujuk prosedur penarikan atau laporkan secara terus ke dalam \nhalaman laporan on-line." + infringement_title_html: Pencabulan hak cipta + intro_1_html: "OpenStreetMap ialah data terbuka yang dilesenkan di bawah Open Data\nCommons Open Database License (ODbL)." + intro_2_html: Anda bebas menyalin, mengedarkan, menyebarkan dan mengubah suai data kami, asalkan anda memperakui OpenStreetMap dan para penyumbangnya. Jika anda mengubah suai atau menokok tambah data kami, anda boleh mengedarkannya di bawah lesen yang sama sahaja. Kanun undang-undang yang lengkap ini menerangkan hak-hak dan tanggungjawab anda. + intro_3_html: Kartografi jubin peta kami serta dokumentasi kami dilesenkan di bawah lesen Pengiktirafan-PerkongsianSerupa 2.0 (CC-BY-SA). + more_1_html: Baca lebih lanjut tentang penggunaan data kami serta memperakui kami di Soalan Lazim Undang-Undang. + more_2_html: Sungguhpun OpenStreetMap merupakan data terbuka, namun kami tidak boleh menyediakan API peta yang percuma kepada pembangun pihak ketiga. Sila rujuk Dasar Penggunaan API, Dasar Penggunaan Jubin dan Dasar Penggunaan Nominatim. + more_title_html: Mengetahui lebih lanjut + title_html: Hak Cipta dan Lesen native: mapping_link: mula membuat peta native_link: versi Bahasa Melayu @@ -1055,12 +1095,9 @@ ms: title: Peti Keluar to: Kepada read: - back_to_inbox: Kembali ke peti masuk - back_to_outbox: Kembali ke peti keluar + back: Kembali date: Tarikh from: Daripada - reading_your_messages: Membaca pesanan anda - reading_your_sent_messages: Membaca pesanan yang dihantar reply_button: Balas subject: Subjek title: Baca pesanan @@ -1071,6 +1108,37 @@ ms: wrong_user: Anda telah log masuk sebagai `%{user}' tetapi pesanan yang anda pohon untuk membalas itu tidak dihantar kepada pengguna itu. Sila log masuk sebagai pengguna yang betul untuk membacanya. sent_message_summary: delete_button: Hapuskan + note: + description: + closed_at_by_html: Diselesaikan %{when} yang lalu oleh %{user} + closed_at_html: Diselesaikan %{when} yang lalu + commented_at_by_html: Dikemaskinikan %{when} yang lalu oleh %{user} + commented_at_html: Dikemaskinikan %{when} yang lalu + opened_at_by_html: Dicatatkan %{when} yang lalu oleh %{user} + opened_at_html: Dicatatkan %{when} yang lalu + reopened_at_by_html: Diaktifkan semula %{when} yang lalu oleh %{user} + reopened_at_html: Diaktifkan semula %{when} yang lalu + entry: + comment: Komen + full: Nota penuh + mine: + ago_html: "%{when} yang lalu" + created_at: Dicatatkan pada + creator: Pencatat + description: Keterangan + heading: nota-nota %{user} + id: Id + last_changed: Kali terakhir disunting + subheading: Nota yang dikemukakan atau diulas oleh %{user} + title: Nota yang dikemukakan atau diulas oleh %{user} + rss: + closed: nota ditutup (dekat %{place}) + commented: komen baru (dekat %{place}) + description_area: Senarai nota yng dilaporkan, diulas atau ditutup di kawasan anda [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Suapan rss untuk nota %{id} + opened: nota baru (dekat %{place}) + reopened: nota yang dihidupkan semula (dekat %{place}) + title: Nota OpenStreetMap notifier: diary_comment_notification: footer: Anda juga boleh membaca komen di %{readurl} serta mengulas di %{commenturl} atau membalas di %{replyurl} @@ -1086,8 +1154,7 @@ ms: email_confirm_plain: click_the_link: Jika anda orangnya, sila klik pautan di bawah untuk mengesahkan perubahan. greeting: Apa khabar, - hopefully_you_1: Seseorang (harap-harap iaitu anda) ingin menukar alamat e-melnya di - hopefully_you_2: "%{server_url} kepada %{new_address}." + hopefully_you: Seseorang (harap-harap iaitu anda) ingin menukar alamat e-melnya di %{server_url} kepada %{new_address}. friend_notification: befriend_them: Anda juga boleh menjadikannya sebagai kawan di %{befriendurl}. had_added_you: "%{user} telah menjadikan anda sebagai kawan di OpenStreetMap." @@ -1116,44 +1183,36 @@ ms: lost_password_plain: click_the_link: Jika anda orangnya, sila klik pautan di bawah untuk mengeset semula kata laluan anda. greeting: Apa khabar, - hopefully_you_1: Seseorang (mungkin anda) telah memohon supaya kata laluan ini diset semula di - hopefully_you_2: akaun openstreetmap.org milik alamat e-mel ini. + hopefully_you: Seseorang (mungkin anda) telah memohon supaya kata laluan ini diset semula di akaun openstreetmap.org milik alamat e-mel ini. message_notification: - footer1: Anda juga boleh membaca pesanan ini di %{readurl} - footer2: dan anda boleh membalas di %{replyurl} + footer_html: Anda juga boleh membaca pesanan ini di %{readurl} dan anda boleh membalasnya di %{replyurl} header: "%{from_user} telah menghantar sepucuk pesanan kepada anda melalui OpenStreetMap dengan subjek %{subject}:" hi: Apa khabar %{to_user}, + note_comment_notification: + anonymous: Seorang pengguna awanama + closed: + commented_note: "%{commenter} telah menyelesaikan salah satu nota peta yang pernah anda ulas dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah menyelesaikan satu nota yang anda minati" + subject_own: "[OpenStreetMap] %{commenter} telah menyelesaikan salah satu nota anda" + your_note: "%{commenter} telah menyelesaikan salah satu nota peta anda dekat %{place}." + commented: + commented_note: "%{commenter} telah meninggalkan komen di salah satu nota peta yang pernah anda ulas dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah mengulas satu nota yang anda minati" + subject_own: "[OpenStreetMap] %{commenter} telah mengulas salah satu nota anda" + your_note: "%{commenter} telah meninggalkan komen di salah satu nota peta anda dekat %{place}." + details: Butiran lanjut tentang nota berkenaan boleh didapati di %{url}. + greeting: Selamat sejahtera, + reopened: + commented_note: "%{commenter} telah menghidupkan semula salah satu nota peta yang pernah anda ulas dekat %{place}." + subject_other: "[OpenStreetMap] %{commenter} telah menghidupkan semula salah satu nota yang anda minati" + subject_own: "[OpenStreetMap] %{commenter} telah menghidupkan semula salah satu nota anda" + your_note: "%{commenter} telah menghidupkan semula salah satu nota peta anda dekat %{place}." signup_confirm: - subject: "[OpenStreetMap] Sahkan alamat e-mel anda" - signup_confirm_html: - ask_questions: Anda boleh menanyakan sebarang soalan tentang OpenStreetMap di tapak soal jawab kami. - click_the_link: Jika anda orangnya, selamat datang! Sila klik pautan di bawah untuk mengesahkan akaun anda dan teruskan membaca untuk maklumat lanjut tentang OpenStreetMap. - current_user: Senarai pengguna semasa dalam kategori berasaskan kedudukan mereka di dunia, terdapat di Category:Users_by_geographical_region. - get_reading: Bacalah maklumat tentang OpenStreetMap di wiki ini, ikutilah perkembangan terbaru melalui blog atau Twitter OpenStreetMap, ataupun layari blog OpenGeoData oleh Steve Coast, pengasas OpenStreetMap untuk mempelajari sejarah ringkas projek ini, lengkap dengan podcast juga! - greeting: Apa khabar! - hopefully_you: Seseorang (harap-harap iaitu anda) ingin membuka akaun di - introductory_video: Anda boleh menonton %{introductory_video_link}. - more_videos: Terdapat %{more_videos_link}. - more_videos_here: banyak lagi video di sini - user_wiki_page: Anda disyorkan supaya membentuk sebuah laman wiki pengguna yang merangkumi tag-tag kategori yang menyatakan kedudukan anda, seperti [[Category:Users_in_London]]. - video_to_openstreetmap: video pengenalan OpenStreetMap - wiki_signup: Apa kata anda mendaftarkan diri ke dalam wiki OpenStreetMap. - signup_confirm_plain: - ask_questions: "Anda boleh menanyakan sebarang soalan tentang OpenStreetMap di tapak soal jawab kami:" - blog_and_twitter: "Dapatkan berita mutakhir melalui blog OpenStreetMap blog atau Twitter:" - click_the_link_1: Jika anda orangnya, selamat datang! Sila klik pautan di bawah untuk mengesahkan akaun - click_the_link_2: anda dan teruskan membaca untuk maklumat lanjut tentang OpenStreetMap. - current_user_1: Senarai pengguna semasa dalam kategori berasaskan kedudukan mereka di dunia, - current_user_2: "boleh didapati di:" + confirm: "Sebelum kami berbuat apa-apa lagi, kami perlu memastikan bahawa permintaan ini datang daripada anda; jika betul, sila klik pautan di bawah untuk mengesahkan akaun anda:" + created: Seseorang (harap-harap anda) baru membuka akaun di %{site_url}. greeting: Apa khabar! - hopefully_you: Seseorang (harap-harap iaitu anda) ingin membuka akaun di - introductory_video: "Anda boleh menonton video pengenalan OpenStreetMap di sini:" - more_videos: "Ada banyak lagi video di sini:" - opengeodata: "OpenGeoData.org merupakan blog milik pengasas OpenStreetMap, Steve Coast, dan juga mempunyai podcast:" - the_wiki: "Bacalah perihal OpenStreetMap di wiki:" - user_wiki_1: Anda disaran supaya mewujudkan laman wiki pengguna yang merangkumi - user_wiki_2: tag-tag kategori yang menyatakan kedudukan anda, seperti [[Category:Users_in_London]]. - wiki_signup: "Anda juga boleh mendaftarkan diri untuk menyertai wiki OpenStreetMap di:" + subject: "[OpenStreetMap] Selamat datang ke OpenStreetMap" + welcome: Selepas mengesahkan akaun anda, kami akan membekalkan kepada anda sedikit maklumat tambahan untuk permulaan anda. oauth: oauthorize: allow_read_gpx: membaca jejak GPS peribadi anda. @@ -1162,8 +1221,18 @@ ms: allow_write_api: mengubah suai peta. allow_write_diary: membuat catatan diari dan komen serta berkawan. allow_write_gpx: memuat naik jejak GPS. + allow_write_notes: menyunting nota. allow_write_prefs: mengubah suai keutamaan pengguna anda. request_access: Aplikasi %{app_name} sedang memohon akses kepada akaun anda, %{user}. Sila semak sama ada anda menginginkan aplikasi itu untuk memiliki kebolehan-kebolehan yang berikut. Anda boleh memilih sebanyak mana yang anda suka. + title: Benarkan akses kepada akaun anda + oauthorize_failure: + denied: Anda telah melarang aplikasi %{app_name} daripada mengakses akaun anda. + invalid: Token kebenaran ini tidak sah. + title: Permohonan kebenaran gagal. + oauthorize_success: + allowed: Anda telah memberi aplikasi %{app_name} akses kepada akaun anda. + title: Permohonan kebenaran dibenarkan + verification: Kod penentusahan ialah %{code}. revoke: flash: Anda telah menarik balik token untuk %{application} oauth_clients: @@ -1180,6 +1249,7 @@ ms: allow_write_api: mengubah suai peta. allow_write_diary: membuat catatan diari dan komen serta berkawan. allow_write_gpx: memuat naik jejak GPS. + allow_write_notes: menyunting nota. allow_write_prefs: mengubah suai keutamaan penggunanya. callback_url: URL Panggil Balik name: Nama @@ -1210,6 +1280,7 @@ ms: allow_write_api: mengubah suai peta. allow_write_diary: membuat catatan diari dan komen serta berkawan. allow_write_gpx: memuat naik jejak GPS. + allow_write_notes: menyunting nota. allow_write_prefs: mengubah suai keutamaan penggunanya. authorize_url: "URL Kebenaran:" confirm: Adakah anda pasti? @@ -1218,7 +1289,7 @@ ms: key: "Kunci Pengguna:" requests: "Kebenaran-kebenaran berikut dipohon daripada pengguna tersebut:" secret: "Rahsia Pengguna:" - support_notice: Kami menyokong HMAC-SHA1 (disyorkan) dan juga teks biasa dalam mod ssl. + support_notice: Kam menyokong tandatangan HMAC-SHA1 (yang disyorkan) dan RSA-SHA1. title: Butiran OAuth untuk %{app_name} url: "URL Token Permohonan:" update: @@ -1258,6 +1329,7 @@ ms: edit: anon_edits_link_text: Ketahuilah sebab jadinya begini. flash_player_required: 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. + id_not_configured: iD belum dikonfigurasi no_iframe_support: Pelayar web anda tidak menyokong 'iframe' HTML yang diperlukan untuk ciri ini. not_public: Anda belum menetapkan suntingan anda untuk untuk ditunjukkan kepada orang awam. not_public_description: Selagi tidak berbuat demikian, anda tidak boleh menyunting peta lagi. Anda boleh menetapkan suntingan-suntingan anda sebagai tatapan umum di %{user_page} anda. @@ -1266,18 +1338,15 @@ ms: 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.) user_page_link: laman pengguna index: + createnote: Tambah nota js_1: Anda sedang menggunakan pelayar web yang tidak menyokong JavaScript, ataupun anda tidak menghidupkan JavaScript. js_2: OpenStreetMap menggunakan JavaScript untuk peta licinnya. license: - license_name: Pengiktirafan-PerkongsianSerupa 2.0 - notice: Dilesenkan di bawah lesen %{license_name} oleh %{project_name} dan para penyumbangnya. - project_name: Projek OpenStreetMap + copyright: Hak cipta OpenStreetMap dan para penyumbang di bawah lesen terbuka permalink: Pautan Kekal remote_failed: Penyuntingan gagal - pastikan JOSM atau Merkaartor dimuatkan dan ciri kawalan jauh dihidupkan shortlink: Pautan Ringkas key: - map_key: Petunjuk - map_key_tooltip: Petunjuk peta table: entry: admin: Sempadan pentadbiran @@ -1363,7 +1432,6 @@ ms: preview: Pralihat search: search: Cari - search_help: "cth: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', atau 'post offices near Lünen' banyak lagi contoh..." submit_text: Pergi where_am_i: Saya di mana? where_am_i_title: Huraikan lokasi semasa dengan menggunakan enjin carian @@ -1379,6 +1447,9 @@ ms: upload_trace: Muat Naik Jejak GPS delete: scheduled_for_deletion: Jejak dijadualkan untuk penghapusan + description: + description_with_count: GPX fail dengan %{count} mata dari %{user} + description_without_count: Fail GPX daripada %{user} edit: description: "Keterangan:" download: muat turun @@ -1396,7 +1467,11 @@ ms: uploaded_at: "Dimuat naik:" visibility: "Keterlihatan:" visibility_help: apakah maksud ini? + georss: + title: Jejak OpenStreetMap GPS list: + description: Semak imbas muatnaikan jejak GPS terkini + empty_html: Belum ada apa-apa lagi di sini. Muat naik jejak baru atau ketahui lebih lanjut tentang penjejakan GPS di halaman wiki ini. public_traces: Jejak GPS umum public_traces_from: Jejak GPS umum oleh %{user} tagged_with: " ditagkan dengan %{tags}" @@ -1425,7 +1500,7 @@ ms: trackable: BOLEH DIJEJAKI view_map: Lihat Peta trace_form: - description: Keterangan + description: "Keterangan:" help: Bantuan tags: "Tag:" tags_help: terbatas tanda koma @@ -1436,14 +1511,15 @@ ms: trace_header: see_all_traces: Lihat semua jejak see_your_traces: Lihat jejak anda - traces_waiting: Anda mempunyai %{count} jejak yang sedang menunggu untuk dimuat naik. Ada baiknya anda menunggu hingga yang ini selesai sebelum memuat naik lagi supaya tidak menyesakkan baris gilir untuk pengguna-pengguna lain. + traces_waiting: + other: Anda mempunyai %{count} jejak yang sedang menunggu untuk dimuat naik. Ada baiknya anda menunggu hingga yang ini selesai sebelum memuat naik lagi supaya tidak menyesakkan baris gilir untuk pengguna-pengguna lain. upload_trace: Muat naik jejak trace_optionals: tags: Tag trace_paging_nav: - next: Berikutnya » - previous: "« Sebelumnya" - showing_page: Memaparkan halaman %{page} + newer: Jejak Baru + older: Jejak Lama + showing_page: Halaman %{page} view: delete_track: Hapuskan jejak ini description: "Keterangan:" @@ -1482,6 +1558,10 @@ ms: email never displayed publicly: (tidak sesekali dipaparkan kepada umum) flash update success: Maklumat pengguna berjaya dikemaskinikan. flash update success confirm needed: Maklumat pengguna berjaya dikemaskinikan. Semak e-mel anda untuk pesanan untuk mengesahkan alamat e-mel baru anda. + gravatar: + gravatar: Gunakan Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: apakah ini? home location: "Lokasi Rumah:" image: "Imej:" image size hint: (imej segi empat sama yang sekurang-kurangnya 100x100 adalah paling bagus) @@ -1517,13 +1597,13 @@ ms: update home location on click: Adakah anda ingin mengemaskinikan lokasi rumah dengan mengklik pada peta? confirm: already active: Akaun ini sudah pun disahkan. - before you start: Kami tahu bahawa anda mungkin tergesa-gesa untuk bermula menyunting peta, tetapi sebelum itu anda disarankan untuk mengisikan banyak lagi maklumat tentang diri anda dalam borang di bawah. button: Sahkan - heading: Sahkan akaun pengguna + heading: Semak e-mel anda + introduction_1: Kami telah mengirim e-mel pengesahan kepada anda. + introduction_2: Sahkan akaun anda dengan mengklik pada pautan pada e-mel itu, kemudian anda boleh mula menyunting peta. press confirm button: Tekan butang pengesahan di bawah untuk mengaktifkan akaun anda. - reconfirm: Jika sudah sekian lama sejak anda mendaftar, mungkin anda perlu menghantar e-mel pengesahan yang baru kepada diri sendiri. - success: Akaun anda telah disahkan. Terima kasih kerana mendaftar! - unknown token: Nampaknya token itu tidak wujud. + reconfirm_html: Jika anda perlukan kami untuk mengirim semula e-mel penghantaran, klik di sini. + unknown token: Kod pengesahan itu telah tamat tempoh atau tidak wujud. confirm_email: button: Sahkan failure: Sudah ada alamat e-mel yang disahkan dengan token ini. @@ -1543,8 +1623,8 @@ ms: heading: Pengguna hide: Sorokkan Pengguna-Pengguna Terpilih showing: - one: Menunjukkan halaman %{page} (%{first_item} daripada %{items}) - other: Menunjukkan halaman %{page} (%{first_item}-%{last_item} daripada %{items}) + one: Halaman %{page} (%{first_item} / %{items}) + other: Halaman %{page} (%{first_item}-%{last_item} / %{items}) summary: "%{name} diwujudkan dari %{ip_address} pada %{date}" summary_no_ip: "%{name} diwujudkan pada %{date}" title: Pengguna @@ -1559,8 +1639,6 @@ ms: lost password link: Lupa kata laluan anda? new to osm: Baru kenal OpenStreetMap? no account: Belum buka akaun? - notice: Ketahui lebih lanjut tentang perubahan lesen OpenStreetMap yang akan datang (terjemahan) (perbincangan) - notice_terms: OpenStreetMap akan beralih kepada lesen baru pada 1 April 2012. Ia sama terbukanya dengan lesen yang kami ada sekarang, cuma butiran undang-undangnya lebih sesuai dengan pangkalan data peta kami. Kami teringin untuk menyimpan sumbangan-sumbangan anda di OpenStreetMap, cuma asalkan anda membenarkan kami untuk mengedarkannya di bawah lesen baru itu. Jika tidak, kami terpaksa membuangnya daripada pangkalan data.

    Sila log masuk, kemudian luangkan sedikit masa untuk meneliti dan menerima syarat-syarat baru ini. Terima kasih! openid: "OpenID %{logo}:" openid invalid: Maaf, OpenID anda nampaknya tidak betul formatnya openid missing provider: Maaf, pembekal OpenID anda tidak dapat dihubungi @@ -1586,7 +1664,7 @@ ms: title: Log masuk dengan Yahoo password: "Kata laluan:" register now: Daftar sekarang - remember: "Ingati saya:" + remember: Ingati saya title: Log masuk to make changes: Untuk membuat perubahan pada data OpenStreetMap, anda mesti mempunyai akaun. with openid: "Ataupun, sila gunakan OpenID anda untuk log masuk:" @@ -1605,19 +1683,21 @@ ms: title: Terlupa kata laluan make_friend: already_a_friend: Anda sudah berkawan dengan %{name}. + button: Jadikan kawan failed: Maaf, %{name} tidak dapat ditambahkan sebagai kawan. - success: "%{name} kini kawan anda." + heading: Jadikan %{user} sebagai kawan? + success: "%{name} kini kawan anda!" new: + about: + header: Bebas dan boleh disunting + html: "

    Tidak seperti peta-peta lain, OpenStreetMap diwujudkan sepenuhnya oleh orang ramai seperti anda, malah percuma untuk diperbaiki, dikemaskinikan, dimuat turun dan digunakan oleh sesiapa sahaja.

    \n

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

    " confirm email address: "Sahkan Alamat E-mel:" confirm password: "Sahkan Kata Laluan:" contact_webmaster: Sila hubungi pentadbir web untuk membuat persediaan untuk membuka akaun - kami akan cuba menguruskan permohonan itu secepat mungkin. - continue: Teruskan + continue: Daftar display name: "Nama Paparan:" display name description: Nama pengguna anda yang dipaparkan kepada awam. Anda boleh menukarnya dalam keutamaan anda pada bila-bila masa. email address: "Alamat E-mel:" - fill_form: Isi borang ini, dan kami akan segera menghantar pesanan e-mel kepada anda untuk mengaktifkan akaun anda. - flash create success message: Terima kasih kerana mendaftar. Kami telah menghantar pesanan pengesahan kepada %{email}. Sebaik sahaja anda mengesahkan akaun anda, anda akan boleh menyunting peta.

    Jika anda menggunakan sistem anti-spam yang menghantar permohonan untuk pengesahan, sila pastikan anda membenarkan webmaster@openstreetmap.org kerana kami tidak dapat membalas sebarang permohonan untuk pengesahan. - heading: Buka Akaun Pengguna license_agreement: Ketika mengesahkan akaun anda, anda perlu bersetuju dengan terma-terma penyumbang. no_auto_account_create: Sayang sekali, kami tidak dapat membuka akaun secara automatik untuk anda buat masa ini. not displayed publicly: Tidak dipaparkan kepada umum (lihat dasar privasi) @@ -1627,7 +1707,7 @@ ms: password: "Kata laluan:" terms accepted: Terima kasih kerana menerima terma-terma penyumbang yang baru! terms declined: Kami berasa kesal kerana anda memutuskan untuk tidak menerima Terma-Terma Penyumbang yang baru ini. Untuk maklumat lanjut, sila rujuk laman wiki ini. - title: Buka akaun + title: Daftar use openid: Ataupun gunakan OpenID %{logo} untuk log masuk no_such_user: body: Maaf, tiada pengguna dengan nama %{user}. Sila semak ejaan anda, atau mungkin pautan yang anda klik itu tidak betul. @@ -1638,6 +1718,8 @@ ms: nearby mapper: Pemeta berdekatan your location: Lokasi anda remove_friend: + button: Gugurkan kawan + heading: Gugurkan %{user} sebagai kawan? not_a_friend: "%{name} bukan kawan anda." success: "%{name} telah dibuang daripada senarai kawan anda." reset_password: @@ -1672,12 +1754,12 @@ ms: you need to accept or decline: Sila baca, kemudian terima atau tolak Terma-Terma Penyumbang yang baru untuk bersambung. view: activate_user: aktifkan pengguna ini - add as friend: jadikan kawan + add as friend: Jadikan Kawan ago: (%{time_in_words_ago} lalu) - block_history: lihat sekatan yang diterima - blocks by me: sekatan oleh saya - blocks on me: sekatan ke atas saya - comments: komen + block_history: sekatan yang diterima + blocks by me: Sekatan oleh Saya + blocks on me: Sekatan pada Saya + comments: Komen confirm: Sahkan confirm_user: sahkan pengguna ini create_block: sekat pengguna ini @@ -1689,31 +1771,35 @@ ms: deactivate_user: nyahaktifkan pengguna ini delete_user: hapuskan pengguna ini description: Keterangan - diary: diari - edits: suntingan + diary: Diari + edits: Suntingan email address: "Alamat e-mel:" - friends_changesets: Semak seimbas semua set ubah kawan-kawan - friends_diaries: Semak seimbas semua catatan diari kawan-kawan + friends_changesets: set ubah kawan-kawan + friends_diaries: catatan diari kawan-kawan hide_user: sorokkan pengguna ini - if set location: Jika anda menetapkan lokasi anda, peta yang cantik dan sebagainya akan muncul di sini. Anda boleh menetapkan lokasi rumah anda di laman %{settings_link} anda. + if set location: Tetapkan lokasi rumah anda di halaman %{settings_link} untuk melihat pengguna berdekatan. km away: "%{count}km jauhnya" latest edit: "Suntingan terkini %{ago}:" m away: "%{count}m jauhnya" mapper since: "Pemeta sejak:" - moderator_history: lihat sekatan yang dikenakan - my comments: komen saya - my diary: diari saya - my edits: suntingan saya - my settings: tetapan saya - my traces: jejak saya + moderator_history: sekatan yang dikenakan + my comments: Komen Saya + my diary: Diari Saya + my edits: Suntingan Saya + my messages: Pesanan Saya + my notes: Nota Saya + my profile: Profil Saya + my settings: Tetapan Saya + my traces: Jejak Saya nearby users: Pengguna lain yang berdekatan - nearby_changesets: Semak seimbas semua set ubah pengguna berdekatan - nearby_diaries: Semak seimbas semua catatan diari pengguna berdekatan + nearby_changesets: set ubah pengguna berdekatan + nearby_diaries: catatan diari pengguna berdekatan new diary entry: catatan diari baru no friends: Anda belum mencari kawan lagi. no nearby users: Belum ada pengguna lain yang mengaku memetakan kawasan berdekatan. + notes: Nota Peta oauth settings: tetapan oauth - remove as friend: gugurkan kawan + remove as friend: Gugurkan Kawan role: administrator: Pengguna ini seorang pentadbir grant: @@ -1723,11 +1809,11 @@ ms: revoke: administrator: Tarik balik akses pentadbir moderator: Tarik balik akses penyelia - send message: hantar pesanan + send message: Hantar Pesanan settings_link_text: tetapan spam score: "Markah Spam:" status: "Status:" - traces: jejak + traces: Jejak unhide_user: tunjukkan pengguna ini user location: Lokasi pengguna your friends: Kawan-kawan anda @@ -1785,11 +1871,14 @@ ms: creator_name: Pembuat display_name: Pengguna yang Disekat edit: Sunting + next: Berikutnya » not_revoked: (tidak ditarik balik) + previous: « Sebelumnya reason: Sebab sekatan revoke: Tarik Balik! revoker_name: Ditarik balik oleh show: Tunjukkan + showing_page: Halaman %{page} status: Status period: one: 1 jam @@ -1837,3 +1926,25 @@ ms: fail: Peranan '%{role}' tidak dapat ditarik balik daripada pengguna '%{name}'. Sila semak supaya kedua-dua pengguna dan peranan itu adalah sah. heading: Sahkan penarikan balik peranan title: Sahkan penarikan balik peranan + welcome_page: + add_a_note: + paragraph_1_html: Jika anda inginkan suatu butiran kecil dibetulkan tetapi tiada kelapangan untuk mendaftar dan belajar menyunting, adalah lebih mudah untuk meletakkan nota. + paragraph_2_html: "Layari peta dan klik pada ikon nota:\n. Ini akan meletakkan penanda pada peta yang boleh anda alihkan dengan menyeret. Tulis pesanan anda, kemudian klik Simpan, supaya penyunting lain boleh mengkajinya." + title: Tiada Masa untuk Menyunting? Letak Nota! + basic_terms: + editor_html: Editor adalah perisian atau laman web yang boleh digunakan untuk menyunting peta. + node_html: Nod adalah titik pada peta, seperti sebuah kedai makan atau sebatang pokok. + paragraph_1_html: OpenStreetMap mempunyai peristilahan tersendiri. Yang berikut ialah kata-kata kunci yang berguna. + tag_html: Teg adalah keterangan ringkas mengenai nod atau jalan, seperti nama restoran atau had laju jalan raya. + title: Peristilahan Asas Pemetaan + way_html: Jalan adalah garis atau kawasan seperti jalan raya, sungai, tasik atau bangunan. + introduction_html: Selamat datang ke OpenStreetMap, peta dunia yang bebas disunting oleh orang awam. Kini setelah mendaftar, anda bersiap sedia untuk memeta. Yang berikut ialah panduan ringkas dengan maklumat-maklumat yang paling penting bagi anda. + questions: + paragraph_1_html: "OpenStreetMap menyediakan kemudahan-kemudahan untuk mempelajari tentang projek ini, bersoal jawab, serta bekerjasama membincangkan dan mendokumenkan topik-topik pemetaan.\nMinta bantuan di sini." + title: Ada soalan? + start_mapping: Mula + title: Selamat datang! + whats_on_the_map: + off_html: Ia tidak mencakupi data pandangan peribadi seperti penilaian, ciri-ciri yang wujud zaman dahulu atau sekadar andaian, serta data dari sumber berhak cipta. Melainkan dengan izin khas, jangan salin dari peta Internet mahupun kertas. + on_html: OpenStreetMap merupakan tempat untuk memetakan benda-benda yang nyata dan terkini - termasuklah berjuta-juta bangunan, jalan raya dan lain-lain butiran tempat. Anda boleh memetakan sebarang ciri-ciri nyata yang menarik minat anda. + title: Kandungan Peta diff --git a/config/locales/nb.yml b/config/locales/nb.yml index ce85a35bd11..4d3d1eb8142 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -1,15 +1,19 @@ -# Messages for Norwegian Bokmål (‪norsk (bokmål)‬) +# Messages for Norwegian Bokmål (norsk bokmål) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Danmichaelo # Author: Dittaeva +# Author: EvenT # Author: Event # Author: Gustavf # Author: Haakon K # Author: Hansfn # Author: Laaknor +# Author: Nemo bis # Author: Nghtwlkr # Author: Oyvind # Author: The real emj +# Author: 6400 nb: activerecord: attributes: @@ -18,8 +22,8 @@ nb: diary_entry: language: Språk latitude: Breddegrad - longitude: "Lengdegrad:" - title: Tittel + longitude: Lengdegrad + title: Emne user: Bruker friend: friend: Venn @@ -28,11 +32,11 @@ nb: body: Brødtekst recipient: Mottaker sender: Avsender - title: Tittel + title: Emne trace: description: Beskrivelse latitude: Breddegrad - longitude: "Lengdegrad:" + longitude: Lengdegrad name: Navn public: Offentlig size: Størrelse @@ -82,203 +86,121 @@ nb: application: require_cookies: cookies_needed: Du ser ut til å ha deaktivert informasjonskapsler. Aktiver informasjonskapsler i nettleseren din før du fortsetter. + require_moderator: + not_a_moderator: Du må være en moderator for å utføre den handlinga. setup_user_auth: blocked: Din tilgang til API-et er blokkert. Logg inn på nettstedet for å finne ut mer. need_to_see_terms: Din tilgang til API-et er midlertidig stoppet. Logg inn på nettsiden for å lese bidragsytervilkårene. Du trenger ikke godta vilkårene, men du må lese dem. browse: + anonymous: anonym changeset: - changeset: "Endringssett: %{id}" + belongs_to: Forfatter changesetxml: XML for endringssett - download: Last ned %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Endringssett %{id} title_comment: "Endringssett: %{id} - %{comment}" + node: Noder (%{count}) + node_paginated: Noder (%{x}-%{y} av %{count}) osmchangexml: osmChange XML - title: Endringssett - changeset_details: - belongs_to: "Tilhører:" - bounding_box: "Avgrensingsboks:" - box: boks - closed_at: "Lukket:" - created_at: "Opprettet:" - has_nodes: - one: "Har følgende %{count} node:" - other: "Har følgende %{count} noder:" - has_relations: - one: "Har følgende %{count} relasjon:" - other: "Har følgende %{count} relasjoner:" - has_ways: - one: "Har følgende %{count} vei:" - other: "Har følgende %{count} veier:" - no_bounding_box: Ingen avgrensingsboks er lagret for dette endringssettet. - show_area_box: Vis boks for område - common_details: - changeset_comment: "Kommentar:" - deleted_at: "Slettet:" - deleted_by: "Slettet av:" - edited_at: "Redigert:" - edited_by: "Redigert av:" - in_changeset: "I endringssett:" - version: "Versjon:" + relation: Forbindelser (%{count}) + relation_paginated: Forbindelser (%{x}-%{y} av %{count}) + title: "Endringssett: %{id}" + way: Strekninger (%{count}) + way_paginated: Strekninger (%{x}-%{y} av %{count}) + closed: Lukket + closed_by_html: Lukket %{time} siden av %{user} + closed_html: Lukket %{time} siden containing_relation: entry: Relasjon %{relation_name} entry_role: Relasjon %{relation_name} (som %{relation_role}) - map: - deleted: Slettet - edit: - area: Rediger område - node: Rediger node - relation: Rediger relasjon - way: Rediger rute - larger: - area: Vis område på større kart - node: Vis node på større kart - relation: Vis relasjon på større kart - way: Vis vei på større kart - loading: Laster... - navigation: - all: - next_changeset_tooltip: Neste endringssett - next_node_tooltip: Neste node - next_relation_tooltip: Neste relasjon - next_way_tooltip: Neste vei - prev_changeset_tooltip: Forrige endringssett - prev_node_tooltip: Forrige node - prev_relation_tooltip: Forrige relasjon - prev_way_tooltip: Forrige vei - user: - name_changeset_tooltip: Vis redigeringer av %{user} - next_changeset_tooltip: Neste redigering av %{user} - prev_changeset_tooltip: Forrige redigering av %{user} + created: Opprettet + created_by_html: Opprettet %{time} siden av %{user} + created_html: Opprettet %{time} siden + deleted_by_html: Slettet %{time} siden av %{user} + download_xml: Last ned XML + edited_by_html: Redigert %{time} siden av %{user} + in_changeset: Endringer + location: "Posisjon:" + no_comment: (ingen kommentar) node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Last ned XML - edit: rediger - node: Node - node_title: "Node: %{node_name}" - view_history: vis historikk - node_details: - coordinates: "Koordinater:" - part_of: "Del av:" - node_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Last ned XML - node_history: Nodehistorik - node_history_title: "Nodehistorikk: %{node_name}" - view_details: vis detaljer + history_title: "Node-historikk: %{name}" + title: "Node: %{name}" not_found: - sorry: Klarte ikke finne %{type}-en med ID %{id}. + sorry: Beklager, klarte ikke finne %{type}-en med ID %{id}. type: changeset: endringssett node: node relation: relasjon way: vei - paging_nav: - of: av - showing_page: Viser side + note: + closed_by: Løst av %{user} %{when} siden + closed_by_anonymous: Løst av anonym bruker %{when} siden + closed_title: "Avklart merknad: #%{note_name}" + commented_by: Kommentar fra %{user} %{when} siden + commented_by_anonymous: Kommentar fra anonym bruker %{when} siden + hidden_by: Skjult av %{user} %{when} siden + hidden_title: "Skjult notis #%{note_name}" + new_note: Ny notis + open_by: Opprettet av %{user} %{when} siden + open_by_anonymous: Opprettet av anonym bruker %{when} siden + open_title: "Uavklart merknad #%{note_name}" + reopened_by: Gjenaktivisert av %{user} %{when} siden + reopened_by_anonymous: Gjenaktivisert av anonym bruker %{when} siden + title: "Merknad: %{id}" + part_of: Del av + redacted: + message_html: Versjon %{version} av denne %{type} kan ikke vises fordi den er blitt maskert. Se %{redaction_link} for detaljer. + redaction: Maskering %{id} + type: + node: node + relation: relasjon + way: vei relation: - download: "%{download_xml_link} eller %{view_history_link}" - download_xml: Last ned XML - relation: Relasjon - relation_title: "Relasjon: %{relation_name}" - view_history: vis historikk - relation_details: - members: "Medlemmer:" - part_of: "Del av:" - relation_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Last ned XML - relation_history: Relasjonshistorikk - relation_history_title: "Relasjonshistorikk: %{relation_name}" - view_details: vis detaljer + history_title: "Forbindelseshistorikk: %{name}" + members: Medlemmer + title: "Forbindelse: %{name}" relation_member: entry_role: "%{type} %{name} som %{role}" type: node: Node relation: Relasjon way: Vei - start: - manually_select: Velg et annet område manuelt - view_data: Vis data for gjeldende kartvisning start_rjs: - data_frame_title: Data - data_layer_name: Data - details: Detaljer - drag_a_box: Dra en boks på kartet for å velge et område - edited_by_user_at_timestamp: Redigert av [[user]], [[timestamp]] - hide_areas: Skjul områder - history_for_feature: Historikk for [[feature]] + feature_warning: Laster %{num_features} funksjonalitetet som kan gjøre at nettleseren blir treg eller stopper helt. Vil du vise frem disse dataene? load_data: Last inn data - loaded_an_area_with_num_features: "Du har lastet et område som inneholder [[num_features]] objekter. Noen nettlesere fungerer ikke ved håndtering av så mye data. Nettlesere fungerer generelt best med mindre enn 100 objekter av gangen: noe mer kan gjøre at nettleseren fryser. Om du er sikker på at du vil se denne informasjonen kan du gjøre det ved å klikke på knappen nedenfor." loading: Laster... - manually_select: Velg et annet område manuelt - object_list: - api: Hent dette området fra API-et - back: Vis objektliste - details: Detaljer - heading: Objektliste - history: - type: - node: Node [[id]] - way: Vei [[id]] - selected: - type: - node: Node [[id]] - way: Vei [[id]] - type: - node: Node - way: Vei - private_user: privat bruker - show_areas: Vis områder - show_history: Vis historikk - unable_to_load_size: "Klarte ikke laste inn: Avgrensingsboks med størrelse [[bbox_size]] er for stor (må være mindre enn %{max_bbox_size})" - wait: Vent ... - zoom_or_select: Zoom inn eller velg et område av kartet for visning tag_details: - tags: "Markelapper:" + tags: Merkelapper wiki_link: key: Wiki-beskrivelsessiden for %{key}-elementet tag: Wiki-beskrivelsessiden for %{key}=%{value}-elementet wikipedia_link: Artikkelen %{page} på Wikipedia timeout: - sorry: Beklager, data for %{type} med id %{id} brukte for lang tid på å hentes. + sorry: Beklager, det tok for lang tid å hente data for %{type} med ID %{id}. type: changeset: endringssett node: node relation: relasjon way: vei + version: Versjon + view_details: Vis detaljer + view_history: Vis historikk way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Last ned XML - edit: rediger - view_history: vis historikk - way: Vei - way_title: "Vei: %{way_name}" - way_details: also_part_of: - one: også del av veien %{related_ways} - other: også del av veiene %{related_ways} - nodes: "Noder:" - part_of: "Del av:" - way_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Last ned XML - view_details: vis detaljer - way_history: Veihistorikk - way_history_title: "Veihistorikk: %{way_name}" + one: delstrekning %{related_ways} + other: delstrekninger %{related_ways} + history_title: "Strekningshistorikk: %{name}" + nodes: Noder + title: "Strekning: %{name}" changeset: changeset: anonymous: Anonym - big_area: (stor) - no_comment: (ingen) no_edits: (ingen redigeringer) - show_area_box: vis boks for område - still_editing: (redigerer forsatt) view_changeset_details: Vis detaljer for endringssett changeset_paging_nav: next: Neste » previous: « Forrige - showing_page: Viser side %{page} + showing_page: Side %{page} changesets: area: Område comment: Kommentar @@ -286,32 +208,37 @@ nb: saved_at: Lagret user: Bruker list: - description: Siste endringer - description_bbox: Endringssett innenfor %{bbox} - description_friend: Endringssett av dine venner - description_user: Endringssett av %{user} - description_user_bbox: Endringssett av %{user} innen %{bbox} - heading: Endringssett - heading_bbox: Endringssett - heading_friend: Endringssett - heading_user: Endringssett - heading_user_bbox: Endringssett + empty: Ingen endringssett funnet. + empty_area: Ingen endringssett i dette området. + empty_user: Ingen endringssett fra denne brukeren. + load_more: Last inn mer + no_more: Ingen flere endringssett funnet. + no_more_area: Ingen flere endringssett i dette området. + no_more_user: Ingen flere endringssett fra denne brukeren. title: Endringssett - title_bbox: Endringssett innenfor %{bbox} title_friend: Endringssett av dine venner + title_nearby: Endringssett av brukere i nærheten title_user: Endringssett av %{user} - title_user_bbox: Endringssett av %{user} innen %{bbox} timeout: sorry: Beklager, listen over endringssett som du ba om tok for lang tid å hente. diary_entry: + comments: + ago: "%{ago} siden" + comment: Kommentar + has_commented_on: "%{display_name} har kommentert på følgende dagboksoppføring" + newer_comments: Nyere kommentarer + older_comments: Eldre kommentarer + post: Skriv + when: Når diary_comment: comment_from: Kommentar fra %{link_user}, %{comment_created_at} confirm: Bekreft hide_link: Skjul denne kommentaren diary_entry: comment_count: - one: 1 kommentar + one: "{count} kommentar" other: "%{count} kommentarer" + zero: Ingen kommentarer comment_link: Kommenter denne oppføringen confirm: Bekreft edit_link: Rediger denne oppføringen @@ -346,8 +273,10 @@ nb: newer_entries: Nyere oppføringer no_entries: Ingen oppføringer i dagboka older_entries: Eldre oppføringer - recent_entries: "Nye oppføringer i dagboka:" + recent_entries: Nye oppføringer i dagboka title: Brukernes dagbøker + title_friends: Dagbøkene til vennene dine + title_nearby: Dagbøkene til nærliggende brukere user_title: Dagboken for %{user} location: edit: Rediger @@ -368,6 +297,9 @@ nb: user_title: Dagboken for %{user} editor: default: Standard (nåværende %{name}) + id: + description: iD (nettlesers egen editor) + name: iD potlatch: description: Potlatch 1 (rediger i nettleseren) name: Potlatch 1 @@ -383,7 +315,7 @@ nb: area_to_export: Område som skal eksporteres embeddable_html: HTML som kan bygges inn export_button: Eksporter - export_details: Data fra OpenStreetMap er lisensiert under lisensen Creative Commons Navngivelse-Del på samme vilkår 2.0. + export_details: Data fra OpenStreetMap er lisensiert under Open Data Commons Open Database License (ODbL). format: Format format_to_export: Format for eksport image_size: Bildestørrelse @@ -391,6 +323,7 @@ nb: licence: Lisens longitude: "Len:" manually_select: Velg et annet område manuelt + map_image: Kartbilde (viser standardlag) max: maks options: Valg osm_xml_data: OpenStreetMap XML-data @@ -398,29 +331,34 @@ nb: paste_html: Lim inn HTML som skal bygges inn i nettsted scale: Skala too_large: - body: Dette området er for stort for å bli eksportert som OpenStreetMap XML-data. Zoom inn eller velg et mindre område. - heading: For stort område + advice: "Hvis eksporten over feiler, vær vennlig å vurdere bruk av en av kildene i listen under:" + body: Dette området er for stort for å bli eksportert som OpenStreetMap XML-data. Vennligst zoom inn eller velg et mindre område. Eller du kan bruke en av kildene angitt under for nedlasting av bulkdata. + geofabrik: + description: Regelmessig oppdaterte utdrag av verdensdeler, land og utvalgte byer + title: Geofabrik-nedlastninger + metro: + description: Utdrag av verdens største byer med omgivelser + title: Metro-utdrag + other: + description: Ytterliger kilder listet på OpenStreetMap-wikien + title: Andre kilder + overpass: + description: Last ned denne avgrensingsrammen fra et speil av OpenStreetMap-databasen + title: Overførings-API + planet: + description: Regelmessig oppdaterte kopier av hele OpenStreetMap-databasen + title: Planet-OSM zoom: Zoom - start_rjs: - add_marker: Legg til en markør på kartet - change_marker: Endre markørposisjon - click_add_marker: Klikk på kartet for å legge til en markør - drag_a_box: Dra en boks på kartet for å velge et område - export: Eksporter - manually_select: Velg et annet område manuelt - view_larger_map: Vis større kart + title: Eksporter geocoder: description: title: geonames: Posisjon fra GeoNames - osm_namefinder: "%{types} fra OpenStreetMap Namefinder" osm_nominatim: Sted fra OpenStreetMap Nominatim types: cities: Byer places: Steder towns: Småbyer - description_osm_namefinder: - prefix: "%{distance} %{direction} av %{type}" direction: east: øst north: nord @@ -441,17 +379,34 @@ nb: title: ca_postcode: Resultat fra Geocoder.CA geonames: Resultat fra GeoNames + geonames_reverse: Resultater fra GeoNames latlon: Resultat fra Internt - osm_namefinder: Resultat fra OpenStreetMap Namefinder osm_nominatim: Resultat fra OpenStreetMap Nominatim + osm_nominatim_reverse: Resultater fra OpenStreetMap Nominatim uk_postcode: Resultat fra NPEMap / FreeThe Postcode us_postcode: Resultat fra Geocoder.us - search_osm_namefinder: - prefix: "%{type}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} av %{parentname})" - suffix_place: ", %{distance} %{direction} av %{placename}" search_osm_nominatim: + admin_levels: + level10: Forstadsgrense + level2: Riksgrense + level4: Statsgrense + level5: Områdegrense + level6: Fylkesgrense + level8: Bygrense + level9: Landsbygrense prefix: + aerialway: + chair_lift: Stolheis + drag_lift: Skitrekk + station: Fjellheisstasjon + aeroway: + aerodrome: Flyplass + apron: Flyrampe + gate: Gate + helipad: Helikopterplass + runway: Rullebane + taxiway: Taksebane + terminal: Terminal amenity: WLAN: Trådløs internettilgang airport: Flyplass @@ -465,6 +420,7 @@ nb: bench: Benk bicycle_parking: Sykkelparkering bicycle_rental: Sykkelutleie + biergarten: Ølhage brothel: Bordell bureau_de_change: Vekslingskontor bus_station: Busstasjon @@ -473,6 +429,7 @@ nb: car_sharing: Bildeling car_wash: Bilvask casino: Kasino + charging_station: Ladestasjon cinema: Kino clinic: Klinikk club: Klubb @@ -533,9 +490,12 @@ nb: shop: Butikk shopping: Handel shower: Dusj + social_centre: Samfunnshus social_club: Sosial klubb + social_facility: Sosialtjeneste studio: Studio supermarket: Supermarked + swimming_pool: Svømmebasseng taxi: Drosje telephone: Offentlig telefon theatre: Teater @@ -550,14 +510,20 @@ nb: youth_centre: Ungdomssenter boundary: administrative: Administrativ grense + census: Folketellingsgrense national_park: Nasjonalpark protected_area: Verna område bridge: + aqueduct: Akvadukt suspension: Hengebru swing: Svingbru + viaduct: Viadukt "yes": Bru building: "yes": Bygning + emergency: + fire_hydrant: Brannhydrant + phone: Nødtelefon highway: bridleway: Ridevei bus_guideway: Ledet bussfelt @@ -569,6 +535,7 @@ nb: footway: Gangsti ford: Vadested living_street: Gatetun + milestone: Milepæl minor: Mindre vei motorway: Motorvei motorway_junction: Motorveikryss @@ -578,6 +545,7 @@ nb: platform: Perrong primary: Primær vei primary_link: Primær vei + proposed: Foreslått vei raceway: Racerbane residential: Bolig rest_area: Rasteplass @@ -586,9 +554,12 @@ nb: secondary_link: Sekundær vei service: Tjenestevei services: Motorveitjenester + speed_camera: Fotoboks steps: Trapper stile: Stige + street_lamp: Gatelys tertiary: Tertiær vei + tertiary_link: Lokalvei track: Sti trail: Sti trunk: Hovedvei @@ -602,6 +573,8 @@ nb: building: Bygning castle: Slott church: Kirke + citywalls: Bymurer + fort: Fort house: Hus icon: Ikon manor: Herregård @@ -610,6 +583,7 @@ nb: monument: Monument museum: Museum ruins: Ruiner + tomb: Grav tower: Tårn wayside_cross: Veikant kors wayside_shrine: Veikant alter @@ -626,6 +600,7 @@ nb: farmland: Jordbruksland farmyard: Gårdstun forest: Skog + garages: Garasjer grass: Gress greenfield: Ikke-utviklet område industrial: Industriområde @@ -634,22 +609,27 @@ nb: military: Militært område mine: Gruve nature_reserve: Naturreservat + orchard: Frukthage park: Park piste: Løype quarry: Steinbrudd railway: Jernbane recreation_ground: Idrettsplass reservoir: Reservoar + reservoir_watershed: Magasinvannskille residential: Boligområde retail: Detaljsalg + road: Veiområde village_green: landsbypark vineyard: Vingård wetland: Våtland wood: Skog leisure: beach_resort: Strandsted + bird_hide: Fugletårn common: Allmenning fishing: Fiskeområde + fitness_station: Treningsstudio garden: Hage golf_course: Golfbane ice_rink: Skøytebane @@ -660,12 +640,19 @@ nb: pitch: Sportsarena playground: Lekeplass recreation_ground: Idrettsplass + sauna: Sauna slipway: Slipp sports_centre: Sportssenter stadium: Stadion swimming_pool: Svømmebaseng track: Løpebane water_park: Vannpark + military: + airfield: Militær flyplass + barracks: Kaserne + bunker: Bunker + mountain_pass: + "yes": Fjellovergang natural: bay: Bukt beach: Strand @@ -674,9 +661,11 @@ nb: channel: Kanal cliff: Klippe crater: Krater + dune: Sanddyne feature: Egenskap fell: Fjellskrent fjord: Fjord + forest: Skog geyser: Geysir glacier: Isbre heath: Vidde @@ -705,6 +694,19 @@ nb: wetland: Våtmark wetlands: Våtland wood: Skog + office: + accountant: Revisor + architect: Arkitekt + company: Firma + employment_agency: Bemanningsfirma + estate_agent: Eiendomsmegler + government: Statlig kontor + insurance: Forsikringskontor + lawyer: Advokat + ngo: Ikke-statlig kontor + telecommunication: Telekommunikasjonskontor + travel_agent: Reisebyrå + "yes": Kontor place: airport: Flyplass city: By @@ -716,9 +718,11 @@ nb: houses: Hus island: Øy islet: Holme + isolated_dwelling: Enslig bosted locality: Plass moor: Myr municipality: Kommune + neighbourhood: Naboskap postcode: Postnummer region: Område sea: Hav @@ -739,12 +743,15 @@ nb: junction: Jernbanekryss level_crossing: Planovergang light_rail: Bybane + miniature: Miniatyrjernbane monorail: Enskinnebane narrow_gauge: Smalspor jernbane platform: Jernbaneperrong preserved: Bevart jernbane + proposed: Foreslått jernbane spur: Jernbaneforgrening station: Jernbanestasjon + stop: Jernbaneknutepunkt subway: T-banestasjon subway_entrance: T-baneinngang switch: Sporveksel @@ -753,12 +760,14 @@ nb: yard: Skiftetomt shop: alcohol: Utenfor lisens + antiques: Antikviteter art: Kunstbutikk bakery: Bakeri beauty: Skjønnhetssalong beverages: Drikkevarerbutikk bicycle: Sykkelbutikk books: Bokhandel + boutique: Luksusforretning butcher: Slakter car: Bilbutikk car_parts: Bildeler @@ -772,6 +781,7 @@ nb: convenience: Nærbutikk copyshop: Kopieringsbutikk cosmetics: Kosmetikkforretning + deli: Delikatessebutikk department_store: Varehus discount: Tilbudsbutikk doityourself: Gjør-det-selv @@ -808,17 +818,21 @@ nb: organic: Organisk matbutikk outdoor: Utendørs butikk pet: Dyrebutikk + pharmacy: Apotek photo: Fotobutikk salon: Salong + second_hand: Bruktbutikk shoes: Skobutikk shopping_centre: Kjøpesenter sports: Sportsbutikk stationery: Papirbutikk supermarket: Supermarked + tailor: Skredder toys: Lekebutikk travel_agency: Reisebyrå video: Videobutikk wine: Utenfor lisens + "yes": Butikk tourism: alpine_hut: Fjellhytte artwork: Kunstverk @@ -840,7 +854,11 @@ nb: valley: Dal viewpoint: Utsiktspunkt zoo: Dyrepark + tunnel: + culvert: Kulvert + "yes": Tunnel waterway: + artificial: Kunstig vassdrag boatyard: Båthan canal: Kanal connector: Vannveiforbindelse @@ -863,84 +881,129 @@ nb: weir: Overløpskant \ prefix_format: "%{name}" javascripts: + close: Lukk + key: + title: Kartsymbol + tooltip: Kartsymbol map: base: cycle_map: Sykkelkart mapquest: MapQuest Open + standard: Standard transport_map: Transport-kart - overlays: - maplint: Maplint + layers: + data: Kartdata + header: Kartlag + notes: Kartmerknader + overlays: Aktiver overlag for å feilsøke kartet + zoom: + in: Zoom inn + out: Zoom ut + notes: + new: + add: Legg til merknad + intro: For å forbedre kartet vil de opplysningene du oppgir bli vist til andre kartleggere. Vær derfor så beskrivende og presis som mulig, når du plasserer markøren og fyller inn din merknad nedenfor. + show: + anonymous_warning: Denne merknaden inneholder kommentarer fra anonyme brukere som bør bekreftes uavhengig. + comment: Kommenter + comment_and_resolve: Kommenter og løs + hide: Skjul + reactivate: Reaktiver + resolve: Løs + share: + cancel: Avbryt + link: Lenke eller HTML + long_link: Lenke + short_link: Kort lenke + title: Del site: + createnote_disabled_tooltip: Zoom inn for å legge til en merknad på kartet + createnote_tooltip: Legg til en merknad på kartet edit_disabled_tooltip: Zoom inn for å redigere kartet edit_tooltip: Rediger kartet - edit_zoom_alert: Du må zoome inn for å redigere kartet - history_disabled_tooltip: Zoom inn for å vise redigeringer i dette området - history_tooltip: Vis redigeringer for dette området - history_zoom_alert: Du må zoome inn for å vise redigeringer i dette området layouts: + about: Om community: Samfunnet community_blogs: Fellesskapsblogger community_blogs_title: Blogger fra medlemmene i OpenStreetMap-felleskapet - copyright: Opphavsrett & lisens - documentation: Dokumentasjon - documentation_title: Dokumentasjon for prosjektet + copyright: Opphavsrett + data: Data donate: Støtt OpenStreetMap ved %{link} til Hardware Upgrade Fund (et fond for maskinvareoppgraderinger). - donate_link_text: donering edit: Rediger edit_with: Rediger med %{editor} export: Eksporter - export_tooltip: Eksporter kartdata + export_data: Eksporter data foundation: Stiftelse foundation_title: OpenStreetMap-stiftelsen gps_traces: GPS-spor gps_traces_tooltip: Behandle GPS-spor help: Hjelp - help_centre: Brukerstøtte - help_title: Hjelpenettsted for prosjektet history: Historikk - home: hjem - home_tooltip: Gå til hjemmeposisjon - inbox: innboks (%{count}) - inbox_tooltip: - one: Din innboks inneholder 1 ulest melding - other: Din innboks inneholder %{count} uleste meldinger - zero: Din innboks inneholder ingen uleste meldinger - intro_1: OpenStreetMap er et fritt redigerbart kart over hele jorda. Det er lagd av folk som deg. - license: - title: Data fra OpenStreetMap er lisensiert under lisensen Creative Commons Navngivelse-Del på like vilkår 2.0 Generisk - log_in: logg inn + home: Gå til din brukers hjemmeadresse + intro_2_create_account: Opprett en brukerkonto + intro_header: Velkommen til OpenStreetMap! + intro_text: OpenStreetMap er et kart over verden, skapt av mennesker som deg, og gratis å bruke under en åpen lisens. + learn_more: Lær mer + log_in: Logg inn log_in_tooltip: Logg inn med en eksisterende konto logo: alt_text: OpenStreetMap-logo - logout: logg ut - logout_tooltip: Logg ut + logout: Logg ut make_a_donation: text: Doner title: Støtt OpenStreetMap med en donasjon + more: Mer osm_offline: OpenStreetMap databasen er for øyeblikket utilgjengelig mens essensielt vedlikeholdsarbeid utføres. osm_read_only: OpenStreetMap kan ikke redigeres akkurat nå, på grunn av nødvendig vedlikeholdsarbeid. + partners_bytemark: Bytemark Hosting + partners_html: Hosting er støttet av %{ucl}, %{ic}, %{bytemark} og andre %{partners}. + partners_ic: Imperial College London partners_partners: partnere + partners_ucl: UCL VR-senteret project_name: h1: OpenStreetMap title: OpenStreetMap - sign_up: registrer + sign_up: Registrer deg sign_up_tooltip: Opprett en konto for redigering - sotm2011: Kom til 2011 OpenStreetMap-konferansen, «Kartets tilstand», 11.-9. september i Denver! + start_mapping: Start kartlegging tag_line: Fritt Wiki-verdenskart user_diaries: Brukerdagbok user_diaries_tooltip: Vis brukerens dagbok - view: Vis - view_tooltip: Vis kartet - welcome_user: Velkommen, %{user_link} - welcome_user_link_tooltip: Din brukerside - wiki: Wiki - wiki_title: Wikinettsted for prosjektet license_page: foreign: english_link: den engelske originalen - text: I tilfellet av en konflikt mellom denne oversatte siden og %{english_original_link} har den engelske presedens + text: I tilfelle konflikt mellom denne oversatte siden og %{english_original_link} har den engelske versjonen presedens title: Om denne oversettelsen - legal_babble: "

    Opphavsrett og lisenser

    \n

    \n OpenStreetMap er åpne data, lisensiert under Creative\n Commons Navngivelse-DelPåSammeVilkår 2.0 (CC BY-SA).\n

    \n

    \n Du er fri til å kopiere, distribuere, overføre og tilpasse våre kart og data, så lenge du krediterer OpenStreetMap og dens\n bidragsytere. Hvis du endrer eller bygger på våre kart eller data, kan du bare distribuere resultatet under samme lisens. \n Den fulle juridiske\n koden forklarer rettighetene og ansvaret.\n

    \n\n

    Hvordan kreditere OpenStreetMap

    \n

    \n Hvis du bruker OpenStreetMap kartbilder, ber vi om at din kreditering minst inneholder \n «© OpenStreetMap-bidragsytere, CC BY-SA». Hvis du bare bruker kartdata, ber vi om \n «Kartdata © OpenStreetMap-bidragsytere, CC BY-SA».\n

    \n

    \n Der det er mulig, bør OpenStreetMap bli lenket til http://www.openstreetmap.org/\n og CC BY-SA til http://creativecommons.org/licenses/by-sa/2.0/. Hvis\n du bruker et medium der lenker ikke er mulig (f.eks. i utskrevne arbeid), foreslår vi at du henviser leserne til\n www.openstreetmap.org (kanskje ved å utvide 'OpenStreetMap' til denne fullstendige adressen) og til\n www.creativecommons.org.\n

    \n\n

    Finn ut mer

    \n

    \n Les mer om hvordan du bruker våre data i den juridiske\n FAQ-en.\n

    \n

    \n OSM-bidragsytere blir påminnet å aldri legge til data fra opphavsrettsbeskyttede kilder (f.eks. Google Maps eller utskrevne kart) uten\n uttrykkelig tillatelse fra rettighetshavere.\n

    \n

    \n Selv om OpenStreetMap er åpne data kan vi ikke gi et\n gratis kart-API til tredjepartsutviklere.\n\n Se våre retningslinjer for bruken av API-et,\n kartbilder (Tiles)\n og Nominatim.\n

    \n\n

    Våre bidragsytere

    \n

    \n Vår CC BY-SA-lisens krever at du «gir den opprinnelige forfatteren rimelig kreditt til mediet eller måten du\n benytter». Individuelle OSM-kartleggere krever ikke en kreditering utover «OpenStreetMap bidragsytere»,\n men der data fra et nasjonal kartleggingsbyrå eller fra en annen stor kilde er blitt inkludert inne i\n OpenStreetMap, kan det være fornuftig å kreditere dem ved direkte\n reprodusering av deres kreditt eller ved å linke til det på denne siden.\n

    \n\n\n\n
      \n
    • Australia: Inneholder forstaddata basert\n på Australian Bureau of Statistics data.
    • \n
    • Canada: Inneholder data fra\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Frankrike: Inneholder data hentet fra\n Direction Générale des Impôts.
    • \n
    • New Zealand: Inneholder data hentet fra\n Land Information New Zealand. Crown Copyright reservert.
    • \n
    • Polen: Inneholder data fra UMP-pcPL maps. Copyright\n UMP-pcPL bidragsytere.
    • \n
    • Storbritannia: Inneholder Ordnance\n Survey data © Crown copyright og database-rettigheter\n 2010.
    • \n
    • Østerrike: Inneholder data hentet fra\n Stadt Wien under\n CC BY.
    • \n
    \n\n

    \n Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige\n dataleverandøren støtter OpenStreetMap, gir noen garanti eller\n godtar noe erstatningsansvar.\n

    " + legal_babble: + attribution_example: + alt: Eksempel på hvordan man angir OpenStreetMap som kartkilde på en nettside + title: Eksempel på kildehenvisning + contributors_at_html: "Østerrike: Inneholder data fra\n Stadt Wien under\n CC BY,\nLand Vorarlberg og\nLand Tirol (under CC-BY AT med tilføyelser)." + contributors_ca_html: "Canada: Inneholder data fra\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Finland: Inneholder data fra National Land Survey fra Finlands topografiske database og andre datasett under NLSFI-lisensen." + contributors_footer_1_html: For detaljer om disse og andre kilder som har blitt brukt for å forbedre OpenStreetMap, se siden med bidragsytere på OpenStreetMap-wikien. + contributors_footer_2_html: " Inkludering av data i OpenStreetMap innebærer ikke at den opprinnelige\n dataleverandøren støtter OpenStreetMap, gir noen garanti eller\n godtar noe erstatningsansvar." + contributors_fr_html: "Frankrike: Inneholder data hentet fra\n Direction Générale des Impôts." + contributors_gb_html: "Storbritannia: Inneholder Ordnance\n Survey data © Crown copyright and database right 2010-12." + contributors_intro_html: "Vi har tusenvis av individuelle bidragsytere. Vi inkluderer også åpne datasett fra nasjonale karttjenester og andre kilder, blant annet fra:" + contributors_nl_html: "Nederland: Inneholder © AND data, 2007\n(www.and.com)" + contributors_nz_html: "New Zealand: Inneholder data hentet fra\n Land Information New Zealand. Crown Copyright reservert." + contributors_title_html: Våre bidragsytere + contributors_za_html: "Sør-Afrika: Inneholder data fra Chief Directorate: National Geo-Spatial Information, State copyright reservert." + credit_1_html: Vi krever at du bruker godskrivinga «© OpenStreetMap-bidragsyterene». + credit_2_html: "Du må også gjøre det klart at dataene er tilgjengelige under Open \nDatabase License, og dersom du bruker våre kartfliser, at kartografien er\n lisensert som CC-BY-SA. Du kan gjøre dette ved å lenke til\ndenne siden om opphavsrett. \nAlternativt, og som et krav, hvis du distribuerer OSM i et\n dataskjema, kan du navngi og opprette en hyperlink direkte til lisensene. I medier\n hvor hyperlenker ikke er mulig (f.eks. trykte verker) foreslår vi at du\n henviser dine lesere til openstreetmap.org (kanskje ved å utvide\n'OpenStreetMap' til denne fulle adressen), til opendatacommons.org, og\n hvis relevant, til creativecommons.org." + credit_3_html: For et navigerbart elektronisk kart bør krediteringen vises i hjørnet på kartet. + credit_title_html: Hvordan kreditere OpenStreetMap + infringement_1_html: OSM-bidragsytere blir minnet på aldri å legge til data fra opphavsrettsbeskyttede kilder (f.eks. Google Maps eller utskrevne kart) uten uttrykkelig tillatelse fra rettighetshaverne. + infringement_2_html: "Hvis du mener at opphavsrettslig beskyttet materiale feilaktig er\nlagt til OpenStreetMap-databasen eller dette nettstedet, ber vi deg se på\nvår prosedyre for fjerning av materiale eller send inn klagen direkte på\nnettsiden." + infringement_title_html: Brudd på opphavsrettigheter + intro_1_html: "OpenStreetMap er åpne data, lisensiert under Open Data\nCommons Open Database License (ODbL)." + intro_2_html: Du står fritt til å kopiere, distribuere, overføre og tilpasse våre kart og data, så lenge du krediterer OpenStreetMap og dens bidragsytere. Hvis du endrer eller bygger videre på våre kart eller data, må du distribuere resultatet under samme lisens. Den fullstendige juridiske teksten beskriver rettigheter og ansvar. + intro_3_html: "Kartografien i våre kartruter, samt dokumentasjonen, er lisensiert under Creative\nCommons Attribution-ShareAlike 2.0 license (CC-BY-SA)." + more_1_html: " Les mer om hvordan du bruker våre data i den juridiske\n FAQ-en" + more_2_html: "Selv om OpenStreetMap er åpne data, kan vi ikke bidra med gratiskart-API for tredjepartsutviklere. Nærmere informasjon finnes på API Usage Policy,\nTile Usage Policy og Nominatim Usage Policy." + more_title_html: Finn ut mer + title_html: Opphavsrett og lisenser native: mapping_link: start kartlegging native_link: Norsk versjon @@ -952,8 +1015,15 @@ nb: inbox: date: Dato from: Fra + messages: Du har %{new_messages} og %{old_messages} my_inbox: Min innboks - no_messages_yet: Du har ingen meldinger enda. Kanskje du kan prøve å komme i kontakt med %{people_mapping_nearby_link}? + new_messages: + one: "%{count} ny melding" + other: "%{count} nye meldinger" + no_messages_yet: Du har ingen meldinger ennå. Kanskje du kan prøve å komme i kontakt med %{people_mapping_nearby_link}? + old_messages: + one: "%{count} gammel melding" + other: "%{count} gamle meldinger" outbox: utboks people_mapping_nearby: folk i nærheten som lager kart subject: Emne @@ -982,6 +1052,9 @@ nb: outbox: date: Dato inbox: innboks + messages: + one: Du har %{count} sendt melding + other: Du har %{count} sendte meldinger my_inbox: Min %{inbox_link} no_sent_messages: folk i nærheten som lager kart outbox: utboks @@ -990,12 +1063,9 @@ nb: title: Utboks to: Til read: - back_to_inbox: Tilbake til innboks - back_to_outbox: Tilbake til utboks + back: Tilbake date: Dato from: Fra - reading_your_messages: Leser dine meldinger - reading_your_sent_messages: Les dine sendte meldinger reply_button: Svar subject: Emne title: Les melding @@ -1006,6 +1076,37 @@ nb: wrong_user: Du er logget inn som «%{user}», men meldingen du ønsker å svare på ble ikke sendt til den brukeren. Logg inn som korrekt bruker for å svare. sent_message_summary: delete_button: Slett + note: + description: + closed_at_by_html: Løst for %{when} siden av %{user} + closed_at_html: Løst for %{when} siden + commented_at_by_html: Oppdatert for %{when} siden av %{user} + commented_at_html: Oppdatert for %{when} siden + opened_at_by_html: Opprettet for %{when} siden av %{user} + opened_at_html: Opprettet for %{when} siden + reopened_at_by_html: Reaktivert for %{when} siden av %{user} + reopened_at_html: Reaktivert for %{when} siden + entry: + comment: Kommentar + full: Full merknad + mine: + ago_html: "%{when} siden" + created_at: Opprettet + creator: Skaper + description: Beskrivelse + heading: "%{user} sine merknader" + id: ID + last_changed: Sist endret + subheading: Merknader sendt inn eller kommentert på av %{user} + title: Merknader sendt inn eller kommentert på av %{user} + rss: + closed: lukket merknad (nær %{place}) + commented: ny kommentar (nær %{place}) + description_area: En liste over merknader, rapportert, kommentert på eller lukket i ditt område [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: En RSS-feed for merknad %{id} + opened: ny merknad (nær %{place}) + reopened: reaktivert merknad (nær %{place}) + title: OpenStreetMap-merknader notifier: diary_comment_notification: footer: Du kan også lese kommentaren på %{readurl} og du kan kommentere på %{commenturl} eller svare på %{replyurl} @@ -1015,14 +1116,13 @@ nb: email_confirm: subject: "[OpenStreetMap] Bekreft din e-postadresse" email_confirm_html: - click_the_link: Om dette er deg, vennligst klikk på lenken under for å bekrefte endringen. + click_the_link: Om dette er deg, klikk på lenken under for å bekrefte endringen. greeting: Hei, hopefully_you: Noen (forhåpentligvis deg) ønsker å endre e-postadressen for %{server_url} til %{new_address}. email_confirm_plain: click_the_link: Hvis det er deg, klikk lenka nedenfor for å bekrefte endringen. greeting: Hei, - hopefully_you_1: Noen (forhåpentligvis deg) ønsker å endre e-postadressen for - hopefully_you_2: "%{server_url} til %{new_address}." + hopefully_you: Noen (forhåpentligvis deg) ønsker å endre e-postadressen for %{server_url} til %{new_address}. friend_notification: befriend_them: Du kan også legge dem til som venn på %{befriendurl}. had_added_you: "%{user} har lagt deg til som venn på OpenStreetMap." @@ -1049,56 +1149,49 @@ nb: greeting: Hei, hopefully_you: Noen (forhåpentligvis deg) har bedt å nullstille passordet for OpenStreetMap-kontoen knyttet til denne e-postadressen. lost_password_plain: - click_the_link: Om dette er deg, vennligst klikk på lenken under for å tilbakestille passordet. + click_the_link: Om dette er deg, klikk på lenken under for å tilbakestille passordet. greeting: Hei, - hopefully_you_1: Noen (muligens deg) har bedt om å tilbakestille passordet på denne - hopefully_you_2: e-postadressser for openstreetmap.org-konto. + hopefully_you: Noen (forhåpentligvis deg) har bedt om å nullstille passordet for OpenStreetMap-kontoen knyttet til denne e-postadressen. message_notification: - footer1: Du kan også lese meldingen på %{readurl} - footer2: og du kan svare til %{replyurl} + footer_html: Du kan også lese meldingen på %{readurl} og du kan svare på %{replyurl} header: "%{from_user} har sendt deg en melding gjennom OpenStreetMap med emnet %{subject}:" hi: Hei %{to_user}, subject_header: "[OpenStreetMap] %{subject}" + note_comment_notification: + anonymous: En anonym bruker + closed: + commented_note: "%{commenter} har løst en kartmerknad som du har kommentert på. Merknaden er i nærheten av %{place}." + subject_other: "[OpenStreetMap] %{commenter} har løst en merknad som du er interessert i" + subject_own: "[OpenStreetMap] %{commenter} har løst en av dine merknader" + your_note: "%{commenter} har løst en av dine kartmerknader nær %{place}." + commented: + commented_note: "%{commenter} har etterlatt en kommentar på en kartmerknad som du har kommentert. Merknaden er i nærheten av %{place}." + subject_other: "[OpenStreetMap] %{commenter} har kommentert en merknad som du er interessert i" + subject_own: "[OpenStreetMap] %{commenter} har kommentert en av dine merknader" + your_note: "%{commenter} har etterlatt en kommentar på en av dine kartmerknader nær %{place}." + details: Flere opplysninger om merknaden finner du på %{url}. + greeting: Hei, + reopened: + commented_note: "%{commenter} har reaktivert en kartmerknad som du har kommentert på. Merknaden er i nærheten av %{place}." + subject_other: "[OpenStreetMap] %{commenter} har reaktivert en merknad som du er interessert i" + subject_own: "[OpenStreetMap] %{commenter} har reaktivert en av dine merknader" + your_note: "%{commenter} har reaktivert en av dine kartmerknader nær %{place}." signup_confirm: - subject: "[OpenStreetMap] Bekreft din e-postadresse" - signup_confirm_html: - ask_questions: Du kan stille spørsmål du har om OpenStreetMap på vårt spørsmål og svar-nettsted. - click_the_link: Hvis dette er deg, så er du velkommen! Klikke lenka nedenfor for å bekrefte kontoen og les videre for mer informasjon om OpenStreetMap - current_user: En liste over nåværende brukere i kategorier, basert på hvor i verden de er, er tilgjengelig fra Category:Users_by_geographical_region. - get_reading: Start å lese om OpenStreetMap på wikien, få med deg de siste nyhetene via OpenStreetMap-bloggen eller Twitter. Eller bla gjennom OpenStreetMaps grunnlegger Steve Coasts OpenGeoData-blogg for hele historien til prosjektet, som også har engelske podkaster du kan lytte til. + confirm: "Før vi kan gjøre noe må vi få bekreftet at denne forespørselen kom fra deg. Om dette stemmer, klikk på lenken nedenfor for å bekrefte kontoen din:" + created: Noen (forhåpentligvis du) har nettopp opprettet en konto på %{site_url}. greeting: Hei der! - hopefully_you: Noen (forhåpentligvis deg) ønsker å opprette en konto på - introductory_video: Du kan se en %{introductory_video_link}. - more_videos: Det er %{more_videos_link}. - more_videos_here: flere videoer her - user_wiki_page: Det anbefales at du oppretter en brukerside på wiki-en som inkluderer kategorimerker som viser hvor du er, f.eks [[Category:Users_in_London]]. - video_to_openstreetmap: introduksjonsvideo til OpenStreetMap - wiki_signup: Du vil kanskje melde deg inn i OpenStreetMap-wikien også. - signup_confirm_plain: - ask_questions: "Du kan stille spørsmål du har om OpenStreetMap på vårt spørsmål og svar-nettsted:" - blog_and_twitter: "Få med deg de siste nyhetene gjennom OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Om dette er deg, velkommen! Vennligst klikk på lenken under for å bekrefte din - click_the_link_2: konto og les videre for mer informasjon om OpenStreetMap. - current_user_1: En liste over nåværende brukere i kategorier, basert på hvor i verden - current_user_2: "de er, er tilgjengelig fra:" - greeting: Hei der! - hopefully_you: Noen (forhåpentligvis deg) ønsker å opprette en konto på - introductory_video: "Du kan se en introduksjonsvideo for OpenStreetMap her:" - more_videos: "Det er flere videoer her:" - opengeodata: "OpenGeoData.org er bloggen til OpenStreetMap-grunnlegger Steve Coast, og den har podcast-er også:" - the_wiki: "Les mer om OpenStreetMap på wikien:" - user_wiki_1: Det anbefales at du oppretter en brukerside på wiki-en som inkluderer - user_wiki_2: kategorimerker som viser hvor du er, f.eks [[Category:Users_in_London]]. - wiki_signup: "Du vil kanskje også melde deg inn i OpenStreetMap-wikien på:" + subject: "[OpenStreetMap] Velkommen til OpenStreetMap" + welcome: Når du har bekreftet kontoen din, vil vi gi deg flere opplysninger så du kan komme godt i gang. oauth: oauthorize: - allow_read_gpx: les dine private GPS-spor. - allow_read_prefs: les brukerinnstillingene dine. - allow_to: "Tillat klientprogrammet å gjøre:" + allow_read_gpx: lese dine private GPS-spor. + allow_read_prefs: lese brukerinnstillingene dine. + allow_to: "Gi programmet lov til å:" allow_write_api: endre kartet. - allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner. - allow_write_gpx: last opp GPS-spor. - allow_write_prefs: Innstillingene ble lagret. + allow_write_diary: opprette dagbokoppføringer, kommentarer og finne venner. + allow_write_gpx: laste opp GPS-spor. + allow_write_notes: endre merknader. + allow_write_prefs: endre innstillingene dine. request_access: Applikasjonen %{app_name} ber om tilgang til din konto, %{user}. Sjekk om du vil at applikasjonen skal ha følgende muligheter. Du kan velge så mange eller få du vil. revoke: flash: Du slettet nøkkelen for %{application} @@ -1116,6 +1209,7 @@ nb: allow_write_api: endre kartet. allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner. allow_write_gpx: last opp GPS-spor. + allow_write_notes: endre merknader. allow_write_prefs: endre brukerinnstillingene deres. callback_url: "URL for tilbakekall:" name: Navn @@ -1146,21 +1240,56 @@ nb: allow_write_api: endre kartet. allow_write_diary: opprett dagbokoppføringer, kommentarer og finn venner. allow_write_gpx: last opp GPS-spor. + allow_write_notes: endre merknader. allow_write_prefs: endre brukerinnstillingene deres. authorize_url: "Godkjenn URL:" + confirm: Er du sikker? + delete: Slett klient edit: Rediger detaljer key: "Forbrukernøkkel:" requests: "Ber om følgende tillatelser fra brukeren:" secret: "Forbrukerhemmelighet:" - support_notice: Vi støtter HMAC-SHA1 (anbefalt) så vel som ren tekst i ssl-modus. + support_notice: Vi støtter HMAC-SHA1 (anbefalt) og RSA-SHA1 signaturer. title: OAuth-detaljer for %{app_name} url: "URL for forespørelsnøkkel:" update: flash: Oppdaterte klientinformasjonen + redaction: + create: + flash: Maskering opprettet. + destroy: + error: Det oppsto en feil da maskeringen skulle ødelegges + flash: Maskering ødelagt. + not_empty: Maskeringen er ikke tom. Avmasker alle versjoner som hører til denne maskeringen før du ødelegger den. + edit: + description: Beskrivelse + heading: Rediger maskering + submit: Lagre markering + title: Rediger maskering + index: + empty: Ingen maskeringer å vise. + heading: Liste over maskeringer + title: Liste over maskeringer + new: + description: Beskrivelse + heading: Legg inn informasjon for ny maskering + submit: Lag maskering + title: Lager ny maskering + show: + confirm: Er du sikker? + description: "Beskrivelse:" + destroy: Fjern denne maskeringen + edit: Endre denne maskeringen + heading: Viser maskering «%{title}» + title: Viser maskering + user: "Opprettet av:" + update: + flash: Endringer lagret. site: edit: anon_edits_link_text: Finn ut hvorfor dette er tilfellet. flash_player_required: Du trenger en Flash-spiller for å kunne bruke Potlatch, Flasheditoren for OpenStreetMap. Du kan laste ned Flash Player fra Adobe.com. Flere andre alternativ er også tilgjengelig for redigering av OpenStreetMap. + 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. not_public: Du har ikke satt dine redigeringer til å være offentlige. not_public_description: Du kan ikke lenger redigere kartet om du ikke gjør det. Du kan gjøre dine redigeringer offentlige fra din %{user_page}. @@ -1169,18 +1298,15 @@ nb: 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.) user_page_link: brukerside index: + createnote: Legg til en merknad js_1: Du har en nettleser som ikke støtter JavaScript eller så har du slått av JavaScript. js_2: OpenStreetMap bruker JavaScript på kartsidene. license: - license_name: Creative Commons Navngivelse-Del på like vilkår 2.0 - notice: Lisensiert under lisensen %{license_name} av %{project_name} og dets bidragsytere. - project_name: OpenStreetMap-prosjekt + copyright: Rettighetshaver OpenStreetMap og bidragsytere, under en åpen lisens permalink: Permanent lenke remote_failed: Klarte ikke redigere - forsikre deg at JOSM eller Merkaartor er lastet og fjernkontrollvalget er aktivert shortlink: Kort lenke key: - map_key: Kartforklaring - map_key_tooltip: Forklaring for kartet table: entry: admin: Administrativ grense @@ -1247,9 +1373,25 @@ nb: unclassified: Uklassifisert vei unsurfaced: Vei uten dekke wood: Ved + markdown_help: + alt: Alternativ tekst + first: Første punkt + heading: Overskrift + headings: Overskrifter + image: Bilde + link: Lenke + ordered: Sortert liste + second: Andre punkt + subheading: Underoverskrift + text: Tekst + title_html: Tolket med Markdown + unordered: Usortert liste + url: URL + richtext_area: + edit: Rediger + preview: Forhåndsvisning search: search: Søk - search_help: "Eksempler: 'Lindesnes', 'Karl Johans gate', 'Sør-Trøndelag' og flere ..." submit_text: Gå where_am_i: Hvor er jeg? where_am_i_title: Bruke søkemotoren til å beskrive gjeldende lokasjon. @@ -1276,13 +1418,15 @@ nb: points: "Punkter:" save_button: Lagre endringer start_coord: "Startkoordinat:" - tags: "Markelapper:" + tags: "Merkelapper:" tags_help: kommaseparert title: Redigerer spor %{name} uploaded_at: "Lastet opp:" visibility: "Synlighet:" visibility_help: hva betyr dette? list: + description: Bla gjennom nylig opplastede GPS-spor + empty_html: Ingenting her ennå. Last opp et nytt spor eller lær å lage GPS-spor på wiki-siden. public_traces: Offentlig GPS-spor public_traces_from: Offentlige GPS-spor fra %{user} tagged_with: merket med %{tags} @@ -1304,7 +1448,7 @@ nb: in: i map: kart more: mer - pending: VENTENDE + pending: VENTER private: PRIVAT public: OFFENTLIG trace_details: Vis detaljer for spor @@ -1322,14 +1466,16 @@ nb: trace_header: see_all_traces: Se alle spor see_your_traces: Se alle dine spor - traces_waiting: Du har %{count} spor som venter på opplasting. Du bør vurdere å la disse bli ferdig før du laster opp flere spor slik at du ikke blokkerer køa for andre brukere. + traces_waiting: + one: Du har %{count} spor som venter på opplasting. Du bør vurdere å la dette bli ferdig før du laster opp flere spor slik at du ikke blokkerer køa for andre brukere. + other: Du har %{count} spor som venter på opplasting. Du bør vurdere å la disse bli ferdig før du laster opp flere spor slik at du ikke blokkerer køa for andre brukere. upload_trace: Last opp et GPS-spor trace_optionals: tags: Merkelapper trace_paging_nav: - next: Neste » - previous: « Forrige - showing_page: Viser side %{page} + newer: Nyere spor + older: Eldre spor + showing_page: Side %{page} view: delete_track: Slett dette sporet description: "Beskrivelse:" @@ -1341,12 +1487,12 @@ nb: map: kart none: Ingen owner: "Eier:" - pending: VENTENDE + pending: VENTER points: "Punkter:" start_coordinates: "Startkoordinat:" - tags: "Markelapper:" + tags: "Merkelapper:" title: Viser spor %{name} - trace_not_found: Spor ikke funnet! + trace_not_found: Sporet ble ikke funnet! uploaded: "Lastet opp:" visibility: "Synlighet:" visibility: @@ -1361,13 +1507,16 @@ nb: agreed_with_pd: Du har også opplyst at du anser dine redigeringer for å være offentlig eiendom (Public Domain). heading: "Bidragsytervilkår:" link text: hva er dette? - not yet agreed: Du har enda ikke godkjent de nye bidragsytervilkårene. + not yet agreed: Du har ennå ikke godkjent de nye bidragsytervilkårene. review link text: Vennligst følg denne lenken når det passer deg, for å se igjennom og godkjenne de nye bidragsytervilkårene. current email address: "Nåværende e-postadresse:" delete image: Fjern gjeldende bilde - email never displayed publicly: " (vis aldri offentlig)" + email never displayed publicly: " (vises aldri offentlig)" flash update success: Brukerinformasjon oppdatert. flash update success confirm needed: Brukerinformasjon oppdatert. Sjekk eposten din for å bekrefte din epostadresse. + gravatar: + gravatar: Bruk Gravatar + link text: hva er dette? home location: "Hjemmeposisjon:" image: "Bilde:" image size hint: (kvadratiske bilder som er minst 100x100 fungerer best) @@ -1403,13 +1552,10 @@ nb: update home location on click: Oppdater hjemmelokasjon når jeg klikker på kartet? confirm: already active: Denne kontoen har allerede blitt bekreftet. - before you start: Vi vet du sannsynligvis har hastverk med å begynne å lage kart, men før du gjør dette kan du fylle inn litt informasjon om deg selv i skjemaet under. button: Bekreft - heading: Bekreft en brukerkonto + heading: Sjekk e-posten din! press confirm button: Klikk bekreftknappen nedenfor for å aktivere kontoen din. - reconfirm: Hvis det er en stund siden du registrerte deg kan det hende du må sende degselv en ny bekreftelsesepost. - success: Kontoen din er bekreftet - takk for at du registrerte deg. - unknown token: Den koden ser ikke ut til å eksistere. + unknown token: Denne bekreftelseskoden finnes ikke eller har utløpt. confirm_email: button: Bekreft failure: En e-postadresse er allerede bekreftet med denne nøkkelen. @@ -1429,12 +1575,13 @@ nb: heading: Brukere hide: Skjul valgte brukere showing: - one: Viser side %{page} (%{first_item} av %{items}) - other: Viser side %{page} (%{first_item}-%{last_item} av %{items}) + one: Side %{page} (%{first_item} av %{items}) + other: Side %{page} (%{first_item}-%{last_item} av %{items}) summary: "%{name} opprettet fra %{ip_address} den %{date}" summary_no_ip: "%{name} opprettet %{date}" title: Brukere login: + account is suspended: Beklager, kontoen din er deaktivert på grunn av mistenkelig aktivitet.
    Vennligst kontakt webmaster hvis du ønsker å diskutere dette. account not active: Beklager, kontoen din er ikke aktivert ennå.
    Bruk lenka i kontobekreftelseseposten for å aktivere kontoen din, eller be om en ny bekreftelsesepost. auth failure: Beklager, kunne ikke logge inn med den informasjonen create account minute: Opprett en konto. Det tar bare ett minutt. @@ -1443,8 +1590,7 @@ nb: login_button: Logg inn lost password link: Mistet passordet ditt? new to osm: Ny på OpenStreetMap? - notice: Finn ut mer om OpenStreetMap sitt kommende bytte av lisens (oversettelser) (diskusjon) - notice_terms: OpenStreetMap bytter til en ny lisens den 1. april 2012. Denne er akkurat så åpen som den nåværende, men de juridiske delene er mye bedre tilpasset vår kartdatabase. Vi ønsker å kunne fortsette å beholde dine bidrag til OpenStreetMap, men vi kan bare gjøre det hvis du er enig med oss i å distribuere dem under den nye lisensen. Ellers må vi fjerne dem fra databasen.

    Vennligst logg inn, og bruk noen sekunder på å gå igjennom og akseptere de nye betingelsene. Takk! + no account: Har du ikke en konto? openid: "%{logo} OpenID:" openid invalid: Beklager, din OpenID ser ut til å være dårlig formatert openid missing provider: Beklager, fikk ikke kontakt med din OpenID-leverandør @@ -1470,7 +1616,7 @@ nb: title: Logg inn med Yahoo password: "Passord:" register now: Registrer deg nå - remember: "Huske meg:" + remember: "Husk meg:" title: Logg inn to make changes: For å gjøre endringer på OpenStreetMap-data, må du ha en konto. with openid: "Alternativt kan du bruke din OpenID for å logge inn:" @@ -1489,19 +1635,18 @@ nb: title: Glemt passord make_friend: already_a_friend: Du er allerede venner med %{name}. + button: Legg til som venn failed: Klarte ikke legge til %{name} som venn. - success: "%{name} er nå din venn." + heading: Legg til %{user} som en venn? + success: "%{name} er nå din venn!" new: confirm email address: "Bekreft e-postadresse:" confirm password: "Bekreft passord:" contact_webmaster: Kontakt webmaster for å opprette en konto. Vi vil prøve å behandle forespørselen så fort som mulig. - continue: Fortsett + continue: Registrer deg display name: "Visningsnavn:" display name description: Ditt offentlig fremviste brukernavn. Du kan endre dette senere i innstillingene. email address: "E-postadresse:" - fill_form: Fyll ut skjemaet og vi vil sende deg en e-post for å aktivere kontoen din. - flash create success message: Takk for at du registrerte deg. Vi har sendt en bekreftelsesmelding til %{email} og så snart du bekrefter kontoen din kan du begynne å lage kart.

    Om du bruker et antispamsystem som sender bekreftelsesforspørsler, kontroller at du har hvitelistet webmaster@openstreetmap.org siden vi ikke kan svar på bekreftelsesforespørsler. - heading: Opprett en brukerkonto license_agreement: Når du bekrefter kontoen din må du godkjenne bidragsytervilkårene. no_auto_account_create: Beklageligvis kan vi for øyeblikket ikke opprette en konto for deg automatisk. not displayed publicly: Ikke vist offentlig (se vår personvernpolitikk) @@ -1511,7 +1656,7 @@ nb: password: "Passord:" terms accepted: Takk for at du godtok de nye bidragsytervilkårene! terms declined: Vi beklager at du har besluttet å ikke akseptere de nye bidragsytervilkårene. For mer informasjon, se denne wiki-siden . - title: Opprett konto + title: Registrer deg use openid: Alternativt kan du bruke %{logo} OpenID for å logge inn no_such_user: body: Det er ingen bruker med navnet %{user}. Sjekk om du har skrevet navnet feil eller om lenka du klikket er feil. @@ -1522,6 +1667,8 @@ nb: nearby mapper: Bruker i nærheten your location: Din posisjon remove_friend: + button: Fjern venn + heading: Fjern %{user} som en venn? not_a_friend: "%{name} er ikke en av dine venner." success: "%{name} ble fjernet fra dine venner" reset_password: @@ -1556,11 +1703,12 @@ nb: you need to accept or decline: Les og deretter enten godta eller avslå de nye bidragsytervilkårene for å fortsette. view: activate_user: aktiver denne brukeren - add as friend: legg til som en venn + add as friend: Legg til venn ago: (%{time_in_words_ago} siden) - block_history: vis mottatte blokkeringer - blocks by me: blokkeringer utført av meg - blocks on me: mine blokkeringer + block_history: mottatte blokkeringer + blocks by me: Blokkeringer opprettet av meg + blocks on me: Mine blokkeringer + comments: Kommentarer confirm: Bekreft confirm_user: bekreft denne brukeren create_block: blokker denne brukeren @@ -1572,27 +1720,33 @@ nb: deactivate_user: deaktiver denne brukeren delete_user: slett denne brukeren description: Beskrivelse - diary: dagbok - edits: redigeringer + diary: Dagbok + edits: Redigeringer email address: "E-postadresse:" - friends_changesets: Bla gjennom alle endringssett av venner + friends_changesets: venners endringssett + friends_diaries: venners dagbokoppføringer hide_user: skjul denne brukeren - if set location: Hvis du setter din posisjon, så vil et fint kart og ting vises her. Du kan sette din hjemmeposisjon på din %{settings_link}-side. + if set location: Sett din hjemmeposisjon på siden %{settings_link} for å se andre brukere i nærheten. km away: "%{count}km unna" latest edit: "Siste redigering %{ago}:" m away: "%{count}m unna" mapper since: "Bruker siden:" - moderator_history: vis tildelte blokkeringer - my diary: min dagbok - my edits: mine redigeringer - my settings: mine innstillinger - my traces: mine spor + moderator_history: tildelte blokkeringer + my comments: Mine kommentarer + my diary: Min dagbok + my edits: Mine redigeringer + my notes: Mine merknader + my settings: Mine innstillinger + my traces: Mine spor nearby users: Andre nærliggende brukere + nearby_changesets: endringssett av brukere i nærheten + nearby_diaries: dagbokoppføringer av brukere i nærheten new diary entry: ny dagbokoppføring no friends: Du har ikke lagt til noen venner ennå. no nearby users: Det er ingen andre brukere som innrømmer kartlegging i ditt område ennå. + notes: Kartmerknader oauth settings: oauth-innstillinger - remove as friend: fjern som venn + remove as friend: Fjern venn role: administrator: Denne brukeren er en administrator grant: @@ -1602,11 +1756,11 @@ nb: revoke: administrator: Fjern administrator-tilgang moderator: fjern moderator-tilgang - send message: send melding + send message: Send melding settings_link_text: innstillinger spam score: "Spamresultat:" status: "Status:" - traces: spor + traces: Spor unhide_user: stopp å skjule denne brukeren user location: Brukerens posisjon your friends: Dine venner @@ -1664,11 +1818,14 @@ nb: creator_name: Opprettet av display_name: Blokkert bruker edit: Rediger + next: Neste » not_revoked: (ikke tilbakekalt) + previous: « Forrige reason: Årsak for blokkering revoke: Tilbakekall! revoker_name: Tilbakekalt av show: Vis + showing_page: Side %{page} status: Status period: one: 1 time @@ -1716,3 +1873,24 @@ nb: fail: Kunne ikke fjerne rollen "%{role}" fra bruker "%{name}". Sjekk at bruker og rolle er gyldig. heading: Bekreft fjerning av rolle title: Bekreft fjerning av rolle + welcome_page: + add_a_note: + paragraph_1_html: Hvis du bare vil ha rettet en liten detalj, men ikke har tid til å gjøre dette selv, kan du legge inn en kommentar. + title: Har du ikke tid til at kartlegge selv? Legg inn en kommentar! + basic_terms: + editor_html: En editor er et program eller en nettside som kan brukes til å redigere kartet. + node_html: En node er et enkeltelement på kartet, f.eks. en restaurant eller et tre. + paragraph_1_html: OpenStreetMap har sin egen sjargong. Her er en ordliste som kan være nyttig. + tag_html: En tagg er et informasjonselement om en node eller strekning, f.eks. navnet på en restaurant eller fartsgrensen på en vei. + title: Grunnleggende termer + way_html: En strekning er en linje eller et areal, f.eks. en vei, elv, innsjø eller en bygning. + introduction_html: Velkommen til OpenStreetMap, det fri brukerredigerte verdenskartet. Nå som du er opprettet som bruker er du klar til å legge til og endre kartinformasjon. Her er en guide med den viktigste informasjonen for å komme hurtig i gang. + questions: + paragraph_1_html: "OpenStreetMap har diverse ressurser for å undervise om prosjektet, som stiller spørsmål og svarer på disse, samt legge til rette for dokumenter og diskusjoner om ulike kartleggingsemner.\nFå hjelp her." + title: Noen spørsmål? + start_mapping: Start kartlegging + title: Velkommen! + whats_on_the_map: + off_html: Kartet inneholder ikke subjektiv informasjon (f.eks. anmeldelser), objekter som er er fiktive eller ikke lenger eksisterer, samt opphavsrettslig beskyttede data fra andre kart. Kopier aldri noe som helst informasjon fra andre digitale eller papirbaserte kart, med mindre det foreligger en særlig tillatelse. + on_html: OpenStreetMap er et nettsted som lagrer og viser frem fysiske elementer med en fast geografisk plassering - f.eks. millionvis av bygninger, veier og andre stedlige detaljer. Du kan kartlegge alle slike ting fra den virkelige verden som du er interessert i. + title: Hva finnes på kartet diff --git a/config/locales/nds.yml b/config/locales/nds.yml index 4263027f1a8..6759b694b8e 100644 --- a/config/locales/nds.yml +++ b/config/locales/nds.yml @@ -100,19 +100,19 @@ nds: data_layer_name: Daten details: Details hide_areas: Rebeden versteken - history_for_feature: Geschicht för [[feature]] + history_for_feature: Geschicht för %{feature} loading: An’t Laden... object_list: details: Details heading: Objektlist history: type: - node: Knütt [[id]] - way: Weg [[id]] + node: Knütt %{id} + way: Weg %{id} selected: type: - node: Knütt [[id]] - way: Weg [[id]] + node: Knütt %{id} + way: Weg %{id} type: node: Knütt way: Weg @@ -124,7 +124,6 @@ nds: type: way: Weg way: - download: "%{download_xml_link}, %{view_history_link} oder %{edit_link}" download_xml: XML dalladen edit: ännern view_history: Geschicht wiesen @@ -205,19 +204,15 @@ nds: zoom: Zoom start_rjs: export: Export - view_larger_map: Grötter Koort wiesen geocoder: description: title: geonames: Steed von GeoNames - osm_namefinder: "%{types} von OpenStreetMap Namefinder" osm_nominatim: Steed von OpenStreetMap Nominatim types: cities: Städer places: Öörd towns: lüttje Städer - description_osm_namefinder: - prefix: "%{distance} %{direction} von %{type}" direction: east: oosten north: noorden @@ -234,9 +229,6 @@ nds: results: more_results: Mehr no_results: nix funnen - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} von %{parentname})" - suffix_place: ", %{distance} %{direction} von %{placename}" search_osm_nominatim: prefix: amenity: @@ -505,8 +497,6 @@ nds: layouts: donate_link_text: Spennen edit: Ännern - export: Export - export_tooltip: Koortendaten exporteren help: Hülp help_centre: Hülpcenter history: Geschicht @@ -516,7 +506,6 @@ nds: logo: alt_text: OpenStreetMap-Logo logout: afmellen - logout_tooltip: Afmellen make_a_donation: text: Spenn wat sign_up: Nee Brukerkonto opstellen @@ -524,8 +513,6 @@ nds: user_diaries_tooltip: Bruker-Dagböker wiesen view: ankieken view_tooltip: Koort wiesen - welcome_user: Willkamen, %{user_link} - welcome_user_link_tooltip: Dien Brukersied wiki: Wiki license_page: native: @@ -581,10 +568,6 @@ nds: greeting: Moin, message_notification: hi: Moin %{to_user}, - signup_confirm_html: - greeting: Moin! - signup_confirm_plain: - greeting: Moin! oauth_clients: edit: submit: Ännern @@ -598,12 +581,9 @@ nds: edit: user_page_link: Brukersied index: - license: - project_name: OpenStreetMap-Projekt permalink: Permalink shortlink: Kortlink key: - map_key: Legenn table: entry: admin: Grenz @@ -754,7 +734,6 @@ nds: continue: Wieder display name: "wiest Brukernaam:" email address: "E-Mail-Adress:" - heading: Brukerkonto opstellen password: "Passwoord:" title: Brukerkonto opstellen no_such_user: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 72b24d39c70..04f2d058d4a 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -98,8 +98,8 @@ ne: data_layer_name: डेटा details: विस्तृत जानकारी drag_a_box: क्षेत्र छान्न नक्साको बाकसलाई घिसार्नुहोस - edited_by_user_at_timestamp: " [[user]]द्रारा [[timestamp]]मा सम्पादित \\" - history_for_feature: " [[feature]]को इतिहास" + edited_by_user_at_timestamp: " %{user}द्रारा %{timestamp}मा सम्पादित \\" + history_for_feature: " %{feature}को इतिहास" load_data: डेटा लोडगर्ने loading: लोड हुदैछ... manually_select: आफै अर्को क्षेत्र छान्नुहोस \ @@ -110,12 +110,12 @@ ne: heading: वस्तु सुची history: type: - node: नोड [[id]] - way: बाटो [[id]] + node: नोड %{id} + way: बाटो %{id} selected: type: - node: नोड [[id]] - way: बाटो [[id]] + node: नोड %{id} + way: बाटो %{id} type: node: नोड way: बाटो diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 5eb30da8275..89853cb0d09 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1,15 +1,35 @@ # Messages for Dutch (Nederlands) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Carsrac +# Author: Donarreiskoffer # Author: Freek # Author: Fruggo # Author: Greencaps +# Author: HanV +# Author: Jochempluim # Author: Ldp +# Author: M!dgard # Author: McDutchie +# Author: Pje335 +# Author: Romaine # Author: SPQRobin +# Author: Shirayuki # Author: Siebrand # Author: Tjcool007 nl: + about_page: + community_driven_html: "De gemeenschap van OpenStreetMap is divers, gepassioneerd en groeiende dagelijks. Onder onze bijdragers zitten mensen die kaarten maken als hobby, GIS-professionals, IT-specialisten die de servers van OSM draaiende houden, filantropen die rampgebieden in kaart brengen en nog veel meer.\nBekijk de gebruikersdagboeken of de gemeenschapsblogs voor meer informatie over de gemeenschap of de website van de OSM Foundation.�" + community_driven_title: Communitygedreven + copyright_html: ©OpenStreetMap-
    bijdragers + lede_text: OpenStreetMap wordt gemaakt door een gemeenschap van kaartenmakers die gegevens over wegen, paden, cafés, treinstations en nog veel meer, over de hele wereld bijdragen en onderhouden. + local_knowledge_html: OpenStreetMap legt de nadruk op lokale kennis. Bijdragers gebruiken luchtfoto's, GPS-apparaten, en low-tech veldkaarten om te controleren of OSM accuraat en bij de tijd is. + local_knowledge_title: Lokale kennis + next: Volgende + open_data_html: "OpenStreetMap is open data: u mag de gegevens gebruiken voor ieder doel, als u de naam van OpenStreetMap en haar bijdragers maar vermeldt. Als u de gegevens wijzigt of uitbouwt op bepaalde manieren, dan mag u het resultaat alleen onder dezelfde licentie verder verspreiden. Zie de pagina over Auteursrechten en Licentie voor details." + open_data_title: Open data + partners_title: Partners + used_by: "%{name} levert gegevens voor honderden websites, mobiele apps en hardwareimplementaties" activerecord: attributes: diary_comment: @@ -18,7 +38,7 @@ nl: language: Taal latitude: Breedtegraad longitude: Lengtegraad - title: Titel + title: Onderwerp user: Gebruiker friend: friend: Vriend @@ -27,7 +47,7 @@ nl: body: Tekst recipient: Ontvanger sender: Afzender - title: Titel + title: Onderwerp trace: description: Beschrijving latitude: Breedtegraad @@ -87,96 +107,62 @@ nl: blocked: Uw toegang tot de API is geblokkeerd. Meld u opnieuw aan in de webinterface om meer te weten te komen. need_to_see_terms: Uw toegang tot de API is tijdelijk opgeschort. Meld u aan in de webinterface om de Voorwaarden voor Bijdragen te bekijken. U hoeft ze niet te onderschijven, maar moet ze wel gezien hebben. browse: + anonymous: anoniem changeset: - changeset: "Set wijzigingen: %{id}" + belongs_to: Auteur changesetxml: Changeset-XML - download: "%{changeset_xml_link} of %{osmchange_xml_link} downloaden" feed: title: Set wijzigingen %{id} title_comment: Set wijzigingen %{id} - %{comment} + node: Knooppunten (%{count}) + node_paginated: Knooppunten (%{x}-%{y} van %{count}) osmchangexml: osmChange-XML - title: Set wijzigingen - changeset_details: - belongs_to: "Hoort bij:" - bounding_box: "Selectiekader:" - box: kader - closed_at: "Gesloten op:" - created_at: "Aangemaakt op:" - has_nodes: - one: "Heeft de volgende node:" - other: "Heeft de volgende %{count} nodes:" - has_relations: - one: "Heeft de volgende relatie:" - other: "Heeft de volgende %{count} relaties:" - has_ways: - one: "Bevat de volgende way:" - other: "Bevat de volgende %{count} ways:" - no_bounding_box: Er is geen selectiekader opgeslagen voor deze set wijzigingen. - show_area_box: Gebied weergeven - common_details: - changeset_comment: "Opmerking:" - deleted_at: "Verwijderd op:" - deleted_by: "Verwijderd door:" - edited_at: "Bewerkt op:" - edited_by: "Bewerkt door:" - in_changeset: "In set wijzigingen:" - version: "Versie:" + relation: Relaties (%{count}) + relation_paginated: Relaties (%{x}-%{y} van %{count}) + title: "Wijzigingenset: %{id}" + way: Wegen (%{count}) + way_paginated: Wegen (%{x}-%{y} van %{count}) + closed: Gesloten + closed_by_html: %{time} geleden gesloten door %{user} + closed_html: %{time} geleden gesloten containing_relation: entry: Relatie %{relation_name} entry_role: Relatie %{relation_name} (als %{relation_role}) - map: - deleted: Verwijderd - edit: - area: Gebied bewerken - node: Node bewerken - relation: Relatie bewerken - way: Weg bewerken - larger: - area: Gebied op grotere kaart bekijken - node: Node op grotere kaart bekijken - relation: Relatie op grotere kaart bekijken - way: Weg op grotere kaart bekijken - loading: Bezig met laden… - navigation: - all: - next_changeset_tooltip: Volgende set wijzigingen - next_node_tooltip: Volgende node - next_relation_tooltip: Volgende relatie - next_way_tooltip: Volgende weg - prev_changeset_tooltip: Vorige set wijzigingen - prev_node_tooltip: Vorige node - prev_relation_tooltip: Vorige relatie - prev_way_tooltip: Vorige weg - user: - name_changeset_tooltip: Bewerkingen van %{user} bekijken - next_changeset_tooltip: Volgende beweking door %{user} - prev_changeset_tooltip: Vorige bewerking door %{user} + created: Aangemaakt + created_by_html: %{time} geleden aangemaakt door %{user} + created_html: %{time} geleden aangemaakt + deleted_by_html: %{time} geleden verwijderd door %{user} + download_xml: XML downloaden + edited_by_html: %{time} geleden bewerkt door %{user} + in_changeset: Wijzigingenset + location: "Locatie:" + no_comment: (geen reactie) node: - download: "%{download_xml_link} of %{view_history_link}" - download_xml: XML downloaden - edit: bewerken - node: Node - node_title: "Node: %{node_name}" - view_history: geschiedenis bekijken - node_details: - coordinates: "Coördinaten:" - part_of: "Onderdeel van:" - node_history: - download: "%{download_xml_link} of %{view_details_link}" - download_xml: XML downloaden - node_history: Nodegeschiedenis - node_history_title: "Nodegeschiedenis: %{node_name}" - view_details: details weergeven + history_title: "Nodegeschiedenis: %{name}" + title: "Node: %{name}" not_found: - sorry: De %{type} met id %{id} kan niet worden gevonden. + sorry: "De %{type} #%{id} kan helaas niet worden gevonden." type: changeset: set wijzigingen node: node relation: relatie way: weg - paging_nav: - of: van - showing_page: Bezig met weergeven van pagina + note: + closed_by: %{when} geleden opgelost door %{user} + closed_by_anonymous: %{when} geleden opgelost door anoniem + closed_title: "Opgeloste opmerking #%{note_name}" + commented_by: Reactie van %{user} %{when} geleden + commented_by_anonymous: Reactie van anoniem %{when} geleden. + hidden_by: %{when} ago verborgen door %{user} + hidden_title: "Verborgen opmerking #%{note_name}" + new_note: Nieuwe opmerking + open_by: %{when} geleden aangemaakt door %{user} + open_by_anonymous: %{when} geleden aangemaakt door anoniem + open_title: "Niet-opgeloste opmerking #%{note_name}" + reopened_by: %{when} geleden opnieuw geactiveerd door %{user} + reopened_by_anonymous: %{when} geleden opnieuw geactiveerd door anoniem + title: "Opmerking: %{id}" + part_of: Onderdeel van redacted: message_html: Versie %{version} van dit element van het type %{type} kan niet weergegeven worden omdat deze na redigering geblokkeerd is. Zie %{redaction_link} voor details. redaction: Redigering %{id} @@ -185,65 +171,21 @@ nl: relation: relatie way: weg relation: - download: "%{download_xml_link} of %{view_history_link}" - download_xml: XML downloaden - relation: Relatie - relation_title: "Relatie: %{relation_name}" - view_history: geschiedenis weergeven - relation_details: - members: "Leden:" - part_of: "Onderdeel van:" - relation_history: - download: "%{download_xml_link} of %{view_details_link}" - download_xml: XML downloaden - relation_history: Relatiegeschiedenis - relation_history_title: "Relatiegeschiedenis: %{relation_name}" - view_details: details bekijken + history_title: "Relatiegeschiedenis: %{name}" + members: Leden + title: "Relatie: %{name}" relation_member: entry_role: "%{type} %{name} als %{role}" type: node: Node relation: Relatie way: Weg - start: - manually_select: Handmatig een ander gebied selecteren - view_data: Gegevens voor de huidige kaartweergave weergeven start_rjs: - data_frame_title: Gegevens - data_layer_name: Kaartgegevens verkennen - details: Details - drag_a_box: Teken een rechthoek op de kaart om een gebied te selecteren - edited_by_user_at_timestamp: Bewerkt door [[user]] op [[timestamp]] - hide_areas: Gebieden verbergen - history_for_feature: Geschiedenis voor [[feature]] + feature_warning: Er worden %{num_features} objecten geladen, waardoor uw browser traag kan worden of niet meer kan reageren. Weet u zeker weet dat u de gegevens wilt weergeven? load_data: Gegevens laden - loaded_an_area_with_num_features: U hebt een gebied geladen dat [[num_features]] objecten bevat. Sommige browsers kunnen niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan honderd objecten. Als u er meer weergeeft kan de browser traag worden of niet meer reageren. Als u zeker weet dat u de gegevens wilt weergeven, klik dan op de knop hieronder. loading: Bezig met laden… - manually_select: Handmatig een ander gebied selecteren - object_list: - api: Dit gebied via de API ophalen - back: Objectenlijst weergeven - details: Details - heading: Objectenlijst - history: - type: - node: Node [[id]] - way: Weg [[id]] - selected: - type: - node: Node [[id]] - way: Weg [[id]] - type: - node: Node - way: Weg - private_user: private gebruiker - show_areas: Gebieden weergeven - show_history: Geschiedenis weergeven - unable_to_load_size: Laden is niet mogelijk. Het selectiekader van [[bbox_size]] is te groot. Het moet kleiner zijn dan %{max_bbox_size} - wait: Een ogenblik geduld alstublieft... - zoom_or_select: Inzoomen of een gebied van de kaart selecteren om te bekijken tag_details: - tags: "Labels:" + tags: Labels wiki_link: key: De wikipagina die het label %{key} beschrijft tag: De wikipagina die het label %{key}=%{value} beschrijft @@ -255,33 +197,20 @@ nl: node: node relation: relatie way: weg + version: Versie + view_details: Gegevens bekijken + view_history: Geschiedenis weergeven way: - download: "%{download_xml_link} of %{view_history_link}" - download_xml: XML downloaden - edit: bewerken - view_history: geschiedenis weergeven - way: Weg - way_title: "Weg: %{way_name}" - way_details: also_part_of: - one: ook onderdeel van weg %{related_ways} - other: ook deel van ways %{related_ways} - nodes: "Nodes:" - part_of: "Onderdeel van:" - way_history: - download: "%{download_xml_link} of %{view_details_link}" - download_xml: XML downloaden - view_details: details weergeven - way_history: Weggeschiedenis - way_history_title: "Weggeschiedenis: %{way_name}" + one: onderdeel van weg %{related_ways} + other: onderdeel van wegen %{related_ways} + history_title: "Weggeschiedenis: %{name}" + nodes: Nodes + title: "Weg: %{name}" changeset: changeset: anonymous: Anoniem - big_area: (groot) - no_comment: (geen) no_edits: (geen bewerkingen) - show_area_box: rechthoek weergeven - still_editing: (nog aan het bewerken) view_changeset_details: Details wijzigingenset weergeven changeset_paging_nav: next: Volgende » @@ -294,30 +223,23 @@ nl: saved_at: Opgeslagen op user: Gebruiker list: - description: Recente wijzigingen - description_bbox: Wijzigingensets binnen %{bbox} - description_friend: Wijzigingensets van uw vrienden - description_nearby: Wijzigingensets door nabijgelegen gebruikers - description_user: Wijzigingensets door %{user} - description_user_bbox: Wijzigingensets door %{user} binnen %{bbox} - heading: Wijzigingensets - heading_bbox: Wijzigingensets - heading_friend: Wijzigingensets - heading_nearby: Wijzigingensets - heading_user: Wijzigingensets - heading_user_bbox: Wijzigingensets + empty: Geen wijzigingensets gevonden. + empty_area: Geen wijzigingensets in dit gebied. + empty_user: Geen wijzigingensets door deze gebruiker. + load_more: Meer laden + no_more: Geen wijzigingensets meer gevonden. + no_more_area: Geen wijzigingensets meer in dit gebied. + no_more_user: Geen wijzigingensets meer door deze gebruiker. title: Wijzigingensets - title_bbox: Wijzigingensets binnen %{bbox} title_friend: Wijzigingensets van uw vrienden title_nearby: Wijzigingensets door de nabijgelegen gebruikers title_user: Wijzigingensets door %{user} - title_user_bbox: Wijzigingensets door %{user} binnen %{bbox} timeout: sorry: Het duurde te lang om de lijst met wijzigingensets die u hebt opgevraagd op te halen. diary_entry: comments: ago: "%{ago} geleden" - comment: Opmerking + comment: Reactie has_commented_on: "%{display_name} heeft gereageerd op het volgende dagboekbericht" newer_comments: Latere opmerkingen older_comments: Eerder opmerkingen @@ -326,11 +248,12 @@ nl: diary_comment: comment_from: Reactie van %{link_user} op %{comment_created_at} confirm: Bevestigen - hide_link: Opmerking verbergen + hide_link: Reactie verbergen diary_entry: comment_count: - one: één reactie + one: Eén reactie other: "%{count} reacties" + zero: Geen reacties comment_link: Reactie plaatsen bij dit bericht confirm: Bevestigen edit_link: Bericht bewerken @@ -361,14 +284,14 @@ nl: list: in_language_title: Dagboekberichten in het %{language} new: Nieuw dagboekbericht - new_title: Nieuw bericht voor uw dagboek schrijven + new_title: Nieuw bericht in uw dagboek schrijven newer_entries: Nieuwere berichten no_entries: Het dagboek is leeg older_entries: Oudere berichten - recent_entries: "Recente dagboekberichten:" + recent_entries: Recente dagboekberichten title: Gebruikersdagboeken title_friends: Dagboeken van vrienden - title_nearby: Dagboeken van nabijgelegen gebruikers + title_nearby: Dagboeken van gebruikers in de buurt user_title: Dagboek van %{user} location: edit: Bewerken @@ -377,23 +300,26 @@ nl: new: title: Nieuw dagboekbericht no_such_entry: - body: Er is geen dagboekbericht of opmerking met het id %{id}. Controleer de spelling, of misschien is de verwijzing waarop u geklikt hebt onjuist. + body: Er is geen dagboekbericht of opmerking met het id %{id}. Controleer de spelling, of misschien is de koppeling waarop u geklikt hebt onjuist. heading: Een bericht met id %{id} bestaat niet - title: Het opgevraagde dagboekbericht bestaat niet + title: Het opgegeven dagboekbericht bestaat niet view: - leave_a_comment: Opmerking achterlaten + leave_a_comment: Reactie achterlaten login: aanmelden login_to_leave_a_comment: U moet moet zich %{login_link} om te kunnen reageren save_button: Opslaan - title: Gebruikersdagboek van %{user} | %{title} + title: Dagboek van %{user} | %{title} user_title: Dagboek van %{user} editor: default: Standaard (op dit moment %{name}) + id: + description: iD (bewerken in de browser) + name: iD potlatch: - description: Potlatch 1 (in-browser kaartbewerkingsprogramma) + description: Potlatch 1 (bewerken in de browser) name: Potlatch 1 potlatch2: - description: Potlatch 2 (in-browser kaartbewerkingsprogramma) + description: Potlatch 2 (bewerken in de browser) name: Potlatch 2 remote: description: Remote Control (JOSM of Merkaartor) @@ -404,7 +330,7 @@ nl: area_to_export: Te exporteren gebied embeddable_html: HTML-code export_button: Exporteren - export_details: OpenStreetMap-gegevens zijn gelicenseerd onder de licentie Creative Commons Naamsvermelding-Gelijk delen 2.0. + export_details: OpenStreetMapgegevens zijn gelicenseerd onder de licentie Open Data Commons Open Database (ODbL). format: "Formaat:" format_to_export: Bestandsformaat image_size: "Afbeeldingsgrootte:" @@ -420,29 +346,45 @@ nl: paste_html: Kopieer de HTML-code en voeg deze toe aan uw website scale: Schaal too_large: + advice: "Als het exporteren mislukt, overweeg dan een van de onderstaande bronnen te gebruiken:" body: Dit gebied is te groot om als OpenStreetMap XML-gegevens te exporteren. Zoom in of selecteer een kleiner gebied. - heading: Gebied te groot + geofabrik: + description: Regelmatig bijgewerkt extracten van continenten, landen en geselecteerde steden + title: Geofabrik downloads + metro: + description: Extracten voor grote wereldsteden en hun omliggende gebieden + title: Metro extracten + other: + description: Extra bronnen die worden vermeld op de OpenStreetMapwiki + title: Andere bronnen + overpass: + description: Dit selectiekader downloaden van een kopie van de database van OpenStreetMap + title: Overpass API + planet: + description: Regelmatig bijgewerkte kopieën van de volledige OpenStreetMap database + title: Planet OSM zoom: Zoom - start_rjs: - add_marker: Marker op de kaart zetten - change_marker: Positie van de marker veranderen - click_add_marker: Klik op de kaart om een marker te plaatsen - drag_a_box: Sleep een selectiekader op de kaart om een gebied te selecteren - export: Exporteren - manually_select: Handmatig een ander gebied selecteren - view_larger_map: Grotere kaart bekijken + title: Exporteren + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Klik op of het hetzelfde pictogram op de kaartweergave.\nEr wordt dan een markering toegevoegd aan de kaart, die u kunt verplaatsen door te slepen.\nVoeg uw bericht toe, klik op opslaan, en andere kaartenmakers kijken dan naar uw melding." + join_the_community: + explanation_html: Als u een probleem met onze kaartgegevens hebt opgemerkt, er ontbreekt bijvoorbeeld een weg of uw adres, dan kunt u het beste lid worden van de OpenStreetMapgemeenschap en de gegevens zelf toevoegen of corrigeren. + title: Word lid van onze gemeenschap + title: Hoe u kunt helpen + other_concerns: + title: Andere punten van zorg + title: Een probleem melden / de kaart corrigeren geocoder: description: title: geonames: Locatie van GeoNames - osm_namefinder: "%{types} van OpenStreetMap Namefinder" osm_nominatim: Locatie van OpenStreetMap Nominatim types: cities: Steden places: Plaatsen towns: Steden - description_osm_namefinder: - prefix: "%{distance} %{direction} van %{type}" direction: east: oost north: noord @@ -463,16 +405,26 @@ nl: title: ca_postcode: Resultaten van Geocoder.CA geonames: Resultaten van GeoNames + geonames_reverse: Resulaten van GeoNames latlon: Resultaten van intern - osm_namefinder: Resultaten van OpenStreetMap Namefinder osm_nominatim: Resultaten van OpenStreetMap Nominatim + osm_nominatim_reverse: Resultaten van OpenStreetMap Nominatim uk_postcode: Resultaten van NPEMap / FreeThe Postcode us_postcode: Resultaten van Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} van %{parentname})" - suffix_place: ", %{distance} %{direction} van %{placename}" search_osm_nominatim: + admin_levels: + level10: Wijkgrens + level2: Landsgrens + level4: Staatsgrens + level5: Regiogrens + level6: Countygrens + level8: Stadsgrens + level9: Dorpsgrens prefix: + aerialway: + chair_lift: Stoeltjeslift + drag_lift: Sleeplift + station: Kabelbaanstation aeroway: aerodrome: Luchtvaartterrein apron: Platform @@ -566,6 +518,7 @@ nl: shower: Douche social_centre: Sociaal centrum social_club: Sociale club + social_facility: Sociale voorziening studio: Eenkamerappartement supermarket: Supermarkt swimming_pool: Zwembad @@ -594,6 +547,9 @@ nl: "yes": Brug building: "yes": Gebouw + emergency: + fire_hydrant: Brandkraan + phone: Noodtelefoon highway: bridleway: Ruiterpad bus_guideway: Vrijliggende busbaan @@ -615,8 +571,9 @@ nl: platform: Perron primary: Primaire weg primary_link: Primaire weg + proposed: Voorgestelde weg raceway: Racecircuit - residential: Woonerf + residential: Straat rest_area: Rustplaats road: Weg secondary: Secundaire weg @@ -626,6 +583,7 @@ nl: speed_camera: Snelheidscamera steps: Trap stile: Overstap + street_lamp: Straatlantaarn tertiary: Tertiaire weg tertiary_link: Tertiaire weg track: Pad @@ -641,15 +599,17 @@ nl: building: Gebouw castle: Kasteel church: Kerk + citywalls: Stadsmuren fort: Fort house: Huis - icon: Icoon + icon: Pictogram manor: Landgoed memorial: Herdenkingsmonument mine: Mijn - monument: Monoment + monument: Monument museum: Museum ruins: Ruïne + tomb: Graf tower: Toren wayside_cross: Kruis langs de weg wayside_shrine: Altaar langs de weg @@ -717,6 +677,8 @@ nl: airfield: Militair vliegveld barracks: Kazerne bunker: Bunker + mountain_pass: + "yes": Bergpas natural: bay: Baai beach: Strand @@ -786,6 +748,7 @@ nl: locality: Plaats moor: Veen municipality: Gemeente + neighbourhood: Wijk postcode: Postcode region: Regio sea: Zee @@ -811,8 +774,10 @@ nl: narrow_gauge: Smalspoor platform: Spoorwegplatform preserved: Historisch spoor + proposed: Voorgestelde spoorlijn spur: Parallelspoorweg station: Spoorwegstation + stop: Spoorhalte subway: Metrostation subway_entrance: Metroingang switch: Wissel @@ -828,6 +793,7 @@ nl: beverages: Frisdrankverkooppunt bicycle: Fietsenwinkel books: Boekenwinkel + boutique: Boetiek butcher: Slagerij car: Automaterialenwinkel car_parts: Autoonderdelen @@ -841,6 +807,7 @@ nl: convenience: Gemakswinkel copyshop: Copyshop cosmetics: Cosmeticawinkel + deli: Speciaalzaak department_store: Warenhuis discount: Discountwinkel doityourself: Doe-het-zelf-winkel @@ -877,17 +844,21 @@ nl: organic: Organische winkel outdoor: Buitensportwinkel pet: Dierenwinkel + pharmacy: Apotheek photo: Fotowinkel salon: Schoonheidssalon + second_hand: Kringloopwinkel shoes: Schoenenzaak shopping_centre: Winkelcentrum sports: Sportwinkel stationery: Kantoorartikelenwinkel supermarket: Supermarkt + tailor: Kleermaker toys: Speelgoedwinkel travel_agency: Reisbureau video: Videotheek wine: Slijterij + "yes": Winkel tourism: alpine_hut: Berghut artwork: Kunst @@ -910,6 +881,7 @@ nl: viewpoint: Bijzonder uitzicht zoo: Dierentuin tunnel: + culvert: Duiker "yes": Tunnel waterway: artificial: Kunstmatige waterweg @@ -933,66 +905,117 @@ nl: water_point: Waterpunt waterfall: Waterval weir: Stuwdam + help_page: + help: + description: Stel een vraag op zoek antwoorden op de vraag- en antwoordsite van OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: Er zijn verschillende bronnen om meer te leren over OpenStreetMap, voor het stellen van vragen en het krijgen van antwoorden, en het samen overleggen en documenteren van onderwerpen die gaan over kaarten maken. + title: Hulp krijgen + welcome: + description: Begin met dit snelle stappenplan dat de basis van OpenSteetMap uitlegt. + title: Welkom bij OSM + url: /welcome + wiki: + description: In de wiki kijken voor diepgaande documentatie over OSM + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Sluiten + edit_help: Verplaats de kaar en zoom in op een plaats die u wilt bewerken. Klik er daarna op. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda is alleen beschikbaar voor standaardlaag map: base: cycle_map: Fietskaart + hot: Humanitarian mapquest: MapQuest Open standard: Standaard transport_map: Transport Map + copyright: © OpenStreetMapbijdragers + donate_link_text: + layers: + data: Kaartgegevens + header: Kaartlagen + notes: Opmerkingen bij kaarten + overlays: Overlays inschakelen om fouten in de kaart te kunnen identificeren + title: Lagen + locate: + popup: U bent binnen {distance} {unit} van dit punt + title: Uw locatie weergeven + zoom: + in: Inzoomen + out: Uitzoomen + notes: + new: + add: Opmerking toevoegen + intro: Om de kaart te verbeteren, worden de gegevens die u opgeeft weergegeven aan andere kaartmakers. Maak uw opmerkingen zo beschrijvend mogelijk en plaats de markering zo precies als mogelijk. + show: + anonymous_warning: In deze opmerking staan reacties van anonieme gebruikers die moeten worden gecontroleerd. + comment: Reageren + comment_and_resolve: Reageren en oplossen + hide: Verbergen + reactivate: Opnieuw activeren + resolve: Oplossen + share: + cancel: Annuleren + center_marker: Kaart centreren op de marker + custom_dimensions: Aangepaste afmetingen instellen + download: Downloaden + embed: HTML + format: "Formaat:" + image: Afbeelding + image_size: Afbeelding geeft standaardlaag weer op + include_marker: Marker opnemen + link: Koppeling of HTML + long_link: Koppeling + paste_html: Plak de HTML om op te nemen in website + scale: "Schaal:" + short_link: Korte koppeling + short_url: Korte URL + title: Delen + view_larger_map: Grotere kaart bekijken site: + createnote_disabled_tooltip: Zoom in om een opmerking bij de kaart te maken + createnote_tooltip: Opmerking bij kaart maken edit_disabled_tooltip: Zoom in om de kaart te bewerken edit_tooltip: Kaart bewerken - edit_zoom_alert: U moet inzoomen om de kaart te bewerken - history_disabled_tooltip: Zoom in om de bewerkingen voor dit gebied te bekijken - history_tooltip: Bewerkingen voor dit gebied bekijken - history_zoom_alert: U moet inzoomen om de kaart te bewerkingsgeschiedenis te bekijken + map_data_zoom_in_tooltip: Inzommen om de kaartgegeven te bekijken + map_notes_zoom_in_tooltip: Inzoomen om de kaartnotities te bekijken layouts: + about: Over community: Gemeenschap community_blogs: Gemeenschapsblogs community_blogs_title: Blogs van leden van de OpenStreetMap-gemeenschap - copyright: Auteursrechten & licentie - documentation: Documentatie - documentation_title: Projectdocumentatie + copyright: Auteursrechten + data: Gegevens donate: Ondersteun OpenStreetMap door te %{link} aan het Hardware Upgrade-fonds. - donate_link_text: doneren edit: Bewerken edit_with: Bewerken met %{editor} export: Exporteren - export_tooltip: Kaartgegevens exporteren + export_data: Gegevens exporteren foundation: Stichting foundation_title: De OpenStreetMap Foundation gps_traces: GPS-traces gps_traces_tooltip: GPS-tracks beheren help: Hulp - help_centre: Helpcentrum - help_title: Helpsite voor dit project history: Geschiedenis - home: home - home_tooltip: Naar thuislocatie gaan - inbox: Postvak IN (%{count}) - inbox_tooltip: - one: Uw Postvak IN bevat één ongelezen bericht - other: Uw Postvak IN bevat %{count} ongelezen berichten - zero: Uw Postvak IN bevat geen nieuwe berichten - intro_1: OpenStreetMap is een vrij bewerkbare kaart van de hele wereld. Hij wordt gemaakt door mensen zoals u. + home: Naar thuislocatie gaan intro_2_create_account: Maak een gebruiker aan - intro_2_download: downloaden - intro_2_html: De gegevens zijn vrij te %{download} en te %{use} onder de %{license}. %{create_account} om de kaart te verbeteren. - intro_2_license: open licentie - intro_2_use: gebruiken - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - title: Gegevens van OpenStreetMap zijn beschikbaar onder de licentie Creative Commons Naamsvermelding-Gelijk delen 2.0 Generiek - log_in: aanmelden + intro_header: Welkom bij OpenStreetMap! + intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals u en vrij te gebruiken onder een open licentie. + learn_more: Meer lezen + log_in: Aanmelden log_in_tooltip: Aanmelden met bestaande gebruiker logo: alt_text: Logo OpenStreetMap - logout: afmelden - logout_tooltip: Afmelden + logout: Afmelden make_a_donation: text: Doneren title: Steun OpenStreetMap met een donatie + more: Meer osm_offline: De OpenStreetMap-database is op het moment niet beschikbaar wegens het uitvoeren van onderhoudswerkzaamheden. osm_read_only: De OpenStreetMap-database kan op het moment niet gewijzigd worden wegens het uitvoeren van onderhoudswerkzaamheden. partners_bytemark: Bytemark Hosting @@ -1000,24 +1023,47 @@ nl: partners_ic: Imperial College London partners_partners: partners partners_ucl: het UCL VR Centre - sign_up: registreren + sign_up: Registreren sign_up_tooltip: Gebruiker voor bewerken aanmaken - sotm2011: Kom naar de OpenStreetMap-conferentie 2011, de staat van de kaart, 9-11 september in Denver! + start_mapping: Beginnen met kaarten maken tag_line: De vrije wikiwereldkaart user_diaries: Gebruikersdagboeken user_diaries_tooltip: Gebruikersdagboeken bekijken - view: Bekijken - view_tooltip: Kaart bekijken - welcome_user: Welkom, %{user_link} - welcome_user_link_tooltip: Uw gebruikerspagina - wiki: wiki - wiki_title: Wikisite voor het project license_page: foreign: english_link: Engelstalige origineel text: In het geval deze taalversie en het %{english_original_link} elkaar tegenspreken, hebben de bepalingen op de Engelstalige pagina voorrang. title: Over deze vertaling - legal_babble: "

    Auteursrechten en licentie

    \n

    \n OpenStreetMap is open data, gelicenceerd onder de licentie Creative\n Commons Naamsvermelding-Gelijk delen 2.0 (CC BY-SA).\n

    \n

    \n Het staat u vrij onze kaarten en gegevens te kopieren, te distribueren,\n weer te geven en aan te passen, zo lang als u OpenStreetMap en haar\n auteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,\n mag u de resultaten onder dezelfde licentie distribueren. In de\n volledige juridische\n tekst worden uw rechten en verantwoordelijkheden uitgelegd.\n

    \n\n

    Hoe OpenStreetMap te vermelden

    \n

    \n Als u kaartmateriaal van OpenStreetMap gebruikt, vragen we u als\n naamsvermelding tenminste op te nemen “© OpenStreetMap-auteurs, CC BY-SA”.\n Als u alleen kaartgegevens gebruikt, vragen we u te vermelden\n “Kaartgegevens © OpenStreetMap-auteurs,\n CC BY-SA”.\n

    \n

    \n Waar mogelijk moet u verwijzen naar OpenStreetMap met een hyperlink naar http://www.openstreetmap.org/\n en CC BY-SA naar http://creativecommons.org/licenses/by-sa/2.0/. Als\n u een medium gebruikt waarin u niet met hyperlinks kunt verwijzen (bijvoorbeeld in\n drukwerk), dan verzoeken we u uw lezers te verwijzen naar \n www.openstreetmap.org (wellicht door \n ‘OpenStreetMap’ uit te schrijven als het complete webadres) en naar\n www.creativecommons.org.\n

    \n\n

    Meer informatie

    \n

    \n U kunt meer lezen over onze gegevens in de Veel gestelde juridische\n vragen.\n

    \n

    \n OSM-auteurs worden er continu aan herinnerd nooit gebruik te maken van enige\n auteursrechtelijk beschermde bron (zoals bijvoorbeeld Google Maps of gedrukte kaarten) zonder\n expliciete toestemming van de auteursrechthebbenden.\n

    \n

    \n Hoewel OpenStreetMap open data is, kunnen we niet om niet een kaart-API\n ter beschikking stellen voor ontwikkelaars van derde partijen.\n\n Zie ons API-gebruiksbeleid,\n Kaartgebruikbeleid\n en Nominatimgebruiksbeleid.\n

    \n\n

    Onze gegevensleveranciers

    \n

    \n Door onze CC BY-SA-licentie moet u “de Originele auteur\n vermelden op een redelijke wijze voor het door U gebruikte medium”.\n Individuele OSM-mappers vragen niet om meer vermelding dan\n “OpenStreetMap-auteurs”, maar daar waar gegevens van\n een nationaal kaartenbureau afkomstig zijn of van een andere belangrijke\n bron, en opgenomen in OpenStreetMap, kan het redelijk zijn om\n die bron direct te vermelden of door naar deze pagina te verwijzen.\n

    \n\n\n\n
      \n
    • Australië: Bevat wijkgegevens\n gebaseerd op gegevens van het Australian Bureau of Statistics.
    • \n
    • Austria: Bevat gegevens van de\n Stad Wenen (onder\n CC BY), Land Vorarlberg en\nLand Tirol (onder CC-BY AT met aanvullingen).
    • \n
    • Canada: Bevat gegevens van\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), en StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Polen: Bevat gegevens van UMP-pcPL maps. Auteursrechten\n UMP-pcPL-deelnemers.
    • \n \n Meer over hoe OSM UMP-gegevens gebruikt\n
    • Zuid-Afrika: Bevat gegevens afkomstig uit\n Chief Directorate:\n National Geo-Spatial Information, auteursrechten voor de Staat voorbehouden.
    • \n
    • Frankrijk: Bevat gegevens van\n Direction Générale des Impôts.
    • \n
    • Nederland: Bevat © Gegevens van AND, 2007\n (www.and.com)
    • \n
    • Nieuw-Zeeland: Bevat gegevens van\n Land Information New Zealand. Crown Copyright voorbehouden.
    • \n
    • Verenigd Koninkrijk: Bevat gegevens van\n de Ordnance Survey © Crown Copyright en databaserechten\n 2010.
    • \n
    \n\n

    \n Opname van gegevens in OpenStreetMap betekent niet dat de originele\n gegevensverstrekker OpenStreetMap ondersteunt, enige vorm van garantie geeft, of\n aansprakelijkheid aanvaardt.\n

    " + legal_babble: + attribution_example: + alt: Voorbeeld van hoe de naamsvermelding voor OpenStreetMap toe te passen op een webpagina + title: Voorbeeld naamsvermelding + contributors_at_html: "Austria: Bevat gegevens van de\nStad Wenen (onder\nCC BY), Land Vorarlberg en\nLand Tirol (onder CC-BY AT met aanvullingen)." + contributors_ca_html: "Canada: Bevat gegevens van\nGeoBase®, GeoGratis (© Department of Natural\nResources Canada), CanVec (© Department of Natural\nResources Canada), en StatCan (Geography Division,\nStatistics Canada)." + contributors_fi_html: "Finland: bevat gegevens van de topografische database van het nationaal kadaster van Finland en andere gegevensverzamelingen, onder de licentie NLSFI." + contributors_footer_1_html: "Voor meer gegevens over deze en andere bronnen die gebruikt zijn\nvoor het verbeteren van OpenStreetMap, kunt u de pagina met Bijdragers\nop de OpenStreetMap Wiki raadplegen." + contributors_footer_2_html: "Opname van gegevens in OpenStreetMap betekent niet dat de originele\ngegevensverstrekker OpenStreetMap ondersteunt, enige vorm van garantie geeft, of\naansprakelijkheid aanvaardt." + contributors_fr_html: "Frankrijk: Bevat gegevens van\nDirection Générale des Impôts." + contributors_gb_html: "Verenigd Koninkrijk: Bevat gegevens van\nde Ordnance Survey © Crown Copyright en databaserechten\n2010-2012." + contributors_intro_html: "Onze bijdragers zijn duizenden individuen. We bieden ook\nopen gelicenseerde gegevens van nationale kaartenbureaus\nen andere bronnen afkomstig zijn, waaronder:" + contributors_nl_html: "Nederland: Bevat © Gegevens van AND, 2007\n(www.and.com)" + contributors_nz_html: "Nieuw-Zeeland: Bevat gegevens van\nLand Information New Zealand. Crown Copyright voorbehouden." + contributors_title_html: Onze bijdragers + contributors_za_html: "Zuid-Afrika: Bevat gegevens afkomstig uit\nChief Directorate:\nNational Geo-Spatial Information, auteursrechten voor de Staat voorbehouden." + credit_1_html: "Wij vereisen dat u het volgende vermeld bij gebruik:\n“Kaartgegevens © OpenStreetMap-auteurs”." + credit_2_html: "U moet ook duidelijk maken dat de gegevens beschikbaar zijn onder de Open\nDatabase License en als u onze kaarttegels gebruikt, dat de cartografie\nde licentie CC-BY-SA heeft. U kunt dit doen door te verwijzen naar\ndeze pagina over auteursrechten. \nAls alternatief, en verplicht als u de gegevens van OSM distribueert, kunt u\ndirect verwijzen naar de licentie(s). In media waar\nverwijzen niet mogelijk is, bijvoorbeeld in gedrukte werken, raden we u aan\nuw lezer te verwijzen naar openstreetmap.org, mogelijk door \n\"OpenStreetMap\" hiernaar uit te breiden, naar opendatacommons.org en\nals van toepassing, naar creativecommons.org." + credit_3_html: "Voor een doorbladerbare kaart, moet de naamsvermelding in een hoek van de kaart weergegeven worden.\nBijvoorbeeld:" + credit_title_html: Hoe OpenStreetMap te vermelden + infringement_1_html: "Bijdragers aan OSM mogen nooit gegevens toevoegen\nuit bronnen waarvan de licentie niet vrij is (bijvoorbeeld Google Maps of gedrukte kaarten)\nzonder expliciete toestemming van de auteursrechtenhouders." + infringement_2_html: "Als u van mening bent dat auteursrechtelijk beschermd en niet vrij gelicenseerd materiaal\nongeoorloofd aan de database van OpenStreetMap is toegevoegd, raadpleeg dan\nonze takedownprocedure\nof meld het direct en formeel via onze online claimpagina." + infringement_title_html: Auteursrechtenschending + intro_1_html: "OpenStreetMap is open data, gelicenseerd onder de Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Het staat u vrij onze gegevens te kopiëren, te distribueren,\nweer te geven en aan te passen, zo lang als u OpenStreetMap en haar\nauteurs vermeldt. Als u onze kaarten of gegevens wijzigt of erop verder bouwt,\nmag u de resultaten onder dezelfde licentie distribueren. In de\nvolledige juridische\ntekst worden uw rechten en verantwoordelijkheden uitgelegd." + intro_3_html: "De cartografie in onze kaarttegels en onze documentatie zijn\ngelicenseerd onder de licentie Creative\nCommons Naamsvermelding-Gelijk delen 2.0 license (CC-BY-SA)." + more_1_html: "U kunt meer lezen over het gebruik van onze gegevens en hoe naamsvermelding toe te passen in de Veel gestelde juridische\nvragen." + more_2_html: "Hoewel OpenStreetMap open data is, kunnen we geen gratis\nkaart-API voor derde partijen aanbieden.\nZie ons API-gebruikbeleid,\nTegelgebruikbeleid\nen Nominatimgebruikbeleid." + more_title_html: Meer informatie + title_html: Auteursrechten en licentie native: mapping_link: gaan mappen native_link: Nederlandstalige versie @@ -1048,7 +1094,7 @@ nl: message_summary: delete_button: Verwijderen read_button: Markeren als gelezen - reply_button: Beantwoorden + reply_button: Antwoorden unread_button: Markeren als ongelezen new: back_to_inbox: Terug naar Postvak IN @@ -1077,13 +1123,10 @@ nl: title: Postvak UIT to: Aan read: - back_to_inbox: Terug naar Postvak IN - back_to_outbox: Terug naar Postvak UIT + back: Terug date: Datum from: Van - reading_your_messages: Bezig met het lezen van uw berichten - reading_your_sent_messages: Bezig met het lezen van uw verzonden berichten - reply_button: Beantwoorden + reply_button: Antwoorden subject: Onderwerp title: Bericht lezen to: Aan @@ -1093,6 +1136,37 @@ nl: wrong_user: U bent aangemeld als "%{user}", maar het bericht waarop u wilt antwoorden is niet aan die gebruiker gericht. Meld u aan als de juiste gebruiker om te antwoorden. sent_message_summary: delete_button: Verwijderen + note: + description: + closed_at_by_html: "%{when} geleden opgelost door %{user}" + closed_at_html: "%{when} geleden opgelost door" + commented_at_by_html: "%{when} geleden bijgewerkt door %{user}" + commented_at_html: "%{when} geleden bijgewerkt" + opened_at_by_html: "%{when} geleden gemaakt door %{user}" + opened_at_html: "%{when} geleden gemaakt" + reopened_at_by_html: "%{when} geleden opnieuw geactiveerd door %{user}" + reopened_at_html: "%{when} geleden opnieuw geactiveerd" + entry: + comment: Opmerking + full: Volledige opmerking + mine: + ago_html: "%{when} geleden" + created_at: Aangemaakt op + creator: Auteur + description: Beschrijving + heading: Opmerkingen van %{user} + id: Id + last_changed: Laatste wijziging + subheading: Opmerkingen gemaakt door %{user} + title: Opmerkingen gemaakt door %{user} + rss: + closed: gesloten opmerking (nabij %{place}) + commented: nieuwe reactie (bij %{place}) + description_area: Een lijst met opmerkingen en reacties in uw gebied [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Een RSS-feed voor opmerking %{id} + opened: nieuwe opmerking (bij %{place}) + reopened: opnieuw geactiveerde opmerking (bij %{place}) + title: OpenStreetMap opmerkingen notifier: diary_comment_notification: footer: U kunt de reactie ook lezen op %{readurl} en u kunt zelf ook reageren op %{commenturl} of antwoorden op %{replyurl} @@ -1102,14 +1176,13 @@ nl: email_confirm: subject: "[OpenStreetMap] Bevestig uw e-mailadres" email_confirm_html: - click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande verwijzing om de wijziging te bevestigen. + click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om de wijziging te bevestigen. greeting: Hallo, hopefully_you: Iemand - hopelijk u - wil zijn e-mailadres op %{server_url} wijzigen naar %{new_address}. email_confirm_plain: - click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande verwijzing om de wijziging te bevestigen. + click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om de wijziging te bevestigen. greeting: Hallo, - hopefully_you_1: Iemand - hopelijk u - wil zijn e-mailadres op - hopefully_you_2: "%{server_url} wijzigen naar %{new_address}." + hopefully_you: Iemand - hopelijk u - wil zijn/haar e-mailadres op %{server_url} wijzigen naar %{new_address}. friend_notification: befriend_them: U kunt deze gebruiker ook als vriend toevoegen op %{befriendurl}. had_added_you: "%{user} heeft u toegevoegd als vriend op OpenStreetMap." @@ -1132,50 +1205,42 @@ nl: lost_password: subject: "[OpenStreetMap] Verzoek wachtwoord opnieuw instellen" lost_password_html: - click_the_link: Als u dit bent, klik dan op de onderstaande verwijzing om uw wachtwoord te wijzigen. + click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om uw wachtwoord te wijzigen. 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. lost_password_plain: - click_the_link: Als u dit bent, klik dan alstublieft op de onderstaande verwijzing om uw wachtwoord opnieuw in te stellen. + click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om uw wachtwoord opnieuw in te stellen. greeting: Hallo, - hopefully_you_1: Iemand - mogelijk u - heeft aangevraagd om het wachtwoord opnieuw in te stellen voor - hopefully_you_2: de gebruiker met dit e-mailadres op openstreetmap.org. + hopefully_you: Iemand - mogelijk u - heeft aangevraagd om het wachtwoord opnieuw in te stellen voor de gebruiker met dit e-mailadres op openstreetmap.org. message_notification: - footer1: U kunt het bericht ook lezen op %{readurl} - footer2: en u kunt antwoorden op %{replyurl} + footer_html: U kunt het bericht ook lezen op %{readurl} en u kunt antwoorden op %{replyurl} header: "%{from_user} heeft u een bericht gezonden via OpenStreetMap met het onderwerp %{subject}:" hi: Hallo %{to_user}, + note_comment_notification: + anonymous: Een anonieme gebruiker + closed: + commented_note: "%{commenter} heeft een opmerking opgelost bij een kaart waar u op hebt gereageerd. De opmerking is gemaakt nabij %{place}." + subject_other: "[OpenStreetMap] %{commenter} heeft een opmerking opgelost waar u interesse in hebt" + subject_own: "[OpenStreetMap] %{commenter} heeft een van uw opmerkingen opgelost" + your_note: "%{commenter} heeft een opmerking van u opgelost bij een kaart nabij %{place}." + commented: + commented_note: "%{commenter} heeft gereageerd op een opmerking bij een kaart waar u op gereageerd hebt. De opmerking is gemaakt nabij %{place}." + subject_other: "[OpenStreetMap] %{commenter} heeft gereageerd op een opmerking waar u interesse in hebt" + subject_own: "[OpenStreetMap] %{commenter} heeft gereageerd op een van jouw opmerkingen" + your_note: "%{commenter} heeft gereageerd op een opmerking van u bij een kaart nabij %{place}." + details: Meer details over de opmerking zijn te vinden op %{url}. + greeting: Hallo, + reopened: + commented_note: "%{commenter} heeft een kaartopmerking waarop u hebt gereageerd opnieuw geactiveerd. De opmerking is gemaakt bij %{place}." + subject_other: "[OpenStreetMap] %{commenter} heeft een opmerking waar u interesse in hebt opnieuw geactiveerd" + subject_own: "[OpenStreetMap] %{commenter} heeft een van uw opmerkingen opnieuw geactiveerd" + your_note: "%{commenter} heeft een van uw kaartnotities bij %{place} opnieuw geactiveerd." signup_confirm: - subject: "[OpenStreetMap] Bevestig uw e-mailadres" - signup_confirm_html: - ask_questions: U kunt vragen stellen over OpenStreetMap op onze vraag en antwoordsite. - click_the_link: Als u dat bent, welkom! Volg de verwijzing hieronder beneden om uw gebruiker bevestigen en om meer over OpenStreetMap te weten te komen - current_user: Een lijst van gebruikers, gesorteerd op woonplaats, is te zien op Category:Users_by_geographical_region. - get_reading: Lees over OpenStreetMap op de wiki, volg het laatste nieuws op de OpenStreetMap-blog of via Twitter. Lees ook de OpenGeoData-blog van OpenSteetMap-grondlegger Steve Coast, die ook podcasts aanbiedt! - greeting: Hallo! - hopefully_you: Iemand (waarschijnlijk u) wil een gebruiker aanmaken op - introductory_video: U kunt een %{introductory_video_link}. - more_videos: Er zijn %{more_videos_link}. - more_videos_here: Er zijn nog meer video's - user_wiki_page: We adviseren u een gebruikerspagina aan te maken met onder andere categorieën die aangeven waar u verblijft, zoals [[Category:Users_in_Amsterdam]]. - video_to_openstreetmap: introductievideo over OpenStreetMap bekijken - wiki_signup: U kunt zich ook registreren op de OpenStreetMap-wiki. - signup_confirm_plain: - ask_questions: "U kunt vragen stellen over OpenStreetMap op onze vraag en antwoordsite:" - blog_and_twitter: "Volg het laatste nieuws via de OpenStreetMap-blog of Twitter:" - click_the_link_1: Als u dat bent, welkom! Volg de verwijzing hieronder om uw gebruiker te bevestigen - click_the_link_2: en om meer informatie over OpenStreetMap te krijgen. - current_user_1: Een lijst van gebruikers, gesorteerd op woonplaats - current_user_2: "is beschikbaar op:" + confirm: "Voordat we iets doen, zoeken we bevestiging dat dit verzoek inderdaad van u afkomstig is. Als dat zo is, klik dan op de onderstaande koppeling om uw gebruiker te bevestigen:" + created: Iemand (hopelijk u) heeft zojuist een gebruiker aangemaakt op %{site_url}. greeting: Hallo! - hopefully_you: Iemand (waarschijnlijk u) wil een gebruiker aanmaken op - introductory_video: "Er is een introductievideo over OpenStreetMap:" - more_videos: "Via de volgende verwijzing zijn meer video's beschikbaar:" - opengeodata: "OpenGeoData.org is de blog van OpenStreetMap-grondlegger Steve Coast, en deze biedt ook podcasts aan:" - the_wiki: "Lees meer over OpenStreetMap op de wiki:" - user_wiki_1: We adviseren u een gebruikerspagina aan te maken met onder andere - user_wiki_2: categorieën die aangeven waar u verblijft, zoals [[Category:Users_in_Amsterdam]]. - wiki_signup: "U kunt zich ook registreren bij de OpenStreetMap-wiki:" + subject: "[OpenStreetMap] Welkom bij OpenStreetMap" + welcome: Nadat u uw gebruiker hebt bevestigd, geven we u graag wat extra informatie zodat u aan de slag kunt. oauth: oauthorize: allow_read_gpx: uw privé-GPS-tracks lezen @@ -1184,8 +1249,18 @@ nl: allow_write_api: de kaart wijzigen allow_write_diary: dagboekberichten schrijven, reacties geven en vrienden maken allow_write_gpx: GPS-tracks uploaden + allow_write_notes: opmerkingen wijzigen. allow_write_prefs: uw gebruikersvoorkeuren wijzigen - request_access: De applicatie %{app_name} vraagt toegang tot uw gebruiker %{user}. Controleer of u deze applicatie de volgende mogelijkheden wilt bieden. U kunt zoveel of zo weinig rechten toewijzen als u wilt. + request_access: De toepassing %{app_name} vraagt toegang tot uw gebruiker %{user}. Controleer of u deze toepassing de volgende mogelijkheden wilt bieden. U kunt zoveel of zo weinig rechten toewijzen als u wilt. + title: Geef toegang tot uw gebruiker + oauthorize_failure: + denied: U hebt de toepassing %{app_name} toegang tot uw gebruiker geweigerd. + invalid: Het autorisatietoken is niet geldig. + title: De autorisatieaanvraag is mislukt. + oauthorize_success: + allowed: U hebt de toepassing %{app_name} toegang verleend tot uw gebruiker. + title: Autorisatieaanvraag toegestaan + verification: De controlecode is %{code}. revoke: flash: U hebt het token voor %{application} ingetrokken oauth_clients: @@ -1195,34 +1270,35 @@ nl: flash: De clientapplicatieregistratie is verwijderd edit: submit: Bewerken - title: Uw applicatie bewerken + title: Uw toepassing bewerken form: allow_read_gpx: privé-GPS-tracks lezen allow_read_prefs: gebruikersinstellingen lezen allow_write_api: de kaart wijzigen allow_write_diary: dagboekberichten schrijven, reacties en vrienden toevoegen allow_write_gpx: GPS-tracks uploaden + allow_write_notes: opmerkingen wijzigen. allow_write_prefs: gebruikersinstellingen wijzigen callback_url: Callback-URL name: Naam requests: "De volgende toegang van gebruikers vragen:" required: verplicht support_url: Ondersteunings-URL - url: Applicatie-URL + url: Toepassings-URL index: application: Applicatienaam issued_at: Uitgegeven op list_tokens: "De volgende tokens zijn op uw naam voor applicaties uitgegeven:" my_apps: Mijn clientapplicaties my_tokens: Mijn geautoriseerde applicaties - no_apps: Heeft u een applicatie die u wilt registreren met de %{oauth}-standaard? Dan moet u uw webapplicatie registreren voordat u OAuth-verzoeken naar deze dienst kunt maken. - register_new: Uw applicatie registreren + no_apps: Heeft u een toepassing die u wilt registreren met de %{oauth}-standaard? Dan moet u uw webtoepassing registreren voordat u OAuth-verzoeken naar deze dienst kunt maken. + register_new: Uw toepassing registreren registered_apps: "U hebt de onderstaande clientapplicaties geregistreerd:" revoke: Intrekken! title: Mijn OAuth-gegeven new: submit: Registreren - title: Nieuwe applicatie registreren + title: Nieuwe toepassing registreren not_found: sorry: Sorry, die %{type} kan niet gevonden worden. show: @@ -1232,6 +1308,7 @@ nl: allow_write_api: kaart wijzigen allow_write_diary: dagboekberichten schrijven, reacties geven en vrienden maken allow_write_gpx: GPS-tracks uploaden + allow_write_notes: opmerkingen wijzigen. allow_write_prefs: gebruikerseigenschappen wijzigen authorize_url: "URL voor autorisatie:" confirm: Weet u het zeker? @@ -1240,7 +1317,7 @@ nl: key: "Gebruikerssleutel:" requests: "Van de gebruiker worden de volgende rechten gevraagd:" secret: "Gebruikersgeheim:" - support_notice: HMAC-SHA-1 (aangeraden) wordt ondersteund, als ook platte tekst in SSL-modus. + support_notice: HMAC-SHA-1- (aangeraden) en RSA-SHA1-handtekeningen worden ondersteund. title: OAuth-gegevens voor %{app_name} url: "URL voor tokenverzoek:" update: @@ -1280,6 +1357,7 @@ nl: edit: anon_edits_link_text: Lees waarom dit het geval is. flash_player_required: 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. + id_not_configured: iD is niet ingesteld no_iframe_support: Uw browser ondersteunt geen iframes HTML die nodig zijn voor deze functie. not_public: U hebt ingesteld dat uw bewerkingen niet openbaar zijn. not_public_description: U kunt de kaart niet meer bewerken, behalve als u uw bewerkingen openbaar maakt. U kunt deze instelling maken op uw %{user_page}. @@ -1288,18 +1366,15 @@ nl: 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. user_page_link: gebruikerspagina index: + createnote: Opmerking toevoegen js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript uitgeschakeld. js_2: OpenStreetMap gebruikt JavaScript voor de slippy-kaart. license: - license_name: Creative Commons Naamsvermelding-Gelijk delen 2.0 - notice: Gelicenseerd onder de %{license_name} licentie door het %{project_name} en zijn bijdragers. - project_name: OpenStreetMap-project - permalink: Permanente verwijzing + copyright: Copyright OpenStreetMap en bijdragers, onder een open licentie + permalink: Permanente koppeling remote_failed: Bewerken is mislukt. Zorg dat JOSM of Merkaartor is geladen en dat de instelling voor Remote Control is ingeschakeld - shortlink: Korte verwijzing + shortlink: Korte koppeling key: - map_key: Legenda - map_key_tooltip: Kaartsleutel table: entry: admin: Bestuurlijke grens @@ -1372,7 +1447,7 @@ nl: heading: Kopje headings: Kopjes image: Afbeelding - link: Verwijzing + link: Koppeling ordered: Geordende lijst second: Tweede item subheading: Onderkop @@ -1385,7 +1460,6 @@ nl: preview: Voorvertoning search: search: Zoeken - search_help: "voorbeelden: 'Brugge', 'Spui, Amsterdam', '1234 AA', of 'post offices near Leuven' (meer voorbeelden...)." submit_text: OK where_am_i: Waar ben ik? where_am_i_title: De huidige locatie via de zoekmachine beschrijven @@ -1401,6 +1475,11 @@ nl: upload_trace: GPS-track uploaden delete: scheduled_for_deletion: Trace staat op de lijst voor verwijdering + description: + description_with_count: + one: GPX-bestand met één punt van %{user} + other: GPX-bestand met %{count} punten van %{user} + description_without_count: GPX-bestand van %{user} edit: description: "Beschrijving:" download: downloaden @@ -1418,7 +1497,11 @@ nl: uploaded_at: "Geüpload op:" visibility: "Zichtbaarheid:" visibility_help: wat betekent dit? + georss: + title: OpenStreetMap GPS-traces list: + description: Recente GPS-trackuploads bekijken + empty_html: Hier is nog niets te zien. Upload een nieuwe trace of kom meer te weten over GPS tracen op de wikipagina. public_traces: Openbare GPS-traces public_traces_from: Openbare GPS-traces van %{user} tagged_with: " gelabeld met %{tags}" @@ -1459,13 +1542,15 @@ nl: trace_header: see_all_traces: Alle traces bekijken see_your_traces: Al uw tracks weergeven - traces_waiting: U hebt al %{count} traces die wachten om geüpload te worden. Overweeg om te wachten totdat die verwerkt zijn, om te voorkomen dat de wachtrij voor andere gebruikers geblokkeerd wordt. + traces_waiting: + one: U hebt al een trace die wacht om geüpload te worden. Overweeg om te wachten totdat die verwerkt is, om te voorkomen dat de wachtrij voor andere gebruikers geblokkeerd wordt. + other: U hebt al %{count} traces die wachten om geüpload te worden. Overweeg om te wachten totdat die verwerkt zijn, om te voorkomen dat de wachtrij voor andere gebruikers geblokkeerd wordt. upload_trace: Trace uploaden trace_optionals: tags: Labels trace_paging_nav: - next: Volgende » - previous: « Vorige + newer: Nieuwere traces + older: Oudere traces showing_page: Pagina %{page} view: delete_track: Deze track verwijderen @@ -1499,12 +1584,15 @@ nl: heading: "Bijdragersovereenkomst:" link text: wat is dit? not yet agreed: U hebt nog niet ingestemd met de nieuwe Bijdragersovereenkomst. - review link text: Volg deze verwijzing als u wilt om de nieuwe Bijdragersovereenkomst te lezen en te accepteren. + review link text: Volg deze koppeling als u wilt om de nieuwe Bijdragersovereenkomst te lezen en te accepteren. current email address: "Huidige e-mailadres:" delete image: Huidige afbeelding verwijderen email never displayed publicly: (nooit openbaar gemaakt) flash update success: De gebruikersinformatie is bijgewerkt. flash update success confirm needed: De gebruikersinformatie is bijgewerkt. Controleer uw e-mail om uw nieuwe e-mailadres te bevestigen. + gravatar: + gravatar: Gravatar gebruiken + link text: wat is dit? home location: "Thuislocatie:" image: "Afbeelding:" image size hint: (vierkante afbeeldingen van minstens 100x100 pixels werken het beste) @@ -1540,13 +1628,13 @@ nl: update home location on click: Thuislocatie aanpassen bij klikken op de kaart confirm: already active: Deze gebruiker is al bevestigd. - before you start: We weten dat u waarschijnlijk snel met mappen wilt beginnen, maar geef alstublieft eerst wat informatie over uzelf in het onderstaande formulier. button: Bevestigen - heading: Gebruikers bevestigen + heading: Controleer uw e-mail + introduction_1: Wij u een bevestiging per e-mail gestuurd. + introduction_2: Bevestig uw gebruiker door op de koppeling in de e-mail te klikken en dan kunt u kaarten gaan maken. press confirm button: Klik op de knop "Bevestigen" hieronder om uw gebruiker te activeren. - reconfirm: Als het al weer een tijdje geleden is sinds u zich hebt geregistreerd, dan kunt u zich een nieuwe bevestigingse-mail laten sturen. - success: De gebruiker is geactiveerd. Dank u wel voor het registreren! - unknown token: Dat token bestaat niet. + reconfirm_html: Als nodig, kunt u de bevestigingscode opnieuw laten verzenden. + unknown token: De opgegeven bevestigingscode is verlopen of bestaat niet. confirm_email: button: Bevestigen failure: Er is al een e-mailadres bevestigd met dit token. @@ -1555,7 +1643,7 @@ nl: success: Uw e-mailadres is bevestigd. Dank u wel voor het registreren! confirm_resend: failure: De gebruiker %{name} is niet gevonden. - success: Er is een bevestigingse-mail verstuurd naar %{email} en als u uw gebruiker hebt bevestigd, kunt u gaan mappen.

    Als u een spamfilter gebruikt die bevestigingse-mails stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken. + success: Er is ter bevestiging een e-mail verstuurd naar %{email} en als u uw gebruiker hebt bevestigd, kunt u gaan mappen.

    Als u een spamfilter gebruikt die per e-mail een bevestiging stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken. filter: not_an_administrator: U moet beheerder zijn om deze handeling uit te kunnen voeren. go_public: @@ -1573,7 +1661,7 @@ nl: title: Gebruikers login: account is suspended: Uw gebruiker is automatisch opgeschort vanwege verdachte activiteit.
    Neem contact op met de webmaster als u deze handeling wilt bespreken. - account not active: Sorry, uw gebruiker is nog niet actief.
    Klik op de verwijzing in de bevestigingse-mail om deze te activeren of vraag een nieuwe bevestigingse-mail aan. + account not active: Uw gebruiker is helaas nog niet actief.
    Klik op de koppeling in de bevestiging om deze te activeren of vraag een nieuwe bevestiging per e-mail aan. auth failure: Sorry, met deze gegevens kunt u niet aanmelden. create account minute: Maak een gebruiker aan. Dat is snel gebeurd. email or username: "E-mailadres of gebruikersnaam:" @@ -1582,8 +1670,6 @@ nl: lost password link: Wachtwoord vergeten? new to osm: Is OpenStreetMap nieuw voor u? no account: Hebt u geen geregistreerde gebruiker? - notice: Lees meer over de aanstaande licentiewijziging voor OpenStreetMap (vertalingen) (overleg) - notice_terms: OpenStreetMap gaat vanaf 1 april 2012 een andere licentie gebruiken. Net als op dit moment is dat een open licenties, maar de juridische details zijn beter geschikt voor onze kaartgegevens. We willen uw bijdragen graag in de database houden, maar dat kan alleen als u ons toestemming geeft om ze te verspreiden onder de nieuwe licentie. Gaat u niet akkoord, dan verwijderen we uw bijdragen uit de database.

    Meld u alstublieft aan en neem dan even de tijd om de nieuwe voorwaarden te lezen en er akkoord mee te gaan. Bedankt! openid: "%{logo} OpenID:" openid invalid: Sorry, uw OpenID lijkt misvormd te zijn openid missing provider: Sorry, we konden geen contact maken met uw OpenID-provider @@ -1621,26 +1707,28 @@ nl: lost_password: email address: "E-mailadres:" heading: Wachtwoord vergeten? - help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie. We sturen u dan een webverwijzing die u kunt gebruiken om uw wachtwoord opnieuw in te stellen. + help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie. We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw in te stellen. new password button: Nieuw wachtwoord verzenden notice email cannot find: Kon dat e-mailadres niet vinden, sorry. notice email on way: Spijtig om te horen dat u het vergeten bent, maar er is een e-mail onderweg zodat u uw wachtwoord opnieuw kunt instellen. title: Wachtwoord vergeten make_friend: already_a_friend: U bent al bevriend met %{name}. + button: Als vriend toevoegen failed: Sorry, het toevoegen van %{name} als vriend is mislukt. + heading: "%{user} als vriend toevoegen?" success: "%{name} is nu uw vriend." new: + about: + header: Open en te bewerken + html: "

    In tegenstelling tot andere kaarten, is OpenStreetMap volledig gemaakt door mensen net als u en iedereen kan correcties maken, en de kaart bijwerken of downloaden en gebruiken.

    \n

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

    " confirm email address: "E-mailadres bevestigen:" confirm password: "Wachtwoord bevestigen:" contact_webmaster: Neem contact op met de webmaster om een gebruiker te laten maken. We proberen uw aanvraag dan zo snel mogelijk af te handelen. - continue: Doorgaan + continue: Registreren display name: "Weergavenaam:" display name description: Uw openbare gebruikersnaam. U kunt deze later in uw voorkeuren wijzigen. email address: "E-mailadres:" - fill_form: Vul het formulier in en we sturen u dan zo snel mogelijk een e-mail met gegevens over hoe u uw gebruiker kunt activeren. - flash create success message: Bedankt voor uw aanmelding. Er is een bevestigingse-mail verstuurd naar %{email} en als u uw gebruiker hebt bevestigd, kunt u gaan mappen.

    Als u een spamfilter gebruikt die bevestigingse-mails stuurt, zorg er dan voor dat u webmaster@openstreetmap.org toestaat. Dit systeem stuurt geen antwoord op bevestigingsverzoeken. - heading: Gebruiker aanmaken license_agreement: Als u een gebruiker aan wilt maken, moet u akkoord gaan met de voorwaarden voor bijdragen. no_auto_account_create: Helaas is het niet mogelijk om automatisch een gebruiker voor u aan te maken. not displayed publicly: Niet openbaar gemaakt. Zie Privacyovereenkomst. @@ -1650,7 +1738,7 @@ nl: password: "Wachtwoord:" terms accepted: Dank u wel voor het aanvaarden van de nieuwe bijdragersovereenkomst! terms declined: We vinden het jammer dat u hebt besloten de nieuwe Bijdragersvoorwaarden niet te accepteren. Zie deze wikipagina voor meer informatie. - title: Gebruiker aanmaken + title: Registreren use openid: U kunt ook aanmelden met een %{logo} OpenID no_such_user: body: Sorry, er is geen gebruiker met de naam %{user}. Controleer de spelling, of misschien is de link waarop je klikte onjuist. @@ -1661,6 +1749,8 @@ nl: nearby mapper: Dichtbijzijnde mapper your location: Uw locatie remove_friend: + button: Als vriend verwijderen + heading: "%{user} als vriend verwijderen?" not_a_friend: "%{name} staat niet in uw vriendelijst." success: "%{name} is verwijderd uit uw vriendenlijst." reset_password: @@ -1692,15 +1782,15 @@ nl: legale_select: "Selecteer het land waarin u woont:" read and accept: Lees de overeenkomst hieronder in en klik op de knop "Instemmen" om te bevestigen dat u de voorwaarden van deze overeenkomst voor uw bestaande en toekomstige bijdragen aanvaardt. title: Bijdragersovereenkomst - you need to accept or decline: Lees alstublieft de nieuwe Bijdragersvoorwaarden en besluit daarna deze te accepteren of te verwerpen voordat u door kunt gaan. + you need to accept or decline: Lees de nieuwe Bijdragersvoorwaarden en besluit daarna deze te accepteren of te verwerpen voordat u door kunt gaan. view: activate_user: gebruiker actief maken - add as friend: vriend toevoegen + add as friend: Vriend toevoegen ago: (%{time_in_words_ago} geleden) block_history: blokkades voor mij - blocks by me: blokkades door mij - blocks on me: blokkades door mij - comments: opmerkingen + blocks by me: Blokkades door u + blocks on me: Blokkades voor u + comments: Reacties confirm: Bevestigen confirm_user: deze gebruiker bevestigen create_block: gebruiker blokkeren @@ -1712,31 +1802,35 @@ nl: deactivate_user: gebruiker inactief maken delete_user: gebruiker verwijderen description: Beschrijving - diary: dagboek - edits: bewerkingen + diary: Dagboek + edits: Bewerkingen email address: "E-mailadres:" - friends_changesets: Alle wijzigingensets van vrienden bekijken - friends_diaries: Alle dagboekberichten van vrienden bekijken + friends_changesets: wijzigingensets van vrienden + friends_diaries: dagboekberichten van vrienden hide_user: gebruikers verbergen - if set location: Als u uw locatie instelt, verschijnt er hieronder een kaart. U kunt de locatie instellen in uw %{settings_link}. + if set location: Stel uw thuislocatie in via de pagina %{settings_link} om gebruikers in uw buurt te zien. km away: "%{count} km verwijderd" latest edit: "Laatste bewerking %{ago}:" m away: "%{count} m verwijderd" mapper since: "Mapper sinds:" - moderator_history: ingestelde blokkades bekijken - my comments: mijn opmerkingen - my diary: mijn dagboek - my edits: mijn bewerkingen - my settings: mijn instellingen - my traces: mijn traces + moderator_history: ingestelde blokkades + my comments: Opmerkingen + my diary: Dagboek + my edits: Bewerkingen + my messages: Mijn berichten + my notes: Opmerkingen + my profile: Profiel + my settings: Instellingen + my traces: Traces nearby users: Andere dichtbijzijnde gebruikers - nearby_changesets: Alle wijzigingensets van nabijgelegen gebruikers bekijken - nearby_diaries: Alle dagboekberichten van nabijgelegen gebruikers bekijken + nearby_changesets: wijzigingensets van gebruikers in de buurt + nearby_diaries: dagboekberichten van gebruikers in de buurt new diary entry: nieuw dagboekbericht no friends: U hebt nog geen vrienden toegevoegd. - no nearby users: Er zijn geen andere gebruikers die hebben aangegeven in de buurt te mappen. + no nearby users: Er zijn geen andere gebruikers die hebben opgegeven in de buurt te mappen. + notes: Opmerkingen bij kaarten oauth settings: Oauth-instellingen - remove as friend: vriend verwijderen + remove as friend: Vriend verwijderen role: administrator: Deze gebruiker is beheerder grant: @@ -1746,11 +1840,11 @@ nl: revoke: administrator: Beheerdersrechten intrekken moderator: Moderatorrechten intrekken - send message: bericht verzenden + send message: Bericht verzenden settings_link_text: voorkeuren spam score: "Spamscore:" status: "Status:" - traces: traces + traces: Traces unhide_user: gebruiker weer zichtbaar maken user location: Gebruikerslocatie your friends: Uw vrienden @@ -1808,11 +1902,14 @@ nl: creator_name: Auteur display_name: Geblokkeerde gebruiker edit: Bewerken + next: Volgende » not_revoked: (niet ingetrokken) + previous: « Vorige reason: Reden voor blokkade revoke: Intrekken revoker_name: Ingetrokken door show: Weergeven + showing_page: Pagina %{page} status: Status period: one: 1 uur @@ -1860,3 +1957,25 @@ nl: fail: Het was niet mogelijk de rol "%{role}" voor gebruiker "%{name}" in te trekken. Controleer of de gebruikersnaam en rolnaam correct waren. heading: Intrekken rechten bevestigen title: Intrekken rechten bevestigen + welcome_page: + add_a_note: + paragraph_1_html: Als u gewoon wilt iets kleins wilt verbeteren en niet de tijd niet hebt om u in te schrijven en om te leren hoe te bewerken, kunt u eenvoudig een opmerking toevoegen. + paragraph_2_html: "Ga naar de kaart en klik op het notitiesymbool:\n. Er wordt een markering toegevoegd aan de kaart die u kunt verplaatsen door te slepen. Voeg uw bericht toe en klik dan op Opslaan, zodat andere mapper het kunnen onderzoeken." + title: Geen tijd om te bewerken? Voeg een opmerking toe! + basic_terms: + editor_html: Een editor is een programma of website die u kunt gebruiken om de kaart te bewerken. + node_html: Een node is een punt op de kaart, zoals een enkel restaurant of een boom. + paragraph_1_html: OpenStreetMap heeft een eigen jargon. Hier volgen een aantal woorden die van pas gaan komen. + tag_html: Een label (tag) is een eigenschap over een node of een weg, zoals de naam van een restaurant of de maximum snelheid voor een weg. + title: Basisbegrippen voor cartografie + way_html: Een weg (way) is een lijn of gebied, zoals een weg, een rivier, een meer of een gebouw. + introduction_html: Welkom bij OpenStreetMap, de open en te bewerken kaart van de wereld. Nu u bent aangemeld, kunt u kaarten gaan maken. Hier zijn een aantal dingen die belangrijk zijn om te weten. + questions: + paragraph_1_html: "Er zijn verschillende bronnen om te leren over OpenStreetMap, voor het stellen van vragen en het krijgen van antwoorden, en het samen overleggen en documenteren van onderwerpen die gaan over kaarten maken.\nHier vindt u meer informatie." + title: Nog vragen? + start_mapping: Beginnen met kaarten maken + title: Welkom! + whats_on_the_map: + off_html: "Geen onderdeel van de kaart zijn subjectieve gegevens zoals waarderingen, historische of hypothetische eigenschappen en gegevens uit bronnen die auteursrechtelijk beschermd zijn. Tenzij u bijzondere toestemming hebt,\nkunt u niet kopiëren uit kaarten die u online of op papier kunt vinden." + on_html: "OpenStreetMap is plaats voor het in kaart brengen van dingen die echt en actueel zijn -\nwe hebben een kaart met miljoenen gebouwen, wegen en andere details over plaatsen.\nU kunt alles uit de echte wereld waar u interesse in hebt in kaart brengen." + title: Wat is er op de kaart? diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 77ed3594b62..a75529f56ff 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1,4 +1,4 @@ -# Messages for Norwegian Nynorsk (‪norsk (nynorsk)‬) +# Messages for Norwegian Nynorsk (norsk nynorsk) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Dittaeva @@ -6,6 +6,7 @@ # Author: Gnonthgol # Author: Gunnernett # Author: Harald Khan +# Author: Nemo bis # Author: Nghtwlkr # Author: Njardarlogar # Author: Pladask @@ -88,92 +89,15 @@ nn: need_to_see_terms: Tilgjenget ditt til API-eit er mellombels stoppa. Logg inn på nettsiden for å lese bidragsytervilkårene. Du treng ikkje godta vilkåra, men du må lese dei. browse: changeset: - changeset: "Endringssett: %{id}" changesetxml: XML for endringssett - download: Last ned %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Endringssett %{id} title_comment: "Endringssett: %{id} - %{comment}" osmchangexml: osmChange XML title: Endringssett - changeset_details: - belongs_to: "Tilhøyrer:" - bounding_box: "Avgrensingsboks:" - box: boks - closed_at: "Lukka:" - created_at: "Oppretta:" - has_nodes: - one: "Har følgjande %{count} node:" - other: "Har følgjande %{count} nodar:" - has_relations: - one: "Har følgjande %{count} relasjon:" - other: "Har følgjande %{count} relasjonar:" - has_ways: - one: "Har følgjande %{count} veg:" - other: "Har følgjande %{count} vegar:" - no_bounding_box: Ingen avgrensingsboks er lagra for dette endringssettet. - show_area_box: Vis boks for område - common_details: - changeset_comment: "Kommentar:" - deleted_at: "Sletta:" - deleted_by: "Sletta av:" - edited_at: "Redigert:" - edited_by: "Redigert av:" - in_changeset: "I endringssett:" - version: "Versjon:" containing_relation: entry: Relasjon %{relation_name} entry_role: Relasjon %{relation_name} (som %{relation_role}) - map: - deleted: Sletta - edit: - area: Rediger område - node: Rediger node - relation: Rediger relasjon - way: Rediger rute - larger: - area: Vis område på større kart - node: Vis node på større kart - relation: Vis relasjon på større kart - way: Vis veg på større kart - loading: Lastar... - navigation: - all: - next_changeset_tooltip: Neste endringssett - next_node_tooltip: Neste node - next_relation_tooltip: Neste relasjon - next_way_tooltip: Neste veg - prev_changeset_tooltip: Forrige endringssett - prev_node_tooltip: Forrige node - prev_relation_tooltip: Forrige relasjon - prev_way_tooltip: Forrige veg - paging: - all: - next: "%{id} »" - prev: « %{id} - user: - next: "%{id} »" - prev: « %{id} - user: - name_changeset_tooltip: Vis redigeringar av %{user} - next_changeset_tooltip: Neste redigering av %{user} - prev_changeset_tooltip: Forrige redigering av %{user} - node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Last ned XML - edit: rediger - node: Node - node_title: "Node: %{node_name}" - view_history: vis historikk - node_details: - coordinates: "Koordinatar:" - part_of: "Del av:" - node_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Last ned XML - node_history: Nodehistorik - node_history_title: "Nodehistorikk: %{node_name}" - view_details: vis detaljar not_found: sorry: Klarte ikkje finne %{type}-ein med ID %{id}. type: @@ -181,9 +105,9 @@ nn: node: node relation: relasjon way: veg - paging_nav: - of: av - showing_page: Viser side + note: + closed_title: "Oppklara notis: %{note_name}" + open_title: "Uoppklara notis: %{note_name}" redacted: message_html: Versjon %{version} av denne %{type} kan ikkje visast fordi den er blitt maskert. Sjå %{redaction_link} for detaljar. redaction: Maskering %{id} @@ -191,21 +115,6 @@ nn: node: noden relation: relasjonen way: vegen - relation: - download: "%{download_xml_link} eller %{view_history_link}" - download_xml: Last ned XML - relation: Relasjon - relation_title: "Relasjon: %{relation_name}" - view_history: vis historikk - relation_details: - members: "Medlemmar:" - part_of: "Del av:" - relation_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Last ned XML - relation_history: Relasjonshistorikk - relation_history_title: "Relasjonshistorikk: %{relation_name}" - view_details: vis detaljar relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} som %{role}" @@ -213,43 +122,9 @@ nn: node: Node relation: Relasjon way: Veg - start: - manually_select: Vel eit anna område manuelt - view_data: Vis data for gjeldande kartvising start_rjs: - data_frame_title: Data - data_layer_name: Kartdata - details: Detaljar - drag_a_box: Dra ein boks på kartet for å velje eit område - edited_by_user_at_timestamp: Redigert av [[user]], [[timestamp]] - hide_areas: Skjul områder - history_for_feature: Historikk for [[feature]] load_data: Last inn data - loaded_an_area_with_num_features: Dette området inneheld [[num_features]] objekt. Nokre nettlesarar kan ikkje handtere så mykje data. For å ikkje risikere at nettlesaren låsar seg bør du halde deg til under [[max_features]] objekt. Om du er sikker på at du vil sjå informasjonen kan du klikke på knappen nedanfor. loading: Lastar... - manually_select: Vel eit anna område manuelt - object_list: - api: Hent dette området frå API-et - back: Vis objektliste - details: Detaljar - heading: Objektliste - history: - type: - node: Node [[id]] - way: Veg [[id]] - selected: - type: - node: Node [[id]] - way: Veg [[id]] - type: - node: Node - way: Veg - private_user: privat brukar - show_areas: Vis områder - show_history: Vis historikk - unable_to_load_size: "Klarte ikkje laste inn: Avgrensingsboks med storleik [[bbox_size]] er for stor (må vere mindre enn %{max_bbox_size})" - wait: Vent ... - zoom_or_select: Zoom inn eller vel eit område av kartet for vising tag_details: tags: "Merkelapper:" wiki_link: @@ -263,39 +138,15 @@ nn: node: node relation: relasjon way: veg - way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Last ned XML - edit: rediger - view_history: vis historikk - way: Veg - way_title: "Veg: %{way_name}" - way_details: - also_part_of: - one: òg del av vegen %{related_ways} - other: òg del av vegane %{related_ways} - nodes: "Nodar:" - part_of: "Del av:" - way_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Last ned XML - view_details: vis detaljar - way_history: Veghistorikk - way_history_title: "Veghistorikk: %{way_name}" changeset: changeset: anonymous: Anonym - big_area: (stor) - id: "#%{id}" - no_comment: (ingen) no_edits: (ingen redigeringar) - show_area_box: vis boks for område - still_editing: (redigerer forsatt) view_changeset_details: Vis detaljar for endringssett changeset_paging_nav: next: Neste » previous: « Forrige - showing_page: Viser side %{page} + showing_page: Side %{page} changesets: area: Område comment: Kommentar @@ -303,24 +154,10 @@ nn: saved_at: Lagra user: Brukar list: - description: Siste endringar - description_bbox: Endringssett innanfor %{bbox} - description_friend: Endringssett av venene dine - description_nearby: Endringssett av næliggande brukarar - description_user: Endringssett av %{user} - description_user_bbox: Endringssett av %{user} innan %{bbox} - heading: Endringssett - heading_bbox: Endringssett - heading_friend: Endringssett - heading_nearby: Endringssett - heading_user: Endringssett - heading_user_bbox: Endringssett title: Endringssett - title_bbox: Endringssett innanfor %{bbox} title_friend: Endringssett av venene dine - title_nearby: Endringssett av nærliggande brukarar + title_nearby: Endringssett av naboar title_user: Endringssett av %{user} - title_user_bbox: Endringssett av %{user} innan %{bbox} timeout: sorry: Lista over endringssett tok for lang tid å hente. diary_entry: @@ -338,8 +175,9 @@ nn: hide_link: Skjul denne kommentaren diary_entry: comment_count: - one: 1 kommentar + one: "%{count} kommentar" other: "%{count} kommentarar" + zero: Ingen kommentarar comment_link: Kommenter denne oppføringa confirm: Stadfest edit_link: Rediger denne oppføringa @@ -374,10 +212,10 @@ nn: newer_entries: Nyare oppføringar no_entries: Ingen oppføringer i dagboka older_entries: Eldre oppføringar - recent_entries: "Nye oppføringer i dagboka:" + recent_entries: Nye oppføringer i dagboka title: Brukarane sine dagbøker title_friends: Dagbøkene til venene dine - title_nearby: Dagbøkene til nærliggande brukarar + title_nearby: Dagbøkene til naboar user_title: "%{user} si dagbok" location: edit: Rediger @@ -413,7 +251,7 @@ nn: area_to_export: Område som skal eksporterast embeddable_html: HTML som kan byggjast inn export_button: Eksporter - export_details: Data frå OpenStreetMap er lisensiert under Creative Commons Navngivelse-Del på same vilkår 2.0. + export_details: Data frå OpenStreetMap er lisensiert under Open Data Commons Open Database License (ODbL). format: Format format_to_export: Format for eksport image_size: Bildestørrelse @@ -430,28 +268,16 @@ nn: scale: Skala too_large: body: Dette området er for stort for å eksporterast som OpenStreetMap XML-data. Zoom inn eller vel eit mindre område. - heading: For stort område zoom: Zoom - start_rjs: - add_marker: Legg til ein markør på kartet - change_marker: Endre markørposisjon - click_add_marker: Klikk på kartet for å leggja til ein markør - drag_a_box: Dra ein boks på kartet for å velje eit område - export: Eksporter - manually_select: Vel eit anna område manuelt - view_larger_map: Vis større kart geocoder: description: title: geonames: Posisjon frå GeoNames - osm_namefinder: "%{types} frå OpenStreetMap Namefinder" osm_nominatim: Posisjon frå OpenStreetMap Nominatim types: cities: Byar places: Stader towns: Småbyar - description_osm_namefinder: - prefix: "%{distance} %{direction} av %{type}" direction: east: aust north: nord @@ -473,15 +299,9 @@ nn: ca_postcode: Resultat frå Geocoder.CA geonames: Resultat frå GeoNames latlon: Resultat frå Internt - osm_namefinder: Resultat frå OpenStreetMap Namefinder osm_nominatim: Resultat frå OpenStreetMap Nominatim uk_postcode: Resultat frå NPEMap / FreeThe Postcode us_postcode: Resultat frå Geocoder.us - search_osm_namefinder: - prefix: "%{type}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} av %{parentname})" - suffix_place: ", %{distance} %{direction} av %{placename}" - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: aeroway: @@ -627,7 +447,7 @@ nn: primary: Primær veg primary_link: Primær veg raceway: Racerbane - residential: Bustad + residential: Bustadveg rest_area: Rasteplass road: Veg secondary: Sekundær veg @@ -728,6 +548,8 @@ nn: airfield: Militær flyplass barracks: Kaserner bunker: Bunker + mountain_pass: + "yes": Fjellovergang natural: bay: Bukt beach: Strand @@ -954,91 +776,83 @@ nn: mapquest: MapQuest Open standard: Standard transport_map: Transport-kart - overlays: - maplint: Maplint site: edit_disabled_tooltip: Zoom inn for å redigere kartet edit_tooltip: Rediger kartet - edit_zoom_alert: Du må zoome inn for å redigere kartet - history_disabled_tooltip: Zoom inn for å vise redigeringar i dette området - history_tooltip: Vis redigeringar for dette området - history_zoom_alert: Du må zoome inn for å vise redigeringar i dette området layouts: community: Samfunnet community_blogs: Bloggar community_blogs_title: Bloggar frå medlemmane i OpenStreetMap-felleskapet copyright: Opphavsrett & lisens - documentation: Dokumentasjon - documentation_title: Dokumentasjon for prosjektet donate: Støytt OpenStreetMap ved %{link} til Hardware Upgrade Fund (eit fond for maskinvareoppgraderinger). - donate_link_text: donering edit: Rediger edit_with: Rediger med %{editor} export: Eksporter - export_tooltip: Eksporter kartdata foundation: Stifting foundation_title: OpenStreetMap-stiftinga gps_traces: GPS-spor gps_traces_tooltip: Handsam GPS-spor help: Hjelp - help_centre: Brukarstøtte - help_title: Hjelpenettstad for prosjektet - help_url: http://help.openstreetmap.org/ history: Historikk home: heim - home_tooltip: Gå til heimeposisjon - inbox: innboks (%{count}) - inbox_tooltip: - one: Din innboks inneheld 1 ulesen melding - other: Din innboks inneheld %{count} ulesne meldingar - zero: Din innboks inneheld ingen ulesne meldingar - intro_1: OpenStreetMap er eit fritt redigerbart kart over heile jorda. Det er laga av folk som deg. intro_2_create_account: Opprett ein brukarkonto - intro_2_download: last ned - intro_2_html: Du står fritt til å %{download} informasjonen og til å %{use} den under ein %{license}. %{create_account} for å forbedre kartet. - intro_2_license: åpen lisens - intro_2_use: bruke - license: - alt: CC by-sa 2.0 - title: Data frå OpenStreetMap er lisensierte under lisensen Creative Commons Navngivelse-Del på like vilkår 2.0 Generisk log_in: logg inn log_in_tooltip: Logg inn med ein eksisterande konto logo: alt_text: OpenStreetMap-logo logout: logg ut - logout_tooltip: Logg ut make_a_donation: text: Gje pengegåve title: Støtt OpenStreetMap med ei pengegåve osm_offline: OpenStreetMap databasen er for augneblunken utilgjengelig medan essensielt vedlikeholdsarbeid vert utført. osm_read_only: OpenStreetMap kan ikkje redigerast akkurat no, på grunn av nødvendig vedlikehaldsarbeid. partners_bytemark: Bytemark Hosting - partners_html: Drifta er støtta av %{ucl}, %{ic} og %{bytemark}, og andre %{partners}. + partners_html: Drifta er støtta av %{ucl}, %{ic}, %{bytemark} og andre %{partners}. partners_ic: Imperial College London partners_partners: partnarar - partners_ucl: UCL VR senteret + partners_ucl: UCL VR-senteret project_name: h1: OpenStreetMap title: OpenStreetMap sign_up: registrer sign_up_tooltip: Opprett ein konto for redigering - sotm2011: Kom til 2011 OpenStreetMap-konferansen, «Tilstanden til kartet», 11.9. september i Denver! tag_line: Fritt Wiki-verdenskart user_diaries: Brukardagbok user_diaries_tooltip: Vis brukaren si dagbok - view: Vis - view_tooltip: Vis kartet - welcome_user: Velkomen, %{user_link} - welcome_user_link_tooltip: Din brukarside - wiki: Wiki - wiki_title: Wikinettstad for prosjektet - wiki_url: http://wiki.openstreetmap.org/ license_page: foreign: english_link: den engelske originalen - text: I tilfellet konflikt mellom denne omsette sida og %{english_original_link} har den engelske presedensen + text: I tilfelle konflikt mellom denne omsette sida og %{english_original_link} har den engelske versjonen presedens title: Om denne omsetjinga - legal_babble: "

    Opphavsrett og lisensar

    \n

    \n OpenStreetMap er opne data, lisensiert under Creative\n Commons Navngivelse-DelPåSammeVilkår 2.0 (CC BY-SA).\n

    \n

    \n Du er fri til å kopiere, distribuere, overføre og tilpasse karta våre og dataa, så lenge du krediterer OpenStreetMap og bidragsytarane\n deira. Dersom du endrar eller byggjer på karta våre eller dataa, kan du berre distribuere resultatet under same lisens. \n Den fulle juridiske\n teksten forklarer rettane og ansvaret.\n

    \n\n

    Korleis kreditere OpenStreetMap

    \n

    \n Dersom du brukar OpenStreetMap kartbilder, ber me om at din kreditering minst inneheld \n «© OpenStreetMap-bidragsytarar, CC BY-SA». Viss du berre brukar kartdata, ber me om \n «Kartdata © OpenStreetMap-bidragsytarar, CC BY-SA».\n

    \n

    \n Der det er mogleg, bør OpenStreetMap lenkjast til http://www.openstreetmap.org/\n og CC BY-SA til http://creativecommons.org/licenses/by-sa/2.0/. Viss\n du brukar eit medium der lenkjer ikkje er mogleg (t.d. i utskrivne arbeid), foreslår me at du viser lesarane til\n www.openstreetmap.org (kanskje ved å utvide 'OpenStreetMap' til denne fullstendige adressa) og til\n www.creativecommons.org.\n

    \n\n

    Finn ut meir

    \n

    \n Les meir om korleis du brukar dataa våre i den juridiske\n FAQ-en.\n

    \n

    \n OSM-bidragsytarar vert minna på å aldri leggje til data frå opphavsrettsbeskytta kjelder (t.d. Google Maps eller utskrivne kart) utan\n uttrykkeleg løyve frå rettighetshavere.\n

    \n

    \n Sjølv om OpenStreetMap er åpne data kan me ikkje gje eit\n gratis kart-API til tredjepartsutviklere.\n\n Sjå våre retningslinjer for nytting av API-et,\n kartbilder\n og Nominatim.\n

    \n\n

    Bidragsytarane våre

    \n

    \n Vår CC BY-SA-lisens krev at du «gjev den opphavlege forfattaren rimeleg kreditt til mediet eller måten du\n nyttar». Individuelle OSM-kartleggere krev ikkje ein kreditering utover «OpenStreetMap bidragsytarar»,\n men der data frå eit nasjonal kartleggingsbyrå eller frå ein anna stor kjelde er vorten inkludert inne i\n OpenStreetMap, kan det vere fornuftig å kreditere dei ved direkte\n reprodusering av kreditten deira eller ved å linke til det på denne sida.\n

    \n\n\n\n
      \n
    • Australia: Inneheld forstadsdata basert\n på Australian Bureau of Statistics data.
    • \n
    • Austerrike: Inneheld data henta frå\n Stadt Wien under\n CC BY,\n Land Vorarlberg og\n Land Tirol (under CC-BY AT med tilleg).
    • \n
    • Canada: Inneheld data frå\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada).
    • \n
    • Frankrike: Inneheld data henta frå\n Direction Générale des Impôts.
    • \n
    • New Zealand: Inneheld data henta frå\n Land Information New Zealand. Crown Copyright reservert.
    • \n
    • Polen: Inneheld data frå UMP-pcPL maps. Copyright\n UMP-pcPL bidragsytarar.
    • \n
    • Storbritannia: Inneheld Ordnance\n Survey data © Crown copyright og database-rettar\n 2010.
    • \n
    \n\n

    \n Inkludering av data i OpenStreetMap inneber ikkje at den opphavlege\n dataleverandøren støttar OpenStreetMap, gjev nokon garanti eller\n godtek noko erstatningsansvar.\n

    " + legal_babble: + attribution_example: + alt: Døme på korleis ein syner OpenStreetMap som kjelde på ei vevside + title: Døme på kjeldehenvising + contributors_at_html: "Austerrike: Inneheld data henta frå\n Stadt Wien under\n CC BY,\n Land Vorarlberg og\n Land Tirol (under CC-BY AT med tilleg)." + contributors_ca_html: "Canada: Inneheld data frå\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), og StatCan (Geography Division,\n Statistics Canada)." + contributors_footer_1_html: " For detaljar om desse og andre kjelder som har blitt brukt for å forbetra\n OpenStreetMap, sjå Bidragsytarar\n sida på OpenStreetMap Wikien." + contributors_footer_2_html: " Inkludering av data i OpenStreetMap inneber ikkje at den opphavlege\n dataleverandøren støttar OpenStreetMap, gjev nokon garanti eller\n godtek noko erstatningsansvar." + contributors_fr_html: "Frankrike: Inneheld data henta frå\n Direction Générale des Impôts." + contributors_gb_html: "Storbritannia: Inneheld Ordnance\n Survey data © Crown copyright og database-rettar\n 2010-12." + contributors_intro_html: "Me har tusenvis av individuelle bidragsytarar. Me inkluderer óg åpne datasett frå nasjonale karttjenester og andre kjelder, bland anna frå:" + contributors_nl_html: "Nederland: Inneheld © AND-data, 2007\n (www.and.com)\n
  • New Zealand: Inneheld data henta frå\n Land Information New Zealand. Crown Copyright reservert." + contributors_nz_html: "New Zealand: Inneheld data henta frå\n Land Information New Zealand. Crown Copyright reservert." + contributors_title_html: Bidragsytarane våre + contributors_za_html: "Sør-Afrika: Inneheld data frå Chief Directorate: National Geo-Spatial Information, State copyright reserved." + credit_1_html: Me krev at du brukar godskrivinga «© OpenStreetMap-bidragsytarane». + credit_2_html: Du må óg gjere det klart at dataa er tilgjengeleg under Open Database License, og dersom du brukar kartflisene, at kartografien er lisensiert under CC BY-SA. Du kan gjere dette ved å lenkje til denne sida. Alternativt, og eit krav om du distribuerer OSM i dataform, kan du nemne og lenkje til lisensen eller lisensane. I former der lenkjer er umogleg (t.d. trykte verk), føreslår me at du viser lesarane dine til openstreetmap.org (kanskje ved å utvide «OpenStreetMap» til denne fulle adressa), til opendatacommons.org, og dersom relevant, til creativecommons.org. + credit_3_html: "For et navigerbart elektronisk kart, skal kjelda visast i hjørnet av kartet.\nTil dømes:" + credit_title_html: Korleis kreditere OpenStreetMap + infringement_1_html: "OSM-bidragsytarar vert minna på å aldri leggje til data frå opphavsrettsbeskytta kjelder (t.d. Google Maps eller utskrivne kart) utan\n uttrykkeleg løyve frå rettighetshavere." + infringement_2_html: "Dersom du trur at kopibeskytta materiale har blitt lagt inn i OpenStreetMap databasen eller denne sida, venligst henvend deg til vår takedown \nprosedyre eller direkte til vårt online skjema." + infringement_title_html: Illegal kopiering + intro_1_html: Data frå OpenStreetMap er åpne data, lisensiert under Open Data Commons Open Database License (ODbL). + intro_2_html: "Du er fri til å kopiere, distribuere, overføre og tilpasse dataa våre, så lenge du godskriv OpenStreetMap og bidragsytarane\n deira. Dersom du endrar eller byggjer på dataa våre, kan du berre distribuere resultatet under same lisens. \n Den fullstendige juridiske\n teksten forklarer rettane og ansvaret." + intro_3_html: "Kartografien i våre kartfliser, og dokumentasjonen vår, er lisensiert under Creative\n Commons Navngivelse-DelPåSammeVilkår 2.0 (CC BY-SA)." + more_1_html: "Les meir om korleis du brukar dataa våre, og korleis du krediterer oss, i den juridiske\n FAQ-en." + more_2_html: "Sjølv om OpenStreetMap er åpne data kan me ikkje gje eit\n gratis kart-API til tredjepartsutviklere.\n\n Sjå våre retningslinjer for nytting av API-et,\n kartbilder\n og Nominatim." + more_title_html: Finn ut meir + title_html: Opphavsrett og lisensar native: mapping_link: start kartlegging native_link: Nynorsk versjon @@ -1098,12 +912,8 @@ nn: title: Utboks to: Til read: - back_to_inbox: Tilbake til innboks - back_to_outbox: Tilbake til utboks date: Dato from: Frå - reading_your_messages: Lesar meldingane dine - reading_your_sent_messages: Les dei sende meldingane dine reply_button: Svar subject: Emne title: Les melding @@ -1129,8 +939,6 @@ nn: email_confirm_plain: click_the_link: Viss det er deg, klikk lenkja nedanfor for å stadfeste endringa. greeting: Hei, - hopefully_you_1: Nokre (vonleg deg) ynskjer å endre e-postadressen for - hopefully_you_2: "%{server_url} til %{new_address}." friend_notification: befriend_them: Du kan òg leggje dei til som ven på %{befriendurl}. had_added_you: "%{user} har lagt deg til som ven på OpenStreetMap." @@ -1160,57 +968,31 @@ nn: lost_password_plain: click_the_link: Om dette er deg, vennligst klikk på lenkja under for å tilbakestille passordet. greeting: Hei, - hopefully_you_1: Nokre (moglegvis deg) har bede om å tilbakestille passordet på denne - hopefully_you_2: e-postadressa for openstreetmap.org-konto. message_notification: - footer1: Du kan òg lese meldinga på %{readurl} - footer2: og du kan svare til %{replyurl} header: "%{from_user} har sendt deg ei melding gjennom OpenStreetMap med emnet %{subject}:" hi: Hei %{to_user}, subject_header: "[OpenStreetMap] %{subject}" + note_comment_notification: + anonymous: Ein anonym brukar + details: Meir detaljar om notisen kan du finne på %{url}. + greeting: Hei, signup_confirm: - subject: "[OpenStreetMap] Stadfest di e-postadresse" - signup_confirm_html: - ask_questions: Du kan stille spørsmål du har om OpenStreetMap på vårt spørsmål og svar-nettsted. - click_the_link: Viss dette er deg, så er du velkomen! Klikke lenkja nedanfor for å stadfeste kontoen og les litt vidare for meir informasjon om OpenStreetMap - current_user: Ei liste over noverande brukarar i kategoriar, basert på kor i verda dei er, er tilgjengeleg frå Category:Users_by_geographical_region. - get_reading: Start å lese om OpenStreetMap på wikien, få med deg dei siste nyhenda via OpenStreetMap-bloggen eller Twitter. Eller bla gjennom OpenStreetMaps grunnlegg Steve Coasts OpenGeoData-blogg for heile historia til prosjektet, som òg har engelske podkaster du kan lytte til. + confirm: "Før me kan gjere noko må me bekrefta at denne forespørselen kom frå deg, om den gjer det ver god å klikk linken nedanfor for å bekrefte kontoen din:" + created: Nokon (forhåpentligvis deg) laga nettop ein konto på %{site_url}. greeting: Hei der! - hopefully_you: Nokre (vonleg deg) ynskjer å opprette ein konto på - introductory_video: Du kan sjå ein %{introductory_video_link}. - more_videos: Det er %{more_videos_link}. - more_videos_here: fleire videoar her - user_wiki_page: Det er tilrådd at du opprettar ei brukarside på wikien som inneheld kategorimerker som viser kor du er, f.eks [[Category:Users_in_norway]]. - video_to_openstreetmap: introduksjonsvideo til OpenStreetMap - wiki_signup: Du vil kanskje melde deg inn i OpenStreetMap-wikien òg. - signup_confirm_plain: - ask_questions: "Du kan stille spørsmål du har om OpenStreetMap på vår spørsmål og svar-nettsted:" - blog_and_twitter: "Få med deg dei siste nyhenda gjennom OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Om dette er deg, velkomen! Vennligst klikk på lenkja under for å stadfeste din - click_the_link_2: konto og les litt vidare for meir informasjon om OpenStreetMap. - current_user_1: Ei liste over noverande brukarar i kategoriar, basert på kor i verda - current_user_2: "dei er, er tilgjengeleg frå:" - greeting: Hei der! - hopefully_you: Nokre (vonleg deg) ynskjer å opprette ein konto på - introductory_video: "Du kan sjå ein introduksjonsvideo for OpenStreetMap her:" - more_videos: "Det er fleire videoar her:" - opengeodata: "OpenGeoData.org er bloggen til OpenStreetMap-grunnlegg Steve Coast, og han har podcast-er òg:" - the_wiki: "Les meir om OpenStreetMap på wikien:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide - user_wiki_1: Det er tilrådd at du opprettar ei brukarside på wikien som inneheld - user_wiki_2: kategorimerker som viser kor du er, f.eks [[Category:Users_in_norway]]. - wiki_signup: "Du vil kanskje òg melde deg inn i OpenStreetMap-wikien på:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_page + subject: "[OpenStreetMap] Velkommen til OpenStreetMap" + welcome: Me vil ynskje velkommen og gje deg litt meir informasjon for å få deg igang. oauth: oauthorize: - allow_read_gpx: les dine private GPS-spor. - allow_read_prefs: les brukarinnstillingane dine. - allow_to: "Tillat klientprogrammet å gjere:" + allow_read_gpx: lese dine private GPS-spor. + allow_read_prefs: lese brukarinnstillingane dine. + allow_to: "Gje programmet lov til å:" allow_write_api: endre kartet. - allow_write_diary: opprett dagbokoppføringer, kommentarar og finn venner. - allow_write_gpx: last opp GPS-spor. - allow_write_prefs: Innstillingane vart lagra. - request_access: Applikasjonen %{app_name} ber om tilgjenge til kontoen din, %{user}. Sjekk om du vil at applikasjonen skal ha følgjande høve. Du kan velje så mange eller få du vil. + allow_write_diary: opprette dagbokoppføringar, kommentarar og finne venner. + allow_write_gpx: laste opp GPS-spor. + allow_write_notes: endre notisar. + allow_write_prefs: endre brukarinnstillingane dine + request_access: Applikasjonen %{app_name} ber om tilgjenge til kontoen din, %{user}. Sjekk om du vil at applikasjonen skal ha følgjande løyve. Du kan velje så mange eller så få som du vil. revoke: flash: Du sletta nøkkelen for %{application} oauth_clients: @@ -1227,6 +1009,7 @@ nn: allow_write_api: endre kartet. allow_write_diary: opprett dagbokoppføringer, kommentarar og finn vener. allow_write_gpx: last opp GPS-spor. + allow_write_notes: endre notisar. allow_write_prefs: endre brukerinnstillingene deira. callback_url: "URL for tilbakekall:" name: Namn @@ -1257,6 +1040,7 @@ nn: allow_write_api: endre kartet. allow_write_diary: opprett dagbokoppføringer, kommentarar og finn venner. allow_write_gpx: last opp GPS-spor. + allow_write_notes: endre notisar. allow_write_prefs: endre brukerinnstillingene deira. authorize_url: "Godkjenn URL:" confirm: Er du sikker? @@ -1265,14 +1049,12 @@ nn: key: "Forbrukarnøkkel:" requests: "Ber om følgjande løyve frå brukaren:" secret: "Forbrukarhemmelegheit:" - support_notice: Me støttar HMAC-SHA1 (tilrådt) så vel som rein tekst i ssl-modus. + support_notice: Me støttar HMAC-SHA1 (tilrådt) og RSA-SHA1 signaturar. title: OAuth-detaljar for %{app_name} url: "URL for forespørelsnøkkel:" update: flash: Oppdaterte klientinformasjonen printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" with_version: "%{id}, v%{version}" redaction: create: @@ -1308,7 +1090,6 @@ nn: site: edit: anon_edits: (%{link}) - anon_edits_link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits anon_edits_link_text: Finn ut kvifor dette er tilfellet. flash_player_required: 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. no_iframe_support: Nettlesaren din støttar ikkje HTML iframes som er naudsynt for denne eigenskapen. @@ -1319,20 +1100,15 @@ nn: 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.) user_page_link: brukarside index: + createnote: Legg til ein notis js_1: Du har ein nettleser som ikkje støttar JavaScript eller så har du slått av JavaScript. js_2: OpenStreetMap brukar JavaScript på kartsidene. license: - license_name: Creative Commons Navngivelse-Del på like vilkår 2.0 - license_url: https://creativecommons.org/licenses/by-sa/2.0/deed.no - notice: Lisensiert under lisensen %{license_name} av %{project_name} og bidragsytarane deira. - project_name: OpenStreetMap-prosjekt - project_url: http://openstreetmap.org + copyright: Kopibeskytta OpenStreetMap og bidragsytarar, under ein åpen lisens permalink: Permanent lenkje remote_failed: Klarte ikkje redigere - forsikre deg at JOSM eller Merkaartor er lasta og fjernkontrollvalget er aktivert shortlink: Kort lenkje key: - map_key: Kartforklaring - map_key_tooltip: Forklaring for kartet table: entry: admin: Administrativ grense @@ -1405,7 +1181,7 @@ nn: heading: Overskrifter headings: Overskrifter image: Bilete - link: Lekje + link: Lenkje ordered: Sortert liste second: Andre punkt subheading: Underoverskrifter @@ -1418,7 +1194,6 @@ nn: preview: Førehandsvising search: search: Søk - search_help: "Døme: 'Lindesnes', 'Karl Johans gate', 'Sør-Trøndelag' og fleire ..." submit_text: Gå where_am_i: Kor er eg? where_am_i_title: Bruk søkjemotoren til å skildre gjeldande lokasjon. @@ -1430,7 +1205,7 @@ nn: friendly: "%e %B %Y kl. %H:%M" trace: create: - trace_uploaded: Din GPX-fil er lasa opp og ventar på å verte sett inn i databasen. Dette skjer vanlegvis innan ein halvtime og ein e-post vert send til deg når det er gjort. + trace_uploaded: GPX-fila di er lasta opp og ventar på å bli sett inn i databasen. Dette skjer vanlegvis innan ein halvtime og ein e-post vert sendt til deg når det er gjort. upload_trace: Last opp GPS-spor delete: scheduled_for_deletion: Spor planlagt sletta @@ -1453,6 +1228,8 @@ nn: visibility_help: kva tyder dette? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces list: + description: Vis siste opplasta GPS loggar + empty_html: Ingenting her endå. Last opp eit nytt spor eller lær å lage GPS spor på wiki sida. public_traces: Offentleg GPS-spor public_traces_from: Offentlege GPS-spor frå %{user} tagged_with: merkte med %{tags} @@ -1474,7 +1251,7 @@ nn: in: i map: kart more: meir - pending: VENTANDE + pending: VENTAR private: PRIVAT public: OFFENTLEG trace_details: Vis detaljar for spor @@ -1499,9 +1276,9 @@ nn: trace_optionals: tags: Merkelappar trace_paging_nav: - next: Neste » - previous: « Forrige - showing_page: Viser side %{page} + newer: Nyare spor + older: Eldre spor + showing_page: Side %{page} view: delete_track: Slett dette sporet description: "Skildring:" @@ -1513,12 +1290,12 @@ nn: map: kart none: Ingen owner: "Eigar:" - pending: VENTANDE + pending: VENTAR points: "Punkter:" start_coordinates: "Startkoordinat:" tags: "Markelappar:" title: Viser spor %{name} - trace_not_found: Spor ikkje funnet! + trace_not_found: Sporet vart ikkje funne! uploaded: "Lasta opp:" visibility: "Synligheit:" visibility: @@ -1541,6 +1318,10 @@ nn: email never displayed publicly: " (vis aldri offentleg)" flash update success: Brukerinformasjon oppdatert. flash update success confirm needed: Brukerinformasjon oppdatert. Sjekk eposten din for å stadfeste din epostadresse. + gravatar: + gravatar: Bruk Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: kva er dette? home location: "Heimeposisjon:" image: "Bilete:" image size hint: (kvadratiske bilete som er minst 100x100 fungerer best) @@ -1576,12 +1357,9 @@ nn: update home location on click: Oppdater hjemmelokasjon når eg klikkar på kartet? confirm: already active: Denne kontoen har allereie stadfesta. - before you start: Me veit du sannsynlegvis har hastverk med å byrja å lage kart, men før du gjer dette kan du fylle inn litt informasjon om deg sjølv i skjemaet under. button: Stadfest heading: Stadfest ein brukerkonto press confirm button: Klikk bekreftknappen nedanfor for å aktivare kontoen din. - reconfirm: Viss det er ei stund sidan du registrerte deg kan det hende du må sende deg sjølv ein ny bekreftelsesepost. - success: Kontoen din er stadfesta - takk for at du registrerte deg. unknown token: Den koda ser ikkje ut til å eksistere. confirm_email: button: Stadfest @@ -1602,8 +1380,8 @@ nn: heading: Brukarar hide: Skjul valde brukarar showing: - one: Viser side %{page} (%{first_item} av %{items}) - other: Viser side %{page} (%{first_item}-%{last_item} av %{items}) + one: Side %{page} (%{first_item} av %{items}) + other: Sside %{page} (%{first_item}-%{last_item} av %{items}) summary: "%{name} oppretta frå %{ip_address} den %{date}" summary_no_ip: "%{name} oppretta %{date}" title: Brukarar @@ -1618,8 +1396,6 @@ nn: lost password link: Mista passordet ditt? new to osm: Ny på OpenStreetMap? no account: Har du ingen brukarkonto? - notice: Finn ut meir om OpenStreetMap sitt komande byte av lisens (omsetjingar) (diskusjon) - notice_terms: OpenStreetMap byter til ein ny lisens den 1. april 2012. Denne er akkurat så open som den noverande, men dei juridiske delene er mykje betre tilpassa vår kartdatabase. Me ynskjer å kunne halde fram å halde på bidraga dine til OpenStreetMap, men me kan berre gjere det viss du er samd med oss i å distribuere dei under den nye lisensen. Elles må me fjerne dei frå databasen.

    Vennligst logg inn, og bruk nokre sekund på å gå igjennom og akseptere dei nye betingelsene. Takk! openid: "%{logo} OpenID:" openid invalid: Beklagar, din OpenID ser ut til å vere dårleg formatert openid missing provider: Beklagar, fekk ikkje kontakt med din OpenID-leverandør @@ -1664,8 +1440,10 @@ nn: title: Gløymt passord make_friend: already_a_friend: Du er allereie venner med %{name}. + button: Legg til som ven failed: Klarte ikkje leggje til %{name} som ven. - success: "%{name} er no venen din." + heading: Legg til %{user} som ein ven? + success: "%{name} er no venen din!" new: confirm email address: "Stadfest e-postadresse:" confirm password: "Stadfest passord:" @@ -1674,9 +1452,6 @@ nn: display name: "Visningsnavn:" display name description: Ditt offentleg framviste brukernavn. Du kan endre dette seinare i innstellingane. email address: "E-postadresse:" - fill_form: Fyll ut skjemaet og me vil sende deg ein e-post for å aktivare kontoen din. - flash create success message: Takk for at du registrerte deg. Me har sendt ein bekreftelsesmelding til %{email} og så snart du stadfestar kontoen din kan du byrje å lage kart.

    Om du brukar eit antispamsystem som sender bekreftelsesforspørsler, kontrollar at du har hvitelistet webmaster@openstreetmap.org sidan me ikkje kan svare på bekreftelsesforespørsler. - heading: Opprett ein brukerkonto license_agreement: Når du stadfestar kontoen din må du godkjenne bidragsytervilkåra. no_auto_account_create: Beklagelegvis kan me for augneblunken ikkje opprette ein konto for deg automatisk. not displayed publicly: Ikkje vist offentleg (sjå vår personvernpolitikk) @@ -1698,6 +1473,8 @@ nn: nearby mapper: Brukarar i nærleiken your location: Posisjonen din remove_friend: + button: Fjern som ein ven + heading: Fjern %{user} som ein ven? not_a_friend: "%{name} er ikkje ein av venene dine." success: "%{name} vart fjerna frå venene dine" reset_password: @@ -1734,9 +1511,9 @@ nn: you need to accept or decline: Les og deretter anten godta eller avslå dei nye bidragsytervilkåra for å halde fram. view: activate_user: aktiver denne brukaren - add as friend: legg til som ein ven + add as friend: legg til ven ago: (%{time_in_words_ago} sidan) - block_history: vis mottekne blokkeringar + block_history: mottekne blokkeringar blocks by me: blokkeringar utført av meg blocks on me: blokkeringane mine comments: kommentarar @@ -1754,28 +1531,30 @@ nn: diary: dagbok edits: redigeringar email address: "E-postadresse:" - friends_changesets: Bla gjennom alle endringssett av vener - friends_diaries: Bla gjennom alle dagbokoppføringar av vener + friends_changesets: endringssett av vener + friends_diaries: dagbokoppføringar av vener hide_user: skjul denne brukaren - if set location: Viss du set posisjonen din, så vil eit fint kart og ting vert her vist. Du kan setje heimeposisjonen på di %{settings_link}-sida. + if set location: Set heimeposisjonen på di %{settings_link}-sida for å sjå naboar. km away: "%{count}km unna" latest edit: "Siste redigering %{ago}:" m away: "%{count}m unna" mapper since: "Brukar sidan:" - moderator_history: vis tildelte blokkeringar + moderator_history: tildelte blokkeringar my comments: mine kommentarar my diary: mi dagbok my edits: redigeringane mine + my notes: mine kartnotisar my settings: innstellingane mine my traces: spora mine nearby users: Andre næliggande brukarar - nearby_changesets: Bla gjennom alle endringssett av nærliggande brukarar - nearby_diaries: Bla gjennom alle dagbokoppføringar av nærliggande brukarar + nearby_changesets: endringssett av naboar + nearby_diaries: dagbokoppføringar av naboar new diary entry: ny dagbokoppføring no friends: Du har ikkje lagt til nokon venner enno. no nearby users: Det er ingen andre brukarar som innrømmer kartlegging i området ditt enno. + notes: kartnotisar oauth settings: oauth-innstellingar - remove as friend: fjern som ven + remove as friend: fjern ven role: administrator: Denne brukaren er ein administrator grant: @@ -1810,7 +1589,7 @@ nn: back: Vis alle blokkeringar heading: Endrar blokkering av %{name} needs_view: Må brukaren logge inn før denne blokkeringa vert fjerna? - period: Kor lengje, frå no, brukaren vil blokkerast frå API-et. + period: Kor lenge, frå no av, brukaren vil blokkerast frå API-en. reason: Årsaka til kvifor %{name} vert blokkert. Vennligst ver så roleg og rimeleg som mogleg og oppgje så mange detaljar du kan om situasjonen. Hugs at ikkje alle brukarar forstår felleskapssjargongen så prøv å bruke lekmannsuttrykk. show: Vis denne blokkeringa submit: Oppdater blokkering @@ -1833,7 +1612,7 @@ nn: back: Vis alle blokkeringar heading: Opprettar blokkering av %{name} needs_view: Brukaren må logge inn før denne blokkeringa vert fjerna. - period: Kor lengje, frå no, brukaren vil blokkerast frå API-et. + period: Kor lenge, frå no av, brukaren vil blokkerast frå API-en. reason: Årsaka til at %{name} vert blokkert. Vennligst ver så roleg og rimeleg som mogleg og gje så mange detaljar du kan om situasjonen, og husk på at meldinga vert synleg for offentligheita. Hugs på at ikkje alle brukarar forstår fellesskapssjargongen så prøv å bruke lekmannsuttrykk. submit: Opprett blokkering title: Opprettar blokkering av %{name} @@ -1847,11 +1626,14 @@ nn: creator_name: Oppretta av display_name: Blokkert brukar edit: Rediger + next: Neste » not_revoked: (ikkje tilbakekalt) + previous: « Forrige reason: Årsak for blokkering revoke: Tilbakekall! revoker_name: Tilbakekalt av show: Vis + showing_page: Side %{page} status: Status period: one: 1 time @@ -1879,7 +1661,7 @@ nn: time_past: Slutta %{time} sidan title: "%{block_on} blokkert av %{block_by}" update: - only_creator_can_edit: Bare moderatoren som oppretta denne blokkeringa kan endre han. + only_creator_can_edit: Berre moderatoren som oppretta blokkeringa kan endre henne. success: Blokkering oppdatert. user_role: filter: diff --git a/config/locales/oc.yml b/config/locales/oc.yml new file mode 100644 index 00000000000..fa9cf047748 --- /dev/null +++ b/config/locales/oc.yml @@ -0,0 +1,1736 @@ +# Messages for Occitan (occitan) +# Exported from translatewiki.net +# Export driver: syck-pecl +# Author: Cedric31 +oc: + about_page: + community_driven_html: "La comunautat d’OpenStreetMap es divèrsa, passionada e grossís cada jorn. Nòstres contributors incluisson de cartografes entosiastes, de professionals del GIS, d'ingenhiaires que menan los servidors OSM, d'umanitaris que cartografian las zònas devastadas per una catastròfa e plan mai encara.\nPer ne saber mai sus la comunautat, consultatz los annuaris d’utilizaires, los blogs comunautaris e lo site web de la Fondacion OSM." + community_driven_title: Menat per la comunautat + copyright_html: ©Contributors
    d’OpenStreetMap + lede_text: OpenStreetMap es bastit per una comunautat de cartografes benevòls que contribuisson e mantenon las donadas de las rotas, caminòls, cafès, estacions ferroviàrias e plan mai encara, pertot dins lo mond. + local_knowledge_title: Coneissença locala + next: Seguent + open_data_title: Donadas liuras + partners_title: Partenaris + activerecord: + attributes: + diary_comment: + body: Còs + diary_entry: + language: Lenga + latitude: Latitud + longitude: Longitud + title: Subjècte + user: Utilizaire + friend: + friend: Amic + user: Utilizaire + message: + body: Còs + recipient: Destinatari + sender: Expeditor + title: Subjècte + trace: + description: Descripcion + latitude: Latitud + longitude: Longitud + name: Nom + public: Public + size: Talha + user: Utilizaire + visible: Visible + user: + active: Actiu + description: Descripcion + display_name: Nom afichat + email: Adreça de corrièr electronic + languages: Lengas + pass_crypt: Senhal + models: + acl: Lista de contraròtle d’accès + changeset: Grop de modificacions + changeset_tag: Balisa del grop de modificacions + country: País + diary_comment: Comentari del jornal + diary_entry: Entrada del jornal + friend: Amic + language: Lenga + message: Messatge + node: Nosèl + node_tag: Balisa de nosèl + notifier: Notificador + old_node: Ancian nosèl + old_node_tag: Balisa de l'ancian nosèl + old_relation: Anciana relacion + old_relation_member: Membre de l'anciana relacion + old_relation_tag: Balisa de l'anciana relacion + old_way: Ancian camin + old_way_node: Nosèl de l’ancian camin + old_way_tag: Balisa de l’ancian camin + relation: Relacion + relation_member: Membre de la relacion + relation_tag: Balisa de relacion + session: Sesilha + trace: Pista + tracepoint: Punt de la traça + tracetag: Balisa de la pista + user: Utilizaire + user_preference: Preferéncias de l’utilizaire + user_token: Geton de l'utilizaire + way: Camin + way_node: Nosèl del camin + way_tag: Balisa del camin + browse: + anonymous: anonim + changeset: + belongs_to: Autor + changesetxml: Grop de modificacions XML + feed: + title: Grop de modificacions %{id} + title_comment: Grop de modificacions %{id} – %{comment} + node: Nosèls (%{count}) + node_paginated: Nosèls (%{x} a %{y} sus %{count}) + osmchangexml: osmChange XML + relation: Relacions (%{count}) + relation_paginated: Relacions (%{x} a %{y} sus %{count}) + title: "Grop de modificacions : %{id}" + way: Camins (%{count}) + way_paginated: Camins (%{x} a %{y} sus %{count}) + closed: Tampat + closed_by_html: Tampat fa %{time} per %{user} + closed_html: Tampat fa %{time} + containing_relation: + entry: Relacion %{relation_name} + entry_role: Relacion %{relation_name} (en tant que %{relation_role}) + created: Creat + created_by_html: Creat fa %{time} per %{user} + created_html: Creat fa %{time} + deleted_by_html: Suprimit fa %{time} per %{user} + download_xml: Telecargar lo XML + edited_by_html: Modificat fa %{time} per %{user} + in_changeset: Grop de modificacions + location: "Emplaçament :" + no_comment: (sens comentaris) + node: + history_title: "Istoric del nosèl : %{name}" + title: "Nosèl : %{name}" + not_found: + sorry: "O planhèm, %{type} #%{id} a pas pogut èsser trobat." + type: + changeset: grop de modificacions + node: nosèl + relation: relacion + way: camin + note: + closed_by: Resolgut per %{user} fa %{when} + closed_by_anonymous: Resolgut per un utilizaire anonim fa %{when} + closed_title: Nòta resolguda nº %{note_name} + commented_by: Comentari de %{user} fa %{when} + commented_by_anonymous: Comentat per un utilizaire anonim fa %{when} + hidden_by: Amagat per %{user} fa %{when} + hidden_title: Nòta amagada nº %{note_name} + new_note: Nòta novèla + open_by: Creat per %{user} fa %{when} + open_by_anonymous: Creat per un utilizaire anonim fa %{when} + open_title: Nòta pas resolguda nº %{note_name} + reopened_by: Reactivat per %{user} fa %{when} + reopened_by_anonymous: Reactivat per un utilizaire anonim fa %{when} + title: "Nòta : %{id}" + part_of: Partida de + redacted: + message_html: La version %{version} d'aqueste(-a) %{type} pòt pas èsser afichada perque es estada amagada. Consultatz %{redaction_link} per mai d'informacions. + redaction: Amagatge %{id} + type: + node: nosèl + relation: relacion + way: camin + relation: + history_title: "Istoric de la relacion : %{name}" + members: Membres + title: "Relacion : %{name}" + relation_member: + entry_role: "%{type} %{name} amb lo ròtle %{role}" + type: + node: Nos + relation: Relacion + way: Camin + start_rjs: + feature_warning: Lo cargament de %{num_features} caracteristicas poiriá rendre vòstre navigador lent o poiriá respondre pas mai. Sètz segur que volètz afichar aquelas donadas ? + load_data: Cargar las donadas + loading: Cargament... + tag_details: + tags: Atributs + wiki_link: + key: La descripcion de la balisa %{key} sul wiki + tag: La descripcion de la balisa %{key}=%{value} sul wiki + wikipedia_link: L’article « %{page} » sus Wikipèdia + timeout: + sorry: O planhèm, las donadas pel tipe %{type} amb l'id %{id} prenon tròp de temps per èsser recuperadas. + type: + changeset: grop de modificacions + node: nosèl + relation: relacion + way: camin + version: Version + view_details: Afichar los detalhs + view_history: Afichar l’istoric + way: + also_part_of: + one: partida del camin %{related_ways} + other: partida dels camins %{related_ways} + history_title: "Istoric del camin : %{name}" + nodes: Nosèls + title: "Camin : %{name}" + changeset: + changeset: + anonymous: Anonim + no_edits: (pas cap de modificacion) + view_changeset_details: Afichar los detalhs del grop de modificacions + changeset_paging_nav: + next: Seguents » + previous: « Precedents + showing_page: Pagina %{page} + changesets: + area: Zòna + comment: Comentari + id: Identificant + saved_at: Salvat a + user: Utilizaire + list: + empty: Cap de grop de modificacions pas trobat. + empty_area: Pas cap de grop de modificacions dins aquesta zòna. + empty_user: Pas cap de grop de modificacions per aqueste utilizaire. + load_more: Cargar mai + no_more: Cap d'autre grop de modificacions pas trobat. + no_more_area: Pas cap d'autre grop de modificacions dins aquesta zòna. + no_more_user: Pas cap d'autre grop de modificacions per aqueste utilizaire. + title: Gropes de modificacions + title_friend: Gropes de modificacions per vòstres amics + title_nearby: Gropes de modificacions dels utilizaires a proximitat + title_user: Gropes de modificacions per %{user} + timeout: + sorry: O planhèm, la lista dels gropes de modificacions qu'avètz demandada met tròp de temps per èsser recuperada. + diary_entry: + comments: + ago: i a %{ago} + comment: Comentari + has_commented_on: "%{display_name} a comentat las entradas de jornal seguentas" + newer_comments: Comentaris mai recents + older_comments: Comentaris mai ancians + post: Mandar + when: Quand + diary_comment: + comment_from: Comentari de %{link_user} lo %{comment_created_at} + confirm: Confirmar + hide_link: Amagar aqueste comentari + diary_entry: + comment_count: + one: "%{count} comentari" + other: "%{count} comentaris" + zero: Pas cap de comentari + comment_link: Comentar aquesta entrada + confirm: Confirmar + edit_link: Modificar aquesta entrada + hide_link: Amagar aquesta entrada + posted_by: Postat per %{link_user} a %{created} en %{language_link} + reply_link: Respondre a aquesta entrada + edit: + body: "Còs :" + language: "Lenga :" + latitude: "Latitud :" + location: "Luòc :" + longitude: "Longitud :" + marker_text: Emplaçament de l'entrada del jornal + save_button: Salvar + subject: "Subjècte :" + title: Modificar l'entrada del jornal + use_map_link: Utilizar la mapa + feed: + all: + description: Entradas recentas del jornal dels utilizaires d'OpenStreetMap + title: Entradas del jornal d'OpenStreetMap + language: + description: Entradas recentas del jornal dels utilizaires d'OpenStreetMap en %{language_name} + title: Entradas del jornal d'OpenStreetMap en %{language_name} + user: + description: Entradas recentas del jornal d'OpenStreetMap per %{user} + title: Entradas del jornal d'OpenStreetMap per %{user} + list: + in_language_title: Entradas del jornal en %{language} + new: Novèla entrada del jornal + new_title: Apondre una novèla entrada dins vòstre jornal + newer_entries: Entradas mai recentas + no_entries: Pas cap d'entrada dins vòstre jornal + older_entries: Entradas mai ancianas + recent_entries: "Entradas recentas del jornal :" + title: Jornals dels utilizaires + title_friends: Jornals dels amics + title_nearby: Jornals dels utilizaires a proximitat + user_title: Jornal de %{user} + location: + edit: Modificar + location: "Luòc :" + view: Afichar + new: + title: Novèla entrada del jornal + no_such_entry: + body: O planhèm, i a pas cap d'entrada dins lo jornal nimai cap de comentari amb l’id %{id}. Verificatz vòstra ortografia o la validitat del ligam qu'avètz clicat. + heading: "Pas cap d'entrada amb l'id : %{id}" + title: Cap d'entrada del jornal es pas estada trobada + view: + leave_a_comment: Apondre un comentari + login: Connectatz-vos + login_to_leave_a_comment: "%{login_link} per apondre un comentari" + save_button: Enregistrar + title: Jornal de %{user} | %{title} + user_title: Jornal de %{user} + editor: + default: Per defaut (actualament %{name}) + id: + description: iD (editor integrat al navigador) + name: iD + potlatch: + description: Potlatch 1 (editor integrat al navigador) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (editor integrat al navigador) + name: Potlatch 2 + remote: + description: Editor extèrne (JOSM o Merkaartor) + name: Editor extèrne + export: + start: + add_marker: Apondre un marcador a la mapa + area_to_export: Zòna d'exportar + embeddable_html: HTML incorporable. + export_button: Exportar + export_details: Las donadas d’OpenStreetMap son publicadas jos la licéncia Open Data Commons ­– Banca de donadas Dobèrta (ODbL). + format: Format + format_to_export: Format d'exportar + image_size: Talha de l'imatge + latitude: "Lat :" + licence: Licéncia + longitude: "Lon :" + manually_select: Seleccionar manualament una zòna diferenta + map_image: Imatge de mapa (aficha un calc normal) + max: max + options: Opcions + osm_xml_data: Donadas XML d'OpenStreetMap + output: Sortida + paste_html: Pegatz lo còde HTML per incorporar dins un site web. + scale: Escala + too_large: + advice: "Se l’expòrt çaisús fracassa, envisatjatz l’utilizacion d’una de las fonts listadas çaijòs :" + geofabrik: + title: Telecargaments de Geofabrik + metro: + title: Extraches de Metro + other: + description: Fonts suplementàrias listadas dins lo wiki d'OpenStreetMap + title: Autras fonts + overpass: + title: API palanca + planet: + title: Planeta OSM + zoom: Zoom + title: Exportar + fixthemap: + how_to_help: + join_the_community: + title: Rejónher la comunautat + title: Cossí ajudar + other_concerns: + explanation_html: "Se sètz preocupat pel biais que nòstras donadas son utilizadas o sus lor contengut, consultatz nòstra\npagina de drech d’autor per d'informacions mai legalas, o contactar lo \ngrop de trabalh OSMF apropriat." + title: Autras preocupacions + title: Senhalar un problèma / Corregir la mapa + geocoder: + description: + title: + geonames: Localizacion dempuèi GeoNames + osm_nominatim: Localizacion dempuèi OpenStreetMap Nominatim + types: + cities: Vilas + places: Plaças + towns: Vilas + direction: + east: èst + north: nòrd + north_east: nòrd-èst + north_west: nòrd-oèst + south: sud + south_east: sud-èst + south_west: sud-oèst + west: oèst + distance: + one: environ 1 km + other: environ %{count} km + zero: mens d'1 km + results: + more_results: Mai de resultats + no_results: Cap de resultat es pas estat trobat + search: + title: + ca_postcode: Resultats dempuèi Geocoder.CA + geonames: Resultats dempuèi GeoNames + geonames_reverse: Resultats de GeoNames + latlon: Resultats intèrnes + osm_nominatim: Resultats de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultatts de OpenStreetMap Nominatim + uk_postcode: Resultats dempuèi NPEMap / FreeThe Postcode + us_postcode: Resultats dempuèi Geocoder.us + search_osm_nominatim: + admin_levels: + level10: Limit de la banlèga + level2: Frontièra del país + level4: Frontièra de l’estat + level5: Frontièra de la region + level6: Frontièra del comtat + level8: Limit de la vila + level9: Limit del vilatge + prefix: + aerialway: + chair_lift: Telesèti + drag_lift: Telesquí + station: Gara de telecabina + aeroway: + aerodrome: Aerodròm + apron: Taulièr + gate: Pòrta + helipad: Elipòrt + runway: Pista + taxiway: Via de manòbra + terminal: Terminal + amenity: + WLAN: Accès WiFi + airport: Aeropòrt + arts_centre: Centre artistic + artwork: Òbra d'art + atm: Distribuidor automatic de bilhets + auditorium: Auditòrium + bank: Banca + bar: Bar + bbq: Barbecue + bench: Banc + bicycle_parking: Parcatge per bicicletas + bicycle_rental: Logason de bicicletas + biergarten: Braçariá a l’aire liure + brothel: Bordèl + bureau_de_change: Burèu de cambi + bus_station: Arrèst de bus + cafe: Cafè + car_rental: Logason de veitura + car_sharing: Coveituratge + car_wash: Lavatge de veitura + casino: Casinò + charging_station: Estacion de recarga + cinema: Cinèma + clinic: Clinica + club: Club + college: Collègi + community_centre: Sala polivalenta + courthouse: Palais de justícia + crematorium: Crematòri + dentist: Dentista + doctors: Mètges + dormitory: Dormitòri + drinking_water: Aiga potabla + driving_school: Escòla de conducha + embassy: Ambaissada + emergency_phone: Telefòn d'urgéncia + fast_food: Restauracion rapida + ferry_terminal: Terminal de ferry + fire_hydrant: Boca d'incendi + fire_station: Casèrna dels pompièrs + food_court: Airal de restauracion + fountain: Font + fuel: Carburant + grave_yard: Cementèri + gym: Fitness /gimnastica + hall: Sala + health_centre: Centre de santat + hospital: Espital + hotel: Ostalariá + hunting_stand: Taulièr de tir + ice_cream: Crema glaçada + kindergarten: Jardin infantil + library: Bibliotèca + market: Mercat + marketplace: Plaça del mercat + mountain_rescue: Secors en montanha + nightclub: Discotèca + nursery: Grépia + nursing_home: Ostal de santat + office: Burèu + park: Pargue + parking: Parcatge + pharmacy: Farmàcia + place_of_worship: Luòc de culte + police: Polícia + post_box: Bóstia de letras + post_office: Burèu de pòsta + preschool: Preescolar + prison: Preson + pub: Bar + public_building: Bastiment public + public_market: Mercat public + reception_area: Zòna de recepcion + recycling: Punt de reciclatge + restaurant: Restaurant + retirement_home: Ostal de retirada + sauna: Saunà + school: Escòla + shelter: Refugi + shop: Magazin + shopping: Comèrci + shower: Docha + social_centre: Centre social + social_club: Club social + social_facility: Servici social + studio: Estúdio + supermarket: Supermercat + swimming_pool: Piscina + taxi: Taxi + telephone: Telefòn public + theatre: Teatre + toilets: Comuns + townhall: Ostal Comun + university: Universitat + vending_machine: Distribuidor automatic + veterinary: Cirurgia veterinària + village_hall: Sala comunala + waste_basket: Escobilhièr + wifi: Accès WiFi + youth_centre: Centre per la joventud + boundary: + administrative: Limit administratiu + census: Frontièra estatistica + national_park: Pargue nacional + protected_area: Zòna protegida + bridge: + aqueduct: Aqüeducte + suspension: Pont penjat + swing: Pont virant + viaduct: Viaducte + "yes": Pont + building: + "yes": Bastiment + emergency: + fire_hydrant: Boca d'incendi + phone: Telefòn d'urgéncia + highway: + bridleway: Camin per cavalièrs + bus_guideway: Via de bus guidada + bus_stop: Arrèst de bus + byway: Rota segondària + construction: Autorota en construccion + cycleway: Pista ciclabla + emergency_access_point: Punt d'accès d'urgéncia + footway: Camin pietonièr + ford: Ga + living_street: Carrièra en zòna de rencontre + milestone: Bòrna quilometrica + minor: Rota menora + motorway: Autorota + motorway_junction: Joncion d'autorota + motorway_link: Rota autorotièra + path: Camin + pedestrian: Camin pietonièr + platform: Plataforma + primary: Rota principala + primary_link: Rota principala + proposed: Projècte de rota + raceway: Circuit + residential: Carrièra residenciala + rest_area: Airal de repaus + road: Rota + secondary: Rota segondària + secondary_link: Rota segondària + service: Rota de servici + services: Servicis autorotièrs + speed_camera: Radar de velocitat + steps: Escalièr + stile: Palenc + street_lamp: Lampadari + tertiary: Rota terciària + tertiary_link: Rota terciària + track: Pista + trail: Pista + trunk: Via exprèssa + trunk_link: Via exprèssa + unclassified: Rota menora + unsurfaced: Rota sens revestiment + historic: + archaeological_site: Site arqueologic + battlefield: Camp de batalha + boundary_stone: Bòrna frontièra + building: Bastiment + castle: Castèl + church: Glèisa + citywalls: Muralhas de la vila + fort: Fòrt + house: Ostal + icon: Icòna + manor: Castelet + memorial: Memorial + mine: Mina + monument: Monument + museum: Musèu + ruins: Roïnas + tomb: Tombèl + tower: Torre + wayside_cross: Calvari + wayside_shrine: Orador + wreck: Varatge + landuse: + allotments: Òrts familials + basin: Bacin + brownfield: Terren rasat + cemetery: Cementèri + commercial: Zòna terciària + conservation: Zòna protegida + construction: Construccion + farm: Zòna agricòla + farmland: Terrens agricòls + farmyard: Bastiments de bòria + forest: Bòsc + garages: Garatges + grass: Èrba + greenfield: Zòna de construccion futura + industrial: Zòna industriala + landfill: Depaus d’escobilhas + meadow: Prada + military: Zòna militara + mine: Mina + nature_reserve: Resèrva naturala + orchard: Vergièr + park: Pargue + piste: Pista + quarry: Peirièra + railway: Via ferrada + recreation_ground: Airal de jòcs + reservoir: Sèrva + reservoir_watershed: Bacin versant de sèrva + residential: Zòna residenciala + retail: Zòna comerciala + road: Zòna rotièra + village_green: Zòna publica erborada + vineyard: Vinhal + wetland: Zòna umida + wood: Bòsc + leisure: + beach_resort: Estacion belneara + bird_hide: Obsevatòri ornitologic + common: Terrens comunals + fishing: Zòna de pesca + fitness_station: Taulièr de percors de santat + garden: Jardin + golf_course: Terren de gòlf + ice_rink: Pista de patinatge + marina: Pòrt de plasença + miniature_golf: Gòlf miniatura + nature_reserve: Resèrva naturala + park: Pargue + pitch: Terren d'espòrt + playground: Airal de jòcs + recreation_ground: Terren de jòcs + sauna: Saunà + slipway: Còta de lançament + sports_centre: Centre esportiu + stadium: Estadi + swimming_pool: Piscina + track: Pista + water_park: Pargue aqüatic + military: + airfield: Terren d'aviacion militara + barracks: Casèrna + bunker: Bunker + mountain_pass: + "yes": Còl de montanha + natural: + bay: Baia + beach: Plaja + cape: Cap + cave_entrance: Entrada de cauna + channel: Canal + cliff: Bauç + crater: Cratèr + dune: Duna + feature: Element + fell: Lana + fjord: Fjòrd + forest: Bòsc + geyser: Geisèr + glacier: Glacièr + heath: Bruguièra + hill: Puèg + island: Illa + land: Tèrra + marsh: Sanha + moor: Maura + mud: Fanga + peak: Pic + point: Puncha + reef: Estèu + ridge: Cresta + river: Riu + rock: Ròca + scree: Esbudèl + scrub: Boissa + shoal: Auçura + spring: Font + stone: Pèira + strait: Estrech + tree: Arbre + valley: Val + volcano: Volcan + water: Aiga + wetland: Zòna umida + wetlands: Zònas umidas + wood: Bòsc + office: + accountant: Comptable + architect: Arquitècte + company: Societat + employment_agency: Agéncia per l'emplec + estate_agent: Agent immobilièr + government: Agéncia governamentala + insurance: Burèu d'assegurança + lawyer: Avocat + ngo: Burèu d'una ONG + telecommunication: Burèus de telecomunicacion + travel_agent: Agéncia de viatge + "yes": Burèu + place: + airport: Aeropòrt + city: Vila + country: País + county: Comtat + farm: Bòria + hamlet: Masatge + house: Ostal + houses: Ostals + island: Illa + islet: Illòt + isolated_dwelling: Abitacion isolada + locality: Localitat + moor: Maura + municipality: Municipalitat + neighbourhood: Quartièr + postcode: Còde postal + region: Region + sea: Mar + state: Estat / província + subdivision: Subdivision + suburb: Barri + town: Vila + unincorporated_area: Luòc pas organizat + village: Vilatge + railway: + abandoned: Via ferrada abandonada + construction: Via ferrada en construccion + disused: Via ferrada desafectada + disused_station: Gara desafectada + funicular: Via de funicular + halt: Arrèst de tren + historic_station: Arrèst de tren istoric + junction: Jonccion ferroviària + level_crossing: Passatge de nivèl + light_rail: Pichona via ferrada + miniature: Via ferrada miniatura + monorail: Monoralh + narrow_gauge: Camin de fèrre de via estrecha + platform: Plataforma ferroviària + preserved: Via ferrada conservada + proposed: Projècte de camin de fèrre + spur: Via de connexion + station: Gara ferroviària + stop: Arrèst de camin de fèrre + subway: Estacion de mètro + subway_entrance: Entrada de mètro + switch: Agulhas + tram: Tramvia + tram_stop: Arrèst de tram + yard: Via de triatge + shop: + alcohol: Magazin oficial d'alcoòl + antiques: Antiquari + art: Botiga d'art + bakery: Fornil + beauty: Magazin de produches de beutat + beverages: Magazin de bevendas + bicycle: Magazin de bicicletas + books: Librariá + boutique: Botiga + butcher: Carnissièr + car: Magazin de veituras + car_parts: Pèças d'automobilas + car_repair: Reparacion d'automobilas + carpet: Magazin de tapisses + charity: Magazin de benfasença + chemist: Magazin de produches d'igièna + clothes: Magazin de vestits + computer: Magazin informatic + confectionery: Confisariá + convenience: Espiciariá + copyshop: Magazin de fotocòpias + cosmetics: Magazin de cosmetics + deli: Tractaire + department_store: Grand magazin + discount: Magazin discount + doityourself: Magazin de bricolatge + dry_cleaning: Netejatge a sec + electronics: Magazin d'electronica + estate_agent: Agent immobilièr + farm: Magazin de produches agricòls + fashion: Magazin de mòda + fish: Peissonariá + florist: Florista + food: Magazin d'alimentacion + funeral_directors: Pompas funèbras + furniture: Amòblament + gallery: Galariá + garden_centre: Jardinariá + general: Magazin generalista + gift: Botiga de presents + greengrocer: Mercand de fruches e legums + grocery: Espiciariá + hairdresser: Cofaire + hardware: Quicalhariá + hifi: Magazin Hi-Fi + insurance: Assegurança + jewelry: Joielariá + kiosk: Quiòsque + laundry: Bugadariá + mall: Galariá mercanda + market: Mercat + mobile_phone: Magazin de telefòns mobils + motorcycle: Magazin de mòto + music: Magazin de musica + newsagent: Mercand de jornals + optician: Optician + organic: Magazin bio + outdoor: Magazin d'activitats d'aire liure + pet: Animalariá + pharmacy: Farmàcia + photo: Magazin de fotografia + salon: Salon + second_hand: Botiga d’ocasions + shoes: Magazin de cauçaduras + shopping_centre: Centre comercial + sports: Magazin d'espòrt + stationery: Papetariá + supermarket: Supermercat + tailor: Sartre + toys: Magazin de joguets + travel_agency: Agéncia de viatge + video: Magazin de vidèos + wine: Cavista + "yes": Botiga + tourism: + alpine_hut: Refugi + artwork: Òbra d'art + attraction: Atraccion + bed_and_breakfast: Jaç + cabin: Cabanon + camp_site: Campatge + caravan_site: Site de caravana + chalet: Chalet + guest_house: Ostal d'òste + hostel: Albèrga + hotel: Ostalariá + information: Informacions + lean_to: Taulièr + motel: Motèl + museum: Musèu + picnic_site: Site de picnic + theme_park: Pargue a tèma + valley: Val + viewpoint: Punt de vista + zoo: Zoo + tunnel: + culvert: Pontet + "yes": Tunèl + waterway: + artificial: Riu artificial + boatyard: Talhièr de construccion navala + canal: Canal + connector: Connexion idrografica + dam: Diga + derelict_canal: Canal de deslaissament + ditch: Valat + dock: Cai + drain: Toat + lock: Esclusa + lock_gate: Pòrta d'esclusa + mineral_spring: Font d'aiga minerala + mooring: Ancoratge + rapids: Raspas + river: Riu + riverbank: Lièch de riu + stream: Riuet + wadi: Oèd + water_point: Punt d'aiga + waterfall: Cascada + weir: Barratge + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap a mantuna ressorsas per aprene lo projècte, per pausar e respondre a de questions, e respondre a de questions, e per discutir en collaboracion amb d’autres e documentar los subjèctes de cartografia. + title: Obténer d’ajuda + welcome: + title: Benvenguda a OSM + url: /welcome + wiki: + description: Parcorrètz lo wiki per la documentacion aprigondida d’OSM + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ + javascripts: + close: Tampar + key: + title: Legenda + tooltip: Legenda + map: + base: + cycle_map: Mapa ciclista + hot: Umanitari + standard: Estandard + transport_map: Mapa de transpòrt + copyright: © Contributors d'OpenStreetMap + donate_link_text: + layers: + data: Donadas de mapa + header: Jaces de mapa + notes: Nòtas de la mapa + title: Jaces + locate: + title: Afichar mon emplaçament + zoom: + in: Zoom avant + out: Zoom arrièr + notes: + new: + add: Apondre una nòta + show: + comment: Comentari + comment_and_resolve: Comentar e resòlvre + hide: Amagar + reactivate: Reactivar + resolve: Resòlvre + share: + cancel: Anullar + center_marker: Centrar la mapa sul marcador + custom_dimensions: Definir las dimensions personalizadas + download: Telecargar + embed: HTML + format: "Format :" + image: Imatge + image_size: L’imatge aficharà lo jaç estandard en + include_marker: Inclure lo marcador + link: Ligam o HTML + long_link: Ligam + scale: "Escala :" + short_link: Ligam cort + short_url: URL corta + title: Partejar + view_larger_map: Afichar una mapa mai granda + site: + edit_tooltip: Modificar la mapa + layouts: + about: A prepaus + community: Comunautat + community_blogs: Blogs de la comunautat + community_blogs_title: Blogs de membres de la comunautat OpenStreetMap + copyright: Dreches d’autor + data: Donadas + donate: Sostenètz OpenStreetMap, %{link} al fons per melhorar lo material. + edit: Modificar + edit_with: Modificar amb %{editor} + export: Exportar + export_data: Exportar las donadas + foundation: La Fondacion + foundation_title: La Fondacion OpenStreetMap + gps_traces: Traças GPS + gps_traces_tooltip: Gerir las traças GPS + help: Ajuda + history: Istoric + home: Anar a l'emplaçament de mon domicili + intro_2_create_account: Creatz un compte d'utilizaire + intro_header: Benvenguda dins OpenStreetMap ! + learn_more: Ne saber mai + log_in: Se connectar + log_in_tooltip: Se connectar amb un compte existent + logo: + alt_text: Lògo d'OpenStreetMap + logout: Se desconnectar + make_a_donation: + text: Far un don + title: Sostenètz OpenStreetMap amb un don financièr + more: Mai + osm_offline: La banca de donadas de OpenStreetMap es actualament fòra linha; una mantenença essenciala a son bon foncionament es en cors. + osm_read_only: La banca de donadas d'OpenStreetMap es actualament en mòde lectura sola ; una mantenença essenciala a son bon foncionament es en cors. + partners_bytemark: Albergament Bytemark + partners_html: L'albergament es pres en carga per %{ucl}, %{ic} e %{bytemark}, e d'autres %{partners}. + partners_ic: lo Collègi Imperial de Londres + partners_partners: partenaris + partners_ucl: lo VR Centre de l'UCL + sign_up: Crear un compte + sign_up_tooltip: Crear un compte per la modificacion + start_mapping: Començar de cartografiar + tag_line: La mapa cooperativa liura + user_diaries: Jornals + user_diaries_tooltip: Veire los jornals d'utilizaires + license_page: + foreign: + english_link: original en anglés + text: En cas de conflicte entre aquesta pagina e la pagina %{english_original_link}, la version anglesa prima + title: A prepaus d'aquesta traduccion + legal_babble: + attribution_example: + alt: Exemple d'atribucion OpenStreetMap sus una pagina internet + title: Exemple d'atribucion + contributors_fr_html: "França : conten de donadas de la\n Direccion generala dels impòts." + contributors_title_html: Nòstres contributors + credit_title_html: Cossí creditar OpenStreetMap + infringement_title_html: Violacion dels dreches d'autor + intro_1_html: "OpenStreetMap es un ensemble de donadas dobèrtas, disponiblas jos la licéncia Open Data Commons Open Database License (ODbL)." + intro_2_html: " Sètz liure de copiar, distribuir, transmetre e adaptar nòstras donadas,\n a condicion que creditiatz OpenStreetMap e sos\n contributors. Se modificatz o utilizatz nòstras donadas dins d’autras òbras derivadas,\n las podètz distribuir sonque jos la meteissa licéncia. Lo\n tèxte\n legal complet detalha vòstres dreches e responsabilitats." + more_1_html: "Se volètz obténer mai d’informacions sus cossí reütilizar nòstras donadas e nos creditar, legissètz la FAQ\n legala." + more_title_html: Per trobar mai d’informacions + title_html: Copyright e Licéncia + native: + mapping_link: començar a contribuir + native_link: version occitana + text: Legissètz la version anglesa de la pagina de copyright. Podètz tornar a la %{native_link} d'aquesta pagina o arrestar de legir aquesta pagina e %{mapping_link}. + title: A prepaus d'aquesta pagina + message: + delete: + deleted: Messatge suprimit + inbox: + date: Data + from: De + messages: Avètz %{new_messages} e %{old_messages} + my_inbox: Ma bóstia de recepcion + new_messages: + one: "%{count} messatge novèl" + other: "%{count} messatges novèls" + no_messages_yet: Actualament, avètz pas cap de messatge. Perqué entratz pas en contacte amb qualques %{people_mapping_nearby_link} ? + old_messages: + one: "%{count} ancian messatge" + other: "%{count} ancians messatges" + outbox: bóstia de mandadís + people_mapping_nearby: personas pròcha de vos + subject: Subjècte + title: Bóstia de recepcion + mark: + as_read: Messatge marcat coma legit + as_unread: Messatge marcat coma pas legit + message_summary: + delete_button: Suprimir + read_button: Marcar coma legit + reply_button: Respondre + unread_button: Marcar coma pas legit + new: + back_to_inbox: Tornar a la bóstia de recepcion + body: Còs + message_sent: Messatge mandat + send_button: Mandar + send_message_to: Mandar un messatge novèl a %{name} + subject: Subjècte + title: Mandar un messatge + no_such_message: + body: O planhèm, i a pas cap de messatge amb aqueste identificant. + heading: Messatge introbable + title: Messatge introbable + outbox: + date: Data + inbox: bóstia de recepcion + messages: + one: Avètz %{count} messatge mandat + other: Avètz %{count} messatges mandats + my_inbox: Ma %{inbox_link} + outbox: bóstia de mandadís + people_mapping_nearby: personas pròcha de vos + subject: Subjècte + title: Bóstia de mandadís + to: A + read: + back: Retorn + date: Data + from: De + reply_button: Respondre + subject: Subjècte + title: Legir lo messatge + to: A + unread_button: Marcar coma pas legit + sent_message_summary: + delete_button: Suprimir + note: + description: + closed_at_by_html: Resolgut fa %{when} per %{user} + closed_at_html: Resolgut fa %{when} + commented_at_by_html: Mesa a jorn fa %{when} per %{user} + commented_at_html: Mes a jorn fa %{when} + opened_at_by_html: Creat fa %{when} per %{user} + opened_at_html: Creat fa %{when} + reopened_at_by_html: Reactivat fa %{when} per %{user} + reopened_at_html: Reactivat fa %{when} + entry: + comment: Comentari + full: Nòta completa + mine: + ago_html: i a %{when} + created_at: Creat lo + creator: Creator + description: Descripcion + heading: Nòtas de %{user} + id: Id + last_changed: Darrièr cambiament + rss: + description_item: Un fial rss per la nòta %{id} + reopened: nòta reactivada (prèp de %{place}) + title: Nòtas d'OpenStreetMap + notifier: + diary_comment_notification: + hi: Bonjorn %{to_user}, + subject: "[OpenStreetMap] %{user} a apondut un comentari sus vòstra entrada del jornal" + email_confirm: + subject: "[OpenStreetMap] Confirmacion de vòstra adreça de corrièr electronic" + email_confirm_html: + greeting: Bonjorn, + email_confirm_plain: + greeting: Bonjorn, + friend_notification: + befriend_them: "Tanben, lo podètz apondre coma amic aicí : %{befriendurl}." + had_added_you: "%{user} vos a apondut coma amic dins OpenStreetMap." + see_their_profile: "Podètz veire son perfil aicí : %{userurl}." + subject: "[OpenStreetMap] %{user} vos a apondut coma amic" + gpx_notification: + and_no_tags: e sens balisa. + and_the_tags: "e las balisas seguentas :" + failure: + failed_to_import: "a pas pogut èsser importat. Aquí l'error :" + more_info_1: Mai d'informacions sus las errors al moment de l'impòrt GPX e cossí las evitar + more_info_2: "pòdon èsser trobats sus :" + subject: "[OpenStreetMap] Error al moment de l'impòrt GPX" + greeting: Bonjorn, + success: + subject: "[OpenStreetMap] Impòrt GPX capitat" + with_description: amb la descripcion + your_gpx_file: Sembla que vòstre fichièr GPX + lost_password: + subject: "[OpenStreetMap] Demanda de reïnicializacion del senhal" + lost_password_html: + greeting: Bonjorn, + lost_password_plain: + greeting: Bonjorn, + message_notification: + hi: Bonjorn %{to_user}, + note_comment_notification: + anonymous: Un utilizaire anonim + commented: + subject_other: "[OpenStreetMap] %{commenter} a comentat una nòta a la quala vos interessatz" + subject_own: "[OpenStreetMap] %{commenter} a comentat una de vòstras nòtas" + details: Mai de detalh sus la nòta pòt èsser obtengut a %{url}. + greeting: Bonjorn, + signup_confirm: + greeting: Bonjorn ! + subject: "[OpenStreetMap] Benvenguda dins OpenStreetMap" + oauth: + oauthorize: + allow_read_gpx: legir vòstras traças GPS privadas. + allow_read_prefs: legir vòstras preferéncias d'utilizaire. + allow_to: "Autorizar l'aplicacion client a :" + allow_write_api: modificar la mapa. + allow_write_diary: creatz d'entradas dins lo jornal, de comentaris e fasètz-vos d'amics. + allow_write_gpx: mandar de traças GPS. + allow_write_notes: modificar las nòtas. + allow_write_prefs: modificar vòstras preferéncias d'utilizaire. + title: Autorizar l’accès a vòstre compte + oauthorize_failure: + invalid: Lo geton d’autorizacion es invalid. + title: La demanda d’autorizacion a fracassat + oauthorize_success: + title: La demanda d’autorizacion es estada acceptada + verification: Lo còde de verificacion es %{code}. + revoke: + flash: Avètz revocat lo geton per %{application} + oauth_clients: + create: + flash: Informacions enregistradas amb succès + destroy: + flash: Enregistrament de l'aplicacion clienta suprimit + edit: + submit: Modificar + title: Modificar vòstra aplicacion + form: + allow_read_gpx: legir sas traças GPS privadas. + allow_read_prefs: legir sas preferéncias d'utilizaire. + allow_write_api: modificar la mapa. + allow_write_gpx: mandar de traças GPS. + allow_write_notes: modificar las nòtas. + allow_write_prefs: modificar sas preferéncias d'utilizaire. + callback_url: URL de rapèl + name: Nom + required: Requesit + support_url: URL de supòrt + url: URL principala de l'aplicacion + index: + application: Nom de l'aplicacion + issued_at: Emés lo + my_apps: Mas aplicacions clientas + my_tokens: Mas aplicacions enregistradas + register_new: Enregistratz vòstra aplicacion + revoke: Revocar ! + title: Mos detalhs OAuth + new: + submit: Enregistrar + title: Enregistratz una novèla aplicacion + not_found: + sorry: O planhèm, aqueste %{type} a pas pogut èsser trobat. + show: + access_url: "URL del geton d'accès :" + allow_read_gpx: legir lors traças GPS privadas. + allow_read_prefs: consultar sas preferéncias d'utilizaire. + allow_write_api: modificar la mapa. + allow_write_gpx: mandar la traça GPS + allow_write_notes: modificar las nòtas. + allow_write_prefs: modificar sas preferéncias d'utilizaire. + authorize_url: "URL d'autorizacion :" + confirm: Sètz segur ? + delete: Suprimir lo client + edit: Modificar los detalhs + key: "Clau de l'utilizaire :" + secret: "Secret de l'utilizaire :" + title: Detalhs OAuth per %{app_name} + url: "URL del geton de requèsta :" + update: + flash: Informacions del client enregistradas amb succès + redaction: + edit: + description: Descripcion + submit: Enregistrar l'amagatge + new: + description: Descripcion + show: + confirm: Sètz segur ? + description: "Descripcion :" + user: "Creator :" + site: + edit: + anon_edits_link_text: Trobatz perqué aicí. + id_not_configured: iD es pas estat configurat + not_public: Avètz pas reglat vòstras modificacions per que sián publicas. + user_page_link: pagina d'utilizaire + index: + createnote: Apondre una nòta + permalink: Ligam permanent + shortlink: Ligam cort + key: + table: + entry: + admin: Limit administratiu + allotments: Òrts familials + apron: + - Estacionament d'avions + - terminal + bridge: Bòrd negre = pont + bridleway: Camin per cavalièrs + brownfield: Zòna rasada + building: Bastiment important + byway: Camin + cable: + - Teleferic + - telesèti + cemetery: Cementèri + centre: Centre esportiu + commercial: Zòna terciària + common: + - Espaci comun + - prada + construction: Rotas en construccion + cycleway: Via ciclabla + destination: Reservat als ribairencs + farm: Zòna agricòla + footway: Via pietonièra + forest: Bòsc + golf: Percors de gòlf + heathland: Landa + industrial: Zòna industriala + lake: + - Lac + - Sèrva + military: Zòna militara + motorway: Autorota + park: Pargue + permissive: Accès tolerat + pitch: Terren d'espòrt + primary: Rota principala + private: Accès privat + rail: Via ferrada + reserve: Resèrva naturala + resident: Zòna residenciala + retail: Zòna de comèrci + runway: + - Pista d'aeropòrt + - via de circulacion d'aeropòrt + school: + - Escòla + - universitat + secondary: Rota segondària + station: Gara ferroviària + subway: Linha de mètro + summit: + - Som + - pic + tourist: Atraccion toristica + track: Pista + tram: + - Pichona via ferrada + - tram + trunk: Via exprèssa + tunnel: Bòrd en puntilhats = tunèl + unclassified: Rota pas classificada + unsurfaced: Rota sens revestiment + wood: Bòsc + markdown_help: + alt: Tèxte Alternatiu + first: Primièr element + heading: Títol + headings: Títols + image: Imatge + link: Ligam + ordered: Lista ordenada + second: Segond element + subheading: Sostítol + text: Tèxte + title_html: Analisat amb Markdown + unordered: Lista pas ordenada + url: URL + richtext_area: + edit: Modificar + preview: Apercebut + search: + search: Recèrca + submit_text: Validar + where_am_i: Ont soi ? + where_am_i_title: Descriu la posicion actuala en utilizant lo motor de recèrca + sidebar: + close: Tampar + search_results: Resultats de la recèrca + time: + formats: + friendly: "%e %B %Y a %H:%M" + trace: + create: + upload_trace: Mandar la traça GPS + delete: + scheduled_for_deletion: Pista prevista per la supression + description: + description_with_count: + one: Fichièr GPX file amb %{count} punt de %{user} + other: Fichièr GPX amb %{count} punts de %{user} + description_without_count: Fichièr GPX de %{user} + edit: + description: "Descripcion :" + download: telecargar + edit: modificar + filename: "Nom del fichièr :" + heading: Modificar la traça %{name} + map: mapa + owner: "Proprietari :" + points: "Punts :" + save_button: Enregistrar las modificacions + start_coord: "Coordenadas de despart :" + tags: "Balisas :" + tags_help: separadas per de virgulas + title: Modificar la traça %{name} + uploaded_at: "Mandat lo :" + visibility: "Visibilitat :" + visibility_help: qué significa aquò ? + georss: + title: Traças GPS d'OpenStreetMap + list: + description: Percórrer las darrièras traças GPS telecargadas + empty_html: Pas res a veire per aquí. Telecargar una traça novèla o per ne saber mai sul traçatge GPS, consultatz la pagina wiki. + public_traces: Traças GPS publicas + public_traces_from: Traças GPS publicas de %{user} + tagged_with: " balisat amb %{tags}" + your_traces: Vòstras traças GPS + make_public: + made_public: Pista renduda publica + offline: + heading: Emmagazinatge GPX fòra linha + offline_warning: + message: Lo sistèma de mandadís GPX es actualament indisponible + trace: + ago: i a %{time_in_words_ago} + by: per + count_points: "%{count} punts" + edit: modificar + edit_map: Modificar la mapa + identifiable: IDENTIFICABLE + in: dins + map: mapa + more: mai + pending: EN ESPÈRA + private: PRIVAT + public: PUBLIC + trace_details: Veire los detalhs de la traça + trackable: PISTABLE + view_map: Veire la mapa + trace_form: + description: "Descripcion :" + help: Ajuda + tags: "Balisas :" + tags_help: separadas per de virgulas + upload_button: Mandar + upload_gpx: "Mandar un fichièr GPX :" + visibility: "Visibilitat :" + visibility_help: qué significa aquò ? + trace_header: + see_all_traces: Veire totas las traças + see_your_traces: Veire totas las traças + upload_trace: Mandar una traça + trace_optionals: + tags: Balisas + trace_paging_nav: + newer: Traças novèlas + older: Ancianas traças + showing_page: Afichatge de la pagina %{page} + view: + delete_track: Suprimir aquesta pista + description: "Descripcion :" + download: telecargar + edit: modificar + edit_track: Modificar aquesta pista + filename: "Nom del fichièr :" + heading: Afichatge de la traça %{name} + map: mapa + none: Pas cap + owner: "Proprietari :" + pending: EN ESPÈRA + points: "Punts :" + start_coordinates: "Coordenadas de despart :" + tags: "Balisas :" + title: Afichatge de la traça %{name} + trace_not_found: Traça pas trobada ! + uploaded: "Mandat lo :" + visibility: "Visibilitat :" + visibility: + private: Privat (partejat anonimament, punts pas ordenats) + user: + account: + contributor terms: + heading: "Tèrmes del contributor :" + link text: qu’es aquò ? + current email address: "Adreça de corrièr electronic actuala:" + delete image: Suprimir l'imatge actual + email never displayed publicly: (pas jamai afichat publicament) + flash update success confirm needed: Informacions sus l'utilizaire mesas a jorn amb succès. Verificatz vòstra bóstia mail per tal de validar la verificacion de vòstre novèla adreça e-mail. + gravatar: + gravatar: Utilizar Gravatar + link text: qu’es aquò ? + home location: "Emplaçament del domicili :" + image: "Imatge :" + image size hint: (los imatges carrats d'al mens 100×100 pixèls foncionan melhor) + keep image: Gardar l'imatge actual + latitude: "Latitud :" + longitude: "Longitud :" + my settings: Mas opcions + new email address: "Novèla adreça de corrièr electronic :" + new image: Apondre un imatge + openid: + link: http://wiki.openstreetmap.org/wiki/OpenID + link text: qu’es aquò ? + openid: "OpenID :" + preferred editor: "Editor preferit :" + preferred languages: "Lengas preferidas :" + profile description: "Descripcion del perfil :" + public editing: + disabled link text: perqué pòdi pas modificar ? + enabled: Activat. Pas anonim e pòt modificar las donadas. + enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits + enabled link text: qu’es aquò ? + heading: "Modificacion publica :" + public editing note: + heading: Modificacion publica + replace image: Remplaçar l'imatge actuala + return to profile: Tornar al perfil + save changes button: Enregistrar las modificacions + title: Modificar lo compte + update home location on click: Metre a jorn l'emplaçament de vòstre domicili quand clicatz sus la mapa ? + confirm: + button: Confirmar + heading: Verificatz vòstre corrièr electronic ! + confirm_email: + button: Confirmar + heading: Confirmar lo cambiament de vòstra adreça e-mail + confirm_resend: + failure: L’utilizaire %{name} es introbable. + list: + confirm: Confirmar los utilizaires seleccionats + empty: Cap d'utilizaire correspondent es pas estat trobat + heading: Utilizaires + hide: Amagar los utilizaires seleccionats + showing: + one: Afichatge de la pagina %{page} (%{first_item} sus %{items}) + other: Afichatge de la pagina %{page} (%{first_item}-%{last_item} sus %{items}) + title: Utilizaires + login: + auth failure: O planhèm, mas las informacions provesidas an pas permés de vos identificar. + create account minute: Se crear un compte. Aquò pren pas qu'una minuta. + email or username: "Adreça e-mail o nom d'utilizaire :" + heading: Connexion + login_button: Se connectar + lost password link: Avètz perdut vòstre senhal ? + new to osm: Novèl sus OpenStreetMap ? + no account: Avètz pas de compte ? + openid: "%{logo} OpenID :" + openid_logo_alt: Se connectar amb un OpenID + openid_providers: + aol: + alt: Connexion amb un OpenID AOL + title: Connexion amb AOL + google: + alt: Connexion amb un OpenID Google + title: Connexion amb Google + myopenid: + alt: Connexion amb un OpenID myOpenID + title: Connexion amb myOpenID + openid: + alt: Connexion amb una URL OpenID + title: Connexion amb OpenID + wordpress: + alt: Connexion amb un OpenID Wordpress + title: Connexion amb Wordpress + yahoo: + alt: Connexion amb un OpenID Yahoo + title: Connexion amb Yahoo + password: "Senhal :" + register now: S'inscriure ara + remember: Se remembrar de ieu + title: Se connectar + with openid: "Tanben podètz utilizar OpenID per vos connectar :" + logout: + heading: Desconnexion d'OpenStreetMap + logout_button: Desconnexion + title: Desconnexion + lost_password: + email address: "Adreça de corrièr electronic :" + heading: Avètz perdut vòstre senhal ? + new password button: Mandar un senhal novèl + title: Senhal perdut + make_friend: + button: Apondre en tant qu'amic + heading: Apondre %{user} en tant qu'amic ? + success: d'ara enlà, %{name} es vòstre amic. + new: + about: + header: Liure e modificable + confirm email address: "Confirmar l'adreça de corrièr electronic :" + confirm password: "Confirmatz lo senhal :" + continue: S’inscriure + display name: "Nom afichat :" + email address: "Adreça de corrièr electronic :" + openid: "%{logo} OpenID :" + password: "Senhal :" + terms accepted: Mercé d’aver acceptat los novèls tèrmes del contributor ! + title: S’inscriure + use openid: Tanben podètz utilizar %{logo} OpenID per vos identificar + no_such_user: + heading: L'utilizaire %{user} existís pas + title: Utilizaire inexistent + popup: + friend: Amic + nearby mapper: Mapaire dins los environs + your location: Vòstre emplaçament + remove_friend: + button: Suprimir en tant qu'amic + heading: Suprimir %{user} en tant qu’amic ? + reset_password: + confirm password: "Confirmatz lo senhal :" + flash changed: Vòstre senhal es estat modificat. + heading: Reïnicializar lo senhal de %{user} + password: "Senhal :" + reset: Reïnicializar lo senhal + title: Reïnicializar lo senhal + suspended: + heading: Compte suspendut + title: Compte suspendut + webmaster: webmèstre + terms: + agree: Accèpti + consider_pd_why: qu’es aquò ? + decline: Declinar + heading: Tèrmes del contributor + legale_names: + france: França + italy: Itàlia + rest_of_world: Rèsta del mond + legale_select: "País de residéncia :" + title: Tèrmes del contributor + view: + activate_user: activar aqueste utilizaire + add as friend: Apondre en tant qu'amic + ago: (i a %{time_in_words_ago}) + block_history: blòts recebuts + blocks by me: Mos blocatges + blocks on me: Mos blocatges + comments: Comentaris + confirm: Confirmar + confirm_user: confirmar aqueste utilizaire + create_block: blocar aqueste utilizaire + created from: "Creat dempuèi :" + ct accepted: Acceptat fa %{ago} + ct declined: Refusat + ct status: "Condicions del contributor :" + ct undecided: Pas decidit + deactivate_user: desactivar aqueste utilizaire + delete_user: suprimir aqueste utilizaire + description: Descripcion + diary: Jornal + edits: Modificacions + email address: "Adreça de corrièr electronic :" + friends_changesets: Percórrer totes los gropes de modificacions dels amics + friends_diaries: Entradas de jornal dels amics + hide_user: amagar aqueste utilizaire + km away: "%{count} km" + latest edit: "Darrièra modificacion %{ago} :" + m away: distant de %{count} m + mapper since: "Mapaire dempuèi :" + moderator_history: blòts provesits + my comments: Mos comentaris + my diary: Mon jornal + my edits: Mas modificacions + my messages: Mos messatges + my notes: Mas nòtas de mapa + my profile: Mon perfil + my settings: Mas opcions + my traces: Mas traças + nearby users: Autres utilizaires a proximitat + nearby_changesets: Percórrer totes los gropes de modificacions dels utilizaires a proximitat + nearby_diaries: Entradas de jornal dels utilizaires a proximitat + new diary entry: novèla entrada dins lo jornal + no friends: Avètz pas encara apondut cap d'amic + notes: Nòtas de mapa + oauth settings: paramètres OAuth + remove as friend: Suprimir en tant qu'amic + role: + administrator: Aqueste utilizaire es un administrator + grant: + administrator: Autrejar l'accès administrator + moderator: Autrejar l'accès moderator + moderator: Aqueste utilizaire es un moderator + revoke: + administrator: Revocar l'accès administrator + moderator: Revocar l'accès moderador + send message: Mandar un messatge + settings_link_text: opcions + spam score: "Nòta pel spam :" + status: "Estatut :" + traces: Traças + unhide_user: reafichar aqueste utilizaire + user location: Emplaçament de l'utilizaire + your friends: Vòstres amics + user_block: + blocks_by: + heading: Lista dels blocatges per %{name} + title: Blocatges per %{name} + blocks_on: + empty: "%{name} es pas encara estat blocat." + heading: Lista dels blocatges sus %{name} + title: Blocatges de %{name} + create: + flash: Blocatge creat sus l'utilizaire %{name}. + edit: + back: Veire totes los blocatges + heading: Modifica un blocatge sus %{name} + reason: Rason per la quala %{name} es blocat. Mercé d'èsser tant suau e rasonable com possible, e de balhar tant de detalhs coma possible sus la situacion. Sapiatz que tot lo monde compren pas lo girgon de la comunautat, alara utilizatz de tèrmes simples e precises. + show: Afichar aqueste blocatge + submit: Modificar lo blocatge + title: Modifica un blocatge sus %{name} + helper: + time_future: Acaba a %{time}. + time_past: Acabat fa %{time}. + until_login: Actiu fins al moment que l'utilizaire se connectarà. + index: + empty: Cap de blocatge es pas encara estat efectuat. + heading: Lista dels blocatges + title: Blocatges utilizaire + model: + non_moderator_revoke: Vos cal èsser moderator per revocar un blocatge. + new: + back: Veire totes los blocatges + heading: Creat un blocatge sus %{name} + reason: Rason per la quala %{name} es blocat. Mercé d'èsser tant suau e rasonable com possible, e de balhar tant de detalhs coma possible sus la situacion. Doblidetz pas qu'aqueste messatge serà visible per totes. Sapiatz que tot lo monde compren pas lo girgon de la comunautat, alara utilizatz de tèrmes simples e precises. + submit: Crear un blòt + title: Creat un blocatge sus %{name} + not_found: + back: Retorn a l'indèx + partial: + confirm: Sètz segur ? + creator_name: Creator + display_name: Utilizaire blocat + edit: Modificar + next: Seguent » + not_revoked: (pas revocat) + previous: « Precedent + reason: Motiu del blocatge + revoke: Revocar ! + revoker_name: Revocat per + show: Afichar + showing_page: Pagina %{page} + status: Estatut + period: + one: 1 ora + other: "%{count} oras" + revoke: + flash: Aqueste blocatge es estat revocat. + heading: Revòca un blocatge sus %{block_on} per %{block_by} + revoke: Revocar ! + time_future: Aqueste blocatge s'acabarà dins %{time}. + title: Revòca un blocatge sus %{block_on} + show: + back: Afichar totes los blocatges + confirm: Sètz segur ? + edit: Modificar + heading: "%{block_on} blocat per %{block_by}" + reason: "Motiu del blocatge :" + revoke: Revocar ! + revoker: "Revocador :" + show: Afichar + status: Estatut + time_future: S'acaba dins %{time} + time_past: S'es acabat fa %{time} + title: "%{block_on} blocat per %{block_by}" + update: + success: Blocatge mes a jorn. + user_role: + filter: + already_has_role: L'utilizaire possedís ja lo ròtle %{role}. + doesnt_have_role: L'utilizaire a pas lo ròtle %{role}. + not_a_role: La cadena « %{role} » es un ròtle valid. + grant: + confirm: Confirmar + heading: Confirmar l'autrejament del ròtle + title: Confirmar l'autrejament del ròtle + revoke: + confirm: Confirmar + heading: Confirmar la revocacion del ròtle + title: Confirmar la revocacion del ròtle + welcome_page: + add_a_note: + title: Pas lo temps d'editar ? Apodètz una nòta ! + basic_terms: + editor_html: Un editor es un programa o site web que vos permet d'editar la mapa. + tag_html: "Un tag es una informacion a prepaus d'un nosèl o d'un camin, coma\nlo nom d'un restaurant o la velocitat limita d'una carrièra." + title: Vocabulari de basa de cartografia + questions: + paragraph_1_html: "OpenStreetMap a mantuna ressorsas per aprene lo projècte, per pausar e respondre a de questions, e per discutir en collaboracion amb d’autres e documentar los subjèctes de cartografia.\nTrobatz d’ajuda aicí." + title: De questions ? + start_mapping: Començar de cartografiar + title: Benvenguda ! + whats_on_the_map: + on_html: "OpenStreetMap servís a cartografiar de causas a l'encòp vertadièras e actualas\n- inclutz de milions de bastiments, de rotas, e d'autres detalhs de luòcs. Podètz cartografiar quin element vertadièr del mond que que vos interèsse." + title: Çò qu'i a sus la mapa diff --git a/config/locales/pa.yml b/config/locales/pa.yml new file mode 100644 index 00000000000..4601679ce99 --- /dev/null +++ b/config/locales/pa.yml @@ -0,0 +1,911 @@ +# Messages for Punjabi (ਪੰਜਾਬੀ) +# Exported from translatewiki.net +# Export driver: syck-pecl +# Author: Aalam +# Author: Babanwalia +pa: + activerecord: + attributes: + diary_comment: + body: ਮੁੱਖ ਭਾਗ + diary_entry: + language: ਭਾਸ਼ਾ + latitude: ਲੰਬਕਾਰ + longitude: ਲੰਬਕਾਰ + title: ਟਾਈਟਲ + user: ਯੂਜ਼ਰ + friend: + friend: ਦੋਸਤ + user: ਯੂਜ਼ਰ + message: + body: ਮੁੱਖ ਭਾਗ + recipient: ਪ੍ਰਾਪਤਕਰਤਾ + sender: ਭੇਜਣ ਵਾਲਾ + title: ਟਾਈਟਲ + trace: + description: ਵੇਰਵਾ + latitude: ਵਿਧਕਾਰ + longitude: ਲੰਬਕਾਰ + name: ਨਾਂ + public: ਪਬਲਿਕ + size: ਆਕਾਰ + user: ਯੂਜ਼ਰ + visible: ਦਿੱਖ + user: + active: ਸਰਗਰਮ + description: ਵੇਰਵਾ + display_name: ਵੇਖਾਉਣ ਨਾਂ + email: ਈਮੇਲ + languages: ਭਾਸ਼ਾ + pass_crypt: ਪਾਸਵਰਡ + models: + acl: ਅਸੈਸ ਕੰਟਰੋਲ ਲਿਸਟ + country: ਦੇਸ਼ + diary_comment: ਡਾਇਰੀ ਟਿੱਪਣੀ + diary_entry: ਡਾਇਰੀ ਐਂਟਰੀ + friend: ਦੋਸਤ + language: ਭਾਸ਼ਾ + message: ਸੁਨੇਹਾ + node: ਨੋਡ + node_tag: ਨੋਡ ਟੈਗ + notifier: ਨੋਟੀਫਾਇਰ + old_node: ਪੁਰਾਣੀ ਨੋਡ + old_node_tag: ਪੁਰਾਣਾ ਨੋਡ ਟੈਗ + old_relation: ਪੁਰਾਣਾ ਸਬੰਧ + old_relation_member: ਪੁਰਾਣਾ ਸਬੰਧ ਮੈਂਬਰ + old_relation_tag: ਪੁਰਾਣਾ ਸਬੰਧ ਟੈਗ + old_way: ਪੁਰਾਣਾ ਢੰਗ + old_way_node: ਪੁਰਾਣਾ ਢੰਗ ਨੋਡ + old_way_tag: ਪੁਰਾਣਾ ਢੰਗ ਟੈਗ + relation: ਸਬੰਧ + relation_member: ਸਬੰਧ ਮੈਂਬਰ + relation_tag: ਸਬੰਧ ਟੈਗ + session: ਸ਼ੈਸ਼ਨ + user: ਯੂਜ਼ਰ + user_preference: ਯੂਜ਼ਰ ਪਸੰਦ + user_token: ਯੂਜ਼ਰ ਟੋਕਨ + way: ਰਾਹ + way_node: ਰਾਹ ਨੋਡ + way_tag: ਰਾਹ ਟੈਗ + browse: + not_found: + type: + changeset: ਚੇਜ਼ਸੈੱਟ + node: ਨੋਡ + relation: ਸਬੰਧ + way: ਰਾਹ + note: + title: ਟਿੱਪਣੀ + redacted: + type: + node: ਗੱਠ + relation: ਸਬੰਧ + way: ਰਾਹ + relation_member: + entry_role: "%{type} %{name} %{role} ਵਜੋਂ" + type: + node: ਨੋਡ + relation: ਸਬੰਧ + way: ਰਾਹ + start_rjs: + load_data: ਡਾਟਾ ਲੋਡ ਕਰੋ + loading: ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ… + tag_details: + tags: "ਟੈਗ:" + timeout: + type: + changeset: ਚੇਜ਼ਸੈੱਟ + node: ਨੋਡ + relation: ਸਬੰਧ + way: ਰਾਹ + changeset: + changeset: + anonymous: ਗੁਮਨਾਮ + no_edits: (ਕੋਈ ਸੋਧ ਨਹੀਂ) + changeset_paging_nav: + next: ਅਗਲਾ » + previous: « ਪਿਛਲਾ + showing_page: ਸਫ਼ਾ %{page} + changesets: + area: ਇਲਾਕਾ + comment: ਟਿੱਪਣੀ + user: ਵਰਤੋਂਕਾਰ + diary_entry: + comments: + ago: "%{ago} ਪਹਿਲਾਂ" + comment: ਟਿੱਪਣੀ + newer_comments: ਹੋਰ ਨਵੀਆਂ ਟਿੱਪਣੀਆਂ + older_comments: ਹੋਰ ਪੁਰਾਣੀਆਂ ਟਿੱਪਣੀਆਂ + when: ਕਦੋਂ + diary_comment: + confirm: ਤਸਦੀਕ ਕਰੋ + hide_link: ਇਹ ਟਿੱਪਣੀ ਲੁਕਾਓ + diary_entry: + comment_link: ਇਸ ਇੰਦਰਾਜ 'ਤੇ ਟਿੱਪਣੀ ਕਰੋ + confirm: ਤਸਦੀਕ ਕਰੋ + edit_link: ਇਹ ਇੰਦਰਾਜ ਸੋਧੋ + hide_link: ਇਹ ਇੰਦਰਾਜ ਲੁਕਾਓ + reply_link: ਇਸ ਇੰਦਰਾਜ ਦਾ ਜੁਆਬ ਦਿਓ + edit: + language: "ਭਾਸ਼ਾ:" + latitude: "ਅਕਸ਼ਾਂਸ਼:" + location: "ਸਥਿਤੀ:" + longitude: "ਰੇਖਾਂਸ਼:" + save_button: ਸਾਂਭੋ + subject: "ਵਿਸ਼ਾ:" + use_map_link: ਨਕਸ਼ਾ ਵਰਤੋ + location: + edit: ਸੋਧੋ + location: "ਸਥਿਤੀ:" + view: ਵੇਖੋ + no_such_entry: + title: ਅਜਿਹਾ ਕੋਈ ਡਾਇਰੀ ਇੰਦਰਾਜ ਨਹੀਂ + view: + login: ਦਾਖ਼ਲਾ + save_button: ਸਾਂਭੋ + editor: + default: ਡਿਫਾਲਟ (ਇਸ ਸਮੇਂ %{name}) + remote: + name: ਰਿਮੋਟ ਕੰਟਰੋਲ + export: + start: + area_to_export: ਨਿਰਯਾਤ ਕਰਨ ਲਈ ਖੇਤਰ + export_button: ਨਿਰਯਾਤ + format: ਰੂਪ + image_size: ਤਸਵੀਰ ਦਾ ਅਕਾਰ + latitude: "ਅਕਸ਼ਾਂਸ਼:" + licence: ਲਸੰਸ + longitude: "ਰੇਖਾਂਸ਼:" + manually_select: ਆਪਣੇ ਆਪ ਇੱਕ ਵੱਖਰਾ ਖੇਤਰ ਚੁਣੋ + max: ਵੱਧ ਤੋਂ ਵੱਧ + options: ਚੋਣਾਂ + output: ਆਊਟਪੁਟ + scale: ਪੈਮਾਨਾ + zoom: ਜ਼ੂਮ ਕਰੋ + geocoder: + description: + types: + cities: ਸ਼ਹਿਰ + places: ਥਾਂਵਾਂ + towns: ਕਸਬੇ + direction: + east: ਪੂਰਬ + north: ਉੱਤਰ + north_east: ਉੱਤਰ-ਪੂਰਬ + north_west: ਉੱਤਰ-ਪੱਛਮ + south: ਦੱਖਣ + south_east: ਦੱਖਣ-ਪੂਰਬ + south_west: ਦੱਖਣ-ਪੱਛਮ + west: ਪੱਛਮ + results: + more_results: ਹੋਰ ਨਤੀਜੇ + no_results: ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ ਲੱਭੇ + search_osm_nominatim: + admin_levels: + level10: ਉਪਨਗਰ ਦੀ ਜੂ + level2: ਦੇਸ਼ ਦੀ ਹੱਦ + level4: ਰਾਜ ਦੀ ਹੱਦ + level5: ਇਲਾਕੇ ਦੀ ਹੱਦ + level6: ਕਾਊਂਟੀ ਦੀ ਹੱਦ + level8: ਸ਼ਹਿਰ ਦੀ ਹੱਦ + level9: ਪਿੰਡ ਦੀ ਜੂ + prefix: + aeroway: + aerodrome: ਏਰੋਡਰੋਮ + apron: ਐਪਰਨ + gate: ਦਰਵਾਜ਼ਾ + helipad: ਹੈਲੀਪੈਡ + runway: ਰਨਵੇ + taxiway: ਟੈਕਸੀਵੇ + terminal: ਟਰਮੀਨਲ + amenity: + WLAN: ਵਾਈਫ਼ਾਈ ਪਹੁੰਚ + airport: ਹਵਾਈ ਅੱਡਾ + arts_centre: ਕਲਾ ਕੇਂਦਰ + artwork: ਕਲਾਕਾਰਜ + atm: ਏ੦ਟੀ੦ਐੱਮ + auditorium: ਆਡੋਟੋਰੀਅਮ + bank: ਬੈਂਕ + bar: ਬਾਰ + bbq: ਬਾਰਬੇਕਿਊ + bench: ਬੈਂਚ + bicycle_parking: ਸਾਈਕਲ ਪਾਰਕਿੰਗ + bicycle_rental: ਕਿਰਾਏ 'ਤੇ ਸਾਈਕਲ + biergarten: ਬੀਅਰ ਬਾਗ਼ + brothel: ਕੋਠਾ + bureau_de_change: ਮੁਦਰਾ ਵਟਾਂਦਰਾ + bus_station: ਬਸ ਸਟੈਂਡ + cafe: ਕੈਫ਼ੇ + car_rental: ਕਿਰਾਏ 'ਤੇ ਕਾਰ + car_sharing: ਸਾਂਝੀ ਕਾਰ + car_wash: ਕਾਰ ਧੁਆਈ + casino: ਕਸੀਨੋ + charging_station: ਚਾਰਜਿੰਗ ਸਟੇਸ਼ਨ + cinema: ਸਿਨੇਮਾ + clinic: ਕਲੀਨਿਕ + club: ਕਲੱਬ + college: ਕਾਲਜ + community_centre: ਭਾਈਚਾਰਾ ਕੇਂਦਰ + courthouse: ਕਚਹਿਰੀ + crematorium: ਸ਼ਮਸ਼ਾਨ ਘਾਟ + dentist: ਦੰਦਾਂ ਦਾ ਡਾਕਟਰ + doctors: ਡਾਕਟਰ + dormitory: ਸਰਾਂ + drinking_water: ਪੀਣ ਦਾ ਪਾਣੀ + driving_school: ਡਰਾਈਵਿੰਗ ਸਕੂਲ + embassy: ਸਫ਼ਾਰਤਖ਼ਾਨਾ + emergency_phone: ਐਮਰਜੈਂਸੀ ਫ਼ੋਨ + fast_food: ਫ਼ਾਸਟ ਫ਼ੂਡ + ferry_terminal: ਫ਼ੈਰੀ ਅੱਡਾ + fire_hydrant: ਅੱਗ-ਬੁਝਾਊ ਨਲਕਾ + fire_station: ਅੱਗ-ਬੁਝਾਊ ਸਟੇਸ਼ਨ + food_court: ਖਾਣਾ ਦਰਬਾਰ + fountain: ਫ਼ੁਹਾਰਾ + fuel: ਤੇਲ + grave_yard: ਕਬਰਿਸਤਾਨ + gym: ਜਿਮ/ਦਰੁਸਤੀ ਕੇਂਦਰ + hall: ਹਾਲ + health_centre: ਸਿਹਤ ਕੇਂਦਰ + hospital: ਹਸਪਤਾਲ + hotel: ਹੋਟਲ + hunting_stand: ਸ਼ਿਕਾਰ ਸਟੈਂਡ + ice_cream: ਆਈਸ ਕਰੀਮ + kindergarten: ਬਾਲਵਾੜੀ + library: ਪੁਸਤਕਾਲਾ + market: ਮਾਰਕਿਟ + marketplace: ਮਾਰਕਿਟ ਟਿਕਾਣਾ + mountain_rescue: ਪਹਾੜ ਬਚਾਓ + nightclub: ਰਾਤ ਦਾ ਕਲੱਬ + nursery: ਨਰਸਰੀ + nursing_home: ਨਰਸਿੰਗ ਹੋਮ + office: ਦਫ਼ਤਰ + park: ਬਾਗ਼ + parking: ਪਾਰਕਿੰਗ + pharmacy: ਫ਼ਾਰਮੇਸੀ + place_of_worship: ਭਗਤੀ ਦਾ ਘਰ + police: ਪੁਲਿਸ + post_box: ਡਾਕ ਬਕਸਾ + post_office: ਡਾਕ ਘਰ + preschool: ਪ੍ਰੀ-ਸਕੂਲ + prison: ਜੇਲ੍ਹ + pub: ਪਬ + public_building: ਲੋਕ ਇਮਾਰਤ + public_market: ਲੋਕ ਮਾਰਕਿਟ + reception_area: ਕਬੂਲ ਇਲਾਕਾ + recycling: ਰੀਸਾਈਕਲ ਬਿੰਦੂ + restaurant: ਰੈਸਟੋਰੈਂਟ + retirement_home: ਸੇਵਾ-ਮੁਕਤੀ ਘਰ + sauna: ਸੌਨਾ + school: ਸਕੂਲ + shelter: ਸ਼ਰਨ + shop: ਹੱਟੀ + shopping: ਸ਼ਾਪਿੰਗ + shower: ਸ਼ਾਵਰ + social_centre: ਸਮਾਜਕ ਕੇਂਦਰ + social_club: ਸਮਾਜਕ ਕਲੱਬ + studio: ਸਟੂਡੀਓ + supermarket: ਸੁਪਰਮਾਰਕਿਟ + swimming_pool: ਤੈਰਾਕੀ ਤਲਾਅ + taxi: ਟੈਕਸੀ + telephone: ਪਬਲਿਕ ਟੈਲੀਫ਼ੋਨ + theatre: ਥੀਏਟਰ + toilets: ਪਖਾਣੇ + townhall: ਟਾਊਨ ਹਾਲ + university: ਯੂਨੀਵਰਸਿਟੀ + vending_machine: ਮਾਲ-ਵੇਚੂ ਮਸ਼ੀਨ + veterinary: ਡੰਗਰਾਂ ਦਾ ਡਾਕਟਰ + village_hall: ਪਿੰਡ ਦਾ ਹਾਲ + waste_basket: ਕੂੜਾਦਾਨ + wifi: ਵਾਈਫ਼ਾਈ ਪਹੁੰਚ + youth_centre: ਨੌਜਵਾਨ ਕੇਂਦਰ + boundary: + administrative: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ + census: ਮਰਦਮਸ਼ੁਮਾਰੀ ਸਰਹੱਦ + national_park: ਰਾਸ਼ਟਰੀ ਪਾਰਕ + protected_area: ਸੁਰੱਖਿਅਤ ਖੇਤਰ + bridge: + aqueduct: ਪੁਲ + suspension: ਲਮਕਦਾ ਪੁਲ + swing: ਝੂਲ਼ਦਾ ਪੁਲ + viaduct: ਘਾਟੀ ਉਤਲਾ ਪੁਲ + "yes": ਪੁਲ + building: + "yes": ਇਮਾਰਤ + highway: + bridleway: ਘੋੜ-ਰਾਹ + bus_stop: ਬਸ ਸਟਾਪ + byway: ਬਾਈਵੇ + construction: ਉਸਾਰੀ ਹੇਠ ਹਾਈਵੇ + cycleway: ਸਾਈਕਲ ਰਾਹ + emergency_access_point: ਐਮਰਜੈਂਸੀ ਪਹੁੰਚ ਬਿੰਦੂ + footway: ਫੁੱਟਪਾਥ + ford: ਫ਼ੋਰਡ + living_street: ਲਿਵਿੰਗ ਸਟਰੀਟ + milestone: ਮੀਲਪੱਥਰ + minor: ਮਾਈਨਰ ਰੋਡ + motorway: ਮੋਟਰਵੇ + motorway_junction: ਮੋਟਰਵੇ ਜੰਕਸ਼ਨ + motorway_link: ਮੋਟਰਵੇ ਰੋਡ + path: ਰਾਹ + pedestrian: ਤੁਰਨ ਦਾ ਰਾਹ + platform: ਪਲੇਟਫਾਰਮ + primary: ਮੁਢਲੀ ਸੜਕ + primary_link: ਮੁਢਲੀ ਸੜਕ + raceway: ਰੇਸਵੇ + residential: ਰਿਹਾਇਸ਼ੀ + rest_area: ਅਰਾਮ ਘਰ + road: ਸੜਕ + secondary: ਸਕੈਂਡਰੀ ਸੜਕ + secondary_link: ਸਕੈਂਡਰੀ ਸੜਕ + service: ਸੇਵਾ ਸੜਕ + services: ਮੋਟਰਵੇ ਸੇਵਾਵਾਂ + speed_camera: ਗਤੀ ਕੈਮਰਾ + steps: ਪੌੜੀਆਂ + stile: ਪੌੜੀ + tertiary: ਤੀਜੇ ਪੱਧਰ ਦੀ ਸੜਕ + tertiary_link: ਤੀਜੇ ਪੱਧਰ ਦੀ ਸੜਕ + track: ਟਰੈਕ + trail: ਡੰਡੀ + trunk: ਟਰੰਕ ਸੜਕ + trunk_link: ਟਰੰਕ ਸੜਕ + historic: + building: ਇਮਾਰਤ + castle: ਗੜ੍ਹੀ + church: ਗਿਰਜਾ + fort: ਕਿਲ਼ਾ + house: ਘਰ + icon: ਆਈਕਨ + manor: ਮੈਨਰ + memorial: ਯਾਦਗਾਰ + mine: ਖਾਨ + monument: ਸਮਾਰਕ + museum: ਅਜਾਇਬਘਰ + ruins: ਖੰਡਰ + tower: ਬੁਰਜ + landuse: + basin: ਹੌਜ਼ੀ + commercial: ਵਪਾਰਕ ਖੇਤਰ + construction: ਉਸਾਰੀ + farm: ਖੇਤ + farmland: ਖੇਤ ਭੂਮੀ + farmyard: ਫਾਰਮਯਾਰਡ + forest: ਜੰਗਲ + garages: ਗੈਰਜ + grass: ਘਾਹ + industrial: ਉਦਯੋਗੀ ਖੇਤਰ + meadow: ਚਰਗਾਹ + military: ਮਿਲਟਰੀ ਖੇਤਰ + mine: ਖਾਨ + orchard: ਬਗ਼ੀਚਾ + park: ਬਾਗ਼ + railway: ਰੇਲਵੇ + road: ਸੜਕ ਇਲਾਕਾ + wood: ਜੰਗਲ + leisure: + garden: ਬਾਗ਼ + park: ਪਾਰਕ + sauna: ਸੌਨਾ + sports_centre: ਖੇਡ ਕੇਂਦਰ + stadium: ਸਟੇਡੀਅਮ + swimming_pool: ਤੈਰਾਕੀ ਤਲਾਅ + track: ਭੱਜਣ ਲਈ ਟਰੈਕ + water_park: ਜਲ ਪਾਰਕ + mountain_pass: + "yes": ਦੱਰਾ + natural: + bay: ਖਾੜੀ + beach: ਬੀਚ + cape: ਅੰਤਰੀਪ + cave_entrance: ਗੁਫ਼ਾ ਦਾ ਪ੍ਰਵੇਸ਼ + forest: ਜੰਗਲ + geyser: ਗੀਜ਼ਰ + glacier: ਗਲੇਸ਼ੀਅਰ + heath: ਸਿਹਤ + hill: ਪਹਾੜੀ + island: ਟਾਪੂ + land: ਭੋਂ + marsh: ਦਲਦਲ + mud: ਚਿੱਕੜ + peak: ਚੋਟੀ + point: ਬਿੰਦੂ + reef: ਰੀਫ਼ + ridge: ਰਿੱਜ + river: ਦਰਿਆ + rock: ਚਟਾਨ + spring: ਸੋਮਾ + stone: ਪੱਥਰ + strait: ਪਣਜੋੜ + tree: ਦਰਖ਼ਤ + valley: ਘਾਟੀ + volcano: ਜਵਾਲਾਮੁਖੀ + water: ਪਾਣੀ + wood: ਜੰਗਲ + office: + accountant: ਅਕਾਊਂਟੈਂਟ + architect: ਨਕਸ਼ਾਕਾਰ + company: ਕੰਪਨੀ + employment_agency: ਰੁਜ਼ਗਾਰ ਏਜੰਸੀ + estate_agent: ਇਸਟੇਟ ਏਜੰਸੀ + government: ਸਰਕਾਰੀ ਦਫ਼ਤਰ + insurance: ਬੀਮਾ ਦਫ਼ਤਰ + lawyer: ਵਕੀਲ + ngo: ਐੱਨ੦ਜੀ੦ਓ ਦਫ਼ਤਰ + travel_agent: ਟਰੈਵਲ ਏਜੰਸੀ + "yes": ਦਫ਼ਤਰ + place: + airport: ਹਵਾਈ ਅੱਡਾ + city: ਸ਼ਹਿਰ + country: ਦੇਸ਼ + county: ਦੇਸ਼ + farm: ਖੇਤ + hamlet: ਡੇਰਾ + house: ਘਰ + houses: ਘਰ + island: ਟਾਪੂ + islet: ਛੋਟਾ ਟਾਪੂ + isolated_dwelling: ਇਕੱਲਾ ਘਰ + locality: ਮੁਹੱਲਾ + moor: ਮੂਰ + municipality: ਨਗਰਪਾਲਿਕਾ + postcode: ਡਾਕਕੋਡ + region: ਇਲਾਕਾ + sea: ਸਮੁੰਦਰ + state: ਰਾਜ + subdivision: ਉਪਵਿਭਾਗ + suburb: ਉਪਨਗਰ + town: ਕਸਬਾ + unincorporated_area: ਗ਼ੈਰ-ਸੰਮਿਲਤ ਇਲਾਕਾ + village: ਪਿੰਡ + railway: + abandoned: ਛੱਡਿਆ ਹੋਇਆ ਰੇਲਵੇ + construction: ਉਸਾਰੀ ਹੇਠ ਰੇਲਵੇ + disused: ਵਰਤੋਂ ਤੋਂ ਬਾਹਰ ਰੇਲਵੇ + disused_station: ਵਰਤੋਂ ਤੋਂ ਮੁਕਤ ਰੇਲਵੇ ਸਟੇਸ਼ਨ + halt: ਟਰੇਨ ਸਟਾਪ + historic_station: ਇਤਿਹਾਸਕ ਰੇਲਵੇ ਸਟੇਸ਼ਨ + junction: ਰੇਲਵੇ ਜੰਕਸ਼ਨ + level_crossing: ਲੈਵਲ ਕਰਾਸਿੰਗ + light_rail: ਹਲਕੀ ਰੇਲ + miniature: ਛੋਟੀ ਰੇਲ + monorail: ਇਕਹਿਰੀ ਰੇਲ + narrow_gauge: ਭੀੜੀ ਰੇਲ + platform: ਰੇਲਵੇ ਪਲੇਟਫਾਰਮ + station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ + subway: ਸਬਵੇ ਸਟੇਸ਼ਨ + subway_entrance: ਸਬਵੇ ਪ੍ਰਵੇਸ਼ + tram: ਟਰਾਮਵੇ + tram_stop: ਟਰਾਮ ਅੱਡਾ + yard: ਰੇਲਵੇ ਯਾਰਡ + shop: + art: ਕਲਾ ਹੱਟੀ + bakery: ਨਾਨਬਾਈ ਦੀ ਹੱਟੀ + beauty: ਬਿਊਟੀ ਪਾਰਲਰ + bicycle: ਸਾਈਕਲਾਂ ਦੀ ਦੁਕਾਨ + books: ਕਿਤਾਬਾਂ ਦੀ ਦੁਕਾਨ + butcher: ਕਸਾਈ + car: ਕਾਰਾਂ ਦੀ ਦੁਕਾਨ + car_parts: ਕਾਰਾਂ ਦੇ ਪਾਰਟ + car_repair: ਕਾਰ ਮੁਰੰਮਤ + carpet: ਗ਼ਲੀਚਿਆਂ ਦੀ ਦੁਕਾਨ + charity: ਦਾਨ ਦੀ ਹੱਟੀ + chemist: ਦਵਾਈਆਂ ਦੀ ਦੁਕਾਨ + clothes: ਕੱਪੜਿਆਂ ਦੀ ਦੁਕਾਨ + computer: ਕੰਪਿਊਟਰਾਂ ਦੀ ਦੁਕਾਨ + confectionery: ਹਲਵਾਈ + convenience: ਸੌਖ ਕੇਂਦਰ + copyshop: ਕਾਪੀ ਹੱਟੀ + cosmetics: ਸੁਰਖੀ-ਬਿੰਦੀ ਦੀ ਦੁਕਾਨ + department_store: ਡਿਪਾਰਟਮੈਂਟ ਸਟੋਰ + discount: ਡਿਸਕਾਊਂਟ ਵਾਲੀਆਂ ਚੀਜ਼ਾ ਦੀ ਦੁਕਾਨ + doityourself: ਆਪ ਕਰੋ + dry_cleaning: ਡਰਾਈ ਕਲੀਨਰ + electronics: ਬਿਜਲਾਣੂ ਦੁਕਾਨ + estate_agent: ਇਸਟੇਟ ਅਜੰਟ + farm: ਫ਼ਾਰਮ ਦੁਕਾਨ + fashion: ਫ਼ੈਸ਼ਨਾਂ ਦੀ ਹੱਟੀ + fish: ਮੱਛੀਆਂ ਦੀ ਦੁਕਾਨ + florist: ਫੁੱਲਾਂ ਦੀ ਦੁਕਾਨ + furniture: ਫ਼ਰਨੀਚਰ + gallery: ਗੈਲਰੀ + garden_centre: ਬਾਗ਼ਬਾਨੀ + general: ਜਨਰਲ ਸਟੋਰ + gift: ਤੋਹਫ਼ਿਆਂ ਦੀ ਦੁਕਾਨ + grocery: ਰਾਸ਼ਨ ਦੀ ਹੱਟੀ + hairdresser: ਵਾਲ ਤਿਆਰ ਕਰਨ ਵਾਲਾ + hardware: ਹਾਰਡਵੇਅਰ ਸਟੋਰ + hifi: ਹਾਈ-ਫ਼ਾਈ + insurance: ਬੀਮਾ + jewelry: ਗਹਿਣਿਆਂ ਦੀ ਦੁਕਾਨ + laundry: ਧੋਬੀਘਾਟ + mall: ਮਾਲ + market: ਮਾਰਕਿਟ + mobile_phone: ਮੋਬਾਈਲਾਂ ਦੀ ਦੁਕਾਨ + motorcycle: ਮੋਟਰਸਾਈਕਲਾਂ ਦੀ ਦੁਕਾਨ + music: ਸੰਗੀਤ ਦੀ ਦੁਕਾਨ + newsagent: ਖ਼ਬਰਾਂ ਦਾ ਏਜੰਟ + pet: ਪਾਲਤੂ ਜਾਨਵਰਾਂ ਦੀ ਦੁਕਾਨ + photo: ਤਸਵੀਰਾਂ ਦੀ ਦੁਕਾਨ + shoes: ਜੁੱਤੀਆਂ ਦੀ ਦੁਕਾਨ + shopping_centre: ਸ਼ਾਪਿੰਗ ਕੇਂਦਰ + sports: ਖੇਡਾਂ ਦੀ ਦੁਕਾਨ + stationery: ਸਟੇਸ਼ਨਰੀ ਦੀ ਦੁਕਾਨ + supermarket: ਸੁਪਰਮਾਰਕਿਟ + toys: ਖਿਡੌਣਿਆਂ ਦੀ ਦੁਕਾਨ + travel_agency: ਟਰੈਵਲ ਏਜੰਸੀ + video: ਵੀਡੀਓ ਦੀ ਦੁਕਾਨ + tourism: + cabin: ਕੈਬਿਨ + guest_house: ਸਰਾਂ + hostel: ਹੋਸਟਲ + hotel: ਹੋਟਲ + information: ਜਾਣਕਾਰੀ + motel: ਮੋਟਲ + museum: ਅਜਾਇਬਘਰ + picnic_site: ਪਿਕਨਿਕ ਟਿਕਾਣਾ + theme_park: ਥੀਮ ਪਾਰਕ + valley: ਘਾਟੀ + zoo: ਚਿੜੀਆਘਰ + tunnel: + "yes": ਸੁਰੰਗ + waterway: + canal: ਨਹਿਰ + dam: ਬੰਨ੍ਹ + drain: ਨਾਲ਼ੀ + lock: ਜਿੰਦਰਾ + river: ਦਰਿਆ + riverbank: ਦਰਿਆ ਦਾ ਕੰਢਾ + wadi: ਵਾਦੀ + waterfall: ਝਰਨਾ + javascripts: + notes: + new: + add: ਟਿੱਪਣੀ ਜੋੜੋ + show: + comment: ਟਿੱਪਣੀ ਕਰੋ + hide: ਲੁਕਾਓ + reactivate: ਮੁੜ ਚਾਲੂ ਕਰੋ + resolve: ਹੱਲ਼ ਕੱਢੋ + layouts: + community: ਭਾਈਚਾਰਾ + copyright: ਕਾਪੀਰਾਈਟ ਅਤੇ ਲਸੰਸ + edit: ਸੋਧੋ + export: ਨਿਰਯਾਤ + foundation: ਸਥਾਪਨਾ + help: ਮਦਦ + history: ਅਤੀਤ + home: ਘਰ + intro_2_create_account: ਵਰਤੋਂਕਾਰ ਖਾਤਾ ਬਣਾਓ + log_in: ਲਾਗ ਇਨ + log_in_tooltip: ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਨਾਲ ਲਾਗ ਇਨ ਕਰੋ + logo: + alt_text: ਓਪਨਸਟਰੀਟਮੈਪ ਲੋਗੋ + logout: ਲਾਗਆਉਟ + make_a_donation: + text: ਦਾਨ ਦਿਓ + partners_partners: ਜੋੜੀਦਾਰ + sign_up: ਸਾਈਨ ਅੱਪ + sign_up_tooltip: ਸੋਧਣ ਲਈ ਇੱਕ ਅਕਾਊਂਟ ਬਣਾਓ + license_page: + foreign: + english_link: ਮੂਲ ਅੰਗਰੇਜ਼ੀ + title: ਇਸ ਤਰਜਮੇ ਬਾਰੇ + legal_babble: + title_html: ਕਾਪੀਰਾਈਟ ਅਤੇ ਲਸੰਸ + native: + mapping_link: ਨਕਸ਼ਾਬੰਦੀ ਸ਼ੁਰੂ ਕਰੋ + title: ਇਸ ਸਫ਼ੇ ਬਾਰੇ + message: + delete: + deleted: ਸੁਨੇਹਾ ਮਿਟਾਇਆ ਗਿਆ + inbox: + date: ਮਿਤੀ + subject: ਵਿਸ਼ਾ + message_summary: + delete_button: ਮਿਟਾਓ + reply_button: ਜੁਆਬ + new: + message_sent: ਸੁਨੇਹਾ ਭੇਜਿਆ ਗਿਆ + send_button: ਭੇਜੋ + subject: ਵਿਸ਼ਾ + title: ਸੁਨੇਹਾ ਭੇਜੋ + no_such_message: + heading: ਕੋਈ ਅਜਿਹਾ ਸੁਨੇਹਾ ਨਹੀਂ + title: ਕੋਈ ਅਜਿਹਾ ਸੁਨੇਹਾ ਨਹੀਂ + outbox: + date: ਮਿਤੀ + subject: ਵਿਸ਼ਾ + read: + date: ਮਿਤੀ + reply_button: ਜੁਆਬ + subject: ਵਿਸ਼ਾ + to: ਸੇਵਾ ਵਿਖੇ + unread_button: ਅਣ-ਪੜ੍ਹਿਆ ਨਿਸ਼ਾਨ ਲਾਓ + sent_message_summary: + delete_button: ਮਿਟਾਓ + note: + entry: + comment: ਟਿੱਪਣੀ ਕਰੋ + full: ਪੂਰੀ ਟਿੱਪਣੀ + mine: + description: ਵੇਰਵਾ + notifier: + gpx_notification: + greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ, + signup_confirm: + greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ! + oauth_clients: + form: + name: ਨਾਂ + required: ਲੋੜੀਂਦਾ + index: + register_new: ਆਪਣੀ ਅਰਜ਼ੀ ਦਾ ਇੰਦਰਾਜ ਕਰਾਓ + show: + allow_write_api: ਨਕਸ਼ਾ 'ਚ ਫੇਰ-ਬਦਲ ਕਰੋ + confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ? + edit: ਵੇਰਵਾ ਸੋਧੋ + redaction: + edit: + description: ਵੇਰਵਾ + new: + description: ਵੇਰਵਾ + show: + confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ? + site: + edit: + anon_edits_link_text: ਪਤਾ ਕਰੋ ਕਿ ਇੱਦਾਂ ਕਿਉਂ ਹੋਇਆ ਹੈ। + user_page_link: ਵਰਤੋਂਕਾਰ ਸਫ਼ਾ + index: + createnote: ਟਿੱਪਣੀ ਜੋੜੋ + key: + table: + entry: + admin: ਪ੍ਰਸ਼ਾਸਕੀ ਸਰਹੱਦ + apron: + - ਹਵਾਈ ਅੱਡੇ ਦਾ ਐਪਰਨ + - ਟਰਮੀਨਲ + bridleway: ਘੋੜ-ਰਾਹ + building: ਮਹੱਤਵਪੂਰਨ ਇਮਾਰਤ + byway: ਬਾਈਵੇ + cable: + - ਕੇਬਲ ਕਾਰ + - ਕੁਰਸੀ ਲਿਫ਼ਟ + cemetery: ਸ਼ਮਸ਼ਾਨ + centre: ਖੇਡ ਕੇਂਦਰ + commercial: ਵਪਾਰਕ ਖੇਤਰ + common: + - ਸੱਥ + - ਚਰਗਾਹ + construction: ਉਸਾਰੀ ਹੇਠ ਸੜਕਾਂ + cycleway: ਸਾਈਕਲ ਦਾ ਰਾਹ + farm: ਖੇਤ + footway: ਪੈਦਲ ਰਾਹ + forest: ਜੰਗਲ + golf: ਗੋਲਫ਼ ਮੈਦਾਨ + industrial: ਉਦਯੋਗੀ ਖੇਤਰ + lake: + - ਝੀਲ + - ਕੁੰਡ + military: ਮਿਲਟਰੀ ਖੇਤਰ + motorway: ਮੋਟਰਵੇ + park: ਪਾਰਕ + pitch: ਖੇਡ ਦੀ ਪਿੱਚ + primary: ਮੁਢਲੀ ਸੜਕ + rail: ਰੇਲਵੇ + reserve: ਕੁਦਰਤੀ ਰਿਜ਼ਰਵ + resident: ਰਿਹਾਇਸ਼ੀ ਇਲਾਕਾ + retail: ਪਰਚੂਨ ਖੇਤਰ + runway: + - ਹਵਾਈ ਅੱਡੇ ਦਾ ਰਨਵੇ + - ਟੈਕਸੀਵੇ + school: + - ਸਕੂਲ + - ਯੂਨੀਵਰਸਿਟੀ + secondary: ਸਕੈਂਡਰੀ ਸੜਕ + station: ਰੇਲਵੇ ਸਟੇਸ਼ਨ + subway: ਸਬਵੇ + summit: + - ਸਿਖਰ + - ਚੋਟੀ + tourist: ਸੈਲਾਨੀ ਟਿਕਾਣਾ + track: ਟਰੈਕ + tram: + - ਹਲਕੀ ਰੇਲ + - ਟਰਾਮ + trunk: ਟਰੰਕ ਸੜਕ + wood: ਜੰਗਲ + markdown_help: + heading: ਸਿਰਨਾਵਾਂ + headings: ਸਿਰਨਾਵੇਂ + image: ਤਸਵੀਰ + link: ਕੜੀ + subheading: ਉਪਸਿਰਨਾਵਾਂ + text: ਲਿਖਤ + richtext_area: + edit: ਸੋਧੋ + preview: ਝਲਕ + search: + search: ਖੋਜੋ + submit_text: ਜਾਓ + where_am_i: ਮੈਂ ਕਿੱਥੇ ਹਾਂ? + sidebar: + close: ਬੰਦ ਕਰੋ + search_results: ਖੋਜ ਨਤੀਜੇ + time: + formats: + friendly: "%e %B %Y at %H:%M" + trace: + edit: + description: "ਵੇਰਵਾ:" + download: ਡਾਊਨਲੋਡ + edit: ਸੋਧ + filename: "ਫ਼ਾਈਲ ਦਾ ਨਾਂ:" + map: ਨਕਸ਼ਾ + owner: "ਮਾਲਕ:" + points: "ਬਿੰਦੂ:" + save_button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ + tags: "ਟੈਗ:" + uploaded_at: "ਅੱਪਲੋਡ ਹੋਇਆ:" + visibility_help: ਇਹਦਾ ਕੀ ਮਤਲਬ ਹੈ? + trace_form: + description: "ਵੇਰਵਾ:" + help: ਮਦਦ + tags: "ਟੈਗ:" + upload_button: ਅੱਪਲੋਡ ਕਰੋ + trace_optionals: + tags: ਟੈਗ + view: + description: "ਵੇਰਵਾ:" + download: ਡਾਊਨਲੋਡ + edit: ਸੋਧੋ + filename: "ਫ਼ਾਈਲ ਦਾ ਨਾਂ:" + map: ਨਕਸ਼ਾ + owner: "ਮਾਲਕ:" + points: ਬਿੰਦੂ + tags: ਟੈਗ + uploaded: "ਅੱਪਲੋਡ ਹੋਇਆ:" + user: + account: + contributor terms: + link text: ਇਹ ਕੀ ਹੈ? + current email address: "ਮੌਜੂਦਾ ਈਮੇਲ ਪਤਾ:" + delete image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਹਟਾਓ + gravatar: + gravatar: ਗਰੈਵੇਟਾਰ ਵਰਤੋ + link text: ਇਹ ਕੀ ਹੈ? + home location: "ਘਰ ਦੀ ਸਥਿਤੀ:" + image: "ਤਸਵੀਰ:" + keep image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਰੱਖੋ + latitude: "ਅਕਸ਼ਾਂਸ਼:" + longitude: "ਰੇਖਾਂਸ਼:" + my settings: ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ + new email address: "ਨਵਾਂ ਈ-ਮੇਲ ਪਤਾ:" + new image: ਇੱਕ ਤਸਵੀਰ ਜੋੜੋ + no home location: ਤੁਸੀਂ ਘਰ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਦੱਸੀ ਹੈ। + openid: + link text: ਇਹ ਕੀ ਹੈ? + preferred editor: "ਪਸੰਦੀਦਾ ਸੰਪਾਦਕ:" + preferred languages: "ਪਸੰਦੀਦਾ ਭਾਸ਼ਾਵਾਂ:" + profile description: "ਪ੍ਰੋਫ਼ਾਈਲ ਵੇਰਵਾ:" + public editing: + disabled link text: ਮੈਂ ਸੋਧ ਕਿਉਂ ਨਹੀਂ ਕਰ ਸਕਦਾ? + enabled link text: ਇਹ ਕੀ ਹੈ? + replace image: ਮੌਜੂਦਾ ਤਸਵੀਰ ਬਦਲੋ + return to profile: ਪ੍ਰੋਫ਼ਾਈਲ 'ਤੇ ਮੁੜੋ + save changes button: ਤਬਦੀਲੀਆਂ ਸਾਂਭੋ + title: ਖਾਤਾ ਸੋਧੋ + confirm: + button: ਤਸਦੀਕ ਕਰੋ + heading: ਵਰਤੋਂਕਾਰ ਖਾਤਾ ਤਸਦੀਕ ਕਰੋ + confirm_email: + button: ਤਸਦੀਕ ਕਰੋ + list: + confirm: ਚੁਣੇ ਹੋਏ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਤਸਦੀਕ ਕਰੋ + empty: ਕੋਈ ਮੇਲ ਖਾਂਦੇ ਵਰਤੋਂਕਾਰ ਨਹੀਂ ਲੱਭੇ + heading: ਵਰਤੋਂਕਾਰ + hide: ਚੁਣੇ ਹੋਏ ਵਰਤੋਂਕਾਰ ਲੁਕਾਓ + title: ਵਰਤੋਂਕਾਰ + login: + create account minute: ਖਾਤਾ ਬਣਾਓ। ਸਿਰ਼ਫ ਇੱਕ ਮਿੰਟ ਲੱਗਦਾ ਹੈ। + email or username: "ਈਮੇਲ ਪਤਾ ਜਾਂ ਵਰਤੋਂਕਾਰ-ਨਾਂ:" + heading: ਦਾਖ਼ਲਾ + login_button: ਦਾਖ਼ਲ ਹੋਵੋ + lost password link: ਆਪਣਾ ਪਾਸਵਰਡ ਗੁਆ ਦਿੱਤਾ? + new to osm: OpenStreetMap 'ਤੇ ਨਵੇਂ ਹੋ? + no account: ਖਾਤਾ ਨਹੀਂ ਹੈ? + password: "ਪਾਸਵਰਡ:" + register now: ਹੁਣੇ ਰਜਿਸਟਰ ਕਰੋ + remember: ਮੈਨੂੰ ਯਾਦ ਰੱਖੋ + title: ਦਾਖ਼ਲਾ + logout: + heading: OpenStreetMap ਤੋਂ ਬਾਹਰ ਜਾਓ + logout_button: ਲਾਗ ਆਊਟ + title: ਲਾਗ ਆਊਟ + lost_password: + email address: "ਈਮੇਲ ਪਤਾ:" + heading: ਪਾਸਵਰਡ ਭੁੱਲ ਗਿਆ? + new password button: ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ + title: ਪਾਸਵਰਡ ਗੁੰਮ ਗਿਆ + make_friend: + button: ਦੋਸਤ ਵਜੋਂ ਜੋੜੋ + new: + confirm email address: "ਈ-ਮੇਲ ਪਤਾ ਤਸਦੀਕ ਕਰੋ:" + confirm password: "ਪਾਸਵਰਡ ਤਸਦੀਕ ਕਰੋ:" + continue: ਜਾਰੀ ਰੱਖੋ + display name: "ਵਖਾਵੇ ਦਾ ਨਾਂ:" + email address: "ਈਮੇਲ ਪਤਾ:" + password: "ਪਾਸਵਰਡ:" + title: ਖਾਤਾ ਬਣਾਓ + no_such_user: + title: ਕੋਈ ਅਜਿਹਾ ਵਰਤੋਂਕਾਰ ਨਹੀਂ + popup: + friend: ਦੋਸਤ + your location: ਤੁਹਾਡੀ ਸਥਿਤੀ + reset_password: + confirm password: "ਪਾਸਵਰਡ ਤਸਦੀਕ ਕਰੋ:" + flash changed: ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਦਲ ਗਿਆ ਹੈ। + password: "ਪਾਸਵਰਡ:" + reset: ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ + title: ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ + suspended: + heading: ਖਾਤਾ ਮੁਅੱਤਲ ਕੀਤਾ ਗਿਆ + title: ਖਾਤਾ ਮੁਅੱਤਲ ਕੀਤਾ ਗਿਆ + webmaster: ਵੈੱਬਮਾਸਟਰ + terms: + agree: ਮਨਜ਼ੂਰ ਹੈ + decline: ਮਨਜ਼ੂਰ ਨਹੀਂ + legale_names: + france: ਫ਼ਰਾਂਸ + italy: ਇਟਲੀ + rest_of_world: ਬਾਕੀ ਦੁਨੀਆਂ + legale_select: "ਆਪਣੀ ਰਿਹਾਇਸ਼ ਦਾ ਦੇਸ਼ ਚੁਣੋ:" + view: + activate_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਚਾਲੂ ਕਰੋ + add as friend: ਦੋਸਤ ਬਣਾਓ + blocks by me: ਮੇਰੇ ਵੱਲੋਂ ਰੋਕਾਂ + blocks on me: ਮੇਰੇ ਉੱਤੇ ਰੋਕਾਂ + comments: ਟਿੱਪਣੀਆਂ + confirm: ਤਸਦੀਕ ਕਰੋ + confirm_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਤਸਦੀਕ ਕਰੋ + create_block: ਇਸ ਵਰਤੋਂਕਾਰ 'ਤੇ ਰੋਕ ਲਾਓ + deactivate_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਬੰਦ ਕਰੋ + delete_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਓ + description: ਵੇਰਵਾ + diary: ਡਾਇਰੀ + edits: ਸੋਧਾਂ + email address: "ਈਮੇਲ ਪਤਾ:" + hide_user: ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਲੁਕਾਓ + km away: "%{count}ਕਿ.ਮੀ. ਪਰ੍ਹਾਂ" + m away: "%{count}ਮੀਟਰ ਪਰ੍ਹਾਂ" + my comments: ਮੇਰੀਆਂ ਟਿੱਪਣੀਆਂ + nearby users: ਨੇੜੇ-ਤੇੜੇ ਦੇ ਹੋਰ ਵਰਤੋਂਕਾਰ + no friends: ਤੁਸੀਂ ਅਜੇ ਕੋਈ ਮਿੱਤਰ ਨਹੀਂ ਜੋੜਿਆ। + remove as friend: ਦੋਸਤੀ ਹਟਾਓ + role: + administrator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਪ੍ਰਸ਼ਾਸਕ ਹੈ। + grant: + administrator: ਪ੍ਰਸ਼ਾਸਕੀ ਹੱਕ ਦਿਓ + moderator: ਵਿਚੋਲਗੀ ਦੇ ਹੱਕ ਦਿਓ + moderator: ਇਹ ਵਰਤੋਂਕਾਰ ਇੱਕ ਵਿਚੋਲਾ ਹੈ। + send message: ਸੁਨੇਹਾ ਭੇਜੋ + settings_link_text: ਸੈਟਿੰਗਾਂ + status: "ਦਰਜਾ:" + user location: ਵਰਤੋਂਕਾਰ ਦੀ ਸਥਿਤੀ + your friends: ਤੁਹਾਡੇ ਦੋਸਤ + user_block: + partial: + confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ? + edit: ਸੋਧੋ + next: ਅਗਲਾ » + previous: « ਪਿਛਲਾ + show: ਵਿਖਾਓ + status: ਦਰਜਾ + show: + confirm: ਕੀ ਤੁਹਾਨੂੰ ਯਕੀਨ ਹੈ? + edit: ਸੋਧੋ + show: ਵਿਖਾਓ + status: ਦਰਜਾ + user_role: + grant: + confirm: ਤਸਦੀਕ ਕਰੋ + revoke: + confirm: ਤਸਦੀਕ ਕਰੋ diff --git a/config/locales/pl.yml b/config/locales/pl.yml index b223c8ea20c..e502e0385f0 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -4,14 +4,39 @@ # Author: Ajank # Author: BdgwksxD # Author: BeginaFelicysym +# Author: Chrumps +# Author: Cysioland +# Author: Debeet # Author: Deejay1 +# Author: Ireun +# Author: Kaligula +# Author: Kocio +# Author: Nemo bis +# Author: Odie2 +# Author: Przemub # Author: RafalR +# Author: Rezonansowy +# Author: RicoElectrico # Author: Soeb # Author: Sp5uhe +# Author: Ty221 # Author: Woytecr # Author: Wpedzich # Author: Yarl +# Author: Zbigniew.czernik pl: + about_page: + community_driven_html: "Społeczność OpenStreetMap - urozmaicona, z pasją i rosnąca każdego dnia. Wśród naszych użytkowników są entuzjaści map, specjaliści GIS, inżynierowie wspomagający pracę serwerów OSM, specjaliści, którzy z humanistycznych powodów, pomagają w stworzeniu mapy obszarów dotkniętych skutkami klęski żywiołowej, i wielu innych.\n Aby dowiedzieć się więcej na temat wspólnoty, odwiedź blogi użytkowników, blogi społeczności, stronę fundacji OSM oraz stronę OSM Polska." + community_driven_title: Kontrolowany przez społeczność + copyright_html: ©Członkowie
    OpenStreetMap + lede_text: OpenStreetMap jest tworzony przez społeczność dodającą dane o drogach, ścieżkach, kawiarniach, dworcach i wielu innych, na całym świecie. + local_knowledge_html: OpenStreetMap wyróżnia wiedzę lokalną. Członkowie używają zdjęć satelitarnych, lotniczych, nawigacji GPS, i zwykłych map abyzweryfikować czy dane w OSM są dokładne i aktualne. + local_knowledge_title: Wiedza lokalna + next: Dalej + open_data_html: "OpenStreetMap to otwarte dane: możesz używać ich jak tylko chcesz pod warunkiem, że dodasz, że pochodzą one z OpenStreetMap i jego członków. Jeśli zmienisz lub stworzysz coś na podstawie tych danych możesz je dystrybuować, ale tylko na tej samej licencji. Zobacz Prawa autorskie i licencja by zobaczyć szczegóły." + open_data_title: Otwarte dane + partners_title: Partnerzy + used_by: "%{name} dostarcza dane mapowe dla setek stron internetowych, aplikacji oraz urządzeń" activerecord: attributes: diary_comment: @@ -20,7 +45,7 @@ pl: language: Język latitude: Szerokość geograficzna longitude: Długość geograficzna - title: Tytuł + title: Temat user: Użytkownik friend: friend: Znajomy @@ -29,7 +54,7 @@ pl: body: Treść recipient: Odbiorca sender: Nadawca - title: Tytuł + title: Temat trace: description: Opis latitude: Szerokość geograficzna @@ -47,7 +72,7 @@ pl: languages: Języki pass_crypt: Hasło models: - acl: Lista ACL + acl: Lista kontroli dostępu changeset: Zestaw zmian changeset_tag: Znacznik zestawu zmian country: Państwo @@ -77,212 +102,117 @@ pl: user: Użytkownik user_preference: Preferencje użytkownika user_token: Token użytkownika - way: Droga + way: Linia way_node: Węzeł drogi - way_tag: Tag drogi + way_tag: Znacznik drogi application: require_cookies: cookies_needed: Wydaje się, że masz wyłączoną obsługę ciasteczek (cookies) w swojej przeglądarce internetowej – włącz ją, zanim przejdziesz dalej. + require_moderator: + not_a_moderator: Musisz być moderatorem, aby wykonać tą akcję. setup_user_auth: blocked: Twój dostęp do API jest zablokowany. Zaloguj się do interfejsu sieciowego, aby dowiedzieć się więcej. - need_to_see_terms: Dostęp do API został czasowo zawieszony. Proszę się zalogować do interfejsu sieci, aby wyświetlić postanowienia. Nie musisz ich akceptować, ale chociaż przejrzeć. + need_to_see_terms: Twój dostęp do API został czasowo zawieszony. Zaloguj się przez stronę WWW, aby zapoznać się z Warunkami uczestnictwa. Nie masz obowiązku ich akceptować, ale musisz się z nimi zapoznać. browse: + anonymous: Anonimowy użytkownik changeset: - changeset: "Zestaw zmian: %{id}" + belongs_to: Autor changesetxml: XML w formacie zestawu zmian - download: Ściągnij %{changeset_xml_link} lub %{osmchange_xml_link} feed: title: Zestaw zmian %{id} - title_comment: Zestaw zmian %{id} – %{comment} + title_comment: Zestaw zmian %{id} - %{comment} + node: Węzły (%{count}) + node_paginated: Węzły (%{x}-%{y} z %{count}) osmchangexml: XML w formacie osmChange - title: Zestaw zmian - changeset_details: - belongs_to: "Należy do:" - bounding_box: "Obszar edycji:" - box: prostokąt - closed_at: "Zamknięto:" - created_at: "Utworzono:" - has_nodes: - few: "Zawiera następujące %{count} węzły:" - one: "Zawiera następujący %{count} węzeł:" - other: "Zawiera następujących %{count} węzłów:" - has_relations: - few: "Zawiera następujące %{count} relacje:" - one: "Zawiera następującą %{count} relację:" - other: "Zawiera następujących %{count} relacji:" - has_ways: - few: "Zawiera następujące %{count} drogi:" - one: "Zawiera następującą %{count} drogę:" - other: "Zawiera następujących %{count} dróg:" - no_bounding_box: Ten zestaw zmian został zapisany bez obszaru edycji. - show_area_box: Pokaż obszar prostokątu - common_details: - changeset_comment: "Komentarz:" - deleted_at: "Usunięte dnia:" - deleted_by: "Usunięte przez:" - edited_at: "Edytowano:" - edited_by: "Edytował(a):" - in_changeset: "W zestawie zmian:" - version: "Wersja:" + relation: Relacje (%{count}) + title: "Zestaw zmian: %{id}" + way: Drogi (%{count}) + closed: Zamknięte + closed_by_html: Zamknięte %{time} temu przez %{user} + closed_html: Zamknięte %{time} temu containing_relation: entry: Relacja %{relation_name} entry_role: Relacja %{relation_name} (jako %{relation_role}) - map: - deleted: Skasowano - edit: - area: Edytuj obszar - node: Edytuj węzeł - relation: Edytuj relację - way: Edytuj drogę - larger: - area: Zobacz obszar na większej mapie - node: Zobacz punkt na większej mapie - relation: Zobacz relację na większej mapie - way: Pokaż drogę na większej mapie - loading: Wczytywanie… - navigation: - all: - next_changeset_tooltip: Następny zestaw zmian - next_node_tooltip: Następny węzeł - next_relation_tooltip: Poprzednia relacja - next_way_tooltip: Następna droga - prev_changeset_tooltip: Poprzedni zestaw zmian - prev_node_tooltip: Poprzedni węzeł - prev_relation_tooltip: Poprzednia relacja - prev_way_tooltip: Poprzednia droga - user: - name_changeset_tooltip: Zobacz edycje wykonane przez użytkownika %{user} - next_changeset_tooltip: Następna edycja wykonana przez użytkownika %{user} - prev_changeset_tooltip: Poprzednia edycja wykonana przez użytkownika %{user} + created: Utworzenie + created_by_html: Utworzone %{time} temu przez %{user} + created_html: Utworzone %{time} temu + deleted_by_html: Usunięte %{time} temu przez %{user} + download_xml: Pobierz XML + edited_by_html: Edytowane %{time} temu przez %{user} + in_changeset: Zestaw zmian + location: "Lokalizacja:" + no_comment: (bez komentarza) node: - download: "%{download_xml_link} lub %{view_history_link}" - download_xml: Ściągnij XML - edit: edytuj - node: Węzeł - node_title: "Węzeł: %{node_name}" - view_history: zobacz historię zmian - node_details: - coordinates: "Współrzędne:" - part_of: "Jest częścią:" - node_history: - download: "%{download_xml_link} lub %{view_details_link}" - download_xml: Ściągnij XML - node_history: Historia zmian węzła - node_history_title: "Historia punktu: %{node_name}" - view_details: zobacz szczegóły + history_title: "Historia węzła: %{name}" + title: "Węzeł: %{name}" not_found: - sorry: Niestety %{type} o id %{id} nie został znaleziony. + sorry: "Przepraszamy, %{type} #%{id} nie został znaleziony." type: changeset: zestaw zmian node: węzeł relation: relacja - way: droga - paging_nav: - of: z - showing_page: Widoczna jest strona + way: linia + note: + closed_by: "Zamknięta przez: %{user} %{when} temu" + closed_by_anonymous: Rozwiązana anonimowo %{when} temu + closed_title: "Rozwiązana uwaga #%{note_name}" + commented_by_anonymous: Skomentowana anonimowo %{when} temu + hidden_title: "Ukryta uwaga #%{note_name}" + new_note: Nowa uwaga + open_by: "Utworzona przez: %{user} %{when} temu" + open_by_anonymous: Utworzona anonimowo %{when} temu + open_title: "Nierozwiązana uwaga #%{note_name}" + reopened_by_anonymous: Reaktywowana anonimowo %{when} temu + title: "Uwaga: %{id}" + part_of: Wchodzi w skład redacted: + message_html: Ten %{type} w wersji %{version} nie może być pokazany, ponieważ został poddany poprawce. Zapoznaj się z %{redaction_link}, aby uzyskać więcej informacji. + redaction: Poprawka %{id} type: node: węzeł relation: relacja - way: droga + way: linia relation: - download: "%{download_xml_link} lub %{view_history_link}" - download_xml: Ściągnij XML - relation: Relacja - relation_title: "Relacja: %{relation_name}" - view_history: zobacz historię zmian - relation_details: - members: "Zawiera:" - part_of: "Jest częścią:" - relation_history: - download: "%{download_xml_link} lub %{view_details_link}" - download_xml: Ściągnij XML - relation_history: Historia zmian relacji - relation_history_title: "Historia relacji: %{relation_name}" - view_details: zobacz szczegóły + history_title: "Historia relacji: %{name}" + members: Członkowie + title: "Relacja: %{name}" relation_member: entry_role: "%{type} %{name} jako %{role}" type: node: Węzeł relation: Relacja - way: Droga - start: - manually_select: Manualnie wybierz inny obszar - view_data: Zobacz dane w aktualnym widoku mapy + way: Linia start_rjs: - data_frame_title: Dane - data_layer_name: Przeglądaj dane mapy - details: Szczegóły - drag_a_box: Zaznacz myszą prostokąt na mapie, aby wybrać obszar - edited_by_user_at_timestamp: Edytowany przez [[user]] ostatni raz [[timestamp]] - hide_areas: Ukryj obszary - history_for_feature: Historia zmian dla [[feature]] - load_data: Załaduj dane - loaded_an_area_with_num_features: Załadowano obszar zawierający [[num_features]] obiektów. Niektóre przeglądarki internetowe mogą nie radzić sobie z wyświetleniem tej ilości danych. Na ogół przeglądarki działają najlepiej przy wyświetlaniu mniej niż 100 obiektów jednocześnie, w przeciwnym przypadku przeglądarka może działać powoli lub przestać odpowiadać. Jeśli jesteś pewien, że chcesz wyświetlić dane, kliknij przycisk poniżej. - loading: Wczytywanie - manually_select: Ręcznie zaznacz inny obszar - object_list: - api: Pobierz ten obszar z API - back: Wyświetlanie listy obiektów - details: Szczegóły - heading: Lista obiektów - history: - type: - node: Węzeł [[id]] - way: Droga [[id]] - selected: - type: - node: Węzeł [[id]] - way: Droga [[id]] - type: - node: Węzeł - way: Droga - private_user: prywatny użytkownika - show_areas: Pokaż obszary - show_history: Pokaż zmiany - unable_to_load_size: "Nie można załadować: prostokąt ograniczający [[bbox_size]] jest zbyt duży (nie może przekraczać %{max_bbox_size} stopnia)" - wait: Moment… - zoom_or_select: Przybliż albo wybierz inny obszar mapy + feature_warning: Ładowanie %{num_features} rzeczy, może spowolnić lub zawiesić twoją przeglądarkę. Jesteś pewien, że chcesz wyświetlić te dane? + load_data: Wczytaj dane + loading: Wczytywanie... tag_details: - tags: "Znaczniki:" + tags: Tagi wiki_link: - key: Strona wiki dla etykiety %{key} - tag: Strona wiki dla etykiety %{key}=%{value} + key: "Opis na wiki dla znacznika: %{key}" + tag: Strona wiki dla znacznika %{key}=%{value} wikipedia_link: Artykuł %{page} w Wikipedii timeout: sorry: Niestety, pobranie danych dla %{type} o identyfikatorze %{id} trwało zbyt długo. type: - changeset: Zestaw zmian + changeset: zestaw zmian node: węzeł relation: relacja - way: droga + way: linia + version: Wersja + view_details: Wyświetl szczegóły + view_history: Wyświetl historię way: - download: "%{download_xml_link} lub %{view_history_link}" - download_xml: Ściągnij XML - edit: edytuj - view_history: pokaż historię - way: Droga - way_title: "Droga: %{way_name}" - way_details: also_part_of: - one: należy również do drogi %{related_ways} - other: należy również do dróg %{related_ways} - nodes: "Węzły:" - part_of: "Jest częścią:" - way_history: - download: "%{download_xml_link} lub %{view_details_link}" - download_xml: Ściągnij XML - view_details: zobacz szczegóły - way_history: Historia zmian drogi - way_history_title: "Historia drogi: %{way_name}" + one: część linii %{related_ways} + other: część linii %{related_ways} + history_title: "Historia drogi: %{name}" + nodes: Węzły + title: "Linia: %{name}" changeset: changeset: anonymous: Anonim - big_area: (duży) - no_comment: (brak) no_edits: (brak edycji) - show_area_box: pokaż prostokąt zawierający - still_editing: (nadal edytowany) view_changeset_details: Zobacz szczegóły zestawu zmian changeset_paging_nav: next: Następna » @@ -295,30 +225,26 @@ pl: saved_at: Zapisano user: Użytkownik list: - description: Ostatnie zmiany - description_bbox: Zestawy zmian na obszarze %{bbox} - description_friend: Zestawy zmian twoich znajomych - description_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu - description_user: Zestawy zmian utworzone przez użytkownika %{user} - description_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox} - heading: Zestawy zmian - heading_bbox: Zestawy zmian - heading_friend: Zestawy zmian - heading_nearby: Zestawy zmian - heading_user: Zestawy zmian - heading_user_bbox: Zestawy zmian + empty: Brak znalezionych zestawów zmian. + empty_area: Brak zestawów zmian w tym obszarze. + empty_user: Brak zestawów zmian tego użytkownika. + load_more: Załaduj więcej + no_more: Nie znaleziono więcej zestawów zmian. + no_more_area: Brak zestawów zmian w tym obszarze. + no_more_user: Brak zestawów zmian tego użytkownika. title: Zestawy zmian - title_bbox: Zestawy zmian w %{bbox} title_friend: Zestawy zmian twoich znajomych - title_nearby: Zestawy zmian użytkowników znajdujących się w pobliżu - title_user: Zestawy zmian utworzone przez użytkownika %{user} - title_user_bbox: Zestawy zmian utworzone przez użytkownika %{user} w %{bbox} + title_nearby: Zestawy zmian pobliskich użytkowników + title_user: Zestawy zmian użytkownika %{user} timeout: sorry: Niestety, pobieranie listy zestawów zmian, którą chciałeś zobaczyć, trwało zbyt długo. diary_entry: comments: ago: "%{ago} temu" comment: Komentarz + has_commented_on: "%{display_name} skomentował następujące wpisy dziennika" + newer_comments: Nowsze komentarze + older_comments: Starsze komentarze post: Wpis when: Kiedy diary_comment: @@ -327,8 +253,10 @@ pl: hide_link: Ukryj ten komentarz diary_entry: comment_count: + few: "%{count} komentarze" one: 1 komentarz other: "%{count} komentarzy" + zero: Brak komentarzy comment_link: Skomentuj ten wpis confirm: Potwierdź edit_link: Edytuj ten wpis @@ -363,11 +291,11 @@ pl: newer_entries: Nowsze wpisy no_entries: Brak wpisów dziennika older_entries: Starsze wpisy - recent_entries: "Ostatnie wpisy do dziennika:" + recent_entries: Ostatnie wpisy do dziennika title: Dzienniki użytkowników title_friends: Dzienniki znajomych - title_nearby: Dzienniki najbliższych użytkowników - user_title: Dziennik dla %{user} + title_nearby: Dzienniki pobliskich użytkowników + user_title: Dziennik użytkownika %{user} location: edit: Edytuj location: "Położenie:" @@ -384,25 +312,28 @@ pl: login_to_leave_a_comment: "%{login_link}, aby dodać komentarz" save_button: Zapisz title: Dziennik użytkownika %{user} | %{title} - user_title: Dziennik dla %{user} + user_title: Dziennik użytkownika %{user} editor: default: Domyślnie (obecnie %{name}) + id: + description: iD (w przeglądarce) + name: iD potlatch: - description: Potlatch 1 (edycja w przeglądarce) + description: Potlatch 1 (w przeglądarce) name: Potlatch 1 potlatch2: - description: Potlatch 2 (edycja w przeglądarce) + description: Potlatch 2 (w przeglądarce) name: Potlatch 2 remote: - description: JOSM albo Merkaartor - name: Remote Control + description: JOSM lub Markaartor + name: Zdalne sterowanie export: start: add_marker: Dodaj pinezkę na mapie area_to_export: Obszar do eksportu embeddable_html: Kod HTML do osadzenia export_button: Eksportuj - export_details: "Dane OpenStreetMap udostępnione są na licencji Creative Commons: uznanie autorstwa, na tych samych warunkach 2.0." + export_details: Dane OpenStreetMap udostępnione są na licencji Open Data Commons Open Database License (ODbL). format: Format format_to_export: Format eksportu image_size: Rozmiar obrazka @@ -415,32 +346,35 @@ pl: options: Opcje osm_xml_data: Dane XML OpenStreetMap output: Wynik - paste_html: Użyj podanego kodu HTML, aby umieścić na stronie + paste_html: Wklej podany kod HTML do swojej strony scale: Skala too_large: - body: Ten obszar jest zbyt duży, aby go wyeksportować jako dane XML OpenStreetMap. Przybliż się lub wybierz mniejszy obszar. - heading: Obszar zbyt duży + body: "Ten obszar jest zbyt duży, aby go wyeksportować jako dane XML OpenStreetMap. Przybliż się, wybierz mniejszy obszar, lub użyj jednego ze następujących źródeł aby objąć pobierane dane:" + geofabrik: + description: Regularnie aktualizowane migawki kontynentów, państw i wybranych miast + title: Pliki Geofabrik + metro: + description: Migawki dużych miast i otaczających je obszarów + title: Metro Extracts + other: + description: Dodatkowe źródła wymienione w OpenStreetMap wiki + title: Inne źródła + overpass: + title: Overpass API + planet: + description: Regularnie aktualizowane kopie całej bazy danych OpenStreetMap + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Dodaj pinezkę na mapie - change_marker: Zmień pozycję pinezki - click_add_marker: Kliknij na mapie aby dodać pinezkę - drag_a_box: Przeciągnięciem zaznacz prostokąt na mapie - export: Eksport - manually_select: Ręcznie zaznacz inny obszar - view_larger_map: Większy widok mapy + title: Eksportuj geocoder: description: title: geonames: Położenie według Geonames - osm_namefinder: "%{types} według OpenStreetMap Namefinder" osm_nominatim: Położenie według OpenStreetMap Nominatim types: cities: Miasta places: Miejsca towns: Miasta - description_osm_namefinder: - prefix: "%{distance} %{direction} względem obiektu %{type}" direction: east: na wschód north: na północ @@ -461,26 +395,48 @@ pl: title: ca_postcode: Wyniki z Geocoder.CA geonames: Wyniki z GeoNames + geonames_reverse: Wyniki z GeoNames latlon: Wyniki z Internal - osm_namefinder: Wyniki z OpenStreetMap Namefinder osm_nominatim: Wyniki z OpenStreetMap Nominatim + osm_nominatim_reverse: Wyniki z OpenStreetMap Nominatim uk_postcode: Wyniki z NPEMap / FreeThe Postcode us_postcode: Wyniki z Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} względem %{parentname})" - suffix_place: ", %{distance} %{direction} względem %{placename}" search_osm_nominatim: + admin_levels: + level10: Granica przedmieścia + level2: Granica kraju + level4: Granica stanu + level5: Granica regionu + level6: Granica hrabstwa + level8: Granica miasta + level9: Granica wsi prefix: + aerialway: + chair_lift: Wyciąg krzesełkowy + drag_lift: Wyciąg orczykowy + station: Stacja wyciągu krzesełkowego + aeroway: + aerodrome: Lotnisko + apron: Płyta postojowa + gate: Bramka + helipad: Helipad + runway: Pas startowy + taxiway: Droga kołowania + terminal: Terminal amenity: + WLAN: Dostęp do WiFi airport: Lonisko arts_centre: Centrum sztuki + artwork: Sztuka atm: Bankomat auditorium: Audytorium bank: Bank bar: Bar + bbq: Miejsce do grillowania bench: Ławka bicycle_parking: Parking rowerowy bicycle_rental: Wypożyczalnia rowerów + biergarten: Ogródek piwny brothel: Dom publiczny bureau_de_change: Kantor bus_station: Stacja autobusowa @@ -489,6 +445,7 @@ pl: car_sharing: Dzielenie się samochodami car_wash: Myjnia samochodowa casino: Kasyno + charging_station: Stacja paliw cinema: Kino clinic: Przychodnia club: Klub @@ -507,6 +464,7 @@ pl: ferry_terminal: Terminal promowy fire_hydrant: Hydrant fire_station: Remiza strażacka + food_court: Targ z żywnością fountain: Fontanna fuel: Stacja benzynowa grave_yard: Mniejszy cmentarz @@ -547,9 +505,13 @@ pl: shelter: Schron shop: Sklep shopping: Zakupy + shower: Prysznic + social_centre: Centrum społeczne social_club: Klub towarzyski + social_facility: Placówka społeczna studio: Studio supermarket: Supermarket + swimming_pool: Basen taxi: Postój taksówek telephone: Budka telefoniczna theatre: Teatr @@ -564,8 +526,20 @@ pl: youth_centre: Centrum młodzieżowe boundary: administrative: Granica administracyjna + census: Granica spisu + national_park: Park Narodowy + protected_area: Obszar chroniony + bridge: + aqueduct: Akwedukt + suspension: Most wiszący + swing: Most obrotowy + viaduct: Wiadukt + "yes": Most building: "yes": Budynek + emergency: + fire_hydrant: Hydrant + phone: Telefon alarmowy highway: bridleway: Droga dla koni bus_guideway: Droga dla autobusów @@ -577,6 +551,7 @@ pl: footway: Chodnik ford: Bród living_street: Strefa zamieszkania + milestone: Punkt kontrolny minor: Drobna droga motorway: Autostrada motorway_junction: Skrzyżowanie autostrad @@ -584,24 +559,29 @@ pl: path: Ścieżka pedestrian: Droga dla pieszych platform: Podwyższenie - primary: Droga krajowa - primary_link: Droga krajowa – dojazd + primary: Droga pierwszorzędna (krajowa) + primary_link: Droga pierwszorzędna – dojazd + proposed: Droga planowana raceway: Tor wyścigowy residential: Droga osiedlowa + rest_area: Miejsce obsługi podróżnych road: Droga - secondary: Droga wojewódzka - secondary_link: Droga wojewódzka – dojazd + secondary: Droga drugorzędna + secondary_link: Droga drugorzędna – dojazd service: Droga serwisowa services: Usługi autostrady + speed_camera: Radar steps: Schody stile: Przełaz - tertiary: Droga powiatowa + street_lamp: Lampa uliczna + tertiary: Droga trzeciorzędna + tertiary_link: Droga trzeciorzędna track: Droga gruntowa trail: Szlak trunk: Droga ekspresowa trunk_link: Droga ekspresowa – dojazd - unclassified: Droga gminna - unsurfaced: Nierówna droga + unclassified: Droga czwartorzędna + unsurfaced: Droga nieutwardzona historic: archaeological_site: Wykopaliska archeologiczne battlefield: Miejsce historycznej bitwy @@ -609,6 +589,8 @@ pl: building: Budynek castle: Zamek church: Kościół + citywalls: Mury miejskie + fort: Fort house: Dom icon: Ikona manor: Dwór @@ -617,6 +599,7 @@ pl: monument: Pomnik museum: Muzeum ruins: Ruiny + tomb: Grób tower: Wieża wayside_cross: Przydrożny krzyż wayside_shrine: Przydrożna kaplica @@ -633,6 +616,7 @@ pl: farmland: Grunty rolne farmyard: Podwórze gospodarskie forest: Las + garages: Garaże grass: Trawa greenfield: Tereny niezagospodarowane industrial: Teren przemysłowy @@ -641,22 +625,27 @@ pl: military: Teren wojskowy mine: Kopalnia nature_reserve: Rezerwat przyrody + orchard: Sad park: Park piste: Trasa quarry: Kamieniołom railway: Teren kolejowy recreation_ground: Ziemia rekreacyjna reservoir: Sztuczny zbiornik wodny - residential: Zabudowa mieszkaniowa + reservoir_watershed: Zbiornik wodny + residential: Zabudowa mieszkalna retail: Handel detaliczny - village_green: Park miejski + road: Obszar drogowy + village_green: Nawsie vineyard: Winnica wetland: Tereny podmokłe wood: Puszcza leisure: beach_resort: Strzeżona plaża + bird_hide: Ukryj ptaki common: Błonie fishing: Łowisko + fitness_station: Fitness garden: Ogród golf_course: Pole golfowe ice_rink: Lodowisko @@ -667,12 +656,19 @@ pl: pitch: Boisko sportowe playground: Plac zabaw recreation_ground: Pole rekreacyjne + sauna: Sauna slipway: Pochylnia sports_centre: Centrum sportowe stadium: Stadion swimming_pool: Basen track: Bieżnia water_park: Park wodny + military: + airfield: Lotnisko wojskowe + barracks: Koszary + bunker: Bunkier + mountain_pass: + "yes": Przełęcz natural: bay: Zatoka beach: Plaża @@ -681,9 +677,11 @@ pl: channel: Kanał cliff: Urwisko crater: Krater + dune: Wydma feature: Obiekt fell: Hale górskie fjord: Fiord + forest: Las geyser: Gejzer glacier: Lodowiec heath: Wrzosowisko @@ -703,6 +701,7 @@ pl: scrub: Zagajnik shoal: Mielizna spring: Źródło + stone: Kamieniołom strait: Cieśnina tree: Drzewo valley: Dolina @@ -711,6 +710,19 @@ pl: wetland: Obszar podmokły wetlands: Obszary podmokłe wood: Puszcza + office: + accountant: Księgowy + architect: Architekt + company: Przedsiębiorstwo + employment_agency: Urząd pracy + estate_agent: Biuro nieruchomości + government: Biura rządowe + insurance: Biuro ubezpieczeń + lawyer: Prawnik + ngo: Biuro organizacji pozarządowych + telecommunication: Urząd telekomunikacji + travel_agent: Biuro podróży + "yes": Biuro place: airport: Lotnisko city: Miasto @@ -722,9 +734,11 @@ pl: houses: Zabudowanie island: Wyspa islet: Wysepka + isolated_dwelling: Oddzielny dom-gospodarstwo locality: Rejon moor: Torfowisko municipality: Gmina + neighbourhood: Sąsiedztwo postcode: Kod pocztowy region: Rejon sea: Morze @@ -745,12 +759,15 @@ pl: junction: Węzeł kolejowy level_crossing: Przejazd kolejowy light_rail: Lekka kolej + miniature: Mini kolej monorail: Kolej jednoszynowa narrow_gauge: Kolej wąskotorowa platform: Peron preserved: Kolej zabytkowa + proposed: Planowana trasa kolejowa spur: Bocznica kolejowa station: Stacja kolejowa + stop: Przystanek kolejowy subway: Stacja metra subway_entrance: Wejście na stację metra switch: Zwrotnica @@ -759,12 +776,14 @@ pl: yard: Stacja postojowa, lokomotywownia shop: alcohol: Sklep monopolowy + antiques: Antyki art: Sklep z dziełami sztuki bakery: Piekarnia beauty: Salon kosmetyczny beverages: Sklep z napojami bicycle: Sklep rowerowy books: Księgarnia + boutique: Butik butcher: Rzeźnik car: Sklep samochodowy car_parts: Sklep z częściami samochodowymi @@ -778,6 +797,7 @@ pl: convenience: Mały sklep wielobranżowy copyshop: Ksero cosmetics: Sklep kosmetyczny + deli: Delikatesy department_store: Dom towarowy discount: Sklep z produktami po obniżce doityourself: Sklep budowlany @@ -814,17 +834,21 @@ pl: organic: Sklep z produktami organicznymi outdoor: Sklep turystyczny pet: Sklep ze zwierzętami + pharmacy: Apteka photo: Sklep fotograficzny salon: Salon + second_hand: Lumpeks shoes: Sklep obuwniczy shopping_centre: Centrum handlowe sports: Sklep sportowy stationery: Sklep papierniczy supermarket: Supermarket + tailor: Krawiec toys: Sklep z zabawkami travel_agency: Biuro podróży video: Sklep filmowy wine: Winiarnia + "yes": Sklep tourism: alpine_hut: Chata alpejska artwork: Sztuka @@ -846,7 +870,11 @@ pl: valley: Dolina viewpoint: Punkt widokowy zoo: Zoo + tunnel: + culvert: Rura kanalizacyjna + "yes": Tunel waterway: + artificial: Sztuczne zbiorniki wodne boatyard: Stocznia canal: Kanał connector: Złącze dróg wodnych @@ -867,82 +895,165 @@ pl: water_point: Punkt wodny waterfall: Wodospad weir: Jaz + help_page: + help: + title: Strona Pomocy OpenStreetMap + url: https://help.openstreetmap.org/ + title: Uzyskiwanie pomocy + welcome: + description: Zacznij od tego krótkiego przewodnika, obejmującego podstawy OpenStreetMap. + title: Witamy w OSM + url: /welcome + wiki: + description: Zapoznaj się z wiki, aby uzyskać szczegółową dokumentację OSM. + title: Wiki OpenStreetMap + url: http://wiki.openstreetmap.org/wiki/Pl:Main_Page javascripts: + close: Zamknij + edit_help: Przesuń mapę i powiększ miejsce, które chcesz edytować, a następnie kliknij tutaj. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda jest dostępna tylko dla warstwy podstawowej map: base: - cycle_map: Mapa Rowerowa - standard: Standard + cycle_map: Mapa rowerowa + hot: Pomoc humanitarna + standard: Podstawowa transport_map: Transport publiczny + copyright: © autorzy OpenStreetMap + donate_link_text: + layers: + data: Dane mapy + header: Warstwy mapy + notes: Uwagi + overlays: Włącz nakładki do rozwiązywania problemów na mapie + title: Warstwy + locate: + popup: Jesteś w promieniu {distance} {unit} od tego punktu + title: Pokaż moje położenie + zoom: + in: Powiększ + out: Pomniejsz + notes: + new: + add: Dodaj uwagę + intro: W celu poprawy jakości mapy informacja, którą wprowadzisz będzie widoczna dla pozostałych maperów. Podaj więc jak najwięcej szczegółów oraz umieść znacznik w możliwie najdokładniejszej pozycji. + show: + anonymous_warning: Uwaga zawiera komentarze anonimowych użytkowników, które powinny być niezależnie zweryfikowane. + comment: Dodaj komentarz + comment_and_resolve: Skomentuj i rozwiąż + hide: Ukryj + reactivate: Ponownie aktywuj + resolve: Rozwiąż + share: + cancel: Anuluj + center_marker: Wyśrodkuj mapę na znaczniku + custom_dimensions: Ustaw własne wymiary + download: Pobierz + embed: HTML + format: "Format:" + image: Obraz + image_size: Obraz będzie pokazywał standardową warstwę w rozdzielczości + include_marker: Dołącz pinezkę + link: Link lub HTML + long_link: Link + paste_html: Wklej podany kod HTML do swojej strony + scale: "Skala:" + short_link: Krótki link + short_url: Krótki URL + title: Udostępnij + view_larger_map: Większy widok mapy site: + createnote_disabled_tooltip: Przybliż mapę, by dodać uwagę + createnote_tooltip: Zgłoś błąd lub dodaj uwagę na mapie edit_disabled_tooltip: Powiększ, aby edytować mapę edit_tooltip: Edytuje mapę - edit_zoom_alert: Musisz przybliżyć się, by edytować mapę - history_disabled_tooltip: Powiększ, aby zobaczyć zmiany w tym obszarze - history_tooltip: Wyświetla przeprowadzone edycje dla tego obszaru - history_zoom_alert: Musisz przybliżyć się, by odczytać historię edycji + map_data_zoom_in_tooltip: Powiększ, aby zobaczyć dane mapy + map_notes_zoom_in_tooltip: Powiększ, aby zobaczyć uwagi layouts: + about: Informacje + community: Społeczność community_blogs: Blogi wspólnoty community_blogs_title: Blogi członków społeczności OpenStreetMap - copyright: Prawa autorskie i licencja - documentation: Dokumentacja - documentation_title: Dokumentacja projektu + copyright: Prawa autorskie + data: Dane donate: Wspomóż projekt OpenStreetMap %{link} na fundusz rozbudowy sprzętu komputerowego. - donate_link_text: dokonując darowizny edit: Edycja edit_with: Edytuj w %{editor} export: Eksport - export_tooltip: Eksport danych mapy + export_data: Eksportuj dane foundation: Fundacja foundation_title: Fundacja OpenStreetMap gps_traces: Ślady GPS gps_traces_tooltip: Zarządzanie śladami GPS help: Pomoc - help_centre: Centrum pomocy - help_title: Witryna pomocy dla projektu history: Zmiany - home: główna - home_tooltip: Przejdź do strony głównej - inbox: poczta (%{count}) - inbox_tooltip: - one: Twoja skrzynka zawiera jedną nową wiadomość - other: Twoja skrzynka zawiera %{count} nowych wiadomości - zero: Brak nowych wiadomości - intro_1: OpenStreetMap to mapa całego świata, którą możesz swobodnie edytować. Tworzą ją ludzie tacy jak Ty. - license: - title: Dane OpenStreetMap są licencjonowane przez Creative Commons Attribution-Share Alike 2.0 Generic License - log_in: zaloguj się + home: Przejdź do lokalizacji domu + intro_2_create_account: Utwórz konto + intro_header: Witamy w OpenStreetMap! + intro_text: OpenStreetMap to mapa świata, stworzona przez ludzi, takich jak ty, i z możliwością użycia pod otwartą licencją. + learn_more: Dowiedz się więcej + log_in: Zaloguj się log_in_tooltip: Zaloguj się logo: alt_text: Logo OpenStreetMap - logout: wyloguj - logout_tooltip: Wyloguj + logout: Wyloguj się make_a_donation: text: Przekaż darowiznę title: Wspomóż OpenStreetMap za pomocą darowizny pieniężnej + more: Więcej osm_offline: Baza danych OpenStreetMap jest niedostępna na czas ważnych zadań administracyjnych, które są w tym momencie wykonywane. osm_read_only: Baza danych OpenStreetMap jest w trybie tylko-do-odczytu na czas ważnych zadań administracyjnych, które są w tym momencie wykonywane. - sign_up: zarejestruj + partners_bytemark: Hosting Bytemark + partners_html: Hosting obsługuje %{ucl}, %{ic}, %{bytemark}, a także inni %{partners}. + partners_ic: Imperial College London + partners_partners: partnerzy + partners_ucl: centrum UCL VR + sign_up: Zarejestruj się sign_up_tooltip: Załóż konto, aby edytować - sotm2011: Przybądź na konferencję OpenStreetMap, The State of the Map, 9-11 września w Denver! - tag_line: Swobodna Wiki-Mapa Świata + start_mapping: Rozpocznij tworzenie mapy + tag_line: Wolna wikimapa świata user_diaries: Dzienniczki user_diaries_tooltip: Przeglądaj dzienniczki użytkownika - view: Mapa - view_tooltip: Zobacz mapę - welcome_user: Witaj, %{user_link} - welcome_user_link_tooltip: Strona użytkownika - wiki: Wiki - wiki_title: Strona Wiki dla projektu license_page: foreign: english_link: oryginalna angielska wersja - text: W przypadku konfliktu pomiędzy tym tłumaczeniem a %{english_original_link}, preferowana jest strona w języku angielskim. + text: W przypadku konfliktu pomiędzy tym tłumaczeniem, a %{english_original_link}, preferowana jest strona w języku angielskim. title: Informacje o tłumaczeniu - legal_babble: "

    Prawa autorskie i licencja

    \n

    \nOpenStreetMap stanowi zbiór wolnych danych, udostępnianych na licencji Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \nMożesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze mapy i dane, pod warunkiem podania OpenStreetMap i jego użytkowników jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze mapy lub dane, wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji. Pełen tekst licencji dokładnie opisuje Twoje prawa i obowiązki.\n

    \n\n

    Jak podać źródło

    \n

    \nJeśli korzystasz z gotowej mapy OpenStreetMap, wymagane jest podanie źródła co najmniej w postaci „© użytkownicy OpenStreetMap, CC BY-SA”. Jeśli korzystasz tylko z danych geograficznych, wymagane jest podanie źródła w postaci „Dane mapy © użytkownicy OpenStreetMap, CC BY-SA”.\n

    \n

    \nO ile jest to możliwe, nazwa OpenStreetMap powinna być hiperłączem do http://www.openstreetmap.org/, zaś CC BY-SA do http://creativecommons.org/licenses/by-sa/2.0/. Jeśli korzystasz z nośnika, który uniemożliwia tworzenie hiperłącz (np. druk na papierze), zalecane jest kierowanie oglądających do stron internetowych www.openstreetmap.org (np. przez rozwinięcie nazwy OpenStreetMap do pełnego adresu internetowego) oraz www.creativecommons.org.\n

    \n\n

    Dowiedz się więcej

    \n

    \nWięcej informacji o możliwości wykorzystania danych OpenStreetMap można znaleźć w Legal FAQ.\n

    \n

    \nUżytkownicy OpenStreetMap powinni pamiętać, aby nigdy nie dodawać danych z jakichkolwiek źródeł chronionych prawami autorskimi (jak np. Google Maps i większość map drukowanych) bez wyraźnego pozwolenia właściciela praw autorskich.\n

    \n

    \nPomimo że OpenStreetMap stanowi zbiór wolnych danych, nie jesteśmy w stanie udostępnić bezpłatnego interfejsu programistycznego (API) dla programistów firm trzecich.\n\nZapoznaj się z naszymi Zasadami korzystania z API, Zasadami korzystania z kafelków mapy oraz Zasadami korzystania z Nominatima.\n

    \n\n

    Dane włączone do OpenStreetMap

    \n

    \nWykorzystywana przez nas licencja CC BY-SA wymaga, aby „oznaczyć twórcę w sposób właściwy dla wykorzystywanego nośnika lub środka przekazu”. Indywidualni użytkownicy OpenStreetMap nie wymagają oznaczenia w sposób bardziej szczegółowy niż „użytkownicy OpenStreetMap”. Jednak gdy do OpenStreetMap włączane są dane z narodowych instytucji kartograficznych lub z innych znaczących źródeł, może być właściwe, by oznaczyć twórcę bezpośrednio we włączanych danych bądź dodać link do niego też na tej stronie.\n

    \n\n
      \n
    • Australia: Zawiera dane o miejscowościach oparte na danych ''Australian Bureau of Statistics''.
    • \n
    • Austria: Zawiera dane miasta Wiednia (na licencji CC BY),\nLand Vorarlberg oraz\nLand Tyrol (na licencji CC-BY AT z późniejszymi zmianami).
    • \n\n
    • Francja: Zawiera dane uzyskane z ''Direction Générale des Impôts''.
    • \n
    • Holandia: Zawiera dane © AND, 2007\t\n(www.and.com)
    • \n
    • Kanada: Zawiera dane z GeoBase®, GeoGratis (© ''Department of Natural Resources Canada''), CanVec (© ''Department of Natural Resources Canada'') i StatCan (''Geography Division, Statistics Canada'').
    • \n
    • Nowa Zelandia: Zawiera dane uzyskane z ''Land Information New Zealand''. Crown Copyright reserved.
    • \n
    • Polska: Zawiera dane z mapy UMP-pcPL. Copyright współtwórców UMP-pcPL.\n Więcej o użyciu danych UMP przez OSM
    • \n
    • Południowa Afryka: Zawiera dane pochodzące od Chief Directorate:\n National Geo-Spatial Information, Państwowe prawa autorskie zastrzeżone.\n
    • \n
    • Wielka Brytania: Zawiera dane ''Ordnance Survey''. © Crown copyright and database right 2010.
    • \n
    \n\n

    \nWłączenie danych do OpenStreetMap nie musi oznaczać, że podmiot będący ich źródłem popiera OpenStreetMap, udziela jakiejkolwiek gwarancji lub ponosi jakąkolwiek odpowiedzialność.\n

    " + legal_babble: + attribution_example: + alt: Przykład, jak przypisywać OpenStreetMap na stronie internetowej + title: Przykład uznania autorstwa + contributors_at_html: "Austria: Zawiera dane miasta Wiednia (na licencji CC BY),\nLand Vorarlberg oraz\nLand Tyrol (na licencji CC-BY AT z późniejszymi zmianami)." + contributors_ca_html: "Kanada: Zawiera dane z GeoBase®, GeoGratis (© ''Department of Natural Resources Canada''), CanVec (© ''Department of Natural Resources Canada'') i StatCan (''Geography Division, Statistics Canada'')." + contributors_footer_1_html: "Szczegóły tych i innych źródeł, które zostały wykorzystane,\naby udoskonalić OpenStreetMap, są dostępne na stronie\nContributors (en)." + contributors_footer_2_html: Włączenie danych do OpenStreetMap nie musi oznaczać, że podmiot będący ich źródłem popiera OpenStreetMap, udziela jakiejkolwiek gwarancji lub ponosi jakąkolwiek odpowiedzialność. + contributors_fr_html: "Francja: Zawiera dane uzyskane z ''Direction Générale des Impôts''.
  • " + contributors_gb_html: "Wielka Brytania: Zawiera dane ''Ordnance Survey''. © Crown copyright and database right 2010-12." + contributors_intro_html: "Autorami są tysiące osób. Uwzględniamy również licencjonowane dane na otwartej zasadzie z krajowych agencji kartograficznych i innych źródeł, wśród nich:" + contributors_nl_html: "Holandia: Zawiera dane © AND, 2007\t\n(www.and.com)" + contributors_nz_html: "Nowa Zelandia: Zawiera dane uzyskane z ''Land Information New Zealand''. Crown Copyright reserved." + contributors_title_html: Dane włączone do OpenStreetMap + contributors_za_html: "Południowa Afryka: zawiera dane pochodzące\nz zarządu głównego:\nNational Geo-Spatial Information, prawa autorskie państwa zastrzeżone." + credit_1_html: Wymagamy podania źródła w postaci “© autorzy OpenStreetMap”. + credit_2_html: Musisz także jasno zaznaczyć, że dane dostępne są na licencji Open Database License, a w przypadku kafelków - CC-BY-SA. Możesz to zrobić przez podlinkowanie tej strony licencyjnej. W przypadku rozpowszechniania OSM w formie danych, możesz podać nazwy licencji i umieścić do nich bezpośredni link. Jeśli niemożliwe jest umieszczenie linków (np. mapy papierowe), sugerujemy pokierowanie czytelników na stronę openstreetmap.org (lub OpenStreetMap.org), opendatacommons.org i, jeśli odpowiednie, creativecommons.org. + credit_3_html: Przy przeglądaniu map elektronicznych, podziękowania powinny pojawić się w rogu mapy. + credit_title_html: Jak podać źródło + infringement_1_html: Użytkownicy OpenStreetMap powinni pamiętać, aby nigdy nie dodawać danych z jakichkolwiek źródeł chronionych prawami autorskimi (jak np. Google Maps i większość map drukowanych) bez wyraźnego pozwolenia właściciela praw autorskich. + infringement_2_html: Jeśli uważasz, że materiał chroniony prawem autorskim został niewłaściwie dodany do bazy OpenStreetMap, zajrzyj pod adres naszej procedury usuwania danych lub wypełnij formularz on-line. + infringement_title_html: Naruszenia praw autorskich + intro_1_html: "OpenStreetMap zawiera wolne dane, rozpowszechniane na licencji Open Data\nCommons Open Database License (ODbL)." + intro_2_html: Możesz swobodnie kopiować, rozpowszechniać, przekazywać innym i dostosowywać nasze dane, pod warunkiem podania OpenStreetMap i jego autorów jako źródło. Jeśli zmienisz, przekształcisz lub wykorzystasz nasze dane, wynik swojej pracy możesz rozpowszechniać tylko na podstawie tej samej licencji. Pełen tekst licencji dokładnie opisuje Twoje prawa i obowiązki. + intro_3_html: Mapy w postaci graficznej, a także dokumentacja rozpowszechniane na warunkach licencji Uznanie autorstwa na tych samych warunkach 2.0 (CC-BY-SA 2.0). + more_1_html: Więcej informacji o możliwości wykorzystania danych OpenStreetMap można znaleźć w Legal FAQ. + more_2_html: Chociaż dane OpenStreetMap są otwarte, nie jesteśmy w stanie zapewnić nieograniczonego dostępu do naszego API wszystkim chętnym. Zapoznaj się z naszą Polityką korzystania z API, Polityką korzystania z kafelków oraz Polityką korzystania z Nominatima. + more_title_html: Dowiedz się więcej + title_html: Prawa autorskie i licencja native: mapping_link: rozpocząć tworzenie mapy native_link: wersji po polsku - text: Przeglądasz wersję po angielsku strony dotyczącej praw autorskich. Możesz wrócić do %{native_link} tej strony lub przestać czytać o prawach autorskich i %{mapping_link}. + text: Przeglądasz angielską wersję strony dotyczącej praw autorskich. Możesz wrócić do %{native_link} tej strony lub przestać czytać o prawach autorskich i %{mapping_link}. title: O stronie message: delete: @@ -951,7 +1062,7 @@ pl: date: Nadano from: Od messages: Masz %{new_messages} i %{old_messages} - my_inbox: Moja skrzynka odbiorcza + my_inbox: skrzynka odbiorcza new_messages: few: "%{count} nowe wiadomości" many: "%{count} nowych wiadomości" @@ -991,6 +1102,9 @@ pl: outbox: date: Nadano inbox: odbiorcza + messages: + one: Masz %{count} wysłaną wiadomość + other: Masz %{count} wysłanych wiadomości my_inbox: Moja skrzynka %{inbox_link} no_sent_messages: Nie masz jeszcze wysłanych wiadomości. Może skontaktujesz się z %{people_mapping_nearby_link}? outbox: nadawcza @@ -999,12 +1113,9 @@ pl: title: Wiadomości wysłane to: Do read: - back_to_inbox: Powrót do wysłanych - back_to_outbox: Powrót do skrzynki nadawczej + back: Cofnij date: Nadano from: Od - reading_your_messages: Czytanie odebranej wiadomości - reading_your_sent_messages: Czytanie wysłanej wiadomości reply_button: Odpowiedz subject: Temat title: Czytanie wiadomości @@ -1015,6 +1126,37 @@ pl: wrong_user: Jesteś zalogowany jako „%{user}”, ale wiadomość, na którą chcesz odpowiedzieć, nie została wysłana do tego użytkownika. Zaloguj się jako właściwy użytkownik, aby na nią odpowiedzieć. sent_message_summary: delete_button: Usuń + note: + description: + closed_at_by_html: Rozwiązano %{when} temu przez %{user} + closed_at_html: Rozwiązano %{when} temu + commented_at_by_html: Zaktualizowano %{when} temu przez %{user} + commented_at_html: Zaktualizowano %{when} temu + opened_at_by_html: Stworzono %{when} temu przez %{user} + opened_at_html: Stworzono %{when} temu + reopened_at_by_html: Ponownie aktywowano %{when} temu przez %{user} + reopened_at_html: Ponownie aktywowano %{when} temu + entry: + comment: Komentarz + full: Pełna treść uwagi + mine: + ago_html: "%{when} temu" + created_at: Utworzono w dniu + creator: Autor + description: Opis + heading: Uwagi użytkownika %{user} + id: Identyfikator + last_changed: Ostatnio zmieniono + subheading: Uwagi utworzone lub skomentowane przez %{user} + title: Uwagi utworzone lub skomentowane przez %{user} + rss: + closed: "zamknięta uwaga (w lokalizacji: %{place})" + commented: nowy komentarz (w pobliżu %{place}) + description_area: Lista uwag stworzonych, skomentowanych lub zamkniętych w Twojej okolicy [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Kanał RSS dla uwagi %{id} + opened: "nowa uwaga (w lokalizacji: %{place})" + reopened: "ponownie aktywowana uwaga (w lokalizacji: %{place})" + title: Uwagi OpenStreetMap notifier: diary_comment_notification: footer: Możesz również przeczytać komentarz pod %{readurl}, skomentować go pod %{commenturl} lub odpowiedzieć pod %{replyurl} @@ -1030,8 +1172,7 @@ pl: email_confirm_plain: click_the_link: Jeśli to Ty, kliknij na poniższy link, aby potwierdzić zmianę. greeting: Cześć, - hopefully_you_1: Ktoś (prawdopodobnie Ty sam(a)) chciałby zmienić adres e-mail w serwisie - hopefully_you_2: "%{server_url} na %{new_address}." + hopefully_you: Ktoś (prawdopodobnie Ty) chce zmienić adres e-mail w %{server_url} na %{new_address}. friend_notification: befriend_them: Możesz również dodać go jako znajomego na %{befriendurl}. had_added_you: "%{user} dodał(a) Cię jako swojego znajomego na OpenStreetMap." @@ -1039,7 +1180,7 @@ pl: subject: "[OpenStreetMap] Użytkownik %{user} dodał Cię jako znajomego" gpx_notification: and_no_tags: i brak znaczników - and_the_tags: i następujące znaczniki + and_the_tags: i następujące tagi failure: failed_to_import: "nie udało się zaimportować. Komunikat błędu:" more_info_1: Więcej informacji na temat błędów przesyłania danych GPX i sposobach ich @@ -1047,7 +1188,7 @@ pl: subject: "[OpenStreetMap] Błąd importu pliku GPX" greeting: Witaj, success: - loaded_successfully: udało się załadować, wraz z %{trace_points} z %{possible_points} punktów łącznie. + loaded_successfully: udało się wczytać, wraz z %{trace_points} z %{possible_points} punktów łącznie. subject: "[OpenStreetMap] Sukces importu pliku GPX" with_description: z opisem your_gpx_file: Wygląda, ze Twój plik GPX @@ -1060,84 +1201,153 @@ pl: lost_password_plain: click_the_link: Jeśli to ty, kliknij na poniższy link, aby zresetować hasło. greeting: Cześć, - hopefully_you_1: Ktoś (prawdopodobnie Ty) poprosił o zresetowanie hasła dla tego - hopefully_you_2: adresy e-mail konto openstreetmap.org. + hopefully_you: Ktoś (prawdopodobnie Ty) poprosił o zresetowanie hasła do konta w serwisie openstreetmap.org dla tego adresu e-mail. message_notification: - footer1: Możesz też przeczytać tę wiadomość pod adresem %{readurl} - footer2: możesz odpowiedzieć pod adresem %{replyurl} + footer_html: Możesz również przeczytać wiadomość na %{readurl} i odpowiedzieć na nią na %{replyurl} header: "%{from_user} wysłał do Ciebie wiadomość z OpenStreetMap o temacie %{subject}:" hi: Witaj %{to_user}, + note_comment_notification: + anonymous: Anonimowy użytkownik + closed: + commented_note: "%{commenter} rozwiązał uwagę, którą skomentowałeś. Znajduje się ona w lokalizacji: %{place}." + subject_other: "[OpenStreetMap] %{commenter} rozwiązał interesującą Cię uwagę" + subject_own: "[OpenStreetMap] %{commenter} rozwiązał Twoją uwagę" + your_note: "%{commenter} rozwiązał jedną z Twoich uwag na mapie w lokalizacji: %{place}." + commented: + commented_note: "%{commenter} zostawił komentarz do uwagę, którą skomentowałeś. Znajduje się ona w lokalizacji: %{place}." + subject_other: "[OpenStreetMap] %{commenter} skomentował interesującą Cię uwagę" + subject_own: "[OpenStreetMap] %{commenter} skomentował Twoją uwagę" + your_note: "%{commenter} zostawił komentarz do jednej z Twoich uwag na mapie w lokalizacji: %{place}." + details: "Więcej informacji na temat uwagi można znaleźć pod adresem: %{url}." + greeting: Witaj, + reopened: + commented_note: "%{commenter} ponownie aktywował uwagę, którą skomentowałeś. Znajduje się ona w lokalizacji: %{place}." + subject_other: "[OpenStreetMap] %{commenter} ponownie aktywował interesującą Cię uwagę" + subject_own: "[OpenStreetMap] %{commenter} ponownie aktywował jedną z Twoich uwag" + your_note: "%{commenter} ponownie aktywował jedną z Twoich uwag na mapie w lokalizacji: %{place}" signup_confirm: - subject: "[OpenStreetMap] Prośba o potwierdzenie adresu e-mail" - signup_confirm_html: - ask_questions: Możesz zadać nurtujące Cię pytania dotyczące OpenStreetMap na naszej stronie pytań i odpowiedzi. - click_the_link: Jeśli to Ty, witamy! Kliknij poniższy link żeby potwierdzić Twoje nowe konto i dowiedzieć się więcej o OpenStreetMap. - current_user: Aktualne listy użytkowników według ich położenia na Ziemi znajdziesz na stronie Category:Users_by_geographical_region. - get_reading: Zacznij czytać o OpenStreetMap na naszej wiki i na blogu opengeodata który ma nawet podcasty do posłuchania! + confirm: "Musimy upewnić się, że wniosek pochodzi od ciebie, dlatego kliknij na łącze poniżej, aby potwierdzić założenie konta:" + created: Ktoś (mamy nadzieję, że ty) właśnie założył konto w %{site_url}. greeting: Cześć! - hopefully_you: Ktoś (prawdopodobnie Ty sam(a)) chciałby utworzyć konto na - introductory_video: To dobry moment żeby obejrzeć %{introductory_video_link}. - more_videos: Mamy %{more_videos_link}. - more_videos_here: więcej materiału wideo tutuaj - user_wiki_page: Najlepiej stwórz swoją stronę użytkownika na wiki zawierającą odpowiednie kategorie wskazujące twoją lokalizację, np. [[Category:Users_in_Warszawa]]. - video_to_openstreetmap: wideo-wprowadzenie do OpenStreetMap - wiki_signup: Załóż sobie konto na wiki projektu OpenStreetMap jeśli chcesz. - signup_confirm_plain: - ask_questions: "Możesz zadać nurtujące Cię pytania dotyczące OpenStreetMap na naszej stronie pytań i odpowiedzi:" - blog_and_twitter: "Bądź na bieżąco z wiadomościami poprzez blog OpenStreetMap czy Twitter:" - click_the_link_1: Jeśli to Ty, witamy! Kliknij poniższy link żeby potwierdzić - click_the_link_2: Twoje nowe konto i dowiedzieć się więcej o OpenStreetMap. - current_user_1: Aktualne listy użytkowników według ich położenia na Ziemi znajdziesz - current_user_2: "tu:" - greeting: Cześć! - hopefully_you: Ktoś (prawdopodobnie Ty sam(a)) chciałby utworzyć konto na - introductory_video: "To dobry moment żeby obejrzeć wideo-wprowadzenie do OpenStreetMap tutaj:" - more_videos: "Więcej materiału wideo znajdziesz na:" - opengeodata: "OpenGeoData.org to blog założyciela OpenStreetMap, Steve'a Coasta. Ma także podcasty:" - the_wiki: "Zacznij czytać o OpenStreetMap na naszej wiki:" - user_wiki_1: Najlepiej stwórz swoją stronę użytkownika na wiki zawierającą odpowiednie - user_wiki_2: kategorie wskazujące twoją lokalizację, np. [[Category:Users_in_Warszawa]]. - wiki_signup: "Załóż sobie konto na wiki projektu OpenStreetMap jeśli chcesz:" + subject: "[OpenStreetMap] Witamy w OpenStreetMap" + welcome: Po potwierdzeniu konta dostarczymy ci dodatkowych informacji o tym jak zacząć. oauth: oauthorize: allow_read_gpx: odczytywanie Twoich osobistych śladów GPS allow_read_prefs: odczytywanie preferencji konta allow_to: "Zezwól aplikacji klienckiej na:" allow_write_api: modyfikuj mapę - allow_write_diary: tworzenie wpisów w dzienniku, dopisywanie komentarzy i nawiązywanie kontaktów + allow_write_diary: tworzenie wpisów w dzienniku, dopisywanie komentarzy i nawiązywanie kontaktów. allow_write_gpx: prześlij ślady GPS + allow_write_notes: modyfikowanie uwag. allow_write_prefs: modyfikowanie preferencji Twojego konta request_access: Aplikacja %{app_name} żąda dostępu do Twojego konta użytkownika - %{user}. Sprawdź, czy chcesz pozwolić aplikacji na poniższe działania. Możesz wybrać dowolną liczbę opcji. + title: Autoryzuj dostęp do Twojego konta + oauthorize_failure: + denied: Zakazano aplikacji %{app_name} dostępu do twojego konta. + invalid: Nieprawidłowy token do autoryzacji. + title: Żądanie autoryzacji nie powiodło się + oauthorize_success: + allowed: Dałeś aplikacji %{app_name} dostęp do twojego konta. + title: Żądanie autoryzacji dozwolone + verification: Kod weryfikacyjny to %{code}. revoke: flash: Cofnąłeś prawa dostępu dla aplikacji %{application} oauth_clients: create: flash: Pomyślnie zarejestrowano informacje + destroy: + flash: Usunięto rejestrację aplikacji edit: submit: Edytuj title: Edycja aplikacji form: + allow_read_gpx: odczytywanie ich prywatnych śladów GPS. + allow_read_prefs: odczytywanie ich ustawień. + allow_write_api: modyfikacja mapy. + allow_write_diary: tworzenie wpisów w dzienniku, dopisywanie komentarzy i nawiązywanie kontaktów. + allow_write_gpx: przesyłanie śladów GPS. + allow_write_notes: modyfikowanie uwag. + allow_write_prefs: modyfikacja ich ustawień. + callback_url: Adres URL odwołania zwrotnego name: Nazwa + requests: "Żądaj następujących uprawnień od użytkowników:" required: Wymagane + support_url: Adres URL pomocy technicznej + url: Główny adres URL aplikacji index: application: Nazwa aplikacji + issued_at: Wydane + list_tokens: "Następujące tokeny zostały wydane do aplikacji w twoim imieniu:" my_apps: Programy klienckie my_tokens: Zarejestrowane programy no_apps: Czy chcesz zarejestrować programy korzystające ze standardu %{oauth}? Programy muszą być wcześniej zarejestrowane, nim będzie można skorzystać z zapytań OAuth do tego serwisu. + register_new: Zarejestruj swoją aplikację + registered_apps: "Masz zarejestrowane następujące aplikacje klienckie:" revoke: Odwołaj! title: Szczegóły autoryzacji OAuth new: submit: Zarejestruj title: Rejestracja nowej aplikacji + not_found: + sorry: Niestety, nie odnaleziono %{type}. show: + access_url: "URL znaki dostępu:" + allow_read_gpx: odczytywanie ich śladów GPS. + allow_read_prefs: odczytywanie ich ustawień. + allow_write_api: modyfikacja mapy. + allow_write_diary: tworzenie wpisów w dzienniku, dopisywanie komentarzy i nawiązywanie kontaktów. + allow_write_gpx: przesyłanie śladów GPS. + allow_write_notes: modyfikowanie uwag. + allow_write_prefs: modyfikacja ich ustawień. + authorize_url: "URL upoważnienia:" + confirm: Jesteś pewien? + delete: Usuń klienta edit: Edytuj szczegóły key: "Klucz odbiorcy:" + requests: "Zapytanie następujących uprawnień ze strony użytkownika:" secret: "Sekret odbiorcy:" + support_notice: Wspieramy HMAC-SHA1 (zalecane) i sygnatury RSA-SHA1. title: Szczegóły OAuth dla %{app_name} + url: "URL znacznika zapytania:" + update: + flash: Informacje o kliencie zostały pomyślnie zaktualizowane + redaction: + create: + flash: Utworzono poprawkę. + destroy: + error: Wystąpił błąd podczas usuwania tej poprawki. + flash: Poprawka usunięta. + not_empty: Ta poprawka jest niepusta, tzn. ukrywa pewne wersje pewnych obiektów. Należy zrezygnować z ich ukrywania przed jej usunięciem. + edit: + description: Opis + heading: Edytuj poprawkę + submit: Zapisz poprawkę + title: Edytuj poprawkę + index: + empty: Brak poprawek do pokazania. + heading: Lista poprawek + title: Lista poprawek + new: + description: Opis + heading: Wprowadź informację dla nowej poprawki + submit: Utwórz poprawkę + title: Tworzenie nowej poprawki + show: + confirm: Na pewno? + description: "Opis:" + destroy: Usuń tą poprawkę + edit: Edytuj tę poprawkę + heading: Poprawka "%{title}" + title: Wyświetlenie poprawki + user: "Autor:" + update: + flash: Zapisano zmiany. site: edit: anon_edits_link_text: Tu dowiesz się dlaczego. flash_player_required: Aby korzystać z Potlacza, 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. + id_not_configured: iD nie został skonfigurowany no_iframe_support: Przeglądarka, której używasz nie obsługuje HTML iframes, które są niezbędne dla tej funkcji. not_public: Nie wybrałeś(aś) by twoje edycje były publiczne. not_public_description: W tym trybie nie można już zmieniać mapy. Możesz ustawić je na publiczne na Twojej %{user_page}. @@ -1146,18 +1356,15 @@ pl: 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.) user_page_link: stronie użytkownika index: + createnote: Dodaj uwagę 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. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Dostęp na zasadach licencji %{license_name}, prawa autorskie %{project_name} i jego uczestników. - project_name: projektu OpenStreetMap + copyright: Prawa autorskie należą do OpenStreetMap i jego autorów na warunkach otwartej licencji permalink: Permalink remote_failed: Edycja nie powiodła się – sprawdź, czy JOSM lub Merkaartor jest uruchomiony i funkcja Remote Control jest włączona shortlink: Shortlink key: - map_key: Legenda - map_key_tooltip: Legenda mapy table: entry: admin: Granica administracyjna @@ -1219,14 +1426,30 @@ pl: tram: - Lekka kolej - tramwaj - trunk: Droga główna + trunk: Droga ekspresowa tunnel: Kreskowany obrys – tunel unclassified: Drogi niesklasyfikowane unsurfaced: Droga nieutwardzona wood: Puszcza + markdown_help: + alt: Tekst alternatywny + first: Pierwszy element + heading: Nagłówek + headings: Nagłówki + image: Obraz + link: Łącze + ordered: Uporządkowana lista + second: Drugi element + subheading: Podtytuł + text: Tekst + title_html: Składnia Markdown + unordered: Lista nieuporządkowana + url: Adres (URL) + richtext_area: + edit: Edytuj + preview: Podgląd search: search: Szukaj - search_help: "przykłady: 'Wąchock', 'Franciszkańska, Poznań', 'CB2 5AQ', lub 'post offices near Mokotów' więcej przykładów..." submit_text: → where_am_i: Gdzie jestem? where_am_i_title: Określ obecną lokalizację przy użyciu wyszukiwarki @@ -1238,10 +1461,15 @@ pl: friendly: "%e %B %Y o %H:%M" trace: create: - trace_uploaded: Twój plik GPX został załadowany i czeka na dodanie do bazy danych. Powinno to nastąpić w ciągu najbliższej pół godziny i dostaniesz wtedy maila z informacją o tym. + trace_uploaded: Twój plik GPX został wczytany i czeka na dodanie do bazy danych. Powinno to nastąpić w ciągu 30 minut. Wtedy też dostaniesz wiadomość z informacją o tym fakcie. upload_trace: Wgraj ślad GPS delete: scheduled_for_deletion: Ślad oczekuje na skasowanie + description: + description_with_count: + one: Plik GPX z %{count} punktem od %{user} + other: Plik GPX z %{count} punktami od %{user} + description_without_count: Plik GPX od %{user} edit: description: "Opis:" download: pobierz @@ -1253,13 +1481,17 @@ pl: points: "Punkty:" save_button: Zapisz zmiany start_coord: "Współrzędne początkowe:" - tags: "Znaczniki:" + tags: "Tagi:" tags_help: rozdzielone przecinkami title: Edycja śladu %{name} - uploaded_at: "Załadowano:" + uploaded_at: "Wysłano:" visibility: "Widoczność:" visibility_help: co to znaczy? + georss: + title: Ślady GPS OpenStreetMap list: + description: Przeglądaj najnowsze dodane ścieżki GPS + empty_html: Nic tu jeszcze nie ma. Prześlij nowy ślad lub dowiedz się więcej o śledzeniu GPS na stronie wiki. public_traces: Publiczne ślady GPS public_traces_from: Publiczne ślady GPS użytkownika %{user} tagged_with: " otagowane %{tags}" @@ -1290,7 +1522,7 @@ pl: trace_form: description: Opis help: Pomoc - tags: Znaczniki + tags: "Tagi:" tags_help: rozdzielone przecinkami upload_button: Wgrywaj upload_gpx: Prześlij plik GPX @@ -1299,14 +1531,18 @@ pl: trace_header: see_all_traces: Zobacz wszystkie ślady see_your_traces: Zobacz wszystkie Twoje ślady - traces_waiting: Masz w tym momencie %{count} śladów nadal oczekujących na dodanie. Prosimy poczekaj aż wgrywanie ich zostanie zakończone przed dodaniem kolejnych aby nie blokować kolejki innym użytkownikom. + traces_waiting: + few: Masz %{count} ślady oczekujące na dodanie. Poczekaj aż wgrywanie ich zostanie zakończone przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom. + many: Masz %{count} oczekujących na dodanie śladów. Poczekaj aż wgrywanie ich zostanie zakończone przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom. + one: Masz %{count} ślad oczekujący na dodanie. Poczekaj aż wgrywanie go zostanie zakończone przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom. + other: Masz %{count} oczekujących na dodanie śladów. Poczekaj aż wgrywanie ich zostanie zakończone przed dodaniem kolejnych, aby nie blokować kolejki innym użytkownikom. upload_trace: Wyślij ślad trace_optionals: - tags: Znaczniki + tags: Tagi trace_paging_nav: - next: Następny » - previous: « Poprzedni - showing_page: Wyświetlanie strony %{page} + newer: Nowsze ślady + older: Starsze ślady + showing_page: Strona %{page} view: delete_track: Wykasuj ten ślad description: "Opis:" @@ -1321,7 +1557,7 @@ pl: pending: OCZEKUJE points: "Punktów:" start_coordinates: "Współrzędne początkowe:" - tags: "Znaczniki:" + tags: "Tagi:" title: Przeglądanie śladu %{name} trace_not_found: Ślad nie znaleziony! uploaded: "Dodano:" @@ -1334,16 +1570,20 @@ pl: user: account: contributor terms: - agreed: Zgodziłeś się na nowe warunki uczestnictwa. + agreed: Zgodziłeś się na nowe Warunki uczestnictwa. agreed_with_pd: Zadeklarowałeś, że twoje edycje publikujesz w domenie publicznej. heading: "Warunki uczestnictwa:" link text: co to jest? not yet agreed: Nie zgodziłeś się na nowe warunki uczestnictwa. + review link text: Na tej stronie możesz zapoznać się z nowymi Warunkami uczestnictwa i je zaakceptować. current email address: "Aktualny adres e-mail:" delete image: Usuń obecną grafikę email never displayed publicly: (nie jest wyświetlany publicznie) flash update success: Zaktualizowano profil użytkownika. flash update success confirm needed: Zaktualizowano profil użytkownika. Sprawdź czy przyszedł już mail potwierdzający nowy adres mailowy. + gravatar: + gravatar: Użyj Gravatara + link text: co to jest? home location: "Lokalizacja domowa:" image: "Grafika:" image size hint: (najlepiej sprawdzają się kwadratowe obrazy o rozmiarach przynajmniej 100x100) @@ -1351,7 +1591,7 @@ pl: latitude: "Szerokość:" longitude: "Długość geograficzna:" make edits public button: Niech wszystkie edycje będą publiczne. - my settings: Moje ustawienia + my settings: moje ustawienia new email address: "Nowy adres e-mail:" new image: Dodaj grafikę no home location: Nie wpisałeś swojej lokalizacji domowej. @@ -1360,7 +1600,7 @@ pl: link text: co to jest? openid: "OpenID:" preferred editor: "Preferowany edytor:" - preferred languages: "Preferowane Języki:" + preferred languages: "Preferowane języki:" profile description: "Opis profilu:" public editing: disabled: Wyłączone i nieuprawniony do edycji danych, wszystkie wcześniejsze edycje są anonimowe. @@ -1373,18 +1613,19 @@ pl: heading: Publiczna edycja text: Obecnie twoje edycje są anonimowe i ludzie nie mogą wysyłać do ciebie wiadomości lub zobaczyć twojej lokalizacji. Aby pokazać, co edytowałeś i umożliwić ludziom kontakt z Tobą za pośrednictwem strony internetowej, kliknij przycisk poniżej. W międzyczasie API 0.6 zmienił się, jedynie publiczni użytkownicy mogą edytować dane mapy. . (dowiedz się dlaczego).
    • Twój adres e-mail nie zostanie ujawniony przez stawanie się publicznym. Tej akcji nie można cofnąć i wszyscy nowi użytkownicy są już domyślnie publiczni.
    replace image: Zmień obecną grafikę - return to profile: Powrót do profilu. + return to profile: Powrót do profilu save changes button: Zapisz zmiany title: Zmiana ustawień konta update home location on click: Aktualizować lokalizację, kiedy klikam na mapie? confirm: already active: To konto zostało potwierdzone. - before you start: Wiemy, że prawdopodobnie spieszy Ci się, aby rozpocząć mapowanie, ale zanim to zrobisz, możesz chcieć podać kilka informacji o sobie poniżej. button: Potwierdzam - heading: Potwierdzenie nowego użytkownika + heading: Sprawdź swoją skrzynkę e-mail! + introduction_1: Wysłaliśmy ci e-mail z potwierdzeniem. + introduction_2: Potwierdź swoje konto klikając na link w wiadomości i zacznij mapować. press confirm button: Użyj poniższego przycisku aby aktywować Twoje konto. - success: Twoje konto zostało zatwierdzone, cieszymy się że do nas dołączyłeś! - unknown token: Wygląda na to, że ten żeton nie istnieje. + reconfirm_html: Możesz ponownie przesłać wiadomość z potwierdzeniem klikając tutaj. + unknown token: Ten kod potwierdzający wygasł lub nie istnieje. confirm_email: button: Potwierdzam failure: Adres email o tym kodzie był już potwierdzony. @@ -1393,6 +1634,7 @@ pl: success: Twój nowy adres został zatwierdzony, cieszymy się że do nas dołączyłeś! confirm_resend: failure: Brak użytkownika %{name}. + success: Wysłaliśmy nową wiadomość z potwierdzeniem na %{email} i jak tylko aktywujesz swoje konto, będziesz mógł zacząć edytować mapę.

    Jeśli używasz systemu antyspamowego, upewnij się, że do swojej białej listy dodałeś adres webmaster@openstreetmap.org. Dzięki temu będziemy mogli skontaktować się z tobą bez problemów. filter: not_an_administrator: Musisz mieć uprawnienia administratora do wykonania tego działania. go_public: @@ -1402,13 +1644,16 @@ pl: empty: Nie znaleziono pasujących użytkowników heading: Użytkownicy hide: Ukryj zaznaczonych użytkowników + showing: + one: Strona %{page} (%{first_item} z %{items}) + other: Strona %{page} (%{first_item}-%{last_item} z %{items}) summary: "%{name} utworzony z adresu %{ip_address} dnia %{date}" summary_no_ip: "%{name} utworzony %{date}" title: Użytkownicy login: account is suspended: Twoje konto zostało zawieszone ze względu na podejrzaną aktywność.
    Skontaktuj się z webmasterem, jeśli chcesz przedyskutować blokadę. account not active: Niestety Twoje konto nie jest jeszcze aktywne.
    Otwórz link zawarty w mailu potwierdzenia założenia konta, aby je aktywować lub poproś o ponowne przesłanie maila. - auth failure: Niestety podane dane nie pozwoliły na zalogowanie Cię. + auth failure: Niestety, podane dane nie pozwoliły na zalogowanie. create account minute: Utwórz konto. To zajmuje tylko minutę. email or username: "Adres email lub nazwa użytkownika:" heading: Logowanie @@ -1416,7 +1661,6 @@ pl: lost password link: Zapomniałeś hasła? new to osm: Nowy na OpenStreetMap? no account: Nie masz konta? - notice: Dowiedz się więcej o nadchodzącej zmianie licencji OpenStreetMap (tłumaczenia) (dyskusja) openid: "%{logo} OpenID:" openid invalid: Niestety Twój OpenID wydaje się być nieprawidłowy openid missing provider: Niestety kontakt z dostawcą OpenID jest niemożliwy @@ -1461,27 +1705,31 @@ pl: title: zgubione hasło make_friend: already_a_friend: "%{name} już jest Twoim gronie znajomych." + button: Dodaj do listy przyjaciół failed: Niestety dodanie %{name} jako znajomego nie powiodło się. - success: "%{name} jest teraz Twoim znajomym." + heading: Dodać %{user} do listy przyjaciół? + success: "%{name} jest teraz twoim znajomym!" new: + about: + header: Darmowa i edytowalna + html:

    W przeciwieństwie do innych map, OpenStreetMap jest całkowicie tworzone przez ludzi takich jak ty. Wszyscy mogą tu wprowadzać poprawki i aktualizacje oraz pobierać i używać map za darmo.

    confirm email address: "Potwierdzenie adresu e-mail:" confirm password: "Potwierdzenie hasła:" contact_webmaster: Skontaktuj się proszę się z webmasterem, aby utworzyć konto. Postaramy się zająć się Twoją prośbą tak szybko, jak to będzie możliwe. - continue: Kontynuuj + continue: Zarejestruj się display name: "Przyjazna nazwa:" display name description: Twoja publiczna nazwa użytkownika. Można ją później zmienić w ustawieniach. email address: "Adres e-mail:" - fill_form: Po wypełnieniu formularza otrzymasz e-mail z instrukcjami dotyczącymi aktywacji konta. - flash create success message: Rejestracja udana. Sprawdź czy na adres %{email} przyszedł mail potwierdzający, a już za moment będziesz edytować mapę.

    Jeśli korzystasz z rozwiązania antyspamowego, które prosi nowych nadawców o potwierdzenie, będziesz musiał dodać adres webmaster@openstreetmap.org do znanych adresów, bo nie jesteśmy w stanie odpowiadać na zapytania takich systemów. - heading: Zakładanie konta - license_agreement: Zakładając konto użytkownika wyrażasz zgodę na warunki współtworzenia. + license_agreement: Zakładając konto użytkownika wyrażasz zgodę na Warunki uczestnictwa. no_auto_account_create: Niestety nie możemy aktualnie stworzyć Ci konta automatycznie. - not displayed publicly: Informacje nie wyświetlane publicznie (zobacz polityka prywatności) + not displayed publicly: Informacje nie wyświetlane publicznie (zobacz politykę prywatności) openid: "%{logo} OpenID:" openid association: "

    Twoje konto OpenID nie jest jeszcze skojarzone z kontem OpenStreetMap.

    \n
      \n
    • Jeśli jesteś nowym użytkownikiem OpenStreetMap, utwórz nowe konto, korzystając z poniższego formularza.
    • \n
    • Jeśli masz już konto, możesz zalogować się na nie przy użyciu nazwy użytkownika i hasła, a następnie skojarzyć je z kontem OpenID w ustawieniach użytkownika.\n
    • \n
    " openid no password: Jeśli korzystasz z OpenID hasło nie jest wymagane, jednak niektóre dodatkowe narzędzia lub serwer mogą go potrzebować. password: Hasło - title: Nowe konto + terms accepted: Dziękujemy za przyjęcie nowych Warunków uczestnictwa! + terms declined: Jest nam przykro, że zdecydowałeś się nie przyjmować nowych Warunków uczestnictwa. Więcej informacji możesz znaleźć na tej stronie. + title: Zarejestruj się use openid: Ewentualnie użyj %{logo} OpenID do zalogowania no_such_user: body: Niestety nie znaleziono użytkownika o nazwie %{user}, sprawdź pisownię. Być może skorzystano z nieprawidłowego odnośnika. @@ -1492,6 +1740,8 @@ pl: nearby mapper: Mapowicz z okolicy your location: Twoje położenie remove_friend: + button: Usuń z przyjaciół + heading: Usunąć %{user} z przyjaciół? not_a_friend: "%{name} nie był Twoim znajomym." success: "%{name} został wyłączony z grona Twoich znajomych." reset_password: @@ -1514,28 +1764,29 @@ pl: consider_pd: Oprócz powyższych warunków, stwierdzam również, że mój wkład jest w domenie publicznej consider_pd_why: co to oznacza? decline: Nie akceptuję - heading: Warunki współtworzenia + guidance: "Informacje, które pomogą zrozumieć te warunki: w formie czytelnego podsumowania oraz nieoficjalne tłumaczenia" + heading: Warunki uczestnictwa legale_names: france: Francja italy: Włochy rest_of_world: Reszta świata legale_select: "Proszę wybrać kraj zamieszkania:" - read and accept: Prosimy przeczytać umowę zamieszczoną poniżej i nacisnąć "Akceptuję". Klikając ten przycisk akceptujesz warunki umowy. - title: Warunki współtworzenia - you need to accept or decline: Prosimy przeczytać i następnie zaakceptować lub odrzucić nowe warunki współtworzenia, aby kontynuować. + read and accept: Prosimy przeczytać umowę zamieszczoną poniżej i nacisnąć "Akceptuję". Klikając ten przycisk przyjmujesz warunki umowy. + title: Warunki uczestnictwa + you need to accept or decline: Prosimy przeczytać i następnie przyjąć lub odrzucić nowe Warunki uczestnictwa, aby kontynuować. view: activate_user: aktywuj tego użytkownika add as friend: dodaj do znajomych ago: (%{time_in_words_ago} temu) block_history: otrzymane blokady - blocks by me: nałożone blokady - blocks on me: otrzymane blokady + blocks by me: Nałożone blokady + blocks on me: Otrzymane blokady comments: komentarze confirm: Potwierdź confirm_user: zatwierdź tego użytkownika create_block: zablokuj tego użytkownika created from: "Stworzony z:" - ct accepted: zaakceptowane %{ago} temu + ct accepted: przyjęte %{ago} temu ct declined: odrzucone ct status: "Warunki uczestnictwa:" ct undecided: niezdecydowane @@ -1545,9 +1796,10 @@ pl: diary: dziennik edits: edycje email address: Adres e‐mail - friends_diaries: Przeglądaj wszystkie wpisy dziennika wykonane przez przyjaciół + friends_changesets: zestawy zmian znajomych + friends_diaries: wpisy w dziennikach znajomych hide_user: ukryj tego użytkownika - if set location: Jeśli ustawisz swoją lokalizację, pojawi się na tej stronie kolorowa mapka i w ogóle. Lokalizację możesz podać na Twojej %{settings_link}. + if set location: Podaj swoją lokalizację na stronie %{settings_link}, aby zobaczyć użytkowników blisko ciebie. km away: "%{count}km stąd" latest edit: "Ostatnia edycja %{ago}:" m away: "%{count}m stąd" @@ -1556,15 +1808,20 @@ pl: my comments: moje komentarze my diary: mój dziennik my edits: moje zmiany + my messages: moje wiadomości + my notes: moje uwagi + my profile: mój profil my settings: moje ustawienia my traces: moje ślady nearby users: Najbliżsi użytkownicy - nearby_diaries: Przeglądaj wszystkie wpisy dziennika użytkowników znajdujących się w pobliżu + nearby_changesets: pobliskie zestawy zmian + nearby_diaries: pobliskie wpisy w dziennikach new diary entry: nowy wpis w dzienniku - no friends: Nie dodałeś/aś jeszcze żadnych znajomych. + no friends: Nie masz jeszcze dodanych żadnych znajomych. no nearby users: Nie ma innych użytkowników, którzy przyznają się do mapowania w tej okolicy. + notes: uwagi oauth settings: ustawienia oauth - remove as friend: usuń ze znajomych + remove as friend: Usuń ze znajomych role: administrator: Ten użytkownik jest administratorem grant: @@ -1608,7 +1865,7 @@ pl: block_expired: Blokada zakończyła się i nie można jej edytować. block_period: Długość blokady należy wybrać z listy rozwijanej. helper: - time_future: Blokada wygasa %{time}. + time_future: Blokada wygasa za %{time}. time_past: Zakończono %{time} temu. until_login: Aktywne do momentu zalogowania użytkownika. index: @@ -1623,6 +1880,7 @@ pl: heading: Tworzenie blokady użytkownika %{name} needs_view: Użytkownik musi się zalogować, zanim blokada zostanie wyczyszczona period: Na jak długo od tego momentu użytkownik ma być zablokowany przed dostępem do API. + reason: Powód blokady użytkownika %{name}. Zachowaj spokój i rozsądek oraz podaj jak najwięcej szczegółów dotyczących sytuacji, mając na uwagę to, że wiadomość będzie publicznie widoczna. Zwróć uwagę na to, że nie wszyscy użytkownicy mogą znać żargon obowiązujący w społeczności projektu, więc staraj się używać ogólnie rozumianych pojęć. submit: Utwórz blokadę title: Tworzenie blokady użytkownika %{name} tried_contacting: Skontaktowałem się z użytkownikami i poprosiłem ich o zaprzestanie. @@ -1635,11 +1893,14 @@ pl: creator_name: Twórca display_name: Zablokowany użytkownik edit: Edytuj + next: Następna » not_revoked: (nie odwołana) + previous: « Poprzednia reason: Powód blokady revoke: Odwołaj revoker_name: Odwołana przez show: Pokaż + showing_page: Strona %{page} status: Status period: one: 1 godzina @@ -1653,7 +1914,7 @@ pl: time_future: Blokada zakończy się za %{time}. title: Odwoływanie blokady użytkownika %{block_on} show: - back: Przejrzyj wszystkie blokady + back: Pokaż wszystkie blokady confirm: Na pewno? edit: Edytuj heading: "%{block_on} zablokowany przez użytkownika %{block_by}" @@ -1663,7 +1924,7 @@ pl: revoker: Cofający uprawnienia show: Pokaż status: Status - time_future: Blokada wygasa %{time} + time_future: Blokada wygasa za %{time} time_past: Zakończona %{time} temu title: "%{block_on} zablokowany przez użytkownika %{block_by}" update: @@ -1687,3 +1948,25 @@ pl: fail: Nie można cofnąć roli `%{role}' użytkownikowi `%{name}'. Sprawdź, czy użytkownik i rola są ważne. heading: Potwierdź cofanie roli title: Potwierdź cofanie roli + welcome_page: + add_a_note: + paragraph_1_html: Jeśli chcesz wprowadzić małą zmianę, ale nie masz czasu na rejestrację i poznanie sposobów edycji, możesz łatwo dodać uwagę. + paragraph_2_html: "Wystarczy, że przejdziesz na mapę i klikniesz ikonę: . Ta czynność doda znacznik, który możesz przesunąć przez przeciągnięcie. Dodaj swoją uwagę i zapisz ją - inni maperzy zajmą się twoim zgłoszeniem." + title: Nie masz czasu na edycję? Dodaj uwagę! + basic_terms: + editor_html: Edytor to program lub strona która pozwala na edycję mapy. + node_html: Węzeł to punkt na mapie, np. latarnia lub drzewo. + paragraph_1_html: OpenStreetMap ma własny slang. Oto kilka słów które ci się przydadzą. + tag_html: Tag to część danych opisująca linię lub węzeł, np. Nazwa ulicy lub jej ograniczenie prędkości. + title: Podstawowe Zasady do Mapowania + way_html: Linia to droga lub obszar, np. ulica, rzeka, jezioro lub budynek. + introduction_html: Witamy w OpenStreetMap, wolnej mapie świata. Teraz gdy masz już konto, możesz przystąpić do mapowania. Oto krótki przewodnik z najważniejszymi rzeczami, o których musisz wiedzieć. + questions: + paragraph_1_html: Potrzebujesz pomocy przy mapowaniu lub nie wiesz jak używać OpenStreetMap? Odpowiedzi na twoje pytania uzyskasz na stronie pomocy. + title: Jakieś pytania? + start_mapping: Rozpocznij mapowanie + title: Witaj! + whats_on_the_map: + off_html: Nie wprowadzamy obiektów nieistniejących, hipotetycznych oraz danych ze źródeł objętych prawami autorskimi. Jeśli nie masz zgody, nie kopiuj z innych map (zarówno map papierowych, jak i online). + on_html: OpeenStreetMap jest miejscem mapowania rzeczy, które są zarówno prawdziwe jak i aktualne - zawiera miliony budynków, dróg i innych szczegółów dotyczących miejsc. Można mapować wszystkie elementy rzeczywistego świata, które Cię interesują + title: Co jest na mapie diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index b93845a8c23..2f4105088ee 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -4,22 +4,37 @@ # Author: BraulioBezerra # Author: Diego Queiroz # Author: Fmca +# Author: Fúlvio # Author: Giro720 # Author: Gmare +# Author: Gusta +# Author: Jgpacker +# Author: Leosls +# Author: Luckas # Author: Luckas Blade +# Author: Matheus Sousa L.T +# Author: Nemo bis # Author: Nighto # Author: Rodrigo Avila +# Author: Tuliouel +# Author: Vgeorge # Author: 555 pt-BR: + about_page: + community_driven_title: Dirigido pela comunidade + copyright_html: ©Colaboradores
    do OpenStreetMap + local_knowledge_title: Conhecimento local + next: Próximo + partners_title: Parceiros activerecord: attributes: diary_comment: body: Corpo diary_entry: - language: Língua + language: Idioma latitude: Latitude longitude: Longitude - title: Título + title: Assunto user: Usuário friend: friend: Amigo @@ -28,7 +43,7 @@ pt-BR: body: Corpo recipient: Destinatário sender: Remetente - title: Título + title: Assunto trace: description: Descrição latitude: Latitude @@ -42,18 +57,18 @@ pt-BR: active: Ativo description: Descrição display_name: Nome para Exibição - email: Email - languages: Línguas + email: E-mail + languages: Idiomas pass_crypt: Senha models: acl: Lista de Controle de acesso - changeset: Alterações + changeset: Conjunto de alterações changeset_tag: Etiqueta do Conjunto de Alterações country: País - diary_comment: Comentário + diary_comment: Comentário do diário diary_entry: Entrada do Diário friend: Amigo - language: Língua + language: Idioma message: Mensagem node: Ponto node_tag: Etiqueta do Ponto @@ -88,173 +103,90 @@ pt-BR: blocked: Seu acesso à API foi bloqueado. Por favor, acesse a interface web para saber de mais detalhes. need_to_see_terms: O seu acesso à API está temporariamente suspenso. Por favor, faça o login na interface web para ler os Termos do Colaborador. Você não precisa concordar, mas você deve vê-los. browse: + anonymous: anônimo changeset: - changeset: "Alterações: %{id}" + belongs_to: Autor changesetxml: XML do conjunto de alterações - download: Baixar %{changeset_xml_link} ou %{osmchange_xml_link} feed: title: Conjunto de mudanças %{id} title_comment: Conjunto de mudanças %{id} - %{comment} + node: Nós (%{count}) + node_paginated: Nós (%{x}-%{y} de %{count}) osmchangexml: osmChange XML - title: Alterações - changeset_details: - belongs_to: "Pertence a:" - bounding_box: "Limites da área:" - box: Área - closed_at: "Fechado em:" - created_at: "Criado em:" - has_nodes: - one: "Tem o seguinte %{count} ponto:" - other: "Tem os seguintes %{count} pontos:" - has_relations: - one: "Tem a seguinte %{count} relação:" - other: "Tem as seguintes %{count} relações:" - has_ways: - one: "Tem o seguinte %{count} caminho:" - other: "Tem os seguintes %{count} caminhos:" - no_bounding_box: Nenhum limite de área foi armazenado para estas alterações. - show_area_box: Área de exibição - common_details: - changeset_comment: "Comentário:" - deleted_at: "Excluídos em:" - deleted_by: "Excluído por:" - edited_at: "Editado em:" - edited_by: "Editado por:" - in_changeset: "No conjunto de alterações:" - version: "Versão:" + relation: Relações (%{count}) + relation_paginated: Relações (%{x}-%{y} of %{count}) + title: "Conjunto de alterações: %{id}" + way: Linhas (%{count}) + way_paginated: Linhas (%{x}-%{y} de %{count}) + closed: Fechado + closed_by_html: Fechado %{time} atrás por %{user} + closed_html: Fechado %{time} atrás containing_relation: entry: Relação %{relation_name} entry_role: Relação %{relation_name} (como %{relation_role}) - map: - deleted: Apagado - edit: - area: Editar área - node: Editar nó - relation: Editar relação - way: Editar caminho - larger: - area: Ver área em um mapa maior - node: Ver ponto em um mapa maior - relation: Ver relação em um mapa maior - way: Ver caminho em um mapa maior - loading: Carregando... - navigation: - all: - next_changeset_tooltip: Próximo conjunto de alterações - next_node_tooltip: Próximo nó - next_relation_tooltip: Próxima relação - next_way_tooltip: Próximo caminho - prev_changeset_tooltip: Conjunto de alterações anterior - prev_node_tooltip: Nó anterior - prev_relation_tooltip: Relação anterior - prev_way_tooltip: Caminho anterior - paging: - all: - next: "%{id} »" - prev: « %{id} - user: - next: "%{id} »" - prev: « %{id} - user: - name_changeset_tooltip: Ver edições de %{user} - next_changeset_tooltip: Editado posteriormente por %{user} - prev_changeset_tooltip: Editado anteriormente por %{user} + created: Criado + created_by_html: Criado %{time} atrás por %{user} + created_html: Criado %{time} atrás + deleted_by_html: Apagado %{time} atrás por %{user} + download_xml: Baixar XML + edited_by_html: Editado %{time} atrás por %{user} + in_changeset: Conjunto de alterações + location: "Localização:" + no_comment: (sem comentário) node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Baixar XML - edit: editar - node: Ponto - node_title: "Ponto: %{node_name}" - view_history: ver histórico - node_details: - coordinates: "Coordenadas:" - part_of: "Parte de:" - node_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Baixar XML - node_history: Histórico do ponto - node_history_title: "Histórico do ponto: %{node_name}" - view_details: ver detalhes + history_title: "Histórico do nó: %{name}" + title: "Nó: %{name}" not_found: - sorry: Desculpe, o %{type} com o ID %{id}, não pode ser encontrado. + sorry: Desculpe, não foi possível encontrar %{type} com id %{id}. type: changeset: conjunto de mudanças - node: ponto + node: nó relation: relação way: caminho - paging_nav: - of: de - showing_page: Exibindo página + note: + closed_by: Resolvido por %{user} há %{when} atrás + closed_by_anonymous: Resolvido por um usuário anônimo há %{when} atrás + closed_title: "Nota resolvida #%{note_name}" + commented_by: Comentado por %{user} há %{when} atrás + commented_by_anonymous: Comentado por um usuário anônimo há %{when} atrás + hidden_by: Ocultado por %{user} há %{when} atrás + hidden_title: "Nota oculta #%{note_name}" + new_note: Nova nota + open_by: Criado por %{user} há %{when} atrás + open_by_anonymous: Criado por um usuário anônimo há %{when} atrás + open_title: "Nota não resolvida #%{note_name}" + reopened_by: Reaberto por %{user} há %{when} atrás + reopened_by_anonymous: Reaberto por um usuário anônimo há %{when} atrás + title: "Nota: %{id}" + part_of: Parte de redacted: + message_html: A versão %{version} deste %{type} não pode ser exibida tal como foi redigida. Consulte %{redaction_link} para obter mais informações. + redaction: Edição %{id} type: node: nó relation: relação way: caminho relation: - download: "%{download_xml_link} ou %{view_history_link}" - download_xml: Baixar XML - relation: Relação - relation_title: "Relação: %{relation_name}" - view_history: ver histórico - relation_details: - members: "Membros:" - part_of: "Parte de:" - relation_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Baixar XML - relation_history: Histórico de Relação - relation_history_title: "Histórico da Relação: %{relation_name}" - view_details: ver detalhes + history_title: "Histórico da Relação: %{name}" + members: Membros + title: "Relação: %{name}" relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} como %{role}" type: - node: Ponto + node: Nó relation: Relação way: Caminho - start: - manually_select: Selecionar manualmente uma área diferente - view_data: Ver dados para do mapa em visualização atual start_rjs: - data_frame_title: Dados - data_layer_name: Navegar nos Dados do Mapa - details: Detalhes - drag_a_box: Clique e arraste para selecionar uma área no mapa - edited_by_user_at_timestamp: Editado por [[user]] at [[timestamp]] - hide_areas: Ocultar áreas - history_for_feature: Histórico para [[feature]] + feature_warning: Carregando %{num_features} feições, o que pode deixar seu navegador lento ou sem resposta. Tem certeza que quer exibir estes dados? load_data: Carregar dados - loaded_an_area_with_num_features: Você carregou uma área que contém [[num_features]] pontos com características. Alguns navegadores podem não conseguir exibir todos estes dados. Geralmente, navegadores trabalham melhor exibindo um conjunto de menos de 100 características por vez, ultrapassar isso pode deixá-lo lento ou travá-lo. Se você tem certeza que deseja exibir estes dados, clique no botão abaixo. loading: Carregando... - manually_select: Selecionar manualmente uma área diferente - object_list: - api: Obter esta área através da API - back: Exibir lista de objetos - details: Detalhes - heading: Lista de Objetos - history: - type: - node: Ponto [[id]] - way: Caminho [[id]] - selected: - type: - node: Ponto [[id]] - way: Caminho [[id]] - type: - node: Ponto - way: Caminho - private_user: usuário privado - show_areas: Mostrar áreas - show_history: Exibir histórico - unable_to_load_size: "Impossível carregar dados: tamanho da área de [[bbox_size]] é muito grande (precisa ser menor que %{max_bbox_size})" - wait: Aguarde... - zoom_or_select: Aproxime ou selecione uma área diferente para visualizar tag_details: - tags: "Etiquetas:" + tags: Etiquetas wiki_link: - key: A página no wiki com a descrição para a tag %{key} - tag: A página no wiki com a descrição para a tag %{key}=%{value} - wikipedia_link: O artigo na Wikipedia %{page} + key: A página no wiki com a descrição da etiqueta %{key} + tag: A página no wiki com a descrição da etiqueta %{key}=%{value} + wikipedia_link: O artigo %{page} na Wikipedia timeout: sorry: Desculpe, mas os dados para %{type} com id %{id} estão demorando muito para chegar. type: @@ -262,39 +194,25 @@ pt-BR: node: nó relation: relação way: caminho + version: Versão + view_details: Ver Detalhes + view_history: Ver Histórico way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Baixar XML - edit: editar - view_history: ver histórico - way: Caminho - way_title: "Caminho: %{way_name}" - way_details: also_part_of: - one: também parte do caminho %{related_ways} - other: também parte dos caminhos %{related_ways} - nodes: "Pontos:" - part_of: "Parte de:" - way_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Baixar XML - view_details: ver detalhes - way_history: Histórico de caminho - way_history_title: "Histórico do caminho: %{way_name}" + one: parte da linha %{related_ways} + other: parte das linhas %{related_ways} + history_title: "Histórico da linha: %{name}" + nodes: Nós + title: "Linha: %{name}" changeset: changeset: anonymous: Anônimo - big_area: (grande) - id: "#%{id}" - no_comment: (nenhum) no_edits: (sem alterações) - show_area_box: exibir limite da área - still_editing: (ainda editando) - view_changeset_details: Ver detalhes das alterações + view_changeset_details: Ver detalhes do conjunto de alterações changeset_paging_nav: next: Seguinte » previous: « Anterior - showing_page: Exibindo página %{page} + showing_page: Página %{page} changesets: area: Área comment: Comentário @@ -302,24 +220,14 @@ pt-BR: saved_at: Salvo em user: Usuário list: - description: Alterações recentes - description_bbox: Conjuntos de alterações em %{bbox} - description_friend: Conjuntos de alterações de seus amigos - description_nearby: Conjuntos de alterações de usuários próximos - description_user: Conjuntos de alterações de %{user} - description_user_bbox: Conjuntos de alterações de %{user} em %{bbox} - heading: Conjuntos de alterações - heading_bbox: Conjuntos de alterações - heading_friend: Conjuntos de alterações - heading_nearby: Conjuntos de alterações - heading_user: Conjuntos de alterações - heading_user_bbox: Conjuntos de alterações + empty: Nenhum conjunto de alterações foi encontrado. + empty_area: Nenhum conjunto de alterações nesta área. + empty_user: Nenhum conjunto de alterações por este usuário. + load_more: Carregar mais title: Conjuntos de alterações - title_bbox: Conjuntos de alterações em %{bbox} title_friend: Conjuntos de alterações dos seus amigos title_nearby: Conjuntos de alterações de usuários próximos title_user: Conjuntos de alterações de %{user} - title_user_bbox: Conjuntos de alterações de %{user} em %{bbox} timeout: sorry: Desculpe. A lista de conjuntos de alterações que você solicitou está demorando muito tempo para ser recuperada. diary_entry: @@ -327,23 +235,24 @@ pt-BR: ago: "%{ago} atrás" comment: Comentário has_commented_on: "%{display_name} comentou nestas entradas de diário" - newer_comments: Comentários Recentes - older_comments: Comentários Antigos - post: Postar + newer_comments: Comentários mais recentes + older_comments: Comentários mais antigos + post: Publicar when: Quando diary_comment: comment_from: Comentário de %{link_user} em %{comment_created_at} confirm: Confirmar - hide_link: Ocultar esse comentário + hide_link: Ocultar este comentário diary_entry: comment_count: - one: 1 comentário + one: "%{count} comentário" other: "%{count} comentários" + zero: Sem comentários comment_link: Comentar nesta entrada confirm: Confirmar edit_link: Editar esta entrada hide_link: Ocultar essa entrada - posted_by: Postado por %{link_user} em %{created} em %{language_link} + posted_by: Publicado por %{link_user} em %{created} em %{language_link} reply_link: Responder esta entrada edit: body: "Texto:" @@ -359,21 +268,21 @@ pt-BR: feed: all: description: Entradas no diário recentes de usuários do OpenStreetMap - title: Entradas no diário OpenStreetMap + title: Entradas no diário do OpenStreetMap language: description: Entradas de diário recentes de usuários do OpenStreetMap em %{language_name} - title: Entradas no diário OpenStreetMap em %{language_name} + title: Entradas no diário do OpenStreetMap em %{language_name} user: - description: Entradas recentes no diário OpenStreetMap de %{user} - title: Entradas do diário OpenStreetMap de %{user} + description: Entradas recentes no diário do OpenStreetMap de %{user} + title: Entradas do diário do OpenStreetMap de %{user} list: - in_language_title: Entradas do Diário em %{language} + in_language_title: Entradas de Diário em %{language} new: Nova Entrada no Diário new_title: Escrever nova entrada em seu Diário - newer_entries: Entradas novas + newer_entries: Entradas mais novas no_entries: Sem entradas no Diário - older_entries: Entradas antigas - recent_entries: "Entradas recentes no Diário:" + older_entries: Entradas mais antigas + recent_entries: Entradas recentes do Diário title: Diários dos Usuários title_friends: Diários dos amigos title_nearby: Diários dos usuários próximos @@ -397,6 +306,9 @@ pt-BR: user_title: Diário de %{user} editor: default: Padrão (atualmente %{name}) + id: + description: iD (editor no navegador) + name: iD potlatch: description: Potlatch 1 (editar no navegador) name: Potlatch 1 @@ -412,7 +324,7 @@ pt-BR: area_to_export: Área a exportar embeddable_html: HTML para embutir export_button: Exportar - export_details: Os dados do OpenStreetMap estão licenciados sob a Creative Commons Atribuição - Compartilhamento pela mesma Licença 2.0 Genérica (CC BY-SA 2.0). + export_details: Os dados do OpenStreetMap estão licenciados sob a licença Open Data Commons Open Database License (ODbL). format: Formato format_to_export: Formato a Exportar image_size: Tamanho da Imagem @@ -423,34 +335,36 @@ pt-BR: map_image: Imagem do Mapa (mostra a camada padrão) max: max options: Opções - osm_xml_data: Dados XML OpenStreetMap + osm_xml_data: Dados XML do OpenStreetMap output: Saída paste_html: Cole o HTML para publicar no site scale: Escala too_large: - body: Esta área é muito grande para ser exportada como dados XML do OpenStreetMap. Por gentileza, aumente o zoom ou selecione uma área menor. - heading: Área muito grande + body: "Esta área é muito grande para ser exportada como dados em XML do OpenStreetMap. Por gentileza, aumente o zoom ou selecione uma área menor, ou use as seguintes fontes de downloads de dados em massa:" + geofabrik: + description: Extratos regularmente atualizados de continentes, países, e cidades selecionadas + title: Baixar do Geofabrik + metro: + description: Extratos das principais cidades do mundo e suas areas próximas + title: Extratos do Portal Metro + planet: + description: Cópias regularmente atualizadas da base de dados completa do OpenStreetMap + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Adicionar um marcador ao mapa - change_marker: Mudar posição do marcador - click_add_marker: Clique no mapa para adicionar um marcador - drag_a_box: Marque uma caixa no mapa para selecionar uma área - export: Exportar - manually_select: Selecionar manualmente uma área diferente - view_larger_map: Ver Mapa Ampliado + fixthemap: + how_to_help: + join_the_community: + title: Junte-se à comunidade + title: Como ajudar geocoder: description: title: geonames: Localização do GeoNames - osm_namefinder: "%{types} de OpenStreetMap Namefinder" osm_nominatim: Resultados de OpenStreetMap Nominatim types: cities: Cidades places: Lugares towns: Cidades - description_osm_namefinder: - prefix: "%{distance} %{direction} de %{type}" direction: east: leste north: norte @@ -472,83 +386,89 @@ pt-BR: ca_postcode: Resultados do Geocoder.CA geonames: Resultados do GeoNames latlon: Resultados Internos - osm_namefinder: Resultados do OpenStreetMap Namefinder osm_nominatim: Resultados de OpenStreetMap Nominatim uk_postcode: Resultados do NPEMap / FreeThe Postcode us_postcode: Resultados do Geocoder.us - search_osm_namefinder: - prefix: "%{type}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} %{direction} de %{placename}" - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: + admin_levels: + level10: Limite Suburbano + level2: Fronteira Nacional + level4: Fronteira Estadual + level5: Fronteira Regional + level6: Fronteira do condado + level8: Limite de Município + level9: Limite da Aldeia prefix: + aerialway: + chair_lift: Elevador para cadeirantes + drag_lift: Elevador de esqui + station: Estação Teleférica aeroway: aerodrome: Aeródromo - apron: Aeroportuário + apron: Rampa gate: Portão - helipad: Heliponto + helipad: Heliporto runway: Pista - taxiway: Pista de manobras + taxiway: Pista de taxiamento terminal: Terminal amenity: WLAN: Acesso WiFi airport: Aeroporto - arts_centre: Centro de Arte + arts_centre: Centro Artístico artwork: Obra de Arte atm: Caixa automático auditorium: Auditório bank: Banco bar: Bar - bbq: Churrascaria - bench: Banco (de praça) + bbq: Churrasco + bench: Banco bicycle_parking: Estacionamento de bicicletas bicycle_rental: Aluguel de bicicletas - biergarten: Beer Garden + biergarten: Praça de Alimentação brothel: Bordel - bureau_de_change: Casa de câmbio + bureau_de_change: Casa de Câmbio bus_station: Estação de Ônibus/Rodoviária - cafe: Café + cafe: Cafeteria car_rental: Aluguel de veículos - car_sharing: Aluguel de Carro + car_sharing: Veículo de Autosserviço car_wash: Lava-Carros casino: Cassino - charging_station: Estação de carga + charging_station: Estação de Carga cinema: Cinema clinic: Clínica club: Clube college: Faculdade - community_centre: Centro comunitário + community_centre: Centro Comunitário courthouse: Fórum crematorium: Crematório dentist: Dentista doctors: Consultórios dormitory: Dormitório - drinking_water: Água potável + drinking_water: Água Potável driving_school: Autoescola embassy: Embaixada - emergency_phone: Telefone de emergência - fast_food: Fast Food - ferry_terminal: Terminal de barca + emergency_phone: Telefone de Emergência + fast_food: Fast-Food + ferry_terminal: Terminal de balsas fire_hydrant: Hidrante - fire_station: Corpo de bombeiros + fire_station: Corpo de Bombeiros food_court: Praça de Alimentação fountain: Fonte fuel: Combustível grave_yard: Cemitério - gym: Ginásio + gym: Academia hall: Salão health_centre: Centro de saúde hospital: Hospital hotel: Hotel - hunting_stand: Stand de caça + hunting_stand: Estande de Caça ice_cream: Sorveteria - kindergarten: Jardim de infância + kindergarten: Pré-Escola library: Biblioteca market: Mercado - marketplace: Mercado público / feira - mountain_rescue: Abrigo de montanha - nightclub: Casa noturna/Boate + marketplace: Feira + mountain_rescue: Resgate em Montanha + nightclub: Boate nursery: Berçário nursing_home: Asilo office: Escritório @@ -557,14 +477,14 @@ pt-BR: pharmacy: Farmácia place_of_worship: Lugar de Adoração police: Polícia - post_box: Caixa de correio + post_box: Caixa de Correio post_office: Agência de Correios - preschool: Pré-escola/Jardim de Infância + preschool: Pré-Escola prison: Prisão pub: Pub - public_building: Edifício público - public_market: Mercado público - reception_area: Área de recepção + public_building: Edifício Público + public_market: Mercado Público + reception_area: Área de Recepção recycling: Posto de Reciclagem restaurant: Restaurante retirement_home: Asilo @@ -574,70 +494,76 @@ pt-BR: shop: Loja shopping: Shopping shower: Chuveiro - social_centre: Centro social - social_club: Clube social + social_centre: Centro Social + social_club: Clube Recreativo + social_facility: Serviço Social studio: Estúdio supermarket: Supermercado swimming_pool: Piscina taxi: Táxi - telephone: Telefone público + telephone: Telefone Público theatre: Teatro toilets: Banheiros townhall: Prefeitura university: Universidade vending_machine: Máquina de venda automática - veterinary: Clínica veterinária - village_hall: Salão de vila - waste_basket: Lata de lixo + veterinary: Clínica Veterinária + village_hall: Prefeitura + waste_basket: Cesto de Lixo wifi: Acesso Wi-Fi - youth_centre: Centro juvenil + youth_centre: Centro Juvenil boundary: administrative: Limite Administrativo - census: Limite de censo + census: Limite censitário national_park: Parque Nacional - protected_area: Área protegida + protected_area: Área Protegida bridge: aqueduct: Aqueduto - suspension: Ponte pênsil - swing: Ponte giratória + suspension: Ponte Suspensa + swing: Ponte Giratória viaduct: Viaduto "yes": Ponte building: "yes": Edifício + emergency: + fire_hydrant: Hidrante + phone: Telefone de emergência highway: bridleway: Pista para cavalos - bus_guideway: Corredor de ônibus - bus_stop: Ponto de ônibus - byway: Trilha larga - construction: Estrada em construção + bus_guideway: Corredor de Ônibus + bus_stop: Ponto de Ônibus + byway: Vicinal + construction: Estrada em Construção cycleway: Ciclovia - emergency_access_point: Acesso de emergência - footway: Caminho - ford: Travessia de rio - living_street: Rua residencial + emergency_access_point: Ponto de Acesso de Emergência + footway: Calçada + ford: Vau + living_street: Calçadão milestone: Marco minor: Estrada Secundária - motorway: Rodovia expressa + motorway: Autoestrada motorway_junction: Trevo de Acesso motorway_link: Autoestrada path: Caminho - pedestrian: Rua de pedestres + pedestrian: Calçadão platform: Plataforma primary: Via Primária primary_link: Via Primária + proposed: Via em planejamento raceway: Pista de corrida residential: Residencial - rest_area: Área de descanso + rest_area: Área de Descanso road: Estrada secondary: Via Secundária secondary_link: Via Secundária - service: Rua de serviço + service: Via Marginal services: Serviços de autoestrada speed_camera: Radar steps: Degraus - stile: Escada de cerca - tertiary: Via terciária - tertiary_link: Via terciária + stile: Passagem + street_lamp: Iluminação Pública + tertiary: Via Terciária + tertiary_link: Via Terciária track: Trilha trail: Trilha trunk: Via de entroncamento @@ -651,6 +577,7 @@ pt-BR: building: Edifício castle: Castelo church: Igreja + citywalls: Muralhas fort: Forte house: Casa histórica icon: Ícone @@ -727,6 +654,8 @@ pt-BR: airfield: Aeródromo militar barracks: Quartel bunker: Bunker + mountain_pass: + "yes": Passe de montanha natural: bay: Baía beach: Praia @@ -796,6 +725,7 @@ pt-BR: locality: Localidade moor: Pântano municipality: Municipalidade + neighbourhood: Vizinhança postcode: CEP region: Região sea: Mar @@ -821,8 +751,10 @@ pt-BR: narrow_gauge: Ferrovia estreita platform: Plataforma de trem preserved: Ferrovia preservada + proposed: Ferrovia em planejamento spur: Ramificação de linha station: Estação de Trem + stop: Cruzamento rodoferroviário subway: Estação de metrô subway_entrance: Entrada do metrô switch: Chave de ferrovia @@ -838,6 +770,7 @@ pt-BR: beverages: Loja/depósito de bebidas bicycle: Loja de bicicletas books: Livraria + boutique: Boutique butcher: Açougue car: Loja de carros car_parts: Autopeças @@ -851,6 +784,7 @@ pt-BR: convenience: Loja de conveniência copyshop: Gráfica/copiadora cosmetics: Loja de cosméticos + deli: Petiscaria department_store: Loja de departamentos discount: Loja de descontos doityourself: Faça você mesmo @@ -887,17 +821,21 @@ pt-BR: organic: Loja de alimentos orgânicos outdoor: Loja ao ar livre pet: Pet Shop + pharmacy: Farmácia photo: Loja fotográfica salon: Salão de beleza + second_hand: Brechó shoes: Sapataria shopping_centre: Shopping Center sports: Loja de artigos esportivos stationery: Papelaria supermarket: Supermercado + tailor: Alfaiate toys: Loja de brinquedos travel_agency: Agência de viagens video: Loja de vídeo wine: Loja de vinhos + "yes": Loja tourism: alpine_hut: Cabana alpina artwork: Obra de Arte @@ -920,6 +858,7 @@ pt-BR: viewpoint: Mirador zoo: Zoológico tunnel: + culvert: Canal "yes": Túnel waterway: artificial: Via fluvial artificial @@ -944,68 +883,98 @@ pt-BR: waterfall: Queda de água weir: Açude prefix_format: "%{name}" + help_page: + welcome: + title: Bem vindo ao OSM + wiki: + description: Navegue na wiki para ver a documentação do OSM com mais detalhes. html: dir: ltr javascripts: + close: Fechar + edit_help: Mover o mapa e ampliar uma localização que pretende editar e clique aqui. + key: + title: Legenda do mapa + tooltip: Legenda do mapa + tooltip_disabled: Legenda do mapa disponível só para a camada padrão map: base: cycle_map: Cycle Map mapquest: MapQuest Open standard: Padrão transport_map: Mapa de transporte público - overlays: - maplint: Maplint + copyright: © Contribuidores OpenStreetMap + donate_link_text: + layers: + data: Dados do Mapa + header: Camadas do Mapa + notes: Notas de Mapa + overlays: Ativar sobreposições para solucionar problemas do mapa + locate: + popup: Você está dentro de {distance} {unit} deste ponto + title: Mostrar minha localização + zoom: + in: Aumentar o Zoom + out: Diminuir o Zoom + notes: + new: + add: Adicionar nota + intro: A fim de melhorar o mapa, as informações inseridas por você serão visíveis a outros cartógrafos; sendo assim, seja o mais descritivo e preciso possível ao mover o marcador para sua posição correta e ao escrever sua nota abaixo dele. + show: + anonymous_warning: Esta nota contém comentários de usuários anônimos que devem ser verificados separadamente. + comment: Comentar + comment_and_resolve: Comentar e resolver + hide: Esconder + reactivate: Reativar + resolve: Resolver + share: + cancel: Cancelar + center_marker: Centralizar o mapa no marcador + custom_dimensions: Definir dimensões personalizadas + download: Download + embed: HTML + format: "Formato:" + image: Imagem + image_size: Imagem irá mostrar camadas padrão em + include_marker: Incluir marcador + link: Link ou HTML + long_link: Link + paste_html: Cole o HTML para publicar no site + scale: "Escala:" + short_link: Link Curto + short_url: URL Curto + title: Compartilhar + view_larger_map: Ver Mapa Ampliado site: + createnote_disabled_tooltip: Ampliar para adicionar uma nota ao mapa + createnote_tooltip: Adicionar uma nota ao mapa edit_disabled_tooltip: Aumente o zoom para editar o mapa edit_tooltip: Edite o mapa - edit_zoom_alert: Você deve aumentar o zoom para editar o mapa - history_disabled_tooltip: Aumente o zoom para ver as edições desta área - history_tooltip: Veja as edições desta área - history_zoom_alert: Você deve aumentar o zoom para ver o histórico de edição layouts: community: Comunidade community_blogs: Blogs da Comunidade community_blogs_title: Blogs de membros da comunidade OpenStreetMap - copyright: Direitos Autorais & Licença - documentation: Documentação - documentation_title: Documentação do projeto + copyright: Direitos Autorais + data: Dados donate: "Ajude o OpenStreetMap fazendo doações para o Fundo de Upgrade de Hardware: %{link}." - donate_link_text: doando edit: Editar edit_with: Edite com %{editor} export: Exportar - export_tooltip: Exportar dados do mapa + export_data: Exportar Dados foundation: Fundação foundation_title: A Fundação OpenStreetMap gps_traces: Trilhas GPS gps_traces_tooltip: Gerenciar trilhas GPS help: Ajuda - help_centre: Central de Ajuda - help_title: Site de ajuda para o projeto - help_url: http://help.openstreetmap.org/ history: Histórico - home: início - home_tooltip: Ir para a sua localização - inbox: caixa de entrada (%{count}) - inbox_tooltip: - one: 1 Nova mensagem na sua caixa de entrada - other: Sua caixa de entrada tem %{count} mensagens não lidas - zero: Sem novas mensagens na sua caixa de entrada - intro_1: O OpenStreetMap é um mapa livre e editável do mundo todo. Ele é feito por pessoas como você. + home: Ir para o seu local intro_2_create_account: Criar uma conta de usuário - intro_2_download: baixar - intro_2_html: Os dados são livres para %{download} e %{use} sob sua %{license}. %{create_account} para melhorar o mapa. - intro_2_license: licença aberta - intro_2_use: usar - license: - alt: CC by-sa 2.0 - title: Os dados do OpenStreetMaps estão licenciados na Licença Creative Commons Atribuição-Compartilhamento pela Mesma Licença 2.0 Genérica - log_in: entrar + learn_more: Saiba mais + log_in: Entrar log_in_tooltip: Entrar com uma conta existente logo: alt_text: Logotipo do OpenStreetMap - logout: sair - logout_tooltip: Sair + logout: Sair make_a_donation: text: Faça uma doação title: Ajude o OpenStreetMap com uma doação monetária @@ -1019,25 +988,45 @@ pt-BR: project_name: h1: OpenStreetMap title: OpenStreetMap - sign_up: registrar + sign_up: Criar conta sign_up_tooltip: Criar uma conta para editar - sotm2011: Venha para a Conferência OpenStreetMap 2011, The State of the Map, de 9 a 11 de setembro em Denver! tag_line: O Wiki de Mapas Livres user_diaries: Diários de Usuário user_diaries_tooltip: Ver os diários dos usuários - view: Ver - view_tooltip: Veja o mapa - welcome_user: Bem vindo, %{user_link} - welcome_user_link_tooltip: Sua Página de usuário - wiki: Wiki - wiki_title: Site wiki para o projeto - wiki_url: http://wiki.openstreetmap.org/wiki/Pt-br:Main_Page license_page: foreign: english_link: o original em Inglês text: Caso haja um conflito entre esta tradução e %{english_original_link}, a página em Inglês terá precedência title: Sobre esta tradução - legal_babble: "

    Direitos Autorais e Licença

    \n

    \n O OpenStreetMap possui dados abertos, licenciados sob a licença Creative\n Commons Atribuição-Compartilhamento pela mesma Licença 2.0 (CC BY-SA).\n

    \n

    \n Você está livre para copiar, distribuir, transmitir e adaptar nossos mapas\n e dados, desde que você dê crédito ao OpenStreetMap e seus\n colaboradores. Se você alterar ou criar sobre nossos mapas ou dados, você\n deve distribuir os resultados apenas sobre a mesma licença. A\n licença\n jurídica explica seus direitos e responsabilidades.\n

    \n\n

    Como dar crédito ao OpenStreetMap

    \n

    \n Se você usar as imagens dos mapas do OpenStreetMap, nós pedimos que\n os créditos apareçam como “© OpenStreetMap\n contributors, CC BY-SA”. Se você estiver usando apenas os dados dos mapas,\n nós pedimos que os créditos apareçam como “Map data © OpenStreetMap contributors,\n CC BY-SA”.\n

    \n

    \n Onde for possível, um link para o OpenStreetMap deve direcionar para http://www.openstreetmap.org/\n e a licença CC BY-SA para http://creativecommons.org/licenses/by-sa/2.0/. Se\n você estiver usando uma mídia que não pode conter links (ex.: um\n trabalho impresso), sugerimos que você direcione seus leitores para \n www.openstreetmap.org (talvez por expandir\n ‘OpenStreetMap’ para este endereço completo) e para \n www.creativecommons.org.\n

    \n\n

    Descobrir mais

    \n

    \n Leia mais sobre o uso de nossos dados no Legal\n FAQ.\n

    \n

    \n Os colaboradores do OSM são lembrados de nunca adicionar dados de quaisquer\n fontes sob copyright (ex.: Google Maps ou mapas impressos) sem\n permissão explícita dos detentores dos direitos atorais.\n

    \n

    \n Embora o OpenStreetMap tenha dados abertos, nós não podemos prover uma\n API de mapas livre de encargos para desenvolvedores de terceiros.\n\n Veja nossa Política de uso da API,\n Política de Uso de Imagens\n e Política de Uso do Nominatim.\n

    \n\n

    Nossos colaboradores

    \n

    \n A nossa licença CC BY-SA requer que você “dê crédito ao \n Autor Original de forma equivalente à mídia ou meios que Você\n está utilizando”. Mapeadores individuais do OSM não solicitam \n crédito além do “OpenStreetMap\n contributors”, mas quando os dados vem de uma agência \n nacional de mapeamento, ou de outra fonte superior, a ser incluída\n no OpenStreetMap, é razoável creditá-la por reproduzir diretamente \n os seus créditos ou por fazer links para eles nesta página.\n

    \n\n\n\n
      \n
    • Austrália: Contém dados do subúrbio baseado\n nos dados do Australian Bureau of Statistics.
    • \n
    • Áustria: Contém dados do \n Stadt Wien (sob licença\n CC BY) e Land Vorarlberg..
    • \n
    • Canadá: Contém dados do\n GeoBase®, GeoGratis (© Departamento de Recursos\n Naturais do Canadá), CanVec (© Departamento de Recursos\n Naturais do Canadá), and StatCan (Divisão de Geografia e \n Estatística do Canada).
    • \n
    • França: Contém dados da\n Direction Générale des Impôts.
    • \n
    • Nova Zelândia: Contém dados do \n Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polônia: Contém dados do UMP-pcPL maps. Copyright Colaboradores do\n UMP-pcPL.
    • \n
    • Reino Unido: Contém Ordnance\n Survey data © Crown copyright and database right\n 2010.
    • \n
    \n\n

    \n A inclusão de dados no OpenStreetMap não implica em endosso do provedor dos dados \n ao OpenStreetMap, nem em qualquer garantia, ou\n aceitação de qualquer responsabilidade.\n

    " + legal_babble: + attribution_example: + alt: Exemplo de como atribuir o OpenStreetMap a uma página + title: Exemplo de atribuição + contributors_at_html: "Áustria: Contém dados de \n Stadt Wien (sob licença\n CC BY), \nLand Vorarlberg e \nLand Tirol (sob a licença CC-BY AT com emendas)." + contributors_ca_html: "Canadá: Contém dados do\n GeoBase®, GeoGratis (© Departamento de Recursos\n Naturais do Canadá), CanVec (© Departamento de Recursos\n Naturais do Canadá), and StatCan (Divisão de Geografia e \n Estatística do Canada)." + contributors_footer_1_html: " A inclusão de dados no OpenStreetMap não implica em endosso do provedor dos dados \n ao OpenStreetMap, nem em qualquer garantia, ou\n aceitação de qualquer responsabilidade." + contributors_footer_2_html: "A inclusão de dados no OpenStreetMap não implica que fornecedor \noriginal apoie o OpenStreetMap, ou dê qualquer garantia, ou \naceite qualquer responsabilidade." + contributors_fr_html: "França: Contém dados da\n Direction Générale des Impôts." + contributors_gb_html: "Reino Unido: Contém dados da Ordnance\n Survey © Crown copyright e direitos da base de dados 2010." + contributors_intro_html: "Nossos contribuidores são milhares de indivíduos. Nós também incluímos\ndados, cujas licenças são abertas, de organismos nacionais de cartografia\ne de outras fontes, dentre elas:" + contributors_nl_html: "Holanda: Contém dados © AND, 2007\n(www.and.com)" + contributors_nz_html: "Nova Zelândia: Contém dados do \n Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Nossos colaboradores + contributors_za_html: "Africa do Sul: contém dados originários de\nChief Directorate:\nNational Geo-Spatial Information, com direitos de autor reservados àquele Estado." + credit_1_html: Solicitamos que você faça referência a “contribuidores do © OpenStreetMap”. + credit_2_html: "Você deve deixar claro que os dados são disponíveis sob a \"Open\nDatabase Licence, e se usar nosso acervo cartográfico, que o mesmo é\nlicenciado como CC-BY-SA. Você pode proceder ligando a\nesta página.\nAlternativamente, e obrigatoriamente, caso esteja distribuindo o OSM em \nforma de dados, você pode denominar e ligar diretamente à(s) licença(s). Em veículos\nonde \"links\" não são possíveis (p. ex.: impressos), sugerimos que você\nremeta seus leitores ao endereço openstreetmap.org (talvez escrevendo \nOpenStreetMap ao endereço completo), ao opendatacommons.org, e,\nse for relevante, ao creativecommons.org." + credit_3_html: "Para um mapa eletrônico explorável, os créditos devem aparecer no canto do mapa.\nPor exemplo:" + credit_title_html: Como dar crédito ao OpenStreetMap + infringement_1_html: " Os colaboradores do OSM são lembrados de nunca adicionar dados de quaisquer\n fontes com direitos autorais protegidos (ex.: Google Maps ou mapas impressos) sem\n permissão expressa dos seus detentores." + infringement_2_html: "Se você acredita que material protegido por direitos autorais foi, inapropriadamente,\nadicionado à base de dados do OpenStreetMap ou a este sítio, por favor, proceda\nao nosso takedown\nprocedure (em inglês) ou comunique diretamente em nosso \non-line filing page (em inglês)." + infringement_title_html: Violação de direitos autorais + intro_1_html: "O OpenStreetMap possui dados abertos, licenciados sob a Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Você é livre para copiar, distribuir, transmitir e adaptar nossos dados,\ndesde que você referencie o OpenStreetMap e seus \ncontribuidores. Se você alterar ou inovar a partir de nossos mapas, você\ndeve distribuir o resultado somente sob a mesma licença. O\ntexto\nlegal completo explica seus direitos e responsabilidades." + intro_3_html: "Nosso acervo cartográfico, bem como nossa documentação, são\nlicenciados sob a licença Creative\nCommons Atribuição – Compartilhamento pela mesma Licença 2.0 (CC-BY-SA)." + more_1_html: "Leia mais sobre o uso de nossos dados, e como nos dar crédito, em Legal\nFAQ." + more_2_html: " Embora o OpenStreetMap tenha dados abertos, nós não podemos prover uma\n API de mapas livre de encargos para desenvolvedores de terceiros.\n\n Veja nossa Política de uso da API,\n Política de Uso de Imagens\n e Política de Uso do Nominatim." + more_title_html: Descobrir mais + title_html: Direitos Autorais e Licença native: mapping_link: começar a mapear native_link: Versão em Português do Brasil @@ -1097,12 +1086,9 @@ pt-BR: title: Caixa de Saída to: Para read: - back_to_inbox: Voltar para a caixa de entrada - back_to_outbox: Voltar para a caixa de saída + back: Voltar date: Data from: De - reading_your_messages: Lendo suas mensagens - reading_your_sent_messages: Lendo suas mensagens enviadas reply_button: Responder subject: Assunto title: Ler Mensagem @@ -1113,6 +1099,37 @@ pt-BR: wrong_user: Você está conectado como `%{user}' mas a mensagem que você quer responder não foi enviada para este usuário. Por gentileza, faça o login com o usuário correto para poder responder. sent_message_summary: delete_button: Apagar + note: + description: + closed_at_by_html: Resolvido %{when} atrás por %{user} + closed_at_html: Tratado há %{when} + commented_at_by_html: Atualizado há %{when} por %{user} + commented_at_html: Atualizado %{when} atrás + opened_at_by_html: Criado há %{when} por %{user} + opened_at_html: Criado %{when} atrás + reopened_at_by_html: Reativado há %{when} por %{user} + reopened_at_html: Reativado %{when} atrás + entry: + comment: Comentar + full: Nota completa + mine: + ago_html: Há %{when} + created_at: Criado em + creator: Criador + description: Descrição + heading: Notas de %{user} + id: ID + last_changed: Última alteração + subheading: Notas postadas ou comentadas por %{user} + title: Notas postadas ou comentadas por %{user} + rss: + closed: nota encerrada (próxima a %{place}) + commented: novo comentário (perto de %{place}) + description_area: Uma lista de notas reportadas, comentadas ou encerradas na sua área [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Um feed RSS para a nota %{id} + opened: nova nota (perto de %{place}) + reopened: reativando nota (perto de %{place}) + title: Notas do OpenStreetMap notifier: diary_comment_notification: footer: Você pode ler o comentário em %{readurl}, pode comentá-lo em %{commenturl} ou respondê-lo em %{replyurl} @@ -1128,8 +1145,7 @@ pt-BR: email_confirm_plain: click_the_link: Se esta pessoa é você, por favor clique no link abaixo para confirmar a alteração. greeting: Olá, - hopefully_you_1: Alguém (esperamos que você) quer alterar seu endereço de e-mail de - hopefully_you_2: "%{server_url} para %{new_address}." + hopefully_you: Alguém (esperamos que você) quer alterar seu endereço de e-mail de %{server_url} para %{new_address}. friend_notification: befriend_them: Você também pode adicioná-lo como amigo em %{befriendurl}. had_added_you: "%{user} adicionou você como amigo no OpenStreetMap." @@ -1159,47 +1175,37 @@ pt-BR: lost_password_plain: click_the_link: Se esta pessoa é você, por favor clique no link abaixo para receber uma nova senha. greeting: Olá, - hopefully_you_1: Alguém (possivelmente você) pediu uma nova senha - hopefully_you_2: para a conta no openstreetmap.org ligada a este e-mail. + hopefully_you: Alguém (possivelmente você) pediu uma nova senha para a conta no openstreetmap.org ligada a este e-mail. message_notification: - footer1: Você pode ler a mensagem em %{readurl} - footer2: e pode respondê-la em %{replyurl} + footer_html: Você pode também ler a mensagem em %{readurl} e pode responder em %{replyurl} header: "%{from_user} enviou uma mensagem pelo OpenStreetMap para você com o assunto %{subject}:" hi: Olá %{to_user}, subject_header: "[OpenStreetMap] %{subject}" + note_comment_notification: + anonymous: Um usuário anônimo + closed: + commented_note: "%{commenter} resolveu uma nota de um mapa que você comentou. A nota está próxima a %{place}." + subject_other: "[OpenStreetMap] %{commenter} resolveu uma nota que interessa a você" + subject_own: "[OpenStreetMap] %{commenter} resolveu uma de suas notas" + your_note: "%{commenter} resolveu uma de suas notas no mapa próximo a %{place}." + commented: + commented_note: "%{commenter} deixou um comentário em uma nota de mapa que você comentou. A notá está próxima a %{place}." + subject_other: "[OpenStreetMap] %{commenter} comentou em uma nota que interessa a você" + subject_own: "[OpenStreetMap] %{commenter} comentou uma de suas notas" + your_note: "%{commenter} deixou um comentário em uma de suas notas no mapa próximo a %{place}." + details: Mais detalhes sobre a nota podem ser encontradas em %{url}. + greeting: Olá, + reopened: + commented_note: "%{commenter} reativou uma nota de um mapa que você comentou. A nota está próxima a %{place}." + subject_other: "[OpenStreetMap] %{commenter} reativou uma nota que interessa a você" + subject_own: "[OpenStreetMap] %{commenter} reativou uma de suas notas" + your_note: "%{commenter} reativou uma de suas notas no mapa perto de %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirme seu endereço de e-mail" - signup_confirm_html: - ask_questions: Você pode perguntar o que quiser sobre o OpenStreetMap em nosso site de perguntas e respostas. - click_the_link: Se esta pessoa é você, bem-vindo! Por favor, clique no link abaixo para confirmar sua inscrição e ler mais informações sobre o OpenStreetMap. - current_user: A lista de usuários, baseada em suas localizações no mundo, está disponível em Category:Users_by_geographical_region. - get_reading: Continue lendo sobre o OpenStreetMap no wiki, mantenha-se informado via o blog OpenStreetMap(em inglês) ou pelo Twitter(em inglês), ou então navegue pelo blog do fundador do OSM(em inglês), Steve Coast, que também tem podcasts(em inglês). + confirm: "Antes de qualquer coisa, nós precisamos confirmar que esta solicitação veio de você, portanto, se sim, por favor, clique no endereço abaixo para confirmar sua conta:" + created: Alguém (provavelmente você) acaba de criar uma conta em %{site_url}. greeting: Olá! - hopefully_you: Alguém (esperamos que você) quer criar uma conta em - introductory_video: Você pode ver um vídeo introdutório (em inglês) em %{introductory_video_link}. - more_videos: Há também %{more_videos_link}. - more_videos_here: mais vídeos aqui - user_wiki_page: É recomendável que você crie sua página no wiki, incluindo etiquetas sobre sua localização, como em [[Category:Users_in_Rio_de_Janeiro]]. - video_to_openstreetmap: vídeo introdutório ao OpenStreetMap - wiki_signup: Você pode querer também se registrar no wiki do OpenStreetMap. - signup_confirm_plain: - ask_questions: "Você pode perguntar qualquer dúvida que você tiver sobre OpenStreetMap em nosso site de perguntas e respostas:" - blog_and_twitter: "Mantenha-se informado via o blog do OpenStreetMap or pelo Twitter:" - click_the_link_1: Se esta pessoa é você, bem-vindo! Clique abaixo para confirmar sua - click_the_link_2: conta e ler mais informações sobre o OpenStreetMap. - current_user_1: Uma lista atualizada de usuários em categorias, baseada em onde eles - current_user_2: "estão, está disponível aqui:" - greeting: Olá! - hopefully_you: Alguém (esperamos que você) quer criar uma conta em - introductory_video: "Você pode assistir um vídeo introdutório (em inglês) sobre o OpenStreetMap aqui:" - more_videos: "Existem mais vídeos aqui:" - opengeodata: "OpenGeoData.org é o blog do fundador do OpenStreetMap, Steve Coast, que também dispõe de podcasts (em inglês):" - the_wiki: "Continue lendo sobre o OpenStreetMap no wiki:" - the_wiki_url: http://wiki.openstreetmap.org/index.php?title=Pt-br:Beginners_Guide&uselang=pt-br - user_wiki_1: É recomendável que você crie sua página no wiki, incluindo tags de - user_wiki_2: categorias marcando onde você está, como [[Category:Users_in_Brazil]]. - wiki_signup: "Você também pode querer registrar-se no wiki do OpenStreetMap em:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=Main_Page&uselang=pt-br + subject: "[OpenStreetMap] Bem-vindo(a) ao OpenStreetMap" + welcome: Após confirmar sua conta, você receberá algumas informações adicionais para começar. oauth: oauthorize: allow_read_gpx: ler suas trilhas de GPS privadas @@ -1208,8 +1214,14 @@ pt-BR: allow_write_api: modificar o mapa. allow_write_diary: criar entradas de diário, comentários e adicionar amigos. allow_write_gpx: atualizar trilhas de GPS. + allow_write_notes: alterar notas. allow_write_prefs: modificar suas preferências de usuário. request_access: A aplicação %{app_name} está pedindo acesso à sua conta, %{user}. Por favor verifique se você deseja que a aplicação tenha as capacidades a seguir. Você pode escolher quaisquer que quiser. + title: Autorizar acesso à sua conta + oauthorize_failure: + title: O pedido de autorização falhou + oauthorize_success: + verification: O código de verificação é %{code}. revoke: flash: Você cancelou o token para %{application} oauth_clients: @@ -1226,6 +1238,7 @@ pt-BR: allow_write_api: modificar o mapa. allow_write_diary: criar entradas de diário, comentários e adicionar amigos. allow_write_gpx: enviar trilhas de GPS + allow_write_notes: alterar notas. allow_write_prefs: modificar suas preferências de usuário. callback_url: URL de callback name: Nome @@ -1256,6 +1269,7 @@ pt-BR: allow_write_api: modificar o mapa allow_write_diary: criar entradas de diário, comentários e adicionar amigos. allow_write_gpx: enviar trilhas de GPS. + allow_write_notes: alterar notas. allow_write_prefs: modificar suas preferências de usuário. authorize_url: "URL de autorização:" confirm: Você tem certeza? @@ -1264,28 +1278,50 @@ pt-BR: key: Chave de Consumidor requests: "Pedindo as seguintes permissões ao usuário:" secret: Segredo do Consumidor - support_notice: Nós suportamos HMAC-SHA1 (recomendado) assim como texto simples em modo SSL. + support_notice: Nós adotamos assinaturas HMAC-SHA1 (recomendado) e RSA-SHA1. title: Detalhes OAuth de %{app_name} url: URL do token de requisição update: flash: As informações do cliente foram atualizadas com sucesso printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" with_version: "%{id}, v%{version}" redaction: + create: + flash: Edição criada. + destroy: + error: Houve um erro de destruir esta edição. + flash: Edição destruída. + not_empty: A edição não está vazia. Por favor, elimine todas as versões pertencentes a esta edição antes de destruí-la. edit: description: Descrição + heading: Editar redação + submit: Salvar redação + title: Editar redação + index: + empty: Nenhuma redação para mostrar. + heading: Lista de redações + title: Lista de redações new: description: Descrição + heading: Digite informações para a nova redação + submit: Criar redação + title: Criando uma nova redação show: + confirm: Tem certeza? description: "Descrição:" + destroy: Remover esta edição + edit: Reformar esta edição + heading: Mostrando a edição "%{title}" + title: Mostrando edição + user: "Criador:" + update: + flash: Alterações salvas. site: edit: anon_edits: (%{link}) - anon_edits_link: http://wiki.openstreetmap.org/wiki/Pt-br:Disabling_anonymous_edits anon_edits_link_text: Descubra se é esse o seu caso. flash_player_required: Você precisa de um tocador Flash para usar o Potlatch, o editor Flash do OpenStreetMap. Você pode baixar o Flash Player da Adobe.com. Outras opções estão disponíveis para editar o OpenStreetMap. + id_not_configured: iD não foi configurado no_iframe_support: Seu navegador não suporta iframes HTML, que são necessários para que esse recurso. not_public: Você não configurou suas edições para serem públicas. not_public_description: Você não pode editar o mapa até que você configure suas edições para serem públicas, o que pode fazer na sua %{user_page}. @@ -1294,20 +1330,15 @@ pt-BR: potlatch_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch, você deve deselecionar a linha ou ponto atual, se editando no modo de edição ao vivo, ou clicar em salvar se estiver editando offline. user_page_link: página de usuário index: + createnote: Adicionar uma nota js_1: Você está usando um navegador sem suporte a JavaScript, ou está com o JavaScript desativado. js_2: O OpenStreetMap usa JavaScript para a navegação dos mapas. license: - license_name: Creative Commons de Atribuição-Compartilhamento pela Mesma Licença 2.0 - license_url: http://creativecommons.org/licenses/by-sa/2.0/ - notice: Licenciado sob a %{license_name} para o %{project_name} e seus colaboradores. - project_name: Projeto OpenStreetMap - project_url: http://openstreetmap.org + copyright: Direitos autorais de OpenStreetMap e contribuidores sob uma licença aberta permalink: Link Permanente remote_failed: Edição falhou - certifique-se de que o JOSM ou o Merkaartor estão carregados e que o Controle Remoto está ativado shortlink: Atalho key: - map_key: Legenda - map_key_tooltip: Chave para o mapa table: entry: admin: Limite Administrativo @@ -1393,7 +1424,6 @@ pt-BR: preview: Pré-visualizar search: search: Buscar - search_help: "exemplos: 'Brasília', 'Av. Paulista, São Paulo', ou 'hospitals near Belo Horizonte'. mais exemplos..." submit_text: Ir where_am_i: Onde estou? where_am_i_title: Descrever a localidade atual usando o motor de busca @@ -1409,6 +1439,8 @@ pt-BR: upload_trace: Envie as trilhas de GPS delete: scheduled_for_deletion: Trilha marcada para ser apagada + description: + description_without_count: Arquivo GPX de %{user} edit: description: "Descrição:" download: baixar @@ -1427,7 +1459,11 @@ pt-BR: visibility: "Visibilidade:" visibility_help: o que isso significa? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=pt-br + georss: + title: Trilhas de GPS do OpenStreetMap list: + description: Consultar últimos carregamentos de trilhas de GPS + empty_html: Nada aqui por enquanto. Carregue uma nova trilha ou aprenda mais sobre trilhas de GPS na página wiki (em inglês). public_traces: Trilhas Públicas de GPS public_traces_from: Trilhas de GPS públicas de %{user} tagged_with: " etiquetadas com %{tags}" @@ -1469,14 +1505,13 @@ pt-BR: trace_header: see_all_traces: Ver todas as trilhas see_your_traces: Ver todas as suas trilhas - traces_waiting: Você tem %{count} trilhas esperando para subir. Por favor considere esperar que elas terminem antes de subir mais, para não bloquear a fila para outros usuários. upload_trace: Enviar uma trilha trace_optionals: tags: Etiquetas trace_paging_nav: - next: Seguinte » - previous: « Anterior - showing_page: Mostrando página %{page} + newer: Trilhas mais recentes + older: Trilhas mais antigas + showing_page: Página %{page} view: delete_track: Apague esta trilha description: "Descrição:" @@ -1516,6 +1551,9 @@ pt-BR: email never displayed publicly: (nunca mostrado publicamente) flash update success: Informação de usuário atualizada com sucesso. flash update success confirm needed: Informação de usuário atualizada com sucesso. Verifique sua caixa de entrada do email para confirmar seu novo endereço. + gravatar: + gravatar: Use o Gravatar + link text: O que é isto? home location: "Localização:" image: "Imagem:" image size hint: (imagens quadradas, com pelo menos 100x100, funcionam melhor) @@ -1551,13 +1589,13 @@ pt-BR: update home location on click: Atualizar localização ao clicar no mapa? confirm: already active: Esse conta já foi confirmada. - before you start: Nós sabemos que você deve estar com pressa para começar a mapear, mas antes, você pode querer preencher mais algumas informações sobre você no formulário abaixo. button: Confirmar - heading: Confirmar uma conta de usuário + heading: Verificar o seu e-mail! + introduction_1: Enviamos um e-mail de confirmação. + introduction_2: Confirme a sua conta clicando no link no e-mail e você será capaz de iniciar o mapeamento. press confirm button: Pressione o botão de confirmação abaixo para ativar sua conta. - reconfirm: Já faz algum tempo que você se cadastrou, por isso você precisa reenviar um novo email de confirmação. - success: Conta ativada, obrigado! - unknown token: Parece que este token não existe. + reconfirm_html: Caso você precisar de nós para reenviar o e-mail de confirmação, clique aqui. + unknown token: Esse código de confirmação expirou ou não existe. confirm_email: button: Confirmar failure: Um endereço de email já foi confirmado com esse código. @@ -1577,8 +1615,8 @@ pt-BR: heading: Usuários hide: Ocultar Usuários Selecionados showing: - one: Mostrando página %{page} (%{first_item} de %{items}) - other: Mostrando página %{page} (%{first_item}-%{last_item} de %{items}) + one: Página %{page} (%{first_item} de %{items}) + other: Página %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} criado no computador %{ip_address} em %{date}" summary_no_ip: "%{name} criado em %{date}" title: Usuários @@ -1593,8 +1631,6 @@ pt-BR: lost password link: Esqueceu sua senha? new to osm: Primeira vez no OpenStreetMap? no account: Não possui uma conta? - notice: Saiba mais sobre a mudança na licença do OpenStreetMap (traduções) (discussão) - notice_terms: O OpenStreetMap irá trocar sua licença em 1 de Abril de 2012. É tão aberta quanto a atual, mas as informações legais se encaixam melhor em nossa base de dados de mapas. Nós ficaríamos felizes de manter suas contribuições no OpenStreetMap, mas nós apenas poderemos fazer isso se você permitir distribui-la sob a nova licença. Do contrário, teremos que remover suas contribuições da base de dados

    Por favor faça o login, e tome alguns segundos para revisar e aceitar os novos termos. Muito obrigado! openid: "%{logo} OpenID:" openid invalid: Desculpe, mas parece que seu OpenID está malformado. openid missing provider: Desculpe, não consegui contatar o seu provedor OpenID @@ -1639,19 +1675,21 @@ pt-BR: title: Senha esquecida make_friend: already_a_friend: Você já é amigo de %{name}. + button: Adicionar como amigo failed: Desculpe, erro ao adicionar %{name} como seu amigo. - success: "%{name} agora é seu amigo." + heading: Adicionar %{user} como amigo? + success: "%{name} agora é seu amigo!" new: + about: + header: Livre e editável + html: "

    Diferente de outros mapas, OpenStreetMap é completamente criado por pessoas como você,\ne é livre para todos arrumarem, atualizarem, baixarem e usarem.

    \n

    Inscreva-se para começar a contribuir. Nós enviaremos um email para confirmar sua conta.

    " confirm email address: "Confirme o Endereço de Email:" - confirm password: "Confirme a Senha:" + confirm password: "Confirmar senha:" contact_webmaster: Por favor contate o webmaster (em inglês) para que uma conta seja criada - nós a criaremos o mais rápido possível. - continue: Continuar + continue: Registrar-se display name: "Nome a ser exibido:" display name description: Seu nome de usuário disponível publicamente. Você pode mudá-lo posteriormente nas preferências. email address: "Endereço de Email:" - fill_form: Preencha o formulário e lhe enviaremos um email rapidamente para ativar sua conta. - flash create success message: Obrigado por se cadastrar. Nós mandamos uma confirmação para %{email} e assim que você confirmar sua conta você poderá começar a mapear.

    Se você usa um sistema antispam que envia pedido de confirmação assegure-se que você adicionou o endereço webmaster@openstreetmap.org à sua lista de e-mails confiáveis, já que nós não conseguimos responder a nenhum pedido de confirmação. - heading: Criar uma nova conta de usuário license_agreement: Quando você confirmar sua conta, você precisará concordar com os Termos de Colaborador. no_auto_account_create: Infelizmente não foi possível criar uma conta para você automaticamente. not displayed publicly: Não será exibido publicamente (veja a política de privacidade) @@ -1661,7 +1699,7 @@ pt-BR: password: "Senha:" terms accepted: Obrigado por aceitar os novos termos de contribuição! terms declined: Lamentamos que você tenha decidido não aceitar os novos Termos do Colaborador. Para obter mais informações, consulte esta página do wiki . - title: Criar Conta + title: Registrar-se use openid: Alternativamente, use o %{logo} OpenID para fazer o login no_such_user: body: Desculpe, não há nenhum usuário com o nome %{user}. Por favor verifique se você digitou corretamente, ou talvez o link que você tenha clicado esteja errado. @@ -1672,6 +1710,8 @@ pt-BR: nearby mapper: Mapeador próximo your location: Sua localização remove_friend: + button: Desfazer amizade + heading: Desfazer amizade com %{user}? not_a_friend: "%{name} não é um de seus amigos." success: "%{name} foi removido de seus amigos." reset_password: @@ -1708,12 +1748,12 @@ pt-BR: you need to accept or decline: Por favor leia e, em seguida, aceite ou recuse os novos Termos do Colaborador para continuar. view: activate_user: ativar este usuário - add as friend: adicionar como amigo + add as friend: Adicionar como amigo ago: (%{time_in_words_ago} atrás) - block_history: ver bloqueios recebidos - blocks by me: bloqueios por mim - blocks on me: bloqueios sobre mim - comments: comentários + block_history: bloqueios recebidos + blocks by me: Bloqueios por mim + blocks on me: Bloqueios sobre mim + comments: Comentários confirm: Confirmar confirm_user: confirmar este usuário create_block: bloquear este usuário @@ -1725,31 +1765,35 @@ pt-BR: deactivate_user: desativar este usuário delete_user: excluir este usuário description: Descrição - diary: diário - edits: edições + diary: Diário + edits: Edições email address: "Endereço de email:" - friends_changesets: Navegar em todos os conjuntos de alterações dos amigos - friends_diaries: Navegar em todas as entradas de diário dos amigos + friends_changesets: Conjuntos de alterações dos amigos + friends_diaries: Entradas de diário dos amigos hide_user: esconder esse usuário - if set location: Se você definir a sua localização, um mapa bonito vai aparecer abaixo. Você pode definir sua localização na página de %{settings_link}. + if set location: Defina o local de sua casa na página de %{settings_link} para ver usuários próximos. km away: "%{count}km de distância" latest edit: "Última edição %{ago}:" m away: "%{count}m de distância" mapper since: "Mapeador desde:" - moderator_history: ver bloqueios aplicados - my comments: meus comentários - my diary: meu diário - my edits: minhas edições - my settings: minhas configurações - my traces: minhas trilhas + moderator_history: bloqueios aplicados + my comments: Meus comentários + my diary: Meu diário + my edits: Minhas edições + my messages: Minhas mensagens + my notes: Minhas notas de mapa + my profile: Meu Perfil + my settings: Minhas configurações + my traces: Minhas trilhas nearby users: Outros usuários próximos - nearby_changesets: Navegar em todos os conjuntos de alterações de usuários próximos - nearby_diaries: Navegar em todas as entradas de diário dos usuários próximos + nearby_changesets: Conjuntos de alterações de usuários próximos + nearby_diaries: Entradas de diário dos usuários próximos new diary entry: nova entrada de diário no friends: Você ainda não adicionou amigos. no nearby users: Ainda não há outros usuários mapeando por perto. + notes: Notas de mapa oauth settings: configurações do oauth - remove as friend: remover da lista de amigos + remove as friend: Desfazer amizade role: administrator: Este usuário é um administrador grant: @@ -1759,11 +1803,11 @@ pt-BR: revoke: administrator: Revogar acesso de administrador moderator: Revogar acesso de moderador - send message: enviar mensagem + send message: Enviar mensagem settings_link_text: configurações spam score: "Contagem de spam:" status: "Estado:" - traces: trilhas + traces: Trilhas unhide_user: mostrar esse usuário user location: Local do usuário your friends: Seus amigos @@ -1821,11 +1865,14 @@ pt-BR: creator_name: Criador display_name: Usuário bloqueado edit: Editar + next: Próximo » not_revoked: (não retirado) + previous: « Anterior reason: Razão para o bloqueio revoke: Cancelar! revoker_name: Retirado por show: Exibir + showing_page: Página %{page} status: Status period: one: uma hora @@ -1873,3 +1920,25 @@ pt-BR: fail: Não foi possível retirar o papel "%{role}" do usuário "%{name}". Por favor cheque se o usuário e o papel são ambos válidos. heading: Confirmar remoção de papel title: Confirmar remoção de papel + welcome_page: + add_a_note: + paragraph_1_html: Se você só quer que algo pequeno seja arrumado, e não tem tempo para se inscrever e aprender como editar, é fácil adicionar uma nota. + paragraph_2_html: "Basta ir ao mapa e clique no ícone da nota: . Isto irá adicionar um marcador ao mapa, que você pode mover \narrastando-o. Adicione a sua mensagem e clique em salvar, e outros mapeadores irão investigar." + title: Sem tempo para editar? Adicione uma nota! + basic_terms: + editor_html: Um editor é um programa ou website que você pode usar para editar o mapa. + node_html: Um nódulo é um ponto no mapa, como um restaurante ou uma árvore. + paragraph_1_html: OpenStreetMap tem seus próprios jargões. Aqui estão algumas palavras-chave que virão comumente. + tag_html: Uma etiqueta é uma porção de dados sobre um nódulo ou caminho, como o nome de um restaurante ou o limite de velocidade de uma rodovia. + title: Condições Básicas para Mapear + way_html: Um caminho é uma linha ou área, como uma estrada, córrego, lago ou edifício. + introduction_html: Bem vindo ao OpenStreetMap, o mapa livre e editável do mundo. Agora que você se inscreveu, você está pronto para começar a mapear. Aqui está um guia rápido com as coisas mais importantes que você precisa saber. + questions: + paragraph_1_html: Precisa de ajuda para mapear, ou não está claro como usar o OpenStreetMap? Tenha suas perguntas respondidas no website de ajuda. + title: Alguma pergunta? + start_mapping: Iniciando Mapeamento + title: Bem-vindo(a)! + whats_on_the_map: + off_html: O que não está incluído é informação opinativa, como clasificações, características históricas ou hipotéticas, bem como dados de fontes protegidas por direitos autorais. A não ser que você tenha permissão especial, não copie de outros mapas online ou de mapas em papel. + on_html: "OpenStreetMap é o lugar para mapear coisas que são simultaneamente reais e atuais -\nisso inclui milhões de edifícios, estradas, e outros detalhes sobre lugares. Você pode mapear quaisquer características do mundo real que te interessam." + title: O que tem no mapa diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 21a2c970655..f4f2c20f0dc 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -2,17 +2,37 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Crazymadlover +# Author: FranciscoDS # Author: Giro720 # Author: Gmare # Author: Hamilton Abreu +# Author: Imperadeiro98 # Author: Indech +# Author: JasonZe +# Author: Jgpacker +# Author: Jgrocha +# Author: Luckas # Author: Luckas Blade # Author: Malafaya # Author: McDutchie +# Author: Nemo bis # Author: Rsbarbosa +# Author: Ruben # Author: SandroHc # Author: Waldir pt: + about_page: + community_driven_html: "A comunidade do OpenStreetMap é diversa, apaixonada, e aumenta diariamente.\nEntre os nossos colaboradores encontra-se mapeadores entusiastas,\nprofissionais das áreas de sistemas geográficos, engenheiros que utilizam\nos servidores do OpenStreetMap, voluntários a mapear áreas afetadas\npor grandes desastres, e muitos mais.\nPara saber mais sobre a nossa comunidade, veja os diários dos editores,\nblogues da comunidade, e o sítio da OSM Foundation." + community_driven_title: Dirigido pela Comunidade + copyright_html: ©Colaboradores
    do OpenStreetMap + lede_text: O OpenStreetMap é desenvolvido por uma comunidade voluntária de mapeadores que contribuem e mantêm atualizados os dados sobre estradas, trilhos, cafés, estações ferroviárias e muito mais por todo o mundo. + local_knowledge_html: O OpenStreetMap valoriza o conhecimento local. Os colaboradores utilizam fotografias aéreas, dispositivos GPS, e mapas do terreno para verificar que a informação no OpenStreetMap é rigorosa e atualizada. + local_knowledge_title: Conhecimento Local + next: Seguinte + open_data_html: "O OpenStreetMap é constituído por dados abertos: qualquer\npessoa tem a liberdade de usar os dados para qualquer fim desde\ncredite a autoria do OpenStreetMap e os seus colaboradores.\nSe você alterar os dados ou criar algo com os dados, pode distribuir\no produto resultante apenas sob a mesma licença. Consulte a página sobre direitos de autor e licenciamento para mais informações." + open_data_title: Dados Abertos + partners_title: Parceiros + used_by: O %{name} fornece dados a centenas de sítios na internet, aplicações de telemóveis e outros dispositivos activerecord: attributes: diary_comment: @@ -21,7 +41,7 @@ pt: language: Língua latitude: Latitude longitude: Longitude - title: Título + title: Assunto user: Utilizador friend: friend: Amigo @@ -30,7 +50,7 @@ pt: body: Conteúdo recipient: Destinatário sender: Remetente - title: Título + title: Assunto trace: description: Descrição latitude: Latitude @@ -41,14 +61,14 @@ pt: user: Utilizador visible: Visível user: - active: Activo + active: Ativo description: Descrição display_name: Nome visualizado email: E-mail - languages: Idiomas + languages: Línguas pass_crypt: Palavra-passe models: - acl: Lista de Controlo do Acesso + acl: Aceder à Lista de Controlo changeset: Conjunto de alterações changeset_tag: Etiqueta do conjunto de alterações country: País @@ -88,208 +108,117 @@ pt: not_a_moderator: Tem de ser um moderador para poder fazer essa ação. setup_user_auth: blocked: O seu acesso à API foi bloqueado. Por favor aceda à página web do OpenStreetMap e entre na sua conta para saber mais. - need_to_see_terms: O seu acesso à API está temporariamente suspenso. Por favor aceda à página web do OpenStreetMap e entre na sua conta para ver os Termos de Contribuição. Não precisa de aceitar os termos mas tem de os ver. + need_to_see_terms: O seu acesso à API está temporariamente suspenso. Por favor aceda à página web do OpenStreetMap e entre na sua conta para ver os Termos de Colaborador. Não precisa de aceitar os termos mas tem de os ver. browse: + anonymous: anónimo changeset: - changeset: "Conjunto de alterações: %{id}" + belongs_to: Autor changesetxml: Conjunto de alterações XML - download: Descarregar %{changeset_xml_link} ou %{osmchange_xml_link} feed: title: Conjunto de alterações %{id} title_comment: Conjunto de alterações %{id} - %{comment} + node: Nós (%{count}) + node_paginated: Nós (%{x}-%{y} of %{count}) osmchangexml: XML no formato osmChange - title: Conjunto de alterações - changeset_details: - belongs_to: "Feito por:" - bounding_box: "Área delimitadora:" - box: caixa - closed_at: "Fechado em:" - created_at: "Criado em:" - has_nodes: - one: "Tem %{count} nó:" - other: "Tem %{count} nós:" - has_relations: - one: "Tem %{count} relação:" - other: "Tem %{count} relações:" - has_ways: - one: "Tem %{count} linha:" - other: "Tem %{count} linhas:" - no_bounding_box: Não foi guardada uma área delimitadora deste conjunto de alterações. - show_area_box: Mostrar Caixa de Área - common_details: - changeset_comment: "Comentário:" - deleted_at: "Eliminado em:" - deleted_by: "Eliminado por:" - edited_at: "Editado em:" - edited_by: "Editado por:" - in_changeset: "No conjunto de alterações:" - version: "Versão:" + relation: Relações (%{count}) + relation_paginated: Relações (%{x}-%{y} of %{count}) + title: "Conjunto de alterações: %{id}" + way: Linhas (%{count}) + way_paginated: Linhas (%{x}-%{y} de %{count}) + closed: Fechado + closed_by_html: Fechado há %{time} atrás por %{user} + closed_html: Fechado há %{time} atrás containing_relation: entry: Relação %{relation_name} entry_role: Relação %{relation_name} (como %{relation_role}) - map: - deleted: Eliminado - edit: - area: Editar área - node: Editar nó - relation: Editar relação - way: Editar linha - larger: - area: Ver área num mapa maior - node: Ver nó num mapa maior - relation: Ver relação num mapa maior - way: Ver linha num mapa maior - loading: A carregar… - navigation: - all: - next_changeset_tooltip: Conjunto de alterações seguinte - next_node_tooltip: Nó seguinte - next_relation_tooltip: Relação seguinte - next_way_tooltip: Linha seguinte - prev_changeset_tooltip: Conjunto de alterações anterior - prev_node_tooltip: Nó anterior - prev_relation_tooltip: Relação anterior - prev_way_tooltip: Linha anterior - user: - name_changeset_tooltip: Ver edições de %{user} - next_changeset_tooltip: Próxima edição por %{user} - prev_changeset_tooltip: Edição anterior por %{user} + created: Criado + created_by_html: Criado há %{time} atrás por %{user} + created_html: Criado há %{time} atrás + deleted_by_html: Eliminado há %{time} atrás por %{user} + download_xml: Descarregar XML + edited_by_html: Editado há %{time} atrás por %{user} + in_changeset: Conjunto de alterações + location: "Localização:" + no_comment: (sem comentário) node: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Descarregar XML - edit: editar - node: Nó - node_title: "Nó: %{node_name}" - view_history: ver histórico - node_details: - coordinates: "Coordenadas:" - part_of: "Faz parte de:" - node_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Descarregar XML - node_history: Histórico do nó - node_history_title: "Histórico do nó: %{node_name}" - view_details: ver detalhes + history_title: "Histórico do Nó: %{name}" + title: "Nó: %{name}" not_found: - sorry: Lamentamos, não foi possível encontrar o %{type} com o id %{id}. + sorry: "Lamentamos, não foi possível encontrar %{type} #%{id}." type: changeset: conjunto de alterações node: nó relation: relação way: linha - paging_nav: - of: de - showing_page: Mostrando página + note: + closed_by: Resolvido por %{user} há %{when} atrás + closed_by_anonymous: Resolvido por um anónimo há %{when} atrás + closed_title: "Erro resolvido #%{note_name}" + commented_by: Comentário de %{user} há %{when} atrás + commented_by_anonymous: Comentário de um anónimo há %{when} atrás + hidden_by: Ocultado por %{user} há %{when} atrás + hidden_title: "Erro ocultado #%{note_name}" + new_note: Reportar Erro + open_by: Reportado por %{user} há %{when} atrás + open_by_anonymous: Reportado por um anónimo há %{when} atrás + open_title: "Erro não resolvido #%{note_name}" + reopened_by: Reaberto por %{user} há %{when} atrás + reopened_by_anonymous: Reaberto por um anónimo há %{when} atrás + title: "Erro: %{id}" + part_of: Faz parte de redacted: - message_html: A versão %{version} do elemento %{type} não pode ser mostrado porque foi redigido. Por favor consulte %{redaction_link} mais obter mais informações.. - redaction: Redação % {id} + message_html: A versão %{version} do elemento %{type} não pode ser mostrada porque foi suprimida. Por favor consulte %{redaction_link} para obter mais informações. + redaction: Revisão %{id} type: node: nó relation: relação way: linha relation: - download: "%{download_xml_link} ou %{view_history_link}" - download_xml: Descarregar XML - relation: Relação - relation_title: "Relação: %{relation_name}" - view_history: ver histórico - relation_details: - members: "Membros:" - part_of: "Faz parte de:" - relation_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Descarregar XML - relation_history: Histórico da Relação - relation_history_title: "Histórico da Relação: %{relation_name}" - view_details: ver detalhes + history_title: "Histórico da Relação: %{name}" + members: Membros + title: "Relação: %{name}" relation_member: entry_role: "%{type} %{name} como %{role}" type: node: Nó relation: Relação way: Linha - start: - manually_select: Selecionar manualmente uma área diferente - view_data: Ver dados para a vista atual do mapa start_rjs: - data_frame_title: Dados - data_layer_name: Inspecionar dados técnicos do mapa - details: Detalhes - drag_a_box: Arraste uma seleção no mapa para escolher uma área - edited_by_user_at_timestamp: Editado por [[user]] em [[timestamp]] - hide_areas: Ocultar áreas - history_for_feature: Histórico de [[feature]] + feature_warning: A carregar %{num_features} elementos, o que pode tornar o carregamento bastante lento ou bloquear. Mesmo assim quer ver estes elementos todos? load_data: Carregar Dados - loaded_an_area_with_num_features: Carregou uma área com [[num_features]] elementos. Alguns navegadores de Internet podem ter problemas em mostrar esta quantidade de dados. Geralmente os navegadores funcionam melhor a mostrar até 100 elementos de cada vez. Mais do que isso o navegador poderá ficar muito lento ou até bloquear. Se tem a certeza que quer mostrar esta quantidade de elementos clique no botão seguinte. - loading: A carregar... - manually_select: Selecionar manualmente uma área diferente - object_list: - api: Descarregar esta área no formato XML OSM através da API - back: Mostrar lista de objetos - details: Detalhes - heading: Lista de objetos - history: - type: - node: Nó [[id]] - way: Linha [[id]] - selected: - type: - node: Nó [[id]] - way: Linha [[id]] - type: - node: Nó - way: Linha - private_user: utilizador privado - show_areas: Mostrar áreas - show_history: Mostrar Histórico - unable_to_load_size: "Não foi possível carregar: O tamanho da caixa de [[bbox_size]] é muito grande (deve ser menor que %{max_bbox_size})" - wait: Espere... - zoom_or_select: Aproximar ou seleccionar uma área do mapa para visionamento + loading: A carregar… tag_details: - tags: "Etiquetas:" + tags: Etiquetas wiki_link: key: A página wiki com a descrição da etiqueta %{key} tag: A página wiki com a descrição da etiqueta %{key}=%{value} wikipedia_link: A página %{page} na Wikipédia timeout: - sorry: Lamentamos, demorou demasiado tempo a obter os dados para o %{type} com o id %{id}. + sorry: "Lamentamos, demorou demasiado tempo a obter os dados do pedido: %{type} com o id %{id}." type: changeset: alterações node: nó relation: relação way: linha + version: Versão + view_details: Ver Detalhes + view_history: Ver Histórico way: - download: "%{download_xml_link}, %{view_history_link} ou %{edit_link}" - download_xml: Descarregar XML - edit: editar - view_history: ver histórico - way: Linha - way_title: "Linha: %{way_name}" - way_details: also_part_of: - one: também faz parte da linha %{related_ways} - other: também faz parte das linhas %{related_ways} - nodes: "Nós:" - part_of: "Faz parte de:" - way_history: - download: "%{download_xml_link} ou %{view_details_link}" - download_xml: Descarregar XML - view_details: ver detalhes - way_history: Histórico da Linha - way_history_title: "Histórico da Linha: %{way_name}" + one: parte da linha %{related_ways} + other: parte das linhas %{related_ways} + history_title: "Histórico da Linha: %{name}" + nodes: Nós + title: "Linha: %{name}" changeset: changeset: anonymous: Anónimo - big_area: (grande) - no_comment: (sem comentário) no_edits: (nenhuma edição) - show_area_box: Mostrar Caixa de Área - still_editing: (ainda a editar) view_changeset_details: Ver detalhes do conjunto de alterações changeset_paging_nav: next: Seguinte » previous: « Anterior - showing_page: Mostrando página %{page} + showing_page: Página %{page} changesets: area: Área comment: Comentário @@ -297,24 +226,17 @@ pt: saved_at: Gravado em user: Utilizador list: - description: Mudanças recentes - description_bbox: Conjunto de alterações em %{bbox} - description_friend: Alterações feitas pelos seus amigos - description_nearby: Alterações feitas por utilizadores das redondezas - description_user: Conjunto de alterações feitas por %{user} - description_user_bbox: Conjunto de alterações feitas por %{user} na área %{bbox} - heading: Conjunto de alterações - heading_bbox: Conjunto de alterações - heading_friend: Conjunto de alterações - heading_nearby: Conjunto de alterações - heading_user: Conjunto de alterações - heading_user_bbox: Conjunto de alterações + empty: Não foi encontrado nenhum conjunto de alterações. + empty_area: Nenhum conjunto de alterações nesta área. + empty_user: Nenhum conjunto de alterações deste utilizador. + load_more: Ver mais + no_more: Sem mais conjuntos de alterações para ver. + no_more_area: Sem mais conjunto de alterações nesta área. + no_more_user: Sem mais conjunto de alterações deste utilizador. title: Conjuntos de alterações - title_bbox: Conjuntos de alterações dentro de %{bbox} title_friend: Conjuntos de alterações feitos pelos seus amigos title_nearby: Conjuntos de alterações feitos por utilizadores das redondezas title_user: Conjuntos de alterações de %{user} - title_user_bbox: Conjuntos de alterações de %{user} dentro de %{bbox} timeout: sorry: Pedimos desculpa, mas a lista de conjuntos de alterações que pediu excedeu o tempo limite de resposta. diary_entry: @@ -332,8 +254,9 @@ pt: hide_link: Ocultar este comentário diary_entry: comment_count: - one: 1 comentário + one: "%{count} comentário" other: "%{count} comentários" + zero: Sem comentários comment_link: Comentar esta entrada confirm: Confirmar edit_link: Editar esta entrada @@ -342,7 +265,7 @@ pt: reply_link: Responder a esta entrada edit: body: "Mensagem:" - language: "Idioma:" + language: "Língua:" latitude: "Latitude:" location: "Localização:" longitude: "Longitude:" @@ -368,7 +291,7 @@ pt: newer_entries: Entradas Recentes no_entries: Diário sem entradas older_entries: Entradas Mais Antigas - recent_entries: "Entradas recentes no diário:" + recent_entries: Entradas recentes no diário title: Diário dos editores title_friends: Diários dos amigos title_nearby: Diários dos Editores das redondezas @@ -380,7 +303,7 @@ pt: new: title: Nova entrada no diário no_such_entry: - body: Desculpe, não há nenhuma entrada de diário ou comentário com o identificador (ID) % {id}. Por favor, verifique a ortografia, caso contrário a ligação está errada ou deixou de existir. + body: Não foi encontrada nenhuma entrada de diário ou comentário com o identificador (ID) %{id}. Por favor, verifique que escreveu corretamente o endereço; caso contrário a ligação que seguiu está errada ou deixou de existir. heading: Não existe a entrada com o identificador (ID) %{id} title: Esta entrada de diário não existe view: @@ -391,7 +314,10 @@ pt: title: Diário de %{user} | %{title} user_title: Diário de %{user} editor: - default: Padrão (actualmente %{name}) + default: Padrão (atualmente %{name}) + id: + description: iD (novo editor) + name: iD potlatch: description: Potlatch 1 name: Potlatch 1 @@ -407,7 +333,7 @@ pt: area_to_export: Área a exportar embeddable_html: HTML (mostra mapa interativo noutros sites) todos os mapas export_button: Exportar - export_details: Os dados do OpenStreetMap encontram-se sob a licença Creative Commons Atribuição - CompartilhaIgual 2.0 (CC BY-SA 2.0). + export_details: Os dados do OpenStreetMap encontram-se sob a licença Open Data Commons Open Database License (ODbL). format: Formato format_to_export: Formato da exportação image_size: Tamanho da Imagem @@ -423,29 +349,45 @@ pt: paste_html: Copie e cole o código num site para mostrar o mapa interativo nesse site scale: Escala too_large: - body: Esta área é demasiado grande para exportar em XML do OpenStreetMap. Por favor aproxime a vista ou selecione uma área mais pequena. - heading: Área Muito Grande + advice: "Se a exportação acima falhar, por favor, considere o uso de uma das fontes listadas abaixo:" + body: Esta área é demasiado grande para exportar em XML do OpenStreetMap. Por favor aproxime a vista ou selecione uma área mais pequena. Para exportar esta área grande utilize uma das seguintes fontes. + geofabrik: + description: Extratos atualizados regularmente de continentes, países e cidades selecionadas + title: Downloads do Geofabrik + metro: + description: Extratos das principais cidades do mundo e seus arredores + title: Extratos do Metro + other: + description: Fontes adicionais listadas no wiki do OpenStreetMap + title: Outras Fontes + overpass: + description: Fazer o download desta caixa delimitadora através de um espelho do banco de dados do OpenStreetMap + planet: + description: Cópias atualizadas regularmente da base de dados completa do OpenStreetMap + title: Planeta OSM zoom: Zoom - start_rjs: - add_marker: Adicionar um ponto de interesse no mapa - change_marker: Alterar posição do ponto de interesse - click_add_marker: Clique no mapa para adicionar um ponto de interesse - drag_a_box: Clique e arraste no mapa para escolher uma área - export: Exportar - manually_select: Escolher manualmente uma área diferente - view_larger_map: Ver num mapa maior + title: Exportar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Apenas clique em ou no mesmo ícone na interface do mapa.\nIsto irá adicionar um marcador ao mapa, o qual pode mover arrastando. Adicione a sua mensagem, clique em salvar, e outros utilizadores como você irão investigar." + join_the_community: + explanation_html: Se você reparou num problema com os dados do nosso mapa, como por exemplo uma estrada ou o seu adereço em falta, a melhor maneira de proceder é juntando-se à comunidade do OpenStreetMap e adicionando ou reparando os dados por si mesmo. + title: Junte-se à comunidade + title: Como Ajudar + other_concerns: + explanation_html: Se você tem preocupações sobre o modo como os nossos dados estão a ser usados ou sobre os conteúdos, por favor consulte a nossa página de direitos de autor para mais informações legais, ou contacte o grupo de trabalho OSMF apropriado. + title: Outras preocupações + title: Reportar um problema / Corrigir o mapa geocoder: description: title: geonames: Resultado de GeoNames - osm_namefinder: "%{types} de OpenStreetMap Namefinder" osm_nominatim: Resultado de OpenStreetMap Nominatim types: cities: Cidades places: Lugares towns: Municípios - description_osm_namefinder: - prefix: "%{distance} %{direction} de %{type}" direction: east: este north: norte @@ -466,16 +408,26 @@ pt: title: ca_postcode: Resultados de Geocoder.CA geonames: Resultados de GeoNames + geonames_reverse: Resultados de GeoNames latlon: Resultados Internos - osm_namefinder: Resultados de OpenStreetMap Namefinder osm_nominatim: Resultados de OpenStreetMap Nominatim + osm_nominatim_reverse: Resultados de OpenStreetMap Nominatim uk_postcode: Resultados de NPEMap / FreeThe Postcode us_postcode: Resultados de Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} de %{parentname})" - suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: + admin_levels: + level10: Fronteira de Subúrbio + level2: Fronteira de País + level4: Fronteira de Estado + level5: Fronteira de Região + level6: Fronteira de Condado + level8: Fronteira de Cidade + level9: Fronteira de Freguesia prefix: + aerialway: + chair_lift: Teleférico + drag_lift: Elevador de esqui + station: Estação de elevador de esqui aeroway: aerodrome: Aeródromo apron: Plataforma de estacionamento @@ -530,6 +482,7 @@ pt: fuel: Combustível grave_yard: Cemitério gym: Centro de Fitness / Ginásio + hall: Salão health_centre: Centro de saúde hospital: Hospital hotel: Hotel @@ -564,9 +517,11 @@ pt: school: Escola shelter: Abrigo shop: Loja + shopping: Compras shower: Chuveiro social_centre: Centro social social_club: Clube Social + social_facility: Serviços sociais studio: Estúdio supermarket: Supermercado swimming_pool: Piscina @@ -578,8 +533,10 @@ pt: university: Universidade vending_machine: Máquina de venda automática veterinary: Clínica veterinária + village_hall: Junta de Freguesia waste_basket: Caixote do Lixo wifi: Acesso WiFi + youth_centre: Centro de juventude boundary: administrative: Fronteira Administrativa census: Fronteira de Censos @@ -593,6 +550,9 @@ pt: "yes": Ponte building: "yes": Edifício + emergency: + fire_hydrant: Boca de incêndio + phone: Telefone de emergência highway: bridleway: Pista de cavalos bus_guideway: Faixa de Autocarros de Guia @@ -603,7 +563,9 @@ pt: emergency_access_point: Ponto de acesso de emergência footway: Caminho pedestre ford: Vau + living_street: Rua residencial milestone: Marco quilométrico + minor: Estrada secundária motorway: Auto-Estrada motorway_junction: Saída de Auto-Estrada motorway_link: Ligação a Auto-Estrada @@ -612,6 +574,7 @@ pt: platform: Plataforma de embarque primary: Estrada Nacional (Primária) primary_link: Ligação a Estrada Nacional (Primária) + proposed: Estrada em planeamento raceway: Autódromo residential: Rua residencial rest_area: Área de descanso @@ -623,6 +586,7 @@ pt: speed_camera: Radar steps: Escadas stile: Escada de vedação + street_lamp: Luminária tertiary: Estrada Municipal (Terciária) tertiary_link: Ligação a Estrada Municipal (Terciária) track: Carreiro florestal ou agrícola @@ -638,14 +602,17 @@ pt: building: Edifício castle: Castelo church: Igreja + citywalls: Muralhas da cidade fort: Forte house: Casa + icon: Ícone manor: Solar / Casa senhorial memorial: Memorial mine: Mina monument: Monumento museum: Museu ruins: Ruínas + tomb: Tumba tower: Torre wayside_cross: Cruzeiro wayside_shrine: Alminhas @@ -713,6 +680,8 @@ pt: airfield: Aeródromo militar barracks: Quartel bunker: Bunker + mountain_pass: + "yes": Passo de Montanha (portela) natural: bay: Baía beach: Praia @@ -722,6 +691,8 @@ pt: cliff: Precipício crater: Cratera dune: Duna + feature: Recurso natural + fell: Encosta fjord: Fiorde forest: Floresta geyser: Geiser @@ -741,8 +712,10 @@ pt: rock: Rocha scree: Escarpa de Roxas Soltas scrub: Matagal + shoal: Banco de areia spring: Nascente stone: Pedra + strait: Estreito tree: Árvore valley: Vale volcano: Vulcão @@ -778,6 +751,7 @@ pt: locality: Localidade moor: Ancoradouro municipality: Município + neighbourhood: Bairro postcode: Código postal region: Região sea: Mar @@ -795,6 +769,7 @@ pt: funicular: Funicular halt: Apeadeiro historic_station: Estação Ferroviária Histórica + junction: Entroncamento ferroviário level_crossing: Passagem de Nível light_rail: Metropolitano de Superfície miniature: Ferrovia em Miniatura @@ -802,8 +777,10 @@ pt: narrow_gauge: Ferrovia de Bitola Estreita platform: Plataforma ferroviária preserved: Ferrovia Preservada + proposed: Ferrovia em planeamento spur: Pequeno Ramal Ferroviário station: Estação Ferroviária + stop: Paragem ferroviária subway: Estação de Metropolitano subway_entrance: Entrada para Estação de Metropolitano switch: Agulha de ferrovia @@ -819,6 +796,7 @@ pt: beverages: Loja de Bebidas bicycle: Loja de Bicicletas books: Livraria + boutique: Boutique butcher: Talho car: Oficina car_parts: Loja de Peças para Automóvel @@ -832,6 +810,7 @@ pt: convenience: Loja de Conveniência copyshop: Centro de Cópias cosmetics: Loja de cosméticos + deli: Charcutaria department_store: Loja de Departamento / Grande Armazém discount: Loja de Descontos doityourself: Bricolage @@ -847,6 +826,7 @@ pt: furniture: Mobiliário gallery: Galeria garden_centre: Loja de Jardinagem + general: Loja de artigos gerais gift: Loja de Lembranças greengrocer: Loja de Frutas e Verduras grocery: Mercearia @@ -867,21 +847,26 @@ pt: organic: Loja de alimentos orgânicos outdoor: Loja de artigos para atividades ao ar livre pet: Loja de animais + pharmacy: Farmácia photo: Loja de Fotografia salon: Salão de beleza + second_hand: Loja de segunda mão shoes: Sapataria shopping_centre: Centro Comercial sports: Loja de Artigos Desportivos stationery: Papelaria supermarket: Supermercado + tailor: Alfaiate toys: Loja de Brinquedos travel_agency: Agência de Viagens video: Videoclube wine: Venda de Bebidas (Off License) + "yes": Loja tourism: alpine_hut: Albergue de Montanha artwork: Obra de arte attraction: Atracção + bed_and_breakfast: Pensão com pequeno-almoço incluído cabin: Cabana camp_site: Parque de campismo caravan_site: Parque de caravanas @@ -899,11 +884,13 @@ pt: viewpoint: Miradouro zoo: Jardim zoológico tunnel: + culvert: Conduta "yes": Túnel waterway: artificial: Curso de água artificial boatyard: Estaleiro Naval canal: Canal + connector: Conector Aquático dam: Barragem derelict_canal: Canal abandonado ditch: Vala @@ -918,66 +905,119 @@ pt: riverbank: Margem de rio stream: Ribeiro wadi: Uádi + water_point: Ponto de água waterfall: Queda de água weir: Represa + help_page: + help: + description: Coloque uma questão ou procure por respostas no fórum de perguntas e respostas do OpenStreetMap. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: O OpenStreetMap tem vários recursos para saber mais sobre o projeto, perguntar e responder a questões, e colaborativamente discutir e documentar vários tópicos sobre o mapa. + title: Obter Ajuda + welcome: + description: Comece por este guia rápido sobre os princípios básicos do OpenStreetMap. + title: Bem vindo ao OpenStreetMap + url: /welcome + wiki: + description: Navegue na wiki de documentação sobre o OpenStreetMap. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/Pt:Main_Page javascripts: + close: Fechar + edit_help: Mova o mapa e amplie a localização que pretende editar e depois clique aqui. + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda do Mapa disponível apenas no Mapa Padrão map: base: cycle_map: Mapa de Ciclismo + hot: Humanitário standard: Mapa Padrão transport_map: Transportes Públicos + copyright: © Colaboradores do OpenStreetMap + donate_link_text: + layers: + data: Dados técnicos do mapa + header: Camadas do Mapa + notes: Erros reportados no mapa + overlays: Ativar sobreposições para solucionar problemas do mapa + title: Camadas + locate: + popup: Está a {distance} {unit} deste ponto + title: Mostrar a minha localização + zoom: + in: Aproximar + out: Afastar + notes: + new: + add: Reportar Erro + intro: Para melhorar a informação no mapa, o erro que vai reportar é mostrado a outros editores, por isso descreva por favor de forma clara e precisa o problema no mapa. Caso seja necessário mude a posição do marco azul no centro do mapa (clicar e arrastar) para o sítio correto do mapa onde se encontra o erro. Obrigado. + show: + anonymous_warning: Este erro reportado inclui comentários de utilizadores anónimos que devem ser confirmados por fonte independente. + comment: Gravar + comment_and_resolve: Gravar como Resolvido + hide: Esconder + reactivate: Reabrir + resolve: Marcar como Resolvido + share: + cancel: Cancelar + center_marker: Centrar o mapa no marcador + custom_dimensions: Definir dimensões personalizadas + download: Descarregar + embed: HTML + format: "Formato:" + image: Imagem + image_size: A imagem mostrará a camada padrão em + include_marker: Incluir marcador + link: Ligação ou HTML + long_link: Link + paste_html: Colar HTML para incorporar na página web + scale: "Escala:" + short_link: Lig.Curta + short_url: URL curto + title: Partilhar + view_larger_map: Ver mapa maior site: + createnote_disabled_tooltip: A área do mapa é demasiado grande. Amplie o mapa para poder reportar um erro + createnote_tooltip: Reportar erro no mapa edit_disabled_tooltip: Área demasiado grande. Amplie para poder editar edit_tooltip: Editar o mapa - edit_zoom_alert: A área do mapa é demasiado grande. Amplie para poder editar o mapa. - history_disabled_tooltip: Amplie para poder ver o histórico de edições nesta área - history_tooltip: Ver histórico de edições nesta área do mapa - history_zoom_alert: Área demasiado grande. Amplie para poder ver o histórico de edições nesta área do mapa. + map_data_zoom_in_tooltip: Aproxime para ver dados do mapa + map_notes_zoom_in_tooltip: Aproxime para ver erros reportados layouts: + about: Sobre Nós community: Comunidade community_blogs: Blogues da Comunidade community_blogs_title: Blogues de membros da comunidade OpenStreetMap - copyright: Licença e Direitos de Autor - documentation: Documentação - documentation_title: Documentação do projeto + copyright: Direitos de Autor + data: Dados donate: Apoie o OpenStreetMap %{link} para o Fundo de Atualização do Hardware. - donate_link_text: doação edit: Editar edit_with: Editar com %{editor} export: Exportar - export_tooltip: "Exporta o mapa em vários formatos: imagem, XML ou HTML" + export_data: Exportar dados foundation: Fundação foundation_title: A Fundação OpenStreetMap gps_traces: Trilhos GPS gps_traces_tooltip: Gerir os trilhos GPS help: Ajuda - help_centre: Fórum de Ajuda - help_title: Fórum onde pode colocar dúvidas sobre o projeto history: Histórico - home: Início - home_tooltip: Ir para a posição inicial - inbox: caixa de entrada (%{count}) - inbox_tooltip: - one: A sua caixa de entrada contém 1 mensagem por ler - other: A sua caixa de entrada contém %{count} mensagens por ler - zero: A sua caixa de entrada não contém mensagens por ler - intro_1: O OpenStreetMap é um mapa mundial livre, feito por pessoas de todo o mundo. + home: Ir para a localização inicial intro_2_create_account: Crie uma conta de utilizador - intro_2_download: descarregar - intro_2_html: Os dados do mapa são livres para %{download} e %{use} sob uma %{license}. %{create_account} para tornar o mapa mais completo e atualizado. - intro_2_license: licença aberta - intro_2_use: usar - license: - title: Os dados do OpenStreetMap encontram-se sob a licença Creative Commons - Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA) - log_in: entrar + intro_header: Bem vindo ao OpenStreetMap! + intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como você e de uso livre sob uma licença aberta. + learn_more: Mais Informações + log_in: Entrar log_in_tooltip: Entrar com uma conta existente logo: alt_text: Logotipo do OpenStreetMap - logout: sair - logout_tooltip: Sair + logout: Sair make_a_donation: text: Fazer um Donativo title: Suporte o OpenStreetMap com um donativo monetário + more: Mais osm_offline: A base de dados do OpenStreetMap não está disponível neste momento enquanto decorrerem trabalhos de manutenção. osm_read_only: A base de dados do OpenStreetMap encontra-se neste momento no modo de leitura, enquanto decorrerem trabalhos de manutenção. partners_bytemark: Bytemark Hosting @@ -985,24 +1025,46 @@ pt: partners_ic: Imperial College London partners_partners: parceiros partners_ucl: UCL VR Centre - sign_up: criar conta + sign_up: Criar Conta sign_up_tooltip: Criar uma conta para poder editar o mapa - sotm2011: Venha à Conferência OpenStreetMap 2011, O Estado do Mapa, 9 a 11 de Setembro em Denver! + start_mapping: Começar a Mapear tag_line: O Mapa Mundial Livre e Editável user_diaries: Diários de Editores user_diaries_tooltip: Ver diários dos editores - view: Ver - view_tooltip: Ver o mapa - welcome_user: Bem vindo, %{user_link} - welcome_user_link_tooltip: A sua página de utilizador - wiki: Wiki - wiki_title: Sitio wiki do projeto license_page: foreign: english_link: o original em inglês - text: Caso haja um conflito entre esta página traduzida e a %{english_original_link}, a página em inglês tem prevalência + text: Caso haja um conflito entre esta página traduzida e %{english_original_link}, a página em inglês tem prevalência title: Sobre esta tradução - legal_babble: "

    Licença e Direitos de autor

    \n

    \n O OpenStreetMap é constituído por dados abertos, disponibilizados sob a licença Creative Commons - Atribuição - CompartilhaIgual 2.0 Genérica (CC BY-SA 2.0).\n

    \n

    \n Tem o direito de copiar, distribuir, transmitir e adaptar os nossos mapas e dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores. Se alterar ou adicionar conteúdo dos nossos mapas ou dados, pode distribuir o resultado apenas com a mesma licença. O texto legal completo explica os seus direitos e responsabilidades.\n

    \n\n

    Como creditar o OpenStreetMap

    \n

    \n Se estiver a utilizar imagens de mapas do OpenStreetMap, pedimos que credite pelo menos com “© contribuidores do OpenStreetMap, CC BY-SA”. Se estiver a usar apenas dados do mapa (cartográficos), pedimos que credite pelo menos com “Dados cartográficos © contribuidores do OpenStreetMap, CC BY-SA”.\n

    \n

    \n Quando possível, a referência ao OpenStreetMap deve ter uma hiperligação a apontar para http://www.openstreetmap.org/ e a referência a CC BY-SA a apontar para http://creativecommons.org/licenses/by-sa/2.0/deed.pt Se estiver a utilizar um meio onde não é possível utilizar hiperligações (por ex. livro impresso) sugerimos-lhe que dirija os seus leitores para www.openstreetmap.org (talvez substituindo ‘OpenStreetMap’ por este endereço web) e para www.creativecommons.org\n

    \n\n

    Saber mais

    \n

    \n Leia mais informações sobre a utilização dos nossos dados em Perguntas frequentes - Legais.\n

    \n

    \n Os contribuidores do OpenStreetMap são informados para nunca adicionarem dados de nenhuma fonte protegida por direitos de autor (por e. Google Maps ou mapas impressos) sem a permissão explícita dos detentores de direitos de autor.\n

    \n

    \n Apesar do OpenStreetMap ser constituído por dados abertos, não podemos fornecer uma API gratuitamente a programadores terceiros.\n\n Consulte a nossa Política de Utilização da API, Política de Utilização de Telas (Tiles) e a Política de Utilização do Nominatim.\n

    \n\n

    os nossos contribuidores

    \n

    \n A nossa licença CC BY-SA requer que “reconheça o Autor Original de forma razoável ao meio ou forma que estiver a utilizar”. Os contribuidores individuais não requerem que os credite para além de “Colaboradores de OpenStreetMap”, mas nos locais onde se adicionaram dados de agências cartográficas nacionais ou outras fontes relevantes, pode ser razoável reconhecer a autoria destas reproduzindo a referência a estas ou incluindo um hiperligação a apontar para esta página.\n

    \n\n\n\n
      \n
    • Austrália: Contém dados de periferias provenientes de dados do Australian Bureau of Statistics.
    • \n
    • Áustria: Contém dados de Stadt Wien (sob a licença CC BY), Land Vorarlberg e Land Tirol (sob a licença CC-BY AT com emendas).
    • \n
    • Canadá: Contém dados de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), e StatCan (Geography Division, Statistics Canada).
    • \n
    • França: Contém dados provenientes da Direction Générale des Impôts.
    • \n
    • Países Baixos: Contém dados © AND, 2007 (www.and.com)
    • \n
    • Nova Zelândia: Contém dados provenientes de Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Polónia: Contém dados de UMP-pcPL maps. Copyright UMP-pcPL contributors. Mais informações sobre a utilização de dados de UMP no OpenStreetMap
    • \n
    • África do Sul: Contém dados provenientes de Chief Directorate: National Geo-Spatial Information, State copyright reserved.
    • \n
    • Reino Unido: Contém dados do Ordnance Survey © Crown copyright and database right 2010.
    • \n
    \n\n

    \n A inclusão de dados no OpenStreetMap não implica que o fornecedor de dados originais apoie o OpenStreetMap, forneça qualquer garantia, ou aceite algum tipo de responsabilidade.\n

    " + legal_babble: + attribution_example: + alt: Exemplo de como indicar os créditos do OpenStreetMap numa página web + title: Exemplo de atribuição + contributors_at_html: "Áustria: Contém dados de Stadt Wien (sob a licença CC BY), Land Vorarlberg e Land Tirol (sob a licença CC-BY AT com emendas)." + contributors_ca_html: "Canadá: Contém dados de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada), e StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: Para mais informações sobre estas e outras fontes utilizadas para melhorar o OpenStreetMap, consulte a página de contribuidores (em inglês) na wiki do OpenStreetMap. + contributors_footer_2_html: " A inclusão de dados no OpenStreetMap não implica que o fornecedor de dados originais apoie o OpenStreetMap, forneça qualquer garantia, ou aceite algum tipo de responsabilidade." + contributors_fr_html: "França: Contém dados provenientes da Direction Générale des Impôts." + contributors_gb_html: "Reino Unido: Contém dados do Ordnance Survey © Crown copyright and database right 2010-2012." + contributors_intro_html: "Os contribuidores do OpenStreetMap são milhares. Também são utilizados dados de agências cartográficas nacionais e outras fontes, entre elas:" + contributors_nl_html: "Países Baixos: Contém dados © AND, 2007 (www.and.com)" + contributors_nz_html: "Nova Zelândia: Contém dados provenientes de Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Os nossos contribuidores + contributors_za_html: "África do Sul: Contém dados provenientes de Chief Directorate: National Geo-Spatial Information, State copyright reserved." + credit_1_html: É necessário indicar “© contribuidores do OpenStreetMap” ou caso seja mais adequado em inglês “© OpenStreetMap contributors”. + credit_2_html: Também tem de indicar claramente que os dados estão disponíveis sob a Open Database License (ODbL), e caso utilize as telas de mapas (imagens dos mapas), que a cartografia é disponibilizada sob a licença CC-BY-SA. Pode fazer isto colocando uma hiperligação para esta página sobre licença e direitos de autor. Como alternativa, e obrigatório caso distribua o OpenStreetMap em formato de dados, pode indicar as licenças e colocar hiperligações a apontar para as páginas das licenças. Em suportes que não seja possível colocar hiperligações (por exemplo, obras impressas) sugerimos que indique o endereço do sítio www.openstreetmap.org (talvez substituindo ‘OpenStreetMap’ por este endereço web), para www.opendatacommons.org e, caso se aplique, para www.creativecommons.org + credit_3_html: "Num mapa eletrónico navegável, os créditos devem aparecer num canto do mapa.\nPor exemplo (em inglês):" + credit_title_html: Como creditar o OpenStreetMap + infringement_1_html: É relembrado aos contribuidores do OpenStreetMap para nunca adicionarem dados de fontes protegidas por direitos de autor (por exemplo o Google Maps ou mapas comerciais impressos) sem permissão explícita dos detentores dos direitos de autor. + infringement_2_html: Se acredita que foi adicionado material protegido por direitos de autor indevidamente à base de dados do OpenStreetMap, por favor consulte o procedimento para retirar dados protegidos (em inglês) ou preencha os dados diretamente no formulário (em inglês). + infringement_title_html: Violação de direitos de autor + intro_1_html: "O OpenStreetMap é disponibilizado em dados abertos, sob a licença Open Data\nCommons Open Database License (ODbL)." + intro_2_html: Tem o direito de copiar, distribuir, transmitir e adaptar os nossos dados, desde que atribua a autoria do OpenStreetMap e os seus contribuidores. Se alterar ou adicionar conteúdo dos nossos dados, pode distribuir o resultado apenas com a mesma licença. O texto legal completo explica os seus direitos e responsabilidades. + intro_3_html: A cartografia nas nossas telas de mapas (imagens dos mapas) e a nossa documentação são disponibilizadas sob a licença Creative Commons Atribuição - CompartilhaIgual 2.0 Genérica (CC BY-SA 2.0). + more_1_html: Leia mais informações sobre a utilização dos nossos dados e como atribuir a autoria em Perguntas frequentes - Legais (em inglês). + more_2_html: Apesar do OpenStreetMap consistir em dados abertos, não podemos fornecer um serviço mapa API, livre de encargos, a programadores terceiros. Veja a Política de Utilização da API (em inglês), Política de Utilização de Telas (em inglês) e Política de Utilização do Nominatim (em inglês). + more_title_html: Saber mais + title_html: Licença e Direitos de autor native: mapping_link: começar a mapear native_link: Versão em português @@ -1062,12 +1124,9 @@ pt: title: Caixa de saída to: Para read: - back_to_inbox: Voltar para a caixa de entrada - back_to_outbox: Voltar para a caixa de saída + back: Voltar date: Data from: De - reading_your_messages: A ler a mensagem - reading_your_sent_messages: Lendo as mensagens enviadas reply_button: Responder subject: Assunto title: Ler mensagem @@ -1078,12 +1137,43 @@ pt: wrong_user: Está autenticado como o utilizador `%{user}' mas a mensagem que pediu para responder não foi enviada para esse utilizador. Por favor entre na conta de utilizador correta para responder. sent_message_summary: delete_button: Eliminar + note: + description: + closed_at_by_html: Resolvido %{when} atrás por %{user} + closed_at_html: Resolvido %{when} atrás + commented_at_by_html: Atualizado %{when} por %{user} + commented_at_html: Atualizado %{when} + opened_at_by_html: Criado %{when} atrás por %{user} + opened_at_html: Criado %{when} atrás + reopened_at_by_html: Reaberto %{when} por %{user} + reopened_at_html: Reaberto em %{when} + entry: + comment: Comentário + full: Erro reportado completo + mine: + ago_html: há %{when} + created_at: Criado em + creator: Criador + description: Descrição + heading: Erros reportados por %{user} + id: Identificador + last_changed: Última alteração + subheading: Erros reportados ou comentados por %{user} + title: Erros reportados ou comentados por %{user} + rss: + closed: erro reportado resolvido (perto de %{place}) + commented: Novo comentário (perto de %{place}) + description_area: Lista de erros reportados, comentados ou resolvidos na sua área [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Uma fonte RSS para o erro %{id} reportado + opened: novo erro no mapa (perto de %{place}) + reopened: erro no mapa reaberto (perto de %{place}) + title: Erros reportados no OpenStreetMap notifier: diary_comment_notification: - footer: Também pode ver o comentário em % {readurl} e comentar em % {commenturl} ou responder em % {replyurl} + footer: Também pode ler o comentário em %{readurl} e comentar em %{commenturl} ou responder em %{replyurl} header: "%{from_user} comentou na sua entrada recente do diário no OpenStreetMap com o assunto %{subject}:" hi: Olá %{to_user}, - subject: "[OpenStreetMap] % {usuário} comentou numa entrada do seu diário" + subject: "[OpenStreetMap] %{user} comentou numa entrada do seu diário" email_confirm: subject: "[OpenStreetMap] Confirme o seu endereço de e-mail" email_confirm_html: @@ -1093,12 +1183,11 @@ pt: email_confirm_plain: click_the_link: Se foi você que fez o pedido, clique na ligação seguinte para confirmar o pedido. greeting: Olá, - hopefully_you_1: Foi feito um pedido no site do OpenStreetMap para alterar o endereço de e-mail da sua conta de - hopefully_you_2: "%{server_url} para %{new_address}." + hopefully_you: Alguém (provavelmente você) pediu para alterar o endereço de email registado na conta em %{server_url} para o endereço %{new_address}. friend_notification: - befriend_them: Também pode adicioná-lo como amigo em % {befriendurl}. - had_added_you: "% {usuário} adicionou-o como amigo no OpenStreetMap." - see_their_profile: Pode ver o perfil do editor em % {userurl}. + befriend_them: Também pode adicioná-lo como amigo em %{befriendurl}. + had_added_you: "%{user} adicionou-o como amigo no OpenStreetMap." + see_their_profile: Pode ver o perfil do editor em %{userurl}. subject: "[OpenStreetMap] %{user} adicionou-o como amigo" gpx_notification: and_no_tags: e sem etiquetas. @@ -1123,44 +1212,36 @@ pt: lost_password_plain: click_the_link: Se foi você que fez o pedido, clique na ligação seguinte para lhe ser enviada uma nova palavra-passe, invalidando a anterior. greeting: Olá, - hopefully_you_1: Foi feito um pedido no site OpenStreetMap para obter uma nova palavra-passe nesta - hopefully_you_2: conta do openstreetmap.org associada a este e-mail. + hopefully_you: Alguém (provavelmente você) pediu para ser enviada uma nova palavra-passe da conta no openstreetmap.org message_notification: - footer1: Também pode ler a mensagem em % {readurl} - footer2: e pode responder em % {replyurl} - header: "% {from_user} enviou-lhe uma mensagem através do OpenStreetMap com o assunto % {objecto}:" + footer_html: Também pode ler a mensagem em %{readurl} e pode responder em %{replyurl} + header: "%{from_user} enviou-lhe uma mensagem através do OpenStreetMap com o assunto %{subject}:" hi: Olá %{to_user}, + note_comment_notification: + anonymous: Um utilizador anónimo + closed: + commented_note: "%{commenter} resolveu um erro do mapa que você comentou. O erro do mapa encontra-se perto de %{place}." + subject_other: "[OpenStreetMap] %{commenter} resolveu um erro no mapa que você está interessado" + subject_own: "[OpenStreetMap] %{commenter} resolveu um erro do mapa que você reportou" + your_note: "%{commenter} resolveu um erro do mapa perto de %{place}." + commented: + commented_note: "%{commenter} deixou um comentário num erro do mapa no mapa que você reportou. O erro reportado encontra-se perto de %{place}." + subject_other: "[OpenStreetMap] %{commenter} deixou um comentário num erro do mapa que você reportou" + subject_own: "[OpenStreetMap] %{commenter} deixou um comentário num erro do mapa que você reportou" + your_note: "%{commenter} deixou um comentário num erro do mapa que você reportou perto de %{place}." + details: Ver mais detalhes sobre o erro reportado em %{url}. + greeting: Olá, + reopened: + commented_note: "%{commenter} reabriu um erro no mapa em que você comentou. O erro encontra-se perto de %{place}." + subject_other: "[OpenStreetMap] %{commenter} reabriu um dos erros no mapa em que você está interessado" + subject_own: "[OpenStreetMap] %{commenter} reabriu um dos erros no mapa reportados por si" + your_note: "%{commenter} reabriu um erro no mapa reportado por si perto de %{place}." signup_confirm: - subject: "[OpenStreetMap] Confirme o seu endereço de e-mail" - signup_confirm_html: - ask_questions: Pode fazer qualquer pergunta sobre o OpenStreetMap no nosso fórum de ajuda. - click_the_link: Se foi você que pediu, clique na ligação abaixo para confirmar a conta de utilizador e ver mais informações sobre o OpenStreetMap - current_user: Está disponível uma lista de utilizadores por categorização conforme o local onde se encontram em Category:Users_by_geographical_region. - get_reading: Saiba mais sobre o OpenStreetMap no wiki, Ponha-se em dia com as últimas notícias com o blogue OpenStreetMap ou o Twitter, ou veja o blogue OpenGeoData de Steve Coast, fundador do OpenStreetMap com alguma história sobre o projeto, que também tem podcasts para ouvir! + confirm: "Antes de fazermos outra coisa, necessitamos que confirme que o pedido partiu de si. Se fez o pedido clique na ligação seguinte para confirmar a conta:" + created: Alguém (provavelmente você) acaba de criar uma conta em %{site_url}. greeting: Olá! - hopefully_you: Foi feito um pedido para criar uma conta em - introductory_video: Pode ver um %{introductory_video_link}. - more_videos: Existem %{more_videos_link} - more_videos_here: mais vídeos aqui - user_wiki_page: É recomendável criar uma página de utilizador no wiki, o que inclui etiquetas de categorização que indiquem de onde é, como a [[Category:Users_in_Lisboa]]. - video_to_openstreetmap: ví­deo de introdução sobre o OpenStreetMap. - wiki_signup: Também pode criar uma conta no wiki do OpenStreetMap. - signup_confirm_plain: - ask_questions: "Pode fazer qualquer pergunta que queira sobre o OpenStreetMap no nosso fórum de ajuda:" - blog_and_twitter: "Ponha-se em dia com as últimas notícias com o blogue OpenStreetMap ou o Twitter:" - click_the_link_1: Se foi você que fez o pedido, bem vindo! Por favor clique na ligação seguinte para confirmar - click_the_link_2: a conta e ver mais informação sobre o OpenStreetMap - current_user_1: Está disponível uma lista de utilizadores por categorização, - current_user_2: "conforme o local onde se encontram em:" - greeting: Olá! - hopefully_you: Foi feito um pedido para criar uma conta em - introductory_video: "Pode ver um vídeo de introdução sobre o OpenStreetMap em:" - more_videos: "Há mais vídeos em:" - opengeodata: "OpenGeoData.org é o blogue do fundador do OpenStreetMap, que também tem podcasts disponíveis:" - the_wiki: "Leia mais sobre o OpenStreetMap em:" - user_wiki_1: É recomendável criar uma página de utilizador no wiki, o que inclui - user_wiki_2: etiquetas de categorização que indiquem de onde é, como a [[Category:Users_in_Lisboa]]. - wiki_signup: "Também pode querer criar uma conta no wiki OpenStreetMap em:" + subject: "[OpenStreetMap] Bem vindo(a) ao OpenStreetMap" + welcome: Depois de confirmar a sua conta, forneceremos algumas informações para começar a editar. oauth: oauthorize: allow_read_gpx: ler os meus trilhos GPS privados. @@ -1169,8 +1250,18 @@ pt: allow_write_api: alterar o mapa. allow_write_diary: criar entradas no diário, comentários e adicionar amigos. allow_write_gpx: enviar trilhos GPS. + allow_write_notes: alterar erros reportados. allow_write_prefs: alterar as minhas preferências. request_access: O programa %{app_name} está a pedir acesso à sua conta, %{user}. Por favor escolha as permissões que o programa pode ter. Pode escolher as que quiser. + title: Autorizar acesso à sua conta + oauthorize_failure: + denied: Anulou o acesso do programa %{app_name} à sua conta. + invalid: O token de autorização não é válido. + title: Falhou o pedido de autorização. + oauthorize_success: + allowed: Forneceu ao programa %{app_name} o acesso à sua conta. + title: Pedido de autorização permitido + verification: O código de verificação é %{code}. revoke: flash: Revogou o Token para %{application} oauth_clients: @@ -1187,6 +1278,7 @@ pt: allow_write_api: alterar o mapa. allow_write_diary: criar entradas no diário, comentários e adicionar amigos. allow_write_gpx: enviar trilhos GPS. + allow_write_notes: alterar erros reportados. allow_write_prefs: alterar as preferências do utilizador. callback_url: URL de retorno name: Nome @@ -1217,6 +1309,7 @@ pt: allow_write_api: alterar o mapa. allow_write_diary: criar entradas no diário, comentários e adicionar amigos. allow_write_gpx: enviar trilhos GPS. + allow_write_notes: alterar erros reportados. allow_write_prefs: alterar as preferências do utilizador. authorize_url: "URL de Autorização:" confirm: Tem a certeza? @@ -1225,39 +1318,39 @@ pt: key: "Chave de Utilizador:" requests: "Pedir as seguintes permissões do utilizador:" secret: "Segredo de Utilizador:" - support_notice: Suportamos HMAC-SHA1 (recomendado) assim como texto normal no modo SSL. + support_notice: Suportamos HMAC-SHA1 (recomendado) e RSA-SHA1. title: Detalhes do OAuth de %{app_name} url: "URL do Token de Pedido:" update: flash: A atualização da informação do programa foi feita com sucesso redaction: create: - flash: A redação foi criada. + flash: A supressão foi criada. destroy: - error: Ocorreu um erro ao tentar eliminar esta redação. - flash: Redação eliminada. - not_empty: A redação não está vazia. Por favor retire a redação de todas as versões pertencentes a esta redação antes de a eliminar + error: Ocorreu um erro ao tentar eliminar esta supressão. + flash: Supressão eliminada. + not_empty: A supressão não está vazia. Por favor retire a supressão de todas as versões pertencentes a esta supressão antes de a eliminar edit: description: Descrição - heading: Editar redação - submit: Gravar redação - title: Editar redação + heading: Editar supressão + submit: Gravar supressão + title: Editar supressão index: - empty: Não existem redações a mostrar. - heading: Lista de redações - title: Lista de redações + empty: Não existem supressões a mostrar. + heading: Lista de supressões + title: Lista de supressões new: description: Descrição - heading: Introduza a informação da nova redação - submit: Criar redação - title: A criar uma nova redação + heading: Introduza a informação da nova supressão + submit: Criar supressão + title: A criar uma nova supressão show: confirm: Tem a certeza? description: "Descrição:" - destroy: Remover esta redação - edit: Editar esta redação - heading: A mostrar a redação "%{title}" - title: A mostrar a redação + destroy: Remover esta supressão + edit: Editar esta supressão + heading: A mostrar a supressão "%{title}" + title: A mostrar a supressão user: "Criador:" update: flash: As alterações foram gravadas. @@ -1265,6 +1358,7 @@ pt: edit: anon_edits_link_text: Descubra a que se deve isto. flash_player_required: Necessita do Flash instalado e ativado para usar o Potlatch, o editor em Flash do OpenStreetMap. Pode descarregar o Flash do site Adobe.com. Também estão disponíveis outras opções para editar o OpenStreetMap. + id_not_configured: O editor iD não foi configurado no_iframe_support: O seu navegador de Internet não suporta ou tem desativado as iframes HTML, que são necessárias para esta funcionalidade. not_public: Não configurou as suas edições como públicas. not_public_description: Não pode editar mais o mapa a não ser que torne as suas edições públicas. Pode fazer essa alteração na sua %{user_page}. @@ -1273,18 +1367,15 @@ pt: potlatch_unsaved_changes: Tem alterações por gravar (Para gravar no Potlatch, deve desselecionar o ponto ou linha atual, se estiver a editar no modo direto, ou clicar no botão gravar se este estiver disponível.) user_page_link: página de utilizador index: + createnote: Reportar um erro no mapa js_1: Está a usar um navegador de Internet que não suporta JavaScript ou tem o JavaScript desativado. js_2: É necessário ter o JavaScript ativado para visualizar mapas no OpenStreetMap. license: - license_name: Creative Commons - Atribuição - Partilha nos Mesmos Termos 2.0 (CC BY-SA) - notice: Sob a licença % {license_name} pelo % {project_name} e seus colaboradores. - project_name: projeto OpenStreetMap + copyright: Copyright OpenStreetMap e contribuidores, sob uma licença aberta permalink: Ligação permanente remote_failed: Erro na edição - confirme se o JOSM ou o Merkaartor está aberto e a opção de Controlo Removo (Remote Control) está ativada shortlink: Ligação curta key: - map_key: Legenda do Mapa - map_key_tooltip: Mostra a legenda para identificar os elementos presentes no mapa table: entry: admin: Fronteira administrativa @@ -1354,15 +1445,15 @@ pt: markdown_help: alt: Texto alternativo first: Primeiro item - heading: Secção - headings: Títulos de secções + heading: Cabeçalho + headings: Cabeçalhos image: Imagem link: Hiperligação ordered: Lista numerada second: Segundo item subheading: Sub-secção text: Texto - title_html: Tabela de códigos. Processado com Markdown + title_html: Tabela de códigos (Markdown) unordered: Lista url: URL richtext_area: @@ -1370,7 +1461,6 @@ pt: preview: Mostrar previsão search: search: Pesquisar - search_help: "exemplos: 'Coimbra', 'Rua da Atalaia, Faro', 'EN329', ou 'Estação ferroviária Lisboa' mais exemplos..." submit_text: Ir where_am_i: Onde estou? where_am_i_title: Pesquisa a localização atual do mapa @@ -1386,6 +1476,11 @@ pt: upload_trace: Carregar um Trilho GPS delete: scheduled_for_deletion: Trilho programado para eliminação + description: + description_with_count: + one: Ficheiro GPX com %{count} ponto de %{user} + other: Ficheiro GPX com %{count} pontos de %{user} + description_without_count: Ficheiro GPX de %{user} edit: description: "Descrição:" download: descarregar @@ -1398,12 +1493,16 @@ pt: save_button: Gravar Alterações start_coord: "Coordenada de início:" tags: "Etiquetas:" - tags_help: delimitado por vírgulas + tags_help: separadas por vírgulas title: A editar o trilho %{name} uploaded_at: "Mandado em:" visibility: "Visibilidade:" visibility_help: o que significa isto? + georss: + title: Trilhos GPS do OpenStreetMap list: + description: Ver trilhos GPS carregados recentemente + empty_html: Ainda não enviou nenhum trilho GPS. Envie um novo trilho GPS ou saiba mais sobre trilhos GPS na página wiki (em inglês). public_traces: Trilhos GPS públicos public_traces_from: Trilhos GPS públicos do utilizador %{user} tagged_with: " etiquetado com %{tags}" @@ -1414,7 +1513,7 @@ pt: heading: Armazenamento de GPX indisponível message: O sistema de envio e armazenamento GPX está neste momento indisponível. offline_warning: - message: O sistema de carregamento de ficheiros GPX está actualmente indisponível + message: O sistema de carregamento de ficheiros GPX está atualmente indisponível trace: ago: Há %{time_in_words_ago} by: por @@ -1435,22 +1534,24 @@ pt: description: "Descrição:" help: Ajuda tags: "Etiquetas:" - tags_help: delimitado por vírgulas + tags_help: separadas por vírgulas upload_button: Carregar upload_gpx: "Carregar Ficheiro GPX:" visibility: "Visibilidade:" visibility_help: o que significa isto? trace_header: see_all_traces: Ver todos os trilhos - see_your_traces: Ver todos os meus trilhos - traces_waiting: Tem %{count} trilhos a serem colocados na base de dados. Por favor, antes de enviar mais trilhos aguarde um pouco para terminar a inclusão dos trilhos enviados, de modo a não bloquear a fila para outros utilizadores. + see_your_traces: Ver todos os meus trilhos GPS + traces_waiting: + one: Tem %{count} trilho GPS na fila para ser colocado na base de dados do OpenStreetMap. Por favor, antes de enviar mais trilhos aguarde um pouco para terminar a inclusão do trilho enviado, de modo a não bloquear a fila para outros utilizadores. + other: Tem %{count} trilhos GPS na fila para serem colocados na base de dados do OpenStreetMap. Por favor, antes de enviar mais trilhos aguarde um pouco para terminar a inclusão dos trilhos enviados, de modo a não bloquear a fila para outros utilizadores. upload_trace: Carregar trilho GPS trace_optionals: tags: Etiquetas trace_paging_nav: - next: Próximo » - previous: « Anterior - showing_page: Mostrando página %{page} + newer: Trilhos GPS mais recentes + older: Trilhos GPS mais antigos + showing_page: Página %{page} view: delete_track: Eliminar este trilho description: "Descrição:" @@ -1472,23 +1573,26 @@ pt: visibility: "Visibilidade:" visibility: identifiable: Identificável (mostrado na lista de trilhos GPS e identificável, pontos ordenados com data e hora) - private: Privado (só partilhado como anónimo, pontos não ordenados) + private: Privado (apenas partilhado como anónimo, pontos não ordenados) public: Público (mostrado na lista de trilhos GPS como anónimo, pontos não ordenados) - trackable: Controlável (apenas compartilhada como anónimo, pontos ordenados com data e hora) + trackable: Controlável (apenas partilhado como anónimo, pontos ordenados com data e hora) user: account: contributor terms: - agreed: Você não aceitou os novos Termos de Colaboração. + agreed: Aceitou os novos Termos de Colaborador. agreed_with_pd: Também declarou que as suas edições são disponibilizadas em Domínio Público. - heading: "Termos do Contribuidor:" + heading: "Termos de Colaborador:" link text: o que é isto? - not yet agreed: Ainda não aceitou os novos Termos de Contribuição. - review link text: Por favor clique na ligação seguinte para rever e aceitar os Termos de Contribuição. + not yet agreed: Ainda não aceitou os novos Termos de Colaborador. + review link text: Por favor clique na ligação seguinte para rever e aceitar os Termos de Colaborador. current email address: "E-mail Actual:" - delete image: Remover a imagem actual + delete image: Remover a imagem atual email never displayed publicly: (nunca é mostrado publicamente) - flash update success: As informações do utilizador foram actualizadas com sucesso. - flash update success confirm needed: As informações do utilizador foram actualizadas com sucesso. Verifica o teu e-mail para confirmar o teu endereço de e-mail. + flash update success: As informações do utilizador foram atualizadas com sucesso. + flash update success confirm needed: As informações do utilizador foram atualizadas com sucesso. Verifica o teu e-mail para confirmar o teu endereço de e-mail. + gravatar: + gravatar: Usar imagem do site Gravatar + link text: o que é isto? home location: Localização Habitual image: "Imagem:" image size hint: (funcionam melhor as imagens quadradas com pelo menos 100x100 pixeis) @@ -1517,20 +1621,20 @@ pt: public editing note: heading: Edição pública text: Neste momento as suas edições são anónimas e as outras pessoas não lhe podem enviar mensagens nem ver onde se encontra. Para mostrar as suas edições e permitir que o contactem através do OpenStreetMap, clique na ligação seguinte. Desde a migração 0.6 da API, apenas utilizadores com edições públicas podem editar dados do mapa. (mais informações).
    • Ao tornar as suas edições públicas o seu endereço de email não será revelado.
    • Esta ação não pode ser revertida e todos os novos utilizadores têm as edições disponibilizadas publicamente.
    - replace image: Substituir a imagem actual + replace image: Substituir a imagem atual return to profile: Regressar ao perfil save changes button: Gravar Alterações title: Editar conta update home location on click: Atualizar local onde me encontro normalmente quando clico no mapa? confirm: already active: Esta conta já foi confirmada. - before you start: Sabemos que provavelmente está com pressa começar a mapear, mas antes disso pode querer preencher mais algumas informações sobre si mesmo no formulário abaixo. button: Confirmar - heading: Confirmar a conta de utilizador - press confirm button: Prime o botão confirmar abaixo para activar a tua conta. - reconfirm: Já passou algum tempo desde que criou uma conta. Pode ser necessário enviar novamente um email de confirmação para ativar a conta.. - success: Conta confirmada, obrigado por te registares! - unknown token: Parece que esse Token não existe. + heading: Verifique o seu email! + introduction_1: Enviámos-lhe um e-mail de confirmação. + introduction_2: Confirme a sua conta clicando no link no e-mail e assim poderá iniciar o mapeamento. + press confirm button: Pressione o botão de confirmação abaixo para ativar a tua conta. + reconfirm_html: Se precisar lhe reenviemos o e-mail de confirmação, clique aqui. + unknown token: Esse código de confirmação expirou ou não existe. confirm_email: button: Confirmar failure: Um e-mail já foi confirmado com este código. @@ -1545,13 +1649,13 @@ pt: go_public: flash success: Todas as suas edições são agora públicas e agora poderá editar o mapa. list: - confirm: Confirmar Utilizadores Seleccionados + confirm: Confirmar utilizadores selecionados empty: Não foi encontrado nenhum utilizador correspondente heading: Utilizadores - hide: Ocultar Utilizadores Seleccionados + hide: Ocultar utilizadores selecionados showing: - one: A mostrar a página %{page} (%{first_item} de %{items}) - other: A mostrar a página %{page} (%{first_item}-%{last_item} de %{items}) + one: Página %{page} (%{first_item} de %{items}) + other: Página %{page} (%{first_item}-%{last_item} de %{items}) summary: "%{name} criado com o ip %{ip_address} em %{date}" summary_no_ip: "%{name} criado na %{date}" title: Utilizadores @@ -1566,9 +1670,7 @@ pt: lost password link: Perdeu a sua palavra-passe? new to osm: É a primeira vez que está no OpenStreetMap? no account: Não possui uma conta? - notice: Saiba mais sobre a alteração da licença do OpenStreetMap (traduções) (discussão) - notice_terms: O OpenStreetMap iniciou o processo de alteração da licença na qual disponibiliza os dados a 1 de Abril de 2012. A nova licença é igualmente aberta, mas é mais adequada a uma base de dados geográficos como a nossa. Adoraríamos manter as suas contribuições no OpenStreetMap, mas apenas poderemos fazê-lo se concordar que o OpenStreetMap disponibilize e distribua as suas contribuições sob a nova licença. Caso contrário seremos obrigados a remover as suas contribuições da nossa base de dados.

    Por favor entre na sua conta e dedique alguns segundos para rever e aceitar os termos da nova licença. Muito obrigado! - openid: "% {logo} OpenID:" + openid: "%{logo} OpenID:" openid invalid: Desculpe, o seu OpenID parece estar incorreto openid missing provider: Desculpe, não foi possível contactar o seu fornecedor de OpenID openid_logo_alt: Iniciar sessão com OpenID @@ -1612,39 +1714,43 @@ pt: title: Palavra-passe esquecida make_friend: already_a_friend: Já é amigo de %{name}. + button: Adicionar aos amigos failed: Desculpe, falha ao adicionar %{name} como um amigo. - success: "%{name} agora é teu amigo." + heading: Adicionar %{user} à lista de amigos? + success: "%{name} já faz parte da sua lista de amigos!" new: + about: + header: Livre e editável + html: "

    Ao contrário de outros mapas, o OpenStreetMap é completamente criado por pessoas como você, e é disponibilizado gratuitamente para que qualquer pessoa possa corrigir, atualizar, descarregar e utilizar.

    \n

    Crie uma conta de utilizador para começar a colaborar. Enviaremos um email para confirmar a sua conta.

    " confirm email address: "Confirmar E-mail:" - confirm password: "Confirmar palavra-passe:" + confirm password: "Confirmar senha:" contact_webmaster: Entre em contacto com o webmaster para uma conta ser criada - vamos tentar lidar com o pedido o mais rapidamente possível. - continue: Continuar + continue: Criar conta display name: "Nome de utilizador:" display name description: O nome de utilizador será visível publicamente. Poderá alterar o nome posteriormente nas preferências. email address: "E-mail:" - fill_form: Preencha o formulário e enviaremos de seguida um e-mail de confirmação para ativar a conta. - flash create success message: Obrigado por te inscreveres. Enviamos uma nota de confirmação para o e-mail %{email} e assim que confirmares a conta, vais ser capaz de obter o mapeamento.

    Se utilizares um sistema anti-spam que envia pedidos de confirmação, por favor, vai ver á pasta de spam. - heading: Criar uma Conta de Utilizador license_agreement: Quando confirmar a sua conta, será necessário aceitar os Termos de Colaboração. no_auto_account_create: Infelizmente neste momento não poderemos criar uma conta automaticamente. not displayed publicly: Não será visível publicamente (ver política de privacidade) - openid: "% {logo} OpenID:" + openid: "%{logo} OpenID:" openid association: "

    O seu OpenID ainda não está associado a uma conta do OpenStreetMap.

    \n
      \n
    • Se ainda não tem uma conta no OpenStreetMap, por favor crie uma conta utilizando o formulário abaixo.
    • \n
    • \n Se já tem uma conta, pode entrar na conta\n usando o nome de utilizador e palavra-passe e então associar a conta\n a um OpenID nas configurações da sua conta.\n
    • \n
    " openid no password: Não é necessário uma palavra-passe com o OpenID, mas algumas ferramentas adicionais ou servidores podem necessitar de uma. password: "Palavra-passe:" - terms accepted: Obrigado por aceitar os novos termos do contribuidor! - terms declined: Lamentamos não ter aceitado os novos Termos de Contribuição. Para obter mais informações consulte esta página wiki. + terms accepted: Obrigado por aceitar os novos termos de colaborador! + terms declined: Lamentamos não ter aceitado os novos Termos de Colaborador. Para obter mais informações consulte esta página wiki. title: Criar conta - use openid: Como alternativa, use % {logo} OpenID para entrar + use openid: Como alternativa, use %{logo} OpenID para entrar no_such_user: body: Não existe nenhum utilizador com o nome %{user}. Verifique se o endereço está correto ou talvez a hiperligação que clicou esteja errada. - heading: O utilizador % {user} não existe + heading: O utilizador %{user} não existe title: Este utilizador não existe popup: friend: Amigo nearby mapper: Mapeador das redondezas your location: Tua localização remove_friend: + button: Remover amigo + heading: Remover %{user}da lista de amigos? not_a_friend: "%{name} não está na lista de seus amigos." success: "%{name} foi removido(a) da lista de seus amigos." reset_password: @@ -1668,59 +1774,63 @@ pt: consider_pd_why: O que é isto? decline: Rejeitar guidance: "Informação para ajudar a compreender os termos: um resumo inteligível e algumas traduções informais" - heading: Termos do contribuidor + heading: Termos de colaborador legale_names: france: França italy: Itália rest_of_world: Resto do mundo legale_select: "por favor selecione o seu país de residência:" read and accept: Por favor leia o acordo seguinte e clique no botão "Aceitar" para confirmar que aceita os termos deste acordo para as suas contribuições anteriores e futuras. - title: Termos dos contribuidores - you need to accept or decline: Por favor leia e depois aceite ou recuse os novos Termos de Contribuição para continuar. + title: Termos de colaborador + you need to accept or decline: Por favor leia e depois aceite ou recuse os novos Termos de Colaborador para continuar. view: - activate_user: activar este utilizador - add as friend: adicionar aos amigos + activate_user: ativar este utilizador + add as friend: Adicionar aos amigos ago: (%{time_in_words_ago} atrás) - block_history: ver bloqueios recebidos - blocks by me: bloqueados por mim - blocks on me: bloqueios sobre mim - comments: comentários + block_history: bloqueios recebidos + blocks by me: Bloqueados por mim + blocks on me: Bloqueios sobre mim + comments: Comentários confirm: Confirmar confirm_user: confirmar esse utilizador create_block: bloquear este utilizador created from: "Criado em:" - ct accepted: Aceitou há %{ago} + ct accepted: Aceite há %{ago} ct declined: Rejeitou - ct status: "Termos do Contribuidor:" + ct status: "Termos de Colaborador:" ct undecided: Indeciso - deactivate_user: desactivar este utilizador + deactivate_user: desativar este utilizador delete_user: eliminar este utilizador description: Descrição - diary: diário - edits: edições + diary: Diário + edits: Edições email address: "E-mail:" - friends_changesets: Ver todos os conjuntos de alterações dos amigos - friends_diaries: Ver todas as entradas de diários dos amigos + friends_changesets: alterações dos amigos + friends_diaries: ver as entradas em diários dos amigos hide_user: ocultar este utilizador - if set location: Se definir a sua localização habitual, aparecerá aqui um mapa. Pode definir a sua localização na página %{settings_link}. + if set location: Indique a sua localização habitual na página %{settings_link} para ver outros editores nas redondezas. km away: "%{count}km de distância" latest edit: "Última edição %{ago}:" m away: "%{count}m de distância" mapper since: "Mapeando desde:" - moderator_history: ver bloqueios feitos - my comments: meus comentários - my diary: meu diário - my edits: as minhas edições - my settings: as minhas configurações - my traces: meus trilhos + moderator_history: bloqueios feitos + my comments: Meus comentários + my diary: Meu diário + my edits: As minhas edições + my messages: As Minhas Mensagens + my notes: Erros reportados por mim + my profile: Meu Perfil + my settings: As minhas configurações + my traces: Meus trilhos GPS nearby users: Outros editores nas redondezas - nearby_changesets: Ver todos os conjuntos de alterações de editores das redondezas - nearby_diaries: Ver todas as entradas em diários de editores das redondezas - new diary entry: adicionar entrada no meu dirário + nearby_changesets: Ver alterações de editores das redondezas + nearby_diaries: entradas em diários de editores das redondezas + new diary entry: adicionar entrada no meu diário no friends: Ainda não adicionou nenhum amigo. no nearby users: Não existem outros editores nas redondezas que admitam que estão nas redondezas. + notes: Erros reportados no mapa oauth settings: configurações do OAuth - remove as friend: remover amigo + remove as friend: Remover amigo role: administrator: Este utilizador é administrador grant: @@ -1730,17 +1840,17 @@ pt: revoke: administrator: Retirar acesso de administrador moderator: Retirar acesso de moderador - send message: enviar mensagem + send message: Enviar mensagem settings_link_text: configurações spam score: "Pontuação de Spam:" status: "Estado:" - traces: trilhos + traces: Trilhos unhide_user: descobrir este utilizador user location: Localização do utilizador your friends: Os seus amigos user_block: blocks_by: - empty: "% {nome} ainda não bloqueou ninguém." + empty: "%{name} ainda não bloqueou ninguém." heading: Lista de bloqueios feitos por %{name} title: Bloqueios por %{name} blocks_on: @@ -1792,11 +1902,14 @@ pt: creator_name: Criador display_name: Utilizador Bloqueado edit: Editar + next: Seguinte » not_revoked: (não revogado) + previous: « Anterior reason: Motivo do bloqueio revoke: Revogar! revoker_name: Revogado por show: Mostrar + showing_page: Página %{page} status: Estado period: one: 1 hora @@ -1817,7 +1930,7 @@ pt: needs_view: O utilizador necessita de autenticar-se antes deste bloqueio terminar. reason: "Razão do bloqueio:" revoke: Revogar! - revoker: "Revocador:" + revoker: "Revogador:" show: Mostrar status: Estado time_future: Termina em %{time} @@ -1844,3 +1957,25 @@ pt: fail: Não foi possível retirar o cargo `%{role}' ao utilizador `%{name}'. Por favor verifique se o utilizador e o cargo são válidos. heading: Confirmar revogação de cargo title: Confirmar revogação de cargo + welcome_page: + add_a_note: + paragraph_1_html: Se quiseres fazer uma pequena alteração más falta tempo para inscrever-se e aprender a editar, é muito simples deixar uma nota. + paragraph_2_html: "Vá apenas para o mapa e clique no ícone de nota: . Isto irá adicionar um marcador no mapa, que poderá ser reposicionado.\nAdiciona a sua mensagem e, em seguida, clique em salvaguardar, assim outros mapeadores irão investigar." + title: Falta de tempo para editar ? Adiciona uma nota ! + basic_terms: + editor_html: Um editor é um programa ou site usado para editar o mapa. + node_html: Um é um ponto no mapa, como um restaurante ou uma árvore. + paragraph_1_html: OpenStreetMap tem a sua própria linguagem. Aqui a explicação de algumas palavras úteis. + tag_html: Uma etiqueta é um peça de informação sob um nó ou uma linha, como o nome do restaurante ou o limite de velocidade duma estrada. + title: Vocabulário para mapear + way_html: Um caminho é uma linha ou uma área, como uma estrada, um rio, um lago ou um prédio. + introduction_html: Bem-vindo ao OpenStreetMap, o mapa livre e editável do mundo. Agora como estás inscrito, estás também pronto para mapear. Aqui um guia rápido com as coisas mais importantes que precisas de saber. + questions: + paragraph_1_html: "O OpenStreetMap tem vários recursos para saber mais sobre o projeto, perguntar e responder a questões, e colaborativamente discutir e documentar vários tópicos sobre o mapa.\nObtenha ajuda aqui" + title: Tens perguntas ? + start_mapping: Começar a mapear + title: Bem-vindo ! + whats_on_the_map: + off_html: O que não é incluído são dados subjectivos como notações, factos históricos, objectos inventados, e dados de fontes com copyright. Se não tiveres permissão específica, não copies dados doutro mapa qualquer que seja online ou em papel. + on_html: OpenStreetMap é um lugar para mapear as coisas que são ambos real e atual - inclui milhões de prédios, estradas, e outros detalhes locais. Podes mapear qualquer elemento do mundo real que lhe interessa. + title: O que está no Mapa diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 486520c286c..0d41c89f179 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -1,6 +1,7 @@ # Messages for Romanian (română) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: EddyPetrisor # Author: McDutchie # Author: Minisarm # Author: Strainu @@ -40,8 +41,9 @@ ro: languages: Limbi pass_crypt: Parolă models: + acl: Lista de control al accesului changeset: Set de modificări - changeset_tag: Etichetă set de modificări + changeset_tag: Etichetă pentru setul de modificări country: Țară diary_comment: Comentariu jurnal diary_entry: Intrare în jurnal @@ -73,139 +75,38 @@ ro: way_tag: Etichetă cale browse: changeset: - changeset: "Set de modificări: %{id}" changesetxml: Set de modificări XML - download: Descarcă %{changeset_xml_link} sau %{osmchange_xml_link} feed: - title_comment: Set de schimbări %{id} - %{comment} + title: "Set de modificări: %{id}" + title_comment: Set de modificări %{id} — %{comment} osmchangexml: XML osmChange title: Set de modificări - changeset_details: - belongs_to: "Aparține lui:" - bounding_box: "Cutie împrejmuitoare:" - box: cutie - closed_at: "Închis la:" - created_at: "Creat la:" - has_nodes: "Are următoarele %{count} noduri:" - has_relations: "Are următoarele %{count} relații:" - has_ways: "Are următoarele %{count} căi:" - no_bounding_box: Nicio cutie împrejmuitoare nu a fost salvată pentru acest set de modificări. - show_area_box: Afișează cutia zonei - common_details: - changeset_comment: "Comentariu:" - deleted_at: "Șters la:" - deleted_by: "Șters de:" - edited_at: "Editat la:" - edited_by: "Editat de:" - in_changeset: "În setul de schimbări:" - version: "Versiune:" containing_relation: - entry: Relație %{relation_name} - entry_role: Relație %{relation_name} (ca %{relation_role}) - map: - deleted: A fost șters - larger: - area: Vizualizare zonă pe hartă mai mare - node: Vizualizare nod pe hartă mai mare - relation: Vizualizare relație pe hartă mai mare - way: Vizualizare cale pe hartă mai mare - loading: Se încarcă... - navigation: - all: - next_changeset_tooltip: Următorul set de schimbări - next_node_tooltip: Următorul nod - next_relation_tooltip: Următoarea relație - next_way_tooltip: Următoarea cale - prev_changeset_tooltip: Setul anterior de schimbări - prev_node_tooltip: Nodul anterior - prev_relation_tooltip: Relația precedentă - prev_way_tooltip: Calea anterioară - user: - name_changeset_tooltip: Vezi editările lui %{user} - next_changeset_tooltip: Următoarea editare de %{user} - prev_changeset_tooltip: Editarea precedentă de %{user} - node: - download: "%{download_xml_link}, %{view_history_link} sau %{edit_link}" - download_xml: Descărcare XML - edit: editare - node: Nod - node_title: "Nod: %{node_name}" - view_history: vizualizare istoric - node_details: - coordinates: "Coordonate:" - part_of: "Parte din:" - node_history: - download: "%{download_xml_link} sau %{view_details_link}" - download_xml: Descărcare XML - node_history: Istoric nod - node_history_title: "Istoric nod: %{node_name}" - view_details: vizualizare detalii + entry: Relația %{relation_name} + entry_role: Relația %{relation_name} (ca %{relation_role}) not_found: - sorry: Ne pare rău, dar %{type} cu identificatorul %{id}, nu a putut fi . + sorry: Ne pare rău, dar %{type} cu identificatorul %{id} nu a fost găsit. type: - changeset: set de schimbări + changeset: set de modificări node: nod relation: relație - way: cale - paging_nav: - of: din - showing_page: Se afișează pagina - relation: - download: "%{download_xml_link} sau %{view_history_link}" - download_xml: Descărcare XML - relation: Relație - relation_title: "Relație: %{relation_name}" - view_history: vizualizare istoric - relation_details: - members: "Membrii:" - part_of: "Parte din:" - relation_history: - download: "%{download_xml_link} sau %{view_details_link}" - download_xml: Descărcare XML - relation_history: Istoric relații - relation_history_title: "Istoric relații: %{relation_name}" - view_details: vizualizare detalii + way: drum + redacted: + message_html: Nu se poate afișa versiunea %{version} a acestui/acestei %{type} pentru că a fost redactată. Vă rugăm să consultați %{redaction_link} pentru detalii. + redaction: Redactarea %{id} + type: + node: nod + relation: relații + way: drum relation_member: entry_role: "%{type} %{name} ca %{role}" type: node: Nod relation: Relație way: Cale - start: - manually_select: Selectare manuală a unei alte zone - view_data: Vizualizare date pentru perspectiva curentă a hărții start_rjs: - data_frame_title: Date - data_layer_name: Navigare prin datele hărții - details: Detalii - drag_a_box: Trageți cu mouse-ul și creați un dreptunghi pentru a selecta zona hărții - edited_by_user_at_timestamp: Editat de [[user]] la [[timestamp]] - history_for_feature: Istoric pentru [[feature]] load_data: Încărcare date - loaded_an_area_with_num_features: "Ați încărcat o zonă care conține [[num_features]] puncte. În general, unele navigatoare nu sunt capabile să facă față afișării unei asemenea cantități de date. Navigatoarele funcționează cel mai bine atunci când afișează mai puțin de 100 de puncte simultan: dacă mai faceți și alte operații cu navigatorul dumneavoastră în paralel veți observa o încetinire / lipsă de răspuns din partea navigatorului. Dacă doriți să afișați aceste puncte apăsați butonul de mai jos." loading: Se încarcă... - manually_select: Selectare manuală a unei alte zone - object_list: - api: Obține această zonă prin API - back: Afișează lista obiectelor - details: Detalii - heading: Lista obiectelor - history: - type: - node: Nod [[id]] - way: Cale [[id]] - selected: - type: - node: Nod [[id]] - way: cale [[id]] - type: - node: Nod - way: Cale - private_user: utilizator privat - show_history: Afișare istoric - unable_to_load_size: "Imposibil de încărcat: Cutia împrejmuitoare de dimensiune [[bbox_size]] este prea mare (trebuie să fie mai mică de %{max_bbox_size})" - wait: Așteptați... - zoom_or_select: Măriți sau selectați o zonă a hărții pentru a o vizualiza tag_details: tags: "Etichete:" wiki_link: @@ -213,39 +114,16 @@ ro: tag: Pagina de pe wiki pentru tagul %{key}=%{value} wikipedia_link: Articolul %{page} pe Wikipedia timeout: - sorry: Ne pare rău, dar durata recepționării datelor pentru %{type} cu id-ul %{id} a fost prea mare. + sorry: Ne pare rău, dar durata recepționării datelor pentru %{type} cu identificatorul %{id} a fost prea mare. type: - changeset: set de schimbări - node: nod - relation: relație - way: cale - way: - download: "%{download_xml_link}, %{view_history_link} sau %{edit_link}" - download_xml: Descărcare XML - edit: editare - view_history: vizualizare istoric - way: Cale - way_title: "Cale: %{way_name}" - way_details: - also_part_of: - one: de asemenea parte din calea %{related_ways} - other: de asemenea parte din căile %{related_ways} - nodes: "Noduri:" - part_of: "Parte din:" - way_history: - download: "%{download_xml_link} sau %{view_details_link}" - download_xml: Descărcare XML - view_details: vizualizare detalii - way_history: Istoric cale - way_history_title: "Istoric cale: %{way_name}" + changeset: setul de schimbări + node: nodul + relation: relația + way: calea changeset: changeset: anonymous: Anonim - big_area: (mare) - no_comment: (niciunul) no_edits: (nu există editări) - show_area_box: afișează chenarul zonei - still_editing: (încă se editează) view_changeset_details: Vizualizare detalii set de schimbări changeset_paging_nav: next: Următoarea » @@ -258,58 +136,115 @@ ro: saved_at: Salvat la user: Utilizator list: - description: Schimbări recente + title: Set de modificări + title_friend: Seturi de modificări de la prietenii dv. + title_nearby: Modificări de la utilizatori din apropiere + title_user: Seturi de modificări făcute de %{user} + timeout: + sorry: Ne pare rău, preluarea listei de modificări pe care ați solicitat-o a durat prea mult. diary_entry: + comments: + ago: cu %{ago} în urmă + comment: Comentariu + has_commented_on: "%{display_name} a comentat pe următoarele înregistrări din jurnal" + newer_comments: Comentarii mai noi + older_comments: Comentarii mai vechi + post: Trimite + when: Când + diary_comment: + comment_from: Comentariu de la %{link_user} pe %{comment_created_at} + confirm: Confirmă + hide_link: Ascunde acest comentariu diary_entry: comment_count: one: un comentariu other: "%{count} comentarii" + comment_link: Comentează la această înregistrare + confirm: Confirmă + edit_link: Editează această înregistrare + hide_link: Ascunde această înregistrare + posted_by: Postat de către %{link_user} pe %{created} în %{language_link} + reply_link: Răspunde la această înregistrare edit: + body: "Corpul mesajului:" language: "Limbă:" latitude: "Latitudine:" - location: "Locație:" + location: "Loc:" longitude: "Longitudine:" + marker_text: Poziția înregistrării din jurnal save_button: Salvează subject: "Subiect:" + title: Editare înregistrare din jurnal + use_map_link: utilizează harta + feed: + all: + description: Înregistrări recente în jurnale de la utilizatorii OpenStreetMap + title: Înregistrări în jurnalul OpenStreetMap + language: + description: Înregistrări recente în jurnale de la utilizatorii OpenStreetMap în limba %{language_name} + title: Înregistrări recente în jurnalul OpenStreetMap în %{language_name} + user: + description: Înregistrări recente în jurnalul OpenStreetMap de la %{user} + title: Înregistrări în jurnalul OpenStreetMap pentru %{user} list: + in_language_title: Înregistrări de jurnal în %{language} + new: O nouă înregistrare în jurnal + new_title: Compune o înregistrare nouă în jurnalul dvs. de utilizator + newer_entries: Înregistrări mai noi + no_entries: Nu există înregistrări în jurnal + older_entries: Înregistrări mai vechi + recent_entries: "Înregistrări recente din jurnal:" title: Jurnalele utilizatorilor title_friends: Jurnalele prietenilor title_nearby: Jurnalele utilizatorilor aflați în apropiere user_title: Jurnalul utilizatorului %{user} location: - edit: Modificare - location: "Locație:" - view: Vizualizare + edit: Modifică + location: "Loc:" + view: Vizualizează + new: + title: O nouă înregistrare în jurnal + no_such_entry: + body: Ne pare rău, dar nu există nici o înregistrare de jurnal sau comentariu cu identificatorul %{id}. Vă rugăm să verificați ortografia; sau poate ați făcut clic pe un link invalid. + heading: Nici o înregistrare cu identificatorul %{id} + title: Nu există o asemenea înregistrare view: + leave_a_comment: Adaugă un comentariu login: Autentificare - login_to_leave_a_comment: "%{login_link}a este necesară pentru a comenta" + login_to_leave_a_comment: "%{login_link} este necesară pentru a comenta" save_button: Salvează title: Jurnalul utilizatorului %{user} | %{title} user_title: Jurnalul utilizatorului %{user} + editor: + default: Implicit (în prezent %{name}) + potlatch: + description: Potlatch 1 (editor înglobat în navigator) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (editor înglobat în navigator) + name: Potlatch 2 + remote: + description: Control de la distanță (JOSM sau Merkaartor) export: start: add_marker: Adaugă un marcator pe hartă + area_to_export: Zona pentru export export_button: Exportare format: Format + format_to_export: Format de exportat image_size: Dimensiune imagine latitude: "Lat:" licence: Licență longitude: "Long:" + manually_select: Selectați manual o altă zonă max: max options: Opțiuni + osm_xml_data: Date XML OpenStreetMap output: Date de ieșire scale: Scară - too_large: - heading: Arie prea mare zoom: Zoom - start_rjs: - drag_a_box: Trageți cu mouse-ul și creați un dreptunghi pentru a selecta zona hărții - export: Exportă - manually_select: Selectare manuală a unei alte zone geocoder: description: - title: - osm_namefinder: "%{types} de la OpenStreetMap Namefinder" types: cities: Orașe places: Locuri @@ -335,25 +270,33 @@ ro: ca_postcode: Rezultate de la Geocoder.CA geonames: Rezultate de la GeoNames latlon: Rezultate interne - osm_namefinder: Rezultate de la OpenStreetMap Namefinder osm_nominatim: Rezultate de la OpenStreetMap Nominatim uk_postcode: Rezultate de la NPEMap / FreeThe Postcode us_postcode: Rezultate de la Geocoder.us - search_osm_namefinder: - prefix: "%{type}" - suffix_place: ", %{distance} %{direction} de %{placename}" search_osm_nominatim: prefix: + aeroway: + aerodrome: Aerodrom + apron: Peron de aeroport + gate: Poartă de aeroport + helipad: Helipad + runway: Pistă + taxiway: Pistă de manevră + terminal: Terminal amenity: + WLAN: Acces WiFi airport: Aeroport arts_centre: Centru de arte + artwork: Operă de artă atm: Bancomat auditorium: Auditoriu bank: Instituție bancară bar: Bar + bbq: Grătar bench: Bancă bicycle_parking: Parcare de biciclete bicycle_rental: Închiriere de biciclete + biergarten: Braserie în aer liber brothel: Bordel bureau_de_change: Casă de schimb valutar bus_station: Stație de autobuz @@ -361,14 +304,17 @@ ro: car_rental: Închiriere de mașini car_wash: Spălătorie auto casino: Cazinou + charging_station: Stație de taxare cinema: Cinematograf clinic: Clinică club: Club college: Colegiu + community_centre: Centru comunitar courthouse: Tribunal crematorium: Crematoriu dentist: Dentist doctors: Medici + dormitory: Cămin drinking_water: Cișmea driving_school: Școală de șoferi embassy: Ambasadă @@ -381,13 +327,16 @@ ro: fuel: Benzinărie grave_yard: Cimitir gym: Sală de fitness / gimnastică + hall: Sală health_centre: Centru de sănătate hospital: Spital hotel: Hotel + hunting_stand: Stand de vânătoare ice_cream: Înghețată kindergarten: Grădiniță library: Bibliotecă market: Piață + marketplace: Piață de mărfuri mountain_rescue: Salvamont nightclub: Club de noapte nursery: Creșă @@ -407,45 +356,79 @@ ro: reception_area: Zonă de recepție recycling: Punct de reciclare restaurant: Restaurant + retirement_home: Casă de bătrâni sauna: Saună school: Școală shelter: Adăpost shop: Magazin shopping: Cumpărături + shower: Duș + social_centre: Centru social + social_club: Club social studio: Studio supermarket: Supermarket + swimming_pool: Bazin de înot taxi: Taxi telephone: Telefon public theatre: Teatru toilets: Toalete townhall: Primărie university: Universitate + vending_machine: Vendomat veterinary: Medic veterinar + village_hall: Primărie comunală waste_basket: Coș de gunoi wifi: Acces WiFi youth_centre: Centru de tineret boundary: administrative: Graniță administrativă + national_park: Parc național + protected_area: Zonă protejată + bridge: + aqueduct: Apeduct + suspension: Pod suspendat + swing: Pod batant + viaduct: Viaduct + "yes": Pod + building: + "yes": Clădire highway: + bridleway: Drum pentru călărie bus_guideway: Linie de autobuz ghidată bus_stop: Stație de autobuz + byway: Rută secundară + construction: Drum în construcție + cycleway: Pistă de biciclete emergency_access_point: Punct de acces de urgență footway: Cale pietonală ford: Vad + living_street: Zonă pietonală + milestone: Bornă kilometrică + minor: Drum minor motorway: Autostradă motorway_junction: Intersecție pe autostradă + motorway_link: Autostradă path: Potecă pedestrian: Cale pietonală platform: Platformă primary: Drum principal + primary_link: Drum principal raceway: Pistă + residential: Rezidențial + rest_area: Zonă pentru odihnă road: Drum secondary: Drum secundar secondary_link: Drum secundar + service: Stradă de serviciu services: Servicii pe autostradă + speed_camera: Radar cu cameră foto + steps: Scară tertiary: Drum terțiar + tertiary_link: Drum terțiar + track: Drum forestier sau agricol trail: Potecă unclassified: Drum neclasificat + unsurfaced: Drum neasfaltat historic: archaeological_site: Sit arheologic battlefield: Câmp de luptă @@ -453,13 +436,17 @@ ro: building: Clădire castle: Castel church: Biserică + fort: Fort house: Casă manor: Conac + memorial: Memorial mine: Mină monument: Monument museum: Muzeu ruins: Ruine tower: Turn + wayside_cross: Troiță + wayside_shrine: Altar wreck: Epavă landuse: basin: Bazin @@ -643,12 +630,9 @@ ro: weir: Stăvilar layouts: copyright: Drepturi de autor și licență - documentation: Documentație - documentation_title: Documentație pentru proiect edit: Modificare edit_with: Modificare cu %{editor} help: Ajutor - help_centre: Centru de ajutor history: Istoric home: acasă log_in: autentificare @@ -656,15 +640,10 @@ ro: logo: alt_text: Logoul OpenStreetMap logout: închide sesiunea - logout_tooltip: Închide sesiunea make_a_donation: text: Faceți o donație sign_up: înregistrare sign_up_tooltip: Creați un cont pentru editare - view: Vizualizare - view_tooltip: Vizualizare hartă - welcome_user: Bine ați venit, %{user_link} - welcome_user_link_tooltip: Pagina dumneavoastră de utilizator license_page: foreign: title: Despre această traducere @@ -687,8 +666,6 @@ ro: title: Mesaje trimise to: Către read: - back_to_inbox: Înapoi la mesaje primite - back_to_outbox: Înapoi la mesaje trimise date: Dată from: De la reply_button: Răspunde @@ -714,19 +691,10 @@ ro: title: Înregistrare aplicație nouă show: allow_write_api: modifică harta. - printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" site: edit: user_page_link: pagină de utilizator index: - license: - license_name: Creative Commons Atribuire și distribuire în condiții identice 2.0 - license_url: http://creativecommons.org/licenses/by-sa/2.0/ - notice: Distribuit sub licența %{license_name} de către %{project_name} și contribuitorii săi. - project_name: proiectul OpenStreetMap - project_url: http://openstreetmap.org permalink: Legătură permanentă shortlink: Legătură scurtată time: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 46de8c2516c..cfa2674829b 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1,12 +1,16 @@ # Messages for Russian (русский) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: AMDmi3 # Author: AOleg +# Author: AZISS # Author: Aleksandr Dezhin # Author: Amire80 # Author: Andrewsh +# Author: CM3X # Author: Calibrator # Author: Chilin +# Author: DCamer # Author: Dr&mx # Author: Eleferen # Author: EugeneZelenko @@ -14,17 +18,36 @@ # Author: Ezhick # Author: G0rn # Author: Ignatus +# Author: Iluvatar # Author: Kaganer # Author: Komzpa # Author: Lockal # Author: MaxSem # Author: Mechano +# Author: Mixaill +# Author: Nemo bis +# Author: Okras +# Author: Putnik +# Author: Santacloud +# Author: Spider # Author: TarzanASG # Author: Yuri Nazarov # Author: Zverik # Author: Александр Сигачёв # Author: Сrower ru: + about_page: + community_driven_html: "Сообщество OpenStreetMap — разнообразное, неравнодущное и растущее с каждым днём.\nНаши участники — это энтузиасты-картографы, ГИС-профессионалы, инженеры, содержащие серверы OSM, люди, отмечающие районы, пострадавшие от бедствий, и многие другие.\nЧтобы узнать больше о сообществе, читайте дневники участников,\nблоги сообщества и сайт Фонда OSM." + community_driven_title: Силами сообщества + copyright_html: ©Участники
    OpenStreetMap + lede_text: OpenStreetMap создан сообществом картографов, которые добавляют и поддерживают данные о дорогах, тропах, кафе, вокзалах и многих других объектах по всему миру. + local_knowledge_html: OpenStreetMap придаёт особое значение локальным знаниям. Участники используют аэрофотоснимки, GPS-устройства и низкотехнологичных карты земель для проверки того, что данные OSM являются точными и актуальными. + local_knowledge_title: Знание местности + next: Далее + open_data_html: "OpenStreetMap являются открытыми данными: вы можете использовать их для любых целей до тех пор, пока вы указываете авторские права OpenStreetMap и его участников. Если вы изменяете данные или определенным образом основываетесь на них, вы можете распространять свой результат только под той же лицензии. Смотрите Авторские права и Страница лицензии для более подробной информации." + open_data_title: Открытые данные + partners_title: Партнёры + used_by: "%{name} предоставляет данные для сотен сайтов, мобильных приложений и устройств" activerecord: attributes: diary_comment: @@ -33,7 +56,7 @@ ru: language: Язык latitude: Широта longitude: Долгота - title: Заголовок + title: Тема user: Пользователь friend: friend: Друг @@ -42,7 +65,7 @@ ru: body: Текст recipient: Получатель sender: Отправитель - title: Заголовок + title: Тема trace: description: Описание latitude: Широта @@ -89,7 +112,7 @@ ru: tracetag: Тег трека user: Пользователь user_preference: Настройки пользователя - user_token: Код подтверждения пользователя + user_token: Маркер пользователя way: Линия way_node: Точка линии way_tag: Тег линии @@ -102,202 +125,110 @@ ru: blocked: Ваш доступ к API заблокирован. Пожалуйста, войдите через веб-интерфейсе, чтобы узнать подробности. need_to_see_terms: Ваш доступ к API временно приостановлен. Пожалуйста войдите через веб-интерфейс для просмотра условий участия. Вам не обязательно соглашаться, но вы должны просмотреть их. browse: + anonymous: аноним changeset: - changeset: "Пакет правок: %{id}" + belongs_to: Автор changesetxml: XML пакета правок - download: Загрузить %{changeset_xml_link} или %{osmchange_xml_link} feed: title: Пакет правок %{id} title_comment: Пакет правок %{id} — %{comment} + node: Точки (%{count}) + node_paginated: Точки (%{x}-%{y} из %{count}) osmchangexml: osmChange XML - title: Пакет правок - changeset_details: - belongs_to: "Пользователь:" - bounding_box: "Границы:" - box: граница - closed_at: "Закрыт:" - created_at: "Создан:" - has_nodes: - few: "Содержит %{count} точки:" - one: "Содержит %{count} точку:" - other: "Содержит %{count} точек:" - has_relations: - few: "Содержит следующие %{count} отношения:" - one: "Содержит следующие %{count} отношение:" - other: "Содержит следующие %{count} отношений:" - has_ways: - few: "Содержит %{count} линии:" - one: "Содержит %{count} линию:" - other: "Содержит %{count} линий:" - no_bounding_box: Для этого пакета правок границы не установлены. - show_area_box: Показать выделенную область - common_details: - changeset_comment: "Комментарий:" - deleted_at: "Когда удалено:" - deleted_by: "Кем удалено:" - edited_at: "Изменено:" - edited_by: "Пользователь:" - in_changeset: "В пакете правок:" - version: "Версия:" + relation: Отношения (%{count}) + relation_paginated: Отношения (%{x}-%{y} из %{count}) + title: "Пакет правок: %{id}" + way: Линии (%{count}) + way_paginated: Линии (%{x}-%{y} из %{count}) + closed: Закрыто + closed_by_html: Закрыто %{time} назад пользователем %{user} + closed_html: Закрыто %{time} назад containing_relation: entry: Отношение %{relation_name} entry_role: Отношение %{relation_name} (в роли %{relation_role}) - map: - deleted: Удалено - edit: - area: Править область - node: Править точку - relation: Править отношение - way: Править линию - larger: - area: Просмотр области на более крупной карте - node: Просмотр точки на более крупной карте - relation: Просмотр отношения на более крупной карте - way: Просмотр линии на более крупной карте - loading: Загрузка... - navigation: - all: - next_changeset_tooltip: Следующий пакет правок - next_node_tooltip: Следующая точка - next_relation_tooltip: Следующее отношение - next_way_tooltip: Следующая линия - prev_changeset_tooltip: Предыдущий пакет правок - prev_node_tooltip: Предыдущая точка - prev_relation_tooltip: Предыдущее отношение - prev_way_tooltip: Предыдущая линия - user: - name_changeset_tooltip: Просмотр правок %{user} - next_changeset_tooltip: Следующая правка %{user} - prev_changeset_tooltip: Предыдущая правка %{user} + created: Создано + created_by_html: Создано %{time} назад пользовталем %{user} + created_html: Создано %{time} назад + deleted_by_html: Удалено %{time} назад пользователем %{user} + download_xml: Скачать XML + edited_by_html: Отредактировано %{time} назад пользователем %{user} + in_changeset: Пакет правок + location: "Географическое положение:" + no_comment: (комментарий отсутствует) node: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" - download_xml: Скачать XML - edit: править - node: Точка - node_title: "Точка: %{node_name}" - view_history: посмотреть историю - node_details: - coordinates: "Координаты:" - part_of: "Участвует в:" - node_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Скачать XML - node_history: История точки - node_history_title: "История точки: %{node_name}" - view_details: посмотреть подробнее + history_title: "История точки: %{name}" + title: "Точка: %{name}" not_found: - sorry: К сожалению, %{type} с идентификатором %{id} не найден. + sorry: "К сожалению, %{type} #%{id} не найден." type: changeset: пакет правок node: точка relation: отношение way: линия - paging_nav: - of: из - showing_page: Показана страница + note: + closed_by: Обработана %{user} %{when} назад + closed_by_anonymous: Обработана анонимом %{when} назад + closed_title: "Обработанная заметка #%{note_name}" + commented_by: Комментарий пользователя %{user} %{when} назад + commented_by_anonymous: Комментарий анонима %{when} назад + hidden_by: Скрыта %{user} %{when} назад + hidden_title: "Скрытая заметка #%{note_name}" + new_note: Новая заметка + open_by: Создано пользователем %{user} %{when} назад + open_by_anonymous: Создано анонимом %{when} назад + open_title: "Необработанная заметка #%{note_name}" + reopened_by: Обработана %{user} %{when} назад + reopened_by_anonymous: Обработана анонимом %{when} назад + title: "Примечание: %{id}" + part_of: Участвует в redacted: + message_html: Версия %{version} этого объекта вырезана и не может быть отображена. Смотрите %{redaction_link} для дополнительной информации. + redaction: Редакция %{id} type: node: точка relation: отношение way: линия relation: - download: "%{download_xml_link} или %{view_history_link}" - download_xml: Скачать XML - relation: Отношение - relation_title: "Отношение: %{relation_name}" - view_history: посмотреть историю - relation_details: - members: "Участники:" - part_of: "Участвует в:" - relation_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Скачать XML - relation_history: История отношения - relation_history_title: "История отношения: %{relation_name}" - view_details: посмотреть подробнее + history_title: "История отношения: %{name}" + members: Участники + title: "Отношение: %{name}" relation_member: entry_role: "%{type} %{name} в роли %{role}" type: node: Точка relation: Отношение way: Линия - start: - manually_select: Выделить другую область - view_data: Посмотреть данные для текущего вида start_rjs: - data_frame_title: Данные - data_layer_name: Просмотр данных карты - details: Подробности - drag_a_box: Для выбора области растяните рамку по карте - edited_by_user_at_timestamp: Изменил [[user]] в [[timestamp]] - hide_areas: Скрыть области - history_for_feature: История [[feature]] + feature_warning: Необходимо загрузить %{num_features} объектов, что может замедлить ваш браузер. Вы уверены что хотите просмотреть эти данные? load_data: Загрузить данные - loaded_an_area_with_num_features: Вы загрузили область, которая содержит [[num_features]] объектов. Некоторые браузеры могут не справиться с отображением такого количества данных. Обычно браузеры лучше всего обрабатывают до 100 объектов одновременно. Загрузка большего числа может замедлить ваш браузер или привести к зависанию. Если вы всё равно хотите отобразить эти данные, нажмите на кнопку ниже. loading: Загрузка... - manually_select: Выделить другую область - object_list: - api: Получить эту область из API - back: Отобразить список объектов - details: Подробности - heading: Список объектов - history: - type: - node: Точка [[id]] - way: Линия [[id]] - selected: - type: - node: Точка [[id]] - way: Линия [[id]] - type: - node: Точка - way: Линия - private_user: частный пользователь - show_areas: Показать области - show_history: Показать историю - unable_to_load_size: Загрузка невозможна. Размер квадрата [[bbox_size]] слишком большой (должен быть меньше %{max_bbox_size}) - wait: Подождите... - zoom_or_select: Увеличьте или выберите область для просмотра tag_details: - tags: "Теги:" + tags: Теги wiki_link: key: Страница вики, описывающая тег %{key} tag: Страница вики, описывающая тег %{key}=%{value} wikipedia_link: Статья %{page} в Википедии timeout: - sorry: Извините, данные для %{type} с id %{id} слишком длинные для извлечения. + sorry: Извините, данные для %{type} с %{id} слишком длинные для извлечения. type: changeset: пакета правок node: точки relation: отношения way: линии + version: Версия + view_details: Подробнее + view_history: Посмотреть историю way: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" - download_xml: Скачать XML - edit: править - view_history: посмотреть историю - way: линия - way_title: "Линия: %{way_name}" - way_details: also_part_of: - one: также содержится в линии %{related_ways} - other: также содержится в линиях %{related_ways} - nodes: "Точки:" - part_of: "Участвует в:" - way_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Скачать XML - view_details: подробнее - way_history: История правок линии - way_history_title: "История правок линии: %{way_name}" + one: содержится в линии %{related_ways} + other: содержится в линиях %{related_ways} + history_title: "История линии: %{name}" + nodes: Точки + title: "Линия: %{name}" changeset: changeset: anonymous: Аноним - big_area: (большая) - no_comment: (нет) no_edits: (нет правок) - show_area_box: Показать рамку, охватывающую область пакета правок - still_editing: (ещё редактируется) view_changeset_details: Просмотреть подробности пакета правок changeset_paging_nav: next: Следующая → @@ -310,24 +241,17 @@ ru: saved_at: Завершено user: Пользователь list: - description: Последние изменения - description_bbox: "Пакеты правок в рамке, охватывающей координаты: %{bbox}" - description_friend: Пакеты правок ваших друзей - description_nearby: Наборы правок соседних участников - description_user: Пакеты правок пользователя %{user} - description_user_bbox: Пакеты правок пользователя %{user} в рамке, охватывающей координаты %{bbox} - heading: Пакеты правок - heading_bbox: Пакеты правок - heading_friend: Пакеты правок - heading_nearby: Пакеты правок - heading_user: Пакеты правок - heading_user_bbox: Пакеты правок + empty: Пакеты правок не найдены. + empty_area: Нет пакетов правок в этой области. + empty_user: Нет пакетов правок от этого пользователя. + load_more: Загрузить ещё + no_more: Больше никаких пакетов правок не обнаружено. + no_more_area: Нет больше пакетов правок в этой области. + no_more_user: Нет больше пакетов правок от этого пользователя. title: Пакет правок - title_bbox: Пакет правок в рамке, охватывающей координаты %{bbox} title_friend: Пакеты правок ваших друзей title_nearby: Пакеты правок соседних участников title_user: Пакеты правок пользователя %{user} - title_user_bbox: Пакеты правок пользователя %{user} в рамке, охватывающей координаты %{bbox} timeout: sorry: К сожалению, список пакетов правок, который вы запросили, слишком большой для извлечения. diary_entry: @@ -348,6 +272,7 @@ ru: few: "%{count} комментария" one: "%{count} комментарий" other: "%{count} комментариев" + zero: Нет комментариев comment_link: Комментировать confirm: Подтвердить edit_link: Изменить запись @@ -382,7 +307,7 @@ ru: newer_entries: Более новые записи no_entries: В дневнике нет записей older_entries: Более старые записи - recent_entries: "Недавние записи:" + recent_entries: Недавние записи title: Дневники title_friends: Дневники друзей title_nearby: Дневники соседних участников @@ -395,7 +320,7 @@ ru: title: Сделать новую запись в дневнике no_such_entry: body: К сожалению, записи или комментария с id %{id} не найдено. Проверьте правильность написания. Возможно, ссылка, по которой вы перешли, ошибочна. - heading: Нет записи с id %{id} + heading: "Нет записи с id: %{id}" title: Нет такой дневниковой записи view: leave_a_comment: Оставить комментарий @@ -406,6 +331,9 @@ ru: user_title: Дневник пользователя %{user} editor: default: По умолчанию (назначен %{name}) + id: + description: iD (редактор в браузере) + name: iD potlatch: description: Potlatch 1 (редактор в браузере) name: Potlatch 1 @@ -421,8 +349,8 @@ ru: area_to_export: Область для экспорта embeddable_html: Встраиваемый HTML export_button: Экспортировать - export_details: Данные OpenStreetMap распространяются по лицензии Creative Commons Attribution-ShareAlike 2.0. - format: "Формат:" + export_details: Данные OpenStreetMap распространяются по лицензии Open Data Commons Open Database License (ODbL). + format: Формат format_to_export: Формат экспорта image_size: "Размер изображения:" latitude: "Широта:" @@ -437,29 +365,46 @@ ru: paste_html: HTML-код для встраивания на сайт scale: Масштаб too_large: - body: Эта область слишком велика для экспорта в качестве данных в формате OpenStreetMap XML. Пожалуйста, увеличьте масштаб или выберите меньшую область. - heading: Область слишком большая + advice: "Если этот экспорт пройдёт неудачно, пожалуйста, попробуйте использовать один из перечисленных ниже источников:" + body: "Эта область слишком велика для экспорта в качестве данных в формате OpenStreetMap XML. Пожалуйста, увеличьте масштаб, выберите меньшую область или используйте один из следующих источников для массовой загрузки данных:" + geofabrik: + description: Регулярно обновляемые выгрузки континентов, стран и отдельных городов + title: Загрузки Geofabrik + metro: + description: Выгрузки крупных городов мира и окружающих их районов + title: Выгрузки городов + other: + description: Дополнительные источники, перечисленные в вики OpenStreetMap + title: Другие источники + overpass: + description: Скачать ограниченную этим прямоугольником область с зеркала базы данных OpenStreetMap + title: Overpass API + planet: + description: Регулярно обновляемые копии полной базы данных OpenStreetMap + title: Планета OSM zoom: Приблизить - start_rjs: - add_marker: Добавить маркер на карту - change_marker: Измените местоположение маркера - click_add_marker: Щёлкните по карте для установки маркера - drag_a_box: Для выбора области растяните рамку по карте - export: Экспорт - manually_select: Выделить другую область - view_larger_map: Посмотреть более крупную карту + title: Экспортировать + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Просто нажмите или на тот же значок на карте.\nЭто добавит на карту маркер, который можно передвигать перетаскиванием. Добавьте сообщение, а затем нажмите кнопку сохранения, и другие картографы увидят его." + join_the_community: + explanation_html: Если вы заметили проблему в данных нашей карты, например, отсутствие дорога или вашего адреса, лучший способ для дальнейших действий — вступить в сообщество OpenStreetMap и добавить или восстановить данные самостоятельно. + title: Присоединиться к сообществу + title: Как помочь + other_concerns: + explanation_html: "Если у вас есть вопросы о том, как используются наши данные, или о содержимом сайта, обратитесь к нашей\nстранице авторских прав для получения дополнительной правовой информации или свяжитесь с соответствующий\nрабочей группой OSMF." + title: Другие проблемы + title: Сообщить о проблеме / исправить карту geocoder: description: title: geonames: Местоположение из GeoNames - osm_namefinder: "%{types} из OpenStreetMap Namefinder" osm_nominatim: Местоположение из OpenStreetMap Nominatim types: cities: Города places: Места towns: Городские поселения - description_osm_namefinder: - prefix: "%{distance} %{direction} %{type}" direction: east: восточнее north: севернее @@ -480,16 +425,26 @@ ru: title: ca_postcode: Результаты от Geocoder.CA geonames: Результаты от GeoNames + geonames_reverse: Результаты с GeoNames latlon: Внутренние результаты - osm_namefinder: Результаты от OpenStreetMap Namefinder osm_nominatim: Результаты, полученные из OpenStreetMap Nominatim + osm_nominatim_reverse: Результаты с OpenStreetMap Nominatim uk_postcode: Результаты от NPEMap / FreeThe Postcode us_postcode: Результаты от Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} %{parentname})" - suffix_place: ", %{distance} %{direction} %{placename}" search_osm_nominatim: + admin_levels: + level10: Граница пригорода + level2: Граница страны + level4: Граница штата, субъекта + level5: Граница региона + level6: Граница страны + level8: Граница города + level9: Граница села, деревни prefix: + aerialway: + chair_lift: Кресельный канатный подъёмник + drag_lift: Якорный (бугельный) подъёмник + station: Станция канатного подъёмника aeroway: aerodrome: Аэродром apron: Перрон @@ -529,17 +484,17 @@ ru: courthouse: Помещение суда crematorium: Крематоорий dentist: Стоматология - doctors: Врач + doctors: Врачи dormitory: Общежитие drinking_water: Питьевая вода driving_school: Автошкола embassy: Посольство emergency_phone: Телефон экстренных служб - fast_food: Палатка с едой + fast_food: Фаст-фуд ferry_terminal: Паромная станция fire_hydrant: Пожарный гидрант fire_station: Пожарная охрана - food_court: Фаст-фуд + food_court: Фудкорт fountain: Фонтан fuel: Заправка grave_yard: Место захоронения @@ -583,6 +538,7 @@ ru: shower: Душ social_centre: Общественный центр social_club: Сообщество + social_facility: Социальное учреждение studio: Студия supermarket: Супермаркет swimming_pool: Бассейн @@ -592,11 +548,11 @@ ru: toilets: Туалет townhall: Городская администрация university: Университет - vending_machine: торговый автомат + vending_machine: Торговый автомат veterinary: Ветеринарная клиника village_hall: Усадьба waste_basket: Мусорка - wifi: WiFi-доступ + wifi: WiFi доступ youth_centre: Молодёжный центр boundary: administrative: Административная граница @@ -611,6 +567,9 @@ ru: "yes": Мост building: "yes": Здание + emergency: + fire_hydrant: Пожарный гидрант + phone: Телефон экстренной связи highway: bridleway: Конный путь bus_guideway: Автобусная полоса-рельс @@ -632,6 +591,7 @@ ru: platform: Платформа primary: Главная дорога primary_link: Главная дорога + proposed: Проектируемая дорога raceway: Гоночная трасса residential: Улица обычная rest_area: Зона отдыха @@ -643,6 +603,7 @@ ru: speed_camera: Камера по контролю скорости steps: Ступеньки stile: Турникет + street_lamp: Уличный фонарь tertiary: Дорога третьего класса tertiary_link: Дорога третьего класса track: Неофициальная грунтовка @@ -658,6 +619,7 @@ ru: building: Здание castle: Крепость church: Церковь + citywalls: Исторические укрепления fort: Форт house: Дом icon: Икона @@ -667,6 +629,7 @@ ru: monument: Памятник museum: Музей ruins: Развалины + tomb: Могила tower: Башня wayside_cross: Придорожный крест wayside_shrine: Придорожная святыня @@ -674,7 +637,7 @@ ru: landuse: allotments: Сады-огороды basin: Бассейн - brownfield: Заброшенная зона + brownfield: Заброшенная зона, пустырь cemetery: Кладбище commercial: Офисная территория conservation: Законсервированная зона @@ -682,7 +645,7 @@ ru: farm: Ферма farmland: Сельхозугодья farmyard: Сельхоздворы - forest: Дикий лес + forest: Лесное хозяйство garages: Гаражи grass: Трава greenfield: Неосвоенная территория @@ -734,6 +697,8 @@ ru: airfield: Военный аэродром barracks: Казармы bunker: Бункер + mountain_pass: + "yes": Перевал natural: bay: Залив beach: Пляж @@ -774,7 +739,7 @@ ru: water: Водоём wetland: Заболоченная территория wetlands: Заболоченные земли - wood: Естественный лес + wood: Лес office: accountant: Бухгалтер architect: Архитектор @@ -803,6 +768,7 @@ ru: locality: Заброшенная деревня, урочище, необитаемая местность moor: Торфяник municipality: Муниципалитет + neighbourhood: Соседство postcode: Почтовый индекс region: Регион sea: Море @@ -828,8 +794,10 @@ ru: narrow_gauge: Узкоколейка platform: Железнодорожная платформа preserved: Историческая ж/д + proposed: Проектируемая железная дорога spur: Ответвление ж/д пути station: Железнодорожная станция + stop: Железнодорожная остановка subway: Станция метро subway_entrance: Вход в метро switch: Железнодорожная стрелка @@ -845,24 +813,26 @@ ru: beverages: Магазин напитков bicycle: Веломагазин books: Книжный магазин + boutique: Бутик butcher: Мясная лавка car: Продажа и ремонт автомобилей car_parts: Автомагазин car_repair: Автомастерская carpet: Ковры - charity: Секонд-хэнд + charity: Благотворительный магазин chemist: Магазин бытовой химии clothes: Магазин одежды computer: Компьютерный магазин confectionery: Кондитерская - convenience: Ларёк + convenience: Продовольственный магазин copyshop: Услуги копирования cosmetics: Косметика + deli: Магазин деликатесов department_store: Универсам discount: Магазин распродаж - doityourself: Магазин типа «Сделай сам» (DIY — Do-It-Yourself) + doityourself: Сделай сам dry_cleaning: Химчистка - electronics: Магазин электротоваров + electronics: Магазин электроники estate_agent: Продажа недвижимости farm: Сельпо fashion: Магазин модной одежды @@ -889,24 +859,28 @@ ru: mobile_phone: Магазин мобильных телефонов motorcycle: Магазин по продаже мотоциклов music: Музыкальный магазин - newsagent: Киоск - optician: оптика + newsagent: Газетный киоск + optician: Оптика organic: Продуктовый магазин outdoor: Открытый рынок pet: Зоомагазин + pharmacy: Аптека photo: Фотомагазин salon: Салон + second_hand: Комиссионный магазин shoes: Обувной магазин shopping_centre: Торговый центр sports: Спортивный магазин stationery: Канцелярские товары supermarket: Супермаркет + tailor: Портной toys: Магазин игрушек travel_agency: Туристической агентство video: Магазин видеозаписей wine: Винный магазин + "yes": Магазин tourism: - alpine_hut: Высокогорная гостиница + alpine_hut: Альпийский Домик artwork: Произведения искусства attraction: Аттракцион bed_and_breakfast: Полупансион @@ -927,9 +901,10 @@ ru: viewpoint: Смотровая площадка zoo: Зоопарк tunnel: + culvert: Водопропускная труба, кульверт "yes": Туннель waterway: - artificial: Искусственный водный путь + artificial: Искусственный водоток boatyard: Верфь canal: Канал connector: Слияние рек @@ -950,70 +925,117 @@ ru: water_point: Пункт водоснабжения waterfall: Водопад weir: Плотина + help_page: + help: + description: Задать вопрос или найти ответы на сайте вопросов и ответов OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: На OpenStreetMap есть несколько ресурсов, где можно узнать о проекте, задать вопросы или ответить на них и совместно обсудить темы, касающиеся картографии. + title: Получение справки + welcome: + description: Начните с этого краткого руководства, охватывающего основы OpenStreetMap. + title: Добро пожаловать на OSM + url: /welcome + wiki: + description: Посмотреть вики с подробной документацией по OSM + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/wiki/RU:Main_Page javascripts: + close: Закрыть + edit_help: Передвиньте карту и увеличьте место, которые вы хотите править, затем кликните здесь. + key: + title: Легенда карты + tooltip: Условные знаки + tooltip_disabled: Легенда карты доступна только для Стандартного слоя map: base: cycle_map: Карта для велосипедистов + hot: Humanitarian‎ mapquest: MapQuest Open standard: Стандартный transport_map: Карта транспорта - overlays: - maplint: Maplint + copyright: © Участники OpenStreetMap + donate_link_text: + layers: + data: Просмотр данных карты + header: Слои карты + notes: Заметки + overlays: Дополнительные слои для устранения неисправностей карты + title: Слои + locate: + popup: Вы находитесь в {distance} {unit} от этой точки + title: Показать мое местоположение + zoom: + in: Приблизить + out: Отдалить + notes: + new: + add: Добавить заметку + intro: Введённая вами информация будет доступна другим пользователям, возможно, она поможет улучшить карту. Пожалуйста, оставьте в заметке чёткое описание, установите маркер в точное место на карте. + show: + anonymous_warning: Эта заметка содержит комментарии анонимных участников. Требуется независимая проверка сведений. + comment: Прокомментировать + comment_and_resolve: Прокомментировать и обработать + hide: Скрыть + reactivate: Переоткрыть + resolve: Обработана + share: + cancel: Отмена + center_marker: Центрировать карту на маркер + custom_dimensions: Выбрать размер вручную + download: Загрузить + embed: Код + format: "Формат:" + image: Изображение + image_size: Будет сохранён участок стандартного слоя размером + include_marker: Включая маркер + link: Ссылка или код для вставки + long_link: Полная ссылка + paste_html: HTML-код для встраивания на сайт + scale: "Масштаб:" + short_link: Короткая ссылка + short_url: Короткая ссылка + title: Поделиться + view_larger_map: Посмотреть более крупную карту site: + createnote_disabled_tooltip: Приблизьте карту, чтобы добавить заметку + createnote_tooltip: Добавить заметку на карту edit_disabled_tooltip: Увеличить масштаб для редактирования карты edit_tooltip: Править карту - edit_zoom_alert: Необходимо увеличить масштаб карты, если вы хотите ее править. - history_disabled_tooltip: Увеличить масштаб для просмотра правок в этой области - history_tooltip: Просмотр правок в этой области - history_zoom_alert: Необходимо увеличить масштаб карты, чтобы увидеть историю правок + map_data_zoom_in_tooltip: Увеличьте масштаб, чтобы увидеть данные карты + map_notes_zoom_in_tooltip: Увеличьте масштаб, чтобы увидеть примечания к карте layouts: + about: О проекте community: Сообщество community_blogs: Блоги сообщества community_blogs_title: Блоги членов сообщества OpenStreetMap - copyright: Лицензия и авторы - documentation: О проекте - documentation_title: Документация по проекту + copyright: Авторские права + data: Данные donate: Поддержите OpenStreetMap %{link} в Фонд обновления оборудования. - donate_link_text: пожертвованиями edit: Правка edit_with: Править с помощью %{editor} export: Экспорт - export_tooltip: Экспортировать данные карты + export_data: Экспортировать данные foundation: Фонд OpenStreetMap foundation_title: Фонд OpenStreetMap gps_traces: GPS-треки gps_traces_tooltip: Работать с GPS треками help: Помощь - help_centre: Центр помощи (англ.) - help_title: Сайт помощи проекта history: История - home: домой - home_tooltip: Показать мой дом - inbox: входящие (%{count}) - inbox_tooltip: - few: В вашем ящике %{count} новых сообщения - one: В вашем ящике %{count} новое сообщение - other: В вашем ящике есть %{count} новых сообщений. - zero: В вашем ящике нет непрочитанных сообщений - intro_1: OpenStreetMap — это свободная карта всего мира, созданная такими же людьми, как и вы. + home: Домой intro_2_create_account: Создайте учётную запись - intro_2_download: скачивания - intro_2_html: Все данные являются свободными для %{download}, %{use} и предоставляются по %{license}. %{create_account} для улучшения карты. - intro_2_license: свободной лицензии - intro_2_use: использования - intro_2_use_url: http://wiki.openstreetmap.org/wiki/RU:Using_OpenStreetMap - license: - alt: CC BY-SA 2.0 - title: Данные OpenStreetMap доступны по лицензии Creative Commons Attribution-Share Alike 2.0 Generic - log_in: войти + intro_header: Добро пожаловать на OpenStreetMap! + intro_text: OpenStreetMap является картой мира, созданной такими же людьми, как и вы, и может свободно использоваться под открытой лицензией. + learn_more: Узнать больше + log_in: Войти log_in_tooltip: Войти под существующей учётной записью logo: alt_text: Логотип OpenStreetMap - logout: выйти - logout_tooltip: Выйти + logout: Выйти make_a_donation: text: Поддержать проект title: Поддержите OpenStreetMap денежным пожертвованием + more: Ещё osm_offline: База данных OpenStreetMap в данный момент не доступна, так как проводится необходимое техническое обслуживание. osm_read_only: База данных OpenStreetMap в данный момент доступна только для чтения, так как проводится необходимое техническое обслуживание. partners_bytemark: Bytemark Hosting @@ -1021,25 +1043,47 @@ ru: partners_ic: Имперским колледжем Лондона partners_partners: партнёрами partners_ucl: UCL VR Centre - sign_up: регистрация + sign_up: Зарегистрироваться sign_up_tooltip: Создать учётную запись для редактирования - sotm2011: Приезжайте на конференцию OpenStreetMap 2011 «The State of the Map», 9-11 сентября, Денвер! + start_mapping: Начать картографировать tag_line: Свободная вики-карта мира user_diaries: Дневники участников user_diaries_tooltip: Посмотреть дневники участников - view: Карта - view_tooltip: Посмотреть карту - welcome_user: Добро пожаловать, %{user_link} - welcome_user_link_tooltip: Ваша персональная страница - wiki: Вики - wiki_title: Вики-сайт проекта - wiki_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D0%BB%D0%B0%D0%B2%D0%BD%D0%B0%D1%8F_%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0?uselang=ru license_page: foreign: english_link: английского оригинала text: В случае конфликта между этой переведённой страницей и %{english_original_link}, английская страница должна иметь приоритет title: Об этом переводе - legal_babble: "

    Авторские права и лицензирование

    \n

    OpenStreetMap — это открытые данные доступные по лицензии Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA). \n

    \n\n

    Вы можете свободно копировать, распространять, передавать и дорабатывать наши карты и данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество. Если вы изменяете или берёте наши карты за основу, то вы должны распространять результат только по такой же лицензии. Полный юридический текст лицензии (перевод на русский язык) разъясняет ваши права и обязанности.\n

    \n\n

    Как сослаться на OpenStreetMap

    \n

    Если вы используете изображения карт OpenStreetMap, мы требуем, чтобы вы указывали, по крайней мере, «© Участники OpenStreetMap, CC BY-SA». Если вы используете только картографические данные, мы требуем наличия указания «Картографические данные © Участники OpenStreetMap, CC BY-SA». \n

    \n

    Где это возможно, текст «OpenStreetMap» должен быть гиперссылкой на http://www.openstreetmap.org/, «CC BY-SA» — на http://creativecommons.org/licenses/by-sa/2.0/deed.ru. Если вы используете носители, где гиперссылки невозможны (например, печатная работа), мы предлагаем вам направлять ваших читателей непосредственно к www.openstreetmap.org (возможно, расширяя «OpenStreetMap» до полного адреса) и к www.creativecommons.org. \n

    \n\n

    Узнайте больше

    \n

    Прочитайте больше об использовании наших данных на странице ответов на юридические вопросы. \n

    \n

    Участники сообщества OSM должны всегда помнить о том, что запрещается добавлять данные из любых защищенных авторским правом источников (например, с Google Maps или печатных карт) без явного предварительного согласия правообладателей. \n

    \n

    Хотя OpenStreetMap — открытые данные, мы не в состоянии предоставлять бесплатный API к нашим картам для сторонних разработчиков. См. Правила использования API, Правила использования частей карты и Правила использования службы Nominatim . \n

    \n\n

    Кто вносит вклад в наш проект

    \n

    Наша лицензия CC BY-SA требует от вас «указывать авторство Автора Оригинала разумно в средстве или способах, которые Вы используете». Индивидуальные картографы OSM не требуют указания авторства больше, чем строчкой «участники OpenStreetMap», но в OpenStreetMap есть данные, полученные от национальных картографических агентств или других существенных источников, поэтому возможно имеет смысл указать непосредственно на них, как на источник, или добавить ссылку на эту страницу. \n

    \n\n\n\n
    \n\n

    \nВключение данных в OpenStreetMap не означает, что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap, предоставляет гарантии или принимает на себя какую-любую ответственность. \n

    " + legal_babble: + attribution_example: + alt: Пример того, как сослаться на OpenStreetMap с веб-страницы + title: Пример указания авторства + contributors_at_html: "Австрия. Данные города Вена (на условиях CC BY), а также земель Форарльберга и\n Тироля (на условиях CC-BY AT с дополнениями)." + contributors_ca_html: Канада. Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады). + contributors_fi_html: "Финляндия: Содержит данные из топографической базы национальной земельной службы Финляндии\n и других наборов данных, под\nлицензией NLSFI." + contributors_footer_1_html: Более подробную информацию об этих и других источниках, использованных для наполнения OpenStreetMap, смотрите на странице Contributors вики-сервера OpenStreetMap. + contributors_footer_2_html: Включение данных в OpenStreetMap не означает, что поставщик первичных данных каким-либо образом поддерживает OpenStreetMap, предоставляет гарантии или принимает на себя какую-любую ответственность. + contributors_fr_html: "Франция: Данные от Главного налогового управления." + contributors_gb_html: Великобритания. Данные Ordnance Survey © Crown copyright и права на базы данных 2010-12. + contributors_intro_html: "Участниками проекта являются тысячи отдельных людей. Проект также включает данные под свободными лицензиями от национальных картографических агентств и от других источников, среди которых:" + contributors_nl_html: "Нидерланды: Contains © AND data, 2007 (www.and.com)" + contributors_nz_html: Новая Зеландия. Данные из сведений о земельных ресурсах Новой Зеландии. Crown Copyright reserved. + contributors_title_html: Кто вносит вклад в наш проект + contributors_za_html: "ЮАР: Имеются данные из\nГлавное управление:\nНациональная геоинформационная система, права принадлежат государству." + credit_1_html: Мы требуем, чтобы вы указывали «© Участники OpenStreetMap». + credit_2_html: Вы должны также ясно обозначить, что по лицензии Open Database License распространяется база геоданных, в то время как готовые изображения карты лицензированы под CC-BY-SA. Вы можете сделать это, разместив ссылку на эту страницу. Если же вы распространяете OSM только в виде базы данных, мы можете размещать гиперссылку напрямую на текст соответствующей лицензии. Если формат медиа делает использование гиперссылок невозможным (как например бумажные карты), мы рассчитываем, что вы направите читателей на openstreetmap.org (обозначив именно адрес сайта вместо только лишь названия проекта, 'OpenStreetMap'), на opendatacommons.org, и, при необходимости, на creativecommons.org. + credit_3_html: "В случае электронной карты с прокруткой, ссылка должна всегда находиться в углу окна просмотра карты.\nНапример:" + credit_title_html: Как сослаться на OpenStreetMap + infringement_1_html: Напоминаем участникам сообщества OSM, что добавление данных из любых защищённых авторским правом источников (например, с Google Maps или печатных карт) не должно проводиться без явного предварительного согласия правообладателей. + infringement_2_html: "Если вы считаете, что защищённый авторским правом материал был неправомерно\n добавлен к базе OpenStreetMap или к этому сайту, пожалуйста, обратитесь\n к нашей процедуре\n изымания или непосредственно на нашу\nвебстраницу регистрации." + infringement_title_html: Нарушение авторских прав + intro_1_html: "OpenStreetMap содержит свободные данные, распространяемые по лицензии Open Data\nCommons Open Database License (ODbL)." + intro_2_html: Вы можете свободно копировать, распространять, передавать и дорабатывать наши данные до тех пор, пока вы ссылаетесь на OpenStreetMap и его сообщество. Если вы изменяете или берёте наши данные за основу, то вы должны распространять результат только по такой же лицензии. Полный юридический текст лицензии разъясняет ваши права и обязанности. + intro_3_html: Изготовленные нами изображения карты, также как и наша документация распространяются по лицензии Creative Commons Attribution-ShareAlike 2.0 (CC-BY-SA). + more_1_html: Прочитайте больше об использовании наших данных и о поддержке на странице ответов на юридические вопросы. + more_2_html: Хотя данные OpenStreetMap открыты для использования, мы не в состоянии предоставить бесплатный API к нашим картам для сторонних разработчиков. См. Правила использования API, Правила использования частей карты и Правила использования службы Nominatim . + more_title_html: Узнайте больше + title_html: Авторские права и лицензирование native: mapping_link: начать картографирование native_link: русской версии @@ -1053,7 +1097,17 @@ ru: from: От messages: У вас есть %{new_messages} и %{old_messages} my_inbox: Мои входящие + new_messages: + few: "%{count} новых сообщения" + many: "%{count} новых сообщений" + one: "%{count} новое сообщение" + other: "%{count} новых сообщений" no_messages_yet: У вас пока нет сообщений. Почему бы не пообщаться с %{people_mapping_nearby_link}? + old_messages: + few: "%{count} старых" + many: "%{count} старых" + one: "%{count} старое" + other: "%{count} старых" outbox: исходящие people_mapping_nearby: пользователями поблизости subject: Тема @@ -1082,6 +1136,11 @@ ru: outbox: date: Дата inbox: входящие + messages: + few: У вас %{count} отправленных сообщения + many: У вас %{count} отправленных сообщений + one: У вас %{count} отправленное сообщение + other: У вас %{count} отправленных сообщений my_inbox: Мои %{inbox_link} no_sent_messages: Нет отправленных сообщений. Почему бы не пообщаться с %{people_mapping_nearby_link}? outbox: исходящие @@ -1090,12 +1149,9 @@ ru: title: Исходящие to: Кому read: - back_to_inbox: Назад ко входящим - back_to_outbox: Назад к исходящим + back: Назад date: Дата from: От - reading_your_messages: Просмотр сообщения - reading_your_sent_messages: Просмотр отправленного сообщения reply_button: Ответить subject: Тема title: Просмотр сообщения @@ -1106,6 +1162,37 @@ ru: wrong_user: "\nВы вошли как `%{user}' но ответ на ваш вопрос был отправлен не этому пользователю. Пожалуйста, войдите как соответствующий вашему вопросу пользователь, чтобы прочитать ответ." sent_message_summary: delete_button: Удалить + note: + description: + closed_at_by_html: Решена %{when} назад %{user} + closed_at_html: Решена %{when} назад + commented_at_by_html: Обновлена %{when} назад %{user} + commented_at_html: Обновлена %{when} назад + opened_at_by_html: Создана %{when} назад %{user} + opened_at_html: Создана %{when} назад + reopened_at_by_html: Возобновлена %{when} назад %{user} + reopened_at_html: Возобновлена %{when} назад + entry: + comment: Комментарий + full: Полный текст + mine: + ago_html: "%{when} назад" + created_at: Создана + creator: Автор + description: Описание + heading: Заметки участника %{user} + id: ИД + last_changed: Изменена + subheading: Заметки, созданные или прокомментированные участником %{user} + title: Заметки, созданные или прокомментированный участником %{user} + rss: + closed: закрытая заметка (около %{place}) + commented: новый комментарий (около %{place}) + description_area: Список заметок, созданных, прокомментированных или закрытых в вашей области [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: RSS-поток заметки %{id} + opened: новая заметка (около %{place}) + reopened: переоткрытая заметка (около %{place}) + title: Заметки OpenStreetMap notifier: diary_comment_notification: footer: Вы можете также прочитать комментарий — %{readurl}, оставить свой — %{commenturl} или ответить — %{replyurl} @@ -1121,8 +1208,7 @@ ru: email_confirm_plain: click_the_link: Если это вы, то перейдите по ссылке, расположенной ниже, чтобы подтвердить изменение. greeting: Здравствуйте, - hopefully_you_1: Кто-то (надеемся, что вы) хочет изменить свой адрес электронной почты в - hopefully_you_2: "%{server_url} на адрес %{new_address}." + hopefully_you: Кто-то (надеемся, что Вы) хочет изменить свой адрес электронной почты в %{server_url} на адрес %{new_address}. friend_notification: befriend_them: Вы также можете добавить их в качестве друзей в %{befriendurl}. had_added_you: "%{user} добавил вас в друзья на OpenStreetMap." @@ -1152,46 +1238,36 @@ ru: lost_password_plain: click_the_link: Если это вы, пожалуйста, перейдите по ссылке, указанной ниже, чтобы сменить ваш пароль. greeting: Здравствуйте, - hopefully_you_1: Кто-то (надеемся, что вы) запросил смену пароля для этого - hopefully_you_2: адреса электронной почты, зарегистрированного на openstreetmap.org. + hopefully_you: Кто-то (надеемся, что Вы) запросил смену пароля для этого адреса электронной почты, зарегистрированного на openstreetmap.org. message_notification: - footer1: Вы можете также прочитать сообщение — %{readurl} - footer2: и вы можете ответить на %{replyurl} + footer_html: Вы можете также прочитать сообщение на странице %{readurl}, ответить на него на странице %{replyurl} header: "Пользователь OpenStreetMap %{from_user} отправил вам сообщение с темой %{subject}:" hi: Привет, %{to_user}, + note_comment_notification: + anonymous: анонимный участник + closed: + commented_note: "%{commenter} разрешил одну из отметок, которые вы комментировали. Отметка недалеко от %{place}." + subject_other: "[OpenStreetMap] %{commenter} обработал интересную вам заметку" + subject_own: "[OpenStreetMap] %{commenter} обработал вашу заметку" + your_note: "%{commenter} разрешил одну из ваших отметок на карте недалеко от %{place}." + commented: + commented_note: "%{commenter} оставил комментарий к одной из картографических заметок, которую вы тоже комментировали. Заметка находится около %{place}." + subject_other: "[OpenStreetMap] %{commenter} прокомментировал интересную вам заметку" + subject_own: "[OpenStreetMap] %{commenter} прокомментировал вашу заметку" + your_note: "%{commenter} оставил комментарий к одной из ваших картографических заметок около %{place}." + details: Подробнее о заметке %{url}. + greeting: Привет, + reopened: + commented_note: "%{commenter} переоткрыл одну из отметок, которые вы комментировали. Отметка недалеко от %{place}." + subject_other: "[OpenStreetMap] %{комментатор} переоткрыл интересную вам заметку" + subject_own: "[OpenStreetMap] %{комментатор} переоткрыл вашу заметку" + your_note: "%{commenter} переоткрыл одну из ваших отметок на карте недалеко от %{place}." signup_confirm: - subject: "[OpenStreetMap] Подтвердите ваш адрес электронной почты" - signup_confirm_html: - ask_questions: Вы можете задать интересующие Вас вопросы о OpenStreetMap на нашем сайте вопросов и ответов . - click_the_link: Если это действительно вы — добро пожаловать! Пожалуйста, перейдите по ссылке ниже, чтобы подтвердить регистрацию и просмотреть дополнительную информацию об OpenStreetMap - current_user: "Список пользователей, основанный на их местоположении, доступен здесь: Category:Users_by_geographical_region." - get_reading: Прочтите об OpenStreetMap в вики, узнайте последние новости в блоге OpenStreetMap или в Twitter. Ознакомьтесь с историей проекта в блоге OpenGeoData, автором которого является основатель OpenStreetMap Стив Кост (Steve Coast), в этом блоге есть подкасты, которые также можно прослушать! - greeting: Здравствуйте! - hopefully_you: Кто-то (надеемся, что вы) хотел создать учетную запись на - introductory_video: Вы можете просмотреть %{introductory_video_link}. - more_videos: Посмотрите %{more_videos_link}. - more_videos_here: больше видео здесь - user_wiki_page: Рекомендуется создать свою пользовательскую вики-страницу, включив в неё теги категорий, описывающих ваше местонахождение, например, [[Category:Users_in_Moscow]]. - video_to_openstreetmap: ознакомительное видео об OpenStreetMap - wiki_signup: Вы можете зарегистрироваться в вики OpenStreetMap. - signup_confirm_plain: - ask_questions: "Вы можете задать интересующие Вас вопросы об OpenStreetMap на нашем сайте вопросов и ответов:" - blog_and_twitter: "Ознакомиться с последними новостями через блог OpenStreetMap или Twitter:" - click_the_link_1: Если это действительно вы — добро пожаловать! Пожалуйста, перейдите по ссылке ниже, чтобы подтвердить - click_the_link_2: регистрацию и прочитать больше об OpenStreetMap. - current_user_1: Список пользователей, основанный на их местонахождении, - current_user_2: "доступен здесь:" - greeting: Здравствуйте! - hopefully_you: Кто-то (надеемся, что вы) хотел создать учетную запись на - introductory_video: "Вы можете посмотреть ознакомительное видео об OpenStreetMap здесь:" - more_videos: "Здесь ещё больше видео:" - opengeodata: "OpenGeoData.org — это блог основателя OpenStreetMap Стива Коста (Steve Coast) и там же можно найти подкасты:" - the_wiki: "Почитать об OpenStreetMap в вики:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/RU:Beginners%27_guide?uselang=ru - user_wiki_1: Рекомендуется создать свою пользовательскую вики-страницу, включив в неё - user_wiki_2: теги категорий, описывающих ваше местонахождение, например, [[Category:Users_in_Moscow]]. - wiki_signup: "Вы также можете зарегистрироваться в вики OpenStreetMap здесь:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=RU:Заглавная_страница&uselang=ru + confirm: "Прежде чем мы сможем что-либо сделать, мы должны убедиться, что эта просьба исходит от вас, так что если это так, то, пожалуйста, нажмите на ссылку ниже для подтверждения вашей учетной записи:" + created: Кто-то (надеемся, вы) только что создал учетную запись на %{site_url}. + greeting: Привет! + subject: "[OpenStreetMap] Добро пожаловать в OpenStreetMap" + welcome: После подтверждения вашей учётной записи, мы предоставим вам немного дополнительной информации для начального ознакомления. oauth: oauthorize: allow_read_gpx: читать ваши частные GPS-треки @@ -1200,8 +1276,18 @@ ru: allow_write_api: изменять карту allow_write_diary: создавать дневниковые записи, комментарии, устанавливать друзей allow_write_gpx: передавать GPS-треки на сервер. + allow_write_notes: изменять заметки. allow_write_prefs: изменять ваши пользовательские настройки request_access: Приложение %{app_name} запрашивает доступ к вашей учётной записи, %{user}. Пожалуйста, проверьте желаете ли вы, чтобы приложение имело следующие возможности. Вы можете выбрать любое количество. + title: Разрешить доступ к вашей учётной записи + oauthorize_failure: + denied: Вы запретили приложению %{app_name} доступ к вашей учётной записи. + invalid: Токен авторизации недействителен. + title: Сбой запроса авторизации + oauthorize_success: + allowed: Вы предоставили приложению %{app_name} доступ к вашей учётной записи. + title: Запрос на авторизацию разрешён + verification: "Проверочный код: %{code}." revoke: flash: Вы отозвали токен для приложения %{application} oauth_clients: @@ -1218,6 +1304,7 @@ ru: allow_write_api: изменять карту. allow_write_diary: создать дневниковые записи, комментарии, устанавливать друзей allow_write_gpx: передавать GPS-треки на сервер. + allow_write_notes: изменять заметки. allow_write_prefs: изменять их пользовательские настройки callback_url: URL обратного вызова name: Имя @@ -1248,14 +1335,16 @@ ru: allow_write_api: изменять карту allow_write_diary: создавать дневниковые записи, комментарии, устанавливать друзей allow_write_gpx: передавать GPS-треки на сервер. + allow_write_notes: изменять заметки. allow_write_prefs: изменять их пользовательские настройки. authorize_url: "Авторизующий URL:" confirm: Вы уверены? + delete: Удаление клиента edit: Изменить подробности key: "Потребительский ключ:" requests: "Запрос следующих разрешений со стороны пользователя:" secret: "Потребительский секрет:" - support_notice: Мы поддерживаем HMAC-SHA1 (рекомендуется) и обычный текст в режиме SSL. + support_notice: Мы поддерживаем HMAC-SHA1 (рекомендуется) и RSA-SHA1 подписи. title: Подробности OAuth для %{app_name} url: "URL маркера запроса:" update: @@ -1263,6 +1352,10 @@ ru: redaction: create: flash: Редакция создана. + destroy: + error: Произошла ошибка при уничтожении этой редакции. + flash: Редакция уничтожена. + not_empty: Редакция не пуста. Пожалуйста, откатите все версии, принадлежащие к этой редакции перед удалением. edit: description: Описание heading: Редактировать исправление @@ -1291,6 +1384,7 @@ ru: edit: anon_edits_link_text: Выяснить, в чём дело. flash_player_required: Для использования редактора Potlatch необходим Flash-плеер. Вы можете загрузить Flash-плеер с Adobe.com. Существуют и другие способы редактирования OpenStreetMap. + id_not_configured: iD не был настроен no_iframe_support: Ваш браузер не поддерживает рамки в HTML, а они нужны для этого режима. not_public: Вы не сделали свои правки общедоступными. not_public_description: "Вы не можете больше анонимно редактировать карту. Вы можете сделать ваши правки общедоступными здесь: %{user_page}." @@ -1299,18 +1393,15 @@ ru: potlatch_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в Potlatch снимите выделение с пути или точки, если редактируете в «живом» режиме, либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.) user_page_link: страница пользователя index: + createnote: Добавить заметку js_1: Вы используете браузер, в котором не поддерживается или отключен JavaScript. js_2: OpenStreetMap использует JavaScript для отображения карт. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Лицензировано на условиях %{license_name} проектом %{project_name} и его участниками, вносившими свой вклад. - project_name: OpenStreetMap + copyright: Авторские права принадлежат OpenStreetMap и его участникам на условиях открытой лицензии permalink: Постоянная ссылка remote_failed: Редактирование не удалось. Убедитесь, что JOSM или Merkaartor загружены и включена настройка дистанционного управления shortlink: Короткая ссылка key: - map_key: Условные знаки - map_key_tooltip: Легенда для карты table: entry: admin: Административная граница @@ -1368,9 +1459,9 @@ ru: - Вершина - пик tourist: Достопримечательность - track: Просёлок + track: Просёлочная дорога tram: - - Легко-рельсовый транспорт + - Легкорельсовый транспорт - трамвай trunk: Шоссе tunnel: Туннель (пунктир) @@ -1388,7 +1479,7 @@ ru: second: Второй элемент subheading: Подзаголовок text: Текст - title_html: Разобрано с посощью Markdown + title_html: Разобрано с помощью Markdown unordered: Неупорядоченный список url: URL richtext_area: @@ -1396,7 +1487,6 @@ ru: preview: Предпросмотр search: search: Поиск - search_help: "Примеры: «Рыбинск», «Ростов-на-Дону», «1, Красная площадь, Москва», «кафе рядом с Арбат», «стоянки Петергоф», «банкоматы Крещатик», «Regent Street, Cambridge» или «CB2 5AQ» (больше примеров)." submit_text: Перейти where_am_i: Где я? where_am_i_title: Опишите ваше местоположение, воспользовавшись инструментом поиска @@ -1412,6 +1502,11 @@ ru: upload_trace: Передать GPS-трек на сервер delete: scheduled_for_deletion: Запланировано к удалению + description: + description_with_count: + one: GPX-файл с %{count} точкой от %{user}} + other: GPX-файл с %{count} точками от %{user} + description_without_count: GPX-файл от %{user} edit: description: "Описание:" download: загрузить @@ -1430,7 +1525,11 @@ ru: visibility: "Видимость:" visibility_help: Что это значит? visibility_help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%92%D0%B8%D0%B4%D0%B8%D0%BC%D0%BE%D1%81%D1%82%D1%8C_GPS-%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru + georss: + title: OpenStreetMap GPS-треки list: + description: Обзор последних загруженных маршрутов GPS + empty_html: Пока здесь ничего нет. Загрузите новый трек или почитайте про GPS-треки на вики-странице. public_traces: Общедоступные GPS-треки public_traces_from: Общедоступные треки пользователя %{user} tagged_with: " отмеченные %{tags}" @@ -1462,7 +1561,7 @@ ru: description: "Описание:" help: Справка help_url: http://wiki.openstreetmap.org/wiki/RU:%D0%97%D0%B0%D0%B3%D1%80%D1%83%D0%B7%D0%BA%D0%B0_%D1%82%D1%80%D0%B5%D0%BA%D0%BE%D0%B2?uselang=ru - tags: "Метки:" + tags: "Теги:" tags_help: через запятую upload_button: Передать на сервер upload_gpx: Загрузить GPX-файл @@ -1472,14 +1571,16 @@ ru: trace_header: see_all_traces: Показать все треки see_your_traces: Показать все ваши треки - traces_waiting: "%{count} ваших треков ожидают передачи на сервер. Пожалуйста, подождите окончания передачи этих треков, а потом передавайте на сервер другие. Это позволит не блокировать сервер для других пользователей." + traces_waiting: + one: "%{count} ваш трек ожидает передачи на сервер. Пожалуйста, дождитесь окончания передачи этого трека, перед тем как начать передавать на сервер другие. Это позволит не блокировать сервер для других пользователей." + other: "%{count} ваших треков ожидают передачи на сервер. Пожалуйста, дождитесь окончания передачи этих треков, перед тем как начать передавать на сервер другие. Это позволит не блокировать сервер для других пользователей." upload_trace: Загрузить треки trace_optionals: tags: "Теги:" trace_paging_nav: - next: Следующая → - previous: ← Предыдущая - showing_page: Показывается страница %{page} + newer: Более новые треки + older: Более старые треки + showing_page: Страница %{page} view: delete_track: Удалить этот трек description: "Описание:" @@ -1507,32 +1608,35 @@ ru: user: account: contributor terms: - agreed: Вы согласились на новые Условия сотрудничества. + agreed: Вы согласились с новыми Условиями участия. agreed_with_pd: Вы также заявили, что вы считаете свои правки находящимися в общественном достоянии. - heading: "Условия сотрудничества:" + heading: "Условия участия:" link: http://wiki.openstreetmap.org/wiki/RU:Open_Database_License/Contributor_Terms?uselang=ru - link text: что это значит? + link text: что это? not yet agreed: Вы ещё не согласились с новыми Условиями участия. review link text: Пожалуйста, перейдите по этой ссылке в удобное для вас время и подтвердите согласие с новыми Условиями участия. - current email address: "Текущий адрес эл. почты:" + current email address: "Текущий адрес электронной почты:" delete image: Удалить текущее изображение email never displayed publicly: (не будет показан) flash update success: Информация о пользователе успешно обновлена. - flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту, чтобы подтвердить ваш новый адрес. - home location: "Основное местоположение:" + flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту для подтверждения вашего нового адреса. + gravatar: + gravatar: Использовать Gravatar + link text: что это? + home location: "Моё местоположение:" image: "Изображение:" - image size hint: (квадратные изображения, по крайней мере 100×100 работают лучше) - keep image: Хранить текущее изображение + image size hint: (квадратные изображения, по крайней мере 100×100, работают лучше) + keep image: Оставить текущее изображение latitude: "Широта:" longitude: "Долгота:" make edits public button: Сделать все мои правки доступными my settings: Мои настройки - new email address: "Новый адрес эл. почты:" + new email address: "Новый адрес электронной почты:" new image: Добавить изображение - no home location: Вы не обозначили свое основное местоположение. + no home location: Вы не обозначили свое домашнее местоположение. openid: link: http://wiki.openstreetmap.org/wiki/RU:OpenID - link text: что это такое? + link text: что это? openid: "OpenID:" preferred editor: "Предпочтительный редактор:" preferred languages: "Предпочитаемые языки:" @@ -1542,30 +1646,30 @@ ru: disabled link text: почему я не могу вносить изменения? enabled: Включено. Можно редактировать. Правки не анонимны. enabled link: http://wiki.openstreetmap.org/wiki/RU:Anonymous_edits&uselang=ru - enabled link text: что это значит? - heading: "Публичное изменение:" + enabled link text: что это? + heading: "Публичная правка:" public editing note: heading: Общедоступная правка text: В настоящий момент ваши правки анонимны и никто не может отправлять вам сообщения или видеть ваше местоположение. Чтобы указать авторство своих правок и позволить другим связываться с вами через вебсайт, нажмите на кнопку внизу. После перехода на API версии 0.6, только доступные для связи пользователи могут править данные карты. (узнайте, почему).
    • Ваш адрес электронной почты не будет раскрыт для других, но связаться с вами будет возможно.
    • Это действие не имеет обратной силы, а все новые пользователи теперь доступны для связи по умолчанию.
    replace image: Заменить текущее изображение - return to profile: Возврат к профилю + return to profile: Вернуться к профилю save changes button: Сохранить изменения - title: Изменение учётной записи + title: Изменить учетную запись update home location on click: Обновлять моё местоположение, когда я нажимаю на карту? confirm: already active: Эта учётная запись уже подтверждена. - before you start: Мы знаем, вы спешите приступить к картографированию, но перед этим вы можете ещё указать какие-то сведения о себе. button: Подтвердить - heading: Подтвердить учётную запись пользователя - press confirm button: Нажмите на кнопку подтверждения ниже, чтобы активировать вашу учетную запись. - reconfirm: Если уже прошло достаточно времени с момента вашей регистрации, возможно, вам необходимо отправить себе новое подтверждение. - success: Ваша учётная запись подтверждена, спасибо за регистрацию! - unknown token: Похоже, что такого токена не существует. + heading: Проверьте свою электронную почту! + introduction_1: Мы отправили вам подтверждение по электронной почте. + introduction_2: Подтвердите аккаунт, нажав на ссылку в письме. Затем вы сможете править карту. + press confirm button: Нажмите кнопку ниже, чтобы активировать вашу учетную запись. + reconfirm_html: Если хотите, чтобы мы выслали ещё одно подтверждение по электронной почте, нажмите здесь. + unknown token: Такой код подтверждения истек или не существует. confirm_email: button: Подтвердить failure: Адрес электронной почты уже был подтверждён этим токеном. heading: Подтвердите изменение адреса электронной почты - press confirm button: Нажмите кнопку подтверждения ниже, чтобы подтвердить ваш новый адрес электронной почты. + press confirm button: Нажмите кнопку подтверждения чтобы подтвердить ваш новый адрес электронной почты. success: Ваш адрес электронной почты подтверждён, спасибо за регистрацию! confirm_resend: failure: Участник %{name} не найден. @@ -1580,8 +1684,8 @@ ru: heading: Пользователи hide: Скрыть выделенных пользователей showing: - one: Показана страница %{page} (%{first_item} из %{items}) - other: Показано страниц %{page} (%{first_item}-%{last_item} из %{items}) + one: Страница %{page} (%{first_item} из %{items}) + other: Страница %{page} (%{first_item}-%{last_item} из %{items}) summary: "%{name} создан %{date}, с адреса %{ip_address}" summary_no_ip: "%{name} создан %{date}" title: Пользователи @@ -1596,8 +1700,6 @@ ru: lost password link: Забыли пароль? new to osm: Впервые на OpenStreetMap? no account: У вас нет аккаунта? - notice: Узнайте больше о предстоящем изменении лицензии OpenStreetMap (переводы) (обсуждение) - notice_terms: OpenStreetMap переходит на новую лицензию с 1 апреля 2012 года. Она такая же открытая как действующая, но юридически гораздо лучше подходит для нашей картографической базы данных. Мы хотели бы сохранить ваш вклад в OpenStreetMap, но это будет возможно только если вы согласны распространять ваши правки на условиях новой лицензии. В противном случае, нам придётся удалить их из базы данных.

    Пожалуйста, представьтесь системе и потратьте несколько секунд на ознакомление и принятие новых условий. Спасибо! openid: "%{logo} OpenID:" openid invalid: Извините, похоже, что ваш OpenID введён неправильно openid missing provider: К сожалению, не удалось связаться с вашим поставщиком OpenID @@ -1641,20 +1743,22 @@ ru: notice email on way: Жаль, что вы потеряли пароль :-( но ничего, скоро придёт письмо и вы сможете поменять свой пароль. title: Восстановление пароля make_friend: - already_a_friend: Вы уже друзья с %{name}. + already_a_friend: Вы всё ещё друзья с %{name}. + button: Добавить в друзья failed: Не удалось добавить %{name} в друзья. - success: Теперь %{name} является вашим другом. + heading: Добавить %{user} в друзья? + success: "%{name} теперь ваш друг!" new: + about: + header: Свободно редактируемая + html: "

    в Отличие от других карт, карты OpenStreetMap полностью создаются обычными людьми вроде вас\nи они свободны для исправления, обновления, загрузки и использования каждым.

    \n

    Зарегистрируйтесь, чтобы сделать свой вклад. Мы отправим вам письмо, чтобы подтвердить ваш аккаунт.

    " confirm email address: "Подтвердите адрес эл. почты:" confirm password: "Повторите пароль:" contact_webmaster: Пожалуйста, свяжитесь с вебмастером с просьбой создать подобную учётную запись. Мы попробуем и ответим настолько быстро, насколько сможем. - continue: Продолжить + continue: Зарегистрироваться display name: "Отображаемое имя:" display name description: Ваше имя, как оно будет видно другим пользователям. Вы сможете изменить его позже в настройках. email address: "Адрес эл. почты:" - fill_form: Заполните форму, и мы вышлем вам на электронную почту письмо с инструкцией по активации. - flash create success message: Спасибо за регистрацию. Мы выслали письмо с подтверждением на адрес %{email} и как только вы подтвердите вашу учётную запись, вы можете начать работать с картами.

    Если вы используете антиспам, посылающий запросы на подтверждение, внесите адрес webmaster@openstreetmap.org в ваш белый список, так как мы не можем отвечать на такие запросы. - heading: Создание учётной записи license_agreement: Для подтверждения своей учётной записи вам необходимо согласиться с условиями сотрудничества. no_auto_account_create: К сожалению, сейчас мы не можем автоматически создать для вас учётную запись. not displayed publicly: Не отображается публично (см. политику конфиденциальности) @@ -1675,8 +1779,10 @@ ru: nearby mapper: Ближайший пользователь your location: Ваше местоположение remove_friend: + button: Удалить из друзей + heading: Удалить %{user} из друзей? not_a_friend: "%{name} не является вашим другом." - success: "%{name} удалён из вашего списка друзей." + success: "%{name} удалён из друзей." reset_password: confirm password: "Подтверждение пароля:" flash changed: Ваш пароль был изменён. @@ -1686,9 +1792,9 @@ ru: reset: Установить пароль title: Повторная установка пароля set_home: - flash success: Ваше местоположение сохранено + flash success: Домашнее местоположение сохранено suspended: - body: "

    \n Извините, ваша учётная запись была автоматически приостановлена из-за\n подозрительной активности.\n

    \n

    \n Это решение может быть вскоре пересмотрено администратором, или\n вы можете связаться с %{webmaster}, если вы хотите обсудить это.\n

    " + body: "

    \n Извините, ваша учётная запись была автоматически приостановлена из-за\n подозрительной активности.\n

    \n

    \n Это решение может быть вскоре пересмотрено администратором, или\n вы можете связаться с %{webmaster}, если вы хотите это обсудить.\n

    " heading: Учётная запись приостановлена title: Учётная запись приостановлена webmaster: веб-мастер @@ -1709,12 +1815,12 @@ ru: you need to accept or decline: Пожалуйста, прочитайте, а затем согласитесь или отклоните новые Условия участия. view: activate_user: активировать этого пользователя - add as friend: добавить в друзья + add as friend: Добавить в друзья ago: (%{time_in_words_ago} назад) block_history: полученные блокировки - blocks by me: наложенные мною блокировки - blocks on me: мои блокировки - comments: комментарии + blocks by me: Наложенные мною блокировки + blocks on me: Мои блокировки + comments: Комментарии confirm: Подтвердить confirm_user: подтвердить этого пользователя create_block: блокировать пользователя @@ -1726,31 +1832,35 @@ ru: deactivate_user: деактивировать этого пользователя delete_user: удалить этого пользователя description: Описание - diary: дневник - edits: правки + diary: Дневник + edits: Правки email address: "Адрес Email:" - friends_changesets: Просмотреть все наборы правок друзей - friends_diaries: Просмотреть все дневниковые записи друзей + friends_changesets: наборы правок друзей + friends_diaries: дневники друзей hide_user: скрыть этого пользователя - if set location: Если вы укажете свое местоположение, ниже появятся карта и дополнительные инструменты. Вы можете установить ваше местоположение на вашей странице %{settings_link}. + if set location: Укажите свое местоположение на вашей странице %{settings_link} чтобы увидеть своих соседей. km away: "%{count} км от вас" latest edit: "Последняя правка %{ago}:" m away: "%{count} м от вас" mapper since: "Зарегистрирован:" moderator_history: созданные блокировки - my comments: мои комментарии - my diary: мой дневник - my edits: мои правки - my settings: мои настройки - my traces: мои треки + my comments: Мои комментарии + my diary: Мой дневник + my edits: Мои правки + my messages: Мои сообщения + my notes: Мои заметки + my profile: Мой профиль + my settings: Мои настройки + my traces: Мои треки nearby users: Другие ближайшие пользователи - nearby_changesets: Просмотреть все наборы правок соседних участников - nearby_diaries: Просмотреть все дневниковые записи соседних участников + nearby_changesets: правки соседей + nearby_diaries: дневники соседей new diary entry: новая запись no friends: Вы не добавили ещё ни одного друга. no nearby users: Пока нет других пользователей, признающих, что занимающихся составлением карты поблизости. + notes: Заметки oauth settings: "\nнастройки OAuth" - remove as friend: удалить из друзей + remove as friend: Удалить из друзей role: administrator: Этот пользователь является администратором grant: @@ -1760,11 +1870,11 @@ ru: revoke: administrator: Отозвать права администратора moderator: Отозвать права модератора - send message: отправить сообщение + send message: Отправить сообщение settings_link_text: настройки spam score: "Оценка спама:" status: "Статус:" - traces: треки + traces: Треки unhide_user: отобразить этого пользователя user location: Местонахождение пользователя your friends: Ваши друзья @@ -1822,11 +1932,14 @@ ru: creator_name: Автор display_name: Заблокированный пользователь edit: Править + next: Следующая → not_revoked: (не разблокирован) + previous: ← Предыдущая reason: Причина блокирования revoke: Разблокировать! revoker_name: Разблокировал show: Показать + showing_page: Страница %{page} status: Состояние period: one: 1 час @@ -1874,3 +1987,25 @@ ru: fail: Не удалось отозвать роль «%{role}» у пользователя «%{name}. Пожалуйста, проверьте, что пользователь и роль являются допустимыми. heading: Подтверждение отзыва роли title: Подтвердить отзыв роли + welcome_page: + add_a_note: + paragraph_1_html: Если нужно сделать небольшое уточнение, ради которого слишком долго регистрироваться и изучать правила правки, можно просто добавить заметку на карту. + paragraph_2_html: "Просто перейдите к карте и кликните на иконку заметок:\n Это добавит на карту маркер, который можно перетаскивать мышью. Просто напишите сообщение и нажмите \"добавить\", и другие участники увидят это." + title: Нет времени править карту? Добавьте заметку! + basic_terms: + editor_html: Редактор — это программа или веб-сайт, которые можно использовать для редактирования карты. + node_html: Точка — простейший элемент карты, вроде входа в ресторан или отдельного дерева. + paragraph_1_html: У OpenStreetMap выработался локальный сленг. Вот несколько понятий, которые стоит иметь ввиду. + tag_html: Тег – это единица описания точки или линии, например название ресторана или скоростное ограничение конкретной дороги. + title: Небольшой словарь картографа + way_html: Линия — это отрезок или кривая, соединяющая точки, обозначающая, к примеру, дорогу, ручей, контур озера или здания. + introduction_html: Добро пожаловать на OpenStreetMap, открытую и свободную карту мира. Теперь, когда регистрация завершена, можно начинать картографировать. Вот небольшая инструкция по самым важным вещам, которые необходимо знать. + questions: + paragraph_1_html: "На OpenStreetMap есть несколько ресурсов, где можно узнать о проекте, задать вопросы или ответить на них и совместно обсудить темы, касающиеся картографии.\nПолучите помощь здесь." + title: Появились вопросы? + start_mapping: Начать картографировать + title: Добро пожаловать! + whats_on_the_map: + off_html: Карта не включает оценочные данные вроде рейтингов, бывшие или гипотетические постройки, и информацию из источников, защищённых авторским правом. Если вы не получили специального разрешения, не копируйте данные с любых других карт. + on_html: "На карте OpenStreetMap расположены объекты, которые существуют в данный момент -\nто есть миллионы зданий, дорог и других элементов местности. Вы вольны отмечать любые детали окружающего мира, которые вам интересны." + title: Что находится на карте diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 65dfc79c36e..7da675f1af7 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -5,10 +5,16 @@ # Author: Jose1711 # Author: Kusavica # Author: Lesny skriatok +# Author: MichalP +# Author: Mimarik +# Author: Nemo bis # Author: Rudko # Author: Teslaton # Author: Vladolc sk: + about_page: + next: Ďalej + partners_title: Partneri activerecord: attributes: diary_comment: @@ -49,20 +55,20 @@ sk: changeset_tag: Značka sady zmien country: Krajina diary_comment: Komentár k denníku - diary_entry: Položka denníka + diary_entry: Záznam denníka friend: Priateľ language: Jazyk message: Správa - node: Bod - node_tag: Značka bodu - notifier: Oznamovateľ - old_node: Starý bod - old_node_tag: Stará značka bodu + node: Uzol + node_tag: Značka uzlu + notifier: Oznamovanie + old_node: Starý uzol + old_node_tag: Stará značka uzlu old_relation: Stará relácia old_relation_member: Starý člen relácie old_relation_tag: Stará značka relácie old_way: Stará cesta - old_way_node: Starý bod cesty + old_way_node: Starý uzol cesty old_way_tag: Stará značka cesty relation: Relácia relation_member: Člen relácie @@ -80,164 +86,80 @@ sk: application: require_cookies: cookies_needed: Zdá sa, že máte zakázané cookies – povoľte prosím cookies vo vašom prehliadači a následne pokračujte. + require_moderator: + not_a_moderator: Pre vykonanie tejto akcie musíte byť moderátor. setup_user_auth: blocked: Váš prístup do API bol zablokovaný. Prosím prihláste sa na webové rozhranie pre zistenie viac informácií. need_to_see_terms: Váš prístup k API je dočasne pozastavený. Prosím prihláste do webového rozhrania a prečítajte si Podmienky prispievania. Nie je nutné ich odsúhlasiť, musíte si ich ale zobraziť. browse: + anonymous: anonym changeset: - changeset: "Sada zmien: %{id}" + belongs_to: Autor changesetxml: XML sady zmien - download: Stiahnuť %{changeset_xml_link} alebo %{osmchange_xml_link} feed: title: Sada zmien %{id} title_comment: Sada zmien %{id} - %{comment} + node: Uzly (%{count}) + node_paginated: Uzly (%{x}–%{y} z %{count}) osmchangexml: osmChange XML + relation: Relácie (%{count}) + relation_paginated: Relácie (%{x}–%{y} z %{count}) title: Sada zmien - changeset_details: - belongs_to: "Používateľ:" - bounding_box: "Rozsah:" - box: rám - closed_at: "Uzavreté o:" - created_at: "Vytvorené o:" - has_relations: - few: "Obsahuje nasledujúce %{count} relácie:" - one: "Obsahuje nasledujúcu %{count} reláciu:" - other: "Obsahuje nasledujúcich %{count} relácií:" - has_ways: - few: "Obsahuje nasledujúce %{count} cesty:" - one: "Obsahuje nasledujúcu %{count} cestu:" - other: "Obsahuje nasledujúcich %{count} ciest:" - no_bounding_box: Pre tento počet zmien nie je uložený žiadny rozsah. - show_area_box: Zobraziť rám oblasti - common_details: - changeset_comment: "Komentár:" - deleted_at: "Odstránené:" - deleted_by: "Odstránil:" - edited_at: "Upravené o:" - edited_by: "Upravil:" - in_changeset: "V sade zmien:" - version: "Verzia:" + way: Cesty (%{count}) + way_paginated: Cesty (%{x}–%{y} z %{count}) + closed: Uzavreté + closed_by_html: Uzavrel pred %{time} %{user} + closed_html: Uzavreté pred %{time} containing_relation: entry: Relácia %{relation_name} entry_role: Relácia %{relation_name} (ako %{relation_role}) - map: - deleted: Zmazané - edit: - area: Upraviť oblasť - node: Upraviť bod - relation: Upraviť reláciu - way: Upraviť cestu - larger: - area: Zobraziť oblasť na väčšej mape - node: Zobraziť bod na väčšej mape - relation: Zobraziť reláciu na väčšej mape - way: Zobraziť cestu na väčšej mape - loading: Nahrávanie... - navigation: - all: - next_changeset_tooltip: Nasledujúca sada zmien - next_node_tooltip: Nasledujúci bod - next_relation_tooltip: Následujúca relácia - next_way_tooltip: Nasledujúca cesta - prev_changeset_tooltip: Predchádzajúca sada zmien - prev_node_tooltip: Predchádzajúci bod - prev_relation_tooltip: Predchádzajúca relácia - prev_way_tooltip: Predchádzajúca cesta - user: - name_changeset_tooltip: Zobraziť úpravy používateľa %{user} - next_changeset_tooltip: Ďalšia úprava používateľa %{user} - prev_changeset_tooltip: Predošlá úprava používateľa %{user} + created: Vytvorené + created_by_html: Vytvoril pred %{time} %{user} + created_html: Vytvorené pred %{time} + deleted_by_html: Odstránil pred %{time} %{user} + download_xml: Stiahnuť XML + edited_by_html: Upravil pred %{time} %{user} + in_changeset: Sada zmien + location: "Poloha:" + no_comment: (bez komentára) node: - download: "%{download_xml_link}, %{view_history_link} alebo %{edit_link}" - download_xml: Stiahnuť XML - edit: upraviť - node: Bod - node_title: "Bod: %{node_name}" - view_history: zobraziť históriu - node_details: - coordinates: "Súradnice:" - part_of: "Časť z:" - node_history: - download: "%{download_xml_link} alebo %{view_details_link}" - download_xml: Stiahnuť XML - node_history: História bodu - node_history_title: "História bodu: %{node_name}" - view_details: zobraziť detaily + history_title: "História uzlu: %{name}" + title: "Uzol: %{name}" not_found: - sorry: Ľutujeme, %{type} s id %{id} nebolo možné nájsť. + sorry: "Ľutujeme, %{type} #%{id} nebolo možné nájsť." type: changeset: počet zmien node: bod relation: relácia way: cesta - paging_nav: - of: z - showing_page: Strana + note: + closed_title: "Vyriešená chyba: %{note_name}" + new_note: Nová poznámka + open_title: "Nevyriešená chyba: %{note_name}" + title: Chyba + part_of: Súčasť redacted: + message_html: Verzia %{version} tohto objektu %{type} nemôže byť zobrazené, pretože bola skrytá. Viac informácií nájdete na %{redaction_link}. + redaction: Revízia %{id} type: node: bod relation: vzťah way: cesta relation: - download: "%{download_xml_link} alebo %{view_history_link}" - download_xml: Stiahnuť XML - relation: Relácia - relation_title: "Relácia: %{relation_name}" - view_history: zobraziť históriu - relation_details: - members: "Členovia:" - part_of: "Časť z:" - relation_history: - download: "%{download_xml_link} alebo %{view_details_link}" - download_xml: Stiahnuť XML - relation_history: História relácie - relation_history_title: "História relácie: %{relation_name}" - view_details: zobraziť detaily + history_title: "História relácie: %{name}" + members: Prvky + title: "Relácia: %{name}" relation_member: entry_role: "%{type} %{name} ako %{role}" type: node: Bod relation: Relácia way: Cesta - start: - manually_select: Manuálne vybrať inú oblasť - view_data: Zobraziť údaje v aktuálnom zobrazení mapy start_rjs: - data_frame_title: Dáta - data_layer_name: Prehľadávať mapové dáta - details: Detaily - drag_a_box: Označte myšou na mape zvolenú oblasť - edited_by_user_at_timestamp: Upravoval [[user]] o [[timestamp]] - hide_areas: Skryť oblasti - history_for_feature: História pre [[feature]] load_data: Načítať údaje - loaded_an_area_with_num_features: Máte načítanú oblasť, ktorá obsahuje [[num_features]] zložiek. Niektoré prehliadače môžu mať problémy so zobrazením takého množstva dát, viac než približne 100 položiek ich môže spomaliť až zablokovať. Pokiaľ ste si istý, že chcete dáta zobraziť, kliknite na tlačítko nižšie. loading: Nahrávanie... - manually_select: Manuálne vybrať inú oblasť - object_list: - api: Načítať túto oblasť pomocou API - back: Zobraziť zoznam objektov - details: Detaily - heading: Zoznam objektov - history: - type: - node: Bod [[id]] - way: Cesta [[id]] - selected: - type: - node: Bod [[id]] - way: Cesta [[id]] - type: - node: Bod - way: Cesta - private_user: anonymný používateľ - show_areas: Zobraziť oblasti - show_history: Zobraziť históriu - unable_to_load_size: "Nebolo možné načítať: Oblasť veľkosti [[bbox_size]] je priveľká (maximum je %{max_bbox_size})" - wait: Čakajte... - zoom_or_select: Priblížte mapu alebo zvoľte nejakú oblasť na zobrazenie tag_details: - tags: "Tagy:" + tags: Tagy wiki_link: key: Stránka s popisom značky %{key} na wiki tag: Stránka s popisom značky %{key}=%{value} na wiki @@ -249,38 +171,25 @@ sk: node: bod relation: relácia way: cesta + version: Verzia + view_details: Zobraziť detaily + view_history: Zobraziť históriu way: - download: "%{download_xml_link}, %{view_history_link} alebo %{edit_link}" - download_xml: Stiahnuť XML - edit: upraviť - view_history: zobraziť históriu - way: Cesta - way_title: "Cesta: %{way_name}" - way_details: also_part_of: - one: tiež časťou cesty %{related_ways} - other: tiež časťou ciest %{related_ways} - nodes: "Body:" - part_of: "Súčasť:" - way_history: - download: "%{download_xml_link} alebo %{view_details_link}" - download_xml: Stiahnuť XML - view_details: zobraziť detaily - way_history: História cesty - way_history_title: "História Cesty: %{way_name}" + one: súčasťou cesty %{related_ways} + other: súčasťou ciest %{related_ways} + history_title: "História cesty: %{name}" + nodes: Uzly + title: "Cesta: %{name}" changeset: changeset: anonymous: Anonym - big_area: (veľký) - no_comment: (žiadny) no_edits: (bez úprav) - show_area_box: Zobraziť rám oblasti - still_editing: (stále sa upravuje) view_changeset_details: Zobraziť detaily sady zmien changeset_paging_nav: next: Ďalšia » previous: « Predošlá - showing_page: Zobrazená stránka %{page} + showing_page: Stránka %{page} changesets: area: Oblasť comment: Komentár @@ -288,24 +197,17 @@ sk: saved_at: Uložené user: Používateľ list: - description: Posledné zmeny - description_bbox: Zmenové súbory vo vnútri %{bbox} - description_friend: Sady zmien vašich priateľov - description_nearby: Sady zmien používateľov v okolí - description_user: Zmenové súbory používateľa %{user} - description_user_bbox: Zmenové súbory používateľa %{user} v %{bbox} - heading: Sady zmien - heading_bbox: Sady zmien - heading_friend: Sady zmien - heading_nearby: Sady zmien - heading_user: Sady zmien - heading_user_bbox: Sady zmien + empty: Neboli nájdené žiadne sady zmien. + empty_area: V tejto oblasti neexistujú žiadne sady zmien. + empty_user: Tento používateľ nemá žiadne sady zmien. + load_more: Načítať ďalšie + no_more: Nie sú ďalšie sady zmien. + no_more_area: Nie sú ďalšie sady zmien v tejto oblasti. + no_more_user: Nie sú ďalšie sady zmien tohoto používateľa. title: Sady zmien - title_bbox: Sady zmien v rámci %{bbox} title_friend: Sady zmien vašich priateľov title_nearby: Sady zmien používateľov v okolí title_user: Sady zmien používateľa %{user} - title_user_bbox: Sady zmien používateľa %{user} v rámci %{bbox} timeout: sorry: Ľutujeme, ale vami požadovaný zoznam sád zmien sa načítaval príliš dlho. diary_entry: @@ -326,6 +228,7 @@ sk: few: "%{count} komentáre" one: 1 komentár other: "%{count} komentárov" + zero: Žiaden komentár comment_link: Komentár k záznamu confirm: Potvrdiť edit_link: Upraviť tento záznam @@ -384,6 +287,9 @@ sk: user_title: Denník používateľa %{user} editor: default: Predvolený (v súčasnosti %{name}) + id: + description: iD (editor v prehliadači) + name: iD potlatch: description: Potlatch 1 (editor v prehliadači) name: Potlatch 1 @@ -399,7 +305,7 @@ sk: area_to_export: Oblasť pre export embeddable_html: Vložiteľné HTML export_button: Export - export_details: OpenStreetMap údaje sú licencované pod Creative Commons Attribution-ShareAlike 2.0 license. + export_details: Údaje OpenStreetMap sú k dispozícii pod licenciou Open Data Commons Open Database License (ODbL). format: Formát format_to_export: Formát pre export image_size: Rozmery obrázku @@ -415,29 +321,38 @@ sk: paste_html: Pre vloženie do stránky použite toto HTML scale: Mierka too_large: - body: Táto oblasť je príliš veľká pre export OpenStreetMap dát. Priblížte prosím mapu, alebo vyberte menšiu oblasť. - heading: Príliš veľká oblasť + advice: "Ak tento export zlyhá, zvážte použitie niektorého z nasledovných zdrojov:" + body: Táto oblasť je príliš veľká pre export OpenStreetMap XML dát. Priblížte prosím mapu, alebo vyberte menšiu oblasť. + geofabrik: + description: Pravidelne aktualizované extrakty svetadielov, krajín a vybraných miest + title: Geofabrik na stiahnutie + metro: + description: Extrakty pre hlavné svetové mestá a ich okolie + title: Metro extrakty + other: + description: Ďalšie zdroje sú uvedené na OpenStreetMap wiki + title: Iné zdroje + overpass: + description: Stiahnuť túto oblasť z repliky databázy OpenStreetMap + title: Overpass API + planet: + description: Pravidelne aktualizované kópie kompletnej databázy OpenStreetMap + title: Planéta OSM zoom: Zväčšenie - start_rjs: - add_marker: Pridať do mapy značku - change_marker: Zmeniť polohu značky - click_add_marker: Kliknutím do mapy vložíte značku - drag_a_box: Označte myšou na mape zvolenú oblasť - export: Export - manually_select: Manuálne vybrať inú oblasť - view_larger_map: Zobraziť väčšiu mapu + title: Export + fixthemap: + how_to_help: + title: Ako pomôcť + title: Nahlásiť problém / Opraviť mapu geocoder: description: title: geonames: Poloha podľa GeoNames - osm_namefinder: "%{types} podľa OpenStreetMap Namefinder" osm_nominatim: Poloha podľa OpenStreetMap Nominatim types: cities: Veľkomestá places: Miesta towns: Mestá - description_osm_namefinder: - prefix: "%{distance} na %{direction} od %{type}" direction: east: východ north: sever @@ -458,16 +373,26 @@ sk: title: ca_postcode: Výsledky z Geocoder.CA geonames: Výsledky z GeoNames + geonames_reverse: Výsledky z GeoNames latlon: Výsledky z internej databázy - osm_namefinder: Výsledky z OpenStreetMap Namefinder osm_nominatim: Výsledky z OpenStreetMap Nominatim + osm_nominatim_reverse: Výsledky z OpenStreetMap Nominatim uk_postcode: Výsledky z NPEMap / FreeThe Postcode us_postcode: Výsledky z Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} na %{parentdirection} od %{parentname})" - suffix_place: ", %{distance} na %{direction} od %{placename}" search_osm_nominatim: + admin_levels: + level10: Hranica časti obce + level2: Štátna hranica + level4: Hranica kraja (state) + level5: Hranica regiónu + level6: Hranica okresu (county) + level8: Hranica mesta + level9: Hranica obce prefix: + aerialway: + chair_lift: Sedačková lanovka + drag_lift: Vlek + station: Lanovková stanica aeroway: aerodrome: Aerodróm apron: Letisková parkovacia plocha @@ -480,6 +405,7 @@ sk: WLAN: Wi-Fi prístup airport: Letisko arts_centre: Kultúrne stredisko + artwork: Umelecké dielo atm: Bankomat auditorium: Auditórium bank: Banka @@ -560,6 +486,7 @@ sk: shower: Sprchy social_centre: Komunitné centrum social_club: Spoločenský klub + social_facility: Sociálne zariadenie studio: Ateliér supermarket: Supermarket swimming_pool: Plaváreň, kúpalisko @@ -588,6 +515,9 @@ sk: "yes": Most building: "yes": Budova + emergency: + fire_hydrant: Požiarny hydrant + phone: Núdzový telefón highway: bridleway: Cesta pre kone bus_guideway: Bus so sprievodcom @@ -603,12 +533,13 @@ sk: minor: Vedľajšia cesta motorway: Diaľnica motorway_junction: Diaľničná križovatka - motorway_link: Diaľnica - path: Cesta + motorway_link: Diaľničný privádzač + path: Nespevnený chodník pedestrian: Chodník pre chodcov platform: Nástupište primary: Cesta I. triedy primary_link: Cesta I. triedy + proposed: Navrhovaná cesta raceway: Pretekárska dráha residential: Ulica rest_area: Odpočívadlo @@ -620,12 +551,13 @@ sk: speed_camera: Radar steps: Schody stile: Schodíky cez ohradu + street_lamp: Pouličná lampa tertiary: Cesta III. triedy tertiary_link: Cesta III. triedy track: Nespevnená cesta trail: Chodník trunk: Cesta pre motorové vozidlá - trunk_link: Cesta pre motorové vozidlá + trunk_link: Privádzač k ceste pre motorové vozidlá unclassified: Neklasifikovaná cesta unsurfaced: Nespevnená cesta historic: @@ -635,6 +567,7 @@ sk: building: Budova castle: Hrad church: Kostol + citywalls: Mestské hradby fort: Pevnosť house: Dom icon: Ikona @@ -644,6 +577,7 @@ sk: monument: Pamätník museum: Múzeum ruins: Ruina + tomb: Náhrobok tower: Veža wayside_cross: Božie muky wayside_shrine: Malá kaplnka pri ceste @@ -676,8 +610,10 @@ sk: railway: Železnica recreation_ground: Rekreačná oblasť reservoir: Zásobník na vodu - residential: Residential Area (Obytná oblasť) - retail: Retail (Obchodná zóna) + reservoir_watershed: Povodie nádrže + residential: Obytná oblasť + retail: Obchodná zóna + road: Cesty village_green: Verejná zeleň vineyard: Vinica wetland: Mokrina @@ -687,6 +623,7 @@ sk: bird_hide: Vtáčia pozorovateľňa common: Verejné priestranstvo fishing: Rybolov (športový) + fitness_station: Fitnes zastávka garden: Záhrada golf_course: Golfové ihrisko ice_rink: Umelé klzisko @@ -708,6 +645,8 @@ sk: airfield: Vojenské letisko barracks: Kasárne bunker: Bunker + mountain_pass: + "yes": Priesmyk natural: bay: Zátoka, záliv beach: Pláž @@ -777,6 +716,7 @@ sk: locality: Oblasť moor: Močiar municipality: Obecný úrad + neighbourhood: Štvrť postcode: PSČ region: Región sea: More @@ -802,8 +742,10 @@ sk: narrow_gauge: Úzkokoľajná železnica platform: Železničné nástupište preserved: Historická železnica + proposed: Navrhovaná železnica spur: Železničná vlečka station: Železničná stanica + stop: Železničná zastávka subway: Stanica metra subway_entrance: Vchod do metra switch: Železničná výhybka @@ -817,8 +759,9 @@ sk: bakery: Pekáreň beauty: Salón krásy beverages: Občerstvenie - bicycle: Obchod s bicylkami + bicycle: Obchod s bicyklami books: Kníhkupectvo + boutique: Butik butcher: Mäsiarstvo car: Predajňa automobilov car_parts: Mototechna @@ -832,6 +775,7 @@ sk: convenience: Rozličný tovar copyshop: Copy centrum cosmetics: Parfuméria + deli: Lahôdky department_store: Obchodný dom discount: Diskontná predajňa doityourself: Urob si sám @@ -868,17 +812,21 @@ sk: organic: Obchod so zdravou výživou outdoor: Turistický obchod pet: Chovprodukt + pharmacy: Lekáreň photo: Fotokino salon: Salón - shoes: Obuva + second_hand: Bazár + shoes: Obuv shopping_centre: Nákupné stredisko sports: Športový obchod stationery: Papierníctvo supermarket: Supermarket + tailor: Krajčír toys: Hračkárstvo travel_agency: Cestovná kancelária video: Videopožičovňa, predaj DVD wine: Mimo povolenia + "yes": Obchod tourism: alpine_hut: Vysokohorská chata artwork: Umelecké dielo @@ -901,6 +849,7 @@ sk: viewpoint: Rozhľadňa, výhliadka zoo: Zoo tunnel: + culvert: Priepust "yes": Tunel waterway: artificial: Vodný kanál, prieplav @@ -924,66 +873,99 @@ sk: water_point: Vodný bod waterfall: Vodopád weir: Splav + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + welcome: + title: Vitajte na OSM javascripts: + close: Zavrieť + key: + title: Legenda + tooltip: Legenda + tooltip_disabled: Legenda je dostupná len pre Štandardnú vrstvu map: base: cycle_map: Cyklomapa + hot: Humanitárna standard: Štandardná transport_map: Dopravná mapa + copyright: © prispievatelia OpenStreetMap + donate_link_text: + layers: + data: Mapové podklady + header: Mapové vrstvy + notes: Poznámky k mape + overlays: Zapnúť vrstvy pre ladenie mapy + title: Vrstvy + locate: + popup: Nachádzate sa do {distance} {unit} od tohoto bodu + title: Zobraziť moju polohu + zoom: + in: Priblížiť + out: Oddialiť + notes: + new: + add: Pridať poznámku + intro: Aby sme mohli mapu spresniť, zobrazí sa vami zadaná informácia ostatným tvorcom. Pri umiestňovaní značky a formulovaní poznámky sa preto snažte byť čo najpodrobnejší a najpresnejší. + show: + hide: Skryť + share: + cancel: Zrušiť + center_marker: Centrovať mapu na značku + custom_dimensions: Nastaviť vlastné rozmery + download: Stiahnuť + embed: HTML + format: "Formát:" + image: Obrázok + image_size: Na obrázku bude štandardná vrstva v + include_marker: Vrátane značky + link: Odkaz alebo HTML + long_link: Odkaz + paste_html: HTML pre vloženie na webovú stránku + scale: "Mierka:" + short_link: Krátky odkaz + short_url: Krátke URL + title: Zdieľať + view_larger_map: Zobraziť väčšiu mapu site: + createnote_disabled_tooltip: Pre vloženie poznámky priblížte mapu + createnote_tooltip: Pridať do mapy poznámku edit_disabled_tooltip: Pre editáciu priblížte mapu edit_tooltip: Upraviť mapu - edit_zoom_alert: Upravovať mapu môžete len pri väčšom priblížení - history_disabled_tooltip: Pre zobrazenie úprav tejto oblasti priblížte mapu - history_tooltip: Zobraziť úpravy tejto oblasti - history_zoom_alert: Zobraziť editácie môžete len pri väčšom priblížení layouts: + about: O projekte community: Komunita community_blogs: Komunitné blogy community_blogs_title: Blogy členov komunity OpenStreetMap - copyright: Autorské práva a licencia - documentation: Dokumentácia - documentation_title: Dokumentácia k projektu + copyright: Copyright + data: Údaje donate: Podporte OpenStreetMap %{link} Fondu na obnovu hardwaru - donate_link_text: príspevkom edit: Upraviť edit_with: Upraviť pomocou %{editor} export: Export - export_tooltip: Export mapových dát + export_data: Export údajov foundation: Nadácia foundation_title: Nadácia OpenStreetMap Foundation - gps_traces: GPS Stopy + gps_traces: GPS stopy gps_traces_tooltip: Správa GPS stôp help: Pomoc - help_centre: Centrum pomoci - help_title: Stránky s nápovedou k tomuto projektu history: História - home: domov - home_tooltip: Prejsť na domovské miesto - inbox: správy (%{count}) - inbox_tooltip: - few: V schránke máte %{count} neprečítané správy - one: V schránke máte 1 neprečítanú správu - other: V schránke máte %{count} neprečítaných správ - zero: Nemáte žiadne neprečítané správy - intro_1: OpenStreetMap je slobodná editovateľná mapa celého sveta. Tvoria ju ľudia ako vy. + home: Domov intro_2_create_account: Založte si konto - intro_2_download: stiahnutie - intro_2_html: Dáta sú k dispozícii na %{download} a %{use} pod %{license}. %{create_account} a pomôžte mapu zdokonaliť. - intro_2_license: slobodnou licenciou - intro_2_use: použitie - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - title: OpenStreetMap dáta sú licencované pod the Creative Commons Attribution-Share Alike 2.0 Generic License - log_in: prihlásiť sa + intro_header: Vitajte v OpenStreetMap! + intro_text: OpenStreetMap je mapa sveta, vytvorené ľuďmi ako vy, voľne využiteľná pod slobodnou licenciou. + learn_more: Viac info + log_in: Prihlásiť sa log_in_tooltip: Prihlásiť sa k existujúcemu kontu logo: alt_text: Logo OpenStreetMap - logout: odhlásiť - logout_tooltip: Odhlásiť + logout: Odhlásiť sa make_a_donation: text: Darovanie title: Podporte OpenStreetMap finančným príspevkom + more: Ďalšie osm_offline: OpenStreetMap databáza je teraz offline, zatiaľ čo potrebná údržba databázy naďalej prebieha. osm_read_only: OpenStreetMap databáza je teraz len v móde čítania (bez možnosti zapisovania), zatiaľ čo potrebná údržba databázy naďalej prebieha. partners_bytemark: Bytemark Hosting @@ -992,26 +974,50 @@ sk: partners_partners: partneri partners_ucl: VR centrum UCL partners_url: http://wiki.openstreetmap.org/wiki/Partners - sign_up: zaregistrovať sa + sign_up: Zaregistrovať sa sign_up_tooltip: Vytvoriť si používateľské konto pre úpravy + start_mapping: Začať mapovať tag_line: Slobodná wiki-mapa sveta user_diaries: Denníky používateľov user_diaries_tooltip: Zobraziť denníky používateľov - view: Zobraziť - view_tooltip: Zobraziť mapu - welcome_user: Vitajte, %{user_link} - welcome_user_link_tooltip: Vaša používateľská stránka - wiki: wiki - wiki_title: Wiki k projektu license_page: foreign: english_link: anglickým originálom text: V prípade rozporu mezi touto preloženou verziou a %{english_original_link} má anglická stránka prednosť title: O tomto preklade - legal_babble: "

    Autorské práva a licencie

    \n

    \n OpenStreetMap sú slobodné dáta, ponúkaná za podmienok licencie Creative Commons Uveďte autora – Zachovajte licenciu 2.0 (CC BY-SA).\n

    \n

    \n Môžete kopírovať, distribuovať, oznamovať verejnosti a upravovať naše mapy aj dáta, pokiaľ ako zdroj uvediete „OpenStreetMap a jeho prispievatelia“. Ak naše mapy alebo dáta budete upravovať alebo ich použijete vo svojom diele, musíte výsledné dielo šíriť pod rovnakou licenciou. Vaše práva a povinnosti sú vysvetlené v plnom znení licenčnej zmluvy.\n

    \n\n

    Ako uvádzať OpenStreetMap

    \n

    \n Ak používate obrázky z mapy OpenStreetMap, žiadame, aby ste uvádzali aspoň „© Prispievatelia OpenStreetMap, CC BY-SA“. Ak používate iba mapové dáta, požadujeme „Mapové dáta © Prispievatelia OpenStreetMap, CC BY-SA“.\n

    \n

    \n Ak je to možné, mal byť text OpenStreetMap uvedený ako hypertextový odkaz na http://www.openstreetmap.org/ a CC BY-SA na http://creativecommons.org/licenses/by-sa/2.0/. Ak používate médium, ktoré odkazy neumožňuje (napr. v tlačenom diele), navrhujeme, aby ste svojho čitateľa nasmerovali na www.openstreetmap.org (zrejme doplnením OpenStreetMap o túto internetovú adresu) a analogicky CC BY-SA na www.creativecommons.org.\n

    \n\n

    Ďalšie informácie

    \n

    \n O používaní našich dát sa môžete dočítať viac v našich Často kladených právnych otázkach.\n

    \n

    \n Prispievateľom OSM pripomíname, že by nikdy nemali pridávať dáta zo zdrojov chránených autorským právom (napr. Google Maps či tlačené mapy) bez výslovného súhlasu držiteľov práv.\n

    \n

    \n Hoci OpenStreetMap tvorí slobodné dáta, nemôžeme zadarmo poskytovať tretím stranám mapové API.\n\n Pozrite naše Pravidlá použitia API, Pravidlá použitia mapových dlaždíc a Pravidlá použitia nástroja Nominatim.\n

    \n\n

    Naši prispievatelia

    \n

    \n Naša CC BY-SA licencia vyžaduje, aby ste „spôsobom zodpovedajúcim danému nosiču a v primeranej forme uvádzali autora“. Jednotliví prispievatelia nevyžadujú uvádzanie svojho autorstva nad rámec onoho „Prispievatelia OpenStreetMap“, ale tam, kde boli do OpenStreetMap zahrnuté dáta národných geografických inštitúcií či iných veľkých zdrojov, môže byť primerané uznať ich autorstvo uvedením ich názvu alebo hypertextovým odkazom na túto stránku.\n

    \n\n
      \n
    • Austrália: Obsahuje dáta predmestí založené na dátach Austrálskeho štatistického úradu.
    • \n
    • Francúzsko: Obsahuje dáta pochádzajúce z Direction Générale des impôts.
    • \n
    • Juhoafrická republika: Obsahuje dáta pochádzajúce z Chief Directorate: National Geo-Spatial Information, State copyright reserved.
    • \n
    • Kanada: Obsahuje dáta z GeoBase ®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada).
    • \n
    • Nový Zéland: Obsahuje dáta pochádzajúce z Land Information New Zealand. Crown Copyright reserved.
    • \n
    • Poľsko: Obsahuje dáta z máp UMP-pcPL. Copyright prispievatelia UMP-pcPL. Viac o využití dát UMP na OSM.
    • \n
    • Rakúsko: Obsahuje dáta od mesta Viedeň pod licenciou CC BY.
    • \n
    • Spojené kráľovstvo: Obsahuje dáta Ordnance Survey © Crown copyright a právo k databáze 2010.
    • \n
    \n\n

    \n Zahrnutie dát do OpenStreetMap neznamená, že pôvodný poskytovateľ dát podporuje OpenStreetMap, ponúka akúkoľvek záruku, alebo prijíma akúkoľvek zodpovednosť.\n

    " + legal_babble: + attribution_example: + alt: Príklad, ako uvádzať autorstvo OpenStreetMap na webovej stránke + title: Príklad uvedenia autorstva + contributors_at_html: "Rakúsko: Obsahuje dáta od\nmesta Viedeň (pod licenciou\nCC BY),\nkrajiny Vorarlberg a\nkrajiny Tirol (pod licenciou CC-BY AT s úpravami)." + contributors_ca_html: "Kanada: Obsahuje dáta z GeoBase ®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural Resources Canada) a StatCan (Geography Division, Statistics Canada)." + contributors_footer_1_html: "Podrobnosti o týchto a ďalších zdrojoch, ktoré boli použité pre vylepšenie OpenStreetMap, nájdete na stránke Contributors na OpenStreetMap wiki." + contributors_footer_2_html: " Zahrnutie dát do OpenStreetMap neznamená, že pôvodný poskytovateľ dát podporuje OpenStreetMap, ponúka akúkoľvek záruku, alebo prijíma akúkoľvek zodpovednosť." + contributors_fr_html: "Francúzsko: Obsahuje dáta pochádzajúce z Direction Générale des impôts." + contributors_gb_html: "Spojené kráľovstvo: Obsahuje dáta Ordnance Survey © Crown copyright a právo k databáze 2010-12." + contributors_intro_html: "Naši prispievatelia sú tisícky jednotlivcov. Máme aj dáta so slobodnou licenciou od národných geografických inštitúcií či iných zdrojov, medzi nimi:" + contributors_nl_html: "Holandsko: obsahuje © AND dát, 2007\n(www.and.com)" + contributors_nz_html: "Nový Zéland: Obsahuje dáta pochádzajúce z Land Information New Zealand. Crown Copyright reserved." + contributors_title_html: Naši prispievatelia + contributors_za_html: "Juhoafrická republika: Obsahuje dáta pochádzajúce z Chief Directorate: National Geo-Spatial Information, State copyright reserved." + credit_1_html: Vyžadujeme uviesť „© Prispievatelia OpenStreetMap“. + credit_2_html: "Musíte tiež zdôrazniť, že údaje sú dostupné pod licenciou Open Database Licence, a pokiaľ používate naše mapové dlaždice, že ich kartografický obsah je licencovaný pod CC-BY-SA. Uvedené môžete splniť hypertextovým odkazom na tuto stránku.\n\nAlternatívne môžete (a ak šírite OSM v dátovej forme, tak musíte) vymenovať licencie a uviesť hypertextové odkazy priamo na ne. Pri médiách, kde hypertextové odkazy nie sú možné (napr. tlačené diela), odporúčame, aby ste nasmerovali čitateľov na openstreetmap.org (napríklad rozšírením slova 'OpenStreetMap' na túto plnú adresu), na opendatacommons.org a na creativecommons.org (ak je to relevenantné)." + credit_3_html: "V prípade interaktívnej elektronickej mapy by autorstvo malo byť uvedené v rohu mapy.\nNapríklad:" + credit_title_html: Ako uvádzať OpenStreetMap + infringement_1_html: Prispievateľom OSM pripomíname, že by nikdy nemali pridávať dáta zo zdrojov chránených autorským právom (napr. Google Maps či tlačené mapy) bez výslovného súhlasu držiteľov práv. + infringement_2_html: Ak sa domnievate, že materiál podliehajúci autorským právam bol neoprávnene pridaný do databázy OpenStreetMap alebo na tieto stránky, prosíme vás, aby ste si pozreli náš postup odstraňovania alebo podajte žiadosť priamo na stránke pre podávanie sťažností. + infringement_title_html: Porušenie autorských práv + intro_1_html: OpenStreetMap sú slobodné dáta, ponúkané za podmienok licencie Open Data Commons Open Database License (ODbL). + intro_2_html: " Môžete kopírovať, distribuovať, oznamovať verejnosti a upravovať naše dáta, pokiaľ ako zdroj uvediete „OpenStreetMap a jeho prispievatelia“. Ak naše mapy alebo dáta budete upravovať alebo ich použijete vo svojom diele, musíte výsledné dielo šíriť pod rovnakou licenciou. Vaše práva a povinnosti sú vysvetlené v plnom znení licenčnej zmluvy." + intro_3_html: Kartografia v našich mapových podkladoch a naša dokumentácia je zverejnená pod licenciou Creative Commons Uveďte autora – Zachovajte licenciu 2.0 (CC-BY-SA). + more_1_html: O používaní našich dát a spôsobe citovania, sa môžete dočítať viac v našich Často kladených právnych otázkach. + more_2_html: "Hoci OpenStreetMap tvorí slobodné dáta, nemôžeme zadarmo poskytovať tretím stranám mapové API.\nPozrite naše Pravidlá použitia API, Pravidlá použitia mapových dlaždíc a Pravidlá použitia nástroja Nominatim." + more_title_html: Ďalšie informácie + title_html: Autorské práva a licencia native: mapping_link: začať mapovať native_link: slovenskú verziu + text: Pozeráte si anglickú verziu stránky o autorských právach. Môžete sa vrátiť na %{native_link} stránky alebo si prestať čítať o copyrightoch a %{mapping_link}. title: O tejto stránke message: delete: @@ -1070,12 +1076,9 @@ sk: title: Odoslaná pošta to: Komu read: - back_to_inbox: Späť do prijatých správ - back_to_outbox: Späť do schránky odoslanej pošty + back: Späť date: Dátum from: Od - reading_your_messages: Načítavam vaše správy - reading_your_sent_messages: Čítanie vašich odoslaných správ reply_button: Odpovedať subject: Predmet title: Čítať správu @@ -1086,6 +1089,9 @@ sk: wrong_user: Ste prihlásený ako „%{user}“, ale správa, na ktorú chcete odpovedať, nebola odoslaná tomuto používateľovi. Ak na ňu chcete odpovedať, prihláste sa pod správnym kontom. sent_message_summary: delete_button: Zmazať + note: + mine: + creator: Autor notifier: diary_comment_notification: footer: Môžete si tiež prečítať komentár na %{readurl}, komentovať na %{commenturl}, alebo odpovedať na %{replyurl} @@ -1097,12 +1103,11 @@ sk: email_confirm_html: click_the_link: Ak ste to vy, kliknite prosím na nižšie uvedený odkaz pre potvrdenie zmeny. greeting: Ahoj, - hopefully_you: Niekto (dúfajme, že vy) chcel zmeniť e-mailovú adresu na %{server_url} do %{new_address}. + hopefully_you: Niekto (dúfame, že vy) požiadal o zmenu e-mailovej adresy na serveri %{server_url} na %{new_address}. email_confirm_plain: click_the_link: Ak ste to boli vy, potvrďte prosím zmenu kliknutím na nasledovný odkaz. greeting: Ahoj, - hopefully_you_1: Niekto (dúfajme, že vy) chce zmeniť svoju e-mailovú adresu, na viac ako - hopefully_you_2: "%{server_url} na %{new_address}." + hopefully_you: Niekto (snáď vy) požiadal o zmenu e-mailovej adresy na serveri %{server_url} na %{new_address}. friend_notification: befriend_them: Môžete ich tiež pridať ako priateľov na %{befriendurl}. had_added_you: "%{user} vás pridal ako priateľa na OpenStreetMap." @@ -1131,44 +1136,20 @@ sk: lost_password_plain: click_the_link: Ak ste to vy, kliknite prosím na odkaz nižšie pre obnovenie svojho hesla. greeting: Ahoj, - hopefully_you_1: Niekto (dúfajme že vy) požiadal o obnovu hesla - hopefully_you_2: e-mailové adresy openstreetmap.org účtu. + hopefully_you: Niekto (snáď vy) požiadal o vygenerovanie nového hesla pre používateľa serveru openstreetmap.org s touto e-mailovou adresou. message_notification: - footer1: Môžete si tiež prečítať správy na %{readurl} - footer2: a môžete odpovedať na %{replyurl} header: "%{from_user} vám zaslal správu cez OpenStreetMap s predmetom %{subject}:" hi: Ahoj %{to_user}, + note_comment_notification: + anonymous: Anonymný používateľ + details: Viac podrobností o poznámke môžete nájsť nájsť na %{url}. + greeting: Ahoj, signup_confirm: - subject: "[OpenStreetMap] Potvrďte svoju e-mailovú adresu" - signup_confirm_html: - ask_questions: Prípadné otázky k OpenStreetMap môžete položiť na našom webe otázok a odpovedí. - click_the_link: Ak ste to vy, vitajte! Kliknutím na nasledovný odkaz potvrdíte svoje konto, nižšie sa dozviete ďalšie informácie o OpenStreetMap - current_user: Zoznam existujúcich používateľov v kategóriách podľa miesta bydliska je dostupný v kategórii Users by geographical region. - get_reading: Prečítajte si niečo o OpenStreetMap na wiki, sledujte aktuálne dianie na našom blogu alebo Twitteri, alebo si prebehnite blog zakladateľa OpenStreetMap Steva Coasta OpenGeoData so stručnou históriou projektu aj vo forme podcastov! - greeting: Ahoj! - hopefully_you: Niekto (dúfame že vy) chcel vytvoriť účet po dobu - introductory_video: Môžete sledovať %{introductory_video_link}. - more_videos: Je tam %{more_videos_link}. - more_videos_here: viac videí tu - user_wiki_page: Odporúčame, aby ste si na wiki založili používateľskú stránku, na ktorej kategóriami označíte odkiaľ pochádzate, napr. [[Category:Users in Bratislava]]. - video_to_openstreetmap: úvodné inštruktážne video k OpenStreetMap - wiki_signup: Môžete sa tiež zaregistrovať na OpenStreetMap wiki. - signup_confirm_plain: - ask_questions: "Prípadné otázky k OpenStreetMap môžete položiť na našom webe otázok a odpovedí:" - blog_and_twitter: "Sledujte aktuálne dianie na našom blogu alebo Twitteri:" - click_the_link_1: Ak je to vám, vitajte! Prosím kliknite na odkaz nižšie pre potvrdenie vášho - click_the_link_2: svoje konto, nižšie sa dozviete ďalšie informácie o OpenStreetMap. - current_user_1: Zoznam aktuálnych používateľov v kategóriách podľa miesta, kde sa vo svete nachádzajú - current_user_2: "sú k dispozícii na:" + confirm: "Predtým, než urobíme čokoľvek ďalšie, potrebujeme potvrdiť, že táto žiadosť prišla od vás. Ak je to tak, kliknutím na nasledovný odkaz potvrdíte svoje konto:" + created: Niekto (dúfame, že vy) si práve vytvoril konto na %{site_url}. greeting: Ahoj! - hopefully_you: Niekto (dúfame že vy) si chce založiť konto na - introductory_video: "Môžete sledovať úvodné video k OpenStreetMap tu:" - more_videos: "Existujú ďalšie videá tu:" - opengeodata: "OpenGeoData.org je blog zakladateľa OpenStreetMap Steva Coasta, ponúka aj podcasty:" - the_wiki: "Prečítajte si niečo o OpenStreetMap na wiki:" - user_wiki_1: Odporúčame, aby ste si na wiki vytvorili používateľskú stránku, ktorá obsahuje - user_wiki_2: kategóriami označíte, odkiaľ pochádzate, napríklad [[Category:Users in Bratislava]]. - wiki_signup: "Môžete tiež prihlásiť do wiki OpenStreetMap na adrese:" + subject: "[OpenStreetMap] Vitajte v OpenStreetMap" + welcome: Dovoľujeme si vás privítať a poskytnúť vám niektoré ďalšie informácie, ktoré vám pomôžu začať. oauth: oauthorize: allow_read_gpx: čítať vaše súkromné GPS stopy. @@ -1179,6 +1160,8 @@ sk: allow_write_gpx: nahrať GPS stopy. allow_write_prefs: upraviť vaše osobné nastavenia. request_access: Aplikácia %{app_name} požaduje prístup k vášmu kontu (%{user}). Vyberte si, či si želáte, aby mala aplikácia nasledujúce oprávnenie. Môžete zvoliť ľubovoľný počet oprávnení. + oauthorize_success: + verification: Váš overovací kód je %{code}. revoke: flash: Prístup pre aplikáciu %{application} bol odvolaný. oauth_clients: @@ -1228,18 +1211,44 @@ sk: allow_write_prefs: upraviť svoje užívateľské nastavenia. authorize_url: "Authorise URL:" confirm: Ste si istý? + delete: Odstrániť klienta edit: Upraviť detaily key: "Consumer Key:" requests: "Žiadam nasledujúce oprávnenia od používateľa:" secret: "Consumer Secret:" - support_notice: Podporujeme HMAC-SHA1 (odporúča sa) rovnako ako obyčajný text v ssl móde. + support_notice: Podporujeme HMAC-SHA1 (odporúča sa) a podpisy RSA-SHA1. title: Podrobnosti OAuth pre %{app_name} url: "Request Token URL:" update: flash: Úspešne aktualizované informácie o klientovi redaction: + create: + flash: Revízia vytvorená. + destroy: + error: Pri zrušení revízie sa vyskytla chyba. + flash: Revízia zrušená. + not_empty: Revízia nie je prázdna. Pred zrušením tejto revízie zrušte skrytie všetkých verzií patriacich do tejto revízie. + edit: + description: Popis + heading: Upraviť revíziu + submit: Uložiť revíziu + title: Upraviť revíziu + index: + empty: Žiadne revízie na zobrazenie. + heading: Zoznam revízií + title: Zoznam revízií + new: + description: Popis + heading: Zadajte informácie k novej revízii. + submit: Vytvoriť revíziu + title: Vytváranie nových revízií show: confirm: Ste si istý? + description: "Popis:" + destroy: Odstrániť túto revíziu + edit: Upraviť túto revíziu + heading: Zobrazujem revíziu "%{title}" + title: Zobrazenie revízie user: "Autor:" update: flash: Zmeny boli uložené. @@ -1247,6 +1256,7 @@ sk: edit: anon_edits_link_text: Prečo to tak je? flash_player_required: 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í. + 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é. not_public: Nemáte nastavené úpravy na verejné. not_public_description: Kým tak neurobíte, nemôžete ďalej editovať mapu. Svoje úpravy môžete nastaviť ako verejné na vašej %{user_page}. @@ -1255,18 +1265,15 @@ sk: 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.) user_page_link: stránke používateľa index: - js_1: Používate prehliadač, ktorý nepodporuje JavaScript, alebo máte vypnutý JavaScript. - js_2: OpenStreetMap využíva JavaScript pre slippy map. + createnote: Pridať poznámku + js_1: Používate prehliadač bez podpory JavaScriptu, alebo máte JavaScript vypnutý. + js_2: OpenStreetMap používa pre interaktívnu mapu JavaScript. license: - license_name: Creative Commons Attribution Share-Alike 2,0 - notice: Licencovaný pod %{license_name} s %{project_name} a jej prispievatelia. - project_name: OpenStreetMap projekt + copyright: Chránené autorskými právami OpenStreetMap a prispievateľov pod slobodnou licenciou permalink: Trvalý odkaz remote_failed: Editácia sa nepodarila – skontrolujte, či je JOSM alebo Merkaartor spustený a je v ňom povolená funkcia Diaľkové ovládanie (Remote control) shortlink: Krátky odkaz key: - map_key: Legenda - map_key_tooltip: Legenda k mape table: entry: admin: Administratívne hranice @@ -1338,8 +1345,13 @@ sk: first: Prvá položka heading: Nadpis headings: Nadpisy + image: Obrázok link: Odkaz + ordered: Číslovaný zoznam + second: Druhá položka subheading: Podnadpis + text: Text + title_html: Používa sa syntax Markdown unordered: Neusporiadaný zoznam url: URL richtext_area: @@ -1347,7 +1359,6 @@ sk: preview: Náhľad search: search: Hľadať - search_help: "príklady: 'Žilina', 'Veľká Okružná, Žilina', '83103', alebo 'post offices near Žilina' ďalšie príklady…" submit_text: hľ. where_am_i: Kde som? where_am_i_title: Opis aktuálnej polohy pomocou vyhľadávača @@ -1356,7 +1367,7 @@ sk: search_results: Výsledky vyhľadávania time: formats: - friendly: "%e. %B %Y o %H:%M" + friendly: "%e. %B %Y o %H:%M" trace: create: trace_uploaded: Váš GPX súbor bol uložený a čaká na zaradenie do databázy. Obvykle to netrvá viac než polhodinu. Po jeho zaradení dostanete potvrdzujúci e-mail. @@ -1381,6 +1392,8 @@ sk: visibility: "Viditeľnosť:" visibility_help: čo má toto znamenať? list: + description: Prechádzať nedávno nahrané GPS stopy + empty_html: Nič tu zatiaľ nie je. Nahrajte novú stopu, alebo si niečo o GPS stopách prečítajte na wiki. public_traces: Verejné GPS stopy public_traces_from: Verejné GPS stopy od %{user} tagged_with: označený s %{tags} @@ -1425,9 +1438,9 @@ sk: trace_optionals: tags: Tagy trace_paging_nav: - next: Dopredu » - previous: « Naspäť - showing_page: Strana %{page} + newer: Novšie stopy + older: Staršie stopy + showing_page: Stránka %{page} view: delete_track: Vymazať túto stopu description: "Popis:" @@ -1458,7 +1471,7 @@ sk: agreed: Súhlasili ste s novými Podmienkami prispievania. agreed_with_pd: Deklarovali ste tiež, že svoje úpravy považujete za slobodné dielo. heading: "Podmienky prispievania:" - link text: čo je toto? + link text: čo to znamená? not yet agreed: Zatiaľ ste neodsúhlasili nové Podmienky prispievania. review link text: Keď budete mať čas, pomocou tohoto odkazu si prosím prečítajte a odsúhlaste nové Podmienky prispievania. current email address: "Aktuálna e-mailová adresa:" @@ -1466,6 +1479,10 @@ sk: email never displayed publicly: (nikde se verejne nezobrazuje) flash update success: Používateľské údaje boli úspešne aktualizované. flash update success confirm needed: Používateľské údaje boli úspešne aktualizované. Skontrolujte si e-mail, mala by Vám prísť výzva na potvrdenie novej e-mailovej adresy. + gravatar: + gravatar: Používať Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar + link text: čo to znamená? home location: "Domovské miesto:" image: "Obrázok:" image size hint: (najvhodnejšie sú štvorcové obrázky s veľkosťou najmenej 100×100) @@ -1479,7 +1496,7 @@ sk: no home location: Nezadali ste svoje domovské miesto. openid: link: http://wiki.openstreetmap.org/wiki/CS:OpenID - link text: čo je toto? + link text: čo to znamená? openid: "OpenID:" preferred editor: "Preferovaný editor:" preferred languages: "Preferované jazyky:" @@ -1487,9 +1504,9 @@ sk: public editing: disabled: Vypnutý a nemôže upravovať údaje, všetky predchádzajúce úpravy sú anonymné. disabled link text: prečo nemôžem upravovať? - enabled: Zapnutý. Nie je anonym a môže upravovať dáta. + enabled: Zapnuté. Nie je anonym a môže upravovať údaje. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: čo je toto? + enabled link text: čo to znamená? heading: "Verejné úpravy:" public editing note: heading: Úprava pre verejnosť @@ -1501,12 +1518,12 @@ sk: update home location on click: Aktualizovať domovské miesto kliknutím na mapu? confirm: already active: Toto používateľské konto už bolo potvrdené. - before you start: Pravdepodobne sa už nemôžete dočkať, kedy začnete vytvárať mapy, predtým by ste ale mohli chcieť v nasledovnom formulári vyplniť niekoľko informácií o svojej osobe. button: Potvrdiť - heading: Potvrdiť používateľské konto + heading: Skontrolujte vašu emailovú adresu! + introduction_1: Poslali sme vám potvrdzovací e-mail. + introduction_2: Potvrďte svoje konto kliknutím na odkaz v e-maili a budete môcť začať mapovať. press confirm button: Stlačte tlačítko na potvrdenie dole, pre aktiváciu vášho účtu. - reconfirm: Ak už od vašej registrácie uplynul dlhší čas, budete si možno musieť nechať poslať nový potvrdzovací e-mail. - success: Váš účet je založený, ďakujeme, že ste sa zapísali! + reconfirm_html: Ak potrebujete, aby sme vám potvrdzovací e-mail poslali znova, kliknite sem. unknown token: Zadaný potvrdzovací kód neexistuje. confirm_email: button: Potvrdiť @@ -1543,8 +1560,6 @@ sk: lost password link: Stratili ste heslo? new to osm: Ste na OpenStreetMap nový? no account: Nemáte konto? - notice: Zistite viac o chystanej zmene licencie OpenStreetMap (preklady) (diskusia) - notice_terms: OpenStreetMap prechádza 1. apríla 2012 na novú licenciu. Je rovnako otvorená ako tá súčasná, ale právne ošetrenie je pre našu mapovú databázu podstatne vhodnejšie. Veľmi radi by sme v OpenStreetMap zachovali vaše príspevky, to ale budeme môcť len v prípade, že dáte súhlas k ich šíreniu pod novou licenciou. V opačnom prípade ich budeme musieť z databázy vyradiť.

    Prosíme, prihláste sa a venujte chvíľku na prečítanie a odsúhlasenie nových podmienok. Ďakujeme! openid: "%{logo} OpenID:" openid invalid: Ľutujeme, ale vaše OpenID sa zdá byť nesprávne openid missing provider: Ľutujeme, nepodarilo se spojiť s vaším OpenID poskytovateľom @@ -1589,19 +1604,18 @@ sk: title: Stratené heslo make_friend: already_a_friend: Ste už priatelia s %{name}. + button: Pridať ako priateľa failed: Ľutujeme, nepodarilo sa pridať %{name} ako priateľa. + heading: Pridať používateľa %{user} ako priateľa? success: "%{name} je teraz váš priateľ." new: confirm email address: "Potvrdiť emailovú adresu:" - confirm password: "Potvrdiť Heslo:" + confirm password: "Potvrdiť heslo:" contact_webmaster: Kontaktujte prosím webmastera so žiadosťou o založenie konta – budeme sa snažiť vašu požiadavku vybaviť čo najrýchlejšie. - continue: Pokračovať + continue: Zaregistrovať sa display name: "Zobrazované meno:" display name description: Vaše verejne zobrazené meno užívateľa. Môžete ho potom zmeniť v nastaveniach. email address: "Emailová adresa:" - fill_form: Vyplňte formulár a my vám rýchlo pošleme email na aktiváciu vášho účtu. - flash create success message: Používateľ bol úspešne vytvorený. Skontrolujte váš email, kvôli potvrdzujúcej správe, a budete môcť mapovať ihneď :-)

    Majte prosím na pamäti, že nebudete schopný prihlásiť sa až do prijatia a potvrdenie vašej emailovej adresy.

    Ak používate antispamový systém, ktorý posiela žiadosť o potvrdenie, potom sa uistite či je emailová adresa webmaster@openstreetmap.org na whiteliste, inak nie sme schopný odpovedať na potvrdenie požiadavky. - heading: Vytvoriť používateľský účet license_agreement: Pri potvrdení konta budete musieť vyjadriť súhlas s Podmienkami prispievania. no_auto_account_create: Bohužiaľ teraz nie sme schopný vytvoriť pre vás účet automaticky. not displayed publicly: Nezobrazuje sa nikde verejne (pozrite pravidlá ochrany osobných údajov) @@ -1611,7 +1625,7 @@ sk: password: "Heslo:" terms accepted: Ďakujeme za odsúhlasenie nových podmienok prispievania! terms declined: Je nám ľúto, že ste sa rozhodli neprijať nové Podmienky prispievania. Bližšie informácie nájdete natejto wiki-stránke. - title: Vytvoriť účet + title: Zaregistrovať sa use openid: Prípadne sa môžete prihlásiť pomocou %{logo} OpenID no_such_user: body: Ľutujeme, používateľ %{user} neexistuje. Prosím skontrolujte váš text, alebo ste možno klikli na nesprávny odkaz. @@ -1622,15 +1636,17 @@ sk: nearby mapper: Používateľ v okolí your location: Vaša poloha remove_friend: + button: Odobrať z priateľov + heading: Odobrať používateľa %{user} zo zoznamu priateľov? not_a_friend: "%{name} nie je nikto z vašich priateľov." success: "%{name} bol z vašich priateľov vymazaný." reset_password: - confirm password: "Potvrdiť Heslo:" + confirm password: "Potvrdiť heslo:" flash changed: Vaše heslo bolo zmenené. flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL. heading: Resetnúť heslo pre %{user} password: "Heslo:" - reset: Zmazať Heslo + reset: Vynulovať heslo title: Resetnúť heslo set_home: flash success: Domáca poloha úspešne uložená @@ -1642,7 +1658,7 @@ sk: terms: agree: Súhlasím consider_pd: Navyše k uvedenej dohode vyhlasujem, že považujem svoje príspevky za slobodné dielo (Public Domain). - consider_pd_why: čo je toto? + consider_pd_why: čo to znamená? decline: Nesúhlasím guidance: "Informácie, ktoré Vám môžu pomôcť porozumieť týmto podmienkam: zhrnutie a nejaké neoficiálne preklady" heading: Podmienky prispievania @@ -1656,11 +1672,11 @@ sk: you need to accept or decline: Pre pokračovanie si prosím prečítajte a príjmite, alebo odmietnite nové Podmienky prispievania. view: activate_user: aktivovať tohoto používateľa - add as friend: pridať ako priateľa + add as friend: Pridať priateľa ago: (pred %{time_in_words_ago}) - block_history: zobraziť prijaté položky - blocks by me: blokovať pre mňa - blocks on me: moje zablokovania + block_history: prijaté bloky + blocks by me: Mnou udelené bloky + blocks on me: Moje zablokovania comments: komentáre confirm: Potvrdiť confirm_user: potvrdiť tohoto používateľa @@ -1673,8 +1689,8 @@ sk: deactivate_user: deaktivovať tohoto používateľa delete_user: vymazať tohoto používateľa description: Popis - diary: denník - edits: úpravy + diary: Denník + edits: Úpravy email address: "Emailová adresa:" friends_changesets: Prechádzať všetky sady zmien priateľov friends_diaries: Prechádzať všetky denníkové záznamy priateľov @@ -1684,20 +1700,24 @@ sk: latest edit: "Posledné úpravy pred %{ago}:" m away: vzdialený %{count}m mapper since: "Mapuje od:" - moderator_history: zobraziť zadaný blok - my comments: moje komentáre - my diary: môj denník - my edits: moje úpravy - my settings: moje nastavenia - my traces: moje stopy + moderator_history: odovzdané bloky + my comments: Moje komentáre + my diary: Môj denník + my edits: Moje úpravy + my messages: Moje správy + my notes: Moje poznámky k mape + my profile: Môj profil + my settings: Moje nastavenia + my traces: Moje stopy nearby users: Ďalší používatelia v okolí nearby_changesets: Prechádzať všetky sady zmien používateľov v okolí nearby_diaries: Prechádzať všetky denníkové záznamy používateľov v okolí new diary entry: nový záznam denníka no friends: Ešte nemáte pridaných žiadnych priateľov. no nearby users: Nie je tu iný používateľ, ktorý priznáva mapovanie v okolí. + notes: Poznámky k mape oauth settings: oauth nastavenia - remove as friend: odstrániť ako priateľa + remove as friend: Odstrániť z priateľov role: administrator: Tento používateľ je administrátor grant: @@ -1707,11 +1727,11 @@ sk: revoke: administrator: Zrušiť prístup administrátora moderator: Zrušiť prístup moderátora - send message: poslať správu + send message: Poslať správu settings_link_text: nastavenia spam score: "Spam skóre:" status: "Stav:" - traces: stopy + traces: Stopy unhide_user: zobraziť tohoto používateľa user location: Poloha používateľa your friends: Vaši priatelia @@ -1769,11 +1789,14 @@ sk: creator_name: Tvorca display_name: Blokovaný používateľ edit: Upraviť + next: Ďalšia stránka » not_revoked: (nezrušený) + previous: « Predchádzajúca stránka reason: Dôvod pre blokovanie revoke: Zrušiť! revoker_name: Zrušil show: Zobraziť + showing_page: Strana %{page} status: Stav period: few: "%{count} hodiny" @@ -1822,3 +1845,24 @@ sk: fail: Nemôžem zrušiť úlohu `%{role}' od používateľa `%{name}'. Prosím skontrolujte aby používateľ a úloha boli oprávnené. heading: Potvrdiť zrušenie funkcie title: Potvrdiť zrušenie funkcie + welcome_page: + add_a_note: + paragraph_1_html: Pokiaľ chcete len opraviť nejakú drobnosť a nemáte čas sa registrovať a učiť sa upravovať, môžete jednoducho pridať poznámku. + title: Nie je čas upravovať? Pridajte poznámku! + basic_terms: + editor_html: Editor je program alebo webovej stránky pomocou ktorej upravujete mapu. + node_html: uzol je bod na mape, napr. jedna reštaurácia alebo strom. + paragraph_1_html: OpenStreetMap má svoj vlastný žargón. Tu je niekoľko kľúčových slov, ktoré vám prídu vhod. + tag_html: Značka je trochu údajov o uzle alebo ceste, napr. názov reštaurácie alebo rýchlostný limit cesty. + title: Základné pojmy pre mapovanie + way_html: Cesta je čiara alebo oblasť, ako cesty, vodné toky, jazerá alebo budovy. + introduction_html: Vitajte na OpenStreetMap, slobodnej a upravovateľnej mape sveta. Teraz, keď ste zaregistrovaní, môžete začať mapovať. Tu je stručný prehľad najdôležitejších, ktoré potrebujete vedieť. + questions: + paragraph_1_html: Potrebujete pomoc s mapovaním alebo vám nie je jasné, ako OpenStreetMap používať? Odpovede na svoje otázky môžete získať na webe s nápovedou. + title: Akékoľvek otázky? + start_mapping: Začať mapovať + title: Vitajte! + whats_on_the_map: + off_html: Čo nezahŕňa sú názory ako hodnotenia, historické či hypotetické objekty a údaje zo zdrojov chránených autorským právom. Pokiaľ nemáte špeciálne oprávnenie, nekopírujte z online nebo papierových máp. + on_html: OpenStreetMap je miesto pre mapovanie vecí, ktoré sú zároveň reálne aj aktuálne - obsahuje milióny budov, ciest a ďalšie podrobnosti o miestach. Môžete mapovať čokoľvek, čo vás zaujíma. + title: Čo patrí do mapy diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 2cd84ebf607..de9b6224f4e 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1,9 +1,15 @@ # Messages for Slovenian (slovenščina) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Damjang # Author: Dbc334 +# Author: Eleassar # Author: Lesko987 +# Author: Mateju +# Author: Stefanb sl: + about_page: + partners_title: Partnerji activerecord: attributes: diary_comment: @@ -12,7 +18,7 @@ sl: language: Jezik latitude: Zemljepisna širina longitude: Zemljepisna dolžina - title: Naslov + title: Zadeva user: Uporabnik friend: friend: Prijatelj @@ -21,7 +27,7 @@ sl: body: Besedilo recipient: Prejemnik sender: Pošiljatelj - title: Naslov + title: Zadeva trace: description: Opis latitude: Zemljepisna širina @@ -51,11 +57,11 @@ sl: node: Vozlišče node_tag: Oznaka vozlišča notifier: Obveščevalec - old_node: Stara točka - old_node_tag: Oznaka stare točke + old_node: Staro vozlišče + old_node_tag: Oznaka starega vozlišča old_relation: Stara zveza - old_relation_member: Star član zveze - old_relation_tag: Stara oznaka zveze + old_relation_member: Član stare zveze + old_relation_tag: Oznaka stare zveze old_way: Stara pot old_way_node: Vozlišče stare poti old_way_tag: Oznaka stare poti @@ -81,100 +87,62 @@ sl: blocked: Vaš dostop do API je bil blokiran. Prosimo, prijavite se na spletno stran, če želite izvedeti več. need_to_see_terms: Vaš dostop do API, je začasno prekinjen. Prosimo, prijavite se na spletno stran in si oglejte pogoje "Contributor Terms". Ni se vam treba strinjati, vendar si jih morate ogledati. browse: + anonymous: anonimni changeset: - changeset: "Paket sprememb: %{id}" + belongs_to: Avtor changesetxml: Paket sprememb XML - download: Prenesi %{changeset_xml_link} ali %{osmchange_xml_link} feed: title: Paket sprememb %{id} title_comment: Paket sprememb %{id} - %{comment} + node: Vozlišč (%{count}) + node_paginated: Vozlišča (%{x}-%{y} od %{count}) osmchangexml: osmChange XML - title: Paket sprememb - changeset_details: - belongs_to: "Pripada:" - bounding_box: "Pravokotno področje:" - box: področje - closed_at: "Zaključen:" - created_at: "Ustvarjen:" - has_nodes: - few: "Vsebuje %{count} vozlišča:" - one: "Vsebuje %{count} vozlišče:" - other: "Vsebuje %{count} vozlišč:" - two: "Vsebuje %{count} vozlišči:" - has_relations: - few: "Vsebuje %{count} zveze:" - one: "Vsebuje %{count} zvezo:" - other: "Vsebuje %{count} zvez:" - two: "Vsebuje %{count} zvezi:" - has_ways: - one: "Vsebuje %{count} pot:" - other: "Vsebuje %{count} poti:" - no_bounding_box: Ta paket nima določenega pravokotnega področja. - show_area_box: Prikaži pravokotno področje - common_details: - changeset_comment: "Komentar:" - deleted_at: "Izbrisan ob:" - deleted_by: "Izbrisal:" - edited_at: "Urejeno ob:" - edited_by: "Uredil:" - in_changeset: "V paketu sprememb:" - version: "Različica:" + relation: Zveze (%{count}) + relation_paginated: Zveze (%{x}-%{y} od %{count}) + title: "Paket sprememb: %{id}" + way: Poti (%{count}) + way_paginated: Poti (%{x}-%{y} od %{count}) + closed: Zaprto + closed_by_html: Zaprl %{user} %{time} nazaj + closed_html: Zaprto %{time} nazaj containing_relation: entry: Zveza %{relation_name} entry_role: Zveza %{relation_name} (kot %{relation_role}) - map: - deleted: Izbrisano - edit: - area: Uredi področje - node: Uredi vozlišče - relation: Uredi zvezo - way: Uredi pot - larger: - area: Prikaz področja na večjem zemljevidu - node: Prikaz vozlišča na večjem zemljevidu - relation: Prikaz zveze na večjem zemljevidu - way: Prikaz poti na večjem zemljevidu - loading: Nalaganje ... - navigation: - all: - next_changeset_tooltip: Naslednji paket sprememb - next_node_tooltip: Naslednje vozlišče - next_relation_tooltip: Naslednja zveza - next_way_tooltip: Naslednja pot - prev_changeset_tooltip: Prejšnji paket sprememb - prev_node_tooltip: Prejšnje vozlišče - prev_relation_tooltip: Prejšnja zveza - prev_way_tooltip: Prejšnja pot - user: - name_changeset_tooltip: Prikaz prispevkov uporabnika %{user} - next_changeset_tooltip: Naslednji prispevek uporabnika %{user} - prev_changeset_tooltip: Prejšnji prispevek uporabnika %{user} + created: Ustvarjeno + created_by_html: Ustvaril %{user} %{time} nazaj + created_html: Ustvarjeno %{time} nazas + deleted_by_html: Izbrisal %{user} %{time} nazaj + download_xml: Prenesi XML + edited_by_html: Uredil %{user} %{time} nazaj + in_changeset: Paket sprememb + location: "Lokacija:" + no_comment: (brez komentarja) node: - download: "%{download_xml_link} ali %{view_history_link}" - download_xml: prenesi XML - edit: uredi - node: Vozlišče - node_title: "Vozlišče: %{node_name}" - view_history: poglej zgodovino - node_details: - coordinates: "Koordinate:" - part_of: "Del:" - node_history: - download: "%{download_xml_link} ali %{view_details_link}" - download_xml: prenesi XML - node_history: Zgodovina vozlišča - node_history_title: "Zgodovina vozlišča: %{node_name}" - view_details: poglej podrobnosti + history_title: "Zgodovina vozlišča: %{name}" + title: "Vozlišče: %{name}" not_found: - sorry: Oprostite, %{type} z ID-jem %{id} ne obstaja v bazi. + sorry: "Oprostite, %{type} #%{id} ni mogoče najti." type: changeset: Paket sprememb node: vozlišče relation: zveza way: pot - paging_nav: - of: od - showing_page: Prikazana stran + note: + closed_by: Razrešil %{user} %{when} nazaj + closed_by_anonymous: Ustvaril anonimni %{when} nazaj + closed_title: "Razrešena opomba #%{note_name}" + commented_by: Komentar uporabnika %{user} %{when} nazaj + commented_by_anonymous: Komentar anonimnega uporabnika %{when} nazaj + hidden_by: Skril %{user} %{when} nazaj + hidden_title: "Skrita opomba #%{note_name}" + new_note: Nova opomba + open_by: Ustvaril %{user} %{when} nazaj + open_by_anonymous: Ustvaril anonimni %{when} nazaj + open_title: "Nerazrešena opomba #%{note_name}" + reopened_by: Ponovno aktiviral %{user} %{when} nazaj + reopened_by_anonymous: Ponovno aktiviral anonimni %{when} nazaj + title: "Opomba: %{id}" + part_of: Del redacted: message_html: Verzija %{version} te %{type} ne more biti prikazana, ker je bila zavrnjena licenca. Glej %{redaction_link} za podrobnosti. redaction: Redakcija %{id} @@ -183,65 +151,20 @@ sl: relation: zveza way: pot relation: - download: "%{download_xml_link} ali %{view_history_link}" - download_xml: prenesi XML - relation: Zveza - relation_title: "Zveza: %{relation_name}" - view_history: poglej zgodovino - relation_details: - members: "Člani:" - part_of: "Del:" - relation_history: - download: "%{download_xml_link} ali %{view_details_link}" - download_xml: Prenesi XML - relation_history: Zgodovina zveze - relation_history_title: "Zgodovina zveze: %{relation_name}" - view_details: Ogled podrobnosti + history_title: "Zgodovina zveze: %{name}" + members: Člani + title: "Zveza: %{name}" relation_member: entry_role: "%{type} %{name} kot %{role}" type: node: Vozlišče relation: Zveza way: Pot - start: - manually_select: Ročno izberite drugo področje - view_data: Ogled podatkov trenutno prikazanega zemljevida start_rjs: - data_frame_title: Podatki - data_layer_name: Prebrskaj podatke zemljevida - details: Podrobnosti - drag_a_box: Za izbor področja povlecite pravokotnik na zemljevidu - edited_by_user_at_timestamp: Uredil [[user]] v [[timestamp]] - hide_areas: Skrij področja - history_for_feature: Zgodovina [[feature]] load_data: Naloži podatke - loaded_an_area_with_num_features: "Naložili ste področje, ki vsebuje [[num_features]] elementov. Nekateri spletni brskalniki ne zmorejo prikaza takšne količine podatkov. Na splošno brskalniki najbolje prikazujejo 100 ali manj elementov hkrati: karkoli drugega lahko upočasni vaš brskalnik ali ga naredi neodzivnega. Če ste prepričani, da želite prikazati vse te podatke, pritisnite na spodnji gumb." loading: Nalaganje ... - manually_select: Ročno izberite drugo področje - object_list: - api: Pridobi področje iz programskega vmesnika (API) - back: Prikaži seznam predmetov - details: Podrobnosti - heading: Seznam predmetov - history: - type: - node: Vozlišče [[id]] - way: Pot [[id]] - selected: - type: - node: Vozlišče [[id]] - way: Pot [[id]] - type: - node: Vozlišče - way: Pot - private_user: anonimni uporabnik - show_areas: Prikaži podrpčja - show_history: Prikaži zgodovino - unable_to_load_size: "Ni mogoče naložiti: Pravokotno področje velikosti [[bbox_size]] je preveliko (mora biti manjše od %{max_bbox_size})" - wait: Počakajte... - zoom_or_select: Povečajte zemljevid ali izberite področje za prikaz tag_details: - tags: "Oznake:" + tags: Oznake wiki_link: key: Wiki stran z opisom oznake %{key} tag: Wiki stran z opisom oznake %{key}=%{value} @@ -253,38 +176,22 @@ sl: node: vozlišče relation: zveza way: pot + version: Različica + view_details: Poglej podrobnosti + view_history: Poglej zgodovino way: - download: "%{download_xml_link}, %{view_history_link} ali %{edit_link}" - download_xml: prenesi XML - edit: uredi - view_history: poglej zgodovino - way: Pot - way_title: "Pot: %{way_name}" - way_details: - also_part_of: - other: tudi del poti %{related_ways} - nodes: "Vozlišča:" - part_of: "Del:" - way_history: - download: "%{download_xml_link} ali %{view_details_link}" - download_xml: prenesi XML - view_details: poglej podrobnosti - way_history: Zgodovina poti - way_history_title: "Zgodovina poti: %{way_name}" + history_title: "Zgodovina poti: %{name}" + nodes: Vozlišča + title: "Pot: %{name}" changeset: changeset: anonymous: Brezimen - big_area: (veliko) - id: št. %{id} - no_comment: (brez) no_edits: (brez sprememb) - show_area_box: prikaži pravokotno področje - still_editing: (še ureja) view_changeset_details: Ogled podrobnosti paketa sprememb changeset_paging_nav: next: Naslednja » previous: « Prejšnja - showing_page: Prikazovanje strani %{page} + showing_page: Stran %{page} changesets: area: Področje comment: Komentar @@ -292,24 +199,11 @@ sl: saved_at: Shranjen user: Uporabnik list: - description: Nedavne spremembe - description_bbox: Paketi sprememb znotraj področja %{bbox} - description_friend: Paketi sprememb vaših prijateljev - description_nearby: Paketi sprememb bližnjih uporabnikov - description_user: Paketi sprememb uporabnika %{user} - description_user_bbox: Paketi sprememb uporabnika %{user} znotraj %{bbox} - heading: Paketi sprememb - heading_bbox: Paketi sprememb - heading_friend: Paketi sprememb - heading_nearby: Paketi sprememb - heading_user: Paketi sprememb - heading_user_bbox: Paketi sprememb + load_more: Naloži več title: Paketi sprememb - title_bbox: Paketi sprememb znotraj področja %{bbox} title_friend: Paket sprememb vaših prijateljev title_nearby: Paketi sprememb bližnjih uporabnikov title_user: Paketi sprememb uporabnika %{user} - title_user_bbox: Paketi sprememb uporabnika %{user} znotraj %{bbox} timeout: sorry: Žal je seznam zahtevanih sprememb predolg za prenos. diary_entry: @@ -327,10 +221,10 @@ sl: hide_link: Skrij ta komentar diary_entry: comment_count: - few: "%{count} komentarje" one: "%{count} komentar" - other: "%{count} komentarjev" + other: three=%{count} komentarji two: "%{count} komentarja" + zero: Brez komentarjev comment_link: Komentiraj ta vnos confirm: Potrdi edit_link: Uredi ta vnos @@ -365,7 +259,7 @@ sl: newer_entries: Novejši zapisi no_entries: Ni zapisov v dnevnik older_entries: Starejši zapisi - recent_entries: "Nedavni zapisi v dnevnik:" + recent_entries: Nedavni vnosi v dnevnik title: Dnevniki uporabnikov title_friends: Dnevniki vaših prijateljev title_nearby: Dnevniki bližnjih uporabnikov @@ -389,11 +283,14 @@ sl: user_title: Dnevnik uporabnika %{user} editor: default: Privzet (trenutno %{name}) + id: + description: iD (urejevalnik v brskalniku) + name: iD potlatch: description: Potlatch 1 (v brskalniku) name: Potlatch 1 potlatch2: - description: Potlatch 2 (v brskalniku) + description: Potlatch 2 (urejevalnik v brskalniku) name: Potlatch 2 remote: description: Zunanji urejevalnik (JOSM ali Merkaartor) @@ -404,12 +301,12 @@ sl: area_to_export: Področje za izvoz embeddable_html: HTML za vključitev na spletno stran export_button: Izvozi - export_details: OpenStreetMap podatki imajo licenco Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0. + export_details: OpenStreetMap podatki imajo dovoljenje Open Data Commons Open Database License (ODbL). format: Oblika format_to_export: Oblika izvoženih podatkov image_size: Velikost slike latitude: "Šir:" - licence: Dovoljenje + licence: Licenca longitude: "Dol:" manually_select: Ročno izberite drugo področje map_image: Slika zemljevida (prikaže standardni izris) @@ -420,29 +317,30 @@ sl: paste_html: Uporabite ta HTML za vključitev zemljevida na spletno stran scale: Merilo too_large: - body: To področje je preveliko za izvoz v OpenStreetMap XML. Prosimo, da se približate ali izberite manjše območje. - heading: Preveliko območje + body: "To področje je preveliko za izvoz v OpenStreetMap XML. Prosimo, da se približate ali izberete manjše območje ali pa da uporabite enega od naslednjih virov za obsežen prenos podatkov:" + geofabrik: + description: Redno posodabljani izvlečki celin, držav in izbranih mest + title: Prenosi Geofabrik + metro: + description: Izvlečki za največja mesta na svetu in njihovo okolico + title: Izvlečki Metro + other: + description: Dodatni viri, navedeni v wikiju OpenStreetMap + title: Drugi viri + planet: + description: Redno posodabljane kopije celotne podatkovne zbirke OpenStreetMap + title: Planet OSM zoom: Povečava - start_rjs: - add_marker: Dodaj zaznamek na zemljevid - change_marker: Premakni zaznamek - click_add_marker: S klikom na zemljevid pripnite zaznamek. - drag_a_box: Za izbor področja povlecite pravokotnik na zemljevidu - export: Izvoz - manually_select: Ročno izberite drugo področje - view_larger_map: Večji zemljevid + title: Izvozi geocoder: description: title: geonames: Lokacija iz GeoNames - osm_namefinder: "%{types} iz iskalca po OpenStreetMap-u" osm_nominatim: Lokacija iz OpenStreetMap Nominatim types: cities: Velemesta places: Kraji towns: Mesta - description_osm_namefinder: - prefix: "%{distance} %{direction} od %{type}" direction: east: vzhodno north: severno @@ -463,16 +361,26 @@ sl: title: ca_postcode: Zadetki iz Geocoder.CA geonames: Zadetki iz GeoNames + geonames_reverse: Zadetki iz GeoNames latlon: Interni zadetki - osm_namefinder: Zadetki iz OpenStreetMap Namefinder osm_nominatim: Zadetki iz OpenStreetMap Nominatim + osm_nominatim_reverse: Zadetki iz OpenStreetMap Nominatim-a uk_postcode: Zadetki iz NPEMap / FreeThe Postcode us_postcode: Zadetki iz Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} od %{parentname})" - suffix_place: ", %{distance} %{direction} od %{placename}" search_osm_nominatim: + admin_levels: + level10: Meja predmestja + level2: Državna meja + level4: Meja pokrajine + level5: Meja regije + level6: Meja upravne enote + level8: Meja občine + level9: Meja mesta prefix: + aerialway: + chair_lift: Sedežnica + drag_lift: Vlečnica + station: Žičniška postaja aeroway: aerodrome: Aerodrom apron: Letališka ploščad @@ -494,6 +402,7 @@ sl: bench: Klop bicycle_parking: Parkirišče za kolesa bicycle_rental: Izposoja koles + biergarten: Pivski vrt brothel: Javna hiša bureau_de_change: Menjalnica bus_station: Avtobusna postaja @@ -562,7 +471,9 @@ sl: shop: Trgovina shopping: Nakupovanje shower: Tuš + social_centre: Socialni center social_club: Društveni klub + social_facility: Socialni objekt studio: Studio supermarket: Supermarket swimming_pool: Bazen @@ -580,13 +491,20 @@ sl: youth_centre: Mladinski center boundary: administrative: Upravne meje + census: Popisna meja national_park: Nacionalni Park protected_area: Zavarovano območje bridge: + aqueduct: Akvadukt + suspension: Viseči most + swing: Vrteči most viaduct: Viadukt "yes": Most building: "yes": Zgradba + emergency: + fire_hydrant: Hidrant + phone: Klic v sili highway: bridleway: Jahalna pot bus_guideway: Turistični avtobus @@ -608,6 +526,7 @@ sl: platform: Platforma primary: Glavna cesta primary_link: Priključek na glavno cesto + proposed: Predlagana cesta raceway: Dirkališče residential: Stanovanjska rest_area: Počivališče @@ -616,9 +535,12 @@ sl: secondary_link: Priključek na regionalno cesto service: Servisna cesta services: Avtocestno postajališče + speed_camera: Hitrostna kamera steps: Stopnice stile: Prehod preko ograje + street_lamp: Ulična svetilka tertiary: Lokalna cesta + tertiary_link: Terciarna cesta track: Kolovoz trail: Sled trunk: Hitra cesta @@ -632,6 +554,8 @@ sl: building: Zgradba castle: Grad church: Cerkev + citywalls: Mestno obzidje + fort: Trdnjava house: Hiša icon: Ikona manor: Graščina @@ -640,6 +564,7 @@ sl: monument: Spomenik museum: Muzej ruins: Ruševine + tomb: Grobnica tower: Stolp wayside_cross: Križ wayside_shrine: Kapelica @@ -674,14 +599,17 @@ sl: reservoir: Zbiralnik residential: Stanovanjska cona retail: Trgovine + road: Območje ceste village_green: Zelenica vineyard: Vinograd wetland: Mokrišče wood: Pragozd leisure: beach_resort: kopališče + bird_hide: Ptičja opazovalnica common: Javno zemljišče fishing: Ribolovno območje + fitness_station: Fitnes center garden: Vrt golf_course: Igrišče za Golf ice_rink: Drsališče @@ -703,6 +631,8 @@ sl: airfield: Vojaško letališče barracks: Vojašnica bunker: Bunker + mountain_pass: + "yes": Gorski prelaz natural: bay: Zaliv beach: Obala @@ -711,9 +641,11 @@ sl: channel: Kanal cliff: Klif crater: Krater + dune: Peščina feature: Znamenitost fell: Višinski travnik fjord: Fjord + forest: Gozd geyser: Gejzir glacier: Ledenik heath: Ravnina @@ -733,6 +665,7 @@ sl: scrub: Grmovje shoal: Peščena plaža spring: Izvir + stone: Skala strait: Ožina tree: Drevo valley: Dolina @@ -741,6 +674,19 @@ sl: wetland: Mokrišče wetlands: Mokrišča wood: Pragozd + office: + accountant: Računovodja + architect: Arhitekt + company: Podjetje + employment_agency: Agencija za zaposlovanje + estate_agent: Nepremičninska agencija + government: Vladni urad + insurance: Zavarovalnica + lawyer: Odvetnik + ngo: NVO urad + telecommunication: Telekomunikacijski urad + travel_agent: Potovalna agencija + "yes": Pisarne place: airport: Letališče city: Mesto @@ -752,9 +698,11 @@ sl: houses: Hiše island: Otok islet: Otoček + isolated_dwelling: Osamljena hiša locality: Krajevno ime moor: Muring municipality: Občina + neighbourhood: Mestna četrt postcode: Poštna številka region: Regija sea: Morje @@ -775,12 +723,15 @@ sl: junction: Križišče železnic level_crossing: Prehod light_rail: Tramvaj + miniature: Miniaturna železnica monorail: Monorail narrow_gauge: Ozkotirna železnica platform: Železniški peron preserved: Ohranjena železniška proga + proposed: Predlagana železnica spur: Tir station: Železniška postaja + stop: Železniško postajališče subway: Podzemna postaja subway_entrance: Vhod na podzemno switch: Kretnica @@ -789,12 +740,14 @@ sl: yard: Železniško dvorišče shop: alcohol: Trgovina alkoholnih pijač + antiques: Starinarna art: Prodajna galerija bakery: Pekarna beauty: Salon lepote beverages: Trgovina pijač bicycle: Trgovina koles books: Knjigarna + boutique: Butik butcher: Mesar car: Avtomobilski salon car_parts: Avtomobilski deli @@ -808,6 +761,7 @@ sl: convenience: Minimarket copyshop: Kopirnica cosmetics: Drogerija + deli: Delikatesna trgovina department_store: Trgovska hiša discount: Outlet doityourself: Orodjarna @@ -844,17 +798,21 @@ sl: organic: Trgovina z ekološko hrano outdoor: Trgovina na prostem pet: Trgovina za male živali + pharmacy: Lekarna photo: Fotograf salon: Lepotilni salon + second_hand: Trgovina z rabljeno opremo shoes: Trgovina s čevlji shopping_centre: Nakupovalno središče sports: Športna trgovina stationery: Papirnica supermarket: Supermarket + tailor: Krojač toys: Trgovina igrač travel_agency: Potovalna agencija video: Videoteka wine: Vinoteka + "yes": Trgovina tourism: alpine_hut: Koča artwork: Umetnina @@ -877,8 +835,10 @@ sl: viewpoint: Razgledna točka zoo: Živalski vrt tunnel: + culvert: Podzemni kanal "yes": Predor waterway: + artificial: Umetni vodotok boatyard: Ladjedelnica canal: Prekop connector: Vodne povezave @@ -899,63 +859,95 @@ sl: water_point: Pitna voda waterfall: Slap weir: Zapornica + help_page: + welcome: + title: Dobrodošli v OSM javascripts: + close: Zapri + key: + title: Ključ zemljevida + tooltip: Ključ zemljevida + tooltip_disabled: Ključ zemljevida na voljo le za standardno plast map: base: cycle_map: Kolesarska karta + hot: Človekoljub standard: Privzeta karta transport_map: Transportna karta + copyright: © OpenStreetMap sodelavci + layers: + data: Podatki zemljevida + header: Plasti zemljevida + notes: Opombe na zemljevidu + overlays: Omogočite prekrivke za odpravljanje težav na zemljevidu + title: Plasti + locate: + popup: Ste v razdalji {distance} {unit} od te točke + title: Pokaži mojo lokacijo + zoom: + in: Povečaj + out: Pomanjšaj + notes: + new: + add: Dodaj opombo + show: + anonymous_warning: To opomba vključuje pripombe anonimnih uporabnikov, ki bi morale biti posamezno preverjene. + comment: Komentar + comment_and_resolve: Komentiraj in razreši + hide: Skrij + reactivate: Znova aktiviraj + resolve: Razreši + share: + cancel: Prekliči + center_marker: Centriraj zemljevid na oznako + custom_dimensions: Nastavitev velikosti po meri + download: Prenesi + embed: HTML + format: "Oblika:" + image: Slika + image_size: Slika prikaže standardno plast na + include_marker: Vključi oznako + link: Povezavo ali HTML + long_link: Povezavo + paste_html: Prilepi HTML za vdelavo v spletno mesto + scale: "Merilo:" + short_link: Kratko povezavo + short_url: Kratek URL + title: Deli + view_larger_map: Prikaži večji zemljevid site: + createnote_disabled_tooltip: Povečaj za dodati opombo na zemljevid + createnote_tooltip: Dodaj opombo na zemljevid edit_disabled_tooltip: Povečajte za urejanje zemljevida edit_tooltip: Urejanje zemljevida - edit_zoom_alert: Morate povečati za urejanje zemljevida - history_disabled_tooltip: Povečajte za ogled urejanj tega področja - history_tooltip: Prikaži urejanja za to področje - history_zoom_alert: Morate povečati karto za ogled urejanj na tem področju layouts: + about: O projektu community: Skupnost community_blogs: Blogi skupnosti community_blogs_title: Blogi članov skupnosti OpenStreetMap - copyright: Avtorske pravice & licenca - documentation: Dokumentacija - documentation_title: Dokumentacija projekta + copyright: Avtorske pravice + data: Podatki donate: Podprite OpenStreetMap z %{link} v fond za nadgradnjo strojne opreme. - donate_link_text: donacijo edit: Uredi - edit_with: Urejaj z %{editor} + edit_with: Za urejanje uporabljaj %{editor} export: Izvoz - export_tooltip: Izvozite podatke zemljevida + export_data: Izvoz podatkov foundation: Fundacija foundation_title: OpenStreetMap Fubdacija gps_traces: Sledi GPS gps_traces_tooltip: Upravljanje sledi GPS help: Pomoč - help_centre: Center za pomoč - help_title: Spletno mesto za pomoč projekta history: Zgodovina - home: domov - home_tooltip: Prikaži domači kraj - inbox: prejeto (%{count}) - inbox_tooltip: - few: Prejeli ste %{count} nova sporočila. - one: Prejeli ste %{count} novo sporočilo. - other: Prejeli ste %{count} novih sporočil. - two: Prejeli ste %{count} novi sporočili. - zero: Niste prejeli novih spročil. - intro_1: OpenStreetMap je prost zemljevid sveta, ki ga urejajo ljudje, kot ste Vi. + home: Domov intro_2_create_account: Ustvarite uporabniški račun - intro_2_download: prenesejo - intro_2_html: Podatki se lahko brezplačno %{download} in %{use} po %{license}. %{create_account} in izboljšajte zemljevid. - intro_2_license: odprti licenci - intro_2_use: uporabijo - license: - title: Podatki OpenStreetMap so licencirani v skladu z Creative Commons Attribution-Share Alike 2.0 Generic License - log_in: prijava + intro_header: Dobrodošli na OpenStreetMap! + intro_text: OpenStreetMap je zemljevid sveta, ki ga ustvarjajo ljudje kot ste vi, brezplačen za uporabo z odprto licenco. + learn_more: Več o tem + log_in: Prijava log_in_tooltip: Vstop s svojim obstoječim uporabniškim računom logo: alt_text: OpenStreetMap logotip - logout: odjava - logout_tooltip: Odjava iz sistema + logout: Odjava make_a_donation: text: Prispevajte finančna sredstva title: Podprite OpenStreetMap z denarnim prispevkom @@ -966,23 +958,21 @@ sl: partners_ic: Imperial College v Londonu partners_partners: partnerji partners_ucl: UCL VR Center - sign_up: ustvari račun + sign_up: Ustvari račun sign_up_tooltip: Ustvarite si nov uporabniški račun za urejanje - sotm2011: Pridite konferenco OpenStreetMap 2011, stanje karte, 9-11 September v Denverju! + start_mapping: Začnite kartirati tag_line: Prost wiki zemljevid sveta user_diaries: Dnevnik user_diaries_tooltip: Pregled dnevnikov uporabnikov - view: Zemljevid - view_tooltip: Prikaži zemljevid - welcome_user: Dobrodošli, %{user_link} - welcome_user_link_tooltip: Vaša uporabniška stran - wiki: Wiki - wiki_title: Wiki stran za projekt license_page: foreign: english_link: angleški izvirnik text: V primeru neskladja med tem prevodom in %{english_original_link} se bo uporabila angleška stran title: O tem prevodu + legal_babble: + infringement_title_html: Kršitev avtorskih pravic + intro_1_html: OpenStreetMap so prosti podatki z Open Data Commons Open Database License (ODbL) licenco. + title_html: Avtorske pravice in licenca native: mapping_link: začnete kartirati native_link: Slovensko verzijo @@ -1048,12 +1038,9 @@ sl: title: Poslana pošta to: Za read: - back_to_inbox: Nazaj na prejeto pošto - back_to_outbox: Nazaj na poslano pošto + back: Nazaj date: Datum from: Od - reading_your_messages: Prebiranje vaših sporočil - reading_your_sent_messages: Prebiranje vaših poslanih sporočil reply_button: Odgovori subject: Zadeva title: Branje sporočila @@ -1064,6 +1051,37 @@ sl: wrong_user: Prijavljeni ste kot '%{user}', ampak sporočilo na katerega odgovarjate, ni bilo poslano vam. Prosimo, prijavite se, kot pravi uporabnik za odgovarjanje. sent_message_summary: delete_button: Izbriši + note: + description: + closed_at_by_html: Rešeno %{when} nazaj od %{user} + closed_at_html: Rešeno %{when} nazaj + commented_at_by_html: Posodobljeno %{when} nazaj od %{user} + commented_at_html: Posodobljeno %{when} nazaj + opened_at_by_html: Ustvarjeno %{when} nazaj od %{user} + opened_at_html: Ustvarjeno %{when} nazaj + reopened_at_by_html: Zopet aktivirano %{when} nazaj od %{user} + reopened_at_html: Zopet aktivirano %{when} nazaj + entry: + comment: Komentar + full: Celotna opomba + mine: + ago_html: "%{when} nazaj" + created_at: Ustvarjeno + creator: Ustvarjalec + description: Opis + heading: Opombe uporabnika %{user} + id: Id + last_changed: Zadnja sprememba + subheading: Opombe, ki jih je posredoval/-a ali komentiral/-a %{user} + title: Opombe, ki jih je posredoval/-a ali komentiral/-a %{user} + rss: + closed: Zaprta opomba (v bližini %{place}) + commented: Nov komentar (v bližini %{place}) + description_area: Seznam opomb, prijavljenih, komentiranih ali zaprtih na vašem območju [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: RSS vir za opombo %{id} + opened: Nova opomba (v bližini %{place}) + reopened: Zopet aktivirana opomba (v bližini %{place}) + title: OpenStreetMap opombe notifier: diary_comment_notification: footer: Komentar lahko preberete tudi na %{readurl}, komentirate lahko na %{commenturl} ali odgovorite na %{replyurl} @@ -1079,8 +1097,7 @@ sl: email_confirm_plain: click_the_link: Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za potrditev spremembe. greeting: Pozdravljeni, - hopefully_you_1: Nekdo (upamo, da vi) je zahteval spremembo svojega e-poštnega naslova v - hopefully_you_2: "%{server_url} na %{new_address}." + hopefully_you: Nekdo (upamo da ste to vi) je zahteval spremembo svojega e-poštnega naslova v %{server_url} na %{new_address}. friend_notification: befriend_them: Lahko ga tudi dodate kot prijatelja na %{befriendurl}. had_added_you: "%{user} vas je dodal med prijatelje na OpenStreetMap." @@ -1109,44 +1126,36 @@ sl: lost_password_plain: click_the_link: Če ste to vi, vas prosimo, da kliknete na spodnjo povezavo za ponastavitev gesla. greeting: Pozdravljeni, - hopefully_you_1: Nekdo (upamo, da vi) je zahteval ponastavitev gesla openstreetmap.org - hopefully_you_2: uporabniškega računa s tem naslovom e-pošte. + hopefully_you: Nekdo (upamo da ste to vi) je zahteval ponastavitev gesla uporabniškega računa openstreetmap.org s tem e-poštnim naslovom. message_notification: - footer1: Sporočilo lahko preberete tudi na %{readurl} - footer2: in nanj odgovorite na naslovu %{replyurl} + footer_html: Lahko tudi preberete sporočilo na %{readurl} in lahko odgovorite na %{replyurl} header: "Uporabnik %{from_user} vam je prek OpenStreetMap poslal novo sporočilo glede %{subject}:" hi: Pozdravljeni, %{to_user}, + note_comment_notification: + anonymous: Anonimni uporabnik + closed: + commented_note: "%{commenter} je rešil/-a opombo na zemljevidu, ki ste jo vi komentirali. Opomba je v bližini %{place}." + subject_other: "[OpenStreetMap] %{commenter} je rešil/-a opombo, ki vas zanima" + subject_own: "[OpenStreetMap] %{commenter} je rešil/-a eno izmed vaših opomb" + your_note: "%{commenter} je rešil/-a eno vaših opomb na zemljevidu v bližini %{place}." + commented: + commented_note: "%{commenter} je pustil/-a komentar za opombo na zemljevidu, ki ste jo vi komentirali. Opomba je v bližini %{place}." + subject_other: "[OpenStreetMap] %{commenter} je komentiral opombo, ki vas zanima" + subject_own: "[OpenStreetMap] %{commenter} je komentiral eno izmed vaših opomb" + your_note: "%{commenter} je pustil/-a komentar za opombo na zemljevidu v bližini %{place}." + details: Več podrobnosti o opombi lahko najdete na %{url}. + greeting: Živjo, + reopened: + commented_note: "%{commenter} je zopet aktiviral/-a opombo na zemljevidu, ki ste jo vi komentirali. Opomba je v bližini %{place}." + subject_other: "[OpenStreetMap] %{commenter} je zopet aktiviral/-a opombo, ki vas zanima" + subject_own: "[OpenStreetMap] %{commenter} je zopet aktiviral/-a eno izmed vaših opomb" + your_note: "%{commenter} je zopet aktiviral/-a eno opombo na zemljevidu v bližini %{place}." signup_confirm: - subject: "[OpenStreetMap] Potrdite svoj elektronski naslov" - signup_confirm_html: - ask_questions: Vsa vprašanja, ki jih imate o OpenStreetMap lahko vprašate na naši strani vprašanja in odgovori. - click_the_link: Če ste to vi, dobrodošli! Kliknite na spodnjo povezavo za potrditev računa in več informacij o projektu OpenStreetMap. - current_user: Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski položaj je na voljo v kategoriji Category:Users_by_geographical_region. - get_reading: Preberite več o OpenStreetMap na wikiju, bodite na tekočem z najnovejšimi novicami preko bloga OpenStreetMap ali Twitterja, ali prebrskajte blog ustanovitelja OpenStreetMap Steva Coasta OpenGeoData za povzeto zgodovino projekta, ki vsebuje tudi zvočne podcaste! - greeting: Pozdravljeni! - hopefully_you: Nekdo (najverjetneje vi) bi rad naredil uporabniški račun na - introductory_video: Ogledate si lahko %{introductory_video_link}. - more_videos: Ogledate si lahko %{more_videos_link}. - more_videos_here: še več video posnetkov - user_wiki_page: Priporočljivo je, da si naredite svojo uporabniško wiki stran, ki naj vsebuje oznako kategorije, ki določa vaš položaj, npr [[Category:Users_in_Slovenia]]. - video_to_openstreetmap: uvodni video posnetek o OpenStreetMap - wiki_signup: Lahko ustvarite račun tudi na wiki projektu OpenStreetMap. - signup_confirm_plain: - ask_questions: "Vsa vprašanja, ki jih imate o OpenStreetMap lahko vprašate na naši strani vprašanja in odgovori:" - blog_and_twitter: "Spremljajte novice preko OpenStreetMap bloga ali Twitterja:" - click_the_link_1: Če ste to vi, dobrodošli! Kliknite na spodnjo povezavo za - click_the_link_2: potrditev računa in več informacij o projektu OpenStreetMap. - current_user_1: Seznam trenutnih uporabnikov po kategorijah glede na njihov geografski - current_user_2: "položaj je na voljo na naslovu:" + confirm: "Pred karkoli drugim, morate potrditi, da je ta zahteva prišla od vas. Zato kliknite na spodnjo povezavo, da potrdite svoj račun:" + created: Nekdo (upamo da ste to vi) je pravkar ustvarili račun na %{site_url}. greeting: Pozdravljeni! - hopefully_you: Nekdo (najverjetneje vi) bi rad naredil uporabniški račun na - introductory_video: "Uvodni video posnetek si lahko pogledate na naslovu:" - more_videos: "Več video posnetkov je na naslovu:" - opengeodata: "OpenGeoData.org je blog ustanovitelja OpenStreetMap Steva Coasta, ima pa tudi podcaste:" - the_wiki: "Več o projektu OpenStreetMap si preberite v wiki-ju:" - user_wiki_1: Priporočljivo je, da si naredite svojo uporabniško wiki stran, ki naj vsebuje - user_wiki_2: oznako kategorije, ki določa vaš položaj, npr [[Category:Users_in_Slovenia]]. - wiki_signup: "Lahko ustvarite račun tudi na wiki projektu OpenStreetMap na naslovu:" + subject: "[OpenStreetMap] Dobrodošli na OpenStreetMap" + welcome: Ko boste potrdili svoj račun, vam bomo za začetek nudili nekaj dodatnih informacij. oauth: oauthorize: allow_read_gpx: branje zasebnih sledi GPS. @@ -1155,8 +1164,10 @@ sl: allow_write_api: spreminjanje zemljevida. allow_write_diary: ustvarjanje dnevniških zapisov, komentarjev in dodajanje prijateljev. allow_write_gpx: nalaganje sledi GPS. + allow_write_notes: spreminjanje opomb. allow_write_prefs: spreminjanje uporabniških nastavitev. request_access: Aplikacija %{app_name} zahteva dostop do vašega računa %{user}. Prosimo, preverite, ali želite aplikaciji omogočiti naslednje zmožnosti. Izbirate lahko med poljubnim številom. + title: Dovoli dostop do vašega računa revoke: flash: Preklicali ste žeton za %{application} oauth_clients: @@ -1173,6 +1184,7 @@ sl: allow_write_api: spreminjanje zemljevida. allow_write_diary: ustvarjanje dnevniških zapisov, komentarjev in dodajanje prijateljev. allow_write_gpx: nalaganje sledi GPS. + allow_write_notes: spreminjanje opomb. allow_write_prefs: spreminjanje uporabniških nastavitev. callback_url: URL povratnih klicev name: Ime @@ -1203,6 +1215,7 @@ sl: allow_write_api: spreminjanje zemljevida. allow_write_diary: ustvarjanje dnevniških zapisov, komentarjev in dodajanje prijateljev. allow_write_gpx: nalaganje sledi GPS. + allow_write_notes: spreminjanje opomb. allow_write_prefs: spreminjanje uporabniških nastavitev. authorize_url: "URL za potrditev zahteve:" confirm: Ali ste prepričani? @@ -1211,7 +1224,7 @@ sl: key: "Uporabnikov ključ:" requests: "Zahteva dovoljenja za naslednje dostope do uporabnikovih podatkov:" secret: "Uporabnikova skrivnost:" - support_notice: Podpiramo HMAC-SHA1 (priporočeno), pa tudi kot golo besedilo v ssl načinu. + support_notice: Podpiramo HMAC-SHA1 (priporočeno) in podpise RSA-SHA1. title: Podatki OAuth za %{app_name} url: "URL zahteve žetona:" update: @@ -1252,7 +1265,8 @@ sl: site: edit: anon_edits_link_text: Pojasnilo zakaj je temu tako. - flash_player_required: Za uporabo Potlatch-a, urejevalnika OpenStreetMap potrebujete predvajalnik Flash. Lahko ga prenesete iz Adobe.com. Na voljo vam je tudi več drugih možnosti za urejanje zemljevida OpenStreetMap. + flash_player_required: Za uporabo Potlatcha, urejevalnika OpenStreetMap, potrebujete urejevalnik Flash. Prenesete ga lahko s strani Adobe.com. Na razpolago so tudi druge možnosti za urejanje zemljevidov OpenStreetMap. + id_not_configured: iD še ni bil konfiguriran no_iframe_support: Vaš brskalnik ne podpira HTML iframes, kar je potrebno za to funkcijo. not_public: Svojih prispevkov še niste označili za javne. not_public_description: Urejanje zemljevida ni mogoče dokler vaši prispevki niso javni. Označite jih lahko kot javne na %{user_page}. @@ -1261,18 +1275,15 @@ sl: 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.) user_page_link: strani vašega uporabniškega računa index: + createnote: Dodajte opombo js_1: Bodisi uporabljate brskalnik, ki ne podpira Javascript-a, ali pa je izvajanje Javascript-a onemogočeno. js_2: OpenStreetMap za prikaz zemljevida uporablja Javascript. license: - license_name: Creative Commons Priznanje avtorstva-Deljenje pod enakimi pogoji 2.0 - notice: "%{project_name} z avtorji objavlja pod licenco %{license_name}." - project_name: Projekt OpenStreetMap + copyright: Avtorske pravice OpenStreetMap in sodelavci, pod odprto licenco permalink: Trajna povezava remote_failed: Urejanje ni uspelo - poskrbite da je JOSM ali Merkaartor naložen in je možnost daljinskega upravljanja omogočena shortlink: Kratka povezava key: - map_key: Legenda - map_key_tooltip: Legenda zemljevida table: entry: admin: Upravna razmejitev @@ -1358,7 +1369,6 @@ sl: preview: Predogled search: search: Iskanje - search_help: "primeri: 'Bovec', 'Prešernova, Celje', 'Živalski vrt' ali 'vzpenjača' Več primerov..." submit_text: Išči where_am_i: Kje sem? where_am_i_title: Opišite trenutno lokacijo z uporabo iskalnika @@ -1374,6 +1384,11 @@ sl: upload_trace: Naloži sled GPS delete: scheduled_for_deletion: Sled bo izbrisana + description: + description_with_count: + one: Datoteka GPX z %{count} točko uporabnika %{user} + other: Datoteka GPX z %{count} točkami uporabnika %{user} + description_without_count: Datoteka GPX uporabnika %{user} edit: description: "Opis:" download: prenos @@ -1391,7 +1406,11 @@ sl: uploaded_at: "Poslano na strežnik:" visibility: "Vidljivost:" visibility_help: kaj to pomeni? + georss: + title: OpenStreetMap-sledi GPS list: + description: Prebrskaj nedavno poslane sledi GPS + empty_html: Prazno. Naložite novo sled oziroma izvedete več o GPS sledeh na wiki strani. public_traces: Javne sledi GPS public_traces_from: Javne sledi GPS uporabnika %{user} tagged_with: " z oznako %{tags}" @@ -1399,10 +1418,10 @@ sl: make_public: made_public: Sled je postala javna offline: - heading: GPX sistem trenutno ni na voljo - message: Sistem za nalaganje GPX datotek in GPX sistem trenutno nista na voljo + heading: GPX-sistem trenutno ni dostopen. + message: Sistem za nalaganje GPX-datotek in GPX-sistem trenutno nista na razpolago. offline_warning: - message: Sistem za nalaganje GPX datotek trenutno ni na voljo + message: Sistem za nalaganje GPX-datotek trenutno ni na razpolago. trace: ago: "%{time_in_words_ago} nazaj" by: Uporabnik @@ -1431,14 +1450,16 @@ sl: trace_header: see_all_traces: Seznam vseh sledi see_your_traces: Seznam vseh mojih sledi - traces_waiting: Imate %{count} sledi v vrsti za obdelavo. Prosimo, počakajte, da se te poti obdelajo pred nadaljnjim nalaganjem, tako da lahko storitev uporabljajo tudi drugi uporabniki. + traces_waiting: + one: V vrsti za obdelavo imate %{count} sled. Prosimo, počakajte, da se obdelajo pred nadaljnjim nalaganjem, tako da lahko storitev uporabljajo tudi drugi uporabniki. + other: V vrsti za obdelavo imate %{count} sledi. Prosimo, počakajte, da se obdelajo pred nadaljnjim nalaganjem, tako da lahko storitev uporabljajo tudi drugi uporabniki. upload_trace: Naloži sled GPS trace_optionals: tags: Oznake trace_paging_nav: - next: Naslednja » - previous: « Prejšnja - showing_page: Prikazujem stran %{page} + newer: Novejše sledi + older: Starejše sledi + showing_page: Stran %{page} view: delete_track: Izbriši to sled description: "Opis:" @@ -1477,6 +1498,9 @@ sl: email never displayed publicly: (nikoli javno objavljen) flash update success: Podatki o uporabniku so bili uspešno posodobljeni. flash update success confirm needed: Podatki o uporabniku so bili uspešno posodobljeni. Preverite svojo e-pošto in potrdite spremembo e-poštnega naslova. + gravatar: + gravatar: Uporabi Gravatar + link text: Kaj je to? home location: "Domača lokacija:" image: "Slika:" image size hint: (Najbolje delujejo kvadratne slike vsaj 100x100 točk) @@ -1504,7 +1528,7 @@ sl: heading: "Javno urejanje:" public editing note: heading: Javno urejanje - text: Trenutno so vaše spremembe anonimne in ljudje vam ne morejo poslali sporočil oz. videti vašo lokacijo. Da pokažet kaj ste je uredili in ljudem omogočite, da se obrnejo na var preko spletne strani, kliknite na gumb spodaj. Od prehoda na API 0.6, lahko le javni uporabniki urejate karto. ( Ugotovi zakaj ).
    • Vaš e-naslov ne bo pokazana s tem, da postane javni.
    • Tega dejanja ni mogoče razveljaviti in vsi novi uporabniki, so sedaj privzeto javni.
    + text: Trenutno so vaše spremembe anonimne in ljudje vam ne morejo poslali sporočil oz. videti vaše lokacije. Da prikažete, kaj ste urejali in ljudem omogočite, da vas kontaktirajo prek spletne strani, kliknite spodnji gumb. Od prehoda na API 0.6 lahko karto urejajo le javni uporabniki. ( Ugotovite, zakaj).
    • Vaš e-naslov se ob tem, ko boste postali javen uporabnik, ne bo razkril.
    • Dejanja ni mogoče razveljaviti in vsi novi uporabniki so zdaj javni po privzetem.
    replace image: Zamenjaj trenutno sliko return to profile: Nazaj na profil save changes button: Shrani spremembe @@ -1512,13 +1536,13 @@ sl: update home location on click: Posodobi domačo lokacijo ob kliku na zemljevid? confirm: already active: Ta račun je že bil potrjen. - before you start: Vemo, da se vam verjetno mudi začeti kartiranje, vendar bi morda želeli prej izpolniti dodatne informacije o sebi v spodnji obrazec. button: Potrdi - heading: Potrdite uporabniški račun + heading: Preverite vaš e-poštni naslov! + introduction_1: Poslali smo vam potrditveno e-pošto. + introduction_2: Potrdite svoj račun s klikom na povezavo v e-pošti in takoj boste lahko začeli kartiranti. press confirm button: Za aktivacijo vašega uporabniškega računa pritisnite na gumb Potrdi spodaj. - reconfirm: Če je minilo že nekaj časa, odkar ste se prijavili, si boste morda morali poslati novo sporočilo o potrditvi. - success: Vaš uporabniški račun je potrjen. Hvala, da ste se vpisali! - unknown token: Ta žeton izgleda ne obstaja. + reconfirm_html: Če hočete da vam znova pošljemo potrditveno e-pošto, kliknite tukaj. + unknown token: Ta potrditvena koda je potekla ali ne obstaja. confirm_email: button: Potrdi failure: Naslov elektronske pošte je že bil potrjen s tem žetonom. @@ -1531,7 +1555,7 @@ sl: filter: not_an_administrator: Morate biti administrator za izvedbo tega dejanja. go_public: - flash success: Vsi vaši prispevki so sedaj javni in sedaj imate pravico do urejanja. + flash success: Zdaj so vsi vaši prispevki javni in lahko urejate podatke. list: confirm: Potrdi izbrane uporabnike empty: Ne najdem nobenega uporabnika @@ -1554,8 +1578,6 @@ sl: lost password link: Ste pozabili geslo? new to osm: Ste novi na OpenStreetMap? no account: Še nimate uporabniškega računa? - notice: Preberite več o prihajajoči spremembi licence na OpenStreetMap (prevodi) (razprava) - notice_terms: OpenStreetMap prehaja na novo licenciranje dne 1. April 2012. Ta licenca je enako odprta kot sedanja, a pravni del je bolj prilagojen naši bazi. Radi bi obdržali vaše prispevke v OpenStreetMap, vendar lahko to storimo le, če se strinjate, da jih delimo po pogojih nove licence. Sicer jih bomo morali izbrisati iz baze.

    Prosimo prijavite se in si vzamite nekaj sekund, da pregledate in sprejmete nove pogoje. Hvala! openid: "%{logo} OpenID:" openid invalid: Oprostite, vaš OpenID ni pravilen openid missing provider: Žal se ni bilo mogoče obrniti na ponudnika OpenID @@ -1600,19 +1622,21 @@ sl: title: pozabljeno geslo make_friend: already_a_friend: Z uporabnikom %{name} ste že prijatelja. + button: Dodaj prijatelja failed: Oprostite, uporabnika %{name} ni bilo mogoče dodati med prijatelje. - success: Uporabnik %{name} je sedaj vaš prijatelj. + heading: Dodaj %{user} med prijatelje? + success: "%{name} je sedaj vaš prijatelj!" new: + about: + header: Brezplačen, ki ga je mogoče urejati + html: "

    Za razliko od drugih zemljevidov je OpenStreetMap popolnoma ustvarjen od ljudi kot si ti in ga lahko vsakdo popravit, nadgradi, prenese ter brezplačno uporablja.

    \n

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

    " confirm email address: "Potrdite naslov e-pošte:" confirm password: "Potrdite geslo:" contact_webmaster: Prosimo, pišite webmastru (v angleščini) in se dogovorite za ustvarjenje uporabniškega računa - potrudili se bomo za čimprejšnjo obravnavo vašega zahtevka. - continue: Nadaljuj + continue: Prijavite se display name: "Prikazno ime:" display name description: Javno prikazano uporabniško ime. To lahko spremenite kasneje v nastavitvah. email address: "E-poštni naslov:" - fill_form: Izpolnite obrazec in poslali vam bomo elektronsko sporočilce s katerim boste aktivirali svoj uporabniški račun. - flash create success message: Hvala, ker ste se registrirali. Poslali smo potrditveno sporočilo na %{email} in takoj, ko boste potrdili vaš račun, boste lahko začeli kartirati.

    V kolikor vaš filter neželene pošte pred sprejemom sporočil neznanih pošiljateljev zahteva potrditev, vas prosimo, da pošiljatelja webmaster@openstreetmap.org uvrstite na seznam dovoljenih pošiljateljev. Sistem pač ne zmore dovolj inteligentno odgovarjati na vse take zahtevke. - heading: Ustvarite si uporabniški račun license_agreement: Ko boste potrdili svoj račun, se boste morali strinjati s pogoji sodelovanja. no_auto_account_create: Na žalost vam trenutno ne moremo samodejno ustvariti uporabniškega računa. not displayed publicly: Ne bo javno objavljeno (glej politiko zasebnosti) @@ -1622,7 +1646,7 @@ sl: password: "Geslo:" terms accepted: Hvala za sprejem novih pogojev prispevanja! terms declined: Žal nam je, da ste se odločili, da ne sprejmete novih "contributor terms". Za več informacij, si oglejte to wiki stran. - title: Nov uporabniški račun + title: Prijavite se use openid: Lahko pa uporabite %{logo} OpenID za prijavo no_such_user: body: Oprostite, uporabnika z imenom %{user} ni. Prosimo, preverite črkovanje in povezavo, ki ste jo kliknili. @@ -1633,6 +1657,8 @@ sl: nearby mapper: Bližnji kartograf your location: Vaša lokacija remove_friend: + button: Odstrani prijatelja + heading: Odstrani %{user} iz prijateljev? not_a_friend: Uporabnika %{name} ni med vašimi prijatelji. success: Uporabnika %{name} ste odstranili izmed svojih prijateljev. reset_password: @@ -1667,12 +1693,12 @@ sl: you need to accept or decline: Prosimo preberite in nato sprejmite ali zavrnite nove "Contributor Terms". view: activate_user: aktiviraj uporabnika - add as friend: dodaj med prijatelje + add as friend: Dodaj med prijatelje ago: (%{time_in_words_ago}) - block_history: poglej prejete blokade - blocks by me: moje blokade - blocks on me: blokade mene - comments: komentarji + block_history: prejete blokade + blocks by me: Moje blokade + blocks on me: Blokade mene + comments: Pripombe confirm: Potrdi confirm_user: potrdi uporabnika create_block: blokiraj uporabnika @@ -1684,31 +1710,34 @@ sl: deactivate_user: dezaktiviraj uporabnika delete_user: izbriši uporabnika description: Opis - diary: dnevnik - edits: prispevki + diary: Dnevnik + edits: Prispevki email address: "E-poštni naslov:" - friends_changesets: Brskanje po paketih sprememb vaših prijateljev - friends_diaries: Brskanje po dnevnikih vaših prijateljev + friends_changesets: paketi sprememb prijateljev + friends_diaries: dnevniki prijateljev hide_user: skriti tega uporabnika - if set location: Če nastavite vašo domačo lokacijo bo tu prikazan lep zemljevd in podobne dobrote. Domačo lokacijo lahko nastavite v %{settings_link}. + if set location: Nastavite vašo domačo lokacijo na strani %{settings_link}, da vidite bližnje uporabnike. km away: oddaljen %{count} km latest edit: "Zadnje urejanje %{ago}:" m away: oddaljen %{count} m mapper since: "Kartograf od:" - moderator_history: poglej dane blokade - my comments: moji komentarji - my diary: moj dnevnik - my edits: moji prispevki - my settings: moje nastavitve - my traces: moje sledi + moderator_history: dane blokade + my comments: Moje pripombe + my diary: Moj dnevnik + my edits: Moji prispevki + my notes: Moje beležke + my profile: Moj profil + my settings: Moje nastavitve + my traces: Moje sledi nearby users: Drugi bližnji uporabniki - nearby_changesets: Brskanje po paketih sprememb bližnjih uporabnikov - nearby_diaries: Brskanje po dnevnikih bližnjih uporabnikov + nearby_changesets: paketi sprememb bližnjih uporabnikov + nearby_diaries: dnevniški vnosi bližnjih uporabnikov new diary entry: nov vnos v dnevnik no friends: Niste še dodali nobenih prijateljev. no nearby users: Ni še drugih uporabnikov, ki bi priznali, da kartirajo v vaši bližini. + notes: Beležke na zemljevidu oauth settings: OAuth nastavitve - remove as friend: odstrani prijatelja + remove as friend: Odstrani prijatelja role: administrator: Ta uporabnik je administrator grant: @@ -1718,11 +1747,11 @@ sl: revoke: administrator: Odvzemi administratorski dostop moderator: Odvzemi moderatorski dostop - send message: pošlji sporočilo + send message: Pošlji sporočilo settings_link_text: vaših nastavitvah spam score: "Rezultat spama:" status: "Stanje:" - traces: sledi + traces: Sledi unhide_user: prikaži uporabnika user location: Lokacija uporabnika your friends: Vaši prijatelji @@ -1780,11 +1809,14 @@ sl: creator_name: Ustvarjalec display_name: Blokiran uporabnik edit: Uredi + next: Naslednja » not_revoked: (ni preklicana) + previous: « Prejšnja reason: "Razlog za blokado:" revoke: Prekliči! revoker_name: Preklical show: Prikaži + showing_page: Stran %{page} status: Stanje period: few: "%{count} ure" @@ -1834,3 +1866,25 @@ sl: fail: Ne morem preklicati vlogo '%{role}' uporabniku '%{name}'. Prosimo preverite, če sta uporabnik in vloga pravilna. heading: Potrdi preklic vloge title: Potrdi preklic vloge + welcome_page: + add_a_note: + paragraph_1_html: Če si želite popraviti kakšno majhno napako in nimate časa za prijavo oziroma za spoznati kaj več o urejanju, lahko enostavneje le dodati opombo. + paragraph_2_html: "Samo pojdite na zemljevid in kliknite ikono opombe: . Tako boste na zemljevid dodali oznako, ki jo lahko premaknete z vlečenjem. Dodajte vašo opombo in nato kliknite Shrani. Drugi kartografi bodo to preiskali." + title: Nimate časa za urejanje? Dodajte opombo! + basic_terms: + editor_html: Urejevalnik je program ali spletna stran, ki jo lahko uporabite za urejanje zemljevida. + node_html: Vozlišče je točka na zemljevidu, kot npr. restavracija ali drevo. + paragraph_1_html: OpenStreetMap ima tudi svoj žargon. Tukaj je nekaj ključnih besed, ki vam bodo prišle prav. + tag_html: Oznaka je podatek o vozlišču ali poti, kot je npr. ime restavracija ali omejitev hitrosti na cesti. + title: Osnovni pogoji za kartiranje + way_html: Pot je črta ali področje, kot je npr. cesta, potok, jezero ali stavba. + introduction_html: Dobrodošli na OpenStreetMap, brezplačni zemljevid sveta, ki ga je mogoče tudi urejati. Zdaj, ko ste vpisani, ste pripravljeni za začetek kartiranja. Tu dobite hitri vodnik z najbolj pomembnimi stvarmi, ki jih morate vedeti. + questions: + paragraph_1_html: "OpenStreetMap ima več virov za učenje o projektu, zastavljanje in odgovarjanje na vprašanja, sodelovalno razpravljanje in dokumentiranje tem o kartiranju.\nPoiščite pomoč tukaj." + title: Imate kakšno vprašanja? + start_mapping: Začnite kartirati + title: Dobrodošli! + whats_on_the_map: + off_html: To, kar ne vključuje mnenjskih podatkov kot so ocene, zgodovinske ali hipotetične značilnosti in podatke iz avtorsko zaščitenih virov. Razen če nimate posebnega dovoljenja, ne kopirajte iz spletnih ali tiskanih zemljevidov. + on_html: OpenStreetMap je kraj za kartiranje stvari, ki so bodisi resnične kot trenutne - vključuje milijone stavb, cest in druge podatke o krajih. Lahko kartirate katerikoli resnično značilnost, ki je za vas zanimiva. + title: Kaj je na zemljevidu diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 26a4c0fea77..7fb717093ce 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -5,8 +5,10 @@ # Author: Mdupont # Author: MicroBoy # Author: Mikullovci11 +# Author: Nemo bis # Author: Techlik # Author: Vinie007 +# Author: 아라 sq: activerecord: attributes: @@ -78,90 +80,15 @@ sq: way_tag: Etiketa e rrugës browse: changeset: - changeset: "Ndryshim : %{id}" changesetxml: Ndryshim en XML - download: Shkarkone %{changeset_xml_link} ose %{osmchange_xml_link} feed: title: Ndryshim %{id} title_comment: Ndryshimi %{id} - %{comment} osmchangexml: Ndrsyhim i OSM-s en XML title: Ndryshim - changeset_details: - belongs_to: "I perket:" - bounding_box: "Baroka e Rrethume:" - box: barok - closed_at: "Mbyllur në:" - created_at: "U krijue en:" - has_nodes: - other: one= - has_relations: - one: "Ka pas %{count} lidhje:" - other: "Ka pas marrëdhënieve %{count} :" - has_ways: - other: one= - no_bounding_box: Nuk ka barok qe osht kon vnu n'kto ndrryshime. - show_area_box: Kqyre Zonen e Barokes - common_details: - changeset_comment: "Komenti :" - deleted_at: "Fshirë në:" - deleted_by: "Fshirë në:" - edited_at: "U ndrzshe te:" - edited_by: "Edituar nga:" - in_changeset: "En ndryshimin :" - version: "Versioni:" containing_relation: entry: Lidhja %{relation_name} entry_role: Lidhja %{relation_name} (sikur %{relation_role}) - map: - deleted: E Fshirë - edit: - area: Zona e redaktimit - node: Nyja e redaktimit - relation: Lidhja e redaktimit - way: Ndrysho rrugën - larger: - area: Kqyre zonen n'hart ma t'madhe - node: Kqyre piken n'hart ma t'madhe - relation: Kqyre lidhjen n'hart ma t'madhe - way: Kqyre udhen n'hart ma t'madhe - loading: Tu u mush... - navigation: - all: - next_changeset_tooltip: Tjerat ndryshime - next_node_tooltip: Pika tjetēr - next_relation_tooltip: Lidhja e ardhshme - next_way_tooltip: Rruga tjeter - prev_changeset_tooltip: Ndryshimi kalum - prev_node_tooltip: Pika e kalume - prev_relation_tooltip: Lidhja e kalume - prev_way_tooltip: Mnyra e mahershme - paging: - all: - next: "%{id} »" - prev: « %{id} - user: - next: "%{id} »" - prev: « %{id} - user: - name_changeset_tooltip: Shiko editimet nga %{user} - next_changeset_tooltip: Tjetri ndryshim prej %{user} - prev_changeset_tooltip: Ndryshimi i ma hershēm prej %{user} - node: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" - download_xml: Shkarko në XML - edit: Ndrysho - node: Pikë - node_title: "Pika: %{node_name}" - view_history: Shikoje historinë - node_details: - coordinates: "Koordinatat:" - part_of: "Pjesë e:" - node_history: - download: "%{download_xml_link} ose %{view_details_link}" - download_xml: Shkarkoni XML - node_history: Historija e Pikes - node_history_title: "Historija e Pikes: %{node_name}" - view_details: shikoni detajet not_found: sorry: Na fal, %{type} me %{id}, nuk mujtem mi gjet type: @@ -169,24 +96,13 @@ sq: node: pikë relation: lidhje way: udhë - paging_nav: - of: pi - showing_page: Tu e kallxu faqen - relation: - download: "%{download_xml_link} ose %{view_history_link}" - download_xml: Shkarkoje XML - relation: Lidhja - relation_title: "Lidhja: %{relation_name}" - view_history: Kshyre historinë - relation_details: - members: "Anëtarët:" - part_of: "Pjesë e:" - relation_history: - download: "%{download_xml_link} ose %{view_details_link}" - download_xml: Merre me XML - relation_history: Historija e Lidhjes - relation_history_title: "Historija e Lidhjes: %{relation_name}" - view_details: kqyre n'detaje + redacted: + message_html: Versioni %{version} i këtij/kësaj %{type} nuk mund të shfaqet pasi është redaktuar. Ju lutem shiko %{redaction_link} për detaje. + redaction: Redaktim %{id} + type: + node: nyjë + relation: lidhje + way: rrugë relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} asht si %{role}" @@ -194,43 +110,9 @@ sq: node: Pikë relation: Lidhje way: Udhë - start: - manually_select: Manualisht zgedh ni zon qeter - view_data: Shini te dhanat per harten e tanishme start_rjs: - data_frame_title: Senet - data_layer_name: Senet - details: Detajet - drag_a_box: Bone ni kuti n'hart edhe zgedhe zonen - edited_by_user_at_timestamp: Ndryshuar nga [[user]] në [[timestamp]] - hide_areas: Fshih zonat - history_for_feature: Historija për [[feature]] load_data: Zgedhi senet - loaded_an_area_with_num_features: "Ti e ke marr ni zon qe ka [[num_features]] . E do browsera nuk e qesin fort mir kualitetin e seneve me ta. Browseri duhet me i kallxu ma pak se 100 sene n'tnjejtin vakt: me bo dishka qeter munet me ta kadalsu browserin. Qe je i sigurt nese don mi pa senet, duhesh me kliku n'pull." loading: Tu u mush... - manually_select: Zgedhe ni zon qeter vet - object_list: - api: Merre qet zon prej API - back: Kqyre listen e seneve - details: Detajet - heading: Lista e seneve - history: - type: - node: Pika [[id]] - way: Rruga [[id]] - selected: - type: - node: Pika [[id]] - way: Rruga [[id]] - type: - node: Pikë - way: Rruga - private_user: perdorus privat - show_areas: Shfaq zonat - show_history: Shfaq Historinë - unable_to_load_size: "Nuk kemi mujt mi shfaq: madhsin e kutis [[bbox_size]] asht shum e madhe (duhet me kan ma e vogel se %{max_bbox_size})" - wait: Prit... - zoom_or_select: Afrohu ose zgedhe zonen n'hart qe pe don me e pa. tag_details: tags: "Etiketat:" wiki_link: @@ -244,34 +126,10 @@ sq: node: pikë relation: lidhje way: rrugë - way: - download: "%{download_xml_link}, %{view_history_link} ose %{edit_link}" - download_xml: Shkarko XML - edit: ndrro - view_history: shiko historin - way: Udhë - way_title: "Rruga: %{way_name}" - way_details: - also_part_of: - one: edhe kjo asht pjes e Udhës %{related_ways} - other: edhe kjo asht pjes e Udheve %{related_ways} - nodes: "Pikat:" - part_of: "Pjesë e:" - way_history: - download: "%{download_xml_link} ose %{view_details_link}" - download_xml: Merre me XML - view_details: kqyre n'detaje - way_history: Historija e Udhës - way_history_title: "Historija e udhës: %{way_name}" changeset: changeset: anonymous: Anonim - big_area: (e madhe) - id: "#%{id}" - no_comment: (asgjë) no_edits: (asnjë redaktim) - show_area_box: Shfaq kutinë e zonës - still_editing: (redaktimi po vazhdon ende) view_changeset_details: Shiko detajet e grupit të ndryshimeve changeset_paging_nav: next: Vazhdo » @@ -284,24 +142,10 @@ sq: saved_at: Ruaje në user: Përdoruesi list: - description: Ndryshime së fundmi - description_bbox: Ndryshime brënda %{bbox} - description_friend: Ndryshime nga miqtë e tu - description_nearby: Ndryshime nga përdorues të zonës - description_user: Grupi i ndryshimeve të %{user} - description_user_bbox: Ndryshime nga përdoruesi %{user} brënda %{bbox} - heading: Grupi i ndryshimeve - heading_bbox: Grupi i ndryshimeve - heading_friend: Grupi i ndryshimeve - heading_nearby: Grupi i ndryshimeve - heading_user: Grupi i ndryshimeve - heading_user_bbox: Grupi i ndryshimeve title: Grupi i ndryshimeve - title_bbox: Ndryshime brënda %{bbox} title_friend: Ndryshime nga miqtë e tu title_nearby: Ndryshime nga përdorues të zonës title_user: Grupi i ndryshimeve të %{user} - title_user_bbox: Ndryshime nga përdoruesi %{user} brënda %{bbox} timeout: sorry: Na vjen keq, lista e grupit të ndryshimeve që u kërkua morri shumë kohë për tu shkarkuar. diary_entry: @@ -382,16 +226,7 @@ sq: scale: Shkallë too_large: body: Kjo zonë është shum e madhe që të eksportohet si XML në OpenStreetMap. Të lutna afroje ma ngat ose mere një zonë ma të vogel. - heading: Zona shumë e madhe zoom: Zmadhim - start_rjs: - add_marker: Shto ni isharet ne hart - change_marker: Ndrysho poziten e isharetit - click_add_marker: Kliko ne hart per me shenu ni isharet. - drag_a_box: Kape ni kuti ne hart per me qit te zona e selektune - export: Eksporto - manually_select: Manualisht zgedhe ni zon t'ndryshme - view_larger_map: Shikoni Hartën Më Të Madhe geocoder: description: title: @@ -413,8 +248,6 @@ sq: ca_postcode: Rezultatet nga Geocoder.CA geonames: Rezultate nga GeoNames us_postcode: Rezultatet nga Geocoder.us - search_osm_namefinder: - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: amenity: @@ -555,34 +388,42 @@ sq: map: base: mapquest: MapQuest Open - overlays: - maplint: Maplint site: edit_tooltip: Edit Harta layouts: edit: Redakto - help_url: http://help.openstreetmap.org/ - license: - alt: CC by-sa 2.0 log_in: Kyçuni log_in_tooltip: Hyni ne me një llogari ekzistuese logout: Ç'kyçu - logout_tooltip: Ç'kyçu make_a_donation: text: Bëni një donacion project_name: h1: OpenStreetMap title: OpenStreetMap - wiki_url: http://wiki.openstreetmap.org/ license_page: foreign: english_link: orgjianl anglisht text: Në ni ngjarje të ni konflitkti me faqe e përktyme dhe %{english_original_link}, Faqja anglisht ka perparsi title: Rreth këtij përkthimi - legal_babble: "

    Të drejtat autoriale dhe licenca

    \n

    \n OpenStreetMap është me kod të hapur, dhe e licencuar nën Creative\n Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \n Ju jeni të lirë të kopjoni, shpërndani, transmetoni dhe adoptoni hartat\n dhe të dhënat tona, duke pasur parasysh citimin e OpenStreetMap dhe \n kontribuuesve të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\n mund të shpërndani rezultatet nën licencën e njëjtë. Licenca e\n e plotë legal\n code shpjegon të drejtat dhe përgjegjësitë tuaja.\n

    \n\n

    Si të citoni OpenStreetMap

    \n

    \n Nëse ju përdorni imazhe të hartave të OpenStreetMap, ne kërkojmë që \n së paku citimet tuaja të përfshijnë “© OpenStreetMap\n kontribuuesit, CC BY-SA”. Nëse ju përdorni vetëm të dhëna të hartave\n ne kërkojmë citimin e kontribuuesve “të të dhënave të hartave © të OpenStreetMap,\n CC BY-SA”.\n

    \n

    \n Ku është e mundur, OpenStreetMap duhet të hyperlinked to http://www.openstreetmap.org/\n dhe CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n www.openstreetmap.org (ndoshta duke shpjeguar \n ‘OpenStreetMap’ këtë adresë të plotë) dhe tek \n www.creativecommons.org.\n

    \n\n

    Të kuptoni më shumë

    \n

    \n Lexoni më shumë rreth përdorimit të të dhënave Legal\n FAQ.\n

    \n

    \n OSM kontribuuesit duhet të mos përdorin asnjë të dhënë prej burimeve të çfarëdoshme\n të mbrojtura me të drejta të kopjimit (p.sh. Google Maps apo harta të printuara) pa\n leje speciale prej pronarëve të të drejtave të kopjimit.\n

    \n

    \n Edhe pse OpenStreetMap është me të kod të hapur, ne nuk mund të ofrojmë \n një hartë API pa pagesë për zhvillues të palëve të treta.\n\n Shikoni API Politika e Përdorimit,\n Politika e përdorimit të pllakave\n dhe Poltika e përfitimit të Normave .\n

    \n\n

    Kontribuuesit tanë

    \n

    \n Licenca jonë CC BY-SA kërkon nga ju që “të vlerësoni Autorin\n Origjinal përkatës të mediumit apo masave që jeni duke i\n shfrytëzuar ”. Hartuesit individual të OSM nuk kërkojnë një\n citim mbi dhe për atë që kontribuojnë për “OpenStreetMap\n ”, por kur përfshihen në OSM, hartat nga një agjencion nacional i hartave \n apo faktor tjerë madhor burimor, është e arsyeshme të citohen drejtpërsëdrejti \n duke paraqitur emrin apo duke lidhur faqen e tyre me link.\n

    \n\n\n\n
      \n
    • Australia: Përmban të dhëna periferike të bazuara në të dhënat e Zyrës Australiane të Statistikave.
    • \n
    • Canada: Përmban të dhëna nga\n GeoBase®, GeoGratis (© Departamenti i Resurseve Natyrale\n në Kanada), CanVec (© Departamenti i Resurseve Natyrale\n në Kanada), and StatCan (Divizioni Gjeografik,\n Statistik në Kanada ).
    • \n
    • New Zealand: Përmban të dhëna nga burimet e Informatave të tokave\n në Zelandë të re. Të drejtat e rezervuara i mbanë Crown.
    • \n
    • Poland: Përmban të dhëna nga UMP-pcPL maps. Copyright\n UMP-pcPL contributors.
    • \n
    • Britani e Madhe: Përmban të dhëna nga Ordnance\n Survey©. Crown i ka të drejtat autoriale dhe të databazës.
    • \n
    \n\n

    \n Përfshirja e të dhënave në OpenStreetMap nuk thekson se të ofruesi origjinal i të \n dhënave përdor OpenStreetMap, ofron garancion, apo\n pranon çfarëdo anekse.\n

    " + legal_babble: + contributors_ca_html: "Canada: Përmban të dhëna nga\n GeoBase®, GeoGratis (© Departamenti i Resurseve Natyrale\n në Kanada), CanVec (© Departamenti i Resurseve Natyrale\n në Kanada), and StatCan (Divizioni Gjeografik,\n Statistik në Kanada )." + contributors_footer_2_html: " Përfshirja e të dhënave në OpenStreetMap nuk thekson se të ofruesi origjinal i të \n dhënave përdor OpenStreetMap, ofron garancion, apo\n pranon çfarëdo anekse." + contributors_gb_html: "Britani e Madhe: Përmban të dhëna nga Ordnance\n Survey©. Crown i ka të drejtat autoriale dhe të databazës." + contributors_intro_html: " Licenca jonë CC BY-SA kërkon nga ju që “të vlerësoni Autorin\n Origjinal përkatës të mediumit apo masave që jeni duke i\n shfrytëzuar ”. Hartuesit individual të OSM nuk kërkojnë një\n citim mbi dhe për atë që kontribuojnë për “OpenStreetMap\n ”, por kur përfshihen në OSM, hartat nga një agjencion nacional i hartave \n apo faktor tjerë madhor burimor, është e arsyeshme të citohen drejtpërsëdrejti \n duke paraqitur emrin apo duke lidhur faqen e tyre me link." + contributors_nz_html: "New Zealand: Përmban të dhëna nga burimet e Informatave të tokave\n në Zelandë të re. Të drejtat e rezervuara i mbanë Crown." + contributors_title_html: Kontribuuesit tanë + credit_1_html: " Nëse ju përdorni imazhe të hartave të OpenStreetMap, ne kërkojmë që \n së paku citimet tuaja të përfshijnë “© OpenStreetMap\n kontribuuesit, CC BY-SA”. Nëse ju përdorni vetëm të dhëna të hartave\n ne kërkojmë citimin e kontribuuesve “të të dhënave të hartave © të OpenStreetMap,\n CC BY-SA”." + credit_2_html: " Ku është e mundur, OpenStreetMap duhet të hyperlinked to http://www.openstreetmap.org/\n dhe CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. Nëse jeni duke përdorur një medium ku nuk mund të bëhen linka (p.sh. a\n letër e shtypur), ne sugjerojmë që ju të drejtoni lexuesit tek\n www.openstreetmap.org (ndoshta duke shpjeguar \n ‘OpenStreetMap’ këtë adresë të plotë) dhe tek \n www.creativecommons.org." + credit_title_html: Si të citoni OpenStreetMap + intro_1_html: "OpenStreetMap is open data, licensed under the Open Data\nCommons Open Database License (ODbL)." + intro_2_html: " Ju jeni të lirë të kopjoni, shpërndani, transmetoni dhe adoptoni hartat\n dhe të dhënat tona, duke pasur parasysh citimin e OpenStreetMap dhe \n kontribuuesve të saj. Nëse ndryshoni apo ndërtoni mbi hartat apo të dhënat tona, ju\n mund të shpërndani rezultatet nën licencën e njëjtë. Licenca e\n e plotë legal\n code shpjegon të drejtat dhe përgjegjësitë tuaja." + more_1_html: " Lexoni më shumë rreth përdorimit të të dhënave Legal\n FAQ." + more_2_html: " OSM kontribuuesit duhet të mos përdorin asnjë të dhënë prej burimeve të çfarëdoshme\n të mbrojtura me të drejta të kopjimit (p.sh. Google Maps apo harta të printuara) pa\n leje speciale prej pronarëve të të drejtave të kopjimit." + more_title_html: Të kuptoni më shumë + title_html: Të drejtat autoriale dhe licenca native: mapping_link: Fillo hatrografimin - native_link: THIS_LANGUAGE_NAME_HERE verzion + native_link: shqip verzion text: Ju po shikoni versionin në gjuhën angelze të faqes së të drejtave autoriale. Ju mund të shkoni prapa tek %{native_link} të kësaj faqe apo mund të ndaleni së lexuari rreth të drejtave autoriale dhe %{mapping_link}. title: Rreth ksaj faqeje message: @@ -592,8 +433,6 @@ sq: new: limit_exceeded: Ju keni dërguar shumë mesazhe kohët e fundit. Ju lutem prisni një kohë para se të dërgoni ndonjë tjetër. title: Qo mesazh - read: - reading_your_sent_messages: Tu i lexue mesazhet e dërgume sent_message_summary: delete_button: Fshij notifier: @@ -609,23 +448,8 @@ sq: import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures greeting: Tung, message_notification: - footer1: Ju gjithashtu mund të lexoni mesazhet në %{readurl} hi: Tung %{to_user}, subject_header: "[OpenStreetMap] %{subject}" - signup_confirm_html: - click_the_link: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu atë llogari dhe lexoni ma shumë informata rreth OpenStreetMap - introductory_video: Ju muni me shiku një %{introductory_video_link}. - more_videos_here: më shumë video këtu - wiki_signup: Ju mund të dëshironi të regjistroheni në OpenStreetMap wiki. - signup_confirm_plain: - blog_and_twitter: "Njoftohu me lajmet ma të fundit nëpërmjet blogut të OpenStreetMap ose Twitter-it:" - click_the_link_1: Nëse ky je ti, mirë se erdhët! Ju lutem trusni lidhjen e maposhtme për me konfirmu - click_the_link_2: llogarin tonde dhe lexo ma shumë informata për OpenStreetMap. - introductory_video: "Këtu ju muni me shiku një video hyrëse për në OpenStreetMap:" - more_videos: "Ma shumë video keni këtu:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide - wiki_signup: "Ti munesh gjithashtu me u regjistru në OpenStreetMap wiki:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page oauth_clients: form: name: Emri @@ -637,9 +461,6 @@ sq: edit: anon_edits: (%{link}) flash_player_required: Ju duhet të keni Flash player për ta përdorur Potlatch, Flash editorin e OpenStreetMap. Ju mundeni ta shkarkoni Flash Player nga Adobe.com. Disa mënyra të tjera janë të mundshme për ta edituar OpenStreetMap. - index: - license: - project_name: Projekti OpenStreetMap key: table: entry: @@ -724,8 +545,6 @@ sq: trace_optionals: tags: Etiketa trace_paging_nav: - next: Vazhdo » - previous: « Paraprake showing_page: Duke shfaqun faqen %{page} view: delete_track: Fshij ket gjurm @@ -796,12 +615,9 @@ sq: update home location on click: Ndryshoma venin kur te klikoj ne hart? confirm: already active: Kjo llogari tashmë është konfirmuar. - before you start: Ne e dimë që ju mezi po prisni të filloni punën me harta, por para se të veproni kështu, mund të plotësoni disa informata më shumë rreth vetes suaj në formën e mëposhtme. button: Konfirmo heading: Konfirmo nje akount te shfrytezuesit press confirm button: Shtypni butonin e mëposhtëm për të aktivizuar llogarinë tuaj. - reconfirm: Nëse ka kaluar një kohë qysh prej se jeni abonuar ju mund të keni nevojë për t'i dërguar vetës një email të ri konfirmimi . - success: Akounti juaj u konfirmua, ju falemnderit per regjistrim! unknown token: Ajo shenjë duket se nuk ekziston. confirm_email: button: Konfirmo @@ -860,9 +676,6 @@ sq: display name: "Emri i pamshem:" display name description: Emni jot publik. Ju muni me ndrry ne preferencat ma von. email address: "Email Adresa:" - fill_form: Plotsoni formularin edhe na do t'ja dergojm ni email per me akivizu. - flash create success message: Faleminderit që jeni abonuar. Ne kemi dërguar një shënim konfirmimi në %{email} tuaj dhe sapo ta konfirmoni llogarinë tuaj ju do të jeni në gjendje të filloni punën me hartat.

    Nëse ju përdorni një antispam sistem që dërgon kërkesat e konfirmimit atëherë ju lutem që të shtoni në listën e bardhë webmaster@openstreetmap.org pasi që ne nuk do të jemi në gjendje të përgjigjemi ndaj çfarëdo kërkese për konfirmim. - heading: Krijo nje akount shfrytezimi license_agreement: Kur ju konfirmoni llogranië tuaj, ju duhet të pajtoheni me kushtet e përdoruesit. no_auto_account_create: Per momentin spo mujm me ju kriju akount automatikisht. not displayed publicly: Nuk u shfaq publikisht (see privacy policy) diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index c00670f1e6b..3aa77a029b5 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1,6 +1,9 @@ -# Messages for Serbian (Latin script) (‪srpski (latinica)‬) +# Messages for Serbian (Latin script) (srpski (latinica)‎) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: McDutchie +# Author: Milicevic01 +# Author: Nemo bis # Author: Rancher sr-Latn: activerecord: @@ -81,95 +84,15 @@ sr-Latn: need_to_see_terms: Vaš pristup API-ju je privremeno ukinut. Prijavite se da biste pogledali uslove uređivanja. Ne morate da ih prihvatite, već samo da ih vidite. browse: changeset: - changeset: "Skup izmena: %{id}" changesetxml: XML skup izmena - download: Preuzmi %{changeset_xml_link} ili %{osmchange_xml_link} feed: title: Skup izmena %{id} title_comment: Skup izmena %{id} – %{comment} osmchangexml: osmChange XML title: Skup izmena - changeset_details: - belongs_to: "Pripada:" - bounding_box: "Granični okvir:" - box: okvir - closed_at: "Zatvoreno:" - created_at: "Napravljeno:" - has_nodes: - few: "Ima sledeća %{count} čvora:" - one: "Ima sledeći čvor:" - other: "Ima sledećih %{count} čvorova:" - has_relations: - few: "Ima sledeća %{count} odnosa:" - one: "Ima sledeći odnos:" - other: "Ima sledećih %{count} odnosa:" - has_ways: - few: "Ima sledeće %{count} putanje:" - one: "Ima sledeću putanju:" - other: "Ima sledećih %{count} putanja:" - no_bounding_box: Nijedan granični okvir nije sačuvan za ovaj skup izmena. - show_area_box: Prikaži okvir područja - common_details: - changeset_comment: "Komentar:" - deleted_at: "Obrisano:" - deleted_by: "Obrisao:" - edited_at: "Izmenjeno:" - edited_by: "Izmenio:" - in_changeset: "U skupu izmena:" - version: "Verzija:" containing_relation: entry: Odnos %{relation_name} entry_role: Odnos %{relation_name} (kao %{relation_role}) - map: - deleted: Obrisano - edit: - area: Uredi područje - node: Uredi čvor - relation: Uredi odnos - way: Uredi putanju - larger: - area: Pogledaj područje na većoj mapi - node: Pogledaj čvor na većoj mapi - relation: Pogledaj odnos na većoj mapi - way: Pogledaj putanju na većoj mapi - loading: Učitavam… - navigation: - all: - next_changeset_tooltip: Sledeći skup izmena - next_node_tooltip: Sledeći čvor - next_relation_tooltip: Sledeći odnos - next_way_tooltip: Sledeća putanja - prev_changeset_tooltip: Prethodni skup izmena - prev_node_tooltip: Prethodni čvor - prev_relation_tooltip: Prethodni odnos - prev_way_tooltip: Prethodna putanja - paging: - all: - next: "%{id} »" - prev: « %{id} - user: - next: "%{id} »" - prev: « %{id} - user: - name_changeset_tooltip: Pogledaj izmene korisnika %{user} - next_changeset_tooltip: Sledeća izmena korisnika %{user} - prev_changeset_tooltip: Prethodna izmena korisnika %{user} - node: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" - download_xml: Preuzmi XML - edit: uredi - node: Čvor - node_title: "Čvor: %{node_name}" - view_history: prikaži istoriju - node_details: - coordinates: "Koordinate:" - part_of: "Deo:" - node_history: - download: "%{download_xml_link} ili %{view_details_link}" - download_xml: Preuzmi XML - node_history: Istorija čvora - node_history_title: "Istorija čvora: %{node_name}" - view_details: prikaži detalje not_found: sorry: Žao nam je, ali %{type} s IB %{id} nije pronađen. type: @@ -177,9 +100,6 @@ sr-Latn: node: čvor relation: odnos way: putanja - paging_nav: - of: od - showing_page: Prikaz stranice redacted: message_html: Verzija %{version} ove %{type} ne može da se prikaže budući da je redigovana. Više na %{redaction_link}. redaction: Redakcija %{id} @@ -187,21 +107,6 @@ sr-Latn: node: čvor relation: odnos way: putanja - relation: - download: "%{download_xml_link} ili %{view_history_link}" - download_xml: Preuzmi XML - relation: Odnos - relation_title: "Odnos: %{relation_name}" - view_history: prikaži istoriju - relation_details: - members: "Članovi:" - part_of: "Deo:" - relation_history: - download: "%{download_xml_link} ili %{view_details_link}" - download_xml: Preuzmi XML - relation_history: Istorija odnosa - relation_history_title: "Istorija odnosa: %{relation_name}" - view_details: pogledaj detalje relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} kao %{role}" @@ -209,43 +114,9 @@ sr-Latn: node: Čvor relation: Odnos way: Putanja - start: - manually_select: Ručno izaberite drugo područje - view_data: Pogledaj podatke trenutnog prikaza mape start_rjs: - data_frame_title: Podaci - data_layer_name: Pregledaj podatke sa mape - details: Detalji - drag_a_box: Prevucite okvir na mapi da biste izabrali područje - edited_by_user_at_timestamp: Izmenio [[user]] u [[timestamp]] - hide_areas: Sakrij područja - history_for_feature: Istorija za [[feature]] load_data: Učitaj podatke - loaded_an_area_with_num_features: "Učitali ste područje koje sadrži [[num_features]] mogućnosti. Neki pregledači se ne mogu nositi s tolikom količinom podataka. Oni najbolje rade kada prikazuju manje od sto mogućnosti istovremeno: ako radite još nešto, to može usporiti pregledač ili ga zakočiti. Ako ste sigurni da želite da prikažete ove podatke, možete to uraditi klikom na dugme ispod." loading: Učitavam… - manually_select: Ručno izaberite drugo područje - object_list: - api: Dobavi ovo područje pomoću API-ja - back: Prikaži spisak predmeta - details: Detalji - heading: Spisak predmeta - history: - type: - node: Čvor [[id]] - way: Putanja [[id]] - selected: - type: - node: Čvor [[id]] - way: Putanja [[id]] - type: - node: Čvor - way: Putanja - private_user: privatni korisnik - show_areas: Prikaži područja - show_history: Prikaži istoriju - unable_to_load_size: "Ne mogu da učitam: granična veličina okvira [[bbox_size]] je prevelika (mora biti manja od %{max_bbox_size})" - wait: Pričekajte… - zoom_or_select: Uvećajte ili izaberite područje koje želite da pogledate tag_details: tags: "Oznake:" wiki_link: @@ -259,34 +130,10 @@ sr-Latn: node: tačka relation: odnos way: putanja - way: - download: "%{download_xml_link}, %{view_history_link} ili %{edit_link}" - download_xml: Preuzmi XML - edit: uredi - view_history: pogledaj istoriju - way: Putanja - way_title: "Putanja: %{way_name}" - way_details: - also_part_of: - one: takođe deo putanje %{related_ways} - other: takođe deo putanja %{related_ways} - nodes: "Čvorovi:" - part_of: "Deo:" - way_history: - download: "%{download_xml_link} ili %{view_details_link}" - download_xml: Preuzmi XML - view_details: pogledaj detalje - way_history: Istorija putanje - way_history_title: "Istorija putanje: %{way_name}" changeset: changeset: anonymous: Anonimno - big_area: (veliko) - id: br. %{id} - no_comment: (nema komentara) no_edits: (nema izmena) - show_area_box: pogledaj okvir područja - still_editing: (još uvek uređuje) view_changeset_details: Pogledaj detalje skupa izmena changeset_paging_nav: next: Sledeća » @@ -299,24 +146,10 @@ sr-Latn: saved_at: Sačuvano u user: Korisnik list: - description: Skorašnje izmene - description_bbox: Skupovi izmena unutar %{bbox} - description_friend: Izmene vaših prijatelja - description_nearby: Izmene od okolnih korisnika - description_user: Skupovi izmena korisnika %{user} - description_user_bbox: Skupovi izmena korisnika %{user} unutar %{bbox} - heading: Skupovi izmena - heading_bbox: Skupovi izmena - heading_friend: Izmene - heading_nearby: Izmene - heading_user: Skupovi izmena - heading_user_bbox: Skupovi izmena title: Skupovi izmena - title_bbox: Skupovi izmena unutar %{bbox} title_friend: Izmene vaših prijatelja title_nearby: Izmene od okolnih korisnika title_user: Skupovi izmena korisnika %{user} - title_user_bbox: Skupovi izmena korisnika %{user} unutar %{bbox} timeout: sorry: Žao nam je, ali spisak izmena koji ste zahtevali je predugačak. diary_entry: @@ -334,7 +167,6 @@ sr-Latn: hide_link: Sakrij ovaj komentar diary_entry: comment_count: - few: "%{count} komentara" one: 1 komentar other: "%{count} komentara" comment_link: Prokomentariši ovaj unos @@ -427,28 +259,16 @@ sr-Latn: scale: Razmera too_large: body: Ovo područje je preveliko da bi bilo izvezeno u formatu XML. Uvećajte prikaz ili izaberite manju površinu. - heading: Područje je preveliko zoom: Uvećanje - start_rjs: - add_marker: Dodaj marker na mapu - change_marker: Promeni položaj markera - click_add_marker: Kliknite na mapu da biste dodali marker - drag_a_box: Prevucite okvir na mapi da biste izabrali područje - export: Izvezi - manually_select: Ručno izaberite drugo područje - view_larger_map: Pogledaj veću mapu geocoder: description: title: geonames: Lokacija iz Geografskih imena - osm_namefinder: "%{types} iz Tragača naziva" osm_nominatim: Lokacija iz Nominatima types: cities: Gradovi places: Mesta towns: Varošice - description_osm_namefinder: - prefix: "%{distance} %{direction} od %{type}" direction: east: istočno north: severno @@ -470,14 +290,9 @@ sr-Latn: ca_postcode: Rezultati iz Geokodera geonames: Rezultati iz Geografskih imena latlon: Rezultati iz Internala - osm_namefinder: Rezultati iz Tragača naziva osm_nominatim: Rezultati iz Nominatima uk_postcode: Rezultati iz NPEMap-a us_postcode: Rezultati iz Geokodera - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} od %{parentname})" - suffix_place: ", %{distance} %{direction} od %{placename}" - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: aeroway: @@ -950,60 +765,31 @@ sr-Latn: mapquest: Mapkvest open standard: Standardna transport_map: Saobraćajna mapa - overlays: - maplint: Maplint site: edit_disabled_tooltip: Uvećajte prikaz da biste uredili mapu edit_tooltip: Uredite mapu - edit_zoom_alert: Morate uvećati prikaz da biste uredili mapu - history_disabled_tooltip: Uvećajte prikaz da biste videli izmene za ovo područje - history_tooltip: Pogledajte izmene za ovo područje - history_zoom_alert: Morate uvećati prikaz da biste videli izmene za ovo područje layouts: community: Zajednica community_blogs: Blogovi zajednice community_blogs_title: Blogovi članova zajednice copyright: Autorska prava i licenca - documentation: Dokumentacija - documentation_title: Dokumentacija projekta donate: Pomozite nam tako što ćete %{link} radi održavanja potrebnog hardvera. - donate_link_text: priložiti novac edit: Uredi edit_with: Uredi uređivačem %{editor} export: Izvezi - export_tooltip: Izvezite podatke mape foundation: Zadužbina foundation_title: Zadužbina Openstritmap gps_traces: GPS tragovi gps_traces_tooltip: Upravljajte GPS tragovima help: Pomoć - help_centre: Centar za pomoć - help_title: Stranica pomoći za projekat - help_url: http://help.openstreetmap.org/ history: Istorija home: dom - home_tooltip: Idi na lokaciju doma - inbox: primljene (%{count}) - inbox_tooltip: - few: Vaše sanduče sadrži %{count} nepročitane poruke - one: Vaše sanduče sadrži jednu nepročitanu poruku - other: Vaše sanduče sadrži %{count} nepročitanih poruka - zero: Vaše sanduče ne sadrži nepročitane poruke - intro_1: Openstritmap je slobodna mapa celog sveta. Sačinjavaju je korisnici kao što ste vi. intro_2_create_account: Otvorite nalog - intro_2_download: preuzimanje - intro_2_html: Podaci su slobodni za %{download} i %{use} pod uslovima licence %{license}. %{create_account} da poboljšate mapu. - intro_2_license: otvorena licenca - intro_2_use: upotreba - license: - alt: CC BY-SA 2.0 - title: Podaci Openstritmapa su objavljeni pod licencom Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0 log_in: prijavi me log_in_tooltip: Prijavite se s postojećim nalogom logo: alt_text: Logotip Openstritmapa logout: odjavi me - logout_tooltip: Odjavite se make_a_donation: text: Priložite novac title: Podržite Openstritmap novčanim prilogom @@ -1019,23 +805,35 @@ sr-Latn: title: Openstritmap sign_up: otvori nalog sign_up_tooltip: Otvorite nalog da biste uređivali - sotm2011: Dođite na Konferenciju Openstritmapa 2011, Stanje mape, od 9. do 11. septembra u Denveru! tag_line: Slobodna viki mapa sveta user_diaries: Dnevnici user_diaries_tooltip: Pogledajte korisničke dnevnike - view: Pregled - view_tooltip: Pogledajte mapu - welcome_user: Dobro došli, %{user_link} - welcome_user_link_tooltip: Vaša korisnička stranica - wiki: viki - wiki_title: Viki stranice projekta - wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Main_Page?uselang=sr-ec license_page: foreign: english_link: engleskog originala text: U slučaju sukoba između prevedene stranice i %{english_original_link}, engleska stranica ima prednost title: O prevodu - legal_babble: "

    Autorska prava i licenca

    \n

    \n Openstritmap čine slobodni podaci koji su objavljeni pod\n licencom \n Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0 (CC BY-SA).\n

    \n

    \n Možete da umnožavate, delite, prenosite i prilagođavate\n naše mape i podatke, sve dok imenujete Openstritmap i njene\n urednike. Ako želite da menjate i dograđujete naše podatke,\n možete ih deliti samo pod istom licencom.\n Ceo \n tekst ugovora objašnjava vam vaša prava i odgovornosti.\n

    \n\n

    Kako da imenujete Openstritmap

    \n

    \n Ako koristite naše slike mapa, tražimo da zasluge sadrže\n bar “© Doprinosioci\n Openstritmapa, CC BY-SA”. Ako koristite samo podatke mapa,\n navedite “Kartografski podaci © Doprinosioci Openstritmapa,\n CC BY-SA”.\n

    \n

    \n Gde je moguće, Openstritmap bi trebalo da vodi do adrese http://www.openstreetmap.org/\n i CC BY-SA do http://creativecommons.org/licenses/by-sa/2.0/.\n Ako koristite medijum u kom se veze ne mogu postaviti\n (npr. štampani rad), predlažemo da usmerite vaše\n čitaoce na www.openstreetmap.org (po mogućstvu\n proširavanjem ‘Openstritmapa’ na celu adresu)\n i na www.creativecommons.org.\n

    \n\n

    Saznajte više

    \n

    \n Pročitajte više o korišćenju naših podataka na ČPP.\n

    \n

    \n Podsećamo urednike Openstritmapa da nikada ne dodaju podatke\n od bilo kog izvora zaštićenog autorskim pravima (npr.\n Gugl mape ili štampane mape) bez izričite dozvole\n nosioca autorskog prava.\n

    \n

    \n Iako Openstritmap čine slobodni podaci, ne možemo da\n obezbedimo besplatne API-je mapa drugim programerima.\n\n Pogledajte našu politiku\n o korišćenju API-ja, politiku\n o prikazivanju mapa i politiku\n o korišćenju Nominatima.\n\n

    Naši saradnici

    \n

    \n Naša licenca CC BY-SA zahteva od vas da “morate\n navesti ime izvornog autora ili davaoca licence”.\n Pojedinačni kartografi ne zahtevaju isticanje zasluga osim\n “Openstritmap doprinosioca”, ali kada podaci\n pripadaju nacionalnoj geografskoj agenciji ili drugom\n većem izvoru koji je uključen u Openstritmap, razumno je\n navesti izvor ili ostaviti hipervezu do njega.\n

    \n\n\n\n
      \n
    • Australija: sadrži podatke o opštinama\n na osnovu podataka Australijskog biroa za statistiku.
    • \n
    • Austrija: sadrži podatke iz\n Štata Viena pod licencom\n CC BY),\n Land Forarlberg i\n + \nLand Tirol (pod licencom CC-BY AT sa izmenama i dopunama).
    • \n
    • Kanada: sadrži podatke iz\n Beobaze®, Geogratisa (© Odeljenje za prirodne\n resurse Kanade), Kanvek (© Odeljenje za prirodne\n resurse Kanade) i Statkan (Geografski odsek,\n Zavod za statistiku Kanade).
    • \n
    • Francuska: sadrži podatke koji potiču od\n Generalne direkcije za oporezivanje.
    • \n
    • Holandija: sadrži © i podatke, 2007\n + \n (www.and.com)
    • \n
    • Novi Zeland: sadrži podatke koji potiču od\n Land Information New Zealand. Krunska autorska prava zadržana.
    • \n
    • Poljska: sadrži podatke iz UMP-pcPL mapa. Autorska prava\n UMP-pcPL doprinosioca.\n \n Više o korišćenju Openstritmapovih UMP podataka
    • \n
    • Južna Afrika: sadrži podatke koji potiču od \n Glavnog direktorata:\n Nacionalne geoprostorne informacije, državna prava zadržana.
    • \n
    • Ujedinjeno Kraljevstvo: sadrži Zvanične\n podatke geodetskog premeravanja © Autorska prava 2010.
    • \n
    \n\n

    \n Uključivanje podataka u Openstritmap ne podrazumeva da izvorni\n vlasnik podataka prihvata Openstritmap, obezbeđuje bilo kakvu\n garanciju ili prihvata odgovornost.\n

    " + legal_babble: + contributors_at_html: "Austrija: sadrži podatke iz\n Štata Viena pod licencom\n CC BY),\n Land Forarlberg i\n \t+ \t\nLand Tirol (pod licencom CC-BY AT sa izmenama i dopunama)." + contributors_ca_html: "Kanada: sadrži podatke iz\n Beobaze®, Geogratisa (© Odeljenje za prirodne\n resurse Kanade), Kanvek (© Odeljenje za prirodne\n resurse Kanade) i Statkan (Geografski odsek,\n Zavod za statistiku Kanade)." + contributors_footer_1_html: "Više informacija o ovim i drugim izvorima korišćenim\nza poboljšavanje Openstritmapa možete naći na stranici Doprinosioci na našem vikiju." + contributors_footer_2_html: " Uključivanje podataka u Openstritmap ne podrazumeva da izvorni\n vlasnik podataka prihvata Openstritmap, obezbeđuje bilo kakvu\n garanciju ili prihvata odgovornost." + contributors_fr_html: "Francuska: sadrži podatke koji potiču od\n Generalne direkcije za oporezivanje." + contributors_gb_html: "Ujedinjeno Kraljevstvo: sadrži Zvanične\n podatke geodetskog premeravanja © Autorska prava 2010." + contributors_intro_html: " Naša licenca CC BY-SA zahteva od vas da “morate\n navesti ime izvornog autora ili davaoca licence”.\n Pojedinačni kartografi ne zahtevaju isticanje zasluga osim\n “Openstritmap doprinosioca”, ali kada podaci\n pripadaju nacionalnoj geografskoj agenciji ili drugom\n većem izvoru koji je uključen u Openstritmap, razumno je\n navesti izvor ili ostaviti hipervezu do njega." + contributors_nl_html: "Holandija: sadrži © AND podaci, 2007\n \t+ \t\n (www.and.com)" + contributors_nz_html: "Novi Zeland: sadrži podatke koji potiču od\n Land Information New Zealand. Krunska autorska prava zadržana." + contributors_title_html: Naši saradnici + contributors_za_html: "Južnoafrička Republika: sadrži podatke iz\nGlavne uprave:\nNacionalna katastarska služba, državna autorska prava zadržana." + credit_1_html: " Ako koristite naše slike mapa, tražimo da zasluge sadrže\n bar “© Doprinosioci\n Openstritmapa, CC BY-SA”. Ako koristite samo podatke mapa,\n navedite “Kartografski podaci © Doprinosioci Openstritmapa,\n CC BY-SA”." + credit_2_html: " Gde je moguće, Openstritmap bi trebalo da vodi do adrese http://www.openstreetmap.org/\n i CC BY-SA do http://creativecommons.org/licenses/by-sa/2.0/.\n Ako koristite medijum u kom se veze ne mogu postaviti\n (npr. štampani rad), predlažemo da usmerite vaše\n čitaoce na www.openstreetmap.org (po mogućstvu\n proširavanjem ‘Openstritmapa’ na celu adresu)\n i na www.creativecommons.org." + credit_title_html: Kako da imenujete Openstritmap + intro_1_html: "OpenStreetMap is open data, licensed under the Open Data\nCommons Open Database License (ODbL)." + intro_2_html: " Možete da umnožavate, delite, prenosite i prilagođavate\n naše mape i podatke, sve dok imenujete Openstritmap i njene\n urednike. Ako želite da menjate i dograđujete naše podatke,\n možete ih deliti samo pod istom licencom.\n Ceo \n tekst ugovora objašnjava vam vaša prava i odgovornosti." + more_1_html: " Pročitajte više o korišćenju naših podataka na ČPP." + more_2_html: " Podsećamo urednike Openstritmapa da nikada ne dodaju podatke\n od bilo kog izvora zaštićenog autorskim pravima (npr.\n Gugl mape ili štampane mape) bez izričite dozvole\n nosioca autorskog prava." + more_title_html: Saznajte više + title_html: Autorska prava i licenca native: mapping_link: počnite s mapiranjem native_link: srpsko izdanje @@ -1054,9 +852,8 @@ sr-Latn: other: "%{count} nove poruke" no_messages_yet: Još uvek nemate poruka. Zašto ne biste stupili u kontakt s %{people_mapping_nearby_link}? old_messages: - few: "%{count} stare poruke" one: "%{count} stara poruka" - other: "%{count} starih poruka" + other: "%{count} stare poruke" outbox: poslate people_mapping_nearby: maperima u vašoj okolini subject: Naslov @@ -1086,9 +883,8 @@ sr-Latn: date: Datum inbox: primljene messages: - few: Imate %{count} poslate poruke one: Imate %{count} poslatu poruku - other: Imate %{count} poslatih poruka + other: Imate %{count} poslate poruke my_inbox: "%{inbox_link}" no_sent_messages: Još uvek nemate poslatih poruka. Zašto ne biste stupili u kontakt s %{people_mapping_nearby_link}? outbox: poslate @@ -1097,12 +893,8 @@ sr-Latn: title: Poslate to: Za read: - back_to_inbox: Nazad na primljene - back_to_outbox: Nazad na poslate date: Datum from: Od - reading_your_messages: Vaše poruke - reading_your_sent_messages: Vaše poslate poruke reply_button: Odgovori subject: Naslov title: Pročitaj poruku @@ -1128,8 +920,6 @@ sr-Latn: email_confirm_plain: click_the_link: Ako ste to vi, kliknite na vezu ispod da biste potvrdili izmene. greeting: Pozdrav, - hopefully_you_1: Neko (verovatno vi) želeo bi da promeni e-adresu na - hopefully_you_2: "%{server_url} na %{new_address}." friend_notification: befriend_them: Možete ga/je dodati i kao prijatelja na %{befriendurl}. had_added_you: "%{user} vas je dodao kao prijatelja na Openstritmapu." @@ -1159,47 +949,12 @@ sr-Latn: lost_password_plain: click_the_link: Ako ste to vi, kliknite na vezu ispod da biste poništili lozinku. greeting: Pozdrav, - hopefully_you_1: Neko (verovatno vi) zatražio je poništavanje lozinke za - hopefully_you_2: nalog s ovom e-adresom. message_notification: - footer1: Možete pročitati poruku i na %{readurl} - footer2: i možete odgovoriti na %{replyurl} header: "%{from_user} vam posla poruku preko Openstritmapa pod naslovom %{subject}:" hi: Pozdrav, %{to_user}, subject_header: "[Openstritmap] – %{subject}" signup_confirm: subject: "[OpenStreetMap] Potvrdite vašu e-adresu" - signup_confirm_html: - ask_questions: Možete postaviti bilo koje pitanje o Openstritmapu na našim stranicama za pitanja i odgovore. - click_the_link: Ako ste to vi, dobro došli! Kliknite na vezu ispod da biste potvrdili vaš nalog i pročitali više o Openstritmapu - current_user: Spisak trenutnih korisnika u kategorijama, zasnovan na tome gde se oni nalaze, dostupan je na Category:Users_by_geographical_region. - get_reading: Pročitajte više o Openstritmapu na vikiju, budite u toku s najnovijim vestima preko bloga ili Tvitera ili pretražite OpenGeoData, blog osnivača Openstritmapa za istoriju projekata. Možete da slušate i podemisije! - greeting: Pozdrav! - hopefully_you: Neko (verovatno vi) želeo bi da otvori nalog na - introductory_video: Možete pogledati %{introductory_video_link}. - more_videos: Postoji %{more_videos_link}. - more_videos_here: više video-snimaka ovde - user_wiki_page: Preporučujemo vam da napravite korisničku stranicu na vikiju koja uključuje oznake kategorija koje označavaju gde se nalazite, kao na primer [[Category:Users_in_London]]. - video_to_openstreetmap: uvodni video-snimak za Openstritmap - wiki_signup: Možete i da otvorite nalog na vikiju. - signup_confirm_plain: - ask_questions: "Možete postaviti bilo koje pitanje o Openstritmapu na našim stranicama za pitanja i odgovore:" - blog_and_twitter: "Budite u toku s najnovijim vestima preko bloga ili Tvitera:" - click_the_link_1: Ako ste to vi, dobro došli! Kliknite na vezu ispod da biste potvrdili svoj - click_the_link_2: korisnički nalog. Pročitajte više o Openstritmapu. - current_user_1: Spisak trenutnih korisnika u kategorijama, na osnovu položaja u svetu - current_user_2: "gde žive, dostupan je na:" - greeting: Pozdrav! - hopefully_you: Neko (verovatno vi) želeo bi da otvori nalog na - introductory_video: "Pogledajte uvodni video-snimak za Openstritmap ovde:" - more_videos: "Više video-snimaka možete naći ovde:" - opengeodata: "OpenGeoData.org je blog Stiva Kosta, osnivača Openstritmapa:" - the_wiki: "Pročitajte više o Openstritmapu na vikiju:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Beginners'_guide?uselang=sr-ec - user_wiki_1: Preporučujemo vam da napravite korisničku stranicu koja uključuje - user_wiki_2: oznake kategorija koje označavaju odakle ste, kao na primer [[Category:Users_in_London]]. - wiki_signup: "Možete i otvoriti nalog na našem vikiju:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=sr-ec oauth: oauthorize: allow_read_gpx: čita vaše privatne GPS tragove. @@ -1317,16 +1072,10 @@ sr-Latn: index: js_1: Koristite pregledač koji ne podržava javaskript ili ste ga onemogućili. js_2: Openstritmap koristi javaskript za prikazivanje mapa. - license: - license_name: Krijejtiv komons Autorstvo-Deliti pod istim uslovima 2.0 - notice: Objavljeno pod licencom %{license_name} od %{project_name} i njenih saradnika. - project_name: Openstritmapa permalink: Trajna veza remote_failed: Uređivanje nije uspelo. Proverite da li je JOSM ili Merkaartor učitan i da je mogućnost daljinskog upravljanja omogućena shortlink: Kratka veza key: - map_key: Legenda - map_key_tooltip: Legenda mape table: entry: admin: Administrativna granica @@ -1412,7 +1161,6 @@ sr-Latn: preview: Pregled search: search: Pretraga - search_help: "primeri: „Novi Sad“, „Vojvode Stepe, Beograd“ ili „železnička stanica, Niš“ više primera…" submit_text: Idi where_am_i: Gde sam? where_am_i_title: Ustanovite trenutnu lokaciju pomoću pretraživača @@ -1447,6 +1195,7 @@ sr-Latn: visibility_help: šta ovo znači? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec list: + empty_html: Ovde još nema ništa. Otpremite novi trag ili saznajte više o GPS traganju na viki stranici. public_traces: Javni GPS tragovi public_traces_from: Javni GPS tragovi korisnika %{user} tagged_with: " označeni sa %{tags}" @@ -1468,7 +1217,7 @@ sr-Latn: in: u map: mapa more: više - pending: NA_ČEKANjU + pending: NA_ČEKANJU private: PRIVATNI public: JAVNI trace_details: Pogledajte detalje o tragu @@ -1493,8 +1242,8 @@ sr-Latn: trace_optionals: tags: Oznake trace_paging_nav: - next: Sledeći » - previous: « Prethodni + newer: Noviji tragovi + older: Stariji tragovi showing_page: Prikaz stranice %{page} view: delete_track: Obriši ovaj trag @@ -1507,7 +1256,7 @@ sr-Latn: map: mapa none: ništa owner: "Vlasnik:" - pending: NA_ČEKANjU + pending: NA_ČEKANJU points: "Tačaka:" start_coordinates: "Početna koordinata:" tags: "Oznake:" @@ -1570,12 +1319,9 @@ sr-Latn: update home location on click: Ažurirati mesto stanovanja kada kliknem na mapu? confirm: already active: Ovaj nalog je već potvrđen. - before you start: Pre nego što počnete s mapiranjem, popunite neke podatke o sebi u obrascu koji se nalazi ispod. button: Potvrdi heading: Potvrda korisničkog naloga press confirm button: Pritisnite dugme za potvrdu da biste aktivirali nalog. - reconfirm: Ako je prošlo neko vreme otkako ste otvorili nalog, možda ćete morati da zatražite novu potvrdu e-poštom. - success: Vaš nalog je potvrđen. Hvala vam na upisu! unknown token: Izgleda da taj novčić ne postoji. confirm_email: button: Potvrdi @@ -1612,8 +1358,6 @@ sr-Latn: lost password link: Zaboravili ste lozinku? new to osm: Novi ste na sajtu? no account: Nemate nalog? - notice: Saznajte više o predstojećoj izmeni licence (prevodi) (razgovor) - notice_terms: Openstritmap dobija novu licencu 1. aprila 2012. Ova licenca je otvorena isto kao i sadašnja, ali pravni detalji su mnogo pogodniji našoj kartografskoj bazi. Sa zadovoljstvom bi zadržali vaše doprinose na Openstritmapu, ali ovo je moguće samo ako prihvatite da oni budu objavljeni pod uslovima nove licence. U suprotnom, moraćemo da ih uklonimo iz baze.

    Prijavite se, pročitajte uslove i vidite da li se slažete s njima. Hvala! openid: "%{logo} OpenID:" openid invalid: Izgleda da OpenID nije ispravan openid missing provider: Ne mogu da se povežem s OpenID dobavljačem @@ -1658,7 +1402,9 @@ sr-Latn: title: Povratak lozinke make_friend: already_a_friend: Već ste prijatelj sa %{name}. + button: Dodaj kao prijatelja failed: Ne mogu da dodam %{name} kao prijatelja. + heading: Dodati korisnika %{user} kao prijatelja? success: "%{name} je sada vaš prijatelj." new: confirm email address: "Potvrdite e-adresu:" @@ -1668,14 +1414,11 @@ sr-Latn: display name: "Ime prikaza:" display name description: Javno prikazano korisničko ime. Kasnije ga možete promeniti u postavkama. email address: "E-adresa:" - fill_form: Kada popunite obrazac, poslaćemo vam poruku za aktiviranje naloga. - flash create success message: Hvala vam na otvaranju naloga. Poslali smo vam potvrdnu poruku na %{email}. Nakon što potvrdite svoj nalog, moći ćete da počnete s mapiranjem.

    Ako koristite sistem protiv nepoželjnih poruka, dodajte webmaster@openstreetmap.org u spisak dozvoljenih adresa jer nismo u mogućnosti da odgovorimo na bilo koji zahtev za potvrdu. - heading: Otvaranje korisničkog naloga license_agreement: Nakon što potvrdite nalog, moraćete da prihvatite uslove uređivanja. no_auto_account_create: Nažalost, trenutno nismo u mogućnosti da otvorimo novi nalog. not displayed publicly: Ne prikazuje se javno (pogledajte politiku privatnosti) openid: "%{logo} OpenID:" - openid association: "

    Vaš OpenID nije povezan s nalogom na Openstritmapu.

    \n
      \n
    • Ako još uvek nemate nalog, otvorite ga koristeći obrazac ispod.
    • \n
    • \n Ako imate nalog, prijavite se sa svojim korisničkim imenom\n i lozinkom, pa ga onda povežite s OpenID-jem u postavkama.\n
    • \n
    " + openid association: "

    Vaš OpenID nije povezan s nalogom na Openstritmapu.

    \n
      \n
    • Ako još uvek nemate nalog, otvorite ga koristeći obrazac ispod.
    • \n
    • \n Ako imate nalog, prijavite se sa svojim korisničkim imenom\n i lozinkom, pa ga onda povežite s OpenID-jem u postavkama.\n
    • \n
    " openid no password: S OpenID-jem, lozinka nije potrebna, ali neke dodatne alatke ipak zahtevaju lozinku. password: "Lozinka:" terms accepted: Hvala vam što prihvatate nove uslove uređivanja. @@ -1692,6 +1435,8 @@ sr-Latn: nearby mapper: Obližnji kartograf your location: Vaša lokacija remove_friend: + button: Ukloni iz prijatelja + heading: Ukloniti korisnika %{user} iz prijatelja? not_a_friend: "%{name} nije vaš prijatelj." success: "%{name} je izbačen iz prijatelja." reset_password: @@ -1705,7 +1450,7 @@ sr-Latn: set_home: flash success: Mesto stanovanja je uspešno sačuvano suspended: - body: "

    \n Žao nam je, vaš nalog je privremeno ukinut\n zbog sumnjive aktivnosti.\n

    \n

    \n Ovu odluku će ubrzo razmotriti administrator. Takođe,\n možete kontaktirati %{webmaster}a ako želite da se žalite.\n

    " + body: "

    \n Žao nam je, vaš nalog je privremeno ukinut\n zbog sumnjive aktivnosti.\n

    \n

    \n Ovu odluku će ubrzo razmotriti administrator. Takođe,\n možete kontaktirati %{webmaster}a ako želite da se žalite.\n

    " heading: Suspendovan nalog title: Suspendovan nalog webmaster: administrator @@ -1730,7 +1475,7 @@ sr-Latn: activate_user: aktiviraj ovog korisnika add as friend: dodaj kao prijatelja ago: (pre %{time_in_words_ago}) - block_history: pogledaj dobijene blokade + block_history: dobijene blokade blocks by me: moja blokiranja blocks on me: blokiranja na mene comments: komentari @@ -1752,11 +1497,11 @@ sr-Latn: friends_diaries: Pregled svih zapisa u dnevniku prijatelja hide_user: sakrij ovog korisnika if set location: Ako postavite svoju lokaciju, zgodna mapa će biti prikazana ispod. Možete je podesiti u %{settings_link}. - km away: udaljeno %{count} km + km away: udaljeno %{count} km latest edit: "Poslednja izmena pre %{ago}:" - m away: udaljeno %{count} m + m away: udaljeno %{count} m mapper since: "Kartograf od:" - moderator_history: pogledaj date blokade + moderator_history: date blokade my comments: moji komentari my diary: moj dnevnik my edits: moje izmene @@ -1841,16 +1586,18 @@ sr-Latn: creator_name: Tvorac display_name: Blokirani korisnik edit: Uredi + next: Sledeće » not_revoked: (nije opozvano) + previous: « Prethodno reason: Razlozi za blokiranje revoke: Opozovi revoker_name: Opozvao show: Prikaži + showing_page: Prikaz stranice %{page} status: Stanje period: - few: "%{count} sata" one: 1 sat - other: "%{count} sati" + other: "%{count} sata" revoke: confirm: Želite li da opozovete ovu blokadu? flash: Ova blokada je opozvana. diff --git a/config/locales/sr.yml b/config/locales/sr.yml index f38afd1532a..bf16e848e18 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1,6 +1,8 @@ -# Messages for Serbian (Cyrillic script) (‪српски (ћирилица)‬) +# Messages for Serbian (Cyrillic script) (српски (ћирилица)‎) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Milicevic01 +# Author: Nemo bis # Author: Nikola Smolenski # Author: Rancher # Author: Sawa @@ -8,6 +10,9 @@ # Author: Милан Јелисавчић # Author: Обрадовић Горан sr: + about_page: + next: Следеће + partners_title: Партнери activerecord: attributes: diary_comment: @@ -38,7 +43,7 @@ sr: user: active: Активан description: Опис - display_name: Име приказа + display_name: Приказано име email: Е-пошта languages: Језици pass_crypt: Лозинка @@ -85,96 +90,21 @@ sr: blocked: Ваш приступ АПИ-ју је блокиран. Пријавите се да сазнате више. need_to_see_terms: Ваш приступ АПИ-ју је привремено укинут. Пријавите се да бисте погледали услове уређивања. Не морате да их прихватите, већ само да их видите. browse: + anonymous: анонимно changeset: - changeset: "Скуп измена: %{id}" + belongs_to: Аутор changesetxml: XML скуп измена - download: Преузми %{changeset_xml_link} или %{osmchange_xml_link} feed: title: Скуп измена %{id} title_comment: Скуп измена %{id} – %{comment} osmchangexml: osmChange XML - title: Скуп измена - changeset_details: - belongs_to: "Припада:" - bounding_box: "Гранични оквир:" - box: оквир - closed_at: "Затворено:" - created_at: "Направљено:" - has_nodes: - few: "Има следећа %{count} чвора:" - one: "Има следећи чвор:" - other: "Има следећих %{count} чворова:" - has_relations: - few: "Има следећа %{count} односа:" - one: "Има следећи однос:" - other: "Има следећих %{count} односа:" - has_ways: - few: "Има следеће %{count} путање:" - one: "Има следећу путању:" - other: "Има следећих %{count} путања:" - no_bounding_box: Ниједан гранични оквир није сачуван за овај скуп измена. - show_area_box: Прикажи оквир подручја - common_details: - changeset_comment: "Коментар:" - deleted_at: "Обрисано:" - deleted_by: "Обрисао:" - edited_at: "Измењено:" - edited_by: "Изменио:" - in_changeset: "У скупу измена:" - version: "Верзија:" + title: "Скуп измена: %{id}" + closed: Затворено containing_relation: entry: Однос %{relation_name} entry_role: Однос %{relation_name} (као %{relation_role}) - map: - deleted: Обрисано - edit: - area: Уреди подручје - node: Уреди чвор - relation: Уреди однос - way: Уреди путању - larger: - area: Погледај подручје на већој мапи - node: Погледај чвор на већој мапи - relation: Погледај однос на већој мапи - way: Погледај путању на већој мапи - loading: Учитавам… - navigation: - all: - next_changeset_tooltip: Следећи скуп измена - next_node_tooltip: Следећи чвор - next_relation_tooltip: Следећи однос - next_way_tooltip: Следећа путања - prev_changeset_tooltip: Претходни скуп измена - prev_node_tooltip: Претходни чвор - prev_relation_tooltip: Претходни однос - prev_way_tooltip: Претходна путања - paging: - all: - next: "%{id} »" - prev: « %{id} - user: - next: "%{id} »" - prev: « %{id} - user: - name_changeset_tooltip: Погледај измене корисника %{user} - next_changeset_tooltip: Следећа измена корисника %{user} - prev_changeset_tooltip: Претходна измена корисника %{user} - node: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" - download_xml: Преузми XML - edit: уреди - node: Чвор - node_title: "Чвор: %{node_name}" - view_history: прикажи историју - node_details: - coordinates: "Координате:" - part_of: "Део:" - node_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Преузми XML - node_history: Историја чвора - node_history_title: "Историја чвора: %{node_name}" - view_details: прикажи детаље + in_changeset: Скуп измена + no_comment: (нема коментара) not_found: sorry: Жао нам је, али %{type} с ИБ %{id} није пронађен. type: @@ -182,9 +112,8 @@ sr: node: чвор relation: однос way: путања - paging_nav: - of: од - showing_page: Приказ странице + note: + title: Белешкаː %{id} redacted: message_html: Верзија %{version} ове %{type} не може да се прикаже будући да је редигована. Више на %{redaction_link}. redaction: Редакција %{id} @@ -193,20 +122,7 @@ sr: relation: однос way: путања relation: - download: "%{download_xml_link} или %{view_history_link}" - download_xml: Преузми XML - relation: Однос - relation_title: "Однос: %{relation_name}" - view_history: прикажи историју - relation_details: - members: "Чланови:" - part_of: "Део:" - relation_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Преузми XML - relation_history: Историја односа - relation_history_title: "Историја односа: %{relation_name}" - view_details: погледај детаље + members: Чланови relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} као %{role}" @@ -214,45 +130,11 @@ sr: node: Чвор relation: Однос way: Путања - start: - manually_select: Ручно изаберите друго подручје - view_data: Погледај податке тренутног приказа мапе start_rjs: - data_frame_title: Подаци - data_layer_name: Прегледај податке са мапе - details: Детаљи - drag_a_box: Превуците оквир на мапи да бисте изабрали подручје - edited_by_user_at_timestamp: Изменио [[user]] у [[timestamp]] - hide_areas: Сакриј подручја - history_for_feature: Историја за [[feature]] load_data: Учитај податке - loaded_an_area_with_num_features: "Учитали сте подручје које садржи [[num_features]] могућности. Неки прегледачи се не могу носити с толиком количином података. Они најбоље раде када приказују мање од сто могућности истовремено: ако радите још нешто, то може успорити прегледач или га закочити. Ако сте сигурни да желите да прикажете ове податке, можете то урадити кликом на дугме испод." loading: Учитавам… - manually_select: Ручно изаберите друго подручје - object_list: - api: Добави ово подручје помоћу АПИ-ја - back: Прикажи списак предмета - details: Детаљи - heading: Списак предмета - history: - type: - node: Чвор [[id]] - way: Путања [[id]] - selected: - type: - node: Чвор [[id]] - way: Путања [[id]] - type: - node: Чвор - way: Путања - private_user: приватни корисник - show_areas: Прикажи подручја - show_history: Прикажи историју - unable_to_load_size: "Не могу да учитам: гранична величина оквира [[bbox_size]] је превелика (мора бити мања од %{max_bbox_size})" - wait: Причекајте… - zoom_or_select: Увећајте или изаберите подручје које желите да погледате tag_details: - tags: "Ознаке:" + tags: Ознаке wiki_link: key: Страница с описом за ознаку %{key} tag: Страница с описом за ознаку %{key}=%{value} @@ -264,39 +146,22 @@ sr: node: тачка relation: однос way: путања + version: Верзија + view_details: Прикажи детаље + view_history: Прикажи историју way: - download: "%{download_xml_link}, %{view_history_link} или %{edit_link}" - download_xml: Преузми XML - edit: уреди - view_history: погледај историју - way: Путања - way_title: "Путања: %{way_name}" - way_details: - also_part_of: - one: такође део путање %{related_ways} - other: такође део путања %{related_ways} - nodes: "Чворови:" - part_of: "Део:" - way_history: - download: "%{download_xml_link} или %{view_details_link}" - download_xml: Преузми XML - view_details: погледај детаље - way_history: Историја путање - way_history_title: "Историја путање: %{way_name}" + history_title: "Историја путање: %{name}" + nodes: Чворови + title: "Путања: %{name}" changeset: changeset: anonymous: Анонимно - big_area: (велико) - id: бр. %{id} - no_comment: (нема коментара) no_edits: (нема измена) - show_area_box: погледај оквир подручја - still_editing: (још увек уређује) view_changeset_details: Погледај детаље скупа измена changeset_paging_nav: next: Следећа » previous: « Претходна - showing_page: Приказ странице %{page} + showing_page: Страница %{page} changesets: area: Подручје comment: Коментар @@ -304,24 +169,10 @@ sr: saved_at: Сачувано у user: Корисник list: - description: Скорашње измене - description_bbox: Скупови измена унутар %{bbox} - description_friend: Измене ваших пријатеља - description_nearby: Измене од околних корисника - description_user: Скупови измена корисника %{user} - description_user_bbox: Скупови измена корисника %{user} унутар %{bbox} - heading: Скупови измена - heading_bbox: Скупови измена - heading_friend: Измене - heading_nearby: Измене - heading_user: Скупови измена - heading_user_bbox: Скупови измена title: Скупови измена - title_bbox: Скупови измена унутар %{bbox} title_friend: Измене ваших пријатеља title_nearby: Измене од околних корисника title_user: Скупови измена корисника %{user} - title_user_bbox: Скупови измена корисника %{user} унутар %{bbox} timeout: sorry: Жао нам је, али списак измена који сте захтевали је предугачак. diary_entry: @@ -361,7 +212,7 @@ sr: feed: all: description: Скорашњи уноси у дневнику од корисника Опенстритмапа - title: Уноси у дневнику Опенстритмапа + title: Уноси у дневнику OpenStreetMap language: description: Скорашњи уноси у дневнику од корисника на %{language_name} title: Уноси у дневнику на %{language_name} @@ -375,7 +226,7 @@ sr: newer_entries: Новији уноси no_entries: Нема уноса у дневнику older_entries: Старији уноси - recent_entries: "Скорашњи уноси у дневнику:" + recent_entries: Скорашњи уноси у дневник title: Кориснички дневници title_friends: Дневници пријатеља title_nearby: Дневници околних корисника @@ -414,7 +265,7 @@ sr: area_to_export: Подручје за извоз embeddable_html: Уградиви HTML код export_button: Извези - export_details: Подаци Опенстритмапа су доступни под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0. + export_details: Подаци OpenStreetMap-а су доступни под лиценцом Open Data Commons Open Database License (ODbL). format: Формат format_to_export: Формат за извоз image_size: Величина слике @@ -425,34 +276,25 @@ sr: map_image: Слика мапе (приказује стандардни слој) max: највише options: Могућности - osm_xml_data: Опенстритмап XML подаци + osm_xml_data: OpenStreetMap XML подаци output: Излаз paste_html: Убаците HTML код за уграђивање на странице scale: Размера too_large: body: Ово подручје је превелико да би било извезено у формату XML. Увећајте приказ или изаберите мању површину. - heading: Подручје је превелико + other: + title: Остали извори zoom: Увећање - start_rjs: - add_marker: Додај маркер на мапу - change_marker: Промени положај маркера - click_add_marker: Кликните на мапу да бисте додали маркер - drag_a_box: Превуците оквир на мапи да бисте изабрали подручје - export: Извези - manually_select: Ручно изаберите друго подручје - view_larger_map: Погледај већу мапу + title: Извоз geocoder: description: title: geonames: Локација из Географских имена - osm_namefinder: "%{types} из Трагача назива" osm_nominatim: Локација из Номинатима types: cities: Градови places: Места towns: Варошице - description_osm_namefinder: - prefix: "%{distance} %{direction} од %{type}" direction: east: источно north: северно @@ -474,15 +316,18 @@ sr: ca_postcode: Резултати из Геокодера geonames: Резултати из Географских имена latlon: Резултати из Интернала - osm_namefinder: Резултати из Трагача назива osm_nominatim: Резултати из Номинатима uk_postcode: Резултати из NPEMap-а us_postcode: Резултати из Геокодера - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} од %{parentname})" - suffix_place: ", %{distance} %{direction} од %{placename}" - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: + admin_levels: + level10: Приградска граница + level2: Државна граница + level4: Савезна граница + level5: Регионална граница + level6: Окружна граница + level8: Градска граница + level9: Сеоска граница prefix: aeroway: aerodrome: Аеродром @@ -605,6 +450,8 @@ sr: "yes": Мост building: "yes": Зграда + emergency: + fire_hydrant: Хидрант highway: bridleway: Коњичка стаза bus_guideway: Аутобуска трака @@ -728,6 +575,8 @@ sr: airfield: Војни аеродром barracks: Касарна bunker: Бункер + mountain_pass: + "yes": Планински прелаз natural: bay: Залив beach: Плажа @@ -888,6 +737,7 @@ sr: organic: Продавница здраве хране outdoor: Штанд pet: Продавница кућних љубимаца + pharmacy: Апотека photo: Фотографска радња salon: Салон shoes: Продавница обуће @@ -899,6 +749,7 @@ sr: travel_agency: Туристичка агенција video: Видеотека wine: Трговина пићем + "yes": Продавница tourism: alpine_hut: Планинарски дом artwork: Галерија @@ -948,68 +799,70 @@ sr: html: dir: ltr javascripts: + close: Затвори map: base: cycle_map: Бициклистичка мапа mapquest: Мапквест опен standard: Стандардна transport_map: Саобраћајна мапа - overlays: - maplint: Маплинт + layers: + title: Слојеви + zoom: + in: Увећај + out: Умањи + notes: + show: + comment: Коментариши + comment_and_resolve: Коментариши и реши + hide: Сакриј + resolve: Реши + share: + cancel: Откажи + download: Преузми + embed: HTML + format: "Формат:" + image: Слика + link: Веза или HTML + long_link: Веза + scale: Размераː + short_link: Кратка веза + short_url: Скраћени URL + title: Дели site: edit_disabled_tooltip: Увећајте приказ да бисте уредили мапу edit_tooltip: Уредите мапу - edit_zoom_alert: Морате увећати приказ да бисте уредили мапу - history_disabled_tooltip: Увећајте приказ да бисте видели измене за ово подручје - history_tooltip: Погледајте измене за ово подручје - history_zoom_alert: Морате увећати приказ да бисте видели измене за ово подручје layouts: + about: О нама community: Заједница community_blogs: Блогови заједнице community_blogs_title: Блогови чланова заједнице - copyright: Ауторска права и лиценца - documentation: Документација - documentation_title: Документација пројекта + copyright: Ауторска права + data: Подаци donate: Помозите нам тако што ћете %{link} ради одржавања потребног хардвера. - donate_link_text: приложити новац edit: Уреди edit_with: Уреди уређивачем %{editor} export: Извези - export_tooltip: Извезите податке мапе + export_data: Извоз података foundation: Задужбина foundation_title: Задужбина Опенстритмап gps_traces: ГПС трагови gps_traces_tooltip: Управљајте ГПС траговима help: Помоћ - help_centre: Центар за помоћ - help_title: Страница помоћи за пројекат - help_url: http://help.openstreetmap.org/ history: Историја - home: дом - home_tooltip: Иди на локацију дома - inbox: примљене (%{count}) - inbox_tooltip: - one: Ваше сандуче садржи једну непрочитану поруку - other: Ваше сандуче садржи %{count} непрочитане поруке - zero: Ваше сандуче не садржи непрочитане поруке - intro_1: Опенстритмап је слободна мапа целог света. Сачињавају је корисници као што сте ви. + home: Иди на место дома intro_2_create_account: Отворите налог - intro_2_download: преузимање - intro_2_html: Подаци су слободни за %{download} и %{use} под условима лиценце %{license}. %{create_account} да побољшате мапу. - intro_2_license: отворена лиценца - intro_2_use: употреба - license: - alt: CC BY-SA 2.0 - title: Подаци Опенстритмапа су објављени под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0 - log_in: пријави ме + intro_header: Добродошли на Опенстритмап! + intro_text: Опенстритмапа је мапа света, створена од стране људи попут тебе и слободна је за коришћење под отвореном лиценцом. + learn_more: Сазнајте више + log_in: Пријави ме log_in_tooltip: Пријавите се с постојећим налогом logo: alt_text: Логотип Опенстритмапа - logout: одјави ме - logout_tooltip: Одјавите се + logout: Одјави ме make_a_donation: text: Приложите новац - title: Подржите Опенстритмап новчаним прилогом + title: Подржите OpenStreetMap новчаним прилогом osm_offline: База података Опенстритмапа је тренутно недоступна док се не заврше важни радови на одржавању. osm_read_only: Због радова на одржавању базе података Опенстритмапа, исту тренутно није могуће мењати. partners_bytemark: Хостинг „Бајтмарк“ @@ -1018,27 +871,46 @@ sr: partners_partners: партнери partners_ucl: VR центар UCL-а project_name: - h1: Опенстритмап - title: Опенстритмап - sign_up: отвори налог + h1: OpenStreetMap + title: OpenStreetMap + sign_up: Отвори налог sign_up_tooltip: Отворите налог да бисте уређивали - sotm2011: Дођите на Конференцију Опенстритмапа 2011, Стање мапе, од 9. до 11. септембра у Денверу! + start_mapping: Почни с мапирањем tag_line: Слободна вики мапа света user_diaries: Дневници user_diaries_tooltip: Погледајте корисничке дневнике - view: Преглед - view_tooltip: Погледајте мапу - welcome_user: Добро дошли, %{user_link} - welcome_user_link_tooltip: Ваша корисничка страница - wiki: вики - wiki_title: Вики странице пројекта - wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Main_Page?uselang=sr-ec license_page: foreign: english_link: енглеског оригинала text: У случају сукоба између преведене странице и %{english_original_link}, енглеска страница има предност title: О преводу - legal_babble: "

    Ауторска права и лиценца

    \n

    \n Опенстритмап чине слободни подаци који су објављени под\n лиценцом \n Кријејтив комонс Ауторство-Делити под истим условима 2.0 (CC BY-SA).\n

    \n

    \n Можете да умножавате, делите, преносите и прилагођавате\n наше мапе и податке, све док именујете Опенстритмап и њене\n уреднике. Ако желите да мењате и дограђујете наше податке,\n можете их делити само под истом лиценцом.\n Цео \n текст уговора објашњава вам ваша права и одговорности.\n

    \n\n

    Како да именујете Опенстритмап

    \n

    \n Ако користите наше слике мапа, тражимо да заслуге садрже\n бар “© Доприносиоци\n Опенстритмапа, CC BY-SA”. Ако користите само податке мапа,\n наведите “Картографски подаци © Доприносиоци Опенстритмапа,\n CC BY-SA”.\n

    \n

    \n Где је могуће, Опенстритмап би требало да води до адресе http://www.openstreetmap.org/\n и CC BY-SA до http://creativecommons.org/licenses/by-sa/2.0/.\n Ако користите медијум у ком се везе не могу поставити\n (нпр. штампани рад), предлажемо да усмерите ваше\n читаоце на www.openstreetmap.org (по могућству\n проширавањем ‘Опенстритмапа’ на целу адресу)\n и на www.creativecommons.org.\n

    \n\n

    Сазнајте више

    \n

    \n Прочитајте више о коришћењу наших података на ЧПП.\n

    \n

    \n Подсећамо уреднике Опенстритмапа да никада не додају податке\n од било ког извора заштићеног ауторским правима (нпр.\n Гугл мапе или штампане мапе) без изричите дозволе\n носиоца ауторског права.\n

    \n

    \n Иако Опенстритмап чине слободни подаци, не можемо да\n обезбедимо бесплатне АПИ-је мапа другим програмерима.\n\n Погледајте нашу политику\n о коришћењу АПИ-ја, политику\n о приказивању мапа и политику\n о коришћењу Номинатима.\n\n

    Наши сарадници

    \n

    \n Наша лиценца CC BY-SA захтева од вас да “морате\n навести име изворног аутора или даваоца лиценце”.\n Појединачни картографи не захтевају истицање заслуга осим\n “Опенстритмап доприносиоца”, али када подаци\n припадају националној географској агенцији или другом\n већем извору који је укључен у Опенстритмап, разумно је\n навести извор или оставити хипервезу до њега.\n

    \n\n\n\n
      \n
    • Аустралија: садржи податке о општинама\n на основу података Аустралијског бироа за статистику.
    • \n
    • Аустрија: садржи податке из\n Штата Виена под лиценцом\n CC BY),\n Ланд Форарлберг и\n \t+ \t\nЛанд Тирол (под лиценцом CC-BY AT са изменама и допунама).
    • \n
    • Канада: садржи податке из\n Беобазе®, Геогратиса (© Одељење за природне\n ресурсе Канаде), Канвек (© Одељење за природне\n ресурсе Канаде) и Статкан (Географски одсек,\n Завод за статистику Канаде).
    • \n
    • Француска: садржи податке који потичу од\n Генералне дирекције за опорезивање.
    • \n
    • Холандија: садржи © и податке, 2007\n \t+ \t\n (www.and.com)
    • \n
    • Нови Зеланд: садржи податке који потичу од\n Land Information New Zealand. Крунска ауторска права задржана.
    • \n
    • Пољска: садржи податке из UMP-pcPL мапа. Ауторска права\n UMP-pcPL доприносиоца.\n \n Више о коришћењу Опенстритмапових UMP података
    • \n
    • Јужна Африка: садржи податке који потичу од \t\n Главног директората:\n Националне геопросторне информације, државна права задржана.
    • \n
    • Уједињено Краљевство: садржи Званичне\n податке геодетског премеравања © Ауторска права 2010.
    • \n
    \n\n

    \n Укључивање података у Опенстритмап не подразумева да изворни\n власник података прихвата Опенстритмап, обезбеђује било какву\n гаранцију или прихвата одговорност.\n

    " + legal_babble: + attribution_example: + alt: Пример како да наведете Опенстритмап на некој страници + title: Пример за навођење + contributors_at_html: "Аустрија: садржи податке из\n Штата Виена под лиценцом\n CC BY),\n Ланд Форарлберг и\n \t+ \t\nЛанд Тирол (под лиценцом CC-BY AT са изменама и допунама)." + contributors_ca_html: "Канада: садржи податке из\n Беобазе®, Геогратиса (© Одељење за природне\n ресурсе Канаде), Канвек (© Одељење за природне\n ресурсе Канаде) и Статкан (Географски одсек,\n Завод за статистику Канаде)." + contributors_footer_1_html: "Више информација о овим и другим изворима коришћеним\nза побољшавање Опенстритмапа можете наћи на страници Доприносиоци на нашем викију." + contributors_footer_2_html: " Укључивање података у Опенстритмап не подразумева да изворни\n власник података прихвата Опенстритмап, обезбеђује било какву\n гаранцију или прихвата одговорност." + contributors_fr_html: "Француска: садржи податке који потичу од\n Генералне дирекције за опорезивање." + contributors_gb_html: "Уједињено Краљевство: Садржи податке\nКартографског завода Уједињеног Краљевства© Крунска ауторска права и\nправа базе 2010-12." + contributors_intro_html: "У нашем пројекту учествује на хиљаде појединаца. Користимо и\nподатке с отвореном лиценцом од државних картографских установа\nи других извора, међу којима су:" + contributors_nl_html: "Холандија: садржи © AND подаци, 2007\n \t+ \t\n (www.and.com)" + contributors_nz_html: "Нови Зеланд: садржи податке који потичу од\n Land Information New Zealand. Крунска ауторска права задржана." + contributors_title_html: Наши сарадници + contributors_za_html: "Јужноафричка Република: садржи податке из\nГлавне управе:\nНационална катастарска служба, државна ауторска права задржана." + credit_1_html: " Ако користите наше слике мапа, тражимо да заслуге садрже\n бар “© Доприносиоци\n Опенстритмапа, CC BY-SA”. Ако користите само податке мапа,\n наведите “Картографски подаци © Доприносиоци Опенстритмапа,\n CC BY-SA”." + credit_2_html: " Где је могуће, OpenStreetMap би требало да води до адресе http://www.openstreetmap.org/\n и CC BY-SA до http://creativecommons.org/licenses/by-sa/2.0/.\n Ако користите медијум у ком се везе не могу поставити\n (нпр. штампани рад), предлажемо да усмерите ваше\n читаоце на www.openstreetmap.org (по могућству\n проширавањем ‘Опенстритмапа’ на целу адресу)\n и на www.creativecommons.org." + credit_3_html: "Ради прегледније електронске мапе, приписивање би требало да се прикаже у углу мапе.\nНа пример:" + credit_title_html: Како да именујете OpenStreetMap + infringement_title_html: Кршење ауторских права + intro_1_html: "Опенстритмап чине слободни подаци, лиценцирани под Open Data\nCommons Open Database License (ODbL)." + intro_2_html: " Можете да умножавате, делите, преносите и прилагођавате\n наше податке, све док именујете Опенстритмап и њене\n уреднике. Ако желите да мењате и дограђујете наше податке,\n можете их делити само под истом лиценцом.\n Цео \n текст уговора објашњава вам ваша права и одговорности." + intro_3_html: "Картографија у нашим пољима мапа и документацији\nнуди се под лиценцом Кријејтив комонс Ауторство-Делити под истим условима 2.0 (CC-BY-SA)." + more_1_html: "Више о употреби података и како да нас наводите можете пронаћи на Правним ЧПП." + more_2_html: "Иако OpenStreetMap ради с отвореним подацима, не можемо\nпонудити бесплатан АПИ за мапе независним програмерима.\nПогледајте правила о употреби АПИ-ја,\nправила о употреби поља\nи Номинатим." + more_title_html: Сазнајте више + title_html: Ауторска права и лиценца native: mapping_link: почните с мапирањем native_link: српско издање @@ -1098,12 +970,9 @@ sr: title: Послате to: За read: - back_to_inbox: Назад на примљене - back_to_outbox: Назад на послате + back: Назад date: Датум from: Од - reading_your_messages: Ваше поруке - reading_your_sent_messages: Ваше послате поруке reply_button: Одговори subject: Наслов title: Прочитај поруку @@ -1114,6 +983,18 @@ sr: wrong_user: Пријављени сте као %{user}, али порука на коју сте желели да одговорите није послата том кориснику. Пријавите се као исправан корисник да бисте одговорили. sent_message_summary: delete_button: Обриши + note: + description: + opened_at_html: Направљено пре %{when} + entry: + comment: Коментар + full: Потпуна белешка + mine: + created_at: Направљено + creator: Творац + description: Опис + id: Id + last_changed: Последња измена notifier: diary_comment_notification: footer: Можете прочитати коментаре на %{readurl}, прокоментарисати на %{commenturl} или одговорити на %{replyurl} @@ -1129,13 +1010,12 @@ sr: email_confirm_plain: click_the_link: Ако сте то ви, кликните на везу испод да бисте потврдили измене. greeting: Поздрав, - hopefully_you_1: Неко (вероватно ви) желео би да промени е-адресу на - hopefully_you_2: "%{server_url} на %{new_address}." + hopefully_you: Неко (вероватно ви) желео би да промени е-адресу са %{server_url} на %{new_address}. friend_notification: befriend_them: Можете га/је додати и као пријатеља на %{befriendurl}. had_added_you: "%{user} вас је додао као пријатеља на Опенстритмапу." see_their_profile: Можете видети његов/њен профил на %{userurl}. - subject: "[Опенстритмап] %{user} вас је додао као пријатеља" + subject: "[OpenStreetMap] %{user} вас је додао као пријатеља" gpx_notification: and_no_tags: и без ознака. and_the_tags: "и са следећим ознакама:" @@ -1160,47 +1040,17 @@ sr: lost_password_plain: click_the_link: Ако сте то ви, кликните на везу испод да бисте поништили лозинку. greeting: Поздрав, - hopefully_you_1: Неко (вероватно ви) затражио је поништавање лозинке за - hopefully_you_2: налог с овом е-адресом. message_notification: - footer1: Можете прочитати поруку и на %{readurl} - footer2: и можете одговорити на %{replyurl} header: "%{from_user} вам посла поруку преко Опенстритмапа под насловом %{subject}:" hi: Поздрав, %{to_user}, subject_header: "[Опенстритмап] – %{subject}" + note_comment_notification: + anonymous: Анонимни корисник + greeting: Поздрав, signup_confirm: - subject: "[OpenStreetMap] Потврдите вашу е-адресу" - signup_confirm_html: - ask_questions: Можете поставити било које питање о Опенстритмапу на нашим страницама за питања и одговоре. - click_the_link: Ако сте то ви, добро дошли! Кликните на везу испод да бисте потврдили ваш налог и прочитали више о Опенстритмапу - current_user: Списак тренутних корисника у категоријама, заснован на томе где се они налазе, доступан је на Category:Users_by_geographical_region. - get_reading: Прочитајте више о Опенстритмапу на викију, будите у току с најновијим вестима преко блога или Твитера или претражите OpenGeoData, блог оснивача Опенстритмапа за историју пројеката. Можете да слушате и подемисије! - greeting: Поздрав! - hopefully_you: Неко (вероватно ви) желео би да отвори налог на - introductory_video: Можете погледати %{introductory_video_link}. - more_videos: Постоји %{more_videos_link}. - more_videos_here: више видео-снимака овде - user_wiki_page: Препоручујемо вам да направите корисничку страницу на викију која укључује ознаке категорија које означавају где се налазите, као на пример [[Category:Users_in_London]]. - video_to_openstreetmap: уводни видео-снимак за Опенстритмап - wiki_signup: Можете и да отворите налог на викију. - signup_confirm_plain: - ask_questions: "Можете поставити било које питање о Опенстритмапу на нашим страницама за питања и одговоре:" - blog_and_twitter: "Будите у току с најновијим вестима преко блога или Твитера:" - click_the_link_1: Ако сте то ви, добро дошли! Кликните на везу испод да бисте потврдили свој - click_the_link_2: кориснички налог. Прочитајте више о Опенстритмапу. - current_user_1: Списак тренутних корисника у категоријама, на основу положаја у свету - current_user_2: "где живе, доступан је на:" - greeting: Поздрав! - hopefully_you: Неко (вероватно ви) желео би да отвори налог на - introductory_video: "Погледајте уводни видео-снимак за Опенстритмап овде:" - more_videos: "Више видео-снимака можете наћи овде:" - opengeodata: "OpenGeoData.org је блог Стива Коста, оснивача Опенстритмапа:" - the_wiki: "Прочитајте више о Опенстритмапу на викију:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/Sr:Beginners'_guide?uselang=sr-ec - user_wiki_1: Препоручујемо вам да направите корисничку страницу која укључује - user_wiki_2: ознаке категорија које означавају одакле сте, као на пример [[Category:Users_in_London]]. - wiki_signup: "Можете и отворити налог на нашем викију:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:UserLogin&type=signup&returnto=MK%3AMain_Page&uselang=sr-ec + created: Неко (надамо се ви) управо је отворио налог на %{site_url}. + greeting: Здраво! + subject: "[OpenStreetMap] Добро дошли на OpenStreetMap" oauth: oauthorize: allow_read_gpx: чита ваше приватне ГПС трагове. @@ -1217,7 +1067,7 @@ sr: create: flash: Подаци су успешно уписани destroy: - flash: Упис програма је укинут + flash: Уништена је регистрација клијентског програма edit: submit: Уреди title: Уреди програм @@ -1227,6 +1077,7 @@ sr: allow_write_api: мењање мапе. allow_write_diary: прављење уноса у дневнику, коментарисање и додавање пријатеља. allow_write_gpx: отпремање ГПС трагова. + allow_write_notes: измени белешке. allow_write_prefs: мењање корисничких поставки. callback_url: Повратна адреса name: Име @@ -1257,6 +1108,7 @@ sr: allow_write_api: мења мапу. allow_write_diary: прави уносе у дневнику, коментарише и додаје пријатеље. allow_write_gpx: отпрема ГПС трагове. + allow_write_notes: измени белешке. allow_write_prefs: мења корисничке поставке. authorize_url: "Адреса овлашћења:" confirm: Јесте ли сигурни? @@ -1316,18 +1168,15 @@ sr: potlatch_unsaved_changes: Нисте сачували измене. Да бисте то урадили, поништите текућу путању или тачку, ако уређујете наживо, или кликните на дугме за чување. user_page_link: корисничке странице index: + createnote: Додај белешку js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили. - js_2: Опенстритмап користи јаваскрипт за приказивање мапа. + js_2: OpenStreetMap користи јаваскрипт за приказивање мапа. license: - license_name: Кријејтив комонс Ауторство-Делити под истим условима 2.0 - notice: Објављено под лиценцом %{license_name} од %{project_name} и њених сарадника. - project_name: Опенстритмапа + copyright: Ауторска права Опенстритмап и доприносиоци, под отвореном лиценцом permalink: Трајна веза remote_failed: Уређивање није успело. Проверите да ли је JOSM или Merkaartor учитан и да је могућност даљинског управљања омогућена shortlink: Кратка веза key: - map_key: Легенда - map_key_tooltip: Легенда мапе table: entry: admin: Административна граница @@ -1413,7 +1262,6 @@ sr: preview: Преглед search: search: Претрага - search_help: "примери: „Нови Сад“, „Војводе Степе, Београд“ или „железничка станица, Ниш“ више примера…" submit_text: Иди where_am_i: Где сам? where_am_i_title: Установите тренутну локацију помоћу претраживача @@ -1448,6 +1296,7 @@ sr: visibility_help: шта ово значи? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=sr-ec list: + empty_html: Овде још нема ништа. Отпремите нови траг или сазнајте више о ГПС трагању на вики страници. public_traces: Јавни ГПС трагови public_traces_from: Јавни ГПС трагови корисника %{user} tagged_with: " означени са %{tags}" @@ -1494,8 +1343,8 @@ sr: trace_optionals: tags: Ознаке trace_paging_nav: - next: Следећи » - previous: « Претходни + newer: Новији трагови + older: Старији трагови showing_page: Приказ странице %{page} view: delete_track: Обриши овај траг @@ -1536,6 +1385,9 @@ sr: email never displayed publicly: (никада се не приказује јавно) flash update success: Подаци о кориснику су успешно ажурирани. flash update success confirm needed: Подаци о кориснику су успешно ажурирани. Проверите е-пошту да бисте потврдили своју нову е-адресу. + gravatar: + gravatar: Користи Граватар + link text: шта је ово? home location: "Место становања:" image: "Слика:" image size hint: (квадратне слике од барем 100×100 пиксела раде најбоље) @@ -1571,12 +1423,9 @@ sr: update home location on click: Ажурирати место становања када кликнем на мапу? confirm: already active: Овај налог је већ потврђен. - before you start: Пре него што почнете с мапирањем, попуните неке податке о себи у обрасцу који се налази испод. button: Потврди heading: Потврда корисничког налога press confirm button: Притисните дугме за потврду да бисте активирали налог. - reconfirm: Ако је прошло неко време откако сте отворили налог, можда ћете морати да затражите нову потврду е-поштом. - success: Ваш налог је потврђен. Хвала вам на упису! unknown token: Изгледа да тај новчић не постоји. confirm_email: button: Потврди @@ -1613,8 +1462,6 @@ sr: lost password link: Заборавили сте лозинку? new to osm: Нови сте на сајту? no account: Немате налог? - notice: Сазнајте више о предстојећој измени лиценце (преводи) (разговор) - notice_terms: Опенстритмап добија нову лиценцу 1. априла 2012. Ова лиценца је отворена исто као и садашња, али правни детаљи су много погоднији нашој картографској бази. Са задовољством би задржали ваше доприносе на Опенстритмапу, али ово је могуће само ако прихватите да они буду објављени под условима нове лиценце. У супротном, мораћемо да их уклонимо из базе.

    Пријавите се, прочитајте услове и видите да ли се слажете с њима. Хвала! openid: "%{logo} OpenID:" openid invalid: Изгледа да OpenID није исправан openid missing provider: Не могу да се повежем с OpenID добављачем @@ -1640,7 +1487,7 @@ sr: title: Пријава путем Јахуа password: "Лозинка:" register now: Отворите налог - remember: "Запамти ме:" + remember: Запамти ме title: Пријава to make changes: Да бисте правили измене, морате имати налог. with openid: "Резервни начин је да користите OpenID:" @@ -1659,7 +1506,9 @@ sr: title: Повратак лозинке make_friend: already_a_friend: Већ сте пријатељ са %{name}. + button: Додај као пријатеља failed: Не могу да додам %{name} као пријатеља. + heading: Додати корисника %{user} као пријатеља? success: "%{name} је сада ваш пријатељ." new: confirm email address: "Потврдите е-адресу:" @@ -1669,9 +1518,6 @@ sr: display name: "Име приказа:" display name description: Јавно приказано корисничко име. Касније га можете променити у поставкама. email address: "Е-адреса:" - fill_form: Када попуните образац, послаћемо вам поруку за активирање налога. - flash create success message: Хвала вам на отварању налога. Послали смо вам потврдну поруку на %{email}. Након што потврдите свој налог, моћи ћете да почнете с мапирањем.

    Ако користите систем против непожељних порука, додајте webmaster@openstreetmap.org у списак дозвољених адреса јер нисмо у могућности да одговоримо на било који захтев за потврду. - heading: Отварање корисничког налога license_agreement: Након што потврдите налог, мораћете да прихватите услове уређивања. no_auto_account_create: Нажалост, тренутно нисмо у могућности да отворимо нови налог. not displayed publicly: Не приказује се јавно (погледајте политику приватности) @@ -1693,6 +1539,8 @@ sr: nearby mapper: Оближњи картограф your location: Ваша локација remove_friend: + button: Уклони из списка пријатеља + heading: Уклонити %{user} из списка пријатеља? not_a_friend: "%{name} није ваш пријатељ." success: "%{name} је избачен из пријатеља." reset_password: @@ -1731,10 +1579,10 @@ sr: activate_user: активирај овог корисника add as friend: додај као пријатеља ago: (пре %{time_in_words_ago}) - block_history: погледај добијене блокаде + block_history: добијене блокаде blocks by me: моја блокирања blocks on me: блокирања на мене - comments: коментари + comments: Коментари confirm: Потврди confirm_user: потврди овог корисника create_block: блокирај овог корисника @@ -1746,8 +1594,8 @@ sr: deactivate_user: деактивирај овог корисника delete_user: обриши овог корисника description: Опис - diary: дневник - edits: измене + diary: Дневник + edits: Измене email address: "Е-адреса:" friends_changesets: Све измене пријатеља friends_diaries: Преглед свих записа у дневнику пријатеља @@ -1757,11 +1605,12 @@ sr: latest edit: "Последња измена пре %{ago}:" m away: удаљено %{count} м mapper since: "Картограф од:" - moderator_history: погледај дате блокаде + moderator_history: дате блокаде my comments: моји коментари my diary: мој дневник my edits: моје измене - my settings: моје поставке + my profile: Мој профил + my settings: Моје поставке my traces: моји трагови nearby users: "Остали оближњи корисници:" nearby_changesets: Преглед свих измена околних корисника @@ -1784,7 +1633,7 @@ sr: settings_link_text: поставкама spam score: "Оцена спама:" status: "Стање:" - traces: трагови + traces: Трагови unhide_user: откриј овог корисника user location: Боравиште корисника your friends: Ваши пријатељи @@ -1842,11 +1691,14 @@ sr: creator_name: Творац display_name: Блокирани корисник edit: Уреди + next: Следеће » not_revoked: (није опозвано) + previous: « Претходно reason: Разлози за блокирање revoke: Опозови revoker_name: Опозвао show: Прикажи + showing_page: Приказ странице %{page} status: Стање period: one: 1 сат @@ -1894,3 +1746,7 @@ sr: fail: Не могу да одузмем улогу „%{role}“ од корисника %{name}. Проверите да ли су корисник и улога исправни. heading: Потврда одузимања улоге title: Потврда одузимања улоге + welcome_page: + questions: + title: Имате питања? + title: Добро дошли! diff --git a/config/locales/sv.yml b/config/locales/sv.yml index adf23cd53a3..82a1a87fc80 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1,28 +1,48 @@ # Messages for Swedish (svenska) # Exported from translatewiki.net # Export driver: syck-pecl +# Author: Adrianod # Author: Ainali # Author: Balp # Author: Cohan +# Author: Cybjit +# Author: Fader # Author: Grillo +# Author: Haxpett # Author: Jas # Author: Jopparn # Author: Liftarn # Author: Lokal Profil # Author: Luen # Author: Magol +# Author: Malmis +# Author: Nemo bis # Author: Per # Author: Pladask # Author: Poxnar # Author: Sannab # Author: Sendelbach # Author: Sertion +# Author: Shirayuki # Author: The real emj +# Author: Tor.klingberg # Author: Ufred # Author: VickyC # Author: WikiPhoenix # Author: Zvenzzon sv: + about_page: + community_driven_html: "OpenStreetMaps gemenskap är blandad, passionerad och växer varje dag.\nBland våra bidragsgivare finns kartentusiaster, GIS-proffs, ingenjörer som håller igång OSM:s servrar, frivilliga som kartlägger katastrofområden, och många andra.\nFör mer information om gemenskapen, se användardagböcker, gemenskapens bloggar, och OSM-stiftelsens webbplats." + community_driven_title: Gemenskapsdriven + copyright_html: ©OpenStreetMap
    bidragsgivare + lede_text: OpenStreetMap är byggt av en gemenskap av kartografer som bidrar och underhåller data om vägar, stigar, caféer, järnvägsstationer och mycket mer, över hela världen. + local_knowledge_html: OpenStreetMap betonar lokal kunskap. Bidragsgivare använder flygbilder, GPS-enheter och lågteknologiska fältkartor för att kontrollera att OSM är korrekt och uppdaterad. + local_knowledge_title: Lokalkännedom + next: Nästa + open_data_html: "OpenStreetMap är öppna data: du kan fritt använda den för valfritt syfte så länge du anger OpenStreetMap och dess bidragsgivare som källa. Om du förändrar eller bygger vidare på datan på vissa sätt, kan du endast distribuera resultatet under samma licens. Se sidan för Upphovsrätt och Licens för detaljer." + open_data_title: Öppna data + partners_title: Partners + used_by: "%{name} driver kartdata till hundratals av webbsidor, mobilappar och fysiska apparater" activerecord: attributes: diary_comment: @@ -31,7 +51,7 @@ sv: language: Språk latitude: Latitud longitude: Longitud - title: Rubrik + title: Ämne user: Användare friend: friend: Vän @@ -40,7 +60,7 @@ sv: body: Brödtext recipient: Mottagare sender: Avsändare - title: Rubrik + title: Ämne trace: description: Beskrivning latitude: Latitud @@ -53,7 +73,7 @@ sv: user: active: Aktiv description: Beskrivning - display_name: Visningsnamn + display_name: Visat namn email: E-post languages: Språk pass_crypt: Lösenord @@ -77,9 +97,9 @@ sv: old_relation_tag: Gammal relationstagg old_way: Gammal sträcka old_way_node: Gammal sträcknod - old_way_tag: Gammal vägtagg + old_way_tag: Gammal sträcktagg relation: Relation - relation_member: Medlem i relation + relation_member: Relationsmedlem relation_tag: Relationstagg session: Session trace: Spår @@ -100,165 +120,87 @@ sv: blocked: Du har blivit blockerad från API:et. Var god logga in via webinterfacet för att få reda på mer. need_to_see_terms: Din tillgång till API:t är tillfälligt avstängd. Logga in på webbgränssnittet för att se bidragsvillkor. Du behöver inte godkänna dem, men du måste se dem. browse: + anonymous: anonym changeset: - changeset: "Ändringsset: %{id}" + belongs_to: Författare changesetxml: XML för ändringsset - download: Ladda ner %{changeset_xml_link} eller %{osmchange_xml_link} feed: title: Ändringsset %{id} title_comment: Ändringsset %{id} - %{comment} + node: Noder (%{count}) + node_paginated: Noder (%{x}-%{y} av %{count}) osmchangexml: osmChange XML - title: Ändringsset - changeset_details: - belongs_to: "Tillhör:" - bounding_box: "Omslutande område:" - box: box - closed_at: "Avslutad:" - created_at: "Skapad:" - has_nodes: - one: "Innehåller följande nod:" - other: "Innehåller följande %{count} noder:" - has_relations: - one: "Har följande %{count} relationer:" - other: "Innehåller följande %{count} relationer:" - has_ways: - one: "Har följande %{count} sträcka:" - other: "Innehåller följande %{count} sträckor:" - no_bounding_box: Inga yttre gränser (bounding box) lagrades för detta changeset. - show_area_box: Visa boxarea - common_details: - changeset_comment: "Kommentar:" - deleted_at: "Raderad:" - deleted_by: "Raderad av:" - edited_at: "Redigerad:" - edited_by: "Redigerad av:" - in_changeset: "I ändringsset:" - version: "Version:" + relation: Förbindelser (%{count}) + relation_paginated: Förbindelser (%{x}-%{y} av %{count}) + title: "Ändringsset: %{id}" + way: Sträckor (%{count}) + way_paginated: Sträckor (%{x}-%{y} av %{count}) + closed: Stängd + closed_by_html: Stängde för %{time} sedan av %{user} + closed_html: Stängde för %{time} sedan containing_relation: entry: Relation %{relation_name} entry_role: Relation %{relation_name} (som %{relation_role}) - map: - deleted: Borttaget - edit: - area: Redigera område - node: Redigera nod - relation: Redigera relation - way: Redigera väg - larger: - area: Se området på en större karta - node: Se noden på en större karta - relation: Se relationen på en större karta - way: Se sträckan på en större karta - loading: Läser in... - navigation: - all: - next_changeset_tooltip: Nästa ändringsset - next_node_tooltip: Nästa nod - next_relation_tooltip: Nästa relation - next_way_tooltip: Nästa väg - prev_changeset_tooltip: Föregående ändringsset - prev_node_tooltip: Föregående nod - prev_relation_tooltip: Föregående relation - prev_way_tooltip: Föregående väg - user: - name_changeset_tooltip: Se redigeringar av %{user} - next_changeset_tooltip: Nästa redigering av %{user} - prev_changeset_tooltip: Föregående redigering av %{user} + created: Skapad + created_by_html: Skapade %{time} sedan av %{user} + created_html: Skapade %{time} sedan + deleted_by_html: Raderade %{time} sedan av %{user} + download_xml: Ladda ner XML + edited_by_html: Redigerade %{time} sedan av %{user} + in_changeset: Ändringsset + location: "Plats:" + no_comment: (inga kommentarer) node: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Laddda hem XML - edit: redigera - node: Nod - node_title: "Nod: %{node_name}" - view_history: se historik - node_details: - coordinates: "Koordinater:" - part_of: "Del av:" - node_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Ladda ner XML - node_history: Nodhistorik - node_history_title: "Nodhistorik: %{node_name}" - view_details: visa detaljer + history_title: "Nodhistorik: %{name}" + title: "Nod: %{name}" not_found: - sorry: "%{type}en med id %{id} kunde inte hittas" + sorry: "Tyvärr kunde inte %{type} #%{id} hittas." type: changeset: ändringsset node: nod relation: relation - way: väg - paging_nav: - of: av - showing_page: Visar sida + way: sträcka + note: + closed_by: Löst av %{user} %{when} sedan + closed_by_anonymous: Löst av anonym %{when} sedan + closed_title: "Avklarad anteckning #%{note_name}" + commented_by: Kommentar från %{user} %{when} sedan + commented_by_anonymous: Kommentar från anonym %{when} sedan + hidden_by: Gömd av %{user} %{when} sedan + hidden_title: "Dold anteckning #%{note_name}" + new_note: Ny anteckning + open_by: Skapad av %{user} %{when} sedan + open_by_anonymous: Skapad av anonym %{when} sedan + open_title: "Ej avklarad anteckning #%{note_name}" + reopened_by: Återaktiverad av %{user} %{when} sedan + reopened_by_anonymous: Återaktiverad av anonym %{when} sedan + title: "Anteckning: %{id}" + part_of: Del av redacted: message_html: Version %{version} av denna %{type} kan inte visas då den har tagits bort. Se %{redaction_link} för detaljer. - redaction: Redaktering %{id} + redaction: Omarbetning %{id} type: node: nod relation: relation - way: väg + way: sträcka relation: - download: "%{download_xml_link} eller %{view_history_link}" - download_xml: Ladda ner XML - relation: Relation - relation_title: "Relation: %{relation_name}" - view_history: Visa historik - relation_details: - members: "Medlemmar:" - part_of: "Del av:" - relation_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Ladda hem XML - relation_history: Relationhistorik - relation_history_title: "Relationshistorik: %{relation_name}" - view_details: visa detaljer + history_title: "Förbindelsehistorik: %{name}" + members: Medlemmar + title: "Förbindelse: %{name}" relation_member: entry_role: "%{type} %{name} som %{role}" type: node: Nod relation: Relation - way: Väg - start: - manually_select: Välj ett område manuellt - view_data: Visa data för denna karta + way: Sträcka start_rjs: - data_frame_title: Data - data_layer_name: Bläddra kartdata - details: Detaljer - drag_a_box: Markera ett område på kartan. - edited_by_user_at_timestamp: Redigerad av [[user]] [[timestamp]] - hide_areas: Göm område - history_for_feature: Historik för [[feature]] + feature_warning: Laddar %{num_features} kartkomponenter, vilket kan göra din webbläsare långsam eller få den att sluta svara. Är säker på att du vill visa denna data? load_data: Ladda data - loaded_an_area_with_num_features: Detta område innehåller [[num_features]] objekt. En del webbläsare klarar inte av hantering av sådana stora mängder data. För att inte riskera att datorn ska slöas ner, bör du hålla antalet objekt till 100 eller färre. Om du är säker på att du vill visa datan som det är nu, kan du göra det genom att klicka på knappen nedan. - loading: Laddar... - manually_select: Välj en annan area manuellt - object_list: - api: Hämta detta område från API:t - back: Visa objektlista - details: Detaljer - heading: Objektlista - history: - type: - node: Nod [[id]] - way: Väg [[id]] - selected: - type: - node: Nod [[id]] - way: Väg [[id]] - type: - node: Nod - way: Väg - private_user: privat användare - show_areas: Visa område - show_history: Visa historik - unable_to_load_size: "Kan inte ladda: det omslutande området [[bbox_size]] är för stort (den måste vara mindre än %{max_bbox_size})" - wait: Vänta... - zoom_or_select: Zooma in eller välj arean du vill se. + loading: Läser in... tag_details: - tags: "Taggar:" + tags: Taggar wiki_link: - key: Wiki-beskrivningssidan för %{key} taggen + key: Wiki-beskrivningssidan för %{key}-taggen tag: Wiki-beskrivningssidan för %{key}=%{value}-taggen wikipedia_link: Artikeln om %{page} på Wikipedia timeout: @@ -267,64 +209,44 @@ sv: changeset: ändringsset node: nod relation: relation - way: väg + way: sträcka + version: Version + view_details: Visa detaljer + view_history: Visa historik way: - download: "%{download_xml_link}, %{view_history_link} eller %{edit_link}" - download_xml: Ladda hem XML - edit: redigera - view_history: se historik - way: Väg - way_title: "Väg: %{way_name}" - way_details: also_part_of: - one: också del av väg %{related_ways} - other: också del av vägarna %{related_ways} - nodes: "Noder:" - part_of: "Del av:" - way_history: - download: "%{download_xml_link} eller %{view_details_link}" - download_xml: Ladda hem XML - view_details: visa detaljer - way_history: Väghistorik - way_history_title: "Väghistorik: %{way_name}" + one: del av sträcka %{related_ways} + other: del av sträckorna %{related_ways} + history_title: "Sträckhistorik: %{name}" + nodes: Noder + title: "Sträcka: %{name}" changeset: changeset: anonymous: Anonym - big_area: (stor) - no_comment: (ingen) - no_edits: (inga ändringar) - show_area_box: visa område - still_editing: (redigerar fortfarande) + no_edits: (inga redigeringar) view_changeset_details: Visa detaljer om ändringsset changeset_paging_nav: next: Nästa » previous: « Föregående - showing_page: Visar sida %{page} + showing_page: Sida %{page} changesets: - area: Area + area: Område comment: Kommentar id: ID saved_at: Sparad user: Användare list: - description: Senaste ändringar - description_bbox: Changesets inom %{bbox} - description_friend: Changesets av dina vänner - description_nearby: Changesets av närliggande användare - description_user: Ändringsset av %{user} - description_user_bbox: Ändringsset av %{user} inom %{bbox} - heading: Ändringsset - heading_bbox: Ändringsset - heading_friend: Changesets - heading_nearby: Changesets - heading_user: Ändringsset - heading_user_bbox: Ändringsset + empty: Inga ändringsset hittades. + empty_area: Inga ändringsset i det här området. + empty_user: Inga ändringsset av den här användaren. + load_more: Läs in fler + no_more: Inga fler ändringsset hittades. + no_more_area: Inga fler ändringsset i det här området. + no_more_user: Inga fler ändringsset av den här användaren. title: Ändringsset - title_bbox: Changesets inom %{bbox} - title_friend: Changesets av dina vänner - title_nearby: Changesets av närliggande användare + title_friend: Ändringsset av dina vänner + title_nearby: Ändringsset av närbelägna användare title_user: Ändringsset av %{user} - title_user_bbox: Ändringsset av %{user} inom %{bbox} timeout: sorry: Kunde tyvärr inte lista begärda ändringsset. Begäran tog för lång tid att hämta. diary_entry: @@ -342,24 +264,25 @@ sv: hide_link: Dölj denna kommentar diary_entry: comment_count: - one: 1 kommentar + one: "%{count} kommentar" other: "%{count} kommentarer" - comment_link: Kommentera denna anteckning + zero: Inga kommentarer + comment_link: Kommentera detta inlägg confirm: Bekräfta - edit_link: Redigera denna anteckning - hide_link: Dölj den här posten + edit_link: Redigera detta inlägg + hide_link: Dölj detta inlägg posted_by: Skrivet av %{link_user} den %{created} på %{language_link} - reply_link: Svara på denna anteckning + reply_link: Svara på detta inlägg edit: body: "Meddelandetext:" language: "Språk:" latitude: "Latitud:" location: "Plats:" longitude: "Longitud:" - marker_text: Plats för inlägg + marker_text: Plats för dagboksinlägg save_button: Spara subject: "Ärende:" - title: Redigera dagboksanteckning + title: Redigera dagboksinlägg use_map_link: använd karta feed: all: @@ -367,41 +290,44 @@ sv: title: OpenStreetMap-dagboksinlägg language: description: Senaste dagboksinlägg från användare av OpenStreetMap på %{language_name} - title: Openstreetmap dagboksinlägg på %{language_name} + title: Openstreetmap-dagboksinlägg på %{language_name} user: description: Senaste dagboksinlägg på OpenStreetMap från %{user} - title: OpenStreetMap dagboksinlägg för användaren %{user} + title: OpenStreetMap-dagboksinlägg för användaren %{user} list: - in_language_title: Dagböcker på %{language} - new: Ny dagboksanteckning - new_title: Skapa inlägg i din användardagbok - newer_entries: Nyare anteckningar - no_entries: Inga dagboksanteckningar - older_entries: Äldre anteckningar - recent_entries: "Aktuella dagboksanteckningar:" + in_language_title: Dagboksinlägg på %{language} + new: Nytt dagboksinlägg + new_title: Skapa ett nytt inlägg i din användardagbok + newer_entries: Nyare inlägg + no_entries: Inga dagboksinlägg + older_entries: Äldre inlägg + recent_entries: Nyligen skapade dagboksinlägg title: Användardagböcker title_friends: Vänners dagböcker - title_nearby: Närliggande användares dagböcker + title_nearby: Närbelägna användares dagböcker user_title: "%{user}s dagbok" location: edit: Redigera location: "Plats:" view: Visa new: - title: Ny dagboksanteckning + title: Nytt dagboksinlägg no_such_entry: - body: Tyvärr finns inget inlägg med id %{id}. Kontrollera stavning eller så är länken du klickade på felaktig. - heading: "Ingen dagboksanteckning med id: %{id}" - title: Ingen sådan dagboksanteckning + body: Tyvärr finns inget dagboksinlägg eller -kommentar med id %{id}. Kontrollera stavning, eller så kan länken du klickade på vara felaktig. + heading: "Finns inget inlägg med id: %{id}" + title: Hittade inte dagboksinlägget view: leave_a_comment: Lämna en kommentar - login: Inloggning + login: Logga in login_to_leave_a_comment: "%{login_link} för att lämna en kommentar" save_button: Spara title: "%{user}s dagbok | %{title}" - user_title: Dagbok för %{user} + user_title: "%{user}s dagbok" editor: default: Standard (för närvarande %{name}) + id: + description: iD (webbläsarredigeraren) + name: iD potlatch: description: Potlatch 1 (redigera i webläsaren) name: Potlatch 1 @@ -414,13 +340,13 @@ sv: export: start: add_marker: Lägg till markör på kartan - area_to_export: Yta som ska exporteras + area_to_export: Område som ska exporteras embeddable_html: Inbäddad HTML export_button: Exportera - export_details: Data från OpenStreetMap har gjorts tillgänglig under licensen Creative Commons Erkännande-DelaLika 2.0. - format: "Format:" + export_details: Data från OpenStreetMap har gjorts tillgänglig under licensen Open Data Commons Open Database License (ODbL). + format: Format format_to_export: Format för export - image_size: "Bildstorlek:" + image_size: Bildstorlek latitude: "Lat:" licence: Licens longitude: "Lon:" @@ -433,29 +359,46 @@ sv: paste_html: Klistra in HTML för att bädda in på webbplats scale: Skala too_large: - body: Detta område är för stort för att exporteras som OpenStreetMap XML-data. Vänligen zooma in eller välja ett mindre område. - heading: For stort område + advice: "Om ovanstående export misslyckas, vänligen överväg att använda en av de källor som anges nedan:" + body: "Detta område är för stort för att exporteras som OpenStreetMap XML-data. Vänligen zooma in eller välj ett mindre område, eller använd en av följande källor för nedladdningar av bulkdata:" + geofabrik: + description: Regelbundet uppdaterat utdrag av kontinenter, länder och utvalda städer + title: Geofabrik Downloads + metro: + description: Utdrag av stora världsstäder och deras närområden + title: Metro Extracts + other: + description: Ytterligare källor anges på OpenStreetMaps wiki + title: Andra källor + overpass: + description: Hämta denna avgränsningsram från en spegel av OpenStreetMap-databasen + title: Overpass API + planet: + description: Regelbundet uppdaterade kopior av den kompletta OpenStreetMap-databasen + title: Planet OSM zoom: Zooma - start_rjs: - add_marker: Lägg till markör på kartan - change_marker: Ändra markörposition - click_add_marker: Klicka på kartan för att lägga till en markör - drag_a_box: Välj ett område på kartan genom att klicka och dra - export: Export - manually_select: Välj ett annat område manuellt - view_larger_map: Visa större karta + title: Exportera + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Klicka bara på eller samma ikon i kartrutan.\nDetta lägger till en markör på kartan som du kan flytta\n genom att dra. Skriv ditt meddelande och klicka sedan på spara, så kommer andra kartritare att undersöka." + join_the_community: + explanation_html: Om du har hittat ett problem med vår kartdata, till exempel att en väg saknas eller din adress, är den bästa lösningen är att gå med i OpenStreetMap-gemenskapen och lägga till eller reparera datan själv. + title: Gå med i gemenskapen + title: Hur man kan hjälpa till + other_concerns: + explanation_html: "Om du har frågor om hur vår data används eller om innehållet, se\nsidan om upphovsrätt för mer juridisk information eller kontakta lämplig\nOSMF-arbetsgrupp." + title: Övriga frågor + title: Rapportera ett problem / Fixa kartan geocoder: description: title: - geonames: Position från GeoNames - osm_namefinder: "%{types} från OpenStreetMap Namefinder" + geonames: Plats från GeoNames osm_nominatim: Plats från OpenStreetMap Nominatim types: cities: Städer places: Platser towns: Samhällen - description_osm_namefinder: - prefix: "%{distance} %{direction} om %{type}" direction: east: öst north: norr @@ -471,24 +414,34 @@ sv: zero: mindre än 1 km results: more_results: Fler resultat - no_results: Hittade inget. + no_results: Inga resultat hittades search: title: ca_postcode: Resultat från Geocoder.CA geonames: Resultat från GeoNames - latlon: intärna resultat - osm_namefinder: Resultat från OpenStreetMap Namefinder + geonames_reverse: Resultat från GeoNames + latlon: Resultat från OpenStreetMap osm_nominatim: Resultat från OpenStreetMap Nominatim + osm_nominatim_reverse: Resultat från OpenStreetMap Nominatim uk_postcode: Resultat från NPEMap / Free The Postcode us_postcode: Resultat från Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} om %{parentname})" - suffix_place: ", %{distance} %{direction} om %{placename}" search_osm_nominatim: + admin_levels: + level10: Förortsgräns + level2: Landsgräns + level4: Statsgräns + level5: Regionsgräns + level6: Länsgräns + level8: Stadsgräns + level9: Bygräns prefix: + aerialway: + chair_lift: Stollift + drag_lift: Släplift + station: Linbanestation aeroway: - aerodrome: Flygplats - apron: Ramp + aerodrome: Flygfält + apron: Platta gate: Gate helipad: Helikopterplatta runway: Landningsbana @@ -507,7 +460,7 @@ sv: bench: Bänk bicycle_parking: Cykelparkering bicycle_rental: Cykeluthyrning - biergarten: Ölträdgård + biergarten: Uteservering brothel: Bordell bureau_de_change: Växlingskontor bus_station: Busstation @@ -520,8 +473,8 @@ sv: cinema: Biograf clinic: Klinik club: Klubb - college: Gymnasium - community_centre: Användarcenter + college: College + community_centre: Allaktivitetshus courthouse: Tingshus crematorium: Krematorium dentist: Tandläkare @@ -578,7 +531,8 @@ sv: shopping: Handel shower: Dusch social_centre: Nöjescenter - social_club: Social klubb + social_club: Kamratförening + social_facility: Socialtjänst studio: Studio supermarket: Stormarknad swimming_pool: Simbassäng @@ -588,9 +542,9 @@ sv: toilets: Toaletter townhall: Rådhus university: Universitet - vending_machine: Varumaskin - veterinary: Veterinär - village_hall: gemensamhetslokal + vending_machine: Varuautomat + veterinary: Veterinärkirurgi + village_hall: Byastuga waste_basket: Papperskorg wifi: WiFi-åtkomst youth_centre: Ungdomscenter @@ -607,6 +561,9 @@ sv: "yes": Bro building: "yes": Byggnad + emergency: + fire_hydrant: Brandpost + phone: Nödtelefon highway: bridleway: Ridstig bus_guideway: Spårbussväg @@ -617,7 +574,7 @@ sv: emergency_access_point: Utryckningsplats footway: Gångväg ford: Vadställe - living_street: Gårdsgata + living_street: Gångfartsområde milestone: Milstolpe minor: Mindre väg motorway: Motorväg @@ -627,23 +584,25 @@ sv: pedestrian: Gågata platform: Perrong primary: Riksväg (primär väg) - primary_link: På-/avfart till primär väg (riksväg) - raceway: Tävlingsbana - residential: Bostäder + primary_link: På-/avfart till riksväg (primär väg) + proposed: Föreslagen väg + raceway: Racerbana + residential: Bostadsgata rest_area: Rastplats road: Väg secondary: Länsväg (sekundärväg) - secondary_link: På-/avfart till sekundär väg (större länsväg) + secondary_link: På-/avfart till länsväg (sekundär väg) service: Serviceväg services: Rastplats-väg speed_camera: Trafiksäkerhetskamera steps: Trappa stile: Stätta + street_lamp: Gatlykta tertiary: Landsväg tertiary_link: Landsväg track: Traktorväg trail: Vandringsled - trunk: Motortrafikled + trunk: Stamväg trunk_link: På-/avfart till stamväg/motortrafikled unclassified: Oklassificerad väg unsurfaced: Oasfalterad väg @@ -654,6 +613,7 @@ sv: building: Byggnad castle: Slott church: Kyrka + citywalls: Stadsmurar fort: Fort house: Hus icon: Ikon @@ -663,21 +623,22 @@ sv: monument: Monument museum: Museum ruins: Ruin + tomb: Grav tower: Torn wayside_cross: Landmärke wayside_shrine: Vägkants-helgedom wreck: Vrak landuse: allotments: Kolonilotter - basin: Bassin + basin: Bäcken brownfield: Outvecklat område cemetery: Begravningsplats commercial: Kommersiellt område - conservation: Skyddat + conservation: Naturskyddsområde construction: Byggarbetsplats farm: Bondgård farmland: Jordbruksmark - farmyard: Gårdstun + farmyard: Gårdsplan forest: Skog garages: Garage grass: Gräs @@ -688,14 +649,14 @@ sv: military: Militärområde mine: Gruva nature_reserve: Naturreservat - orchard: Plantering + orchard: Fruktträdgård park: Park piste: Pist quarry: Stenbrott railway: Järnväg recreation_ground: Rekreationsområde reservoir: Reservoar - reservoir_watershed: Dammbyggnad + reservoir_watershed: Vattenreservoar residential: Bostadsområde retail: Detaljhandel road: Vägområde @@ -705,7 +666,7 @@ sv: wood: Skog leisure: beach_resort: Badort - bird_hide: Fågelnäste + bird_hide: Fågeltorn common: Allmänning fishing: Fiskevatten fitness_station: Gym @@ -730,6 +691,8 @@ sv: airfield: Militärt flygfält barracks: Kaserner bunker: Bunker + mountain_pass: + "yes": Bergspass natural: bay: Bukt beach: Strand @@ -769,7 +732,7 @@ sv: volcano: Vulkan water: Vatten wetland: Våtmark - wetlands: Våtmark + wetlands: Våtmarker wood: Skog office: accountant: Revisor @@ -781,7 +744,7 @@ sv: insurance: Försäkringskassa lawyer: Advokat ngo: Icke-statligt kontor - telecommunication: Telefonbolag + telecommunication: Telefonbolagskontor travel_agent: Resebyrå "yes": Kontor place: @@ -799,6 +762,7 @@ sv: locality: Läge moor: Hed municipality: Kommun + neighbourhood: Grannskap postcode: Postnummer region: Region sea: Hav @@ -807,7 +771,7 @@ sv: suburb: Förort town: Ort unincorporated_area: Kommunfritt område - village: Mindre ort + village: By railway: abandoned: Övergiven järnväg construction: Järnväg under anläggande @@ -817,15 +781,17 @@ sv: halt: Tågstopp historic_station: Historisk Järnvägsstation junction: Järnvägsknutpunkt - level_crossing: Plankorsning - light_rail: Spårvagn + level_crossing: Järnvägskorsning + light_rail: Snabbspårväg miniature: Miniatyrjärnväg monorail: Enspårsbana narrow_gauge: Smalspårsjärnväg platform: Tågperrong preserved: Bevarad järnväg + proposed: Föreslagen järnväg spur: Sidospår station: Tågstation + stop: Järnvägshållplats subway: Tunnelbanestation subway_entrance: Tunnelbaneingång switch: Järnvägsväxel @@ -833,7 +799,7 @@ sv: tram_stop: Spårvagnshållplats yard: Bangård shop: - alcohol: Systembolag + alcohol: Spritbutik antiques: Antikviteter art: Konstaffär bakery: Bageri @@ -841,6 +807,7 @@ sv: beverages: Dryckesbutik bicycle: Cykelaffär books: Bokhandel + boutique: Boutique butcher: Slaktare car: Bilhandlare car_parts: Bildelar @@ -854,6 +821,7 @@ sv: convenience: Närköp copyshop: Kopieringsfirma cosmetics: Parfymeri + deli: Delikatessbutik department_store: Varuhus discount: Lågprisbutik doityourself: Gör-det-själv @@ -863,13 +831,13 @@ sv: farm: Gårdsbutik fashion: Modebutik fish: Fiskhandlare - florist: Blommor + florist: Florist food: Mataffär - funeral_directors: Begravningsbyrå + funeral_directors: Begravningsentreprenör furniture: Möbler gallery: Galleri garden_centre: Trädgårdshandel - general: Landhandel + general: Lanthandel gift: Presentaffär greengrocer: Grönsakshandlare grocery: Livsmedelsbutik @@ -890,19 +858,23 @@ sv: organic: Ekologiska livsmedelsaffär outdoor: Friluftsbutik pet: Djuraffär + pharmacy: Apotek photo: Fotoaffär - salon: Salong + salon: Damfrisering + second_hand: Second hand-butik shoes: Skoaffär shopping_centre: Köpcentrum sports: Sportaffär stationery: Pappershandel supermarket: Snabbköp + tailor: Skräddare toys: Leksaksaffär travel_agency: Resebyrå video: Videobutik - wine: Alkoholbutik + wine: Spritbutik + "yes": Affär tourism: - alpine_hut: Fjällbod + alpine_hut: Fjällstuga artwork: Konstverk attraction: Attraktion bed_and_breakfast: Bed and breakfast @@ -923,6 +895,7 @@ sv: viewpoint: Utsiktspunkt zoo: Djurpark tunnel: + culvert: Kulvert "yes": Tunnel waterway: artificial: Artificiellt vattendrag @@ -932,108 +905,184 @@ sv: dam: Damm derelict_canal: Nerlagd kanal ditch: Dike - dock: Docka + dock: Hamnplats drain: Avlopp lock: Sluss lock_gate: Slussport mineral_spring: Mineralvattenskälla mooring: Förtöjning rapids: Fors - river: Älv - riverbank: Älvbank - stream: Ström + river: Flod + riverbank: Flodbank + stream: Bäck wadi: Uttorkad flod water_point: Vattenpunkt waterfall: Vattenfall weir: Överfallsvärn + help_page: + help: + description: Ställ en fråga eller kolla upp svar på OSM:s sida med svar på ofta förekommande frågor. + title: help.openstreetmap.org + url: https://help.OpenStreetMap.org/ + introduction: OpenStreetMap har flera resurser som hjälper dig att lära dig om projektet, för att ställa och svara på frågor, och tillsammans diskutera och dokumentera frågor gällande kartering. + title: Få hjälp + welcome: + description: Börja med den här snabbguiden som täcker grunderna i OpenStreetMap. + title: Välkommen till OSM + url: /welcome + wiki: + description: Sök i wikin för ingående OSM-dokumentation. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Stäng + edit_help: Flytta kartan och zooma in på en plats som du vill redigera, klicka sedan här. + key: + title: Kartnyckel + tooltip: Kartnyckel + tooltip_disabled: Kartnyckeln finns bara för standardlagret map: base: cycle_map: Cykelkarta + hot: Humanitärt standard: Standard transport_map: Transportkarta + copyright: © OpenStreetMaps bidragsgivare + donate_link_text: + layers: + data: Kartdata + header: Kartskikt + notes: Kartanteckningar + overlays: Aktivera lager för felsökning av kartan + title: Lager + locate: + popup: Du är inom {distance} {unit} från denna punkt + title: Visa min position + zoom: + in: Zooma in + out: Zooma ut + notes: + new: + add: Lägg till anteckning + intro: För att förbättra kartan visas den information du skriver in för andra karterare. Var så noga och beskrivande som möjligt när du positionerar markören till korrekt position och skriver din anteckning nedan. + show: + anonymous_warning: Denna anteckning innehåller kommentarer från anonyma användare vilka bör bekräftas oberoende av varandra. + comment: Kommentera + comment_and_resolve: Kommentera och Avklara + hide: Göm + reactivate: Återaktivera + resolve: Avklara + share: + cancel: Avbryt + center_marker: Centrera kartan på markören + custom_dimensions: Ange anpassade dimensioner + download: Ladda ned + embed: HTML + format: "Format:" + image: Bild + image_size: Bilden kommer att visa standardlagret på + include_marker: Lägg till markör + link: Länk eller HTML + long_link: Länk + paste_html: Klistra in HTML-koden för att publicera på en webbsida + scale: "Skala:" + short_link: Kort länk + short_url: Kortlänk + title: Dela + view_larger_map: Visa större karta site: + createnote_disabled_tooltip: Zooma in för att lägga till anteckningar på kartan + createnote_tooltip: Lägg till en anteckning på kartan edit_disabled_tooltip: Zooma in för att redigera kartan edit_tooltip: Redigera kartan - edit_zoom_alert: Du måste zooma in för att kunna ändra kartan - history_disabled_tooltip: Zooma in för att kunna se karteringshistorik för detta område - history_tooltip: Visa ändringar för detta område - history_zoom_alert: Du måste zooma in för att kunna se karteringshistorik. + map_data_zoom_in_tooltip: Zooma in för att se kartdata + map_notes_zoom_in_tooltip: Zooma in för att se kartanteckningar layouts: - community: Användare - community_blogs: Communitybloggar - community_blogs_title: Bloggar från OpenStreetMap-medlemmar - copyright: Upphovsrätt & licens - documentation: Dokumentation - documentation_title: Projektdokumentation - donate: Donera till OpenStreetMap med en %{link} till hårdvarufonden. - donate_link_text: donation + about: Om + community: Gemenskap + community_blogs: Gemenskapens bloggar + community_blogs_title: Bloggar från medlemmar i OpenStreetMap-gemenskapen + copyright: Upphovsrätt + data: Data + donate: Stöd OpenStreetMap med en %{link} till hårdvarufonden. edit: Redigera edit_with: Redigera med %{editor} export: Exportera - export_tooltip: Exportera kartdata som bild eller rådata + export_data: Exportera data foundation: Stiftelsen - foundation_title: OpenStreetMap stiftelsen + foundation_title: OpenStreetMap-stiftelsen gps_traces: GPS-spår gps_traces_tooltip: Visa, ladda upp och ändra GPS-spår. help: Hjälp - help_centre: Hjälpcentral - help_title: Hjälpsida för projektet history: Historik - home: hem - home_tooltip: Gå till hempositionen - inbox: inkorg (%{count}) - inbox_tooltip: - one: Du har ett oläst meddelande - other: Du har %{count} olästa meddelanden - zero: Du har inga olästa meddelanden. - intro_1: Openstreetmap är en fri redigeringsbar karta av hela världen, den görs av folk precis som du. + home: Gå till hemposition intro_2_create_account: Skapa ett användarkonto - intro_2_download: ladda ner - intro_2_html: Informationen är fri att %{download} och %{use} under dess %{license}. %{create_account} för att förbättra kartan. - intro_2_license: Öppna licens - intro_2_use: använda - intro_2_use_url: http://wiki.OpenStreetMap.org/wiki/Using_OpenStreetMap - license: - title: Data från OpenStreetMap har gjorts tillgänglig under licensen Creative Commons Erkännande-Dela Lika 2.0 Generisk. - log_in: logga in + intro_header: Välkommen till OpenStreetMap! + intro_text: OpenStreetMap är en karta över världen, skapad av människor som du och fri att använda under en öppen licens. + learn_more: Läs mer + log_in: Logga in log_in_tooltip: Logga in med ditt konto logo: alt_text: OpenStreetMaps logotyp - logout: logga ut - logout_tooltip: Logga ut + logout: Logga ut make_a_donation: text: Donera title: Stöd OpenStreetMap med en monetär donation - osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, då databasunderhåll pågår. - osm_read_only: Det går bara att läsa från OpenStreetMap-databasen just nu, då viktigt underhåll utförs på databasen. + more: Mer + osm_offline: OpenStreetMap-databasen är inte tillgänglig just nu, då nödvändigt databasunderhåll pågår. + osm_read_only: OpenStreetMap-databasen är skrivskyddad just nu, då nödvändigt databasunderhåll pågår. partners_bytemark: Bytemark Hosting partners_html: Hosting via %{ucl}, %{ic} och %{bytemark}, med flera %{partners}. partners_ic: Imperial College London partners_partners: partners partners_ucl: UCL VR Center partners_url: http://wiki.openstreetmap.org/wiki/Partners - sign_up: registrera + project_name: + title: OpenStreetMap + sign_up: Skapa ett konto sign_up_tooltip: Skapa ett konto för kartering - sotm2011: Kom till 2011 års OpenStreetMapkonferens, The State of the Map, 9:e -11:e september i Denver! + start_mapping: Börja kartläggning tag_line: Den fria wiki-världskartan user_diaries: Användardagböcker user_diaries_tooltip: Visa användardagböcker - view: Visa - view_tooltip: Visa kartan - welcome_user: Välkommen %{user_link} - welcome_user_link_tooltip: Din användarsida - wiki: Wiki - wiki_title: Wiki-webplats för projektet license_page: foreign: english_link: det engelska originalet text: I händelse av en konflikt mellan denna översatta sida och %{english_original_link} har den engelska texten företräde title: Om denna översättning - legal_babble: "

    Upphovsrätt och licens

    \n

    \n OpenStreetMap är öppen data, gjord tillgänglig under licensenCreative\n Commons Erkännande-DelaLika 2.0 (CC BY-SA).\n

    \n

    \n Du är fri att kopiera, distribuera, överföra och anpassa våra kartor\n och data, så länge du hänvisar till OpenStreetMap och dess\n bidragsgivare. Om du ändrar eller bygger på våra kartor eller data kan du\n distribuera resultatet endast under samma licens. Den\n fullständig juridiska texten förklarar dina rättigheter och skyldigheter.\n

    \n\n

    Hur du hänvisar till OpenStreetMap

    \n

    \n Om du använder OpenStreetMaps kartbilder begär vi att\n din hänvisning innehåller minst “© OpenStreetMaps\n bidragsgivare, CC BY-SA”. Om du enbart använder kartdata\n begär vi “Kartdata © OpenStreetMaps bidragsgivare,\n CC BY-SA”.\n

    \n

    \n Där så är möjligt, bör OpenStreetMap bli länkat till http://www.openstreetmap.org/\n och CC BY-SA till http://creativecommons.org/licenses/by-sa/2.0/. Om\n du använder ett medium där länkar inte är möjligt (exempelvis ett\n tryckt arbete), föreslår vi att du hänvisar läsarna till\n www.openstreetmap.org (kanske genom att expandera\n ‘OpenStreetMap’ till dess fullständiga adress) och till\n www.creativecommons.org.\n

    \n\n

    Hitta mer

    \n

    \n Läs mer om hur du använder vår data på vår juridiska\n FAQ.\n

    \n OSM bidragsgivare påminns att aldrig att lägga till data från några\n upphovsrättsskyddade källor (t.ex. Google Maps eller tryckta kartor) utan\n uttryckligt tillstånd från upphovsrättsinnehavarna.\n

    \n

    \n Även om OpenStreetMap är öppna data, kan vi inte tillhandahålla ett\n gratis kart-API för tredjepartsutvecklare.\n\n Se vår Policy för användning API,\n Policy för användning av Kartbilder (Tiles)\n och Policyn för Nominatim-användning.\n

    \n\n

    Våra bidragsgivare

    \n

    \n Vår CC BY-SA-licens kräver att du “ger den ursprungliga\n författaren ett erkännande skäligt nog för det medium eller det syfte du \n nyttjar det för\". Enskilda OSM-kartografer begär inte ett erkännande utöver “OpenStreetMaps\n bidragsgivare”, men där data från en nationell kartläggningsbyrå eller annan viktig källa har inkluderats i\n OpenStreetMap kan det vara rimligt att kreditera dem genom att direkt\n lägga till deras erkännande eller genom att länka till det på den här sidan.\n

    \n\n\n\n
      \n
    • Australien: Innehåller förortsdata baserad på data från Australian Bureau of Statistics.
    • \n
    • Österrike: Innehåller data från Stadt Wien under\n CC BY.
    • \n
    • Kanada: Innehåller data från GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada) och StatCan (Geography Division, Statistics Canada.
    • \n
    • Frankrike: Innehåller data från Direction Générale des Impôts.
    • \n
    • Netherlands: Innehåller © OCH data, 2007\n (www.and.com)
    • \n
    • Nya Zeeland: Innehåller data från Land Information New Zealand. Crown äger upphovsrätten.
    • \n
    • Polen: Innehåller data från UMP-pcPL maps. UMP-pcPL:s bidragsgivare äger upphovsrätten.\n \n Mer om OSM's användande av UMP:s data
    • \n
    • Sydafrika: Innehåller data från\n Chief Directorate:\n National Geo-Spatial Information, Staten äger upphovsrätten.
    • \n
    • Storbritannien: Innehåller Ordnance Survey data © Crown äger upphovsrätten och databasrättigheterna 2010.
    • \n
    \n\n

    \n Införandet av uppgifter i OpenStreetMap innebär inte att den ursprungliga \n datagivaren stödjer OpenStreetMap, ger någon som helst garanti eller\n tar på sig något ansvar.\n

    " + legal_babble: + attribution_example: + alt: Exempel på hur en webbsida kan ange OpenStreetMap som källa + title: Exempel på källhänvisning. + contributors_at_html: "Österrike: Innehåller data från\nStadt Wien (under licensen\nCC BY),\nLand Vorarlberg och\nLand Tirol (under licensen CC-BY AT med ändringar)." + contributors_ca_html: "Kanada: Innehåller data från\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), och StatCan (Geography Division,\n Statistics Canada)." + contributors_fi_html: "Finland: Innehåller data från Lantmäteriverket i Finlands topografiska databas och andra dataset, under licensen NLSFI." + contributors_footer_1_html: "För ytterligare detaljer om dessa och andra källor som använts\nför att förbättra OpenStreetMap, se sidan om bidragsgivare\npå OpenStreetMaps wiki." + contributors_footer_2_html: " Införandet av uppgifter i OpenStreetMap innebär inte att den ursprungliga \n datagivaren stödjer OpenStreetMap, ger någon som helst garanti eller\n tar på sig något ansvar." + contributors_fr_html: "Frankrike: Innehåller data\n från Direction Générale des Impôts." + contributors_gb_html: "Storbritannien: Innehåller Ordnance\nSurvey data © Crown copyright and database right\n2010-12." + contributors_intro_html: "Våra bidragsgivare är tusentals individer. Vi inkluderar också\nöppna data från nationella karttjänster,\nbland annat från:" + contributors_nl_html: "Nederländerna: Innehåller © AND data, 2007\n(www.and.com)" + contributors_nz_html: "Nya Zeeland: Innehåller data från\nLand Information New Zealand. Crown Copyright reserved." + contributors_title_html: Våra bidragsgivare + contributors_za_html: "Sydafrika: Innehåller data från\nChief Directorate:\nNational Geo-Spatial Information, State copyright reserved." + credit_1_html: "Vi kräver att din källhänvisning består av “© OpenStreetMaps\nbidragsgivare”." + credit_2_html: "Du måste också göra klart att datan är tillgänglig under licensen\nOpen Database License, och om du använder våra kartrutor, att kartografin är\ntillgänglig under licensen CC-BY-SA. Du kan göra detta genom att länka till\ndenna sida om upphovsrätt.\nAlternativt, och som krav om du distribuerar OSM i dataform, kan du namnge\noch länka direkt till licenserna. I media där länkar ej är möjliga\n(t.ex. tryckt material), förslår vi att du hänvisar dina läsare till openstreetmap.org\n(förslagsvis genom att expandera 'OpenStreetMap' till hela denna adress), till opendatacommons.org, och om relevant till creativecommons.org." + credit_3_html: "För en navigerbar elektronisk karta, ska källhänvisningen synas i ena hörnet av kartan.\nTill exempel:" + credit_title_html: Hur du anger OpenStreetMap som källa + infringement_1_html: "Bidragsgivare till OSM påminns om att aldrig lägga till data från\nupphovsrättsskyddade källor (t.ex. Google Maps och tryckta kartor) utan\nuttryckligt tillstånd från upphovsrättsinnehavarna." + infringement_2_html: "Om du tror att upphovsrättsskyddat material felaktigt har\nlagts in i OpenStreetMaps databas eller till den här webbplatsen, se\nvårt borttagningsförfarande\neller fyll i vårt online-formulär direkt." + infringement_title_html: Upphovsrättsintrång + intro_1_html: "OpenStreetMap är öppen data, gjord tillgänglig under licensen Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Du är fri att kopiera, distribuera, överföra och anpassa vår data,\nså länge du anger OpenStreetMap och dess bidragsgivare som källa.\nOm du ändrar eller bygger vidare på vår data kan du\nendast distribuera resultatet under samma licens. Den\nfullständiga juridiska\ntexten förklarar dina rättigheter och skyldigheter." + intro_3_html: "Kartografin i våra kartrutor, och vår dokumentation, är\ntillgängliga under licensen Creative\nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." + more_1_html: "Läs mer om användning av vår data, och hur du anger oss som källa, på vår juridiska\nFAQ." + more_2_html: "Även om OpenStreetMap är öppen data, kan vi inte tillhandahålla något gratis kart-API för tredjepartsutvecklare.\nSe vår användningspolicy för API,\nanvändningspolicy för kartrutor\noch användningspolicy för Nominatim." + more_title_html: Mer information + title_html: Upphovsrätt och licens native: mapping_link: börja kartlägga - native_link: Svensk version + native_link: svensk version text: Du tittar på den engelska versionen av sidan om upphovsrätt. Du kan gå tillbaka till %{native_link} på den här sidan eller sluta läsa om upphovsrätt och %{mapping_link}. title: Om denna sida message: @@ -1043,7 +1092,7 @@ sv: date: Datum from: Från messages: Du har %{new_messages} och %{old_messages} - my_inbox: Min inbox + my_inbox: Min inkorg new_messages: one: "%{count} nytt meddelande" other: "%{count} nya meddelanden" @@ -1051,10 +1100,10 @@ sv: old_messages: one: "%{count} gammalt meddelande" other: "%{count} gamla meddelanden" - outbox: utbox + outbox: utkorg people_mapping_nearby: folk som kartlägger i närheten subject: Ärende - title: Inbox + title: Inkorg mark: as_read: Meddelandet markerat som läst as_unread: Meddelandet markerat som oläst @@ -1064,54 +1113,82 @@ sv: reply_button: Svar unread_button: Markera som oläst new: - back_to_inbox: Tillbaks till inboxen + back_to_inbox: Tillbaka till inkorgen body: Brödtext limit_exceeded: Du har skickat många meddelanden på kort tid. Var god vänta en stund innan du försöker igen. message_sent: Meddelande skickat send_button: Skicka - send_message_to: Skicka nytt meddelande till %{name} + send_message_to: Skicka ett nytt meddelande till %{name} subject: Ärende title: Skicka meddelande no_such_message: - body: Det finns inget meddelande med det ID-et. + body: Det finns inget meddelande med det ID:et. heading: Inget sådant meddelande title: Inget sådant meddelande outbox: date: Datum - inbox: inbox + inbox: inkorg messages: - one: Du har %{count} skickat meddelande - other: Du har %{count} skickade meddelanden + one: Du har %{count} skickat ett meddelande + other: Du har %{count} skickat meddelanden my_inbox: Min %{inbox_link} - no_sent_messages: Du had ing a skickade meddelanden ännu. Varför inte ta kontakt med någon av de %{people_mapping_nearby_link}? - outbox: utbox + no_sent_messages: Du har inte skickat några meddelanden ännu. Varför inte ta kontakt med någon av de %{people_mapping_nearby_link}? + outbox: utkorg people_mapping_nearby: folk som kartlägger i närheten subject: Ärende - title: Utbox + title: Utkorg to: Till read: - back_to_inbox: Åter till inbox - back_to_outbox: Tillbaks till utboxen + back: Tillbaka date: Datum from: Från - reading_your_messages: Läser dina meddelanden - reading_your_sent_messages: Läser dina skickade meddelanden reply_button: Svara subject: Ärende title: Läs meddelande to: Till unread_button: Markera som oläst - wrong_user: Du är inloggad som '%{user}' men meddelandet du har bett om att få läsa skickades inte till eller av den användaren. Logga in som korrekt användare för att läsa det.. + wrong_user: Du är inloggad som '%{user}', men meddelandet du har bett om att få läsa skickades inte till eller av den användaren. Logga in med korrekt användare för att läsa det. reply: - wrong_user: Du är inloggad som '%{user}' men meddelandet du har beth om att besvara skickades inte till den användaren. Logga in som den användaren för att svara. + wrong_user: Du är inloggad som '%{user}', men meddelandet du har bett om att besvara skickades inte till den användaren. Logga in med korrekt användare för att svara. sent_message_summary: delete_button: Radera + note: + description: + closed_at_by_html: Löstes för %{when} sedan av %{user} + closed_at_html: Löstes för %{when} sedan + commented_at_by_html: Uppdaterades för %{when} sedan av %{user} + commented_at_html: Uppdaterades för %{when} sedan + opened_at_by_html: Skapades för %{when} sedan av %{user} + opened_at_html: Skapades för %{when} sedan + reopened_at_by_html: Återaktiverades för %{when} sedan av %{user} + reopened_at_html: Återaktiverades för %{when} sedan + entry: + comment: Kommentar + full: Hela anteckningen + mine: + ago_html: "%{when} sedan" + created_at: Skapades den + creator: Skapare + description: Beskrivning + heading: "%{user}s anteckningar" + id: Id + last_changed: Senast ändrad + subheading: Anteckningar skapade eller kommenterade av %{user} + title: Anteckningar skapade eller kommenterade av %{user} + rss: + closed: stängde anteckning (nära %{place}) + commented: ny kommentar (nära %{place}) + description_area: En lista med anteckningar som rapporterats, kommenterats eller avklarats i närheten av ditt område [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] + description_item: Ett rss-flöde för anteckning %{id} + opened: ny anteckning (nära %{place}) + reopened: återaktiverade anteckningar (nära %{place}) + title: OpenStreetMap-anteckningar notifier: diary_comment_notification: footer: Du kan också läsa kommentaren på %{readurl} och du kan kommentera på %{commenturl} eller svara på %{replyurl} - header: "%{from_user} har lämnat kommentar till ditt OpenStreetMap dagboksinlägg med rubriken %{subject}:" + header: "%{from_user} har kommenterat ditt dagboksinlägg på OpenStreetMap med rubriken %{subject}:" hi: Hej %{to_user}, - subject: "[OpenStreetMap] %{user} kommenterade din dagboksanteckning" + subject: "[OpenStreetMap] %{user} kommenterade ditt dagboksinlägg" email_confirm: subject: "[OpenStreetMap] Bekräfta din e-postadress" email_confirm_html: @@ -1121,8 +1198,7 @@ sv: email_confirm_plain: click_the_link: Om det är du, klicka på länken nedan för att bekräfta ändringen. greeting: Hej, - hopefully_you_1: Någon (förhoppningsvis du) skulle vilja ändra sina e-postadress vid - hopefully_you_2: "%{server_url} till %{new_address}." + hopefully_you: Någon (förhoppningsvis du själv) vill ändra sin e-postadress på %{server_url} till %{new_address}. friend_notification: befriend_them: Du kan också lägga till dem som en vän på %{befriendurl}. had_added_you: "%{user} har lagt till dig som vän på OpenStreetMap." @@ -1133,7 +1209,7 @@ sv: and_the_tags: "och följande taggar:" failure: failed_to_import: "misslyckats med att importera. Här är felet:" - more_info_1: Mer information om GPX importfel och hur man undviker dem + more_info_1: Mer information om importfel av GPX och hur man undviker dem more_info_2: "de kan hittas på:" subject: "[OpenStreetMap] Misslyckades importera GPX" greeting: Hej, @@ -1151,61 +1227,63 @@ sv: lost_password_plain: click_the_link: Om det är du, klicka på länken nedan för att återställa ditt lösenord. greeting: Hej, - hopefully_you_1: Någon (förhoppningsvis du) vill återställa lösenordet för denna - hopefully_you_2: email adress openstreetmap.org konto. + hopefully_you: Någon (kanske du själv) har begärt återställning av lösenordet på denna e-postadress opeenstreetmap.org-konto. message_notification: - footer1: Du kan också läsa meddelandet på %{readurl} - footer2: och du kan svara på %{replyurl} + footer_html: Du kan också läsa meddelandet på %{readurl} och du kan svara på %{replyurl} header: "%{from_user} har skickat ett meddelande via OpenStreetMap med ämnet %{subject}:" hi: Hej %{to_user}, + note_comment_notification: + anonymous: En anonym användare + closed: + commented_note: "%{commenter} har löst en kartanteckning du har kommenterat. Anteckningen är nära %{place}." + subject_other: "[OpenStreetMap] %{commenter} har löst en anteckning som du är intresserad av" + subject_own: "[OpenStreetMap] %{commenter} har löst en av dina anteckningar" + your_note: "%{commenter} har kommenterat en av dina kartanteckningar i närheten av %{place}." + commented: + commented_note: "%{commenter} har kommenterat en kartanteckning som du tidigare kommenterat. Anteckningen är i närheten av %{place}." + subject_other: "[OpenStreetMap] %{commenter} har kommenterat en anteckning du är intresserad av" + subject_own: "[OpenStreetMap] %{commenter} har kommenterat en av dina anteckningar" + your_note: "%{commenter} har lämnat en kommentar till en av dina kartanteckningar i närheten av %{place}." + details: Mer detaljer om anteckningen finns på %{url}. + greeting: Hej, + reopened: + commented_note: "%{commenter} har återaktiverat en kartnotering du har kommenterat på. Noteringen är nära %{place}." + subject_other: "[OpenStreetMap] %{commenter} har återaktiverat en anteckning som du är intresserad av" + subject_own: "[OpenStreetMap] %{commenter} har återaktiverat en av dina anteckningar" + your_note: "%{commenter} har återaktiverat en av dina kartanteckningar nära %{place}." signup_confirm: - subject: "[OpenStreetMap] Bekräfta din e-postadress" - signup_confirm_html: - ask_questions: Du kan ställa vilken fråga du vill om OpenStreetMap på vår frågor- och svarsida. - click_the_link: Om detta är du, Välkommen! Klicka på länken nedan för att bekräfta kontot och läsa vidare för mer information om OpenStreetMap - current_user: En lista över nuvarande användare i kategorier, baserat på var i världen de är, finns på Category:Users_by_geographical_region. - get_reading: Kom igång med OpenStreetMap på wikin, blir uppdaterad om de senaste nyheterna via OpenStreetMaps blogg eller Twitter, eller skumma genom OpenStreetMaps grundare Steve Coasts OpenGeoData blog för en kortfattad historisk genomgång, som också har en poddradio att lyssna på! - greeting: Hej där! - hopefully_you: Någon (förhoppningsvis du) vill skapa ett konto på - introductory_video: Du kan titta på en %{introductory_video_link}. - more_videos: Det finns %{more_videos_link}. - more_videos_here: fler videoklipp här - user_wiki_page: "Det rekommenderas att du skapar en användarsida som innehåller kategoritaggar som visar var befinner dig, såsom [[Category:Users_in_London]]." - video_to_openstreetmap: introduktionsvideo om OpenStreetMap - wiki_signup: Du kan också registrera dig på OpenStreetMap-wikin. - signup_confirm_plain: - ask_questions: "Du kan ställa valfria frågor om OpenStreetMap på vår frågesida:" - blog_and_twitter: "Håll dig uppdaterad med de sensate nyheterna via OpenStreetMap-bloggen eller Twitter:" - click_the_link_1: Om detta är du, välkommen! Klicka på länken nedan för att bekräfta ditt - click_the_link_2: konto och läs vidare för mer information om OpenStreetMap. - current_user_1: En lista över aktuella användare i kategorier, baserat på var i världen - current_user_2: "de är, finns tillgänglig från:" + confirm: "Innan vi gör något annat, måste vi bekräfta att denna begäran kom från dig. Om den gjorde det, var vänligen klicka på länken nedan för att bekräfta ditt konto:" + created: Någon (förhoppningsvis du) skapade just ett konto på %{site_url}. greeting: Hej där! - hopefully_you: Någon (förhoppningsvis du) vill skapa ett konto på - introductory_video: "Du kan titta på en introduktionsvideo till OpenStreetMap här:" - more_videos: "Det finns fler filmer här:" - opengeodata: "OpenGeoData.org är OpenStreetMap-grundarens Steve Coasts blogg, och den har även podcasts:" - the_wiki: "Läs mer om OpenStreetMap på wikin:" - user_wiki_1: Det rekommenderas att du skapar en användarsida på wikin som innehåller - user_wiki_2: "kategorietiketter som visar var du befinner dig, t.ex. [[Category: Users_in_London]]." - wiki_signup: "Du kan också registrera dig på OpenStreetMap wikin på:" + subject: "[OpenStreetMap] Välkommen till OpenStreetMap" + welcome: Efter att du har bekräftat ditt konto ger vi dig ytterligare information om hur du kommer igång. oauth: oauthorize: - allow_read_gpx: läsa dina privata GPS-spår. - allow_read_prefs: läsa dina inställningar - allow_to: "Tillåt applikation att:" + allow_read_gpx: läs dina privata GPS-spår. + allow_read_prefs: läs dina användarinställningar + allow_to: "Tillåt klientapplikation att:" allow_write_api: ändra på kartan. - allow_write_diary: göra dagboksinlägg, kommentara och lägga till vänner. + allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner. allow_write_gpx: ladda upp GPS-spår - allow_write_prefs: ändra på dina inställningar. - request_access: För att programmet %{app_name} ska få tillgång till ditt konto måste du godkänna att det får tillgång till att göra ändringar i ditt namn. Du kan välja eller ta bort hur många val du vill. + allow_write_notes: ändra anteckningar. + allow_write_prefs: ändra på dina användarinställningar. + request_access: Programmet %{app_name} har begärt tillgång till ditt konto, %{user}. Var god kontrollera om du vill att programmet ska ha dessa möjligheter. Du kan välja eller ta bort hur många val du vill. + title: Auktorisera tillgång till ditt konto + oauthorize_failure: + denied: Du har blockerat en applikation %{app_name} från tillgång till ditt konto. + invalid: Auktoriserings-token är inte giltig. + title: Auktoriseringsbegäran misslyckades + oauthorize_success: + allowed: Du har beviljat en applikation %{app_name} tillgång till ditt konto. + title: Auktoriseringsbegäran tillåten + verification: Verifikationskoden är %{code}. revoke: - flash: Du tagit bort OAuth-nyckel för %{application} + flash: Du tagit bort nyckeln för %{application} oauth_clients: create: flash: Informationen registrerades framgångsrikt destroy: - flash: Annulerade registreringen av klientapplikationen + flash: Annullerade registreringen av klientprogrammet edit: submit: Redigera title: Redigera ditt tillägg @@ -1215,22 +1293,23 @@ sv: allow_write_api: ändra kartan. allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner. allow_write_gpx: ladda upp GPS-spår. + allow_write_notes: ändra anteckningar. allow_write_prefs: ändra deras användarinställningar. callback_url: Återkopplingsadress name: Namn requests: "Be om följande behörigheter från användaren:" required: Nödvändigt - support_url: Support URL + support_url: Support-adress url: Programmets huvudadress index: application: Applikationsnamn - issued_at: Utfärdad - list_tokens: "Följande token har utfärdats till program i ditt namn:" + issued_at: Utfärdad den + list_tokens: "Följande nycklar har utfärdats till program i ditt namn:" my_apps: Mina klientprogram my_tokens: Mina auktoriserade program - no_apps: Har du ett program som du vill registrera för att användas med oss med % {oauth} standard? Innan du kan göra OAuth-begäranden till den här tjänsten måste du registrera din webbapplikation. + no_apps: Har du ett program som du vill registrera för användning hos oss med hjälp av %{oauth}-standarden? Du måste registrera din webbapplikation innan du kan göra OAuth-anropp till denna tjänsten. register_new: Registrera din applikation - registered_apps: Du har följande klientapplikationer registrerade. + registered_apps: "Du har följande klientapplikationer registrerade:" revoke: Återkalla! title: Mina OAuth-detaljer new: @@ -1239,12 +1318,13 @@ sv: not_found: sorry: Tyvärr kunde inte %{type} hittas. show: - access_url: Adress för åtkomst-Token + access_url: "URL för tillgångsnyckel:" allow_read_gpx: läs deras privata GPS-spår - allow_read_prefs: Läs deras användarinställningar. + allow_read_prefs: läs deras användarinställningar. allow_write_api: ändra kartan. allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner. allow_write_gpx: ladda upp GPS-spår. + allow_write_notes: ändra anteckningar. allow_write_prefs: ändra deras användarinställningar. authorize_url: "Godkänn URL:" confirm: Är du säker? @@ -1253,9 +1333,9 @@ sv: key: "Konsumentnyckel:" requests: "Begär följande behörigheter från användaren:" secret: "Konsumenthemlighet:" - support_notice: Vi stödjer HMAC-SHA1 (rekommenderas) såväl som oformaterad text i SSL-läge. + support_notice: Vi stödjer signaturer med HMAC-SHA1 (rekommenderas) och RSA-SHA1. title: OAuth-detaljer för %{app_name} - url: Begäran av Token-adress + url: "URL för anropsnyckel:" update: flash: Uppdaterade klientinformationen framgångsrikt redaction: @@ -1292,27 +1372,25 @@ sv: site: edit: anon_edits_link_text: Ta reda på varför det är så. - flash_player_required: Du måste ha Flash för att kunna använda Potatch, OpenStreetMaps flasheditor. Du kan ladda hem Flash Player från Adobe.com. Det finns flera andra editorer tillgängliga för OpenStreetMap. - no_iframe_support: Din webbläsare stöder inte HTML iframe, som är nödvändiga för den här funktionen. - not_public: Du har into ändrat statusen på dina ändringar till offentliga. + flash_player_required: 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 editorer tillgängliga för OpenStreetMap. + id_not_configured: iD har inte konfigurerats + no_iframe_support: Din webbläsare stöder inte HTML iframe, som är nödvändig för den här funktionen. + not_public: Du har inte satt statusen på dina redigeringar som offentliga. not_public_description: Du kan inte längre redigera kartan om du inte gör det. Du kan göra dina redigeringar offentliga från din %{user_page}. potlatch2_not_configured: Potlatch 2 har inte konfigurerats - se http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 för mer information potlatch2_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch 2, bör du klicka på Spara.) 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.) user_page_link: användarsida index: - js_1: Du måste ha javascript påslaget, alternativt en webbläsare som stödjer javascript. - js_2: OpentStreetMap använder javascript för slippymapen + createnote: Lägg till en anteckning + js_1: Du använder antingen en webbläsare som inte stöder JavaScript, eller så har du inaktiverat JavaScript. + js_2: OpentStreetMap använder JavaScript för slippy-kartan. license: - license_name: Creative Commons Erkännande-DelaLika 2.0 - notice: Licensierat under licensen %{license_name} av %{project_name} och dess bidragsgivare.. - project_name: OpenStreetMap-projektet + copyright: Upphovsrätten tillhör OpenStreetMap och bidragsgivare, under en öppen licens permalink: Permanent länk - remote_failed: Redigering misslyckades - kontrollera att JOSM eller Merkaartor är inläst och fjärrkontrollsalternativet är aktiverat + remote_failed: Redigering misslyckades - kontrollera att JOSM eller Merkaartor är startad och fjärrkontrollsalternativet är aktiverat shortlink: Kortlänk key: - map_key: Kartnyckel - map_key_tooltip: Symbolförklaring table: entry: admin: Administrativ gräns @@ -1320,7 +1398,7 @@ sv: apron: - Flygplatsplatta - terminal - bridge: Svarta kantar = bro + bridge: Svarta kanter = bro bridleway: Ridstig brownfield: Förfallen industritomt building: Viktig byggnad @@ -1334,14 +1412,14 @@ sv: common: - Allmänning - äng - construction: Vägar som byggs + construction: Vägar under konstruktion cycleway: Cykelväg destination: Förbjuden genomfart farm: Bondgård footway: Gångväg forest: Kulturskog golf: Golfbana - heathland: hed + heathland: Hed industrial: Industriellt område lake: - Sjö @@ -1398,9 +1476,8 @@ sv: preview: Förhandsgranska search: search: Sök - search_help: "exempel: 'Delsbo', 'Storgatan, Svedala', Fler exempel.." submit_text: Gå - where_am_i: Var är jag + where_am_i: Var är jag? where_am_i_title: Beskriv den aktuella platsen med hjälp av sökmotorn sidebar: close: Stäng @@ -1413,7 +1490,11 @@ sv: trace_uploaded: Din GPX-fil har laddats upp och väntar på att lagras i databasen. Detta sker vanligtvis inom en halvtimme. När den är klar skickas ett e-brev till dig. upload_trace: Ladda upp GPS-spår delete: - scheduled_for_deletion: Spår markerat för radering + scheduled_for_deletion: GPS-spår schemalagt för radering + description: + description_with_count: + other: en=GPX-fil med %{count} punkter från %{user} + description_without_count: GPX-fil från %{user} edit: description: "Beskrivning:" download: ladda ner @@ -1431,13 +1512,17 @@ sv: uploaded_at: "Uppladdad:" visibility: "Synlighet:" visibility_help: vad betyder detta? + georss: + title: OpenStreetMap GPS-spår list: + description: Bläddra bland nyligen uppladdade GPS-spår + empty_html: Ingenting här ännu. Ladda upp ett nytt GPS-spår eller lär dig om GPS-spår på wikin. public_traces: Publika GPS-spår public_traces_from: Publika GPS-spår från %{user} tagged_with: " taggad med %{tags}" your_traces: Dina GPS-spår make_public: - made_public: Spår offentliggjort + made_public: GPS-spår offentliggjort offline: heading: GPX förvaring är offlien message: GPX-uppladdningssystemet är för närvarande inte tillgängligt. @@ -1447,16 +1532,16 @@ sv: ago: "%{time_in_words_ago} sedan" by: av count_points: "%{count} punkter" - edit: Redigera + edit: redigera edit_map: Redigera karta identifiable: IDENTIFIERBAR in: i map: karta more: mer - pending: BEHANDLAS + pending: VÄNTANDE private: PRIVAT public: PUBLIK - trace_details: Visa spårdetaljer + trace_details: Visa detaljer för GPS-spår trackable: SPÅRBAR view_map: Visa karta trace_form: @@ -1470,23 +1555,25 @@ sv: visibility_help: vad betyder detta? trace_header: see_all_traces: Se alla GPS-spår - see_your_traces: Visa alla dina spår - traces_waiting: Du har %{count} GPS-spår som laddas upp. Det är en bra idé att låta dessa bli klara innan du laddar upp fler, så att du inte blockerar uppladdningskön för andra användare. + see_your_traces: Visa alla dina GPS-spår + traces_waiting: + one: Du har %{count} GPS-spår som håller på att laddas upp. Vänta gärna på att dessa blir klara innan du laddar upp fler, så att du inte blockerar kön för andra användare. + other: Du har %{count} GPS-spår som håller på att laddas upp. Vänta gärna på att detta blir klart innan du laddar upp fler, så att du inte blockerar kön för andra användare. upload_trace: Ladda upp GPS-spår trace_optionals: tags: Taggar trace_paging_nav: - next: Nästa » - previous: « Föregående - showing_page: Visar sida %{page} + newer: Nyare GPS-spår + older: Äldre GPS-spår + showing_page: Sida %{page} view: - delete_track: Radera detta spår + delete_track: Radera detta GPS-spår description: "Beskrivning:" download: ladda ner edit: redigera - edit_track: Redigera detta spår + edit_track: Redigera detta GPS-spår filename: "Filnamn:" - heading: Visar spår %{name} + heading: Visar GPS-spår %{name} map: karta none: Ingen owner: "Ägare:" @@ -1494,9 +1581,9 @@ sv: points: "Punkter:" start_coordinates: "Startkoordinat:" tags: "Taggar:" - title: Visar spår %{name} - trace_not_found: Spår hittades inte! - uploaded: "Uppladdad den:" + title: Visar GPS-spår %{name} + trace_not_found: GPS-spår hittades inte! + uploaded: "Uppladdad:" visibility: "Synlighet:" visibility: identifiable: Identifierbar (visas i GPS-spårlistan och som ordnade punkter med tidsstämpel) @@ -1508,15 +1595,18 @@ sv: contributor terms: agreed: Du har godkänt de nya bidragsgivarvillkoren. agreed_with_pd: Du har också förklarat att du anser att dina redigeringar är inom Public Domain. - heading: "Användarvillkor:" + heading: "Bidragsgivarvillkor:" link text: vad är detta? not yet agreed: Du har ännu inte godkänt de nya bidragsgivarvillkoren. review link text: Följ denna länk när du har tid att granska och godkänna de nya bidragsvillkoren. - current email address: "Nuvarande E-postadress:" + current email address: "Nuvarande e-postadress:" delete image: Ta bort nuvarande bild - email never displayed publicly: (Visas aldrig offentligt) + email never displayed publicly: (visas aldrig offentligt) flash update success: Användarinformation uppdaterades. flash update success confirm needed: Användarinformation uppdaterades. Kontrollera din e-post för att bekräfta din e-postadress. + gravatar: + gravatar: Använd Gravatar + link text: vad är detta? home location: "Hemposition:" image: "Bild:" image size hint: (kvadratiska bilder på minst 100x100 fungerar bäst) @@ -1541,7 +1631,7 @@ sv: enabled: Aktiverat, du är inte anonym och kan redigera data. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: vad är detta? - heading: "Publik redigering:" + heading: "Offentlig redigering:" public editing note: heading: Offentlig redigering text: Dina redigeringar är för tillfället anonyma och andra användare kan inte skicka meddelanden till dig eller se din position. För att visa andra vad du redigerat och för att tillåta andra att kontakta dig genom webbplatsen, klicka på knappen nedan. Sedan bytet till API av version 0.6 kan bara publika användare redigera kartdata. (ta reda på varför (engelska)).
    • Din e-postadress avslöjas inte om du blir publik användare.
    • Denna handling kan inte ångras och alla nya användare är numera publika som standard.
    @@ -1552,13 +1642,13 @@ sv: update home location on click: Uppdatera hemplatsen när jag klickar på kartan? confirm: already active: Detta konto har redan bekräftats. - before you start: "Vi vet att du knappt kan bärga dig med att komma igång att börja mappa, men först får du gärna fylla i mer information om dig själv i nedanstående formulär:" button: Bekräfta - heading: Bekräfta ett användarkonto. - press confirm button: Klicka bekräftelseknappen nedan för att aktivera ditt konto. - reconfirm: Om det gått ett tag sedan du registrerade dig kan du behöva skicka ett nytt bekräftelsemail till dig själv. - success: Ditt konto är bekräftat, tack för att du registrerade dig. - unknown token: Den token tycks inte existera. + heading: Kontrollera din e-post! + introduction_1: Vi har skickat en bekräftelse via e-post. + introduction_2: Bekräfta ditt konto genom att klicka på länken i mailet, sen kan du sätta igång att kartera. + press confirm button: Klicka på bekräftelseknappen nedan för att aktivera ditt konto. + reconfirm_html: Om du vill att vi ska skicka bekräftelsemailet igen, klicka här. + unknown token: Denna bekräftelsekod har gått ut eller finns inte. confirm_email: button: Bekräfta failure: En e-postadress har redan bekräftats med den här nyckeln. @@ -1567,7 +1657,7 @@ sv: success: E-postadressen är bekräftad. Tack för att du registrerade dig! confirm_resend: failure: Användaren %{name} hittades inte. - success: Vi har skickat ett nytt bekräftelsemeddelande till %{email} och så snart du bekräftat ditt konto kommer du kunna börja kartlägga.

    Om du använder ett antispamsystem som skickar bekräftelsebegäranden se till att du vitlistar webmaster@openstreetmap.org då vi inte kan svara på några sådana begäranden. + success: Vi har skickat ett nytt bekräftelsemeddelande till %{email} och så snart du bekräftat ditt konto kommer du kunna börja kartera.

    Om du använder ett antispamsystem som skickar bekräftelsemeddelanden se till att du vitlistar webmaster@openstreetmap.org då vi inte kan svara på några sådana begäranden. filter: not_an_administrator: Du måste vara administratör för att få göra det. go_public: @@ -1578,27 +1668,25 @@ sv: heading: Användare hide: Göm valda användare showing: - one: Visar sida %{page} (%{first_item} av %{items}) - other: Visar sida %{page} (%{first_item}-%{last_item} av %{items}) + one: Sida %{page} (%{first_item} av %{items}) + other: Sida %{page} (%{first_item}-%{last_item} av %{items}) summary: "%{name} skapades från %{ip_address} den %{date}" summary_no_ip: "%{name} skapad %{date}" title: Användare login: account is suspended: "Tyvärr har ditt konto stängts av på grund av tvivelaktig aktivitet.
    Kontakta webbansvarig om du vill diskutera saken." - account not active: Ditt konto är inte aktivterat.
    Vänligen klicka på länken i e-brevet med kontobekräftelsen för att aktivera ditt konto, eller begär ett nytt bekräftelsebrev. + account not active: Tyvärr, ditt konto är inte aktiverat.
    Vänligen klicka på länken i e-posten med kontobekräftelsen, för att aktivera ditt konto, eller begär en ny epostsbekräftelse. auth failure: Kunde inte logga in med de uppgifterna. create account minute: Skapa ett konto. Det tar bara en minut. email or username: "E-postadress eller användarnamn:" - heading: Inloggning + heading: Logga in login_button: Logga in lost password link: Glömt ditt lösenord? new to osm: Ny på OpenStreetMap? no account: Har du inget konto? - notice: Läs mer om Openstreetmaps kommande licensändring (översättningar) (diskussion) - notice_terms: OpenStreetMap flyttas till en ny licens 1 april 2012. Den är lika öppen som den nuvarande, men de juridiska bitarna är mycket bättre lämpade för vår kartdatabas. Vi vill gärna behålla dina bidrag i OpenStreetMap, men vi kan bara göra detta om du samtycker till att låta oss distribuera dem under den nya licensen. Annars kommer vi att ta bort dem från databasen.

    Logga in, och lägg några sekunder på att granska och godkänna de nya villkoren. Tack! openid: "%{logo} OpenID:" - openid invalid: Tyvärr verkar din OpenID vara felaktigt formaterad. - openid missing provider: Kunde inte nå din OpenID leverantör + openid invalid: Tyvärr verkar ditt OpenID vara felaktigt formaterat. + openid missing provider: Kunde inte nå din OpenID-leverantör openid_logo_alt: Logga in med ett OpenID openid_providers: aol: @@ -1611,21 +1699,21 @@ sv: alt: Logga in med myOpenID OpenID title: Logga in med myOpenID openid: - alt: Logga in med ett OpenID-URL + alt: Logga in med en OpenID-URL title: Logga in med OpenID wordpress: - alt: Logga in med Wordpress OpenID + alt: Logga in med ett Wordpress OpenID title: Logga in med Wordpress yahoo: alt: Logga in med ett Yahoo OpenID title: Logga in med Yahoo password: "Lösenord:" register now: Registrera dig nu - remember: "Kom ihåg mig:" + remember: Kom ihåg mig title: Logga in to make changes: För att göra ändringar i OpenStreetMaps data måste du ha ett konto. with openid: "Du kan även använda ditt OpenID-konto för att logga in:" - with username: "Har du redan ett OpenStreetMap konto? Logga in med ditt användarnamn och lösenord:" + with username: "Har du redan ett OpenStreetMap-konto? Logga in med ditt användarnamn och lösenord:" logout: heading: Logga ut från OpenStreetMap logout_button: Logga ut @@ -1640,39 +1728,43 @@ sv: title: Förlorat lösenord make_friend: already_a_friend: Du är redan vän med %{name}. - failed: Misslyckades med att lägga till %{name} som vän. - success: "%{name} är nu din vän." + button: Lägg till som vän + failed: Misslyckades med att lägga till %{name} som en vän. + heading: Lägg till %{user} som en vän? + success: "%{name} är nu din vän!" new: + about: + header: Fri och redigerbar + html: "

    Till skillnad från andra kartor är OpenStreetMap helt skapad av människor som du. Kartan är öppen för alla att bidra till, uppdatera, ladda ner och använda.

    \n

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

    " confirm email address: "Bekräfta e-postadress:" confirm password: "Bekräfta lösenord:" - contact_webmaster: Kontakta webmastern för att få ett konto skapat - vi kommer att behandla ansökan så snabbt som möjligt. - continue: Fortsätt - display name: "Namn som visas:" + contact_webmaster: Kontakta webbansvarig för att få ett konto skapat – vi kommer att behandla ansökan så snart som möjligt. + continue: Skapa ett konto + display name: "Visat namn:" display name description: Ditt offentligt visade användarnamn. Du kan ändra detta senare i inställningarna. email address: "E-postadress:" - fill_form: Fyll i formuläret så skickar vi ett e-brev för att aktivera ditt konto. - flash create success message: Tack för att du registrerade dig. Vi har skickat ett bekräftelsebegäran till %{email} och så snart du bekräftat ditt konto kommer du kunna kartlägga.

    Använder du ett antispamsystem som skickar bekräftelsebegäranden se till att du vitlistar webmaster@openstreetmap.org då vi inte kan svara på några bekräftelsebegäranden. - heading: Skapa ett användarkonto - license_agreement: När du bekräftar ditt konto måste du samtycka till bidragsgivarvillkoren . + license_agreement: När du bekräftar ditt konto måste du samtycka till bidragsgivarvillkoren. no_auto_account_create: Tyvärr kan vi för närvarande inte kan skapa ett konto åt dig automatiskt. - not displayed publicly: Visas inte offentligt (se sekretesspolicyn) + not displayed publicly: Visas inte offentligt (se integritetspolicyn) openid: "%{logo} OpenID:" - openid association: "

    Ditt OpenID är ännu inte associerad med ett OpenStreetMap konto

    \n
      \n
    • Om du är ny på OpenStreetMap, skapa ett nytt konto med hjälp av formuläret nedan.
    • \n
    • \n Om du redan har ett konto kan du logga in till ditt konto på vanligt sätt\n med hjälp av ditt användarnamn och lösenord, för att sedan associera kontot\n med ditt OpenID i användarinställningarna.\n
    • \n
    " - openid no password: Med OpenID behövs inget lösenord, men en del extra verktyg och vissa servrar kan fortfarande behöva en. + openid association: "

    Ditt OpenID är ännu inte associerad med ett OpenStreetMap konto ännu.

    \n
      \n
    • Om du är ny på OpenStreetMap, skapa ett nytt konto med hjälp av formuläret nedan.
    • \n
    • \n Om du redan har ett konto, kan du logga in\n med hjälp av ditt användarnamn och lösenord, för att sedan associera kontot\n med ditt OpenID i användarinställningarna.\n
    • \n
    " + openid no password: Med OpenID behövs inget lösenord, men en del extra verktyg och vissa servrar kan fortfarande behöva ett. password: "Lösenord:" - terms accepted: Tack för att du accepterar de nya vilkoren för bidrag till kartan + terms accepted: Tack för att du accepterat de nya villkoren för bidrag till kartan! terms declined: Vi beklagar att du bestämt dig för att inte acceptera de nya användarvillkoren. För mer information, se denna wikisida. - title: Skapa konto + title: Registrera use openid: Alternativt, använd %{logo} OpenID för att logga in no_such_user: - body: Det finns ingen användare med namnet %{user}. Kontrollera stavningen eller kanske länken är trasig. + body: Det finns ingen användare med namnet %{user}. Kontrollera stavningen, eller så kanske länken är trasig. heading: Användaren %{user} finns inte - title: Ingen sådan användare + title: Finns ingen sådan användare popup: friend: Vän nearby mapper: Användare i närheten your location: Din position remove_friend: + button: Ta bort som vän + heading: Ta bort %{user} som vän? not_a_friend: "%{name} är inte en av dina vänner." success: "%{name} togs bort från dina vänner." reset_password: @@ -1696,23 +1788,23 @@ sv: consider_pd_why: vad är det här? decline: Avslå guidance: "Information som hjälper dig förstå dessa termer: en lättläst sammanfattning och några informella översättningar" - heading: Vilkor för bidrag till kartan + heading: Villkor för deltagare legale_names: france: Frankrike italy: Italien - rest_of_world: Resten av världen - legale_select: Välj din vistelseort + rest_of_world: Övriga världen + legale_select: "Välj det land du bor i:" read and accept: Läs avtalet nedan och klicka på knappen Godkänn för att bekräfta att du godkänner villkoren i detta avtal för dina befintliga och framtida bidrag. title: Villkor för deltagare you need to accept or decline: Läs igenom och Godkänn eller Avböj de nya bidragsvillkoren för att fortsätta. view: activate_user: aktivera denna användare - add as friend: lägg till som vän + add as friend: Lägg till vän ago: (%{time_in_words_ago} sedan) - block_history: visa tilldelade blockeringar - blocks by me: blockeringar av mig - blocks on me: mina blockeringar - comments: kommentarer + block_history: tilldelade blockeringar + blocks by me: Blockeringar lagda av mig + blocks on me: Blockeringar av mig + comments: Kommentarer confirm: Bekräfta confirm_user: bekräfta denna användare create_block: blockera denna användare @@ -1720,35 +1812,39 @@ sv: ct accepted: Godkända för %{ago} sedan ct declined: Avböjda ct status: "Användarvillkor:" - ct undecided: Oavgjorda - deactivate_user: deaktivera denna användare + ct undecided: Ej bestämda + deactivate_user: avaktivera denna användare delete_user: radera denna användare description: Beskrivning - diary: dagbok - edits: redigeringar + diary: Dagbok + edits: Redigeringar email address: "E-post:" - friends_changesets: Bläddra igenom alla ändringsset bland vänner - friends_diaries: Bläddra igenom alla dagboksinlägg av vänner + friends_changesets: vänners ändringsset + friends_diaries: vänners dagboksinlägg hide_user: dölj denna användare - if set location: Om du sätter din position, så kommer en karta med lite funktioner att dyka upp här nedanför. Du kan sätta din hemposition på din %{settings_link}-sida. + if set location: Ange din hemposition på %{settings_link}-sidan för att se närbelägna användare. km away: "%{count}km bort" latest edit: "Senaste redigering %{ago}:" m away: "%{count}m bort" mapper since: "Karterar sedan:" - moderator_history: visa tilldelade blockeringar - my comments: mina kommentarer - my diary: min dagbok - my edits: mina redigeringar - my settings: mina inställningar - my traces: mina GPS-spår + moderator_history: utdelade blockeringar + my comments: Mina kommentarer + my diary: Min dagbok + my edits: Mina redigeringar + my messages: Mina meddelanden + my notes: Mina kartanteckningar + my profile: Min profil + my settings: Mina inställningar + my traces: Mina GPS-spår nearby users: Andra användare nära dig - nearby_changesets: Bläddra igenom alla ändringsset av närbelägna användare - nearby_diaries: Bläddra igenom alla dagboksinlägg av närbelägna användare + nearby_changesets: närbelägna användares ändringsset + nearby_diaries: närbelägna användares dagboksinlägg new diary entry: nytt dagboksinlägg no friends: Du har inte lagt till några vänner ännu. - no nearby users: Det är inga andra användare som uppgett att de mappar i ditt område ännu. - oauth settings: oauth inställningar - remove as friend: ta bort vän + no nearby users: Det är ännu inga andra användare som uppgett att de kartlägger nära dig. + notes: Kartanteckningar + oauth settings: oauth-inställningar + remove as friend: Ta bort vän role: administrator: Den här användaren är en administratör grant: @@ -1760,24 +1856,24 @@ sv: moderator: Återkalla moderatorrättigheter send message: Skicka meddelande settings_link_text: inställningar - spam score: "Spambeömmning:" + spam score: "Spam-poäng:" status: "Status:" - traces: spår + traces: Spår unhide_user: sluta dölja användaren user location: Användarposition your friends: Dina vänner user_block: blocks_by: - empty: "%{name} har inge gjort några blockeringar än." - heading: Lista blockeringar av %{name} + empty: "%{name} har inte gjort några blockeringar än." + heading: Lista över blockeringar av %{name} title: Blockeringar av %{name} blocks_on: empty: "%{name} har inte blockerats än." - heading: Lista blockeringar på %{name} + heading: Lista över blockeringar på %{name} title: Blockeringar på %{name} create: - flash: Skapat en blockering av användare %{name}. - try_contacting: Försök att kontakta användarenoch ge användaren tid att svara innan du blockerar . + flash: Upprättade en blockering av användare %{name}. + try_contacting: Försök att kontakta användaren och ge användaren rimlig tid att svara innan du blockerar. try_waiting: Försök att ge användaren en rimlig svarstid innan denna blockeras. edit: back: Visa alla blockeringar @@ -1797,7 +1893,7 @@ sv: until_login: Aktiv till dess användaren loggar in. index: empty: Inga blockeringar har gjorts ännu. - heading: Lista över blockerade användare + heading: Lista över användarblockeringar title: Användarblockeringar model: non_moderator_revoke: Måste vara en moderator för att återkalla en blockering. @@ -1807,10 +1903,10 @@ sv: heading: Skapa blockering på %{name} needs_view: Användaren måste logga in innan blockeringen kommer att upphöra. period: Hur lång tid, från och med nu, användaren ska vara blockerad från API. - reason: Anledning till varför %{name} blockeras. Var så lugn och resonabel som möjligt, ge så så många detaljer som du kan om situationen med vetskapen att meddelandet kommer vara offentligt i bakhuvudet. Tänk på att inte alla användare förstår community-jargongen, så försök att använda lekmannatermer. + reason: Anledning till varför %{name} blockeras. Var så lugn och resonabel som möjligt och ge så så många detaljer som du kan om situationen. Men ha i bakhuvudet att meddelandet kommer vara offentligt. Tänk på att inte alla användare förstår community-jargongen, så försök att använda lekmannatermer. submit: Skapa blockering title: Skapa blockering på %{name} - tried_contacting: Jag har kontaktat användaren och bett honom sluta. + tried_contacting: Jag har kontaktat användaren och bett användaren sluta. tried_waiting: Jag har gett en rimlig tidsfrist för användaren att svara på dessa meddelanden. not_found: back: Tillbaka till index @@ -1819,28 +1915,31 @@ sv: confirm: Är du säker? creator_name: Skapare display_name: Blockerad användare - edit: Ändra + edit: Redigera + next: Nästa » not_revoked: (Inte återkallat) + previous: « Föregående reason: Orsak till blockering revoke: Återkalla! revoker_name: Återkallad av show: Visa + showing_page: Sida %{page} status: Status period: one: 1 timma other: "%{count} timmar" revoke: - confirm: Är du säker på att du vill återkalla denna blockering - flash: Denna blockering har återkallats. - heading: Återkalla blockering på %{block_on} av %{block_by} - past: Detta block avslutades %{time} sedan och kan inte återkallas nu. - revoke: Återkalla! + confirm: Är du säker på att du vill återkalla denna blockering? + flash: Denna blockering har upphävts. + heading: Upphäv blockering på %{block_on} av %{block_by} + past: Detta block avslutades %{time} sedan och kan inte upphävas nu. + revoke: Upphäv! time_future: Denna blockering kommer att avslutas inom %{time}. title: Upphäv blockering av %{block_on} show: back: Se alla blockeringar confirm: Är du säker? - edit: Ändra + edit: Redigera heading: "%{block_on} blockerad av %{block_by}" needs_view: Användaren måste logga in innan blockeringen upphör. reason: "Anledning för blockering:" @@ -1849,26 +1948,48 @@ sv: show: Visa status: Status time_future: Upphör om %{time} - time_past: Slutade %{time} sedan + time_past: Slutade för %{time} sedan title: "%{block_on} blockerad av %{block_by}" update: only_creator_can_edit: Bara moderatorn som skapade denna blockering kan redigera den. success: Blockering uppdaterad. user_role: filter: - already_has_role: Användaren har rollen %{role}. + already_has_role: Användaren har redan rollen %{role}. doesnt_have_role: Användaren har inte rollen %{role}. not_a_role: Strängen `%{role}' är inte en korrekt roll. not_an_administrator: Endast adminstratörer kan ändra användares roller och du är inte administratör. grant: are_you_sure: Är du säker på att du vill ge rollen `%{role}' till användaren `%{name}'? confirm: Bekräfta - fail: Kunde inte ge rollen "%{role}" till användare "%{name}". Kontrollera att användare och roll båda är korrekta. + fail: Kunde inte ge rollen "%{role}" till användare "%{name}". Kontrollera att både användare och roll är korrekta. heading: Bekräfta rolltilldelning title: Bekräfta rolltilldelning revoke: are_you_sure: Är du säker på att du vill avlägsna rollen "%{role}" från användaren "%{name}"? confirm: Bekräfta - fail: Kunde inte avlägsna rollen "%{role}" från användaren "%{name}". Kontrollera att användaren och rollen båda är korrekta. + fail: Kunde inte återkalla rollen "%{role}" från användaren "%{name}". Kontrollera att både användaren och rollen är korrekta. heading: Bekräfta återkallning av roll title: Bekräfta återkallning av roll + welcome_page: + add_a_note: + paragraph_1_html: Om du bara vill ha ett litet problem fixat och inte har tid att registrera dig så är det lätt att lämna en kartanteckning. + paragraph_2_html: "Gå till kartan och tryck på anteckningsikonen:\n. En markör, som du kan dra omkring, kommer att läggas till på kartan. Lägg till ett meddelande och spara. Någon annan kommer att undersöka frågan." + title: Ingen tid att redigera? Lägg till en kommentar! + basic_terms: + editor_html: En redigerare är ett program eller en webbsida du kan använda för att ändra i kartan. + node_html: En nod är en punkt på kartan, till exempel en ensam restaurang eller ett träd. + paragraph_1_html: OpenStreetMap har en del egen jargong. Här är några begrepp som kan vara bra att förstå. + tag_html: En tagg är en bit data om en nod eller väg, till exempel en restaurangs namn eller en vägs hastighetsbegränsning. + title: Grundläggande termer för kartering + way_html: En väg är en linje eller ett område, till exempel en väg, bäck, sjö eller byggnad. + introduction_html: Välkommen till OpenStreetMap, den fria och redigerbara kartan över världen. Nu när du har registrerat dig är du klar för att börja kartlägga saker. Här är en snabb genomgång av de viktigaste sakerna du behöver veta. + questions: + paragraph_1_html: "OpenStreetMap har flera resurser som hjälper dig att lära dig om projektet, för att ställa och svara på frågor, och tillsammans diskutera och dokumentera frågor gällande kartering.\nFå hjälp här." + title: Några frågor? + start_mapping: Börja kartlägga + title: Välkommen! + whats_on_the_map: + off_html: Vad OpenStreetMap inte innehåller är subjektiva data som betyg, historiska eller hypotetiska objekt, samt data från upphovsrättsskyddade källor. Om du inte har ett speciellt tillstånd, kopiera inte från andra kartor online eller på papper. + on_html: OpenStreetMap är en plats för att kartlägga sådant som både finns i verkligheten och är aktuellt. OpenStreetMap innehåller miljontals byggnader, vägar och annan information om platser. Du kan lägga till vad som helst som finns i verkligheten och som intresserar dig. + title: Vad finns på kartan diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 7e20296a737..16f5cd9d0fb 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -4,6 +4,7 @@ # Author: Aswn # Author: Karthi.dr # Author: Krishnaprasaths +# Author: Sank # Author: Shanmugamp7 # Author: Surya Prakash.S.A. # Author: TRYPPN @@ -78,75 +79,15 @@ ta: way_tag: வழி இணைப்பு browse: changeset: - changeset: "மாற்றங்கள்: %{id}" changesetxml: மாற்றத்தொடுப்பு XML - download: "%{changeset_xml_link} அல்லது %{osmchange_xml_link} -ஐப் பதிவிறக்கு" feed: title: "மாற்றங்கள்: %{id}" title_comment: மாற்றங்கள் %{id}-%{comment} osmchangexml: osmChange XML title: மாற்றங்கள் - changeset_details: - belongs_to: "உரியது:" - bounding_box: சூழ்பெட்டி - box: பெட்டி - closed_at: "மூடப்பட்டது:" - created_at: "உருவாக்கப்பட்டது:" - no_bounding_box: இந்த மாற்றத்துக்கு எந்த சூழ்பெட்டியும் இதுவரை சேமிக்கப்படவில்லை. - show_area_box: பரப்புப் பெட்டியைக் காட்டு - common_details: - changeset_comment: "கருத்து:" - deleted_at: "நீக்கப்பட்ட நேரம்:" - deleted_by: "நீக்கியவர்:" - edited_at: "திருத்தப்பட்டது:" - edited_by: "தொகுத்தவர்:" - in_changeset: "மாற்றத்தொகுப்பில்:" - version: "பதிப்பு:" containing_relation: entry: தொடர்பு %{relation_name} entry_role: தொடர்பு %{relation_name} (%{relation_role} ஆக) - map: - deleted: நீக்கப்பட்டது - edit: - area: பகுதி திருத்து - relation: தொடர்பை திருத்து - way: வழியை திருத்து - larger: - area: பரப்பைப் பெரிய வரைபடத்தில் பார்க்கவும் - node: முனையத்தைப் பெரிய வரைபடத்தில் பார்க்கவும் - relation: தொடர்பைப் பெரிய வரைபடத்தில் பார்க்கவும் - way: வழியைப் பெரிய வரைபடத்தில் பார்க்கவும் - loading: ஏற்றப்படுகிறது... - navigation: - all: - next_changeset_tooltip: அடுத்த மாற்றம் - next_node_tooltip: அடுத்த முனையம் - next_relation_tooltip: அடுத்த தொடர்பு - next_way_tooltip: அடுத்த வழி - prev_changeset_tooltip: முந்தைய மாற்றம் - prev_node_tooltip: முந்தைய முனையம் - prev_relation_tooltip: முந்தைய தொடர்பு - prev_way_tooltip: முந்தைய வழி - user: - name_changeset_tooltip: "%{user} என்பவரின் தொகுப்புகளைக் காண்க" - next_changeset_tooltip: "%{user} என்ற பயனரின் அடுத்த தொகுப்பு" - prev_changeset_tooltip: "%{user} என்ற பயனரின் முந்தைய தொகுப்பு" - node: - download: "%{download_xml_link}, %{view_history_link} அல்லது %{edit_link}" - download_xml: XML பதிவிறக்கு - edit: தொகு - node: சந்தி - node_title: "சந்தி: %{node_name}" - view_history: வரலாற்றை பார்க்கவும் - node_details: - coordinates: "ஆயக்கூறுகள்:" - part_of: "பகுதி:" - node_history: - download: "%{download_xml_link} அல்லது %{view_details_link}" - download_xml: XML பதிவிறக்கு - node_history: "முனைய வரலாறு:" - node_history_title: "முனைய வரலாறு: %{node_name}" - view_details: விவரங்களைக் காணவும் not_found: sorry: மன்னிக்கவும், %{id} என்ற அடையாளம் கொண்ட %{type} என்பது கிடைக்கவில்லை. type: @@ -154,62 +95,17 @@ ta: node: முனையம் relation: தொடர்பு way: வழி - paging_nav: - of: "," - showing_page: காட்டப்பட்டுக் கொண்டிருக்கும் பக்கம் - relation: - download: "%{download_xml_link} அல்லது %{view_history_link}" - download_xml: XML பதிவிறக்கு - relation: தொடர்பு - relation_title: "தொடர்பு: %{relation_name}" - view_history: வரலாறைப் பார்க்கவும் - relation_details: - members: "உறுப்பினர்கள்:" - part_of: "பகுதி:" - relation_history: - download: "%{download_xml_link} அல்லது %{view_details_link}" - download_xml: XML பதிவிறக்கு - relation_history: தொடர்பு வரலாறு - relation_history_title: "தொடர்பு வரலாறு: %{relation_name}" - view_details: விவரங்களைக் காணவும் + redacted: + type: + way: வழி relation_member: entry_role: "%{type} %{name} %{role} ஆக" type: node: சந்தி relation: தொடர்பு way: வழி - start: - manually_select: நீங்களாகவே வேறு பகுதியைத் தேர்ந்தெடுக்கவும் - view_data: நடப்பு வரைபடக் காட்சிக்கான தரவுகளைப் பார்க்கவும் start_rjs: - data_frame_title: தரவு - data_layer_name: தரவு - details: விளக்கம் - drag_a_box: குறிப்பிட்ட பரப்பைத் தேர்வு செய்ய ஒரு பெட்டியை வரைபடத்தின் மீது இழுத்து வரவும் - edited_by_user_at_timestamp: தொகுத்தவர் [[user]] அன்று [[timestamp]] - hide_areas: பகுதிகளை மறை loading: ஏற்றப்படுகிறது ... - manually_select: நீங்களாகவே வேறு பகுதியைத் தேர்ந்தெடுக்கவும் - object_list: - back: பொருள் பட்டியலை காண்பி - details: விளக்கம் - heading: பொருட்களின் பட்டியல் - history: - type: - node: சந்தி [[id]] - way: வழி [[id]] - selected: - type: - node: சந்தி [[id]] - way: வழி [[id]] - type: - node: சந்தி - way: வழி - private_user: தனிப்பட்ட பயனர் - show_areas: பகுதிகளைக் காண்பி - show_history: வரலாற்றைக் காட்டவும் - wait: காத்திருக்கவும்... - zoom_or_select: வரைபடத்தைப் பார்ப்பதற்கு ஒரு பகுதியை நெருங்கிப் பார்க்கவும் அல்லது தேர்ந்தெடுக்கவும் tag_details: tags: "குறிப்புக்கள்:" wiki_link: @@ -221,24 +117,10 @@ ta: node: சந்தி relation: தொடர்பு way: வழி - way: - edit: தொகு - view_history: வரலாற்றை பார்க்கவும் - way: வழி - way_title: "வழி: %{way_name}" - way_details: - nodes: "சந்திகள்:" - way_history: - download_xml: XML கோப்பாக பதிவிறக்கு - view_details: விவரங்களைக் காணவும் changeset: changeset: anonymous: அடையாளமற்றவர் - big_area: (பெரிய) - no_comment: (எதுவுமில்லை) no_edits: (திருத்தங்கள் இல்லை) - show_area_box: பரப்புப் பெட்டியைக் காட்டு - still_editing: (இன்னும் திருத்தப்படுகிறது) changeset_paging_nav: next: அடுத்து » previous: « முந்தைய @@ -249,17 +131,13 @@ ta: saved_at: சேமிக்கப்பட்ட user: பயனர் list: - description: அண்மைய மாற்றங்கள் - heading: மாற்ற தொகுப்புகள் - heading_bbox: மாற்ற தொகுப்புகள் - heading_friend: மாற்ற தொகுப்புகள் - heading_nearby: மாற்ற தொகுப்புகள் - heading_user: மாற்ற தொகுப்புகள் - heading_user_bbox: மாற்ற தொகுப்புகள் title: மாற்றங்கள் diary_entry: + comments: + comment: கருத்துரை diary_comment: confirm: உறுதிசெய் + hide_link: இக் கருத்துரையை மறை diary_entry: comment_link: இந்த உள்ளீடு குறித்து கருத்துகூறு confirm: உறுதிசெய் @@ -327,11 +205,6 @@ ta: output: வெளியீடு scale: அளவுவீதம் zoom: பெரிதாக்கு - start_rjs: - click_add_marker: வரைபடம் மீது ஒரு குறியீட்டை சேர்க்க அதை கிளிக் செய்யவும் - drag_a_box: குறிப்பிட்ட பரப்பைத் தேர்வு செய்ய ஒரு பெட்டியை வரைபடத்தின் மீது இழுத்து வரவும் - export: ஏற்றுமதி செய் - manually_select: நீங்களாகவே வேறு பகுதியைத் தேர்ந்தெடுக்கவும் geocoder: description: types: @@ -377,7 +250,9 @@ ta: driving_school: ஓட்டுநர் பயிற்சிப்பள்ளி embassy: தூதரகம் emergency_phone: அவசர தொலைபேசி + fast_food: துரித உணவு fire_station: தீயணைப்பு நிலையம் + food_court: உணவுச்சாலை fountain: நீரூற்று fuel: எரிபொருள் grave_yard: இடுகாடு @@ -401,6 +276,7 @@ ta: police: காவல் post_box: அஞ்சல் பெட்டி post_office: தபால் நிலையம் + preschool: முன் பள்ளி prison: சிறைச்சாலை public_building: பொது கட்டிடம் public_market: பொது சந்தை @@ -412,6 +288,7 @@ ta: shelter: தங்குமிடம் shop: கடை studio: ஸ்டுடியோ + swimming_pool: நீச்சல் தடாகம் taxi: வாடகை வண்டி telephone: பொது தொலைபேசி theatre: திரையரங்கம் @@ -424,6 +301,10 @@ ta: youth_centre: இளைஞர் மையம் boundary: administrative: நிர்வாக எல்லை + bridge: + "yes": பாலம் + building: + "yes": கட்டிடம் highway: bus_guideway: வழிநடத்தப்பட்ட பேருந்து தடம் bus_stop: பேருந்து நிறுத்தம் @@ -432,6 +313,7 @@ ta: emergency_access_point: அவசர அணுகல் புள்ளி footway: நடைபாதை living_street: வாழும் வீதி + milestone: மைல் கல் minor: சிறு சாலை path: பாதை pedestrian: பாதசாரிகள் வழி @@ -450,6 +332,7 @@ ta: boundary_stone: எல்லைக் கல் building: கட்டிடம் castle: கோட்டை + church: தேவாலயம் house: வீடு icon: படவுரு memorial: நினைவிடம் @@ -504,6 +387,11 @@ ta: volcano: எரிமலை water: நீர் wood: மரம் + office: + accountant: கணக்காளர் + company: நிறுவனம் + lawyer: வழக்குரைஞர் + "yes": அலுவலகம் place: airport: விமான நிலையம் city: நகரம் @@ -548,6 +436,7 @@ ta: fashion: நாகரிக கடை fish: மீன் கடை food: உணவுக் கடை + gallery: காட்சியகம் insurance: காப்புறுதி jewelry: நகைக் கடை laundry: சலவை @@ -574,37 +463,23 @@ ta: canal: கால்வாய் dam: அணை lock: பூட்டு - river: நதி + river: ஆறு riverbank: நதிக்கரை waterfall: நீர்வீழ்ச்சி - javascripts: - site: - history_tooltip: இந்த பகுதிக்கான திருத்தங்களை காண் layouts: community_blogs: சமுதாய வலைப்பதிவுகள் copyright: பதிப்புரிமை & உரிமம் - documentation: ஆவணமாக்கல் edit: தொகு - export_tooltip: வரைபட தரவை ஏற்று foundation: அறக்கட்டளை foundation_title: OpenStreetMap அறக்கட்டளை help: உதவி - help_centre: உதவி மையம் history: வரலாறு home: முகப்பு - home_tooltip: முகப்பு பகுதிக்கு செல்லவும் - inbox: உள்பெட்டி (%{count}) log_in: புகுபதிகை log_in_tooltip: ஏற்கனவே உள்ள கணக்கு மூலம் புகுபதிகை செய் logout: விடுபதிகை - logout_tooltip: விடுபதிகை make_a_donation: text: ஒரு நன்கொடையை அளிக்கவும் - view: காண் - view_tooltip: வரைபடத்தை காண் - welcome_user: வரவேற்பு, %{user_link} - welcome_user_link_tooltip: உங்கள் பயனர் பக்கம் - wiki: விக்கி license_page: foreign: title: இந்த மொழிபெயர்ப்பு பற்றி @@ -638,7 +513,6 @@ ta: outbox: வெளிப்பெட்டி subject: பொருள் read: - back_to_inbox: உள்பெட்டிக்கு திரும்பவும் date: நாள் from: அனுப்புநர் reply_button: பதில் அளி @@ -669,6 +543,9 @@ ta: revoke: திரும்பபெறு new: submit: பதிவுசெய் + redaction: + update: + flash: மாற்றங்கள் சேமிக்கப்பட்டன site: edit: user_page_link: பயனர் பக்கம் @@ -734,6 +611,7 @@ ta: identifiable: அடையாளம் காணக்கூடிய in: உள் map: வரைபடம் + more: மேலும் private: தனியார் public: பொது view_map: வரைபடத்தை காண் @@ -751,9 +629,6 @@ ta: upload_trace: சுவடை பதிவேற்றவும் trace_optionals: tags: குறிச்சொற்கள் - trace_paging_nav: - next: அடுத்து » - previous: « முந்தைய view: delete_track: இந்த சுவடை நீக்கவும் description: "விளக்கம்:" @@ -816,7 +691,6 @@ ta: confirm email address: "மின்னஞ்சல் முகவரியை உறுதி செய்யவும்:" confirm password: "கடவுச்சொல்லை உறுதிசெய்:" email address: "மின்னஞ்சல் முகவரி:" - heading: பயனர் கணக்கு ஒன்றை உருவாக்கு password: "கடவுச்சொல்:" title: கணக்கை உருவாக்கு no_such_user: @@ -824,6 +698,7 @@ ta: title: அப்படியொரு பயனர் இல்லை. popup: friend: நண்பர் + your location: உங்களது இருப்பிடம் reset_password: confirm password: "கடவுச்சொல்லை உறுதிசெய்:" flash changed: உங்கள் கடவுச்சொல் மாற்றப்பட்டது. @@ -846,6 +721,7 @@ ta: add as friend: நண்பராக சேர் ago: (%{time_in_words_ago} முன்பு) block_history: பெறப்பட்ட தடுப்புகளை காண் + comments: கருத்துரைகள் confirm: உறுதிசெய் confirm_user: இந்த பயனரை உறுதிசெய் create_block: இப் பயனரைத் தடைசெய் diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 057aee9ccee..c28fa496340 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -2,6 +2,9 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: AnakngAraw +# Author: Ianlopez1115 +# Author: Jewel457 +# Author: 아라 tl: activerecord: attributes: @@ -81,89 +84,15 @@ tl: need_to_see_terms: Pansamantalang inantala ang pagpunta mo sa API. Mangyaring lumagda sa ugnayang-mukha ng web upang tingnan ang mga Tuntunin ng Tagapag-ambag. Hindi mo kailangan sumang-ayon, subalit dapat mong tingnan ang mga ito. browse: changeset: - changeset: "Pangkat ng pagbabago: %{id}" changesetxml: XML ng pangkat ng pagbabago - download: Ikargang paibaba ang %{changeset_xml_link} o %{osmchange_xml_link} feed: title: "%{id} ng pangkat ng pagbabago" title_comment: "%{id} ng angkat ng pagbabago - %{comment}" osmchangexml: XML ng osmChange title: Pangkat ng pagbabago - changeset_details: - belongs_to: "Pag-aari ni:" - bounding_box: "Bumabalot na kahon:" - box: kahon - closed_at: "Isinara sa:" - created_at: "Nilikha sa:" - has_nodes: - other: "isa=May sumusunod na %{count} ng buko:" - has_relations: - other: "isa=Mayroong sumusunod na %{count} ng kaugnayan:" - has_ways: - other: "isa=May sumusunod na %{count} ng daan:" - no_bounding_box: Walang naitabing gumagapos na kahon para sa pangkat pamalit na ito. - show_area_box: Ipakita ang Kahon ng Pook - common_details: - changeset_comment: "Puna:" - deleted_at: "Binura doon sa:" - deleted_by: "Binura ni:" - edited_at: "Binago sa:" - edited_by: "Binago ni:" - in_changeset: "Sa loob ng pangkat ng pagbabago:" - version: "Bersyon:" containing_relation: entry: Kaugnayan %{relation_name} entry_role: Kaugnayan %{relation_name} (bilang %{relation_role}) - map: - deleted: Binura - edit: - area: Baguhin ang pook - node: Baguhin ang buko - relation: Baguhin ang kaugnayan - way: Baguhin ang daan - larger: - area: Tingnan ang pook sa mas malaking mapa - node: Tingnan ang buko sa mas malaking mapa - relation: Tingnan ang kaugnayan sa mas malaking mapa - way: Tingnan ang daan sa mas malaking mapa - loading: Ikinakarga... - navigation: - all: - next_changeset_tooltip: Susunod na pangkat ng pagbabago - next_node_tooltip: Susunod na buko - next_relation_tooltip: Susunod na kaugnayan - next_way_tooltip: Susunod na daan - prev_changeset_tooltip: Nakaraang pangkat ng pagbabago - prev_node_tooltip: Nakaraang buko - prev_relation_tooltip: Nakaraang kaugnayan - prev_way_tooltip: Dating daan - paging: - all: - next: "%{id} »" - prev: « %{id} - user: - next: "%{id} »" - prev: « %{id} - user: - name_changeset_tooltip: Tingnan ang mga pamamatnugot ni %{user} - next_changeset_tooltip: Susunod na pamamatnugot ni %{user} - prev_changeset_tooltip: Nakaraang pagbabagong ginawa ni %{user} - node: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Ikargang paibaba ang XML - edit: baguhin - node: Buko - node_title: "Buko : %{node_name}" - view_history: tingnan ang kasaysayan - node_details: - coordinates: "Mga tugmaang-pampook:" - part_of: "Bahagi ng:" - node_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Ikargang paibaba ang XML - node_history: Kasaysayan ng Buko - node_history_title: "Kasaysayan ng Buko: %{node_name}" - view_details: tingnan ang mga detalye not_found: sorry: Paumanhin, ang %{type} na may ID na %{id}, ay hindi matagpuan. type: @@ -171,9 +100,6 @@ tl: node: buko relation: kaugnayan way: daan - paging_nav: - of: ang - showing_page: Ipinapakita ang pahina redacted: message_html: Ang bersiyong %{version} ng %{type} ito ay hindi maipapakita dahil sumailalim na ito sa redaksiyon. Pakitingnan ang %{redaction_link} para sa mga detalye. redaction: Redaksiyon %{id} @@ -181,21 +107,6 @@ tl: node: buko relation: kaugnayan way: daan - relation: - download: "%{download_xml_link} o %{view_history_link}" - download_xml: Ikargang paibaba ang XML - relation: Kaugnayan - relation_title: "Kaugnayan: %{relation_name}" - view_history: tingnan ang kasaysayan - relation_details: - members: "Mga kasapi:" - part_of: "Bahagi ng:" - relation_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Ikargang paibaba ang XML - relation_history: Kasaysayan ng Kaugnayan - relation_history_title: "Kasaysayan ng Kaugnayan: %{relation_name}" - view_details: tingnan ang mga detalye relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} bilang %{role}" @@ -203,43 +114,9 @@ tl: node: Buko relation: Kaugnayan way: Daan - start: - manually_select: Kinakamay na pumili ng ibang lugar - view_data: Tingnan ang dato para sa pangkasalukuyang tanawin ng mapa start_rjs: - data_frame_title: Dato - data_layer_name: Tumingin-tingin sa Dato ng Mapa - details: Mga detalye - drag_a_box: Kumaladkad ng isang kahon sa mapa upang pumili ng isang lugar - edited_by_user_at_timestamp: Binago ni [[user]] sa ganap na [[timestamp]] - hide_areas: Itago ang mga lugar - history_for_feature: Kasaysayan para sa [[feature]] load_data: Ikarga ang Dato - loaded_an_area_with_num_features: "Nagkarga ka ng isang pook na naglalaman ng mga tamok na [[num_features]]. Sa pangkalahatan, ilang mga pantingin-tingin ang hindi maaaring makaangkop ng mabuti sa pagpapakita ng ganitong dami ng dato. Sa pangkalahatan, gumagana ng pinakamahusay ang mga pantingin-tingin kapag nagpapakita ng mas kakaunti kaysa 100 mga tampok: ang paggawa ng ibang mga bagay ay maaaring makagawa sa iyong pantingin-tingin upang bumagal/hindi tumutugon. Kung nakatitiyak kang nais mong ipakita ang ganitong dato, magagawa mo ito sa pamamagitan ng pagpindot sa pindutang nasa ibaba." loading: Ikinakarga... - manually_select: Kinakamay na pumili ng iba pang lugar - object_list: - api: Kuhaning muli ang pook na ito mula sa API - back: Ipakita ang tala ng bagay - details: Mga detalye - heading: Tala ng bagay - history: - type: - node: Buko [[id]] - way: Daan [[id]] - selected: - type: - node: Buko [[id]] - way: Daan [[id]] - type: - node: Buko - way: Daan - private_user: pribadong tagagamit - show_areas: Ipakita ang mga lugar - show_history: Ipakita ang Kasaysayan - unable_to_load_size: "Hindi naikarga: Napakalaki ng sumasakop na sukat ng kahon na [[bbox_size]] (dapat na mas maliit kaysa %{max_bbox_size})" - wait: Hintay... - zoom_or_select: Lumapit o pumili ng isang lugar sa mapa na tatanawin tag_details: tags: "Mga tatak:" wiki_link: @@ -253,33 +130,10 @@ tl: node: buko relation: kaugnayan way: daan - way: - download: "%{download_xml_link}, %{view_history_link} o %{edit_link}" - download_xml: Ikargang paibaba ang XML - edit: baguhin - view_history: tingnan ang kasaysayan - way: Daan - way_title: "Daan: %{way_name}" - way_details: - also_part_of: - other: isa=bahagi rin ng daan %{related_ways}, bahagi rin ng mga daan %{related_ways} - nodes: "Mga buko:" - part_of: "Bahagi ng:" - way_history: - download: "%{download_xml_link} o %{view_details_link}" - download_xml: Ikargang paibaba ang XML - view_details: tingnan ang mga detalye - way_history: Kasaysayan ng Daan - way_history_title: "Kasaysayan ng Daan: %{way_name}" changeset: changeset: anonymous: Hindi nagpapakilala (anonimo) - big_area: (malaki) - id: "#%{id}" - no_comment: (wala) no_edits: (walang mga pamamatnugot) - show_area_box: ipakita ang kahon ng pook - still_editing: (namamatnugot pa rin) view_changeset_details: Tingnan ang mga detalye ng pangkat ng pagbabago changeset_paging_nav: next: Kasunod » @@ -292,24 +146,10 @@ tl: saved_at: Sinagip sa user: Tagagamit list: - description: Kamakailang pagbabago - description_bbox: Mga pangkat ng pagbabago sa loob ng %{bbox} - description_friend: Mga pangkat ng pagbabago ng mga kaibigan mo - description_nearby: Mga pangkat ng pagbabago ng kalapit na mga tagagamit - description_user: Mga pangkat ng pagbabago ayon sa %{user} - description_user_bbox: Mga pangkat ng pagbabago ayon sa %{user} sa loob ng %{bbox} - heading: Mga pangkat ng pagbabago - heading_bbox: Mga pangkat ng pagbabago - heading_friend: Mga pangkat ng pagbabago - heading_nearby: Mga pangkat ng pagbabago - heading_user: Mga pangkat ng pagbabago - heading_user_bbox: Mga pangkat ng pagbabago title: Mga pangkat ng pagbabago - title_bbox: Mga pangkat ng pagbabago sa loob ng %{bbox} title_friend: Mga pangkat ng pagbabago ng mga kaibigan mo title_nearby: Mga pangkat ng pagbabago ng kalapit na mga tagagamit title_user: Mga pangkat ng pagbabago ayon sa %{user} - title_user_bbox: Mga pangkat ng pagbabago ayon sa %{user} sa loob ng %{bbox} timeout: sorry: Paumanhin, ang talaan ng mga pangkat ng pagbabagong hiniling mo ay naging napakatagal bago nakuhang muli. diary_entry: @@ -402,7 +242,7 @@ tl: area_to_export: Pook na Iluluwas embeddable_html: Maibabaong HTML export_button: Iluwas - export_details: Ang dato ng OpenStreetMap ay may lisensiyang nasa ilalim ng lisensiyang Creative Commons Attribution-ShareAlike 2.0. + export_details: Ang dato ng OpenStreetMap ay may lisensiyang nasa ilalim ng lisensiyang Open Data Commons Open Database License (ODbL). format: Anyo format_to_export: Anyong Iluluwas image_size: Sukat ng Larawan @@ -419,28 +259,20 @@ tl: scale: Sukat too_large: body: Masyadong malaki ang lugar na ito upang mailuwas bilang Dato ng XML ng OpenStreetMap. Mangyaring lumapit o pumili ng isang mas maliit na pook. - heading: Napakalaki ng Lugar zoom: Lapitan - start_rjs: - add_marker: Magdagdag ng isang pananda sa mapa - change_marker: Baguhin ang puwesto ng pangmarka - click_add_marker: Pumindot sa mapa upang magdagdag ng isang pangmarka - drag_a_box: Kumaladkad ng isang kahon sa mapa upang pumili ng isang lugar - export: Iluwas - manually_select: Kinakamay na pumili ng ibang lugar - view_larger_map: Tingnan ang Mas Malaking Mapa + fixthemap: + how_to_help: + title: Papaano tumulong + title: Mag-ulat ng problema/ Ayusin ang mapa geocoder: description: title: geonames: Kinalalagyan mula sa GeoNames - osm_namefinder: "%{types} mula sa Tagapaghanap ng Pangalan ng OpenStreetMap" osm_nominatim: Kinalalagyan mula sa Nominatim ng OpenStreetMap types: cities: Mga lungsod places: Mga lugar towns: Mga bayan - description_osm_namefinder: - prefix: "%{distance} %{direction} ng %{type}" direction: east: silangan north: hilaga @@ -451,7 +283,9 @@ tl: south_west: timog-kanluran west: kanluran distance: - other: sero=mas mababa kaysa 1km + one: humigit-kumulang sa 1km + other: humigit-kumulang sa %{count}km + zero: mas mababa kaysa 1km results: more_results: Marami pang mga kinalabasan no_results: Walang natagpuang mga kinalabasan @@ -460,14 +294,9 @@ tl: ca_postcode: Mga kinalabasan mula sa Geocoder.CA geonames: Mga kinalabasan mula sa GeoNames latlon: Mga kinalabasan mula sa Panloob - osm_namefinder: Mga kinalabasan mula sa Tagahanap ng Pangalan ng OpenStreetMap osm_nominatim: Mga kinalabasan mula sa Nominatim ng OpenStreetMap uk_postcode: Mga kinalabasan mula sa NPEMap / FreeThe Postcode us_postcode: Mga kinalabasan mula sa Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} ng %{parentname})" - suffix_place: ", %{distance} %{direction} ng %{placename}" - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix: aeroway: @@ -932,7 +761,7 @@ tl: weir: Pilapil prefix_format: "%{name}" html: - dir: mula kaliwa pakanan + dir: ltr javascripts: map: base: @@ -940,58 +769,31 @@ tl: mapquest: Bukas ang MapQuest standard: Pamantayan transport_map: Mapa ng Biyahe - overlays: - maplint: Maplint site: edit_disabled_tooltip: Lumapit upang baguhin ang mapa edit_tooltip: Baguhin ang mapa - edit_zoom_alert: Dapat kang lumapit upang baguhin ang mapa - history_disabled_tooltip: Lumapit upang matingnan ang mga pagbabago para sa lugar na ito - history_tooltip: Tingnan ang mga pagbabago para sa lugar na ito - history_zoom_alert: Dapat kang lumapit upang matingnan ang mga pagbabago para sa lugar na ito layouts: community: Pamayanan community_blogs: Mga Blog ng Pamayanan community_blogs_title: Mga blog mula sa mga kasapi ng pamayanan ng OpenStreetMap copyright: Karapatang-ari at Lisensiya - documentation: Dokumentasyon - documentation_title: Dokumentasyon para sa proyekto donate: Tangkilikin ang OpenStreetMap sa pamamagitan ng %{link} sa Pondo ng Pagpapataas ng Uri ng Hardwer. - donate_link_text: nag-aabuloy edit: Baguhin edit_with: Mamatnugot sa pamamagitan ng %{editor} export: Iluwas - export_tooltip: Iluwas ang dato ng mapa foundation: Pundasyon foundation_title: Ang Pundasyon ng OpenStreetMap gps_traces: Mga Bakas ng GPS gps_traces_tooltip: Pamahalaan ang mga Bakas ng GPS help: Tulong - help_centre: Lunduyan ng Tulong - help_title: Lugar ng tulong para sa proyekto - help_url: http://help.openstreetmap.org/ history: Kasaysayan home: tahanan - home_tooltip: Pumunta sa kinalalagyan ng tahanan - inbox: kahong-tanggapan (%{count}) - inbox_tooltip: - other: sero=Ang kahong-tanggapan mo ay walang mga mensaheng hindi pa nababasa - intro_1: Ang OpenStreetMap ay isang malayang mababagong mapa ng buong mundo. Ginawa ito ng mga taong katulad mo. intro_2_create_account: Lumikha ng isang akawnt ng tagagamit - intro_2_download: ikargang paibaba - intro_2_html: Malayang %{download} at %{use} ang dato sa ilalim ng %{license}. %{create_account} upang mapainam ang mapa. - intro_2_license: lisensiyang bukas - intro_2_use: gamitin - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap - license: - alt: CC BY-SA 2.0 - title: Nilisensiyahan ang dato ng OpenStreetMap sa ilalim ng Pangkalahatang Lisensiya ng Malikhaing mga Pangkaraniwan ng Pagbanggit at Pagbabahaging Magkatulad 2.0 log_in: lumagda log_in_tooltip: Lumagdang papasok sa umiiral na akawnt logo: alt_text: Logo ng OpenStreetMap logout: umalis mula sa pagkakalagda - logout_tooltip: Umalis sa pagkakalagda make_a_donation: text: Magkaloob ng isang Abuloy title: Tangkilikin ang OpenStreetMap sa pamamagitan ng isang abuloy na pananalapi @@ -1008,26 +810,39 @@ tl: title: OpenStreetMap sign_up: magpatala sign_up_tooltip: Lumikha ng isang akawnt para sa pamamatnugot - sotm2011: Pumunta sa Pulong ng OpenStreetMap ng 2011, Ang Katayuan ng Mapa, ika-9 hanggang ika-11 ng Setyembre sa Denver! tag_line: Ang Malayang Mapa sa Daigdig ng Wiki user_diaries: Mga Talaarawan ng mga Tagagamit user_diaries_tooltip: Tingnan ang mga talaarawan ng tagagamit - view: Tingnan - view_tooltip: Tingnan ang mapa - welcome_user: Maligayang pagdating, %{user_link} - welcome_user_link_tooltip: Ang iyong pahina ng tagagamit - wiki: Wiki - wiki_title: Lugar ng wiki para sa proyekto - wiki_url: http://wiki.openstreetmap.org/ license_page: foreign: english_link: ang orihinal na nasa Ingles text: Kung sakaling maganap ang isang salungatan sa pagitan ng isinalinwikang pahinang ito at ng %{english_original_link}, mangingibabaw ang pahinang nasa Ingles title: Tungkol sa salinwikang ito - legal_babble: "

    Karapatang-ari at Lisensiya

    \n

    \nAng OpenStreetMap ay bukas na dato, na nilisensiyahan sa ilalim ng lisensiyangMalikhaing Pangkaraniwang Pagtukoy na Magkatulad 2.0 (CC BY-SA).\n

    \n

    \nMalaya mong makokopya, maipapamahagi, maipadadala and iangkop ang aming mga mapa at dato, hangga’t binabanggit mo ang OpenStreetMap at mga tagapag-ambag nito. Kapag binago o pinainam mo ang aming mga mapa o dato, maaari mong ipamahagi ang mga resulta sa ilalim lamang ng katulad na lisensiya. Ang buong kodigong makabatas ay nagpapaliwanag ng iyong mga karapatan at mga pananagutan.\n

    \n

    Paano babanggitin ang OpenStreetMap

    \n

    \nKapag ginagamit mo ang mga larawan ng mapa ng OpenStreetMap, hinihiling naming na ang pagbanggit mo ay mapagbabasahan ng kahit na “© Mga tagapag-ambag sa OpenStreetMap, CC BY-SA”. Kapag ginagamit mo lamang ang dato ng mapa, hinihiling namin ang “Dato ng mapa © Mga tagapag-ambag ng OpenStreetMap, CC BY-SA”.\n

    \n

    \nKung saan maaari, ang OpenStreetMap ay dapat na ikawing sa http://www.openstreetmap.org/\nat CC BY-SA sa http://creativecommons.org/licenses/by-sa/2.0/. Kung gumagamit ka ng isang midyum kung saan hindi maaari ang mga kawing (katulad halimbawa ng isang nilimbag a akda), iminumungkahi namin na papuntahin ang mga mambabasa mo sa www.openstreetmap.org (marahil sa pamamagitan ng pagpapalawig ng ‘OpenStreetMap’ papunta sa buong tirahang ito) at sa www.creativecommons.org.\n

    \n\n

    Pag-alam ng iba pa

    \n

    Magbasa ng iba pa na ginagamit an gaming dato na nasa Mga madalas na tanong na makabatas.\n

    \n

    \nAng mga tagapag-ambag sa OSM ay pinaaalalahanang huwag na huwag magdaragdag ng anumang mga dato mula sa anumang mga mapagkukunang may karapatang-ari (katulad ng Google Maps o nakalimbag na mga mapa) na walang hayagang pahintulot mula sa mga tagapaghawak ng karapatan sa kopya.\n

    \n

    \nBagaman ang OpenStreetMap ay isang bukas na dato, hindi kami makapagbibigay ng isang hindi binabayarang API ng mapa para sa mga tagapagpaunlad ng pangatlong partido. Tingnan ang aming Patakaran sa Paggamit ng API,Patakaran sa Paggamit ng Tisa and Patakaran sa Paggamit ng Nominatim.\n

    \n

    Mga tagapag-ambag namin

    \n

    \nAng aming lisensiyang CC BY-SA ay nangangailangan sa iyo na “magbigay ng pagbanggit sa Orihinal na May-akda na makatwiran para sa midya o paraang ginagamit Mo”.Ang indibidwal na mga tagapagmapa ng OSM ay hindi humihiling ng isang pagbanggit sa ibabaw at sa itaas niyan sa “Mga tagapag-ambag ng OpenStreetMap”, subalit kung saan ang dato para sa isang ahensiya ng pagmamapang pambansa o ibang pangunahing kuhanan ay naisama na sa OpenStreetMap,maaaring makatwirang banggitin sila na tuwiran sa pamamagitan ng tuwirang muling pagsipi ng kanilang pagbabanggit o sa pamamagitan ng pagkakawing nito sa pahinang ito.

    \n\n
      \n
    • Australya: Naglalaman ng dato sa sub-urbanong lugar na nakapaligid sa lungsod na nakabatay sa Tanggapang Pang-estadistika ng Australya
    • \n
    • Austria: Naglalaman ng dato \n Stadt Wien (sa ilalim ng\n CC BY),\n Land Vorarlberg at\n Land Tirol (sa ilalim ng CC-BY AT na may mga susog).
    • \n
    • Canada: Naglalaman ng mga dato mula sa GeoBase®, GeoGratis (© Kagawaran ng Likas na Yaman ng Canada), CanVec (© Kagawaran ng Likas na Yaman ng Canada), at StatCan (Kahatiang Pangheograpiya,\nEstadistika ng Canada).
    • \n
    • Pransiya: Naglalaman ng dato na nagmula sa \n Direction Générale des Impôts.
    • \n
    • Bagong Selanda: Naglalaman ng mga datong kinuha mula sa Kabatirang Panglupain ng Bagong Selanda. Nakareserba ang Karapatang-ari ng Korona.
    • \n
    • Polonya: Naglalaman ng dato mula sa Mga mapa ng UMP-pcPL. Karapatang-ari ng mga tagapag-ambag sa UMP-pcPL.\n
    • Nagkakaisang Kaharian: Naglalaman ng dato ng May Ordinansiyang Pagtatanong© Karapatang-ari ng korona at karapatan sa kalipun ng dato 2010.\n More about OSM's use of UMP data
    • \n
    • Timog Aprika: Naglalaman ng dato mula sa\n Punong Pangasiwaan:\n Pambansang Kabatirang Pangheograpiya at Kalaparan (National Geo-Spatial Information), may pinaglalaanan ang karapatang-ari ng Estado.
    • \n
    \n\n

    \nAng pagsasama ng dato sa OpenStreetMap ay hindi nagpapahiwatig na ang nagbigay ng orihinal na dato ay tumatangkilik sa OpenStreetMap, nagbiibigay ng anumang garantiya, o tumatanggap ng anumang pananagutan.\n

    " + legal_babble: + contributors_at_html: "Austria: Naglalaman ng dato magmula sa \nStadt Wien (na nasa ilalim ng \nCC BY),\nLand Vorarlberg at ng\nLand Tirol (na nasa ilalim ng CC-BY AT na mayroong mga susog)." + contributors_ca_html: "Canada: Naglalaman ng dato mula sa\nGeoBase®, GeoGratis (© Kagawaran ng Likas na Yaman ng \nCanada), CanVec (© Kagawaran ng Likas na Yaman ng Canada), at StatCan \n(Dibisyon ng Heograpiya, Estadistika ng Canada)." + contributors_footer_1_html: "Para sa karagdagang mga detalye ng mga ito, at iba pang pinanggalingan na ginamit \nupang mapainam ang OpenStreetMap, paki tingnan ang Pahina ng \ntagapag-ambag na nasa ibabaw ng Wiki ng OpenStreetMap." + contributors_footer_2_html: "Ang pagsasama ng dato sa loob ng OpenStreetMap ay hindi nagpapahiwatig na ang orihinal \nna tagapagbigay ng dato ay tumatangkilik sa OpenStreetMap, nagbibigay ng anumang garantiya, o \ntumatanggap ng anumang pananagutan." + contributors_fr_html: "Pransiya: Naglalaman ng dato na nanggaling magmula sa \nDirection Générale des Impôts." + contributors_gb_html: "Nagkakasiang mga Kaharian: Naglalaman ng Ordinansiya \nsa dato ng Pagsisiyasat © Karapatan sa Paglalathala ng Korona at karapatan \nsa kalipunan ng dato 2010." + contributors_intro_html: "Nangangailangan ang aming lisensiyang CC BY-SA na ikaw ay “magbigay ng pagbanggit sa Orihinal\nna May-akda na makatwiran sa midyum o kaparaanan na ginagamit Mo”. Ang indibidwal na mga \ntagapagmapa ng OSM ay hindi humihiling ng isang pagbanggit sa ibabaw at sa itaas niyan sa “mga \ntagapag-ambag ng OpenStreetMap”, subalit kung saan ang dato magmula sa isang pambansang\nahensiya ng pagmamapa o ibang pangunahing pinagmulan ay naisama sa loob ng OpenStreetMap,\nmaaaring maging makatwiran na banggitin sila sa pamamagitan ng tuwirang paglikha muli ng kanilang\npagkakabanggit o sa pamamagitan ng pagkakawing dito sa ibabaw ng pahinang ito." + contributors_nl_html: "Nederlandiya: Naglalaman ng © dato ng AND, 2007\n(www.and.com)" + contributors_nz_html: "Bagong Selanda: naglalaman ng dato na nanggaling magmula sa\nKabatirang Panlupain ng Bagong Selanda. Nakareserba ang Karapatan sa Paglalatahala\nna Pangkorona." + contributors_title_html: Mga tagapag-ambag namin + contributors_za_html: "Timog Aprika: Naglalaman ng datong nanggaling magmula sa \nPunong Pangasiwaan: \nPambansang Kabatiran na Pangheograpiya at Pangkalawakan, nakareserba ang \nkarapatan ng paglalathala ng Estado." + credit_1_html: "Kinakailangan namin na gamitin ang kredito na “© mga tagapag-ambag ng \nOpenStreetMap”." + credit_2_html: "Kung saan maaari, dapat na ikawing nang labis (lagyan ng hyperlink) ang OpenStreetMap\nna papunta sa http://www.openstreetmap.org/\nat CC BY-SA sa http://creativecommons.org/licenses/by-sa/2.0/. Kung\ngumagamit ka ng isang midyum o kasangkapan kung saan hindi maaari ang mga kawing (iyong isang\nakdang nakalimbag), iminumungkahi namin na ituro ang mga mambabasa mo sa \nwww.openstreetmap.org (marahil sa pamamagitan ng pagpapalawak ng ‘OpenStreetMap’\nupang maging tumuturo sa buong tirahan na ito) at sa www.creativecommons.org." + credit_title_html: Paano babanggitin ang OpenStreetMap + intro_1_html: "OpenStreetMap is open data, licensed under the Open Data\nCommons Open Database License (ODbL)." + intro_2_html: "Malaya mong makokopya, maipapamahagi, maipahahatid at mahahalaw ang aming mga dato,\nbasta't babanggitin mo ang OpenStreetMap at ang mga tagapag-ambag\nnito. Kapag binago mo o nagbuo sa pamamagitan ng aming mga dato, maaari\nmong ipamahagi ang resulta sa ilalim lamang ng katulad na lisensiya. Ipinapaliwanag \nng buong kodigong pambatas \nang mga karapatan at mga pananagutan mo." + intro_3_html: "Ang kartograpya sa aming mga tile na mapa at ang aming dokumentasyon ay lisensyado sa ilalim ng lisensiyang Creative\nCommons Attribution-ShareAlike 2.0 (CC BY-SA)." + more_1_html: "Magbasa ng mas marami pa hinggil sa paggamit ng dato namin doon sa Mga Palaging Itinatanong \nna Makabatas." + more_2_html: "Ipinapaalala sa mga tagapag-ambag ng OpenStreetMap (OSM) na huwag kailanman magdaragdag ng dato magmula sa anumang\nmga pinagmulan na mayroong karapatan sa paglalathala (halimbawa na ang Google Maps o nakalimbag na mga mapa) na wala\nang malinaw na kapahintulutan magmula sa mga tagapaghawak ng karapatan sa paglalathala." + more_title_html: Ang pagtuklas ng mas marami pang iba + title_html: Karapatan sa Paglalathala at Lisensiya native: mapping_link: simulan ang pagmamapa - native_link: Bersyon ng PANGALAN_NG_WIKANG_ITO_DITO + native_link: Bersyon ng Tagalog text: Tinitingnan mo ang bersyon sa Ingles ng pahina ng karapatan sa kopya. Makababalik ka sa %{native_link} ng pahinang ito o makahihinto ka sa pagbasa ng tungkol sa karapatang-ari at %{mapping_link}. title: Tungkol sa pahinang ito message: @@ -1084,12 +899,8 @@ tl: title: Kahong-labasan to: Para kay read: - back_to_inbox: Bumalik sa kahong-tanggapan - back_to_outbox: Bumalik sa kahong-labasan date: Petsa from: Mula sa - reading_your_messages: Binabasa ang mga mensahe mo - reading_your_sent_messages: Binabasa ang ipinadala mong mga mensahe reply_button: Tumugon subject: Paksa title: Basahin ang mensahe @@ -1115,8 +926,6 @@ tl: email_confirm_plain: click_the_link: Kung ikaw ito, mangyaring pindutin ang kawing na nasa ibaba upang tiyakin ang pagbabago. greeting: Kumusta, - hopefully_you_1: May isang tao (ikaw sana) ang may nais na baguhin ang kanilang tirahan ng e-liham na nandoon sa - hopefully_you_2: "%{server_url} papunta sa %{new_address}." friend_notification: befriend_them: Maaari mong rin silang idagdag bilang isang kaibigan doon sa %{befriendurl}. had_added_you: Idinagdag ka ni %{user} bilang isang kaibigan doon sa OpenStreetMap. @@ -1146,47 +955,12 @@ tl: lost_password_plain: click_the_link: Kung ikaw ito, mangyaring pindutin ang kawing na nasa ibaba upang itakdang muli ang hudyat mo. greeting: Kumusta, - hopefully_you_1: May isang tao (marahil ay ikaw) ang humiling na itakdang muli ang hudyat dito sa - hopefully_you_2: akawnt ng openstreetmap.org ng mga tirahan ng e-liham. message_notification: - footer1: Maaari mo ring basahin ang mensahe roon sa %{readurl} - footer2: at maaari kang tumugon doon sa %{replyurl} header: "Nagpadala sa iyo si %{from_user} ng isang mensahe sa pamamagitan ng OpenStreetMap na may paksang %{subject}:" hi: Kumusta %{to_user}, subject_header: "[OpenStreetMap] %{subject}" signup_confirm: subject: "[OpenStreetMap] Tiyakin ang iyong tirahan ng e-liham" - signup_confirm_html: - ask_questions: Maaari kang magtanong ng anumang mga katanungang mayroon ka hinggil sa OpenStreetMap doon sa aming pook ng katanungan at kasagutan. - click_the_link: Kung ikaw ito, maligayang pagdating! Mangyaring pindutin ang kawing na nasa ibaba upang tiyakin ang akawnt na iyan at magbasa pa para sa mas marami pang kabatiran hinggil sa OpenStreetMap - current_user: Isang talaan ng pangkasalukuyang mga tagagamit sa loob ng mga kategorya, na nakabatay kung saan sa mundo sila naroroon, ang makukuha mula sa Kategorya:Mga_tagagamit_ayon_sa_rehiyong_pangheograpiya. - get_reading: Kumuha ng mababasa tungkol sa OpenStreetMap doon sa wiki, humabol sa pinakahuling mga balita sa pamamagitan ng blog ng OpenStreetMap o Twitter, o tumingin-tingin sa kahabaan ng blog ng OpenGeoData ng tagapagtatag ng OpenStreetMap na si Steve Coast para sa nakatapayang kasaysayan ng proyekto, na mayroon ding mga podkast na mapakikinggan! - greeting: Kumusta ka diyan! - hopefully_you: May isang tao (ikaw sana) ang may nais na lumikha ng isang akawnt doon sa - introductory_video: Maaari kang manood ng isang %{introductory_video_link}. - more_videos: Mayroong mga %{more_videos_link}. - more_videos_here: marami pang mga bidyo rito - user_wiki_page: Iminumungkahing lumikha ka ng isang pahina ng wiki ng tagagamit, na nagsasama ng mga tatak ng kategorya na nagsasabi kung nasaan ka, katulad ng [[Kategorya:Mga_tagagamit_na_nasa_Londres]]. - video_to_openstreetmap: bidyo ng pagpapakilala sa OpenStreetMap - wiki_signup: Maaari mo ring naisin na magpatala sa wiki ng OpenStreetMap. - signup_confirm_plain: - ask_questions: "Maaari kang magtanong ng anumang mga katanungang mayroon ka hinggil sa OpenStreetMap doon sa aming lugar ng katanungan at kasagutan:" - blog_and_twitter: "Humabol sa pinakahuling mga balita sa pamamagitan ng blog ng OpenStreetMap o Twitter:" - click_the_link_1: Kung ikaw ito, maligayang pagdating! Mangyaring pindutin ang kawing na nasa ibaba upang tiyakin ang iyong - click_the_link_2: akawnt at magbasa pa para sa mas marami pang kabatiran tungkol sa OpenStreetMap. - current_user_1: Isang talaan ng pangkasalukuyang mga tagagamit na nasa mga kategorya, na nakabatay sa kung saan sa mundo - current_user_2: "sila naroroon, ay makukuha magmula sa:" - greeting: Kumusta ka diyan! - hopefully_you: May isang tao (ikaw sana) ang may nais na lumikha ng isang akawnt doon sa - introductory_video: "Maaari kang makapanood ng isang bidyo ng pagpapakilala sa OpenStreetMap dito:" - more_videos: "May marami pang mga bidyo rito:" - opengeodata: "Ang OpenGeoData.org ay ang blog ng tagapagtatag ng OpenStreetMap na si Steve Coast, at mayroon din itong mga podkast:" - the_wiki: "Kumuha ng mababasa tungkol sa OpenStreetMap doon sa wiki:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide - user_wiki_1: Iminumungkahing lumikha ka ng isang pahina ng wiki ng tagagamit, na may kasamang - user_wiki_2: mga tatak ng kategorya na nagtatala kung nasaan ka, katulad ng [[Kategorya:Mga tagagamit_sa_Londres]]. - wiki_signup: "Marahil ay nais mo ring magpatala sa wiki ng OpenStreetMap doon sa:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page oauth: oauthorize: allow_read_gpx: basahin ang iyong pribadong mga bakas ng GPS. @@ -1304,16 +1078,10 @@ tl: index: js_1: Maaaring gumagamit ka ng isang pantingin-tingin na hindi tumatangkilik ng JavaScript, o hindi mo pinagagana ang JavaScript. js_2: Ang OpenStreetMap ay gumagamit ng JavaScript para sa madulas nitong mapa. - license: - license_name: Malikhaing Pangkaraniwang Pagtukoy na Pamamahaging Magkatulad 2.0 - notice: Nilisensiyahan sa ilalim ng lisensiyang %{license_name} ng %{project_name} at ng mga tagapag-ambag nito. - project_name: Proyekto ng OpenStreetMap permalink: Permalink remote_failed: Nabigo ang pamamatnugot - tiyaking naikarga ang JOSM or Merkaartor at kung gumagana ang pagpipilian ng malayong pantaban shortlink: Maikling kawing key: - map_key: Susi ng Mapa - map_key_tooltip: Susi para sa mapa table: entry: admin: Hangganang pampangangasiwa @@ -1399,7 +1167,6 @@ tl: preview: Paunang tanaw search: search: Maghanap - search_help: "mga halimbawa: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', o 'mga padalahan ng liham na malapit sa Lünen' marami pang mga halimbawa..." submit_text: Gawin where_am_i: Nasaan ba ako? where_am_i_title: Ilarawan ang pangkasalukuyang kinalalagyan na ginagamit ang makinang panghanap @@ -1434,6 +1201,7 @@ tl: visibility_help: ano ba ang kahulugan nito? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces list: + empty_html: Wala pang narito. Magkarang paitaas ng isang bagong bakas o umalam ng mas marami pa hinggil sa pagbabakas ng GPS doon sa pahina ng wiki. public_traces: Mga pagbabakas ng pangmadlang GPS public_traces_from: Pangmadlang pagbakas ng GPS mula kay %{user} tagged_with: tinatakan ng %{tags} @@ -1480,8 +1248,8 @@ tl: trace_optionals: tags: Mga tatak trace_paging_nav: - next: Susunod » - previous: « Nakaraan + newer: Mas Bagong mga Bakas + older: Mas Lumang mga Bakas showing_page: Ipinapakita ang pahinang %{page} view: delete_track: Burahin ang bakas na ito @@ -1557,12 +1325,9 @@ tl: update home location on click: Isapanahon ang kinalalagyan ng tahanan kapag pinindot ko ang ibabaw ng mapa? confirm: already active: Natiyak na ang akawnt na ito. - before you start: Alam namin na nagmamadali ka na marahil upang makapagsimula sa pagmamapa, subalit bago mo gawin iyan maaaring naisin mo munang magpuno ng ilan pang karagdagang kabatiran hinggil sa iyong sarili sa loob ng pormularyong nasa ibaba. button: Tiyakin heading: Tiyakin ang isang akawnt ng tagagamit press confirm button: Pindtuin ang pindutan ng pagtitiyak na nasa ibaba upang buhayin ang akawnt mo. - reconfirm: Kung matagal na magmula noong magpatala ka maaaring kailanganin mong padalhan ang sarili mo ng isang bagong e-liham ng pagtitiyak. - success: Natiyak ang akawnt mo, salamat sa pagpapatala! unknown token: Tila hindi yata umiiral ang kahalip na iyan. confirm_email: button: Tiyakin @@ -1583,7 +1348,8 @@ tl: heading: Mga tagagamit hide: Itago ang Napiling mga Tagagamit showing: - other: isa=Ipinapakita ang pahinang %{page} (%{first_item} ng mga %{items}) + one: Ipinapakita ang pahinang %{page} (%{first_item} ng %{items}) + other: Ipinapakita ang pahinang %{page} (%{first_item}-%{last_item} ng mga %{items}) summary: Nilikha ang %{name} mula sa %{ip_address} noong %{date} summary_no_ip: Nilikha ang %{name} noong %{date} title: Mga tagagamit @@ -1598,8 +1364,6 @@ tl: lost password link: Nawala ang hudyat mo? new to osm: Bago pa lamang sa OpenStreetMap? no account: Wala ka pa bang akawnt? - notice: Umalam ng marami pa tungkol sa parating na pagbabago sa lisensiya ng OpenStreetMap (mga salinwika) (talakayan) - notice_terms: Ang OpenStreetMap ay lilipat sa isang bagong lisensiya pagsapit ng ika-1 ng Abril, 2012. Kasimbukas din ito ng pangkasalukuyan, ngunit ang mga pirasong pambatas ay mas naaakma sa aming kalipunan ng dato ng mapa. Nais naming panatilihin ang mga ambag mo sa OpenStreetMap, subalit magagawa lang namin iyan kapag sasang-ayon ka na ipamahagi namin ang mga ito sa ilalim ng bagong lisensiya. Kung hindi naman, kakailanganin naming tanggalin ang mga ito mula sa kalipunan ng dato.

    Mangyaring lumagdang papasok, pagkaraan ay gumamit ng ilang mga segundo upang suriin at tanggapin ang bagong mga kasunduan. Salamat sa iyo! openid: "%{logo} OpenID:" openid invalid: Paumanhin, tila may pinsala ang OpenID mo openid missing provider: Paumahin, hindi nagawang makipag-ugnayan sa tagapagbigay mo ng OpenID @@ -1644,7 +1408,9 @@ tl: title: Naiwalang hudyat make_friend: already_a_friend: Kaibigan ka na ni %{name}. + button: idagdag bilang kaibigan failed: Paumanhin, nabigong maidagdag si %{name} bilang isang kaibigan. + heading: Idagdag si %{user} bilang isang kaibigan? success: Kaibigan mo na ngayon si %{name}. new: confirm email address: "Patotohanan ang Tirahan ng E-liham:" @@ -1654,9 +1420,6 @@ tl: display name: "Pangalang Ipinapakita:" display name description: Ang iyong pangalan ng tagagamit na ipinapakita sa madla. Maaari mo itong baguhin mamaya sa loob ng mga kanaisan. email address: "Tirahan ng E-liham:" - fill_form: Punan ang pormularyo at padadalhan ka namin ng isang mabilisang e-liham upang buhayin ang akawnt mo. - flash create success message: Salamat sa pagpapatala. Nagpadala kami ng isang paunawa ng pagtitiyak sa %{email} at kapag tiniyak mo nang iyong akawnt sa lalong madaling panahon maaari ka nang magsimula sa pagmamapa.

    Kung gumagamit ka ng isang sistemang panlaban sa basurang liham na nagpapadala ng mga kahilingan ng pagtitiyak, pakitiyak na itala mo sa puting-talaan ang webmaster@openstreetmap.org dahil hindi namin magagawang tumugon sa anumang mga kahilingan ng pagtitiyak. - heading: Lumikha ng Akawnt ng Tagagamit license_agreement: Kapag tiniyak mo ang iyong akawnt kakailanganin mong sumang-ayon sa mga tuntunin ng tagapag-ambag. no_auto_account_create: Sa kasamaang-palad pangkasalukuyang hindi namin magawang kusang lumikha ng akawnt para sa iyo. not displayed publicly: Hindi ipinapakita sa madla (tingnan ang patakaran sa pagsasarilinan) @@ -1678,6 +1441,8 @@ tl: nearby mapper: Malapit na tagapagmapa your location: Kinalalagyan mo remove_friend: + button: Tanggalin bilang kaibigan + heading: Tanggalin si %{user} bilang isang kaibigan? not_a_friend: Si %{name} ay hindi isa sa mga kaibigan mo. success: Si %{name} ay tinanggal mula sa mga kaibigan mo. reset_password: @@ -1716,7 +1481,7 @@ tl: activate_user: pasiglahin ang tagagamit na ito add as friend: idagdag bilang kaibigan ago: (%{time_in_words_ago} na ang nakalipas) - block_history: tingnan ang natanggap na mga paghadlang + block_history: natanggap na mga paghadlang blocks by me: mga paghahadlang ko blocks on me: mga paghadlang sa akin comments: mga puna @@ -1742,7 +1507,7 @@ tl: latest edit: "Pinakahuling pagbabago %{ago}:" m away: "%{count}m ang layo" mapper since: "Tagapagmapa mula pa noong:" - moderator_history: tingnan ang ibinigay na mga paghadlang + moderator_history: ibinigay na mga paghadlang my comments: mga puna ko my diary: talaarawan ko my edits: mga pamamatnugot ko @@ -1827,11 +1592,14 @@ tl: creator_name: Tagapaglikha display_name: Hinadlangang Tagagamit edit: Baguhin + next: Susunod » not_revoked: (hindi binawi) + previous: « Nakaraan reason: Dahilan ng pagharang revoke: Bawiin! revoker_name: Binawi ni show: Ipakita + showing_page: Ipinapakita ang pahinang %{page} status: Kalagayan period: one: 1 oras diff --git a/config/locales/tr.yml b/config/locales/tr.yml index c292225ea93..ccb9f509f16 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -3,13 +3,24 @@ # Export driver: syck-pecl # Author: Alerque # Author: Emperyan +# Author: Erdemaslancan # Author: George Animal # Author: Gizemb +# Author: Incelemeelemani +# Author: Joseph # Author: Katpatuka # Author: SalihB # Author: Szoszv +# Author: Talha Samil Cakir # Author: Tarikozket +# Author: Trncmvsr +# Author: Trockya +# Author: 아라 tr: + about_page: + copyright_html: ©OpenStreetMap
    katkıda bulunanlar + local_knowledge_title: Yerel Bilgi + next: İleri activerecord: attributes: diary_comment: @@ -39,14 +50,14 @@ tr: visible: Görünür user: active: Etkin - description: Tanıtım + description: Tanım display_name: Görünen Ad email: E-posta languages: Diller pass_crypt: Şifre models: acl: Erişim Kontrol Listesi - changeset: Değişiklik Kayıdı + changeset: Değişiklik Kaydı changeset_tag: Değişiklik kayıdının etiketi country: Ülke diary_comment: Günlük Yorumu @@ -55,158 +66,87 @@ tr: language: Dil message: Mesaj node: Nokta - notifier: Bildir + node_tag: Nokta Etiketi + notifier: Bildiren + old_node: Eski Nokta + old_node_tag: Eski Nokta Etiketi + old_relation: Eski Relasyon old_way: Eski Yol old_way_tag: Eski Yol Etiketi relation: İlişki + relation_member: Relasyon Üyesi session: Oturum user: Kullanıcı user_preference: Kullanıcı Tercihleri way: Yol way_node: Yol Noktası browse: + anonymous: anonim changeset: - changeset: "Değişiklik takımı: %{id}" + belongs_to: Yazar changesetxml: Değişiklik takımı XML - download: "%{changeset_xml_link} veya %{osmchange_xml_link} indir" feed: title: Değişiklik takımı %{id} title_comment: Değişiklik takımı %{id} - %{comment} + node: Noktalar (%{count}) + node_paginated: Nokta (%{x}-%{y} - toplam %{count}) osmchangexml: osmChange XML - title: Değişiklik takımı - changeset_details: - belongs_to: "Ait olduğu değişiklik takımı:" - bounding_box: Alan sınırları - box: alan - closed_at: "Kapanış tarihi:" - created_at: "Oluşturma tarihi:" - show_area_box: Alan Kutusu Görüntüle - common_details: - changeset_comment: "Yorum:" - deleted_at: "Silinmesi:" - deleted_by: "Silen:" - edited_at: "Düzenleme tarihi:" - edited_by: "Düzenleyen:" - in_changeset: "Değişiklik takımı içinde:" - version: "Sürüm:" + relation: Relasyonlar (%{count}) + relation_paginated: Relasyon (%{x}-%{y} - toplam %{count}) + title: "Değişiklik takımı: %{id}" + way: Yollar (%{count}) + way_paginated: Yol (%{x}-%{y} - toplam %{count}) + closed: Kapandı + closed_by_html: %{time} önce %{user} tarafından kapandı + closed_html: %{time} önce kapandı containing_relation: entry: İlişki %{relation_name} entry_role: İlişki %{relation_name} (%{relation_role} olarak) - map: - deleted: Silindi - edit: - area: Alanı düzenle - node: Noktayı düzenle - relation: İlişki düzenle - way: Yolu düzenle - larger: - area: Alanı büyük haritada görüntüle - node: Noktayı büyük haritada görüntüle - relation: İlişki büyük haritada görüntüle - way: Yolu büyük haritada görüntüle - loading: Yükleniyor... - navigation: - all: - next_changeset_tooltip: Sonraki değişiklik takımı - next_node_tooltip: Sonraki nokta - next_relation_tooltip: Sonraki ilişki - next_way_tooltip: Sonraki yol - prev_changeset_tooltip: Önceki değişiklik takımı - prev_node_tooltip: Önceki nokta - prev_relation_tooltip: Önceki ilişki - prev_way_tooltip: Önceki yol - user: - name_changeset_tooltip: "%{user} tarafından düzenlemeleri görüntüle" - next_changeset_tooltip: "%{user} tarafından sonraki düzenleme" - prev_changeset_tooltip: "%{user} tarafından önceki düzenleme" + created: Oluşturuldu + created_by_html: %{time} önce %{user} tarafından oluşturuldu + created_html: %{time} önce oluşturuldu + deleted_by_html: %{time} önce %{user} tarafından silindi + download_xml: XML İndir + edited_by_html: %{time} önce %{user} tarafından düzenlendi + in_changeset: Değişiklik Kayıdı + no_comment: (yorum yok) node: - download: "%{download_xml_link}, %{view_history_link} veya %{edit_link}" - download_xml: XML İndir - edit: değiştir - node: Nokta - node_title: "Nokta: %{node_name}" - view_history: geçmişi görüntüle - node_details: - coordinates: "Koordinatları:" - part_of: "Ortak parça:" - node_history: - download: "%{download_xml_link} veya %{view_details_link}" - download_xml: XML indir - node_history: Nokta Geçmişi - node_history_title: "Nokta geçmişi: %{node_name}" - view_details: ayrıntıları göster + history_title: "Nokta Geçmişi: %{name}" + title: "Nokta: %{name}" not_found: - sorry: Üzgünüm, %{id} numaralı %{type} bulunamadı. + sorry: "Üzgünüm, #%{id} numaralı %{type} bulunamadı." type: changeset: değişiklik takımı node: nokta relation: ilişki way: yol - paging_nav: - of: toplam - showing_page: Gösterilen sayfa + note: + closed_title: "Çözümlenmiş not: #%{note_name}" + hidden_title: "Saklı not #%{note_name}" + new_note: Yeni Not + open_title: "Çözümlenmemiş not: #%{note_name}" + title: "Not: %{id}" + part_of: Ortak parça redacted: type: node: nokta + relation: ilişki + way: yol relation: - download: "%{download_xml_link} veya %{view_history_link}" - download_xml: XML indir - relation: İlişki - relation_title: "Ilişki: %{relation_name}" - view_history: Geçmişi görüntüle - relation_details: - members: "Elemanlar:" - part_of: "Ortak parça:" - relation_history: - download: "%{download_xml_link} veya %{view_details_link}" - download_xml: XML İndir - relation_history: Ilişki Geçmişi - relation_history_title: "İlişki Geçmişi: %{relation_name}" - view_details: ayrıntıları göster + history_title: "Relasyon Geçmişi: %{name}" + members: Üyeler + title: "Relasyon: %{name}" relation_member: entry_role: "%{type} %{name}, adı %{role}" type: node: Nokta relation: İlişki way: Yol - start: - manually_select: Fare kullanarak farklı bir alan seç - view_data: Geçerli harita alanının verileri görüntüle start_rjs: - data_frame_title: Veri - data_layer_name: Harita Verisi Gözat - details: Ayrıntılar - drag_a_box: Fare kullanarak harita üzerinde bir alan seç - edited_by_user_at_timestamp: "[[user]] tarafından düzenlendi ([[timestamp]])" - hide_areas: Bölgeleri gizle - history_for_feature: "[[feature]] (geçmiş)" load_data: Veri Yükle loading: Yükleniyor... - manually_select: Fare kullanarak farklı bir alan seç - object_list: - api: Bu alanı API'dan al - back: Nesne listesine dön - details: Ayrıntılar - heading: Nesne listesi - history: - type: - node: Nokta [[id]] - way: Yol [[id]] - selected: - type: - node: Nokta [[id]] - way: Yol [[id]] - type: - node: Nokta - way: Yol - private_user: gizli kullanıcı - show_areas: Bölgeleri göster - show_history: Geçmişi görüntüle - unable_to_load_size: "Yüklenemiyor: alan boyutu [[bbox_size]] çok büyük - (%{max_bbox_size}'den küçük olması gerekir)" - wait: Bekleyin... - zoom_or_select: Yakınlaştır ya da haritada bir alan seç tag_details: - tags: "Parametreler:" + tags: Etiketler wiki_link: key: "%{key} parametresi için Viki açıklaması" tag: "%{key}=%{value} parametresi için Viki açıklaması" @@ -217,35 +157,22 @@ tr: node: nokta relation: ilişki way: yol + version: Sürüm + view_details: Ayrıntıları Görüntüle + view_history: Geçmişi Görüntüle way: - download: "%{download_xml_link}, %{view_history_link} veya %{edit_link}" - download_xml: XML İndir - edit: Düzenle - view_history: Geçmişi görüntüle - way: Yol - way_title: "Yol: %{way_name}" - way_details: - nodes: "Noktalar:" - part_of: "Ortak parça:" - way_history: - download: "%{download_xml_link} veya %{view_details_link}" - download_xml: XML İndir - view_details: ayrıntıları göster - way_history: Yol Geçmişi - way_history_title: "Yol geçmişi: %{way_name}" + history_title: "Yol geçmişi: %{name}" + nodes: Noktalar + title: "Yol: %{name}" changeset: changeset: anonymous: Anonim - big_area: (büyük) - no_comment: (hiç) no_edits: (düzenleme yok) - show_area_box: alanın çerçevesi görüntüle - still_editing: (Hala düzenlemekte) view_changeset_details: Değişiklik setleri ayrıntılı görüntüle changeset_paging_nav: next: Sonraki » previous: « Önceki - showing_page: "Gösterilen sayfa: %{page}" + showing_page: "Sayfa: %{page}" changesets: area: Alan comment: Yorum @@ -253,28 +180,16 @@ tr: saved_at: Kaydetme Tarih user: Kullanıcı list: - description: Son değişiklikler - description_bbox: "%{bbox} alanındaki bulunan harita değişiklik setleri" - description_friend: Arkadaşların değişiklik kayıtları - description_nearby: Yakındaki kullanıcıların değişiklik kayıtları - description_user: "%{user} tarafından değişiklik setleri" - description_user_bbox: "%{user} tarafından %{bbox} alanındaki değişiklik setleri" - heading: Değişiklik Setleri - heading_bbox: Değişiklik Setleri - heading_friend: Değişiklik Kayıtları - heading_nearby: Değişiklik Kayıtları - heading_user: Değişiklik Setleri - heading_user_bbox: Değişiklik Setleri + load_more: Fazla görüntüle title: Değişiklik Setleri - title_bbox: "%{bbox} alanındaki bulunan harita değişiklik setleri" title_friend: Arkadaşların değişiklik kayıtları title_nearby: Yakındaki kullanıcıların değişiklik kayıtları title_user: "%{user} tarafından değişiklik setleri" - title_user_bbox: "%{user} tarafından %{bbox} alanındaki değişiklik setleri" timeout: sorry: Üzgünüz, değişiklik kayıtlarının listelenmesi fazla sürdü. diary_entry: comments: + ago: "%{ago} önce" comment: Yorum has_commented_on: "%{display_name} aşağıdaki günlük girdilerini yorumladı" newer_comments: Daha yeni yorumlar @@ -289,6 +204,7 @@ tr: comment_count: one: 1 yorum other: "%{count} yorum" + zero: yorumsuz comment_link: Bu girdisi yorumla confirm: Onayla edit_link: Bu girdisi düzenle @@ -323,7 +239,7 @@ tr: newer_entries: Daha yeni kayıtlar no_entries: Günlük girdisi yok older_entries: Daha eski kayıtlar - recent_entries: "Son günlük kayıtları:" + recent_entries: Son günlük kayıtları title: Kullanıcıların günlükleri title_friends: Arkadaşlarının günlükleri title_nearby: Yakındaki kullanıcıların günlükleri @@ -347,6 +263,8 @@ tr: user_title: "%{user} (Günlük)" editor: default: Varsayılan (kullanılan %{name}) + id: + description: iD (tarayıcı düzenleyici) potlatch: description: Potlatch 1 (flash tarayıcı düzenleyici, eski) name: Potlatch 1 @@ -362,7 +280,7 @@ tr: area_to_export: Çıkartılacak alan embeddable_html: Gömülebilir HTML export_button: Çıkart - export_details: OpenStreetMap veri, Creative Commons Attribution-ShareAlike 2.0 lisansı altında lisanslanmıştır. + export_details: OpenStreetMap verileri, Open Data Commons Open Database License (ODbL) altında lisanslanmıştır. format: Biçim format_to_export: Çıkartma biçimi image_size: Resim Boyutu @@ -378,17 +296,21 @@ tr: paste_html: Yukarıdaki HTML kodu kopyalayıp websitesinde yapıştırabilir scale: Ölçek too_large: - body: Bu alan OpenStreetMap XML verisi olarak verilmesine kadar büyüktür. Lütfen yakınlaştır veya daha küçük bir alan seç. - heading: Alan Çok Büyük + body: Bu alan OpenStreetMap XML verisi olarak verilmesine kadar büyüktür. Lütfen yakınlaştır veya daha küçük bir alan seç ya da aşağıdaki verilen diğer kaynakları kullan. + geofabrik: + title: Geofabrik İndirmeleri + other: + title: Diğer Kaynaklar + planet: + title: OSM Gezegeni zoom: Yakınlaştır - start_rjs: - add_marker: Haritaya bir işareti ekle - change_marker: İşaretinin konumu değiştir - click_add_marker: İşareti eklemek için harita üzerine tıklayınız - drag_a_box: Fare kullanarak harita üzerinde bir alan seç - export: Çıkart - manually_select: Fare kullanarak farklı bir alan seç - view_larger_map: Haritayı daha büyük göster + title: Dışa aktar + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Sadece ikonuna tıklayın veya harita görünümü üzerinde aynı ikona tıklayın.\nBu haritaya daha sonra sürükleyerek taşıyabileceğiniz bir işaretleyici ekleyecek. Mesajınızı ekleyin ve kaydedin, diğer haritacılar bunu araştıracaklar." + title: Nasıl yardım edebilirim? + title: Sorun bildir / Haritayı onar geocoder: description: title: @@ -398,8 +320,6 @@ tr: cities: Büyükşehirler places: Yerler towns: Şehirler - description_osm_namefinder: - prefix: "%{distance} %{direction} - %{type}" direction: east: doğu north: kuzey @@ -421,26 +341,43 @@ tr: ca_postcode: Geocoder.CA'dan sonuçları geonames: GeoNames.org'un sonuçları latlon: OSM'un sonuçları - osm_namefinder: OpenStreetMap Ad Bulucu osm_nominatim: OSM Nominatim sonuçları uk_postcode: FreeThe Postcode sonuçları (İngiltere) us_postcode: Geocoder.us'dan sonuçları search_osm_nominatim: + admin_levels: + level10: Mahalle Sınırı + level2: Ülke Sınırı + level4: Eyalet Sınırı + level5: Bölge Sınırı + level6: İlçe Sınırı + level8: Büyükşehir Sınırı + level9: Köy Sınırı prefix: + aerialway: + station: Teleferik İstasyonu aeroway: aerodrome: Havaalanı + apron: Apron + gate: Kapı helipad: Helikopter alanı runway: Uçak pisti + taxiway: Taksi yolu + terminal: Terminal amenity: + WLAN: WiFi Erişim Noktası airport: Havaalanı arts_centre: Sanat Merkezi + artwork: Sanat eseri atm: Bankamatik auditorium: Oditoryum bank: Banka bar: Bar + bbq: Mangal alanı bench: Bank bicycle_parking: Bisiklet Parkı bicycle_rental: Bisiklet kiralama + biergarten: Bira Bahçesi brothel: Genelev bureau_de_change: Döviz bürosu bus_station: Otogar @@ -449,6 +386,7 @@ tr: car_sharing: Araç Paylaşımı car_wash: Oto Yıkama casino: Kasino + charging_station: Şarj İstasyonu cinema: Sinema clinic: Klinik club: Kulüp @@ -480,6 +418,7 @@ tr: library: Kütüphane market: Pazar yeri marketplace: Pazar yeri + mountain_rescue: Dağ Kurtarma nightclub: Gece Kulübü nursery: Kreş nursing_home: Huzurevi @@ -505,9 +444,12 @@ tr: shelter: Korunak shop: Dükkan shopping: Alışveriş Merkezi + shower: Duş social_club: Sosyal kulübü + social_facility: Sosyal Tesis studio: Stüdyo supermarket: Süpermarket + swimming_pool: Yüzme Havuzu taxi: Taksi telephone: Telefon theatre: Tiyatro @@ -522,8 +464,19 @@ tr: youth_centre: Gençlik Merkezi boundary: administrative: İdari Sınır + national_park: Milli Park + protected_area: Korumalı Alan + bridge: + aqueduct: Su kemeri + suspension: Asma köprüsü + swing: Asma Köprüsü + viaduct: Viyadük + "yes": Köprü building: "yes": Bina + emergency: + fire_hydrant: Yangın Musluğu + phone: Acil Durum Telefonu highway: bridleway: At yürüyüş yolu bus_guideway: Güdümlü otobüs yolu @@ -535,6 +488,7 @@ tr: footway: Yaya yolu ford: Akarsu geçidi living_street: Yaşam sokağı + milestone: Kilometre taşı minor: Ufak yol motorway: Otoyol motorway_junction: Otoyol Kavşağı @@ -544,16 +498,21 @@ tr: platform: Peron primary: Devlet Yolu primary_link: Devlet Yolu bağlantısı + proposed: Planlanmış Yol raceway: Koşu yolu residential: Sokak + rest_area: Dinlenme Alanı road: Yol secondary: İl yolu secondary_link: İl yolunun bağlantısı service: Servis Yolu services: Dinleme Tesisi + speed_camera: Hız Kamerası steps: Merdiven stile: Çit basamağı + street_lamp: Sokak Lambası tertiary: Köy arası yolu + tertiary_link: Köy arası yolu track: Toprak yolu trail: İz trunk: Bölünmüş anayol @@ -567,47 +526,59 @@ tr: building: Bina castle: Kale church: Kilise + citywalls: Şehir Surları house: Tarihi Konak icon: Simge + manor: Köşk memorial: Anıt mine: Maden Ocağı monument: Anıt museum: Müze ruins: Harabe + tomb: Mezar tower: Kule wreck: Batık Gemi landuse: allotments: Bostan basin: Havuz - brownfield: Nadas + brownfield: Çıplak Arazi cemetery: Mezarlık - commercial: Ticari Bölge + commercial: Ticari ve Hizmet Alanı + conservation: Koruma construction: İnşaat farm: Çiftlik farmland: Tarım arazisi farmyard: Çiftlik avlusu forest: Orman + garages: Garajlar grass: Çim - industrial: Sanayi + greenfield: Nadas Alanı + industrial: Sanayi Alanı landfill: Çöplük - meadow: Çayır + meadow: Mera military: Askeri Bölge mine: Maden Ocağı nature_reserve: Doğa Koruma Alanı + orchard: Meyve Bahçesi park: Park + piste: Pist quarry: Ocak railway: Demiryolu recreation_ground: Eğlence Parkı reservoir: Baraj Gölü + reservoir_watershed: Akarsu Havzası residential: Yerleşim Bölgesi retail: Esnaf - village_green: Kırsal Yeşillik + road: Yol Alanı + village_green: Yeşil Alan vineyard: Bağ wetland: Sulak Alan wood: Orman leisure: beach_resort: Plajlı tatilköyü + bird_hide: Kuş Gözleme Yeri fishing: Balıkçılık alanı + fitness_station: Spor Merkezi garden: Bahçe golf_course: Golf Sahası ice_rink: Buz pateni @@ -618,12 +589,19 @@ tr: pitch: Spor sahası playground: Çocuk parkı recreation_ground: Eğlence parkı + sauna: Sauna slipway: Kızak yolu sports_centre: Spor Merkezi stadium: Stadyum swimming_pool: Yüzme Havuzu track: Koşuş yolu water_park: Su Parkı + military: + airfield: Askeri Havaalanı + barracks: Kışla + bunker: Sığınak + mountain_pass: + "yes": Dağ Geçidi natural: bay: Koy / körfez beach: Plaj @@ -632,9 +610,11 @@ tr: channel: Kanal cliff: Uçurum crater: Krater + dune: Kumul feature: Özelliği fell: Ağaçsız tepe fjord: Haliç + forest: Orman geyser: Gayzer glacier: Buzul heath: Fundalık @@ -654,6 +634,7 @@ tr: scrub: Çalılık shoal: Sığlık spring: Pınar + stone: Taş strait: Boğaz tree: Ağaç valley: Dere/vadi @@ -662,6 +643,19 @@ tr: wetland: Sulak alan wetlands: Sulak Alanlar wood: Orman + office: + accountant: Muhasebeci + architect: Mimar + company: Şirket + employment_agency: İş ve İşçi Bulma Kurumu + estate_agent: Emlakçı + government: Devlet Ofisi + insurance: Sigorta Ofisi + lawyer: Avukat + ngo: STK Ofisi + telecommunication: Telekomünikasyon Ofisi + travel_agent: Seyahat Acentası + "yes": Ofis place: airport: Havaalanı city: Büyükşehir / il merkezi @@ -698,18 +692,23 @@ tr: light_rail: Dar raylı demiryolu platform: Peron station: Tren istasyonu + stop: Tren Durağı subway: Metro istasyonu subway_entrance: Metro Giriş switch: Demiryolu makası tram: Tramvay tram_stop: Tramvay Durağı + yard: Tren Avlusu shop: alcohol: Tekel bayii + antiques: Antikacı art: Sanat Galerisi bakery: Fırın beauty: Güzellik Salonu + beverages: İçecek Dükkanı bicycle: Bisikletçi books: Kitap Evi + boutique: Butik butcher: Kasap car: Araba Galerisi car_parts: Araba Parçası Dükkanı @@ -718,13 +717,18 @@ tr: chemist: Eczacı clothes: Giysi Dükkanı computer: Bilgisayar Mağazası + confectionery: Pastane + convenience: Bakkal copyshop: Fotokopi Merkezi cosmetics: Kozmetik Mağazası + deli: Şarküteri + department_store: Mağaza discount: İndirimli Ürünler Mağazası dry_cleaning: Kuru Temizleme electronics: Elektronik Mağazası estate_agent: Emlakçı farm: Tarım Ürünleri Dükkanı + fashion: Moda Dükkanı fish: Balık Dükkanı florist: Çiçekçi food: Yiyecek Dükkanı @@ -750,16 +754,21 @@ tr: organic: Organik Yiyecek Dükkanı outdoor: Outdoor Sporları Mağazası pet: Hayvan Mağazası + pharmacy: Eczane photo: Fotoğrafçı salon: Kuaför + second_hand: İkinci El Dükkanı shoes: Ayakkabı Dükkanı shopping_centre: Alışveriş Merkezi sports: Spor Malzemeleri Mağazası + stationery: Kırtasiye supermarket: Süpermarket + tailor: Terzi toys: Oyuncakçı travel_agency: Seyahat Acentası video: Video-CD Dükkanı wine: Şarap evi + "yes": Dükkan tourism: alpine_hut: Dağ evi artwork: Sanat eseri @@ -781,18 +790,42 @@ tr: valley: Dere/vadi viewpoint: Panoramik view zoo: Hayvanat bahçesi + tunnel: + culvert: Menfez + "yes": Tünel waterway: + artificial: Yapay su yolu + boatyard: Tersane canal: Kanal + connector: Su yolu bağlantısı dam: Baraj + derelict_canal: Sahipsiz kanal ditch: Sulama kanalı dock: İskele drain: Atık su kanalı + lock: İskele + lock_gate: Menfez mineral_spring: Maden Suyu + mooring: Baba + rapids: Akıntı river: Nehir riverbank: Irmak kenarı stream: Çay wadi: Vadi + water_point: İçme suyu waterfall: Şelale + weir: Küçük köprü + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + title: Yardım Almak + welcome: + description: OpenStreetMap temellerini öğrenmek için kısa bir kılavuz ile başla. + title: OSM'ye hoşgeldin! + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: map: base: @@ -801,57 +834,40 @@ tr: standard: Standart transport_map: Ulaştırma Haritası site: + createnote_tooltip: Haritaya bir not ekle edit_disabled_tooltip: Harita düzenlemek için yakınlaştırmak gerek edit_tooltip: Haritayı düzenle - edit_zoom_alert: Harita düzenleyebilmek için yakınlaştırman gerek - history_disabled_tooltip: Bu alandaki değişiklikleri görmek için yakınlaştır - history_tooltip: Bu alandaki düzenlemeleri göster - history_zoom_alert: Bu alandaki düzenlemeleri görmek için yakınlaştırmak gerekiyor layouts: + about: Hakkında community: Topluluk community_blogs: Üye Blogları community_blogs_title: OpenStreetMap üyelerinin blogları - copyright: Telif hakkı & Lisans - documentation: Viki Belgelenmesi - documentation_title: Harita Projesinin Belgeleme Sistemi + copyright: Telif Hakkı + data: Veri donate: Donanım Yükseltme Fonu'na %{link} yaparak OpenStreetMap'e destek veriniz. - donate_link_text: Bağış edit: Düzenle edit_with: "%{editor} kullanarak düzenle" export: Dışalım - export_tooltip: Harita verisinin dışalımı + export_data: Verinin Dışalımı foundation: Vakıf foundation_title: OpenStreetMap Vakfı gps_traces: GPS İzleri gps_traces_tooltip: GPS izleri yönet help: Yardım - help_centre: Yardım & Soru Bankası - help_title: Projenin yardım sayfaları history: Geçmiş - home: konum - home_tooltip: Kendin konuma git - inbox: mesajlar (%{count}) - inbox_tooltip: - one: Bir tane okunmamış mesajın var - other: "%{count} okunmamış mesaj var" - zero: Okunmamış mesajın yok - intro_1: OpenStreetMap herkese serbest ve ücretsiz senin gibi insanlar tarafından oluşturduğu bir dünya haritasıdır. - intro_2_create_account: hesabı oluşturunuz - intro_2_download: indirmesi - intro_2_html: "%{license} olan verilerinin %{download} ve %{use} tamamen serbesttir. Harita geliştirmek için bir %{create_account}." - intro_2_license: Kamuya açık lisansı - intro_2_use: kullanması - license: - title: OpenStreetMap veri Creative Commons Attribution-Share Alike 2.0 Genel Lisans altında lisanslanmıştır + home: Kendin Konuma Git + intro_2_create_account: hesap oluşturunuz + intro_header: OpenStreetMap'e hoş geldiniz! + learn_more: Daha Fazla Bilgi log_in: Oturum aç log_in_tooltip: Var olan bir hesapla giriş yapın logo: alt_text: OpenStreetMap logosu - logout: çıkış - logout_tooltip: Oturumu kapat + logout: Çıkış make_a_donation: text: Bir bağışta bulunun title: OpenStreetMap para bağışı ile destek verebilirsiniz + more: Daha fazla osm_offline: OpenStreetMap veritabanı bakım çalışmaları yürütüldüğü için veritabanı şu anda çevrimdışıdır. osm_read_only: OpenStreetMap veritabanı bakım çalışmaları yürütüldüğü için veritabanı şu anda sadece okunur durumdadır. partners_bytemark: Bytemark Hosting @@ -861,23 +877,21 @@ tr: partners_ucl: UCL VR Centre sign_up: Kaydol sign_up_tooltip: Düzenleme moduna girmek için bir hesap oluştur - sotm2011: 2011 OpenStreetMap konferans, The State of the Map (Haritanın Durumu), 9-11 Eylül Denver'de! + start_mapping: Harita Çizmeye Başla tag_line: Özgür Viki Dünya Haritası user_diaries: Günlük user_diaries_tooltip: Kullanıcı günlükleri görüntüle - view: Harita - view_tooltip: Haritayı göster - welcome_user: Merhaba, %{user_link} - welcome_user_link_tooltip: Senin kullanıcı sayfan - wiki: Viki - wiki_title: Projenin viki sayfaları license_page: foreign: english_link: İngilizce orijinal title: Bu çeviri hakkında + legal_babble: + contributors_title_html: Katkıcılarımız + credit_3_html: "Bir gezinebilir elektronik haritanın sağ alt köşesinde kredisi görünmesi lazım.\nÖrnegin:" + title_html: Telif Hakkı ve Lisans native: mapping_link: harita çizmeye başla - native_link: THIS_LANGUAGE_NAME_HERE sürümü + native_link: Türkçe sürümü title: Sayfa hakkında message: delete: @@ -885,6 +899,7 @@ tr: inbox: date: Tarih from: Gönderen + messages: "%{new_messages} yeni ve %{old_messages} eski mesaj var" my_inbox: Gelen kutusu outbox: Gönderilmiş kutusu people_mapping_nearby: yakın çevredeki haritacılar @@ -920,12 +935,9 @@ tr: title: Gönderilmiş Kutusu to: Alıcı read: - back_to_inbox: Gelen kutusuna dön - back_to_outbox: Gönderilmiş kutusuna dön + back: Geri date: Tarih from: Gönderen - reading_your_messages: Mesajlarını oku - reading_your_sent_messages: Gönderilmiş mesajlarını oku reply_button: Yanıtla subject: Konu title: Mesaj oku @@ -941,8 +953,11 @@ tr: email_confirm: subject: "[OpenStreetMap] E-posta adresi onaylama mesajı" email_confirm_html: + click_the_link: Bu e-postayı sana aitse onaylamak için aşağıdaki bağlantıyı tıkla. greeting: Merhaba, + hopefully_you: Birisi (umarım sen) %{server_url} deki kayıtlı olan e-posta adresi %{new_address} olarak değiştirmek istiyor. email_confirm_plain: + click_the_link: Bu e-posta adresi sana aitse onaylamak için aşağıdaki bağlantıyı tıkla. greeting: Merhaba, friend_notification: befriend_them: "%{befriendurl} üzerinden arkadaş olarak da ekleyebilirsiniz." @@ -961,24 +976,20 @@ tr: lost_password: subject: "[OpenStreetMap] Şifre sıfırlama isteği" lost_password_html: + click_the_link: Bu istek sana aitse şifre sıfırlamak için aşağıdaki bağlantıyı tıkla. greeting: Merhaba, lost_password_plain: + click_the_link: Bu istek sana aitse şifre sıfırlamak için aşağıdaki bağlantıyı tıkla. greeting: Merhaba, message_notification: - footer1: Ayrıca mesajı %{readurl} tıklayarak okuyabilirsin - footer2: ve %{replyurl} üzerinden cevap verebilirsiniz header: "OpenStreetMap kullanıcı %{from_user} sana %{subject} konulu bir mesaj gönderdi:" hi: Merhaba %{to_user}, + note_comment_notification: + greeting: Merhaba, signup_confirm: - subject: "[OpenStreetMap] e-posta adresi onaylama mesajı" - signup_confirm_html: - greeting: Merhaba! - introductory_video: "%{introductory_video_link} seyretebilirsin." - more_videos_here: daha fazla video - video_to_openstreetmap: OpenStreetMap tanıtım filmi - signup_confirm_plain: + created: Birisi (umarım sen) %{site_url} sitesinde yeni bir hesap açtı. greeting: Merhaba! - more_videos: "Burada daha fazla video var:" + subject: "[OpenStreetMap]'e hoşgeldin" oauth_clients: edit: submit: Değiştir @@ -987,25 +998,56 @@ tr: name: Isim required: Gerekli index: + my_apps: Benim istemci uygulamalarım revoke: İptal! title: OAuth Ayrıntılarım new: submit: Kayıt ol show: + confirm: Emin misiniz? + delete: İstemci Sil edit: Ayrıntıları Düzenle + redaction: + create: + flash: Redaksiyon oluşturuldu. + destroy: + error: Bu redaksiyon kaldırılırken bir hata oluştu. + flash: Redaksiyon kaldırıldı. + not_empty: Redaksiyon boş değil. Lütfen bu redaksiyonu kaldırmadan önce tüm sürümlerini tekrar düzenleyin. + edit: + description: Açıklama + heading: Redaksiyonu düzenle + submit: Redaksiyonu kaydet + title: Redaksiyonu düzenle + index: + empty: Gösterilecek redaksiyon yok. + heading: Redaksiyonların listesi + title: Redaksiyonların listesi + new: + description: Açıklama + heading: Yeni redaksiyon için bilgi giriniz + submit: Redaksiyon oluştur + title: Yeni redaksiyon oluşturma + show: + confirm: Emin misiniz? + description: "Açıklama:" + destroy: Bu redaksiyonu kaldır + edit: Bu redaksiyonu düzenle + heading: Redaksiyon "%{title}" göster + title: Redaksiyon göster + user: "Oluşturan:" + update: + flash: Değişiklikler kaydedildi. site: edit: anon_edits: (%{link}) user_page_link: kullanıcı sayfası index: + createnote: Bir not ekle js_2: OpenStreetMap harita gösterim için JavaScript kullanıyor. - license: - project_name: OpenStreetMap projesi permalink: Kalıcı Bağlantı shortlink: Kısa Bağlantı key: - map_key: Harita Anahtarı (Lejant) - map_key_tooltip: Haritanın anahtarı table: entry: admin: İdari sınırı @@ -1015,7 +1057,7 @@ tr: - terminal bridge: Siyah kenar = köprü bridleway: Binici yolu - brownfield: Nadas + brownfield: Çıplak arazi building: Önemli yapı byway: Yan yolu cable: @@ -1023,10 +1065,10 @@ tr: - gondol cemetery: Mezarlık centre: Spor merkezi - commercial: Ticari bölge + commercial: Ticari ve hizmet alanı common: - Çimen - - çayır + - mera construction: yapım aşamasında yolu cycleway: Bisiklet yolu farm: Çiftlik @@ -1034,10 +1076,10 @@ tr: forest: Orman golf: Golf sahası heathland: Fundalık - industrial: Sanayi bölgesi + industrial: Sanayi alanı lake: - Göl - - Baraj + - baraj military: Askeri bölge motorway: Otoyol park: Park @@ -1070,9 +1112,16 @@ tr: unclassified: Sınıflandırılmamış yol unsurfaced: Ham yolu wood: Orman + markdown_help: + image: Görsel + link: Bağlantı + text: Metin + url: URL + richtext_area: + edit: Düzenle + preview: Ön izle search: search: Ara - search_help: "örneğin: 'Beyoğlu', 'İstiklal Caddesi, İstanbul', 'CB2 5AQ' ya da 'Fatih yakınlarında postane' daha fazla örnek..." submit_text: Git where_am_i: Ben neredeyim? where_am_i_title: Arama motoru kullanarak geçerli konumunu tanımlar @@ -1145,9 +1194,7 @@ tr: trace_optionals: tags: Etiketler trace_paging_nav: - next: Sonraki » - previous: « Önceki - showing_page: Sayfa %{page} görüntüleniyor + showing_page: Sayfa %{page} view: delete_track: Bu izi sil description: "Açıklama:" @@ -1173,13 +1220,16 @@ tr: agreed: Yeni katılımcı şartları kabul ettin. agreed_with_pd: Ayrıca düzenlediklerin Kamu Malı olsun diye kabul ettin. heading: "Katılımcı Şartları:" - link text: nemiş bu? + link text: Bu nedir? not yet agreed: Yeni katılımcı şartları kabul etmedin. current email address: "Geçerli E-posta Adresi:" delete image: Geçerli resim kaldır - email never displayed publicly: (asla genel olarak görüntülenir) + email never displayed publicly: (hiçbir zaman görüntülenmez) flash update success: Kullanıcı bilgisi başarıyla güncellendi. flash update success confirm needed: Kullanıcı bilgisi başarıyla güncellendi. Yeni e-posta adresinizi onaylamak için e-mail'inizi lütfen kontrol ediniz. + gravatar: + gravatar: Gravatar kullanın + link text: bu nedir? home location: "Konum:" image: "Resim:" image size hint: (100x100 olan kare görüntüleri en iyi görünür) @@ -1193,7 +1243,7 @@ tr: no home location: Konumunu girmedin. openid: link: http://wiki.openstreetmap.org/wiki/OpenID - link text: nemiş bu? + link text: Bu nedir? openid: "OpenID:" preferred editor: "Tercih edilen harita düzenleyici:" preferred languages: "Tercih edilen diller (mesela tr,en,de):" @@ -1203,7 +1253,7 @@ tr: disabled link text: neden düzenleyemiyorum? enabled: Etkin. Anonim değil ve verileri düzenleyebilir. enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits - enabled link text: bu da ne? + enabled link text: Bu nedir? heading: "Herkese açık düzenleme modu:" public editing note: heading: Herkese açık düzenleme modu @@ -1214,8 +1264,7 @@ tr: update home location on click: Haritada tıkladığımda konumum güncelleştirilsin mi? confirm: button: Onayla - heading: Kullanıcı hesabı onayla - success: Hesabın onaylandı, teşekkür ve iyi çalışmaları!

    Hoşgeldin sayfasında Türkiye'deki harita durumu konusunda bilgi alabilirsin. + heading: E-postalarını kontrol et! confirm_email: button: Onayla success: E-posta adresinizi doğrulandı, kaydolduğu için teşekkür ederiz! İyi çalışmaları dileriz! @@ -1239,14 +1288,35 @@ tr: lost password link: Şifren mi unuttun? new to osm: OpenStreetMap sitesinde yeni misiniz? no account: Hesabın yok mu? + openid invalid: Üzgünüz, OpenID hatalı biçimlendirilmiş gözüküyor + openid missing provider: Üzgünüz, OpenID sağlayınızla iletişim kurulamadı + openid_logo_alt: OpenID ile giriş openid_providers: + aol: + alt: AOL OpenID ile giriş + title: AOL ile giriş + google: + alt: Google OpenID ile giriş + title: Google ile giriş + myopenid: + alt: myOpenID OpenID ile giriş + title: MyOpenID ile giriş openid: + alt: OpenID URL ile giriş title: OpenID kullanarak oturum aç + wordpress: + alt: Wordpress OpenID ile giriş + title: Wordpress ile giriş + yahoo: + alt: Yahoo OpenID ile giriş + title: Yahoo ile giriş password: "Şifre:" register now: Şimdi kayıt ol remember: "Beni hatırla:" title: Giriş to make changes: OpenStreetMap verileri değiştirmek için bir hesabın olması gerekir. + with openid: "Alternatif olarak OpenID ile giriş yapın:" + with username: "OpenStreetMap hesabınız var mı? Lütfen kullanıcı adı ve şifrenizle giriş yapınız:" logout: heading: OpenStreetMap'den çıkış logout_button: Çıkış @@ -1262,11 +1332,10 @@ tr: new: confirm email address: E-posta Adresini Onayla confirm password: "Şifre Onayla:" - continue: Devam + continue: Kaydol display name: "Görünen Ad:" display name description: Herkes tarafından görünen ad. Bu adı istediği zaman 'tercihlerim' bölümünde değiştirebilirsin. email address: "E-posta Adresi:" - heading: Kullanıcı Hesabı Oluştur openid: "%{logo} OpenID:" password: "Şifre:" terms accepted: Yeni katılımcı şartları kabul ettiğin için teşekkür ederiz! @@ -1296,23 +1365,27 @@ tr: webmaster: site yönetici terms: agree: Kabul Et + consider_pd: Yukarıdaki anlaşmaya ek olarak, katkılarınızın kamu malı olarak kabul edilmesini de seçebilirsiniz consider_pd_why: bu nedir? decline: Reddet + guidance: "Buradaki bilgileri anlamanıza yardımcı olabilecek bilgiler: okunabilir bir özet ve ayrıca genel çeviriler" heading: Katılımcı Şartları legale_names: france: Fransa italy: İtalya rest_of_world: Dünyanın geri kalanı legale_select: "İkamet ettiğiniz ülke seç:" + read and accept: Lütfen aşağıdaki anlaşmayı okuyun ve mevcut ya da gelecekteki katkılarınız için bu sözleşmenin şartlarını kabul ettiğinizi onaylamak için kabul et butonuna basın. title: Katılımcı Şartları + you need to accept or decline: Lütfen katılımcı şartlarını okuyunuz ve şartları kabul ya da ret ediniz. view: activate_user: Bu kullanıcıyı etkinleştir - add as friend: arkadaş olarak ekle + add as friend: Arkadaş olarak ekle ago: (%{time_in_words_ago} önce) - block_history: verilen engellemeleri görüntüle - blocks by me: engellediklerim - blocks on me: engellendiklerim - comments: yorumlar + block_history: alınan engellemeleri + blocks by me: Engellediklerim + blocks on me: Engellendiklerim + comments: Yorumlar confirm: Onayla confirm_user: bu kullanıcıyı onayla create_block: Bu kullanıcıyı engelle @@ -1324,38 +1397,44 @@ tr: deactivate_user: bu kullanıcıyı pasifleştir delete_user: bu kullanıcıyı sil description: Açıklama - diary: günlük - edits: düzenlemeleri + diary: Günlük + edits: Düzenlemeleri email address: "E-posta adresi:" - friends_changesets: Arkadaşların bütün değişiklik kayıtları görüntüle - friends_diaries: Arkadaşların bütün günlük girdileri görüntüle + friends_changesets: arkadaşların değişiklik kayıtları + friends_diaries: arkadaşların günlük girdileri hide_user: bu kullanıcı gizle km away: "%{count} km uzak" latest edit: "Son değişiklik %{ago}:" m away: "%{count} metre yakın" mapper since: "Haritacılığın başlangıç tarihi:" - moderator_history: verilen engellemeleri görüntüle - my comments: yorumladıklarım - my diary: günlüğüm - my edits: katkılarım - my settings: tercihlerim - my traces: GPS izlerim + moderator_history: verilen engellemeleri + my comments: Yorumlarım + my diary: Günlüğüm + my edits: Katkılarım + my settings: Tercihlerim + my traces: GPS İzlerim nearby users: Yakın çevrede bulunan kullanıcılar - nearby_changesets: Yakındaki kullanıcıların bütün değişiklik kayıtları görüntüle - nearby_diaries: Yakındaki kullanıcıların bütün günlük girdileri görüntüle + nearby_changesets: yakınlarındaki kullanıcıların bütün değişiklik kayıtları + nearby_diaries: yakınlarındaki kullanıcıların bütün günlük girdileri new diary entry: yeni kayıt no friends: Henüz herhangi bir arkadaş eklemediniz. no nearby users: Yakın çevredeki herhangi başka kullanıcı henüz yok. oauth settings: OAuth ayarları - remove as friend: Arkadaş listesinden çıkar + remove as friend: Arkadaş listesinden çıkart role: administrator: Bu kullanıcı bir yönetici dir. + grant: + administrator: Yönetici erişim hakkı + moderator: Moderatör erişim izni moderator: Bu kullanıcı bir moderatör dür. - send message: mesaj gönder + revoke: + administrator: Yönetici erişimini iptal etme + moderator: Moderatör erişimini iptal etme + send message: Mesaj Gönder settings_link_text: ayarları spam score: "Spam puanı:" status: "Durum:" - traces: izleri + traces: İzleri unhide_user: kullanıcının gizlenmesini kaldır user location: Kullanıcının konumu your friends: Arkadaş listesi @@ -1385,11 +1464,14 @@ tr: creator_name: Oluşturan display_name: Engellenmiş kullanıcı edit: Düzenle + next: Sonraki » not_revoked: (iptal edilmemiş) + previous: « Önceki reason: Engelleme sebebi revoke: İptal! revoker_name: İptal eden show: Göster + showing_page: Sayfa %{page} status: Durum period: one: 1 saat @@ -1424,3 +1506,16 @@ tr: confirm: Onayla revoke: confirm: Onayla + welcome_page: + add_a_note: + title: Düzenlemek için vaktın yok mu? O zaman bir not ekle...! + basic_terms: + editor_html: Düzenleyici haritayı düzenlemek için kullanabileceğiniz bir program ya da web sayfasıdır. + title: Haritacılığın temel terimleri + way_html: Bir yol bir çizgi ya da alan, bir cadde, akarsu, göl veya bina olabilir. + questions: + title: Sorularınız var mı? + start_mapping: Harita çizmeye başla + title: Hoşgeldiniz! + whats_on_the_map: + title: Haritada ne bulunur diff --git a/config/locales/uk.yml b/config/locales/uk.yml index eb56afca2c9..40a2a99bd06 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -2,16 +2,37 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: AS +# Author: Andriykopanytsia # Author: Andygol # Author: Arturyatsko +# Author: Base # Author: Dim Grits +# Author: Dittaeva +# Author: Dubyk +# Author: Dudka # Author: KEL +# Author: Nemo bis # Author: Olvin # Author: Prima klasy4na # Author: Riwnodennyk +# Author: Sev +# Author: Shirayuki +# Author: SteveR # Author: Yurkoy # Author: Тест uk: + about_page: + community_driven_html: "Спільнота OpenStreetMap — різноманітна, затята і щоденно зростаюча. Серед наших учасників є мапери ентузіасти, фахівці ГІС, інженери що підтримують роботу серверів OSM, фахівці, які із гуманістичних причин, допомагають в картографуванні районів, постраждалих від стихійного лиха, і багато інших.\nЩоб дізнатися більше про спільноту, подивіться щоденники користувачів\nблоги спільноти і сайт фундації OSM." + community_driven_title: Керується спільнотою + copyright_html: ©Учасники OpenStreetMap
    + lede_text: OpenStreetMap створений спільнотою маперів, які вносять і підтримують дані про дороги, стежки, кав’ярні, вокзали і багато чого іншого по всьому світу. + local_knowledge_html: OpenStreetMap надає виразності місцевим даним. Мапери використовують аерофотознімки, GPS пристрої та прості створені на місцевості схеми для перевірки точності та актуальності даних OSM. + local_knowledge_title: Знання місцевості + next: Далі + open_data_html: "OpenStreetMap — це відкриті дані: ви можете вільно використовувати їх для будь-яких цілей до тих пір, поки ви згадуєте OpenStreetMap і його учасників. Якщо ви змінюєте дані або на основі даних будуєте власні певним чином, ви можете розповсюджувати результат лише під тією ж самою ліцензією. Дивіться сторінку авторські права і\nліцензії, щоб отримати докладну інформацію." + open_data_title: Відкриті дані + partners_title: Партнери + used_by: "%{name} надає картографічні дані для сотень веб-сайтів, мобільних застосунків та апаратних пристроїв" activerecord: attributes: diary_comment: @@ -20,7 +41,7 @@ uk: language: Мова latitude: Широта longitude: Довгота - title: Заголовок + title: Тема user: Користувач friend: friend: Друг @@ -29,7 +50,7 @@ uk: body: Текст recipient: Одержувач sender: Відправник - title: Заголовок + title: Тема trace: description: Опис latitude: Широта @@ -42,7 +63,7 @@ uk: user: active: Активний description: Опис - display_name: "Показувати ім’я:" + display_name: "Прізвисько:" email: Ел. пошта languages: Мови pass_crypt: Пароль @@ -57,29 +78,29 @@ uk: language: Мова message: Повідомлення node: Точка - node_tag: Теґ Точки + node_tag: Теґ точки notifier: Повідомлювач old_node: Стара точка - old_node_tag: Старий теґ Точки - old_relation: Старий Зв’язок - old_relation_member: Старий елемент Зв’язку + 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: Теґ Зв’язку + relation_member: Елемент зв’язку + relation_tag: Теґ зв’язку session: Сесія trace: Трек tracepoint: Точка треку - tracetag: Теґ Треку + tracetag: Теґ треку user: Користувач user_preference: Налаштування користувача user_token: Код підтвердження користувача way: Лінія way_node: Точка лінії - way_tag: Теґ Лінії + way_tag: Теґ лінії application: require_cookies: cookies_needed: Схоже, що у вас вимкнені куки. Будь ласка, увімкніть куки у вашому оглядачі, перш ніж продовжити. @@ -89,166 +110,85 @@ uk: blocked: Ваш доступ до API заблоковано. Будь ласка, увійдіть через веб-інтерфейс, щоб дізнатися подробиці. need_to_see_terms: Ваш доступ до API тимчасово призупинено. Будь ласка, увійдіть в систему, через веб-інтерфейс для перегляду Умов Участі. Вам не обов’язково погоджуватись, але ви повинні переглянути їх. browse: + anonymous: анонім changeset: - changeset: "Набір змін: %{id}" - changesetxml: XML набір змін - download: Завантажити %{changeset_xml_link} або %{osmchange_xml_link} + belongs_to: Автор + changesetxml: XML набір змін feed: title: Набір змін %{id} title_comment: Набір змін %{id} — %{comment} + node: Точки (%{count}) + node_paginated: Точки (%{x}-%{y} із %{count}) osmchangexml: osmChange XML - title: Набір змін - changeset_details: - belongs_to: "Користувача:" - bounding_box: "Межі:" - box: в межах - closed_at: "Закінчено:" - created_at: "Розпочато:" - has_nodes: - few: "Містить %{count} точки:" - one: "Містить %{count} точку:" - other: "Містить %{count} точок:" - has_relations: - few: "Має наступні %{count} зв’язки:" - one: "Має наступний %{count} зв’язок:" - other: "Має наступні %{count} зв’язків:" - has_ways: - few: "Містить %{count} лінії:" - one: "Містить %{count} лінію:" - other: "містить %{count} ліній:" - no_bounding_box: Для цього набору змін межі не встановлено. - show_area_box: Показати виділену ділянку - common_details: - changeset_comment: "Коментар:" - deleted_at: "Вилучено:" - deleted_by: "Вилучив:" - edited_at: "Змінено:" - edited_by: "Змінив:" - in_changeset: "В наборі змін:" - version: "Версія:" + relation: Зв’язки (%{count}) + relation_paginated: Зв’язки (%{x}-%{y} із %{count}) + title: "Набір змін: %{id}" + way: Лінії (%{count}) + way_paginated: Лінії (%{x}-%{y} із %{count}) + closed: Закрито + closed_by_html: Закрито %{time} тому учасником %{user} + closed_html: Закрито %{time} тому containing_relation: entry: Зв’язок %{relation_name} entry_role: Зв’язок %{relation_name} (як %{relation_role}) - map: - deleted: Вилучено - edit: - area: Редагувати область - node: Редагувати точку - relation: Редагувати відношення - way: Редагувати лінію - larger: - area: Перегляд ділянки на більшій мапі - node: Перегляд точки на більшій мапі - relation: Перегляд зв’язку на більшій мапі - way: Перегляд лінії на більшій мапі - loading: Завантаження… - navigation: - all: - next_changeset_tooltip: Наступний набір змін - next_node_tooltip: Наступна точка - next_relation_tooltip: Наступний зв'язок - next_way_tooltip: Наступна лінія - prev_changeset_tooltip: Попередній набір змін - prev_node_tooltip: Попередня точка - prev_relation_tooltip: Попередній зв’язок - prev_way_tooltip: Попередня лінія - user: - name_changeset_tooltip: Переглянути правки %{user} - next_changeset_tooltip: Наступні зміни %{user} - prev_changeset_tooltip: Попередні зміни %{user} + created: Створено + created_by_html: Створено %{time} тому учасником %{user} + created_html: Створено %{time} тому + deleted_by_html: Вилучено %{time} тому учасником %{user} + download_xml: Завантажити XML + edited_by_html: Змінено %{time} тому учасником %{user} + in_changeset: Набір змін + location: "Координати:" + no_comment: (без коментарів) node: - download: "%{download_xml_link}, %{view_history_link} або %{edit_link}" - download_xml: Завантажити XML - edit: правити - node: Точка - node_title: "Точка: %{node_name}" - view_history: перегляд історії - node_details: - coordinates: "Координати:" - part_of: "Бере участь у:" - node_history: - download: "%{download_xml_link} або %{view_details_link}" - download_xml: Завантажити XML - node_history: Історія Точки - node_history_title: "Історія Точки: %{node_name}" - view_details: переглянути подробиці + history_title: "Історія точки: %{name}" + title: "Точка: %{name}" not_found: - sorry: На жаль, %{type} з ідентифікатором %{id} не знайдено. + sorry: "На жаль, %{type} #%{id} неможливо знайти." type: changeset: набір змін node: точка relation: зв’язок way: лінія - paging_nav: - of: з - showing_page: Показано сторінку + note: + closed_by: Розв’язано учасником %{user} %{when} тому + closed_by_anonymous: Розв’язано анонімом %{when} тому + closed_title: "Опрацьована нотатка #%{note_name}" + commented_by: Прокоментовано учасником %{user} %{when} тому + commented_by_anonymous: Прокоментовано анонімом %{when} тому + hidden_by: Приховано учасником %{user} %{when} тому + hidden_title: "Прихована нотатка #%{note_name}" + new_note: Нова нотатка + open_by: Створено учасником %{user} %{when} тому + open_by_anonymous: Створено анонімом %{when} тому + open_title: "Неопрацьована нотатка #%{note_name}" + reopened_by: Відновлено учасником %{user} %{when} тому + reopened_by_anonymous: Відновлено анонімом %{when} тому + title: "Нотатка: %{id}" + part_of: Входить до складу redacted: - message_html: Версія %{version} типу %{type} не може бути показана так як вона була змінена. Будь ласка, перегляньте %{redaction_link} для отримання деталей. + message_html: Версія %{version} типу %{type} не може бути показана через те, що її було відредаговано. Будь ласка, перегляньте %{redaction_link} для отримання деталей. redaction: Редакція %{id} type: node: точка relation: зв’язок way: лінія relation: - download: "%{download_xml_link} або %{view_history_link}" - download_xml: Завантажити XML - relation: Зв’язок - relation_title: "Зв’язок: %{relation_name}" - view_history: перегляд історії - relation_details: - members: "Учасники:" - part_of: "Бере участь у:" - relation_history: - download: "%{download_xml_link} або %{view_details_link}" - download_xml: Завантажити XML - relation_history: Історія Зв’язку - relation_history_title: "Історія Зв’язку: %{relation_name}" - view_details: переглянути подробиці + history_title: "Історія зв’язку: %{name}" + members: Учасники + title: "Зв’язок: %{name}" relation_member: entry_role: "%{type} %{name} як %{role}" type: node: Точка relation: Зв’язок way: Лінія - start: - manually_select: Виділіть іншу ділянку - view_data: Переглянути дані з поточного виду start_rjs: - data_frame_title: Дані - data_layer_name: Переглянути дані мапи - details: Подробиці - drag_a_box: Для виділення ділянки пересуньте рамку на мапі - edited_by_user_at_timestamp: Змінив [[user]] в [[timestamp]] - hide_areas: Приховати ділянки - history_for_feature: Історія [[feature]] + feature_warning: Завантаження %{num_features} об’єктів, яке може призвести до уповільнення або неможливості роботи вашого оглядача. Ви справді бажаєте переглянути ці дані? load_data: Завантажити Дані - loaded_an_area_with_num_features: "Ви завантажили ділянку, яка містить [[num_features]] об’єктів. Загалом, деякі оглядачі можуть не впоратися з показом цієї кількості даних. Як правило, оглядачі працюють краще показуючи менше 100 об’єктів одночасно: якщо ви робите ще будь-що інше — це може спричинити сповільнення/відсутність відклику у вашому оглядачі. Якщо ви впевнені, що хочете побачити ці дані, це можна зробити, натиснувши на кнопку нижче." loading: Завантаження… - manually_select: Виберіть іншу дялінку - object_list: - api: Отримати цю ділянку з API - back: Показати перелік об’єктів - details: Подробиці - heading: Перелік об’єктів - history: - type: - node: Точка [[id]] - way: Лінія [[id]] - selected: - type: - node: Точка [[id]] - way: Лінія [[id]] - type: - node: Точка - way: Лінія - private_user: приватний користувч - show_areas: Показати ділянки - show_history: Показати історію - unable_to_load_size: "Неможливо завантажити: розмір ділянки [[bbox_size]] завеликий (повинен бути менше ніж %{max_bbox_size})" - wait: Зачекайте… - zoom_or_select: Збільшить масштаб або виберіть ділянку на мапі для перегляду tag_details: - tags: "Теґи:" + tags: Теґи wiki_link: key: Сторінка вікі, що описує теґ %{key} tag: Сторінка вікі, що описує теґ %{key}=%{value} @@ -260,33 +200,20 @@ uk: node: точка relation: зв’язок way: лінія + version: Версія + view_details: Поточна інформація + view_history: Перегляд історії way: - download: "%{download_xml_link}, %{view_history_link} або %{edit_link}" - download_xml: Завантажити XML - edit: редагувати - view_history: переглянути історію - way: Лінія - way_title: "Лінія: %{way_name}" - way_details: also_part_of: one: також є частиною лінії %{related_ways} other: також є частиною ліній %{related_ways} - nodes: "Точки:" - part_of: "Частина з:" - way_history: - download: "%{download_xml_link} або %{view_details_link}" - download_xml: Завантажити XML - view_details: переглянути подробиці - way_history: Історія змін лінії - way_history_title: "Історія змін лінії: %{way_name}" + history_title: "Історія лінії: %{name}" + nodes: Точки + title: "Лінія: %{name}" changeset: changeset: anonymous: Анонім - big_area: (велика) - no_comment: (немає) no_edits: (без виправлень) - show_area_box: Показати межу, що охоплює область набору змін - still_editing: (ще редагується) view_changeset_details: Подивитися подробиці набору змін changeset_paging_nav: next: Наступна → @@ -299,26 +226,19 @@ uk: saved_at: Збережено user: Користувач list: - description: Останні зміни - description_bbox: Набір змін в межах %{bbox} - description_friend: Набори змін ваших друзів - description_nearby: Набори змін близьких користувачів - description_user: Набір змін користувача %{user} - description_user_bbox: Набір змін користувача %{user} в межах %{bbox} - heading: Набір змін - heading_bbox: Набір змін - heading_friend: Набори змін - heading_nearby: Набір змін - heading_user: Набір змін - heading_user_bbox: Набір змін + empty: Жодного набору змін не знайдено. + empty_area: На цій ділянці набори змін відсутні. + empty_user: Немає наборів змін від цього учасника. + load_more: Завантажити ще + no_more: Наборів змін більше не знайдено. + no_more_area: Наборів змін на цій ділянці більше немає. + no_more_user: Немає більше наборів змін від цього учасника. title: Набір змін - title_bbox: Набір змін в межах %{bbox} title_friend: Набори змін ваших друзів - title_nearby: Набори змін близьких користувачів + title_nearby: Набори змін користувачів поряд з вами title_user: Набір змін користувача %{user} - title_user_bbox: Набір змін користувача %{user} в межах %{bbox} timeout: - sorry: На жаль, список наборів змін який ви запросили, потребує багато часу для завантаження. + sorry: На жаль, список наборів змін який ви запросили, потребує забагато часу для завантаження. diary_entry: comments: ago: "%{ago} тому" @@ -337,6 +257,7 @@ uk: few: "%{count} коментарі" one: "%{count} коментар" other: "%{count} коментарів" + zero: Немає коментарів comment_link: Коментувати confirm: Підтвердити edit_link: Правити цей запис @@ -371,10 +292,10 @@ uk: newer_entries: Нові записи no_entries: В щоденнику немає записів older_entries: Старі записи - recent_entries: "Останні записи:" + recent_entries: Останні записи в щоденнику title: Щоденник title_friends: Щоденники друзів - title_nearby: Щоденники близьких користувачів + title_nearby: Щоденники користувачів поряд з вами user_title: Щоденник користувача %{user} location: edit: Редагувати @@ -395,6 +316,9 @@ uk: user_title: Щоденник користувача %{user} editor: default: Типовий (зараз %{name}) + id: + description: iD (редактор в оглядачі) + name: iD potlatch: description: Потлач 1 (редактор в оглядачі) name: Потлач 1 @@ -410,7 +334,7 @@ uk: area_to_export: Ділянка для експорту embeddable_html: Вбудований HTML export_button: Експортувати - export_details: Дані OpenStreetMap ліцензуються на умовах Ліцензії Creative Commons Attribution-ShareAlike 2.0. + export_details: Дані OpenStreetMap ліцензуються на умовах Ліцензії Open Data Commons Open Database License (ODbL). format: "Формат:" format_to_export: Формат експорту image_size: "Розмір зображення:" @@ -426,29 +350,46 @@ uk: paste_html: HTML-код для вбудовування до сайту scale: Масштаб too_large: - body: Ця ділянка дуже велика для експорту у вигляді XML-даних OpenStreetMap. Будь ласка наблизьтесь або виберіть меншу ділянку. - heading: Завелика площа + advice: "Якщо експорт вище не вдався, то розгляньте можливість використання одного з перелічених нижче джерел:" + body: "Ця ділянка дуже велика для експорту у вигляді XML-даних OpenStreetMap. Будь ласка наблизьтесь або виберіть меншу ділянку, або скористайтеся одним з наступних джерел для завантаження великого обсягу даних:" + geofabrik: + description: Регулярно оновлювані вибірки континентів, країн і деяких міст + title: Завантаження Geofabrik + metro: + description: Вибірки даних для великих міст світу і прилеглих до них територій + title: Mегаполіси + other: + description: Додаткові джерела перераховані у вікі OpenStreetMap + title: Інші джерела + overpass: + description: Завантажити дані з габаритного прямокутника з дзеркала бази даних OpenStreetMap + title: Overpass API + planet: + description: Регулярно оновлювані копії усієї бази даних OpenStreetMap + title: Планета OSM zoom: Збільшити - start_rjs: - add_marker: Додати маркер на мапу - change_marker: Змініть положення маркера - click_add_marker: Клацніть по мапі для встановлення маркера - drag_a_box: Для вибору ділянки розтягніть рамку на мапі - export: Експорт - manually_select: Виділіть іншу ділянку - view_larger_map: Збільшити мапу + title: Експорт + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Просто натисніть або подібну піктограму на мапі.\nЦе додасть маркер на мапу, який ви зможете переміщувати\n шляхом перетягування. Додайте ваше повідомлення, а потім натисніть кнопку Зберегти, а інші картографи будуть розбиратися." + join_the_community: + explanation_html: Якщо ви помітили, проблеми з нашими картографічними даними, наприклад відсутня дорога або ваша адреса, найкращий спосіб продовження - це приєднання до спільноти OpenStreetMap і додавання або відновлення даних самостійно. + title: Приєднатися до спільноти + title: Як допомогти + other_concerns: + explanation_html: "Якщо у вас є занепокоєння про те, як наші дані використовуються або вміст, то зверніться до нашої\nсторінки авторських прав для правової інформації або зв'яжіться з відповідною\nробочою групою OSMF." + title: Інші проблеми + title: Повідомити про проблему / Виправити мапу geocoder: description: title: geonames: Місце знаходження з GeoNames - osm_namefinder: "%{types} з OpenStreetMap Namefinder" osm_nominatim: Місце знаходження з OpenStreetMap Nominatim types: cities: Міста places: Місця towns: Містечка - description_osm_namefinder: - prefix: "%{distance} %{direction} %{type}" direction: east: на схід north: на північ @@ -459,9 +400,9 @@ uk: south_west: на південний захід west: на захід distance: - one: близько 1 км - other: близько %{count} км - zero: менше ніж 1 км + one: менше ніж 1 км + other: майже %{count} км + zero: майже 1 км results: more_results: Більше результатів no_results: Нічого не знайдено @@ -469,16 +410,26 @@ uk: title: ca_postcode: Результати від Geocoder.CA geonames: Результати від GeoNames + geonames_reverse: Результати від GeoNames latlon: Результати від OpenStreetMap - osm_namefinder: Результати від OpenStreetMap Namefinder osm_nominatim: Результати від OpenStreetMap Nominatim + osm_nominatim_reverse: Результати від OpenStreetMap Nominatim uk_postcode: Результати від NPEMap / FreeThe Postcode us_postcode: Результати від Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} %{parentname})" - suffix_place: ", %{distance} %{direction} від %{placename}" search_osm_nominatim: + admin_levels: + level10: Межа передмістя + level2: Державний кордон + level4: Межа краю, штату, республіки + level5: Межа області + level6: Межа району, графства + level8: Межа міста + level9: Межа села prefix: + aerialway: + chair_lift: Крісельний підйомник + drag_lift: Бугельний підйомник + station: Канатна станція aeroway: aerodrome: Аеродром apron: Перон @@ -510,7 +461,7 @@ uk: car_wash: Автомийка casino: Казино charging_station: Станція для зарядки електромобілів - cinema: Кинотеатр + cinema: Кінотеатр clinic: Клініка club: Клуб college: Коледж @@ -572,6 +523,7 @@ uk: shower: Душ social_centre: Суспільний центр social_club: Клуб за інтересами + social_facility: Соціальна установа studio: Студія supermarket: Супермаркет swimming_pool: Басейн @@ -600,12 +552,15 @@ uk: "yes": Міст building: "yes": Будівля + emergency: + fire_hydrant: Пожежний гідрант + phone: Телефон для екстрених викликів highway: - bridleway: Дорога для їзди верхи + bridleway: Дорога для їзди кіньми bus_guideway: Рейковий автобус bus_stop: Автобусна зупинка byway: Боковий шлях - construction: Будівництво автомагітсралі + construction: Будівництво автомагістралі cycleway: Велосипедна доріжка emergency_access_point: Пункт швидкої допомоги footway: Пішохідна доріжка @@ -616,13 +571,14 @@ uk: motorway: Автомагістраль motorway_junction: В’їзд на автомагістраль motorway_link: З’єднання з автомагістраллю - path: алея + path: Стежка pedestrian: Пішохідна дорога platform: Платформа primary: Головна дорога primary_link: З’єднання з головною дорогою + proposed: Пропонована дорога raceway: Гоночна траса - residential: Жила вулиця + residential: Вулиця місцевого значення rest_area: Зона відпочинку road: Дорога secondary: Другорядна дорога @@ -630,11 +586,12 @@ uk: service: Службова дорога services: Придорожній сервіс speed_camera: Камера контролю швидкості - steps: Стежка + steps: Сходи stile: Турнікет - tertiary: Третьорядна дорога - tertiary_link: Третинна дорога - track: Неасфальтований шлях. + street_lamp: Вуличний ліхтар + tertiary: Третинна дорога + tertiary_link: Виїзд на третинну дорогу + track: Путівець trail: Стежка trunk: Шосе trunk_link: З’їзд з/на шосе @@ -647,6 +604,7 @@ uk: building: Будівля castle: За́мок church: Храм + citywalls: Міські стіни fort: Форт house: Дім icon: Ікона @@ -656,6 +614,7 @@ uk: monument: Пам’ятник museum: Музей ruins: Руїни + tomb: Гробниця tower: Башта wayside_cross: Придорожній хрест wayside_shrine: Придорожній храм @@ -670,7 +629,7 @@ uk: construction: Будівництво farm: Ферма farmland: Рілля - farmyard: Фермерське подвір'я + farmyard: Територія ферми forest: Ліс garages: Гаражі grass: Трава @@ -695,7 +654,7 @@ uk: village_green: Сільська галявина vineyard: Виноградник wetland: Болота - wood: Гай + wood: Дерева leisure: beach_resort: Пляжний курорт bird_hide: Засідка (пункт спостереження за птахами) @@ -718,16 +677,18 @@ uk: stadium: Стадіон swimming_pool: Басейн track: Бігова доріжка - water_park: Аквапарку + water_park: Аквапарк military: airfield: Військовий аеродром barracks: Казарма bunker: Бункер + mountain_pass: + "yes": Гірський перевал natural: bay: Затока beach: Пляж cape: Мис - cave_entrance: Входу в печеру + cave_entrance: Вхід до печери channel: Канал cliff: Скеля crater: Кратер @@ -761,9 +722,9 @@ uk: valley: Долина volcano: Вулкан water: Вода - wetland: Болото + wetland: Заболочені землі wetlands: Водно-болотні угіддя - wood: Гай + wood: Дерева office: accountant: Бухгалтер architect: Архітектор @@ -792,6 +753,7 @@ uk: locality: Населений пункт moor: Мур municipality: Муніципалітет + neighbourhood: Околиці postcode: Індекс region: Район sea: Море @@ -802,7 +764,7 @@ uk: unincorporated_area: Неприєднанні території village: Село railway: - abandoned: Кинуті колії + abandoned: Занедбані колії construction: Будівництво колії disused: Покинута колія disused_station: Покинута залізнична станція @@ -812,13 +774,15 @@ uk: junction: Переїзд level_crossing: Залізничний переїзд light_rail: Швидкісний трамвай - miniature: Мінізалізнця + miniature: Мінізалізниця monorail: Монорейка narrow_gauge: Вузькоколійка platform: Залізнична платформа preserved: Законсервовані колії + proposed: Пропоновані залізничні колії spur: Залізнична гілка station: Залізнична станція + stop: Залізнична зупинка subway: Станція метро subway_entrance: Вхід в метро switch: Стрілка @@ -826,7 +790,7 @@ uk: tram_stop: Трамвайна зупинка yard: Депо shop: - alcohol: Спритні напої + alcohol: Спиртні напої antiques: Антикваріат art: Художній салон bakery: Хліб @@ -834,6 +798,7 @@ uk: beverages: Напої bicycle: Веломагазин books: Книгарня + boutique: Бутік butcher: М’ясо car: Автомагазин car_parts: Автозапчастини @@ -847,13 +812,14 @@ uk: convenience: Мінімаркет copyshop: Послуги копіювання cosmetics: Магазин косметики + deli: Магазин делікатесів department_store: Універмаг discount: Уцінені товари doityourself: Зроби сам dry_cleaning: Хімчистка electronics: Магазин електроніки estate_agent: Агентство нерухомості - farm: Сільпо + farm: Фермерський магазин fashion: Модний одяг fish: Риба florist: Квіти @@ -880,20 +846,24 @@ uk: music: Музика newsagent: Газетний кіоск optician: Оптика - organic: Продовольчий магазин + organic: Органічні Продукти outdoor: Виносна торгівля pet: Зоомагазин + pharmacy: Аптека photo: Фотомагазин salon: Салон + second_hand: Комісійний магазин shoes: Взуття shopping_centre: Торговий центр sports: Спортивні товари stationery: Канцтовари supermarket: Супермаркет + tailor: Кравець toys: Іграшки travel_agency: Туристична агенція video: Відео wine: Вино + "yes": Крамниця tourism: alpine_hut: Гірський притулок artwork: Образотворче мистецтво @@ -916,6 +886,7 @@ uk: viewpoint: Оглядовий майданчик zoo: Зоопарк tunnel: + culvert: Кульверт "yes": Тунель waterway: artificial: Штучні водний шлях @@ -938,67 +909,118 @@ uk: wadi: Ваді water_point: Пункт водопостачання waterfall: Водоспад - weir: Ставок + weir: Гребля + help_page: + help: + description: Поставте запитання або знайдіть відповіді на сайті OSM питання-відповідь. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap має різні ресурси для отримання інформації про проект, щоб поставити питання та отримати відповідь, для спільного обговорення і створення документації з картографування. + title: Отримання довідки + welcome: + description: Розпочніть з цього короткого посібника, що охоплює основи OpenStreetMap. + title: Ласкаво просимо до OSM + url: /welcome + wiki: + description: Перегляньте вікі щоб отримати докладу OSM документацію. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: Закрити + edit_help: Перемістіть мапу і наблизьтесь до місця, яке ви бажаєте змінити, потім клацніть тут. + key: + title: Умовні знаки + tooltip: Умовні знаки + tooltip_disabled: Легенда мапи доступна лише для Стандартного шару map: base: - cycle_map: Мапа для велосипедистів + cycle_map: ВелоМапа + hot: Humanitarian‎ mapquest: MapQuest Open standard: Стандартний transport_map: Мапа Транспорту + copyright: © Учасники OpenStreetMap + donate_link_text: + layers: + data: Дані + header: Шари мапи + notes: Нотатки + overlays: Увімкніть наступні шари для пошуку і усунення помилок на мапі + title: Шари + locate: + popup: Ви знаходитесь в межах {distance} {unit} від цієї точки + title: Показати моє місцезнаходження + zoom: + in: Збільшити + out: Зменшити + notes: + new: + add: Додати нотатку + intro: Введена вами інформація буде доступна іншим користувачам, можливо, вона допоможе поліпшити мапу. Будь ласка, додайте в нотатку чіткий опис, встановіть маркер в точне місце на мапі. + show: + anonymous_warning: Ця нотатка містить коментарі від анонімних користувачів. Потрібна незалежна перевірка відомостей. + comment: Коментар + comment_and_resolve: Прокоментувати та Опрацювати + hide: Приховати + reactivate: Поновити + resolve: Опрацьовано + share: + cancel: Скасувати + center_marker: Центрувати мапу на маркері + custom_dimensions: Встановити власні розміри + download: Завантажити + embed: HTML + format: "Формат:" + image: Зображення + image_size: Зображення буде містити стандартний шар + include_marker: Додати маркер + link: Посилання або HTML + long_link: Посилання + paste_html: HTML-код для вбудування у сайт + scale: "Масштаб:" + short_link: Кор.посил. + short_url: Скорочене URL-посилання + title: Поділитись + view_larger_map: Переглянути більшу мапу site: + createnote_disabled_tooltip: Треба наблизитись для додання нотатки + createnote_tooltip: Додати нотатку на мапу edit_disabled_tooltip: Збільшить масштаб для редагування мапи edit_tooltip: Редагування мапи - edit_zoom_alert: Потрібно збільшити масштаб мапи для її редагування - history_disabled_tooltip: Збільшить масштаб для перегляду правок на цій ділянці - history_tooltip: Перегляд правок для цієї ділянки - history_zoom_alert: Потрібно збільшити масштаб мапи, щоб побачити історію правок + map_data_zoom_in_tooltip: Збільшить, щоб побачити дані мапи + map_notes_zoom_in_tooltip: Збільшить масштаб, щоб побачити більше нотаток layouts: + about: Про проект community: Спільнота community_blogs: Блоги спільноти community_blogs_title: Блоги членів спільноти OpenStreetMap - copyright: Авторські права & Ліцензія - documentation: Документація - documentation_title: Документація проекту - donate: Підтримайте OpenStreetMap %{link} у фонді оновлення обладнання. - donate_link_text: пожертвування + copyright: Авторські права + data: Дані + donate: Підтримайте OpenStreetMap %{link} у Фонді оновлення обладнання. edit: Правка edit_with: Правити у %{editor} export: Експорт - export_tooltip: Експортувати картографічні дані + export_data: Експортувати дані foundation: Фонд foundation_title: Фонд OpenStreetMap gps_traces: GPS-треки gps_traces_tooltip: Управління GPS треками help: Довідка - help_centre: Довідковий центр - help_title: Питання та відповіді history: Історія - home: додому - home_tooltip: Показати моє місце знаходження - inbox: вхідні (%{count}) - inbox_tooltip: - few: У вас %{count} непрочитаних повідомлення - one: У вас %{count} непрочитане повідомлення - other: У вас %{count} непрочитаних повідомлень - zero: У вас немає непрочитаних повідомлень - intro_1: OpenStreetMap — це мапа Світу, яку можна вільно редагувати. Вона зроблена такими ж людьми, як і ви. + home: Додому intro_2_create_account: Створіть обліковий запис - intro_2_download: завантажити - intro_2_html: Дані можна вільно %{download} та %{use} під %{license}. %{create_account}, щоб мати змогу покращити мапу. - intro_2_license: відкритою ліцензією - intro_2_use: використовувати - license: - title: Дані OpenStreetMap ліцензовано за Загальною Ліцензією Creative Commons Attribution-Share Alike 2.0 - log_in: увійти + intro_header: Ласкаво просимо до OpenStreetMap! + intro_text: OpenStreetMap — мапа світу, створена такими ж людьми, як і ви, для вільного використання під відкритою ліцензією. + learn_more: Дізнатись більше + log_in: Ввійти log_in_tooltip: Увійти під існуючим обліковим записом logo: alt_text: Логотип OpenStreetMap - logout: вийти - logout_tooltip: Вийти + logout: Вийти make_a_donation: text: Підтримайте проект title: Підтримайте OpenStreetMap грошима + more: Більше osm_offline: База даних OpenStreetMap в даний момент не доступна, так як проводиться необхідне технічне обслуговування. osm_read_only: База даних OpenStreetMap в даний момент доступна тільки для читання, тому що проводиться необхідне технічне обслуговування. partners_bytemark: Bytemark Hosting @@ -1006,25 +1028,47 @@ uk: partners_ic: Імперський коледж Лондона partners_partners: партнерами partners_ucl: UCL VR Centre - sign_up: реєстрація + sign_up: Реєстрація sign_up_tooltip: Створити обліковий запис для редагування - sotm2011: Відвідайте конференцію OpenStreetMap 2011, «The State of the Map», яка відбудеться у Денвері 9-11 вересня! + start_mapping: Почати мапити tag_line: Вільна Вікі-мапа Світу user_diaries: Щоденники user_diaries_tooltip: Подивитись щоденники - view: Мапа - view_tooltip: Переглянути мапу - welcome_user: Вітаємо, %{user_link} - welcome_user_link_tooltip: Ваша сторінка користувача - wiki: Вікі - wiki_title: Вікі-сайт проекту - wiki_url: http://wiki.openstreetmap.org/wiki/Uk:Main_Page license_page: foreign: english_link: оригіналом англійською text: У разі суперечностей між цим перекладом та %{english_original_link}, оригінал англійською має перевагу. title: Про цей переклад - legal_babble: "

    Авторські права та Ліцензування

    \n

    \n Дані OpenStreetMap є відкрити даними, що ліцензуються на\n умовах Ліцензії Creative Commons Attribution-ShareAlike 2.0 (CC BY-SA).\n

    \n

    \n Ви можете вільно копіювати, поширювати, передавати й адаптувати наші\n мапи й дані доти, доки ви посилаєтесь на OpenStreetMap та його\n спільноту. Якщо ви переробляєте наші мапи або дані чи будуєте на їх основі свої, \n ви повинні розповсюджувати результати під такою ж Ліцензією.\n Повний чинний текст Ліцензії пояснює ваші права та обов’язки.\n

    \n\n

    Як вказувати посилання на OpenStreetMap

    \n

    \n Якщо ви використовуєте зображення мапи OpenStreetMap, ми вимагаємо, щоб ви зазначали, принаймні, “© OpenStreetMap\n contributors, CC BY-SA”. Якщо ви використовуєте тільки картографічні дані, ми вимагаємо наявності “Map data © OpenStreetMap contributors, CC BY-SA”.\n

    \n

    \n Будь-де, де це можливо, повинне бути гіпертекстове посилання на OpenStreetMap http://www.openstreetmap.org/\n та на CC BY-SA http://creativecommons.org/licenses/by-sa/2.0/. Якщо ви користуєтесь\n носіями, де використання гіпертекстових посилань неможливе (наприклад:\n друковані твори), ми пропонуємо вам спрямувати ваших читачів\n безпосередньо до www.openstreetmap.org (можливо, шляхом розширення\n ‘OpenStreetMap’ до повної адреси) та до\n www.creativecommons.org.\n

    \n\n

    Дізнатися більше

    \n

    \n Дізнайтеся більше про використання наших даних у відповідях з правових питань.\n

    \n

    \n Члени спільноти OSM повинні завжди пам’ятати про те, що\n забороняється додавати дані з будь-яких захищених авторським правом\n джерел (наприклад, з Google Maps чи з друкованих мап) без отримання\n попереднього дозволу правовласників.\n

    \n

    \n Хоча OpenStreetMap містить вільні дані, ми не в змозі надавати\n безкоштовний API до наших мап стороннім розробникам.\n\n Дивіться Правила використання API,\n Правила використання частин мапи\n та Правила використання сервісу Nominatim.\n

    \n\n

    З нами співпрацюють

    \n

    \n Наша Ліцензія CC BY-SA вимагає від Вас “ певним чином зазначати Автора\n оригіналу відповідно до носія даних чи умов\n використання”. Окремі члени спільноти OSM не вимагають\n зазначати більше, ніж “OpenStreetMap contributors”, але\n якщо дані для OpenStreetMap було отримано від національних картографічних\n агенцій чи з інших великих джерел, можливо, має сенс вказати\n безпосередньо на них, зазначивши їх внесок або додавши посилання на них\n на цій сторінці.\n

    \n\n\n\n
      \n
    • Австралія: дані передмість від Австралійського Бюро Статистики.
    • \n
    • Австрія: дані від\n Stadt Wien (на умовах ліцензії\n CC BY), Land Vorarlberg та Земля Тіроль (на умовах CC-BY AT з виправленнями).
    • \n
    • Канада: дані від GeoBase®, GeoGratis (© Департамент природних ресурсів Канади), CanVec (© Департамент природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство Канади).
    • \n
    • Нова Зеландія: дані отримані з інформації про земельні ресурси Нової Зеландії. Crown Copyright reserved.
    • \n
    • Польща: містить дані з мап UMP-pcPL. Copyright\n учасники UMP-pcPL.\n \n Більше про використання OSM даних UMP
    • \n
    • Південна Африка: Містить дані з \n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved.
    • \n
    • Сполучене Королівство Великобританії: дані Ordnance\n Survey © Crown copyright and database right\n 2010.
    • \n
    • Франція: Дані отримані від Direction Générale des Impôts (Генеральне управління з оподаткування).
    • \n
    • Нідерланди: Дані від © AND, 2007 \n (www.and.com)
    • \n
    \n\n

    \n Включення даних до OpenStreetMap не означає, що постачальник\n цих даних якимось чином підтримує OpenStreetMap, надає\n які-небудь гарантії чи бере на себе якусь відповідальність.\n

    " + legal_babble: + attribution_example: + alt: Приклад того, як треба посилатись на OpenStreetMap на веб-сторінці + title: Приклад зазначення авторства + contributors_at_html: "Австрія: дані від\n Stadt Wien (на умовах ліцензії\n CC BY), Land Vorarlberg та Земля Тіроль (на умовах CC-BY AT з виправленнями)." + contributors_ca_html: "Канада: дані від GeoBase®, GeoGratis (© Департамент природних ресурсів Канади), CanVec (© Департамент природних ресурсів Канади), та StatCan (Відділ Географії, Статистичне відомство Канади)." + contributors_fi_html: "Фінляндія: містить дані з топографічної бази даних Національної земельної служби Фінляндії та інші набори даних на умовах ліцензії\nNLSFI." + contributors_footer_1_html: Щоб отримати більш докладну інформацію про ці та інші джерела, що були використані для покращення мапи OpenStreetMap, будь ласка, перегляньте сторінку Учасники у OpenStreetMap Вікі. + contributors_footer_2_html: " Включення даних до OpenStreetMap не означає, що постачальник\n цих даних якимось чином підтримує OpenStreetMap, надає\n які-небудь гарантії чи бере на себе якусь відповідальність." + contributors_fr_html: "Франція: Дані отримані від Direction Générale des Impôts (Генеральне управління з оподаткування)." + contributors_gb_html: "Сполучене Королівство Великобританії: дані Ordnance Survey © Crown copyright and database right 2012." + contributors_intro_html: "Нашими учасниками є тисячі людей. Ми також включаємо дані від національних картографічних агенцій, які розповсюджуються на умовах відкритих ліцензій, серед них:" + contributors_nl_html: "Нідерланди: Дані від © AND, 2007 \n (www.and.com)" + contributors_nz_html: "Нова Зеландія: дані отримані з інформації про земельні ресурси Нової Зеландії. Crown Copyright reserved." + contributors_title_html: З нами співпрацюють + contributors_za_html: "Південна Африка: Містить дані з \n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved." + credit_1_html: Ми вимагаємо, щоб ви зазначали “© OpenStreetMap contributors”. + credit_2_html: Ви повинні також чітко розуміти, що дані доступні на умовах ліцензії Open Database License, а у разі, коли ви використовуєте графічні мапи з нашого сервера, на них розповсюджуються умови CC-BY-SA. Ви можете зробити це надавши посилання на цю сторінку з роз’ясненням ліцензійних вимог. Або ж, для виконання наших вимог під час розповсюдження даних OSM, ви можете безпосередньо вказувати назву ліцензії(й) та посилання на її(їх) текст. Якщо ви користуєтесь носіями, де використання гіпертекстових посилань неможливе (наприклад друковані матеріали), ми пропонуємо посилатися безпосередньо на www.openstreetmap.org (або розширено "www.openstreetmap.org, OpenStreetMap"), opendatacommons.org, а якщо треба, і на creativecommons.org. + credit_3_html: "Для електронних мап, згадка про джерело даних повинна знаходитись у кутку мапи.\nНаприклад:" + credit_title_html: Як вказати посилання на OpenStreetMap + infringement_1_html: Члени спільноти OSM повинні завжди пам’ятати про те, що забороняється додавати дані з будь-яких захищених авторським правом джерел (наприклад, з Google Maps чи з друкованих мап) без отримання попереднього дозволу правовласників. + infringement_2_html: Якщо ви вважаєте, що захищений авторським правом матеріал був недоречно доданий до бази даних OpenStreetMap або до цього сайту, ознайомтесь із нашим порядком з вилучення таких даних або скористуйтесь безпосередньо нашою сторінкою для онлайн звернень. + infringement_title_html: Порушення авторських прав + intro_1_html: "Дані OpenStreetMap є відкрити даними, що ліцензуються на\nумовах Ліцензії Open Data Commons Open Database License (ODbL)" + intro_2_html: Ви можете вільно копіювати, поширювати, передавати й змінювати наші дані, посилаючись при цьому на OpenStreetMap та його спільноту. Якщо ви змінюєте наші дані чи створюєте на їх основі свої, ви повинні розповсюджувати результати під такою ж Ліцензією. Повний чинний текст Ліцензії пояснює ваші права та обов’язки. + intro_3_html: "Мапи в графічному вигляді, а також документація розповсюджуються на умовах Ліцензії Creative \nCommons Attribution-ShareAlike 2.0 (CC-BY-SA)." + more_1_html: Дізнайтеся більше про використання наших даних та про те, як вказувати нас як джерело походження даних у відповідях з правових питань. + more_2_html: Хоча дані OpenStreetMap є відкритими даними, ми не в змозі надавати безкоштовний API для сторонніх розробників. Ознайомтесь із нашими Правилами використання API, Правилами використання графічних мап та Правилами використання сервісу Nominatim. + more_title_html: Дізнатися більше + title_html: Авторські права та Ліцензування native: mapping_link: почати створення мапи native_link: української версії @@ -1044,7 +1088,7 @@ uk: no_messages_yet: У вас ще немає повідомлень. Чому б не поспілкуватись з кимось із %{people_mapping_nearby_link}? old_messages: one: "%{count} старе повідомлення" - other: "%{count} стари повідомлень" + other: "%{count} старих повідомлень" outbox: вихідні people_mapping_nearby: користувачів поблизу вас subject: Тема @@ -1077,19 +1121,16 @@ uk: one: У вас %{count} надіслане повідомлення other: У вас %{count} надісланих повідомлень my_inbox: Мої %{inbox_link} - no_sent_messages: У вас немає відправлених повідомлень. Чому б не поспілкуватись з кимось із %{people_mapping_nearby_link}? + no_sent_messages: У вас немає надісланих повідомлень. Чому б не поспілкуватись з кимось із %{people_mapping_nearby_link}? outbox: вихідні people_mapping_nearby: користувачів поблизу вас subject: Тема title: Вихідні to: Кому read: - back_to_inbox: Назад до вхідних - back_to_outbox: Назад до вихідних + back: Назад date: Дата from: Від - reading_your_messages: Перегляд повідомлення - reading_your_sent_messages: Перегляд відправленого повідомлення reply_button: Відповісти subject: Тема title: Перегляд повідомлення @@ -1097,9 +1138,40 @@ uk: unread_button: Позначити як непрочитане wrong_user: Ви увійшли як `%{user}', але повідомлення, яке ви хочете прочитати, не було відправлено цим користувачем, чи призначено для цього користувача. Будь ласка, увійдіть під правильним ім'ям користувача, щоб прочитати його. reply: - wrong_user: Ви увійшли як `%{user}', але повідомлення, на яке ви хочете відповісти, було відправлено не цьому користувачу. Будь ласка, увійдіть за правильним ім'ям користувача щоб відповісти. + wrong_user: Ви увійшли як `%{user}', але повідомлення, на яке ви хочете відповісти, було відправлено не цьому користувачу. Будь ласка, увійдіть з правильним ім’ям користувача щоб відповісти. sent_message_summary: delete_button: Вилучити + note: + description: + closed_at_by_html: Розв’язано %{when} тому користувачем %{user} + closed_at_html: Опрацьовано %{when} тому + commented_at_by_html: Оновлено %{when} тому користувачем %{user} + commented_at_html: Оновлено %{when} тому + opened_at_by_html: Створено %{when} тому користувачем %{user} + opened_at_html: Створено %{when} тому + reopened_at_by_html: Відновлено %{when} тому користувачем %{user} + reopened_at_html: Відновлено %{when} тому + entry: + comment: Коментар + full: Повний текст + mine: + ago_html: "%{when} тому" + created_at: Створено + creator: Автор + description: Опис + heading: Нотатки користувача %{user} + id: Номер + last_changed: Остання зміна + subheading: Нотатки, створені чи прокоментовані користувачем %{user} + title: Нотатки створені чи прокоментовані користувачем %{user} + rss: + closed: закрита нотатка (біля %{place}) + commented: новий коментар (біля %{place}) + description_area: Перелік нотаток, створених, прокоментованих чи закритих біля вас [(%{min_lat}|%{min_lon}) — (%{max_lat}|%{max_lon})] + description_item: Rss-канал нотаток %{id} + opened: нова нотатка (біля %{place}) + reopened: поновлена нотатка (біля %{place}) + title: Нотатки OpenStreetMap notifier: diary_comment_notification: footer: Ви можете також прочитати коментар — %{readurl}, залишити свій — %{commenturl} або відповісти — %{replyurl} @@ -1115,8 +1187,7 @@ uk: email_confirm_plain: click_the_link: Якщо це ви, будь ласка, клацніть на посилання нижче, щоб підтвердити зміни. greeting: Привіт, - hopefully_you_1: Хтось (сподіваємось, ви) хоче змінити адресу електронної пошти з - hopefully_you_2: "%{server_url} на адресу: %{new_address}." + hopefully_you: "Хтось (сподіваємось, що ви) хоче змінити свою адресу електронної пошти в %{server_url} на адресу: %{new_address}." friend_notification: befriend_them: Ви також можете додати їх у якості друзів %{befriendurl}. had_added_you: "%{user} додав Вас як друга у OpenStreetMap." @@ -1145,46 +1216,36 @@ uk: lost_password_plain: click_the_link: Якщо це ви, будь ласка, клацніть на посилання нижче, щоб змінити свій пароль. greeting: Привіт, - hopefully_you_1: Хтось (можливо, ви) запросив зміну паролю для цієї - hopefully_you_2: адреси ел.пошти зареєстрованої на openstreetmap.org + hopefully_you: Хтось (сподіваємось, що ви) замовив зміну пароля для цієї адреси електронної пошти, зареєстрованої на openstreetmap.org. message_notification: - footer1: Ви також можете прочитати повідомлення %{readurl} - footer2: і ви можете відповісти на %{replyurl} + footer_html: Ви також можете прочитати повідомлення в %{readurl} і ви можете відповісти на %{replyurl} header: "%{from_user} надіслав вам повідомлення через OpenStreetMap з темою %{subject}:" hi: Привіт, %{to_user}, + note_comment_notification: + anonymous: Анонімний користувач + closed: + commented_note: "%{commenter} розв’язав нотатку, прокоментовану вами, що знаходиться біля %{place}." + subject_other: "[OpenStreetMap] %{commenter} розв’язав нотатку до якови ви виявили зацікавленість" + subject_own: "[OpenStreetMap] %{commenter} опрацював одну з ваших нотаток" + your_note: "%{commenter} опрацював одну з ваших нотаток на мапі біля %{place}." + commented: + commented_note: "%{commenter} залишив коментар до однієї з прокоментованих вами нотаток, що знаходиться біля %{place}." + subject_other: "[OpenStreetMap] %{commenter} прокоментував цікаву вам нотатку" + subject_own: "[OpenStreetMap] %{commenter} прокоментував одну з ваших нотаток" + your_note: "%{commenter} залишив коментар до однієї з ваших нотаток на мапі біля %{place}." + details: Докладніше про нотатку %{url}. + greeting: Привіт, + reopened: + commented_note: "%{commenter} поновив нотатку, прокоментовану вами, що знаходиться біля %{place}." + subject_other: "[OpenStreetMap] %{commenter} поновив нотатку до якови ви виявили зацікавленість" + subject_own: "[OpenStreetMap] %{commenter} поновив одну з ваших нотаток" + your_note: "%{commenter} поновив одну з ваших нотаток на мапі біля %{place}." signup_confirm: - subject: "[OpenStreetMap] Підтвердіть вашу адресу електронної пошти" - signup_confirm_html: - ask_questions: Ви можете задати питання про OpenStreetMap на нашому сайті питань і відповідей. - click_the_link: Якщо це Ви, ласкаво просимо! Будь ласка, клацніть на посилання нижче, щоб підтвердити цей обліковий запис і ознайомтеся з додатковою інформацією про OpenStreetMap - current_user: "Перелік користувачів, за їх місцем знаходження, можна отримати тут: Category:Users_by_geographical_region." - get_reading: Прочитайте про OpenStreetMap у Вікі, дізнайтесь про останні новини у Блозі OpenStreetMap або Twitter, чи перегляньте OpenGeoData blog — блог засновника OpenStreetMap Стіва Коуста (Steve Coast) у якому змальовано історію розвитку проекту та є підкасти, які також можливо послухати! - greeting: Привіт! - hopefully_you: Хтось (сподіваємось, ви) бажає створити обліковий запис на - introductory_video: Ви можете переглянути %{introductory_video_link}. - more_videos: Перегляньте %{more_videos_link}. - more_videos_here: більше відео тут - user_wiki_page: "Радимо створити власну вікі-сторінку, включивши до неї теґи категорій, що пояснюють ваше місце знаходження, наприклад: [[Category:Users in Дніпропетровськ]]." - video_to_openstreetmap: відео-вступ до OpenStreetMap - wiki_signup: Ви маєте змогу зареєструватись у Вікі проекту OpenStreetMap. - signup_confirm_plain: - ask_questions: "Ви можете задати питання про OpenStreetMap на нашому сайті питань та і відповідей:" - blog_and_twitter: "Ознайомитися з останніми новинами через блог OpenStreetMap або Twitter:" - click_the_link_1: Якщо це ві, ласкаво просимо! Будь ласка, клацніть на посилання нижче, щоб підтвердити - click_the_link_2: реєстрацію та прочитати більше про OpenStreetMap. - current_user_1: Список користувачів, заснований на їх місці знаходження, - current_user_2: "доступний тут:" + confirm: "Перш ніж ми щось зробимо, ми повинні впевнитись, що запит надійшов від Вас; тож якщо це були Ви, будь ласка, натисніть на посилання нижче, щоб підтвердити Ваш обліковий запис:" + created: Хтось (сподіваємось Ви) щойно створив обліковий запис на %{site_url}. greeting: Привіт! - hopefully_you: Хтось (сподіваємось, що ви) бажає створити обліковий запис на - introductory_video: "Ви можете подивитися відео-вступ про OpenStreetMap тут:" - more_videos: "Ще більше відео тут:" - opengeodata: "OpenGeoData.org — це блог засновника OpenStreetMap — Стіва Коуста (Steve Coast), тут також можна знайти підкасти:" - the_wiki: "Почитати про OpenStreetMap у Вікі:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/Uk:Beginners%27_Guide - user_wiki_1: Ми рекомендуємо вам створити сторінку користувача Віки, яка містить - user_wiki_2: теґи категорій, які пояснюють ваше місце знаходження, наприклад, [[Category:Users_in_Дніпропетровськ]]. - wiki_signup: "Ви також можете зареєструватися в вікі OpenStreetMap тут:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Uk:Main_Page + subject: "[OpenStreetMap] Ласкаво просимо до OpenStreetMap" + welcome: Після того, як ви підтвердите свій обліковий запис, ми надамо вам додаткову інформацію, щоб ви розпочали роботу. oauth: oauthorize: allow_read_gpx: читати ваші приватні GPS-треки. @@ -1193,8 +1254,18 @@ uk: allow_write_api: змінювати мапу allow_write_diary: створювати записи у щоденнику, коментарі та заводити друзів. allow_write_gpx: передавати GPS-треки на сервер. + allow_write_notes: змінювати нотатки. allow_write_prefs: змінювати ваші налаштування користувача. request_access: Застосунок %{app_name} намагається отримати доступ до вашого облікового запису, %{user}. Будь ласка, перевірте чи бажаєте ви, щоб застосунок мав наступні можливості. Ви можете обрати будь-яку кількість. + title: Авторизувати доступ до облікового запису + oauthorize_failure: + denied: Ви заборонили програмі %{app_name} доступ до вашого облікового запису. + invalid: Неприпустимий маркер авторизації. + title: Не вдалося виконати запит авторизації + oauthorize_success: + allowed: Ви надали програмі %{app_name} доступ до вашого облікового запису. + title: Дозволено запит на авторизацію + verification: Код перевірки - %{code}. revoke: flash: Ви відкликали маркер для застосунка %{application} oauth_clients: @@ -1211,6 +1282,7 @@ uk: allow_write_api: правити мапу. allow_write_diary: створити записи щоденника, коментарі та завести нових друзів. allow_write_gpx: передавати GPS-треки на сервер. + allow_write_notes: змінювати нотатки. allow_write_prefs: змінювати налаштування користувача. callback_url: URL зворотного виклику name: Ім’я @@ -1241,6 +1313,7 @@ uk: allow_write_api: правити мапу. allow_write_diary: створити записи щоденника, коментарі та завести нових друзів. allow_write_gpx: передавати GPS-треки на сервер. + allow_write_notes: змінювати нотатки. allow_write_prefs: змінювати налаштування користувача. authorize_url: "URL автентифікації:" confirm: Ви впевнені? @@ -1249,7 +1322,7 @@ uk: key: "Позначки абонента:" requests: "Запит наступних дозволів з боку користувача:" secret: "Секретна фраза абонента:" - support_notice: Ми підтримуємо HMAC-SHA1 (рекомендується) і звичайний текст в режимі SSL. + support_notice: Ми підтримуємо підписи HMAC-SHA1 (рекомендується) і RSA-SHA1. title: Подробиці OAuth для %{app_name} url: "URL маркеру запита:" update: @@ -1289,6 +1362,7 @@ uk: edit: anon_edits_link_text: З’ясувати в чому справа. flash_player_required: Для використання редактора Potlatch потрібний Flash-плеєр. Ви можете завантажити Flash-плеєр з Adobe.com. Існують й інші можливості для правки в OpenStreetMap. + id_not_configured: iD не був налаштований no_iframe_support: Ваш оглядач не підтримує фрейми HTML, які необхідні для цієї функції. not_public: Ви не зробили свої правки загальнодоступними. not_public_description: "Ви не можете більше анонімно редагувати мапу. Ви можете зробити ваші редагування загальнодоступними тут: %{user_page}." @@ -1297,18 +1371,15 @@ uk: potlatch_unsaved_changes: Є незбережені зміни. (Для збереження в Potlatch зніміть виділення з колії або точки, якщо редагуєте «вживу», або натисніть кнопку «зберегти», якщо ви в режимі відкладеного збереження.) user_page_link: сторінка користувача index: + createnote: Додати нотатку js_1: Ви користуєтесь оглядачем, в якому не підтримується або відключений JavaScript. js_2: OpenStreetMap використовує JavaScript для мапи. license: - license_name: Creative Commons Attribution-Share Alike 2.0 - notice: Ліцензовано на умовах %{license_name} проектом %{project_name} та його користувачами. - project_name: OpenStreetMap + copyright: Авторські права за OpenStreetMap та його учасниками на умовах відкритої ліцензії permalink: Постійне посилання remote_failed: Редагування не вдалося — переконайтеся, що JOSM або Merkaartor завантажений та втулок дистанційного керування увімкнений. - shortlink: Коротке посилання + shortlink: Кор.посил. key: - map_key: Умовні знаки - map_key_tooltip: Легенда для карти table: entry: admin: Адміністративна межа @@ -1317,7 +1388,7 @@ uk: - Перон аеропорту - термінал bridge: Міст (жирна лінія) - bridleway: Дорога для їзди верхи + bridleway: Дорога для їзди кіньми brownfield: Покинута зона building: Значна споруда byway: Стежка @@ -1329,7 +1400,7 @@ uk: commercial: Бізнесова зона common: - Суспільні землі - - луг + - левада construction: Будівництво дороги cycleway: Вело-доріжка destination: Цільовий доступ @@ -1374,7 +1445,7 @@ uk: tunnel: Тунель (пунктиром) unclassified: Дорога без класифікації unsurfaced: Дорога без покриття - wood: Гай + wood: Дерева markdown_help: alt: Alt текст first: Перший елемент @@ -1394,7 +1465,6 @@ uk: preview: Попередній перегляд search: search: Пошук - search_help: "наприклад: 'Кобеляки', 'Regent Street, Cambridge', 'CB2 5AQ', чи 'post offices near Lünen' ще приклади…" submit_text: ↵ where_am_i: Що на мапі? where_am_i_title: Опишіть ваше місце знаходження, скориставшись інструментом пошуку @@ -1410,6 +1480,11 @@ uk: upload_trace: Надіслати GPS-трек на сервер delete: scheduled_for_deletion: Заплановано для вилучення + description: + description_with_count: + one: Файл GPX з %{count} точкою від %{user} + other: Файл GPX з %{count} точками від %{user} + description_without_count: GPX файл від %{user} edit: description: "Опис:" download: завантажити @@ -1418,7 +1493,7 @@ uk: heading: Правка треку %{name} map: мапа owner: "Власник:" - points: "Точок:" + points: "Кількість точок:" save_button: Зберегти зміни start_coord: "Координати початку:" tags: "Теґи:" @@ -1427,7 +1502,11 @@ uk: uploaded_at: "Завантажено на сервер:" visibility: "Видимість:" visibility_help: ще це означає? + georss: + title: GPS-Треки OpenStreetMap list: + description: Огляд останніх завантажених треків GPS + empty_html: Досі нічого не має. Завантажте нові треки або дізнайтесь більше про створення GPS-треків на сторінці вікі. public_traces: Загальнодоступні GPS-треки public_traces_from: Загальнодоступні GPS треки користувача %{user} tagged_with: " позначені %{tags}" @@ -1468,13 +1547,12 @@ uk: trace_header: see_all_traces: Показати всі треки see_your_traces: Показати всі ваші треки - traces_waiting: "%{count} з ваших треків очікують завантаження на сервер. Будь ласка, дочекайтесь завершення їх завантаження перед завантаженням на сервер інших треків, що дозволить іншим користувачам також надіслати свої треки." upload_trace: Надіслати GPS-трек на сервер trace_optionals: tags: "Теґи:" trace_paging_nav: - next: Наступна → - previous: ← Попередня + newer: Новіші треки + older: Старіші треки showing_page: Сторінка %{page} view: delete_track: Вилучити цей трек @@ -1488,7 +1566,7 @@ uk: none: Нічого owner: "Власник:" pending: ОЧІКУЄ - points: "Точок:" + points: "Кількість точок:" start_coordinates: "Координати початку:" tags: "Теґи:" title: Перегляд треку %{name} @@ -1515,6 +1593,9 @@ uk: email never displayed publicly: "\n(ніколи не показується загальнодоступно)" flash update success: Інформацію про користувача успішно оновлено. flash update success confirm needed: Інформацію про користувача успішно оновлено. Перевірте свою електронну пошту, щоб підтвердити вашу нову адресу. + gravatar: + gravatar: Використовувати Gravatar + link text: Що це? home location: "Основне місце розташування:" image: "Зображення:" image size hint: (найкраще підходять квадратні зображення, принаймні 100х100) @@ -1550,13 +1631,13 @@ uk: update home location on click: Оновлювати моє місце розташування, коли я клацаю на мапу? confirm: already active: Цей обліковий запис вже підтверджений. - before you start: Ми знаємо, Ви, ймовірно, хочете якнайшвидше почати картографування, але, перш ніж ви почнете, не хотіли б Ви заповнити деякі додаткові відомості про себе у формі нижче. button: Підтвердити - heading: Підтвердити обліковий запис користувача + heading: Перевірте вашу електронну пошту! + introduction_1: Ми надіслали вам підтвердження електронною поштою. + introduction_2: Підтвердіть ваш обліковий запис, натиснувши на посилання в листі, і ви зможете почати картографувати. press confirm button: Натисніть на кнопку підтвердження нижче, щоб активувати ваш профіль. - reconfirm: Якщо пройшло достатньо часу з моменту Вашої реєстрації, Вам, можливо, необхідно відправити собі нове підтвердження по електронній пошті . - success: Ваш обліковий запис підтверджено, дякуємо за реєстрацію! - unknown token: Цей маркер, здається, не існує. + reconfirm_html: Якщо ви бажаєте, аби ми повторно надіслали ще одне підтвердження електронною поштою, то натисніть тут. + unknown token: Термін дії коду підтвердження вже минув або він не існує. confirm_email: button: Підтвердити failure: Електронна адреса вже була підтверджена цим посиланням. @@ -1565,7 +1646,7 @@ uk: success: Адресу вашої електронної пошти підтверджено, дякуємо за реєстрацію! confirm_resend: failure: Користувача %{name} не знайдено. - success: Користувача успішно зареєстровано. Перевірте вашу електрону пошту (%{email}) на наявність листа з підтвердженням, натисніть на посилання в ньому та можете негайно починати редагувати мапу :-).

    Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти.

    Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити. + success: Користувача успішно зареєстровано. Перевірте вашу електрону пошту (%{email}) на наявність листа з підтвердженням, натисніть на посилання в ньому та можете негайно починати створювати мапу.

    Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти.

    Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити. filter: not_an_administrator: Тільки адміністратор може виконати цю дію. go_public: @@ -1576,9 +1657,8 @@ uk: heading: Користувачі hide: Сховати вибраних користувачів showing: - few: Показано %{page} сторінки (%{first_item} з %{items}) - one: Показано %{page} сторінку (%{first_item} з %{items}) - other: Показано %{page} сторінок (%{first_item}-%{last_item} з %{items}) + one: Сторінка %{page} (%{first_item} з %{items}) + other: Сторінка %{page} сторінок (%{first_item}-%{last_item} з %{items}) summary: "%{name} зареєстрований з %{ip_address}, %{date}" summary_no_ip: "%{name} зареєстврований %{date}" title: Користувачі @@ -1588,13 +1668,11 @@ uk: auth failure: Вибачте, вхід з цими ім'ям або паролем неможливий. create account minute: Створити обліковий запис. Це займе всього хвилину. email or username: "Ел. пошта або ім'я користувача:" - heading: Представтесь + heading: Ласкаво просимо login_button: Увійти lost password link: Забули пароль? new to osm: Вперше на OpenStreetMap? no account: Не маєте облікового запису? - notice: Дізнайтеся більше про майбутні зміни ліцензії OpenStreetMap ( переклади ) ( обговорення ) - notice_terms: OpenStreetMap переходить на нову ліцензію з 1 квітня 2012 року. Вона така ж відкрита як діюча, але юридично набагато краще підходить для нашої картографічної бази даних. Ми хотіли б зберегти ваш внесок у OpenStreetMap, але це буде можливо тільки якщо ви згодні поширювати ваші правки на умовах нової ліцензії. В іншому разі, нам доведеться видалити їх з бази даних.

    Будь ласка, ввійдіть в систему і потратьте декілька секунд на ознайомлення і прийняття нових умов. Спасибі! openid: "%{logo} OpenID:" openid invalid: На жаль, схоже ваш OpenID спотворений openid missing provider: На жаль, не вдається зв’язатись з вашим постачальником OpenID @@ -1620,8 +1698,8 @@ uk: title: Увійти з Yahoo password: "Пароль:" register now: Зареєструйтеся зараз - remember: "Запам'ятати мене:" - title: Представтесь + remember: Запам’ятати мене + title: Ласкаво просимо to make changes: Щоб вносити зміни до даних OpenStreetMap, ви повинні мати обліковий запис. with openid: "Крім того, для входу ви можете скористатись вашим OpenID:" with username: "Вже є обліковий запис OpenStreetMap? Будь ласка, введіть ваше ім'я користувача та пароль:" @@ -1639,20 +1717,22 @@ uk: title: Відновлення пароля make_friend: already_a_friend: Ви вже товаришуєте з %{name}. + button: Додати як друга failed: На жаль, %{name} не вдалось додати до списку друзів. - success: Тепер %{name} є вашим другом. + heading: Додати %{user} як друга? + success: Тепер %{name} є вашим другом! new: + about: + header: Вільний і доступний для редагування + html: "

    На відміну від інших мап, мапи OpenStreetMap повністю створюються такими ж людьми як ви,\nвони доступні всім для виправлення, оновлення, завантаження і використання.

    \n

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

    " confirm email address: "Підтвердити адресу ел. пошти:" confirm password: "Повторіть пароль:" contact_webmaster: Будь-ласка, зверніться до вебмастера з проханням створити подібний обліковий запис. Ми спробуємо це зробити і відповісти настільки швидко, наскільки це можливо. - continue: Продовжити + continue: Зареєструватись display name: "Показувати ім’я:" display name description: Ваше загальнодоступне ім’я. Ви можете змінити його потім у ваших налаштуваннях. email address: "Адреса ел. пошти:" - fill_form: Заповніть форму, і ми надішлемо вам на електронну пошту листа з інструкцією по активацію вашого облікового запису. - flash create success message: Користувача успішно зареєстровано. Перевірте вашу електрону пошту (%{email}) на наявність листа з підтвердженням, натисніть на посилання в ньому та можете негайно починати редагувати мапу :-).

    Зауважте, що ви не зможете увійти, доки ви не підтвердите адресу вашої електронної пошти.

    Якщо ви користуєтесь системою анти-спаму, що надсилає запити на підтвердження, внесіть до «білого» списку адресу webmaster@openstreetmap.org, так як ми не в змозі відповідати на такі запити. - heading: Створення облікового запису користувача - license_agreement: Створюючи обліковий запис ви погоджуєтесь з тим, що всі дані, які надсилаються до Openstreetmap ліцензуються на умовах ліцензії Creative Commons (by-sa). + license_agreement: Створюючи обліковий запис, вам треба погодитись з Умовами Співпраці. no_auto_account_create: На жаль, ми в даний час не в змозі створити для вас обліковий запис автоматично. not displayed publicly: Не показується загальнодоступно (див. політику конфіденційності) openid: "%{logo} OpenID:" @@ -1669,16 +1749,18 @@ uk: title: Немає такого користувача popup: friend: Друг - nearby mapper: Найближчий користувач + nearby mapper: Користувач поруч з вами your location: Ваше місце розташування remove_friend: + button: Вилучити із списку друзів + heading: Вилучити %{user} з друзів? not_a_friend: "%{name} не є вашим другом." success: "%{name} вилучений з вашого списку друзів." reset_password: confirm password: "Підтвердження пароля:" flash changed: Ваш пароль було змінено. flash token bad: Неможливо знайти такий код підтвердження, перевірте посилання. - heading: Перевстановлення пароль для %{user} + heading: Перевстановлення паролю для %{user} password: "Пароль:" reset: Перевстановити пароль title: Перевстановлення пароля @@ -1706,12 +1788,12 @@ uk: you need to accept or decline: Будь ласка, прочитайте, а потім або прийміть або відхиліть нові Умови Участі. view: activate_user: активувати цього користувача - add as friend: додати до списку друзів + add as friend: Додати до списку друзів ago: (%{time_in_words_ago} тому) block_history: отримані блокування - blocks by me: заблоковано мною - blocks on me: мої блокування - comments: коментарі + blocks by me: Заблоковано мною + blocks on me: Мої блокування + comments: Коментарі confirm: Підтвердити confirm_user: підтвердити користувача create_block: блокувати користувача @@ -1723,31 +1805,35 @@ uk: deactivate_user: де-активувати цього користувача delete_user: вилучити цього користувача description: Опис - diary: щоденник - edits: правки + diary: Щоденник + edits: Правки email address: "Адреса Е-пошти:" - friends_changesets: Переглянути усі набори змін друзів - friends_diaries: Переглянути всі записи в щоденнику друзів + friends_changesets: набори змін друзів + friends_diaries: записи в щоденниках друзів hide_user: приховати цього користувача - if set location: Якщо ви вкажете своє місце розташування, мапа і додаткові інструменти з’являться нижче. Ви можете встановити ваше місце розташування на вашій сторінці %{settings_link}. + if set location: Вкажіть ваше місце розташування на вашій сторінці %{settings_link}, щоб побачити користувачів, які є поруч з вами. km away: "%{count} км від вас" latest edit: "Остання правка %{ago}:" m away: "%{count} м від вас" mapper since: "Зареєстрований:" moderator_history: створені блокування - my comments: мої коментарі - my diary: мій щоденник - my edits: мої правки - my settings: мої налаштування - my traces: мої треки - nearby users: Інші найближчі користувачі - nearby_changesets: Переглянути всі набори змін близьких користувачів - nearby_diaries: Переглянути всі записи в щоденниках близьких користувачів + my comments: Мої коментарі + my diary: Мій щоденник + my edits: Мої правки + my messages: Мої повідомлення + my notes: Мої нотатки + my profile: Мій профіль + my settings: Мої налаштування + my traces: Мої треки + nearby users: Інші користувачі поруч + nearby_changesets: набори змін користувачів, що знаходяться поруч з вами + nearby_diaries: записи в щоденниках користувачів, що знаходяться поруч з вами new diary entry: новий запис no friends: Ви не додали ще жодного друга. no nearby users: Поблизу поки немає користувачів, які займаються складанням мапи. + notes: Нотатки oauth settings: налаштування OAuth - remove as friend: вилучити із списку друзів + remove as friend: Вилучити із списку друзів role: administrator: Цей користувач є адміністратором grant: @@ -1757,11 +1843,11 @@ uk: revoke: administrator: Відкликати права адміністратора moderator: Відкликати права модератора - send message: відправити повідомлення + send message: Надіслати повідомлення settings_link_text: налаштування spam score: "Оцінка Спаму:" status: "Статус:" - traces: треки + traces: Треки unhide_user: показати цього користувача user location: Місце знаходження користувача your friends: Ваші друзі @@ -1780,23 +1866,23 @@ uk: try_waiting: Будь ласка, спробуйте дати користувачеві розумний період часу, перед тим як блокувати його. edit: back: Переглянути всі блокування - heading: Правити блокування для %{name} + heading: Редагування блокування для %{name} needs_view: Дозволити користувачу входити в систему, перш, ніж блокування буде знято? period: Як довго, починаючи з поточного моменту, користувач буде заблокований від API. reason: Причина з якої користувача %{name} було заблоковано. Будь ласка, будьте терпимі і дійте розумно, надаючи користувачеві, як можна більше інформації про ситуацію. Майте на увазі, що не всі користувачі розуміють жаргон спільноти, тому, будь ласка, спробуйте використовувати прості пояснення. show: Переглянути блокування submit: Оновити блокування - title: Правити блокування для %{name} + title: Редагування блокування для %{name} filter: block_expired: Блокування вже закінчилось і не може бути змінено. block_period: Період блокування повинен бути одним із значень з списку, що розкривається. helper: time_future: Закінчується в %{time}. time_past: Закінчилось %{time} тому. - until_login: Активне до тих пір, доки користувача не увійде до системи. + until_login: Активне до тих пір, доки користувач не увійде в систему. index: empty: Ще не накладено жодного блокування. - heading: Перелік блокувань користувача + heading: Перелік заблокованих користувачів title: Блокування користувача model: non_moderator_revoke: Потрібно бути модератором, щоб зняти блокування. @@ -1819,11 +1905,14 @@ uk: creator_name: Автор display_name: Заблокований користувач edit: Правити + next: Наступна → not_revoked: (не розблокований) + previous: ← Попередня reason: Причина блокування revoke: Розблокувати! revoker_name: Розблокував show: Показати + showing_page: Сторінка %{page} status: Стан period: few: "%{count} години" @@ -1857,7 +1946,7 @@ uk: user_role: filter: already_has_role: Користувач вже має роль — %{role}. - doesnt_have_role: Користувач не маж ролі %{role}. + doesnt_have_role: Користувач не має ролі %{role}. not_a_role: Рядок «%{role}» не є припустимою роллю. not_an_administrator: Тільки адміністратори можуть керувати ролями користувачів, а ви не є адміністратором. grant: @@ -1872,3 +1961,25 @@ uk: fail: Не вдалося відкликати роль «%{role}» у користувача «%{name}». Будь ласка, перевірте, що користувач і роль є дійсними. heading: Підтвердження відкликання ролі title: Підтвердження відкликання ролі + welcome_page: + add_a_note: + paragraph_1_html: Якщо потрібно внести дрібне уточнення, заради якого немає потреби витрачати час на реєстрацію та вивчення правил редагування, то можна просто додати нотатку. + paragraph_2_html: "Перейдіть до мапи та натисніть піктограму нотатки:\n. Це дозволить додати маркер на мапу, який ви зможете перетягнути мишею. Додайте ваше повідомлення, натисніть „зберегти“, і інші учасники побачать його та, у разі потреби, внесуть зміни на мапу." + title: Немає часу, щоб виправити мапу? Додайте нотатку! + basic_terms: + editor_html: Редактор — це програма або веб-сайт, який можна використовувати для редагування мапи. + node_html: Точка — це позначка на мапі, на кшталт ресторану або дерева. + paragraph_1_html: OpenStreetMap має власну термінологію. Ось кілька важливих слів, які можуть знадобитися. + tag_html: Теґ — одиниця опису точки чи лінії на кшталт назви ресторану або обмеження швидкості на дорозі. + title: Основні Терміни Для Картографування + way_html: Лінія — це відкрита або замкнена ламана на кшталт дороги, струмка, озера або будівлі. + introduction_html: Ласкаво просимо до OpenStreetMap, безкоштовної та доступної для редагування мапи світу. Тепер, коли ви увійшли, все готово для початку редагування. Ось короткий посібник з найважливішими речами, які ви повинні знати. + questions: + paragraph_1_html: "OpenStreetMap має різні ресурси для отримання інформації про проект, щоб поставити питання та отримати відповідь, для спільного обговорення і створення документації з картографування.\nОтримайте допомогу тут." + title: Є питання? + start_mapping: Розпочати картографування + title: Ласкаво просимо! + whats_on_the_map: + off_html: Мапа не включає суб’єктивні дані на кшталт оцінок, історичних або гіпотетичних характеристик та дані з джерел, які захищені авторським правом. Якщо ви не маєте спеціального дозволу, не копіюйте з паперових мап або з мап в інтернеті. + on_html: "На мапі OpenStreetMap розташовані об’єкти, які існують в поточний момент — тобто, це\nмільйони будинків, доріг та інших елементів місцевості. Ви можете наносити на мапу будь-які об’єкти навколишнього світу, цікаві для вас." + title: Що на мапі diff --git a/config/locales/vi.yml b/config/locales/vi.yml index a2416619137..d9ff92f002f 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -2,9 +2,22 @@ # Exported from translatewiki.net # Export driver: syck-pecl # Author: Minh Nguyen +# Author: Nemo bis # Author: Ninomax # Author: Trần Nguyễn Minh Huy vi: + about_page: + community_driven_html: "Cộng đồng của OpenStreetMap gồm đủ loại người nhiệt tình và càng ngày càng phát triển.\nCộng đồng gồm những người tình nguyện vẽ bản đồ, các chuyên gia GIS, các kỹ sư bảo quản các máy chủ OSM. Chúng ta vẽ bản đồ quê hưởng, những nơi du lịch, những nơi bị thiên tai (để hỗ trợ cơ quan nhân đạo), và nhiều hơn nữa.\nĐể tìm hiểu thêm về cộng đồng này, hãy đọc các nhật ký của người dùng,\nblog của cộng đồng, và trang chủ Quỹ OSM." + community_driven_title: Căn cứ vào Cộng động + copyright_html: ©những người
    đóng góp vào
    OpenStreetMap + lede_text: OpenStreetMap được xây dựng bởi cộng đồng những người đóng góp và bảo quản dữ liệu về đường sá, tòa nhà, quán cà phê, nhà ga, và đủ mọi thứ ở khắp thế giới. + local_knowledge_html: OpenStreetMap chú trọng vào kiến thức địa phương. Những người đóng góp sử dụng hình ảnh từ không trung, các thiết bị GPS, và các bản đồ phác thảo trên giấy để làm cho OSM chính xác và đúng thời. + local_knowledge_title: Kiến thức Địa phương + next: Tiếp + open_data_html: "OpenStreetMap là dữ liệu mở: bạn được tự do sử dụng nó cho bất cứ mục đích nào, miễn là bạn ghi công OpenStreetMap và những người đóng góp vào nó. Nếu bạn tạo ra một tác phẩm thay đổi dữ liệu hoặc dựa trên dữ liệu theo một số cách nhất định, bạn chỉ được phép phân phối tác phẩm kết quả dưới cùng giấy phép này. Hãy xem chi tiết tại trang Bản quyền và Giấy phép." + open_data_title: Dữ liệu Mở + partners_title: Nhà bảo trợ + used_by: "%{name} là nguồn dữ liệu bản đồ của hàng trăm trang Web, ứng dụng di động, và thiết bị phần cứng" activerecord: attributes: diary_comment: @@ -82,96 +95,62 @@ vi: blocked: Bạn bị chặn không được truy cập qua API. Vui lòng đăng nhập vào giao diện Web để biết chi tiết. need_to_see_terms: Bạn tạm không có quyền truy cập API. Xin vui lòng đăng nhập giao diện Web để đọc các Điều khoản Đóng góp. Bạn không cần phải chấp nhận các điều khoản nhưng ít nhất phải đọc chúng. browse: + anonymous: vô danh changeset: - changeset: "Bộ thay đổi: %{id}" + belongs_to: Tác giả changesetxml: Bộ thay đổi XML - download: Tải về %{changeset_xml_link} hoặc %{osmchange_xml_link} feed: title: Bộ thay đổi %{id} title_comment: Bộ thay đổi %{id} – %{comment} + node: Các nốt (%{count}) + node_paginated: Các nốt (%{x}–%{y} trên %{count}) osmchangexml: osmChange XML - title: Bộ thay đổi - changeset_details: - belongs_to: "Người Sửa đổi:" - bounding_box: "Hộp bao:" - box: hộp - closed_at: "Lúc Đóng:" - created_at: "Lúc Tạo:" - has_nodes: - one: "Có nốt sau:" - other: "Có %{count} nốt sau:" - has_relations: - one: "Có quan hệ sau:" - other: "Có %{count} quan hệ sau:" - has_ways: - one: "Có lối sau:" - other: "Có %{count} lối sau:" - no_bounding_box: Không lưu hộp bao của bộ thay đổi này. - show_area_box: Hiện Hộp vùng - common_details: - changeset_comment: "Miêu tả:" - deleted_at: "Lúc Xóa:" - deleted_by: "Người Xóa:" - edited_at: "Lúc Sửa đổi:" - edited_by: "Người Sửa đổi:" - in_changeset: "Thuộc Bộ thay đổi:" - version: "Phiên bản:" + relation: Các quan hệ (%{count}) + relation_paginated: Các quan hệ (%{x}–%{y} trên %{count}) + title: "Bộ thay đổi: %{id}" + way: Các lối (%{count}) + way_paginated: Các lối (%{x}–%{y} trên %{count}) + closed: Đóng + closed_by_html: Đóng cách đây %{time} bởi %{user} + closed_html: Đóng cách đây %{time} containing_relation: entry: Quan hệ %{relation_name} entry_role: "Quan hệ %{relation_name} (vai trò: %{relation_role})" - map: - deleted: Đã xóa - edit: - area: Sửa đổi vùng - node: Sửa đổi nốt - relation: Sửa đổi quan hệ - way: Sửa đổi lối - larger: - area: Xem vùng trên bản đồ rộng hơn - node: Xem nốt trên bản đồ rộng hơn - relation: Xem quan hệ trên bản đồ rộng hơn - way: Xem lối trên bản đồ rộng hơn - loading: Đang tải… - navigation: - all: - next_changeset_tooltip: Bộ thay đổi sau - next_node_tooltip: Node tiếp theo - next_relation_tooltip: Quan hệ sau - next_way_tooltip: Đường tiếp theo - prev_changeset_tooltip: Bộ thay đổi trước - prev_node_tooltip: Node trước - prev_relation_tooltip: Relation trước - prev_way_tooltip: Lối trước - user: - name_changeset_tooltip: Xem các đóng góp của %{user} - next_changeset_tooltip: Đóng góp sau của %{user} - prev_changeset_tooltip: Đóng góp trước của %{user} + created: Tạo + created_by_html: Tạo ra cách đây %{time} bởi %{user} + created_html: Tạo ra cách đây %{time} + deleted_by_html: Xóa cách đây %{time} bởi %{user} + download_xml: Tải về XML + edited_by_html: Sửa đổi cách đây %{time} bởi %{user} + in_changeset: Bộ thay đổi + location: "Vị trí:" + no_comment: (không miêu tả) node: - download: "%{download_xml_link}, %{view_history_link}, hoặc %{edit_link}" - download_xml: Tải về XML - edit: sửa đổi - node: Nốt - node_title: "Nốt: %{node_name}" - view_history: xem lịch sử - node_details: - coordinates: "Tọa độ:" - part_of: "Trực thuộc:" - node_history: - download: "%{download_xml_link} hoặc %{view_details_link}" - download_xml: Tải về XML - node_history: Lịch sử Nốt - node_history_title: "Lịch sử Nốt: %{node_name}" - view_details: xem chi tiết + history_title: "Lịch sử Nốt: %{name}" + title: "Nốt: %{name}" not_found: - sorry: Rất tiếc, không thể tìm thấy %{type} với ID %{id}. + sorry: "Rất tiếc, không tìm thấy %{type} #%{id}." type: changeset: bộ thay đổi node: nốt relation: quan hệ way: lối - paging_nav: - of: trong - showing_page: Đang hiện trang + note: + closed_by: Giải quyết bởi %{user} cách đây %{when} + closed_by_anonymous: Giải quyết vô danh cách đây %{when} + closed_title: "Ghi chú đã giải quyết #%{note_name}" + commented_by: Bình luận của %{user} cách đây %{when} + commented_by_anonymous: Bình luận vô danh cách đây %{when} + hidden_by: Ẩn bởi %{user} cách đây %{when} + hidden_title: "Ghi chú ẩn #%{note_name}" + new_note: Ghi chú Mới + open_by: Tạo bởi %{user} cách đây %{when} + open_by_anonymous: Tạo vô danh cách đây %{when} + open_title: "Ghi chú chưa giải quyết #%{note_name}" + reopened_by: Mở lại bởi %{user} cách đây %{when} + reopened_by_anonymous: Mở lại vô danh cách đây %{when} + title: "Ghi chú: %{id}" + part_of: Trực thuộc redacted: message_html: Không thể xem phiên bản %{version} của %{type} này vì nó đã bị ẩn. Xin vui lòng xem chi tiết tại %{redaction_link}. redaction: Dãy ẩn %{id} @@ -180,65 +159,21 @@ vi: relation: quan hệ way: lối relation: - download: "%{download_xml_link} hoặc %{view_history_link}" - download_xml: Tải về XML - relation: Quan hệ - relation_title: "Quan hệ: %{relation_name}" - view_history: xem lịch sử - relation_details: - members: "Thành viên:" - part_of: "Trực thuộc:" - relation_history: - download: "%{download_xml_link} hoặc %{view_details_link}" - download_xml: Tải về XML - relation_history: Lịch sử Quan hệ - relation_history_title: "Lịch sử Quan hệ: %{relation_name}" - view_details: xem chi tiết + history_title: "Lịch sử Quan hệ: %{name}" + members: Các thành viên + title: "Quan hệ: %{name}" relation_member: entry_role: "%{type} %{name} với vai trò %{role}" type: node: Nốt relation: Quan hệ way: Lối - start: - manually_select: Chọn vùng khác thủ công - view_data: Xem dữ liệu của phần bản đồ đang xem start_rjs: - data_frame_title: Dữ liệu - data_layer_name: Xem Dữ liệu Bản đồ - details: Chi tiết - drag_a_box: Kéo hộp trên bản đồ để chọn vùng - edited_by_user_at_timestamp: Được sửa đổi bởi [[user]] lúc [[timestamp]] - hide_areas: Ẩn các khu vực - history_for_feature: Lịch sử [[đối tượng]] + feature_warning: Đang tải %{num_features} đối tượng, điều này sẽ chậm lại trình duyệt của bạn hoặc làm nó không phản hồi. Bạn có chắc chắn muốn hiển thị toàn bộ dữ liệu này? load_data: Tải Dữ liệu - loaded_an_area_with_num_features: "Bạn đã tải vùng chứa [[num_features]] nét. Một số trình duyệt không hiển thị nổi nhiều dữ liệu như thế. Nói chung, trình duyệt hoạt động tốt khi nào chỉ có 100 nét cùng lúc: hơn thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới." loading: Đang tải… - manually_select: Chọn vùng khác thủ công - object_list: - api: Lấy vùng này dùng API - back: Liệt kê các đối tượng - details: Chi tiết - heading: Danh sách đối tượng - history: - type: - node: Nốt [[id]] - way: Lối [[id]] - selected: - type: - node: Nốt [[id]] - way: Lối [[id]] - type: - node: Nốt - way: Lối - private_user: người bí mật - show_areas: Hiện các khu vực - show_history: Xem Lịch sử - unable_to_load_size: "Không thể tải: Hộp bao với cỡ [[bbox_size]] quá lớn (phải nhỏ hơn %{max_bbox_size})" - wait: Xin chờ... - zoom_or_select: Phóng to hoặc chọn vùng bản đồ để xem tag_details: - tags: "Thẻ:" + tags: Thẻ wiki_link: key: Trang wiki miêu tả khóa %{key} tag: Trang wiki miêu tả thẻ %{key}=%{value} @@ -250,38 +185,25 @@ vi: node: nốt relation: quan hệ way: lối + version: Phiên bản + view_details: Xem Chi tiết + view_history: Xem Lịch sử way: - download: "%{download_xml_link}, %{view_history_link}, hoặc %{edit_link}" - download_xml: Tải về XML - edit: sửa đổi - view_history: xem lịch sử - way: Lối - way_title: "Lối: %{way_name}" - way_details: also_part_of: - one: cũng thuộc về lối %{related_ways} - other: cũng thuộc về các lối %{related_ways} - nodes: "Nốt:" - part_of: "Trực thuộc:" - way_history: - download: "%{download_xml_link} hoặc %{view_details_link}" - download_xml: Tải về XML - view_details: xem chi tiết - way_history: Lịch sử Lối - way_history_title: "Lịch sử Lối: %{way_name}" + one: trực thuộc lối %{related_ways} + other: trực thuộc các lối %{related_ways} + history_title: "Lịch sử Lối: %{name}" + nodes: Các nốt + title: "Lối: %{name}" changeset: changeset: anonymous: Vô danh - big_area: (lớn) - no_comment: (không có) no_edits: (không có thay đổi) - show_area_box: hiện hộp vùng - still_editing: (đang sửa) view_changeset_details: Xem chi tiết của bộ thay đổi changeset_paging_nav: next: Sau » previous: « Trước - showing_page: Đang hiện trang %{page} + showing_page: Trang %{page} changesets: area: Vùng comment: Miêu tả @@ -289,24 +211,17 @@ vi: saved_at: Lúc Lưu user: Người dùng list: - description: Những thay đổi gần đây - description_bbox: Những bộ thay đổi ở trong %{bbox} - description_friend: Những bộ thay đổi của bạn bè - description_nearby: Những bộ thay đổi của người dùng ở gần - description_user: Những bộ thay đổi của %{user} - description_user_bbox: Những bộ thay đổi của %{user} ở trong %{bbox} - heading: Các bộ thay đổi - heading_bbox: Các bộ thay đổi - heading_friend: Các bộ thay đổi - heading_nearby: Các bộ thay đổi - heading_user: Các bộ thay đổi - heading_user_bbox: Các bộ thay đổi + empty: Không tìm thấy bộ thay đổi. + empty_area: Không có bộ thay đổi trong khu vực này. + empty_user: Người dùng này không có bộ thay đổi nào. + load_more: Tải tiếp + no_more: Hết bộ thay đổi. + no_more_area: Hết bộ thay đổi trong khu vực này. + no_more_user: Hết bộ thay đổi của người dùng này. title: Các bộ thay đổi - title_bbox: Những bộ thay đổi ở trong %{bbox} title_friend: Những bộ thay đổi của bạn bè title_nearby: Những bộ thay đổi của người dùng ở gần title_user: Những bộ thay đổi của %{user} - title_user_bbox: Những bộ thay đổi của %{user} ở trong %{bbox} timeout: sorry: Rất tiếc, lấy danh sách bộ thay đổi tốn quá nhiều thì giờ. diary_entry: @@ -319,18 +234,18 @@ vi: post: Mục nhật ký when: Lúc đăng diary_comment: - comment_from: Bình luận của %{link_user} lúc %{comment_created_at} + comment_from: Bình luận của %{link_user} vào %{comment_created_at} confirm: Xác nhận hide_link: Ẩn bình luận này diary_entry: comment_count: - one: 1 bình luận other: "%{count} bình luận" + zero: Chưa có bình luận comment_link: Bình luận về mục này confirm: Xác nhận edit_link: Sửa đổi mục này hide_link: Ẩn mục này - posted_by: Được đăng bởi %{link_user} lúc %{created} bằng %{language_link} + posted_by: Do %{link_user} đăng vào %{created} bằng %{language_link} reply_link: Trả lời mục này edit: body: "Nội dung:" @@ -360,7 +275,7 @@ vi: newer_entries: Mục Sau no_entries: Chưa có mục nhật ký older_entries: Mục Trước - recent_entries: "Mục nhật ký gần đây:" + recent_entries: Mục nhật ký gần đây title: Các Nhật ký Cá nhân title_friends: Các nhật ký của bạn bè title_nearby: Các nhật ký của người dùng ở gần @@ -384,6 +299,9 @@ vi: user_title: Nhật ký của %{user} editor: default: Mặc định (hiện là %{name}) + id: + description: iD (trình vẽ trong trình duyệt) + name: iD potlatch: description: Potlatch 1 (trình vẽ trong trình duyệt) name: Potlatch 1 @@ -399,7 +317,7 @@ vi: area_to_export: Vùng để Xuất embeddable_html: HTML để Nhúng export_button: Xuất - export_details: Dữ liệu OpenStreetMap được phép sử dụng theo giấy phép Ghi công–Chia sẻ tương tự Creative Commons 2.0. + export_details: Dữ liệu OpenStreetMap được phép sử dụng theo Giấy phép Cơ sở dữ liệu Mở Open Data Commons (ODbL). format: "Định dạng:" format_to_export: Định dạng Xuất image_size: Hình có Kích cỡ @@ -415,29 +333,46 @@ vi: paste_html: Dán HTML để nhúng vào trang Web scale: Tỷ lệ too_large: - body: Khu vực này quá lớn để xuất dữ liệu OpenStreetMap XML được. Xin hãy phóng to hoặc lựa chọn khu vực nhỏ hơn. - heading: Khu vực Lớn quá + advice: "Nếu việc xuất dữ liệu ở trên bị thất bại, hãy nghĩ đến việc sử dụng một trong những nguồn bên dưới:" + body: "Khu vực này quá lớn để xuất được dữ liệu OpenStreetMap XML. Xin vui lòng phóng to, chọn khu vực nhỏ hơn, hoặc tải về dữ liệu khối lượng lớn từ một dịch vụ sau:" + geofabrik: + description: Bản trích lục địa, quốc gia, và một số thành phố được cập nhật thường xuyên + title: Tải về Geofabrik + metro: + description: Bản trích một số thành phố lớn và vùng lân cận + title: Bản trích Metro + other: + description: Những nguồn khác được liệt kê trên wiki OpenStreetMap + title: Nguồn Khác + overpass: + description: Tải về hộp bao này từ một mirror của cơ sở dữ liệu OpenStreetMap + title: Overpass API + planet: + description: Các bản sao toàn thể cơ sở dữ liệu OpenStreetMap được cập nhật thường xuyên + title: Quả đất OSM zoom: Thu phóng - start_rjs: - add_marker: Đánh dấu vào bản đồ - change_marker: Thay đổi vị trí đánh dấu - click_add_marker: Nhấn chuột vào bản đồ để đánh dấu - drag_a_box: Kéo hộp trên bản đồ để chọn vùng - export: Xuất - manually_select: Chọn vùng khác thủ công - view_larger_map: Xem Bản đồ Rộng hơn + title: Xuất + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Chỉ việc bấm hoặc hình tượng này trên bản đồ.\nNút này sẽ thả một ghim vào bản đồ để bạn kéo thả vào vị trí đúng. Miêu tả vấn đề và bấm Lưu. Những người khác sẽ điều tra." + join_the_community: + explanation_html: Nếu bạn nhận thấy một vấn đề trong dữ liệu bản đồ của chúng tôi, chẳng hạn thiếu con đường hoặc địa chỉ của bạn, cách xử lý tốt nhất là tham gia cộng đồng OpenStreetMap để thêm hoặc sửa dữ liệu lấy. + title: Tham gia cộng đồng + title: Cách giúp đỡ + other_concerns: + explanation_html: Nếu bạn có thắc mắc về cách sử dụng dữ liệu của chúng tôi hoặc về nội dung của bản đồ, xin vui lòng xem thông tin pháp lý tại trang bản quyền, hoặc liên lạc với nhóm làm việc thích hợp của Quỹ OpenStreetMap. + title: Vấn đề khác + title: Báo cáo lỗi / Sửa bản đồ geocoder: description: title: geonames: Vị trí từ GeoNames - osm_namefinder: "%{types} từ OpenStreetMap Namefinder" osm_nominatim: Vị trí từ OpenStreetMap Nominatim types: cities: Thành phố places: Địa điểm towns: Thị xã - description_osm_namefinder: - prefix: "%{distance} về phía %{direction} của %{type}" direction: east: đông north: bắc @@ -458,16 +393,26 @@ vi: title: ca_postcode: Kết quả Geocoder.CA geonames: Kết quả GeoNames + geonames_reverse: Kết quả GeoNames latlon: Kết quả nội bộ - osm_namefinder: Kết quả OpenStreetMap Namefinder osm_nominatim: Kết quả OpenStreetMap Nominatim + osm_nominatim_reverse: Kết quả OpenStreetMap Nominatim uk_postcode: Kết quả NPEMap / FreeThe Postcode us_postcode: Kết quả Geocoder.us - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} về phía %{parentdirection} của %{parentname})" - suffix_place: ", %{distance} về phía %{direction} của %{placename}" search_osm_nominatim: + admin_levels: + level10: Biên giới Khu phố + level2: Biên giới Quốc gia + 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 + level8: Biên giới Phường/Xã/Thị trấn + level9: Biên giới Làng prefix: + aerialway: + chair_lift: Ghế Cáp treo + drag_lift: Thang kéo trên Mặt đất + station: Trạm Cáp treo aeroway: aerodrome: Sân bay apron: Sân Đậu Máy bay @@ -478,7 +423,7 @@ vi: terminal: Nhà ga Sân bay amenity: WLAN: Điểm Truy cập Wi-Fi - airport: Phi trường + airport: Sân bay arts_centre: Trung tâm Nghệ thuật artwork: Tác phẩm Nghệ thuật atm: Máy Rút tiền Tự động @@ -492,7 +437,7 @@ vi: biergarten: Quán rượu Ngoài trời brothel: Nhà chứa bureau_de_change: Tiệm Đổi tiền - bus_station: Trạm Xe buýt + bus_station: Bến Xe buýt cafe: Quán Cà phê car_rental: Chỗ Mướn Xe car_sharing: Chia sẻ Xe cộ @@ -515,7 +460,7 @@ vi: emergency_phone: Điện thoại Khẩn cấp fast_food: Nhà hàng Ăn nhanh ferry_terminal: Trạm Phà - fire_hydrant: Vòi nước Máy + fire_hydrant: Trụ Cứu hỏa fire_station: Trạm Cứu hỏa food_court: Khu Ẩm thực fountain: Vòi nước @@ -561,6 +506,7 @@ vi: shower: Vòi tắm social_centre: Hội trường social_club: Câu lạc bộ Xã hội + social_facility: Cơ quan Xã hội studio: Studio supermarket: Siêu thị swimming_pool: Hồ tắm @@ -589,15 +535,18 @@ vi: "yes": Cầu building: "yes": Tòa nhà + emergency: + fire_hydrant: Trụ Cứu hỏa + phone: Điện thoại Khẩn cấp highway: bridleway: Đường Cưỡi ngựa bus_guideway: Làn đường Dẫn Xe buýt - bus_stop: Chỗ Đậu Xe buýt + bus_stop: Trạm Xe buýt byway: Đường mòn Đa mốt construction: Đường Đang Xây cycleway: Đường Xe đạp emergency_access_point: Địa điểm Truy nhập Khẩn cấp - footway: Đường bộ + footway: Đường Đi bộ ford: Khúc Sông Cạn living_street: Đường Hàng xóm milestone: Mốc @@ -606,28 +555,30 @@ vi: motorway_junction: Ngã tư Đường Cao tốc motorway_link: Đường Cao tốc path: Lối - pedestrian: Đường bộ Lớn + pedestrian: Đường Dành cho Người Đi bộ platform: Sân ga primary: Đường Chính primary_link: Đường Chính + proposed: Đường được Đề nghị raceway: Đường đua - residential: Đường Nhà ở + residential: Ngõ Dân cư rest_area: Trạm Nghỉ Dọc đường road: Đường secondary: Đường Lớn secondary_link: Đường Lớn - service: Đường phụ + service: Ngách services: Dịch vụ Dọc đường Cao tốc speed_camera: Máy chụp hình Tốc độ steps: Cầu thang stile: Cửa xoay - tertiary: Đường Lớn - tertiary_link: Đường Lớn + street_lamp: Đèn Đường phố + tertiary: Phố + tertiary_link: Phố track: Đường mòn trail: Đường mòn trunk: Xa lộ trunk_link: Xa lộ - unclassified: Đường Không Phân loại + unclassified: Ngõ unsurfaced: Đường Không Lát historic: archaeological_site: Khu vực Khảo cổ @@ -636,15 +587,17 @@ vi: building: Tòa nhà castle: Lâu đài church: Nhà thờ + citywalls: Tường Thành phố fort: Pháo đài house: Nhà ở icon: Thánh tượng manor: Trang viên - memorial: Đài Tưởng niệm + memorial: Vật Tưởng niệm mine: Mỏ - monument: Đài Tưởng niệm + monument: Công trình Tưởng niệm museum: Bảo tàng ruins: Tàn tích + tomb: Mộ tower: Tháp wayside_cross: Thánh Giá Dọc đường wayside_shrine: Đền thánh Dọc đường @@ -698,7 +651,7 @@ vi: miniature_golf: Golf Nhỏ nature_reserve: Khu Bảo tồn Thiên niên park: Công viên - pitch: Bãi Thể thao + pitch: Sân cỏ playground: Sân chơi recreation_ground: Sân Giải trí sauna: Nhà Tắm hơi @@ -712,6 +665,8 @@ vi: airfield: Sân bay Không quân barracks: Trại Lính bunker: Boong ke + mountain_pass: + "yes": Đèo natural: bay: Vịnh beach: Bãi biển @@ -722,7 +677,7 @@ vi: crater: Miệng Núi dune: Cồn cát feature: Đối tượng Thiên nhiên - fell: Đồi đá + fell: Đồi Cằn cỗi fjord: Vịnh hẹp forest: Rừng geyser: Mạch nước Phun @@ -740,7 +695,7 @@ vi: ridge: Luống đất river: Sông rock: Đá - scree: Bãi Đá + scree: Sườn Núi Đá scrub: Đất Bụi rậm shoal: Bãi cạn spring: Suối @@ -767,7 +722,7 @@ vi: travel_agent: Văn phòng Du lịch "yes": Văn phòng place: - airport: Phi trường + airport: Sân bay city: Thành phố country: Quốc gia county: Quận hạt @@ -781,6 +736,7 @@ vi: locality: Địa phương moor: Truông municipality: Đô thị + neighbourhood: Hàng xóm postcode: Mã Bưu chính region: Miền sea: Biển @@ -791,9 +747,9 @@ vi: unincorporated_area: Khu Chưa Hợp nhất village: Làng railway: - abandoned: Đường sắt bị Bỏ rơi + abandoned: Đường sắt Bỏ hoang construction: Đường sắt Đang Xây - disused: Đường sắt Ngừng hoạt động + disused: Đường sắt Không hoạt động disused_station: Nhà ga Đóng cửa funicular: Đường sắt Leo núi halt: Ga Xép @@ -802,12 +758,14 @@ vi: level_crossing: Điểm giao Đường sắt light_rail: Đường sắt Nhẹ miniature: Đường sắt Nhỏ - monorail: Đường Một Ray + monorail: Đường sắt Một ray narrow_gauge: Đường sắt Khổ hẹp platform: Ke ga preserved: Đường sắt được Bảo tồn + proposed: Đường sắt được Đề nghị spur: Đường sắt Phụ station: Nhà ga + stop: Chỗ Xe lửa Dừng lại subway: Trạm Xe điện Ngầm subway_entrance: Cửa vào Nhà ga Xe điện ngầm switch: Ghi Đường sắt @@ -823,19 +781,21 @@ vi: beverages: Tiệm Đồ uống bicycle: Tiệm Xe đạp books: Tiệm Sách - butcher: Tiệm Thịt + boutique: Tiệm Thời trang + butcher: Hàng Thịt car: Tiệm Xe hơi car_parts: Phụ tùng Xe hơi car_repair: Tiệm Sửa Xe carpet: Tiệm Thảm charity: Cửa hàng Từ thiện - chemist: Nhà thuốc + chemist: Tiệm Dược phẩm clothes: Tiệm Quần áo computer: Tiệm Máy tính confectionery: Tiệm Kẹo - convenience: Tiệm Tập hóa + convenience: Tiệm Tiện lợi copyshop: Tiệm In ấn cosmetics: Tiệm Mỹ phẩm + deli: Deli department_store: Cửa hàng Bách hóa discount: Cửa hàng Giảm giá doityourself: Tiệm Ngũ kim @@ -853,7 +813,7 @@ vi: garden_centre: Trung tâm Làm vườn general: Tiệm Đồ gift: Tiệm Quà tặng - greengrocer: Tiệm Rau + greengrocer: Tiệm Rau quả grocery: Tiệm Tạp phẩm hairdresser: Tiệm Làm tóc hardware: Tiệm Ngũ kim @@ -870,19 +830,23 @@ vi: newsagent: Tiệm Báo optician: Tiệm Kính mắt organic: Tiệm Thực phẩm Hữu cơ - outdoor: Cửa hàng Ngoài trời + outdoor: Tiệm Thể thao Ngoài trời pet: Tiệm Vật nuôi + pharmacy: Nhà thuốc photo: Tiệm Rửa Hình salon: Tiệm Làm tóc + second_hand: Tiệm Mua lại shoes: Tiệm Giày shopping_centre: Trung tâm Mua sắm sports: Tiệm Thể thao stationery: Tiệm Văn phòng phẩm supermarket: Siêu thị + tailor: Tiệm May toys: Tiệm Đồ chơi travel_agency: Văn phòng Du lịch video: Tiệm Phim wine: Tiệm Rượu + "yes": Tiệm tourism: alpine_hut: Túp lều Trên Núi artwork: Tác phẩm Nghệ thuật @@ -905,6 +869,7 @@ vi: viewpoint: Thắng cảnh zoo: Vườn thú tunnel: + culvert: Cống "yes": Đường hầm waterway: artificial: Dòng nước Nhân tạo @@ -927,70 +892,118 @@ vi: wadi: Dòng sông Vào mùa water_point: Máy bơm nước waterfall: Thác - weir: Đập Cột nước Thấp + weir: Đập Tràn + help_page: + help: + description: Hỏi hang hoặc tìm kiếm các câu trả lời tại trung tâm hỏi đáp của OSM. + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + introduction: OpenStreetMap có nhiều tài nguyên để cho bạn tìm hiểu về dự án, hỏi đáp, và cộng tác soạn thảo tài liệu về các đề tài bản đồ. + title: Trợ giúp + welcome: + description: Bắt đầu với cẩm nang các điều cơ bản OpenStreetMap. + title: Chào mừng đến với OSM + url: /welcome + wiki: + description: Đọc tài liệu đầy đủ về OSM trên wiki. + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/?setlang=vi javascripts: + close: Đóng + edit_help: Di chuyển bản đồ và phóng to một vị trí mà bạn muốn sửa đổi, rồi nhấn chuột vào đây. + key: + title: Chú giải Bản đồ + tooltip: Chú giải Bản đồ + tooltip_disabled: Bảng Chú giải chỉ có sẵn cho lớp Chuẩn map: base: cycle_map: Bản đồ Xe đạp + hot: Nhân đạo mapquest: MapQuest Mở standard: Chuẩn transport_map: Bản đồ Giao thông - overlays: - maplint: Maplint + copyright: © những người đóng góp vào OpenStreetMap + donate_link_text: + layers: + data: Dữ liệu Bản đồ + header: Lớp Bản đồ + notes: Ghi chú Bản đồ + overlays: Bật lớp phủ để gỡ lỗi trên bản đồ + title: Lớp + locate: + popup: Bạn hiện đang ở cách đây {distance} {unit} + title: Nhảy tới Vị trí của Tôi + zoom: + in: Phóng to + out: Thu nhỏ + notes: + new: + add: Thêm Ghi chú + intro: Những thông tin bạn nhập được hiển thị cho những người dùng khác để cho họ cải thiện bản đồ. Xin vui lòng chuyển ghim vào đúng vị trí và ghi chú trong hộp bên dưới càng rõ ràng càng tốt. + show: + anonymous_warning: Ghi chú này có bình luận của người dùng vô danh đóng góp; các bình luận này cần được xác nhận lại. + comment: Bình luận + comment_and_resolve: Bình luận & Giải quyết + hide: Ẩn + reactivate: Mở lại + resolve: Giải quyết + share: + cancel: Hủy bỏ + center_marker: Chuyển ghim vào giữa bản đồ + custom_dimensions: Tùy biến kích thước + download: Tải về + embed: HTML + format: "Định dạng:" + image: Hình ảnh + image_size: Hình lớp chuẩn với kích thước + include_marker: Ghim trên bản đồ + link: Liên kết hoặc HTML + long_link: Liên kết + paste_html: Dán HTML để nhúng vào trang Web + scale: "Tỷ lệ:" + short_link: Liên kết Ngắn gọn + short_url: URL Ngắn gọn + title: Chia sẻ + view_larger_map: Xem Bản đồ Rộng hơn site: + createnote_disabled_tooltip: Phóng to để thêm một ghi chú vào bản đồ + createnote_tooltip: Thêm một ghi chú vào bản đồ edit_disabled_tooltip: Phóng to để sửa đổi bản đồ edit_tooltip: Sửa đổi bản đồ - edit_zoom_alert: Hãy phóng to hơn để sửa đổi bản đồ - history_disabled_tooltip: Phóng to để xem danh sách sửa đổi trong khu vực này - history_tooltip: Xem danh sách sửa đổi trong khu vực này - history_zoom_alert: Hãy phóng to hơn để xem lịch sử sửa đổi + map_data_zoom_in_tooltip: Phóng to để xem dữ liệu bản đồ + map_notes_zoom_in_tooltip: Phóng to để xem các ghi chú trên bản đồ layouts: + about: Giới thiệu community: Cộng đồng community_blogs: Các Blog của Cộng đồng community_blogs_title: Các blog của thành viên cộng đồng OpenStreetMap - copyright: Bản quyền & Giấy phép - documentation: Tài liệu - documentation_title: Tài liệu về dự án + copyright: Bản quyền + data: Dữ liệu donate: Hỗ trợ OpenStreetMap bằng cách %{link} cho Quỹ Nâng cấp Phần cứng. - donate_link_text: quyên góp edit: Sửa đổi edit_with: Sửa đổi dùng %{editor} export: Xuất - export_tooltip: Xuất dữ liệu bản đồ + export_data: Xuất Dữ liệu foundation: Quỹ OpenStreetMap foundation_title: Quỹ OpenStreetMap gps_traces: Tuyến đường GPS gps_traces_tooltip: Quản lý tuyến đường GPS help: Trợ giúp - help_centre: Hỏi đáp - help_title: Trang trợ giúp của dự án history: Lịch sử - home: nhà - home_tooltip: Về vị trí nhà - inbox: hộp thư (%{count}) - inbox_tooltip: - one: Hộp thư của bạn có 1 thư chưa đọc - other: Hộp thư của bạn có %{count} thư chưa đọc - zero: Hộp thư của bạn không có thư chưa đọc - intro_1: OpenStreetMap là bản đồ thế giới nguồn mở, do những người như bạn vẽ. + home: Về Vị trí Nhà ở intro_2_create_account: Mở tài khoản mới - intro_2_download: tải về - intro_2_html: Bạn được phép %{download} và %{use} theo %{license}. Hãy %{create_account} để cải tiến bản đồ. - intro_2_license: giấy phép mở - intro_2_use: sử dụng - intro_2_use_url: http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap?uselang=vi - license: - alt: CC BY-SA 2.0 - title: Dữ liệu OpenStreetMap được phát hành theo Giấy phép Creative Commons Ghi công–Chia sẻ tương tự 2.0 Chung - log_in: đăng nhập + intro_header: Chào mừng đến với OpenStreetMap! + intro_text: OpenStreetMap là bản đồ thế giới do những người như bạn xây dựng và cho phép sử dụng thoải mái theo một giấy phép nguồn mở. + learn_more: Tìm hiểu Thêm + log_in: Đăng nhập log_in_tooltip: Đăng nhập với tài khoản đã tồn tại logo: alt_text: Biểu trưng OpenStreetMap - logout: đăng xuất - logout_tooltip: Đăng xuất + logout: Đăng xuất make_a_donation: text: Quyên góp title: Quyên góp tiền để hỗ trợ OpenStreetMap + more: Thêm osm_offline: Cơ sở dữ liệu OpenStreetMap đang ngoại tuyến trong lúc đang thực hiện những công việc bảo quản cơ sở dữ liệu cần thiết. osm_read_only: Cơ sở dữ liệu OpenStreetMap đang bị khóa không được sửa đổi trong lúc đang thực hiện những công việc bảo quản cơ sở dữ liệu cần thiết. partners_bytemark: Bytemark Hosting @@ -999,25 +1012,47 @@ vi: partners_partners: các công ty bảo trợ partners_ucl: Trung tâm VR tại UCL partners_url: http://wiki.openstreetmap.org/wiki/Partners?uselang=vi - sign_up: đăng ký + sign_up: Mở Tài khoản sign_up_tooltip: Mở tài khoản để sửa đổi - sotm2011: Mời tham dự Hội nghị OpenStreetMap 2011, Tình trạng Bản đồ, 9–11 tháng 9 tại Denver! + start_mapping: Bắt đầu Đóng góp tag_line: Bản đồ Thế giới trên Wiki Mở user_diaries: Nhật ký Cá nhân user_diaries_tooltip: Đọc các nhật ký cá nhân - view: Xem - view_tooltip: Xem bản đồ - welcome_user: Hoan nghênh, %{user_link} - welcome_user_link_tooltip: Trang cá nhân của bạn - wiki: Wiki - wiki_title: Trang wiki của dự án - wiki_url: http://wiki.openstreetmap.org/wiki/Vi:Main_Page?uselang=vi license_page: foreign: english_link: nguyên bản tiếng Anh text: Trong trường hợp có xung đột giữa trang dịch và trang %{english_original_link}, trang tiếng Anh sẽ được ưu tiên title: Thông tin về bản dịch này - legal_babble: "

    Bản quyền và Giấy phép

    \n

    \n OpenStreetMap là dữ liệu mở được phát hành theo giấy phép Creative Commons Ghi công–Chia sẻ tương tự 2.0 (CC BY-SA).\n

    \n

    \n Bạn được tự do sao chép, phân phối, truyền, và tạo ra các tác phẩm phái sinh từ các bản đồ và dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap và những người đóng góp vào nó. Nếu bạn sửa đổi hoặc tạo sản phẩm dựa trên các bản đồ và dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng giấy phép. mã pháp lý đầy đủ giải thích các quyền và trách nhiệm của bạn.\n

    \n\n

    Cách ghi công OpenStreetMap

    \n

    \n Nếu bạn đang sử dụng các hình ảnh bản đồ OpenStreetMap, chúng tôi yêu cầu rằng lời ghi công của bạn ít nhất đề “© những người đóng góp vào OpenStreetMap, CC BY-SA”. Nếu bạn chỉ đang sử dụng dữ liệu bản đồ, chúng tôi xin câu “Dữ liệu © những người đóng góp vào OpenStreetMap, CC BY-SA”.\n

    \n

    \n Lúc nào có thể, “OpenStreetMap” nên có liên kết đến http://www.openstreetmap.org/ và “CC BY-SA” đến http://creativecommons.org/licenses/by-sa/2.0/. Nếu bạn đang sử dụng phương tiện không cho phép đặt liên kết (thí dụ trong tác phẩm in giấy), chúng tôi gợi ý chỉ các độc giả đến www.openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap” trở thành địa chỉ đầy đủ này) và đến www.creativecommons.org.\n

    \n\n

    Tìm hiểu thêm

    \n

    \n Hãy đọc thêm chi tiết về việc sử dụng dữ liệu của chúng tôi trong Hỏi đáp Pháp lý.\n

    \n

    \n Những người đóng góp vào OSM được khuyên không bao giờ bổ sung dữ liệu từ những nguồn có bản quyền (chẳng hạn Bản đồ Google hoặc các bản đồ trên giấy) trước khi người hay công ty giữ bản quyền cho phép rõ ràng.\n

    \n

    \n Tuy OpenStreetMap là dữ liệu mở, nhưng chúng tôi không thể cung cấp API miễn phí để cho những nhà phát triển bên thứ ba truy cập bản đồ. Hãy xem Quy định Sử dụng API, Quy định Sử dụng Hình ảnh Bản đồ, và Quy định Sử dụng Nominatim.\n

    \n\n

    Những người đóng góp vào đây

    \n

    \n Giấy phép CC BY-SA của chúng tôi bắt bạn phải “ghi công Tác giả Đầu tiên bằng cách hợp với phương tiện Bạn đang sử dụng”. Những cá nhân vẽ bản đồ OSM không yêu cầu lời ghi công dứt khoát hơn “những người đóng góp vào OpenStreetMap”, nhưng trong những trường hợp dữ liệu của cơ quan khảo sát quốc gia hoặc nguồn lớn khác đã được nhập vào OpenStreetMap, có thể có lý ghi công nguồn này bằng cách ghi công họ thẳng hoặc đặt liên kết đến trang này.\n

    \n\n\n\n
      \n
    • Áo: Bao gồm dữ liệu từ Bang Viên (theo CC BY), Bang Vorarlberg, và Bang Tyrol (theo bản sửa đổi CC BY Áo).
    • \n
    • Ba Lan: Bao gồm dữ liệu từ các bản đồ UMP-pcPL. Bản quyền những người đóng góp UMP-pcPL. Xem thêm chi tiết về cách sử dụng dữ liệu UMP tại OpenStreetMap.
    • \n
    • Canada: Bao gồm dữ liệu từ GeoBase®, GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở Địa lý, Statistics Canada).
    • \n
    • Hà Lan: Bao gồm dữ liệu © 2007 AND (www.and.com)
    • \n
    • Nam Phi: Bao gồm dữ liệu từ Tổng cục: Thông tin Không gian địa lý Quốc gia, bản quyền nhà nước được bảo lưu.
    • \n
    • New Zealand: Bao gồm dữ liệu bắt nguồn từ Land Information New Zealand. Bản quyền Crown Copyright được bảo lưu.
    • \n
    • Pháp: Bao gồm dữ liệu từ Sở thuế Pháp (Direction générale des Impôts).
    • \n
    • Úc: Bao gồm dữ liệu về ngoại ô dựa trên dữ liệu của Cục Thống kê Úc.
    • \n
    • Vương quốc Anh: Bao gồm dữ liệu Ordnance Survey © bản quyền Crown Copyright và quyền cơ sở dữ liệu 2010.
    • \n
    \n\n

    \n Việc bao gồm dữ liệu trong OpenStreetMap không ngụ ý rằng nhà cung cấp dữ liệu đầu tiên ủng hộ OpenStreetMap, biện hộ sự chính xác của nó, hoặc nhận trách nhiệm pháp lý nào.\n

    " + legal_babble: + attribution_example: + alt: Ví dụ ghi công OpenStreetMap trên một trang Web + title: Ví dụ ghi công + contributors_at_html: "Áo: Bao gồm dữ liệu từ Bang Viên (theo CC BY), Bang Vorarlberg, và Bang Tyrol (theo bản sửa đổi CC BY Áo)." + contributors_ca_html: "Canada: Bao gồm dữ liệu từ GeoBase®, GeoGratis (© Bộ Tài nguyên Canada), CanVec (© Bộ Tài nguyên Canada), và StatCan (Sở Địa lý, Statistics Canada)." + contributors_fi_html: "Phần Lan: Chứa dữ liệu từ\nCơ sở dữ liệu Địa hình của Cục Khảo sát Địa lý Quốc gia Phần Lan (NLS) và các tập hợp dữ liệu khác theo \nGiấy phép dữ liệu mở NLS." + contributors_footer_1_html: "Xem thêm chi tiết và các nguồn gốc khác dùng để cải tiến OpenStreetMap tại trang Người đóng góp trên OpenStreetMap Wiki." + contributors_footer_2_html: " Việc bao gồm dữ liệu trong OpenStreetMap không ngụ ý rằng nhà cung cấp dữ liệu đầu tiên ủng hộ OpenStreetMap, biện hộ sự chính xác của nó, hoặc nhận trách nhiệm pháp lý nào." + contributors_fr_html: "Pháp: Bao gồm dữ liệu từ Sở thuế Pháp (Direction générale des Impôts)." + contributors_gb_html: "Vương quốc Anh: Bao gồm dữ liệu Ordnance Survey © bản quyền Crown Copyright và quyền cơ sở dữ liệu 2010–12." + contributors_intro_html: "Dự án này nhờ công sức đóng góp của hàng ngàn cá nhân và cũng bao gồm các dữ liệu có giấy phép mở từ các cơ quan khảo sát quốc gia và những nguồn gốc khác, chẳng hạn:" + contributors_nl_html: "Hà Lan: Bao gồm dữ liệu © 2007 AND (www.and.com)" + contributors_nz_html: "New Zealand: Bao gồm dữ liệu bắt nguồn từ Land Information New Zealand. Bản quyền Crown Copyright được bảo lưu." + contributors_title_html: Những người đóng góp vào đây + contributors_za_html: "Nam Phi: Bao gồm dữ liệu từ Tổng cục: Thông tin Không gian địa lý Quốc gia, bản quyền nhà nước được bảo lưu." + credit_1_html: Chúng tôi bắt bạn phải sử dụng lời ghi công “© những người đóng góp vào OpenStreetMap”. + credit_2_html: Bạn cũng phải giải thích rõ rằng dữ liệu được phát hành theo Giấy phép Cơ sở dữ liệu Mở, và, nếu bạn đang sử dung các hình ảnh bản đồ của chúng tôi, rằng các hình ảnh này được phát hành theo giấy phép CC BY-SA. Bạn có thể thỏa mãn điều này bằng cách đặt liên kết đến trang bản quyền này. Nếu bạn đang phân phối nguyên dữ liệu của OSM hoặc không muốn đặt liên kết đến trang bản quyền của OSM, bạn có thể nói đến và đặt liên kết trực tiếp đến (các) giấy phép. Nếu bạn đang sử dụng phương tiện không cho phép đặt liên kết, chẳng hạn trong tác phẩm in giấy, chúng tôi gợi ý chỉ các độc giả đến openstreetmap.org (có lẽ bằng cách mở rộng “OpenStreetMap” trở thành địa chỉ đầy đủ này), đến opendatacommons.org, và nếu hợp lý, đến creativecommons.org. + credit_3_html: "Đối với một bản đồ điện tử tương tác, lời ghi công nên xuất hiện ở góc bản đồ.\nVí dụ:" + credit_title_html: Cách ghi công OpenStreetMap + infringement_1_html: Những người đóng góp vào OSM được khuyên không bao giờ bổ sung dữ liệu từ những nguồn có bản quyền (chẳng hạn Bản đồ Google hoặc các bản đồ trên giấy) trước khi các nhà giữ bản quyền cho phép rõ ràng. + infringement_2_html: Nếu bạn tin rằng tài liệu có bản quyền đã được bổ sung vào cơ sở dữ liệu OpenStreetMap hoặc trang này một cách không thích đáng, xin vui lòng tham khảo quá trình takedown hoặc nộp đơn trực tiếp tại trang khiếu nại trực tuyến của chúng tôi. + infringement_title_html: Vi phạm bản quyền + intro_1_html: "OpenStreetMap là dữ liệu mở được phát hành theo Giấy phép Cơ sở dữ liệu Mở của Open Data\nCommons (ODbL)." + intro_2_html: Bạn được tự do sao chép, phân phối, truyền, và tạo ra các tác phẩm phái sinh từ các dữ liệu của chúng ta, miễn là bạn ghi công OpenStreetMap và những người đóng góp vào nó. Nếu bạn sửa đổi hoặc tạo sản phẩm dựa trên các dữ liệu của chúng tôi, bạn chỉ được phép phân phối kết quả theo cùng giấy phép. Mã pháp lý đầy đủ giải thích các quyền và trách nhiệm của bạn. + intro_3_html: "Các hình ảnh bản đồ và tài liệu của chúng tôi được phát hành theo giấy phép Creative \nCommons Ghi công–Chia sẻ tương tự 2.0 (CC BY-SA)." + more_1_html: Hãy đọc thêm chi tiết về việc sử dụng dữ liệu của chúng tôi và cách ghi công chúng tôi trong Hỏi đáp Pháp lý. + more_2_html: Tuy OpenStreetMap là một nguồn dữ liệu mở, nhưng chúng tôi không thể cung cấp API miễn phí cho những nhà phát triển bên thứ ba truy cập bản đồ. Hãy xem Quy định Sử dụng API, Quy định Sử dụng Mảnh Bản đồ, và Quy định Sử dụng Nominatim. + more_title_html: Tìm hiểu thêm + title_html: Bản quyền và Giấy phép native: mapping_link: bắt đầu vẽ bản đồ native_link: bản dịch tiếng Việt @@ -1071,12 +1106,9 @@ vi: title: Hộp thư đã gửi to: Tới read: - back_to_inbox: Trở về hộp thư đến - back_to_outbox: Trở về hộp thư đã gửi + back: Quay lại date: Ngày from: Từ - reading_your_messages: Đọc thư - reading_your_sent_messages: Đọc thư đã gửi reply_button: Trả lời subject: Tiêu đề title: Đọc thư @@ -1087,6 +1119,37 @@ vi: wrong_user: Bạn đã đăng nhập dùng tài khoản “%{user}” nhưng vừa yêu cầu trả lời một thư không được gửi đến bạn. Xin hãy đăng nhập với nhận diện chính xác để trả lời. sent_message_summary: delete_button: Xóa + note: + description: + closed_at_by_html: Được %{user} giải quyết cách đây %{when} + closed_at_html: Được giải quyết cách đây %{when} + commented_at_by_html: Được %{user} cập nhật cách đây %{when} + commented_at_html: Được cập nhật cách đây %{when} + opened_at_by_html: Được %{user} tạo cách đây %{when} + opened_at_html: Được tạo cách đây %{when} + reopened_at_by_html: Được %{user} mở lại cách đây %{when} + reopened_at_html: Được mở lại cách đây %{when} + entry: + comment: Bình luận + full: Ghi chú đầy đủ + mine: + ago_html: cách đây %{when} + created_at: Lúc tạo + creator: Người tạo + description: Miêu tả + heading: Ghi chú của %{user} + id: Mã số + last_changed: Thay đổi gần đây nhất + subheading: Các ghi chú do %{user} lưu hoặc bình luận + title: Các ghi chú do %{user} lưu hoặc bình luận + rss: + closed: đóng ghi chú (gần %{place}) + commented: bình luận mới (gần %{place}) + description_area: Danh sách các ghi chú được mở, bình luận, hoặc đóng trong khu vực của bạn [(%{min_lat}|%{min_lon}) – (%{max_lat}|%{max_lon})] + description_item: Nguồn cấp RSS của ghi chú %{id} + opened: mở ghi chú (gần %{place}) + reopened: mở lại ghi chú (gần %{place}) + title: Ghi chú OpenStreetMap notifier: diary_comment_notification: footer: Bạn cũng có thể đọc bình luận tại %{readurl}, bình luận tại %{commenturl}, hoặc trả lời tại %{replyurl} @@ -1102,19 +1165,18 @@ vi: email_confirm_plain: 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. greeting: Chào bạn, - hopefully_you_1: Ai (chắc bạn) muốn đổi địa chỉ thư điện tử bên - hopefully_you_2: "%{server_url} thành %{new_address}." + hopefully_you: Ai đó (chắc bạn) muốn đổi địa chỉ thư điện tử bên %{server_url} thành %{new_address}. friend_notification: - befriend_them: Cũng có thể thêm họ vào danh sách người bạn tại %{befriendurl}. + 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}. 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}. - subject: "[OpenStreetMap] %{user} đã thêm bạn là người bạn" + subject: "[OpenStreetMap] %{user} đã kết bạn với bạn" gpx_notification: and_no_tags: và không có thẻ and_the_tags: "và các thẻ sau:" failure: failed_to_import: "không nhập thành công. Đã gặp lỗi này:" - import_failures_url: http://wiki.openstreetmap.org/wiki/Vi:FAQ#Why_didn.27t_my_GPX_file_upload_properly.3F + import_failures_url: http://wiki.openstreetmap.org/wiki/Vi:FAQ?uselang=vi#Why_didn.27t_my_GPX_file_upload_properly.3F more_info_1: Có thêm chi tiết về vụ nhập GPX bị thất bại và cách tránh more_info_2: "vấn đề này tại:" subject: "[OpenStreetMap] Nhập GPX thất bại" @@ -1133,56 +1195,56 @@ vi: lost_password_plain: 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. greeting: Chào bạn, - hopefully_you_1: Ai (chắc bạn) đã xin đặt lại mật khẩu của tài khoản openstreetmap.org - hopefully_you_2: có địa chỉ thư điện tử này. + 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. message_notification: - footer1: Bạn cũng có thể đọc thư này tại %{readurl} - footer2: và trả lời tại %{replyurl} + footer_html: Bạn cũng có thể đọc tin nhắn này tại %{readurl} và có thể trả lời tại %{replyurl} header: "%{from_user} đã gửi thư cho bạn dùng OpenStreetMap có tiêu đề %{subject}:" hi: Chào %{to_user}, + note_comment_notification: + anonymous: Người dùng vô danh + closed: + commented_note: "%{commenter} đã giải quyết một ghi chú mà bạn đã bình luận, ghi chú gần %{place}." + subject_other: "[OpenStreetMap] %{commenter} đã giải quyết một ghi chú mà bạn đang quan tâm" + subject_own: "[OpenStreetMap] %{commenter} đã giải quyết một ghi chú của bạn" + your_note: "%{commenter} đã giải quyết một ghi chú bản đồ của bạn gần %{place}." + commented: + commented_note: "%{commenter} đã bình luận tiếp theo bạn trên một ghi chú bản đồ gần %{place}." + subject_other: "[OpenStreetMap] %{commenter} đã bình luận trên một ghi chú mà bạn đang quan tâm" + subject_own: "[OpenStreetMap] %{commenter} đã bình luận trên một ghi chú của bạn" + your_note: "%{commenter} đã bình luận trên một ghi chú bản đồ của bạn gần %{place}." + details: Xem chi tiết về ghi chú tại %{url}. + greeting: Chào bạn, + reopened: + commented_note: "%{commenter} đã mở lại một ghi chú mà bạn đã bình luận, ghi chú gần %{place}." + subject_other: "[OpenStreetMap] %{commenter} đã mở lại một ghi chú mà bạn đang quan tâm" + subject_own: "[OpenStreetMap] %{commenter} đã mở lại một ghi chú của bạn" + your_note: "%{commenter} đã mở lại một ghi chú bản đồ của bạn gần %{place}." signup_confirm: - subject: "[OpenStreetMap] Xác nhận địa chỉ thư điện tử của bạn" - signup_confirm_html: - ask_questions: Có thể đặt bất kỳ câu hỏi mà bạn có về OpenStreetMap tại trang hỏi đáp. - click_the_link: Nếu bạn là người đó, hoan nghênh! Xin hãy nhấn chuột vào liên kết ở dưới để xác nhân tài khoản đó và đọc tiếp để tìm hiểu thêm về OpenStreetMap. - current_user: Có danh sách các người dùng, xếp thể loại theo nơi ở, tại Category:Users by geographical region. - get_reading: Bắt đầu tìm hiểu về OpenStreetMap tại wiki, theo dõi tin tức gần đây tại blog OpenGeoData hay Twitter, hoặc đọc blog và nghe podcast của nhà sáng lập Steve Coast! - greeting: Chào bạn! - hopefully_you: Ai (chắc bạn) muốn mở tài khoản bên - introductory_video: Bạn có thể coi %{introductory_video_link}. - more_videos: Cũng có %{more_videos_link}. - more_videos_here: thêm video tại đây - user_wiki_page: Bạn nên tạo ra trang cá nhân trên wiki và gắn các thẻ thể loại để cho người ta biết bạn ở đâu, thí dụ như [[Category:Users in Hanoi]]. - video_to_openstreetmap: video giới thiệu về OpenStreetMap - wiki_signup: Có lẽ bạn cũng muốn mở tài khoản ở wiki OpenStreetMap. - signup_confirm_plain: - ask_questions: "Có thể đặt bất kỳ câu hỏi mà bạn có về OpenStreetMap tại trang hỏi đáp:" - blog_and_twitter: "Theo dõi tin tức gần đây tại blog OpenStreetMap và Twitter:" - click_the_link_1: Nếu bạn là người đó, hoan nghênh! Xin hãy nhấn chuột vào liên kết ở dưới để - click_the_link_2: xác nhận tài khoản của bạn và đọc tiếp để tìm hiểu thêm về OpenStreetMap. - current_user_1: Có danh sách các người dùng, xếp thể loại theo nơi ở, - current_user_2: "tại:" + confirm: "Trước tiên, chúng tôi cần xác nhận bạn là người mở tài khoản này. Nếu phải, xin vui lòng sử dụng liên kết ở dưới để xác nhận tài khoản mới của bạn:" + created: Ai đó (có lẽ là bạn) vừa mở tài khoản tại %{site_url}. greeting: Chào bạn! - hopefully_you: Ai (chắc bạn) muốn mở tài khoản bên - introductory_video: "Bạn có thể coi video giới thiệu OpenStreetMap tại đây:" - more_videos: "Có thêm video tại đây:" - opengeodata: "OpenGeoData.org là blog của nhà sáng lập OpenStreetMap, Steve Coast, cũng chứa podcast:" - the_wiki: "Bắt đầu tìm hiểu về OpenStreetMap trên wiki:" - the_wiki_url: http://wiki.openstreetmap.org/wiki/Vi:Beginners%27_Guide?uselang=vi - user_wiki_1: Bạn nên tạo ra trang cá nhân trên wiki và gắn các thẻ thể loại để cho - user_wiki_2: người ta biết bạn ở đâu, thí dụ như [[Category:Users in Hanoi]]. - wiki_signup: "Có lẽ bạn cũng muốn mở tài khoản ở wiki OpenStreetMap tại:" - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Vi:Main_Page&uselang=vi + subject: "[OpenStreetMap] Chào mừng bạn đã tham gia OpenStreetMap" + welcome: Sau khi bạn xác nhận tài khoản của bạn, chúng tôi sẽ cung cấp một số thông tin về cách bắt đầu. oauth: oauthorize: allow_read_gpx: truy cập các tuyến đường GPS bí mật của bạn. allow_read_prefs: truy cập tùy chọn cá nhân. allow_to: "Cho phép trình khách:" allow_write_api: sửa đổi bản đồ. - allow_write_diary: tạo mục trong nhật ký, bình luận, và thêm người bạn. + allow_write_diary: tạo mục trong nhật ký, bình luận, và kết bạn. allow_write_gpx: tải lên tuyến đường GPS. + allow_write_notes: thay đổi ghi chú. allow_write_prefs: thay đổi tùy chọn cá nhân. request_access: Chương trình %{app_name} xin phép truy cập tài khoản của bạn, %{user}. Xin hãy chọn những khả năng mà bạn muốn cấp cho chương trình này. Bạn có thể chọn nhiều hay ít khả năng tùy ý. + title: Cho phép truy cập tài khoản của bạn + oauthorize_failure: + denied: Bạn đã từ chối ứng dụng %{app_name} không được phép truy cập tài khoản của bạn. + invalid: Dấu hiệu cho phép không hợp lệ. + title: Yêu cầu cho phép bị thất bại + oauthorize_success: + allowed: Bạn đã cho phép ứng dụng %{app_name} truy cập tài khoản của bạn. + title: Yêu cầu cho phép được chấp nhận + verification: Mã xác minh là %{code}. revoke: flash: Bạn đã thu hồi dấu của %{application} oauth_clients: @@ -1197,8 +1259,9 @@ vi: allow_read_gpx: truy cập các tuyến đường GPS bí mật của họ. allow_read_prefs: truy cập tùy chọn cá nhân. allow_write_api: sửa đổi bản đồ. - allow_write_diary: tạo mục trong nhật ký, bình luận, và thêm người bạn. + allow_write_diary: tạo mục trong nhật ký, bình luận, và kết bạn. allow_write_gpx: tải lên tuyến đường GPS. + allow_write_notes: thay đổi ghi chú. allow_write_prefs: thay đổi tùy chọn cá nhân. callback_url: URL Gọi lại name: Tên @@ -1212,7 +1275,7 @@ vi: list_tokens: "Các dấu ở dưới được gửi cho chương trình dùng tên của bạn:" my_apps: Trình khách của Tôi my_tokens: Chương trình Tôi Cho phép - no_apps: Bạn có muốn đăng ky chương trình của bạn với chúng tôi dùng tiêu chuẩn %{oauth}? Bạn cần phải đăng ký chương trình Web trước khi gửi yêu cầu OAuth được. + no_apps: Bạn có muốn đăng ký chương trình của bạn với chúng tôi dùng tiêu chuẩn %{oauth}? Bạn cần phải đăng ký chương trình Web trước khi gửi yêu cầu OAuth được. register_new: Đăng ký chương trình của bạn registered_apps: "Các trình khá ở dưới đã được đăng ký:" revoke: Thu hồi! @@ -1227,8 +1290,9 @@ vi: allow_read_gpx: truy cập các tuyến đường GPS bí mật của họ. allow_read_prefs: truy cập tùy chọn cá nhân. allow_write_api: sửa đổi bản đồ. - allow_write_diary: tạo mục trong nhật ký, bình luận, và thêm người bạn. + allow_write_diary: tạo mục trong nhật ký, bình luận, và kết bạn. allow_write_gpx: tải lên tuyến đường GPS. + allow_write_notes: thay đổi ghi chú. allow_write_prefs: thay đổi tùy chọn cá nhân. authorize_url: "Cho phép URL:" confirm: Bạn có chắc không? @@ -1237,7 +1301,7 @@ vi: key: "Từ khóa Tiêu dùng:" requests: "Yêu cầu các khả năng của người dùng ở dưới:" secret: "Mật khẩu Tiêu dùng:" - support_notice: Chúng tôi hỗ trợ mã hóa HMAC-SHA1 (khuyên dùng) cũng như văn bản thuần với chế độ ssl. + support_notice: Chúng tôi hỗ trợ các chữ ký HMAC-SHA1 (khuyên dùng) và RSA-SHA1. title: Chi tiết OAuth của %{app_name} url: "URL của Dấu Yêu cầu:" update: @@ -1277,6 +1341,7 @@ vi: edit: anon_edits_link_text: Tại sao vậy? flash_player_required: 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. + 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. not_public: Bạn chưa đưa ra công khai các sửa đổi của bạn. not_public_description: Nếu không đưa ra công khai, bạn không còn được phép sửa đổi bản đồ. Bạn có thể đưa ra công khai tại %{user_page}. @@ -1285,18 +1350,15 @@ vi: 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ó.) user_page_link: trang cá nhân index: + createnote: Thêm ghi chú js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript. js_2: OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn. license: - license_name: Creative Commons Ghi công–Chia sẻ tương tự 2.0 - notice: "%{project_name} và những người đóng góp cho phép sử dụng theo giấy phép %{license_name}." - project_name: Dự án OpenStreetMap + copyright: Bản quyền của OpenStreetMap và những người đóng góp, được phát hành theo giấy phép mở permalink: Liên kết Thường trực remote_failed: Thất bại mở trình vẽ – hãy chắc chắn rằng JOSM hoặc Markaartor đã khởi động và tùy chọn phần điều khiển từ xa được kích hoạt shortlink: Liên kết Ngắn gọn key: - map_key: Chú giải - map_key_tooltip: Chú giải bản đồ table: entry: admin: Biên giới hành chính @@ -1311,7 +1373,7 @@ vi: byway: Đường mòn đa mốt cable: - Đường xe cáp - - thang kéo trượt tuyết + - ghế cáp treo cemetery: Nghĩa địa centre: Trung tâm thể thao commercial: Khu vực thương mại @@ -1334,7 +1396,7 @@ vi: motorway: Đường cao tốc park: Công viên permissive: Đường cho phép - pitch: Sân thể thao + pitch: Sân cỏ primary: Đường chính private: Đường riêng rail: Đường sắt @@ -1382,7 +1444,6 @@ vi: preview: Xem trước search: search: Tìm kiếm - search_help: "thí dụ: “Thượng Hải”, “Hai Bà Trưng, Hà Nội”, “CB2 5AQ”, hoặc “bưu điện gần Tân Sơn Nhất” – thêm thí dụ…" submit_text: Đi where_am_i: Tôi ở đâu? where_am_i_title: Miêu tả vị trí đang ở dùng máy tìm kiếm @@ -1398,6 +1459,9 @@ vi: upload_trace: Tải lên Tuyến đường GPS delete: scheduled_for_deletion: Tuyến đường chờ được xóa + description: + description_with_count: Tập tin GPX của %{user} có %{count} địa điểm + description_without_count: Tập tin GPX của %{user} edit: description: "Miêu tả:" download: tải về @@ -1414,9 +1478,13 @@ vi: title: Sửa đổi tuyến đường %{name} uploaded_at: "Lúc tải lên:" visibility: "Mức độ truy cập:" - visibility_help: có nghĩa là gì? + visibility_help: điều này có nghĩa là gì? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi + georss: + title: Tuyến đường GPS OpenStreetMap list: + description: Xem những tuyến đường GPS được tải lên gần đây + empty_html: Chưa có gì ở đây. Tải lên tuyến đường mới hoặc tìm hiểu thêm về tuyến đường GPS tại trang wiki. public_traces: Tuyến đường GPS công khai public_traces_from: Tuyến đường GPS công khai của %{user} tagged_with: " có thẻ %{tags}" @@ -1453,7 +1521,7 @@ vi: upload_button: Tải lên upload_gpx: "Tải lên Tập tin GPX:" visibility: "Mức độ Truy cập:" - visibility_help: có nghĩa là gì? + visibility_help: điều này có nghĩa là gì? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces?uselang=vi trace_header: see_all_traces: Xem tất cả các tuyến đường @@ -1463,9 +1531,9 @@ vi: trace_optionals: tags: Thẻ trace_paging_nav: - next: Sau » - previous: « Trước - showing_page: Đang hiện trang %{page} + newer: Tuyến đường Mới hơn + older: Tuyến đường Cũ hơn + showing_page: Trang %{page} view: delete_track: Xóa tuyến đường này description: "Miêu tả:" @@ -1505,6 +1573,10 @@ vi: email never displayed publicly: (không lúc nào hiện công khai) flash update success: Đã cập nhật thông tin cá nhân thành công. flash update success confirm needed: Đã cập nhật thông tin cá nhân thành công. Kiểm tra thư điện tử xác nhận địa chỉ thư điện tử mới. + gravatar: + gravatar: Sử dụng Gravatar + link: http://wiki.openstreetmap.org/wiki/Gravatar?uselang=vi + link text: đây là gì? home location: "Vị trí Nhà:" image: "Hình:" image size hint: (hình vuông ít nhất 100×100 điểm ảnh là tốt nhất) @@ -1540,19 +1612,19 @@ vi: update home location on click: Cập nhật vị trí nhà khi tôi nhấn chuột vào bản đồ? confirm: already active: Tài khoản này đã được xác nhận rồi. - before you start: Có lẽ bạn muốn vội vàng bắt đầu vẽ bản đồ, nhưng trước tiên xin vui lòng tự giới thiệu về bạn trong biểu mẫu ở dưới. button: Xác nhận - heading: Xác nhận tài khoản người dùng + heading: Hãy kiểm tra hộp thư điện tử! + introduction_1: Chúng tôi đã gửi cho bạn một thư điện tử xác nhận. + introduction_2: Hãy xác nhận tài khoản của bạn dùng liên kết trong thư điện tử để bắt đầu đóng góp vào bản đồ. press confirm button: Bấm nút Xác nhận ở dưới để xác nhận tài khoản. - reconfirm: Nếu mở tài khoản lâu rồi có thể cần gửi mình một thư xác nhận mới. - success: Đã xác nhận tài khoản của bạn. Cám ơn bạn đã đăng ký! - unknown token: Hình như dấu hiệu đó không tồn tại. + reconfirm_html: Nhấn vào đây để gửi thư điện tử xác nhận lần nữa. + unknown token: Dấu hiệu xác nhận này đã hết hạn hoặc không tồn tại. confirm_email: button: Xác nhận failure: Một địa chỉ thư điện tử đã được xác nhận dùng dấu hiệu này. heading: Xác nhận thay đổi địa chỉ thư điện tử press confirm button: Bấm nút Xác nhận ở dưới để xác nhận địa chỉ thư điện tử mới. - success: Đã xác nhận địa chỉ thư điện tử mới. Cám ơn bạn đã đăng ký! + success: Đã xác nhận địa chỉ thư điện tử mới. Cám ơn bạn đã mở tài khoản! confirm_resend: failure: Không tìm thấy người dùng %{name}. success: Chúng tôi đã gửi thư xác nhận đến %{email}; ngay khi xác nhận tài khoản, bạn sẽ có thể vẽ bản đồ.

    Nếu hộp thư của bạn gửi thư yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này. @@ -1576,14 +1648,12 @@ vi: account not active: Rất tiếc, tài khoản của bạn chưa được kích hoạt.
    Xin hãy nhấn chuột vào liên kết trong thư điện tử xác nhận tài khoản để kích hoạt tài khoản, hoặc yêu cầu thư xác nhận mới. auth failure: Rất tiếc, không thể đăng nhập với những chi tiết đó. create account minute: Chỉ mất một phút để mở tài khoản mới. - email or username: "Địa chỉ Thư điện tử hoặc Tên đăng ký:" + email or username: "Địa chỉ Thư điện tử hoặc Tên người dùng:" heading: Đăng nhập login_button: Đăng nhập lost password link: Quên mất Mật khẩu? new to osm: Mới đến OpenStreetMap? no account: Chưa có tài khoản? - notice: Tìm hiểu thêm về thay đổi giấy phép sắp tới của OpenStreetMap (bản dịch) (thảo luận) - notice_terms: OpenStreetMap sẽ đổi qua một giấy phép mới vào ngày 1 tháng 4 năm 2012. Giấy phép mới vẫn mở như giấy phép hiện tại, trong khi các chi tiết pháp lý mới phù hợp hơn với cơ sở dữ liệu bản đồ của chúng ta. Chúng tôi rất muốn tiếp tục bao gồm các đóng góp của bạn trong OpenStreetMap; tuy nhiên, bạn cần phải cho phép chúng tôi phân phối các đóng góp này theo các điều khoản của giấy phép mới. Nếu không cho phép, chúng tôi sẽ phải xóa chúng khỏi cơ sở dữ liệu.

    Xin làm ơn đăng nhập rồi đọc lại và chấp nhận các điều khoản mới, chỉ mất vài giây thôi. Cám ơn! openid: "%{logo} OpenID:" openid invalid: Rất tiếc, hình như OpenID của bạn không hợp lệ openid missing provider: Rất tiếc, không thể kết nối với nhà cung cấp OpenID của bạn @@ -1608,7 +1678,7 @@ vi: alt: Đăng nhập với OpenID của Yahoo! title: Đăng nhập với Yahoo! password: "Mật khẩu:" - register now: Đăng ký ngay + register now: Mở tài khoản ngay remember: Nhớ tôi title: Đăng nhập to make changes: Bạn phải có tài khoản để thay đổi dữ liệu OpenStreetMap. @@ -1621,29 +1691,31 @@ vi: lost_password: email address: "Địa chỉ Thư điện tử:" heading: Quên mất Mật khẩu? - help_text: Điền vào địa chỉ thư điện tử của bạn khi đăng ký, rồi chúng tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu. + help_text: Nhập địa chỉ thư điện tử mà bạn đã dùng để mở tài khoản, rồi chúng tôi sẽ gửi liên kết cho địa chỉ đó để cho bạn đặt lại mật khẩu. new password button: Đặt lại mật khẩu notice email cannot find: Rất tiếc, không tìm thấy địa chỉ thư điện tử. notice email on way: Đáng tiếc là bạn quên nó. :-( May là thư điện tử sắp tới để bạn đặt nó lại. title: Quên mất mật khẩu make_friend: already_a_friend: "%{name} đã là người bạn." - failed: Rất tiếc, việc thêm %{name} là người bạn bị thất bại. - success: "%{name} mới là người bạn." + button: Thêm là người bạn + failed: Rất tiếc, thất bại khi kết bạn với %{name}. + heading: Kết bạn với %{user}? + success: "%{name} bây giờ là bạn bè của bạn!" new: + about: + header: Tự do sử dụng và sửa đổi + html: "

    Khác với mọi bản đồ khác, OpenStreetMap hoàn toàn được xây dựng bởi những người như bạn và cho phép mọi người chỉnh sửa, cập nhật, tải về, và sử dụng miễn phí cho bất kỳ mục đích.

    \n

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

    " confirm email address: "Xác nhận Địa chỉ Thư điện tử:" confirm password: "Xác nhận Mật khẩu:" contact_webmaster: Xin hãy liên lạc với webmaster để xin họ tạo ra tài khoản - chúng tôi sẽ cố gắng thỏa mãn yêu cầu nhanh lẹ. - continue: Tiếp tục + continue: Mở tài khoản display name: "Tên hiển thị:" - display name description: Tên đăng ký của bạn được hiển thị công khai. Bạn có thể thay đổi tên này về sau trong tùy chọn. + display name description: Tên người dùng của bạn được hiển thị công khai. Bạn có thể thay đổi tên này về sau trong tùy chọn. email address: "Địa chỉ Thư điện tử:" - fill_form: Điền biểu mẫu rồi chúng tôi sẽ gửi thư điện tử cho bạn để kích hoạt tài khoản. - flash create success message: Cám ơn bạn đã đăng ký. Chúng tôi đã gửi thư xác nhận đến %{email}; ngay khi xác nhận tài khoản, bạn sẽ có thể vẽ bản đồ.

    Nếu hộp thư của bạn gửi thư yêu cầu xác nhận để chống thư rác, xin chắc chắn thêm webmaster@openstreetmap.org vào danh sách trắng, vì chúng tôi không thể trả lời những yêu cầu xác nhận này. - heading: Mở Tài khoản Người dùng license_agreement: Lúc khi xác nhận tài khoản, bạn sẽ phải chấp nhận các Điều kiện Đóng góp. no_auto_account_create: Rất tiếc, chúng ta hiện không có khả năng tạo ra tài khoản tự động cho bạn. - not displayed publicly: Không được hiển thị công khai (xem chính sách riêng tư) + not displayed publicly: Không được hiển thị công khai (xem quy định quyền riêng tư) openid: "%{logo} OpenID:" openid association: "

    OpenID của bạn chưa được nối với một tài khoản OpenStreetMap.

    \n
      \n
    • Nếu bạn mới đến OpenStreetMap, hãy mở tài khoản dùng biểu mẫu ở dưới.
    • \n
    • Nếu đã có tài khoản, bạn có thể đăng nhập vào tài khoản của bạn dùng tên người dùng và một khẩu thường và nối tài khoản với OpenID của bạn tại trang tùy chọn.
    • \n
    " openid no password: Khi đăng nhập dùng OpenID, bạn sẽ không cần đưa vào mật khẩu. Tuy nhiên, một số công cụ hoặc máy chủ phụ vẫn có thể cần mật khẩu. @@ -1662,8 +1734,10 @@ vi: nearby mapper: Người vẽ bản đồ ở gần your location: Vị trí của bạn remove_friend: + button: Hủy kết nối bạn + heading: Hủy kết nối bạn với %{user}? not_a_friend: "%{name} đã không phải người bạn." - success: "%{name} không còn là người bạn." + success: "%{name} đã được xóa khỏi danh sách bạn của bạn." reset_password: confirm password: "Xác nhận Mật khẩu:" flash changed: Mật khẩu của bạn đã được thay đổi. @@ -1698,12 +1772,12 @@ vi: you need to accept or decline: Để tiếp tục, xin vui lòng đọc các Điều khoản Đóng góp mới và chấp nhận hoặc từ chối chúng. view: activate_user: kích hoạt tài khoản này - add as friend: thêm là người bạn + add as friend: Kết Bạn ago: (cách đây %{time_in_words_ago}) - block_history: xem các tác vụ cấm người này - blocks by me: tác vụ cấm bởi tôi - blocks on me: tác vụ cấm tôi - comments: bình luận + block_history: tác vụ cấm người này + blocks by me: Tác vụ Cấm bởi Tôi + blocks on me: Tác vụ Cấm Tôi + comments: Bình luận confirm: Xác nhận confirm_user: xác nhận người dùng này create_block: cấm người dùng này @@ -1715,31 +1789,35 @@ vi: deactivate_user: vô hiệu hóa tài khoản này delete_user: xóa tài khoản này description: Miêu tả - diary: nhật ký - edits: đóng góp + diary: Nhật ký + edits: Đóng góp email address: "Địa chỉ thư điện tử:" - friends_changesets: Xem những bộ thay đổi của bạn bè - friends_diaries: Đọc những mục nhật ký của bạn bè + friends_changesets: bộ thay đổi của bạn bè + friends_diaries: mục nhật ký của bạn bè hide_user: ẩn tài khoản này - if set location: Nếu đặt vị trí, bản đồ đẹp đẽ và những thứ đó sẽ được hiển thị ở dưới. Bạn có thể đặt vị trí nhà tại trang %{settings_link}. + if set location: Đặt vị trí nhà tại trang %{settings_link} để xem những người dùng ở gần. km away: cách %{count} km latest edit: "Sửa đổi gần đây nhất cách đây %{ago}:" m away: cách %{count} m mapper since: "Tham gia:" - moderator_history: xem các tác vụ cấm bởi người này - my comments: bình luận của tôi - my diary: nhật ký của tôi - my edits: đóng góp của tôi - my settings: tùy chọn - my traces: tuyến đường của tôi + moderator_history: tác vụ cấm bởi người này + my comments: Bình luận của Tôi + my diary: Nhật ký của Tôi + my edits: Đóng góp của Tôi + my messages: Hộp Tin nhắn + my notes: Ghi chú của Tôi + my profile: Trang của Tôi + my settings: Tùy chọn + my traces: Tuyến đường của Tôi nearby users: Người dùng khác ở gần - nearby_changesets: Xem các bộ thay đổi của người dùng ở gần - nearby_diaries: Đọc các mục nhật ký của người dùng ở gần + nearby_changesets: bộ thay đổi của người dùng ở gần + nearby_diaries: mục nhật ký của người dùng ở gần new diary entry: mục nhật ký mới - no friends: Bạn chưa thêm người bạn. + no friends: Bạn chưa thêm bạn bè. no nearby users: Không có người dùng nào nhận rằng họ ở gần. + notes: Ghi chú trên Bản đồ oauth settings: thiết lập OAuth - remove as friend: dời người bạn + remove as friend: Hủy Kết Bạn role: administrator: Người dùng này là quản lý viên grant: @@ -1749,14 +1827,14 @@ vi: revoke: administrator: Rút quyền quản lý viên moderator: Rút quyền điều hành viên - send message: gửi thư + send message: Gửi Thư settings_link_text: tùy chọn spam score: "Điểm số Spam:" status: "Trạng thái:" - traces: tuyến đường + traces: Tuyến đường unhide_user: hiện tài khoản này user location: Vị trí của người dùng - your friends: Người bạn của bạn + your friends: Bạn bè của bạn user_block: blocks_by: empty: "%{name} chưa cấm ai." @@ -1811,11 +1889,14 @@ vi: creator_name: Người cấm display_name: Người bị cấm edit: Sửa đổi + next: Sau » not_revoked: (không bị hủy) + previous: « Trước reason: Lý do cấm revoke: Bỏ cấm! revoker_name: Người bỏ cấm show: Hiện + showing_page: Trang %{page} status: Trạng thái period: "%{count} giờ" revoke: @@ -1861,3 +1942,25 @@ vi: fail: Không thể rút vai trò “%{role}” của người dùng “%{name}”. Vui lòng kiểm tra rằng tên người dùng và vai trò đều hợp lệ. heading: Xác nhận rút vai trò title: Xác nhận rút vai trò + welcome_page: + add_a_note: + paragraph_1_html: Nếu bạn chỉ muốn sửa một chi tiết nhỏ và không có thì giờ tập sửa đổi, bạn có thể thêm một ghi chú dễ dàng. + paragraph_2_html: "Chỉ việc mở bản đồ và bấm hình ghi chú\n để thả đinh ghim trên bản đồ. Kéo ghim vào đúng vị trí, ghi lời miêu tả vấn đề, và bấm “Thêm Ghi chú”. Cộng đồng sẽ cố gắng sửa theo ý của bạn." + title: Không có Thì giờ Sửa đổi? Thêm một Ghi chú! + basic_terms: + editor_html: Trình vẽ là một ứng dụng hoặc trang Web cho phép sửa đổi bản đồ. + node_html: Nốt là một địa điểm trên bản đồ, thí dụ một nhà hàng hoặc một cái cây. + paragraph_1_html: "Đây là những thuật ngữ thường gặp khi sử dụng và đóng góp vào OpenStreetMap:" + tag_html: Thẻ là một chi tiết về một nốt hoặc lối, thí dụ tên của một nhà hàng hoặc tốc độ tối đa của một con đường. + title: Thuật ngữ Cơ bản + way_html: Lối là một đường kẻ hoặc vùng, thí dụ con đường, dòng nước, hồ nước, hoặc tòa nhà. + introduction_html: Chào mừng bạn đã đến OpenStreetMap, bản đồ thế giới có dữ liệu mở được xây dựng bởi những người như bạn. Bây giờ bạn đã mở tài khoản thì hãy cùng góp sức vẽ bản đồ. Đây là những căn bản cần biết để bắt đầu đóng góp. + questions: + paragraph_1_html: "OpenStreetMap có nhiều tài nguyên để cho bạn tìm hiểu về dự án, hỏi đáp, và cộng tác soạn thảo tài liệu về các đề tài bản đồ.\nNhận trợ giúp tại đây." + title: Có thắc mắc? + start_mapping: Bắt đầu Đóng góp + title: Hoan nghênh! + whats_on_the_map: + off_html: Nó không chứa các ý kiến như bài đánh giá, những gì không hoặc không còn tồn tại, hoặc thông tin từ các nguồn giữ bản quyền. Bạn phải xin phép của nhà giữ bản quyền mới được sao chép từ bản đồ giấy hay bản đồ trực tuyến khác. + on_html: OpenStreetMap là bản đồ chứa bất cứ những gì hiện tại có thật – nó chứa biết bao tòa nhà, con đường, cửa hàng, cơ sở hạ tầng, cây cối… đủ mọi thứ. Mời bạn bổ sung bất cứ những gì thu hút sự quan tâm của bạn. + title: Mục đích của Bản đồ diff --git a/config/locales/yo.yml b/config/locales/yo.yml index 3fb1858d079..7176f1c8ba2 100644 --- a/config/locales/yo.yml +++ b/config/locales/yo.yml @@ -39,7 +39,7 @@ yo: object_list: selected: type: - way: Ona [[id]] + way: Ona %{id} type: way: Ona wait: Duro... diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 82ff5ddd3b0..8f599a7e729 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1,444 +1,377 @@ -# Messages for Simplified Chinese (‪中文(简体)‬) +# Messages for Simplified Chinese (中文(简体)‎) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Anakmalaysia +# Author: Dimension # Author: Hydra +# Author: Hzy980512 +# Author: Jiwei # Author: Liangent +# Author: Liuxinyu970226 # Author: Mmyangfl +# Author: Nemo bis # Author: PhiLiP +# Author: Qiyue2001 # Author: Shizhao +# Author: StephDC # Author: Xiaomingyan +# Author: Yfdyh000 +# Author: 乌拉跨氪 zh-CN: + about_page: + community_driven_title: 社区驱动 + copyright_html: ©OpenStreetMap
    贡献者 + local_knowledge_html: OpenStreetMap强调使用本地知识。贡献者们使用航空图像,GBS设备与低科技地区地图来确保OSM的精确性和时效性。 + local_knowledge_title: 本地知识库 + next: 继续 + open_data_title: 开放数据 + partners_title: 合作伙伴 activerecord: attributes: diary_comment: - body: 内容 + body: 正文 diary_entry: language: 语言 latitude: 纬度 longitude: 经度 - title: 标题 + title: 主题 user: 用户 friend: friend: 朋友 user: 用户 message: - body: 内容 + body: 正文 recipient: 收件人 - sender: 发送人 - title: 标题 + sender: 发件人 + title: 主题 trace: description: 说明 latitude: 纬度 longitude: 经度 name: 姓名 - public: 公共 + public: 公开 size: 大小 user: 用户 - visible: 可见性 + visible: 可见 user: active: 激活 description: 说明 display_name: 显示姓名 - email: 邮件 + email: 电子邮件 languages: 语言 pass_crypt: 密码 models: acl: 访问控制列表 - changeset: 修改集合 - changeset_tag: 修改集合标签 + changeset: 变更集 + changeset_tag: 变更集标签 country: 国家 diary_comment: 日记评论 - diary_entry: 日记条目 + diary_entry: 日记文章 friend: 朋友 language: 语言 message: 信息 node: 节点 node_tag: 节点标签 - notifier: 通知 + notifier: 通知人 old_node: 旧节点 old_node_tag: 旧节点标签 old_relation: 旧关系 - old_relation_member: 旧关系对象 + old_relation_member: 旧关系成员 old_relation_tag: 旧关系标签 old_way: 旧路径 old_way_node: 旧路径节点 old_way_tag: 旧路径标签 relation: 关系 - relation_member: 关系对象 + relation_member: 关系成员 relation_tag: 关系标签 session: 会话 - trace: 跟踪 - tracepoint: 跟踪点 - tracetag: 跟踪标签 + trace: 轨迹 + tracepoint: 轨迹点 + tracetag: 轨迹标签 user: 用户 - user_preference: 用户首选项 + user_preference: 用户设置 user_token: 用户令牌 way: 路径 way_node: 路径节点 way_tag: 路径标签 application: require_cookies: - cookies_needed: 您似乎已禁用了 cookies - 请在浏览器中启用 cookies,然后继续。 + cookies_needed: 你似乎停用了cookie - 请在继续操作前启用你的浏览器cookie。 + require_moderator: + not_a_moderator: 必须为管理员才能执行该操作。 setup_user_auth: - blocked: 您对 API 的访问已经被阻挡了。请登录到网站以了解更多信息。 - need_to_see_terms: 您对 API 的访问已暂时中止。请登录到网站以查看贡献者条款。您不需要同意,但必须查看它们。 + blocked: 你对 API 的访问已经被阻挡了。请登录到网站以了解更多信息。 + need_to_see_terms: 你对 API 的访问已暂时中止。请登录到网站以查看贡献者条款。你不需要同意,但必须查看它们。 browse: + anonymous: 匿名用户 changeset: - changeset: 修改集合:%{id} - changesetxml: 修改集合 XML - download: 下载%{changeset_xml_link} 或 %{osmchange_xml_link} + belongs_to: 作者 + changesetxml: 变更集XML feed: - title: 修改集合 %{id} - title_comment: 修改集合 %{id} - %{comment} + title: 变更集%{id} + title_comment: 变更集%{id} - %{comment} + node: 节点(%{count}) + node_paginated: 节点(%{x}-%{y},总计%{count}) osmchangexml: osmChange XML - title: 修改集合 - changeset_details: - belongs_to: 属于: - bounding_box: 限定窗口: - box: 窗口 - closed_at: 关闭于: - created_at: 创建于: - has_nodes: 有如下 %{count} 个节点: - has_relations: 有如下 %{count} 种关系: - has_ways: 有如下 %{count} 条路径: - no_bounding_box: 没有为该修改集合所储存的限定窗口。 - show_area_box: 显示区域窗口 - common_details: - changeset_comment: 评论: - deleted_at: 删除于: - deleted_by: 删除由: - edited_at: 编辑于: - edited_by: 编辑由: - in_changeset: 在修改集合中: - version: 版本: + title: 变更集:%{id} + closed: 关闭于 + closed_by_html: 关闭于%{time}前,由%{user} + closed_html: 关闭于%{time}前 containing_relation: - entry: 关系 %{relation_name} - entry_role: 关系 %{relation_name}(作为 %{relation_role}) - map: - deleted: 删除 - edit: - area: 编辑区域 - node: 编辑节点 - relation: 编辑关系 - way: 编辑路径 - larger: - area: 在较大的地图查看区域 - node: 在较大的地图查看节点 - relation: 在较大的地图查看关系 - way: 在较大的地图查看路径 - loading: 载入中... - navigation: - all: - next_changeset_tooltip: 下个修改集合 - next_node_tooltip: 下个节点 - next_relation_tooltip: 下个关系 - next_way_tooltip: 下个路径 - prev_changeset_tooltip: 上个修改集合 - prev_node_tooltip: 上个节点 - prev_relation_tooltip: 上个关系 - prev_way_tooltip: 上个路径 - paging: - all: - next: "%{id} »" - prev: « %{id} - user: - next: "%{id} »" - prev: « %{id} - user: - name_changeset_tooltip: 查看 %{user} 的编辑 - next_changeset_tooltip: 下一个 %{user} 的编辑 - prev_changeset_tooltip: 上一个 %{user} 的编辑 + entry: 关系%{relation_name} + entry_role: 关系%{relation_name}(作为%{relation_role}) + created: 创建于 + created_by_html: 创建于%{time}前,由%{user} + created_html: 创建于%{time}前 + deleted_by_html: 删除于%{time}前,由%{user} + download_xml: 下载XML + edited_by_html: 编辑于%{time}前,由%{user} + in_changeset: 变更集 + location: 位置: + no_comment: (无评论) node: - download: "%{download_xml_link}、%{view_history_link}或%{edit_link}" - download_xml: 下载 XML - edit: 编辑 - node: 节点 - node_title: 节点:%{node_name} - view_history: 查看历史 - node_details: - coordinates: 坐标: - part_of: 部分: - node_history: - download: "%{download_xml_link} 或%{view_details_link}" - download_xml: 下载 XML - node_history: 节点历史 - node_history_title: 节点历史:%{node_name} - view_details: 查看详细信息 + history_title: 节点历史:%{name} + title: 节点:%{name} not_found: - sorry: 对不起,无法找到 id 为 %{id} 的%{type}。 + sorry: "对不起,无法找到 %{type} #%{id}。" type: - changeset: 修改集合 + changeset: 变更集 node: 节点 relation: 关系 way: 路径 - paging_nav: - of: / - showing_page: 显示页面 + note: + closed_by: "%{user}解决于%{when}前" + closed_by_anonymous: 匿名用户解决于%{when}前 + closed_title: "已解决的注释 #%{note_name}" + commented_by: "%{user}于%{when}前发表的评论" + commented_by_anonymous: 匿名用户于%{when}前发表的评论 + hidden_by: "%{user}隐藏于%{when}前" + hidden_title: 隐藏注释#%{note_name} + new_note: 新建注释 + open_by: "%{user}创建于%{when}前" + open_by_anonymous: 匿名用户创建于%{when}前 + open_title: "未解决的注释 #%{note_name}" + reopened_by: "%{user}于%{when}前重新启用" + reopened_by_anonymous: 匿名用户于%{when}前重新启用 + title: 注释:%{id} + part_of: 属于 redacted: + message_html: 该%{type}的版本%{version}无法显示,因为其已被编辑。详情请见%{redaction_link}。 + redaction: 编辑%{id} type: node: 节点 relation: 关系 way: 路径 relation: - download: "%{download_xml_link} 或%{view_history_link}" - download_xml: 下载 XML - relation: 关系 - relation_title: 关系:%{relation_name} - view_history: 查看历史 - relation_details: - members: 成员: - part_of: 部分: - relation_history: - download: "%{download_xml_link} 或%{view_details_link}" - download_xml: 下载 XML - relation_history: 关系历史 - relation_history_title: 关系历史:%{relation_name} - view_details: 查看详细信息 + history_title: 关系历史:%{name} + members: 成员 + title: 关系:%{name} relation_member: - entry: "%{type} %{name}" - entry_role: "%{type} %{name} 作为 %{role}" + entry: "%{type}%{name}" + entry_role: "%{type}%{name}作为%{role}" type: node: 节点 relation: 关系 way: 路径 - start: - manually_select: 手动选择一个不同区域 - view_data: 查看当前地图视图中的数据 start_rjs: - data_frame_title: 数据 - data_layer_name: 浏览地图数据 - details: 详细信息 - drag_a_box: 通过拖曳窗口来选择区域 - edited_by_user_at_timestamp: 由 [[user]] 于 [[timestamp]] 编辑 - hide_areas: 隐藏区域 - history_for_feature: 历史 [[feature]] - load_data: 加载数据 - loaded_an_area_with_num_features: 您已经选择了包含 [[num_features]] 项特征的区域。通常,有些浏览器无法正常显示这么多的数据。一般而言,浏览器一次显示 100 个以下特征时效果最好;超过这个数量会使您的浏览器变慢/无响应。如果确定要显示这个数据,请按下面的按钮。 - loading: 载入中... - manually_select: 手动选择一个不同区域 - object_list: - api: 从 API 取回这一区域 - back: 显示对象列表 - details: 详细信息 - heading: 对象列表 - history: - type: - node: 节点 [[id]] - way: 路径 [[id]] - selected: - type: - node: 节点 [[id]] - way: 路径 [[id]] - type: - node: 节点 - way: 路径 - private_user: 个人用户 - show_areas: 显示区域 - show_history: 显示历史 - unable_to_load_size: 无法读取:限定窗口的大小 [[bbox_size]] 过大(需小于 %{max_bbox_size}) - wait: 等待中... - zoom_or_select: 放大或选择查看一个地图区域 + feature_warning: 正在加载 %{num_features} 个功能,这可能致使你的浏览器缓慢或失去响应。你确定要显示此数据吗? + load_data: 载入数据 + loading: 正在载入... tag_details: - tags: 标签: + tags: 标签 wiki_link: - key: "%{key} 标签的 wiki 描述页面" - tag: "%{key}=%{value} 标签的 wiki 描述页面" - wikipedia_link: 维基百科上的 %{page} 文章 + key: "%{key}标签的wiki说明页面" + tag: "%{key}=%{value}标签的wiki说明页面" + wikipedia_link: 维基百科上的%{page}条目 timeout: - sorry: 对不起,取得 ID 为 %{id} 的%{type}资料花了太长的时间。 + sorry: 对不起,检索id为%{id}的%{type}的数据耗费时间过长。 type: - changeset: 修改集合 + changeset: 变更集 node: 节点 relation: 关系 way: 路径 + version: 版本 + view_details: 查看详情 + view_history: 查看历史 way: - download: "%{download_xml_link},%{view_history_link}或%{edit_link}" - download_xml: 下载 XML - edit: 编辑 - view_history: 查看历史 - way: 路径 - way_title: 路径:%{way_name} - way_details: - also_part_of: 也是 %{related_ways} 路径的一部分 - nodes: 节点: - part_of: 部分: - way_history: - download: "%{download_xml_link} 或者%{view_details_link}" - download_xml: 下载 XML - view_details: 查看详细信息 - way_history: 路径历史 - way_history_title: 路径历史:%{way_name} + history_title: 路径历史:%{name} + nodes: 节点 + title: 路径:%{name} changeset: changeset: anonymous: 匿名 - big_area: (大) - id: "#%{id}" - no_comment: (空) - no_edits: (没有编辑) - show_area_box: 显示区域窗口 - still_editing: (仍在编辑中) - view_changeset_details: 查看详细变更 + no_edits: (没有编辑) + view_changeset_details: 查看变更集详细信息 changeset_paging_nav: next: 下一页 » previous: « 上一页 - showing_page: 显示第 %{page} 页 + showing_page: 第%{page}页 changesets: area: 区域 comment: 评论 id: ID - saved_at: 保存时间 + saved_at: 保存于 user: 用户 list: - description: 最近更改 - description_bbox: "%{bbox} 内的修改集合" - description_friend: 您的朋友的修改集合 - description_nearby: 附近用户的修改集合 - description_user: "%{user} 的修改集合" - description_user_bbox: "%{user} 在 %{bbox} 内的修改集合" - heading: 修改集合 - heading_bbox: 修改集合 - heading_friend: 修改集合 - heading_nearby: 修改集合 - heading_user: 修改集合 - heading_user_bbox: 修改集合 - title: 修改集合 - title_bbox: "%{bbox} 内的修改集合" - title_friend: 您的朋友的修改集合 - title_nearby: 附近用户的修改集合 - title_user: "%{user} 的修改集合" - title_user_bbox: "%{user} 在 %{bbox} 内的修改集合" + empty: 没有找到变更集。 + empty_area: 在此区域没有变更集。 + empty_user: 没有此用户的变更集。 + load_more: 加载更多 + no_more: 没有更多变更集。 + no_more_area: 在此区域没有更多变更集。 + no_more_user: 没有更多此用户的变更集。 + title: 变更集 + title_friend: 你的朋友的变更集 + title_nearby: 附近用户的变更集 + title_user: "%{user}的变更集" timeout: - sorry: 对不起,取得您要求的修改集合列表时花了太长的时间。 + sorry: 对不起,检索你请求的变更集的列表耗费时间过长。 diary_entry: comments: ago: "%{ago}前" comment: 评论 - has_commented_on: "%{display_name} 在以下的日记中发表了评论" - newer_comments: 新的评论 - older_comments: 旧的评论 - post: 发布 - when: 于 + has_commented_on: "%{display_name}已经评论以下日记文章" + newer_comments: 新评论 + older_comments: 旧评论 + post: 发表 + when: 时间 diary_comment: - comment_from: 由 %{link_user} 于 %{comment_created_at} 发表的评论 + comment_from: "%{link_user}于%{comment_created_at}发表的评论" confirm: 确认 - hide_link: 隐藏此评论 + hide_link: 隐藏该评论 diary_entry: comment_count: - one: 1 回复 - other: "%{count} 回复" - comment_link: 关于此篇评论 + one: "%{count}个评论" + other: "%{count}个评论" + zero: 没有评论 + comment_link: 关于该文章的评论 confirm: 确认 - edit_link: 编辑此篇 - hide_link: 隐藏此项目 - posted_by: 由 %{link_user} 于 %{created} 以 %{language_link} 发表 - reply_link: 对此篇进行回复 + edit_link: 编辑该文章 + hide_link: 隐藏该文章 + posted_by: "%{link_user}于%{created}以%{language_link}发表" + reply_link: 回复该文章 edit: body: 正文: language: 语言: latitude: 纬度: - location: 位置: + location: 地点: longitude: 经度: - marker_text: 日记条目位置 + marker_text: 日记文章地点 save_button: 保存 subject: 标题: - title: 编辑日记条目 + title: 编辑日记文章 use_map_link: 使用地图 feed: all: - description: 用户最近的 OpenStreetMap 日记 - title: OpenStreetMap 日记 + description: 最近的OpenStreetMap用户日记文章 + title: OpenStreetMap日记文章 language: - description: 用户最近的 OpenStreetMap 日记(语言为 %{language_name}) - title: OpenStreetMap 日记(语言为 %{language_name}) + description: 最近的%{language_name}OpenStreetMap用户日记文章 + title: "%{language_name}OpenStreetMap日记文章" user: - description: "%{user} 最近的 OpenStreetMap 日记" - title: "%{user} 的 OpenStreetMap 日记" + description: "%{user}最近的OpenStreetMap日记文章" + title: "%{user}的OpenStreetMap日记文章" list: - in_language_title: 日记(语言为 %{language}) - new: 新日志条目 - new_title: 在您的用户日记中创建一个新条目 - newer_entries: 更新的条目 - no_entries: 没有日记条目 - older_entries: 更早的条目 - recent_entries: 最近的日记条目: + in_language_title: "%{language}日记文章" + new: 新日记文章 + new_title: 在你的用户日记中撰写新文章 + newer_entries: 更新的文章 + no_entries: 没有日记文章 + older_entries: 更老的文章 + recent_entries: 最近的日记文章 title: 用户的日记 title_friends: 朋友的日记 title_nearby: 附近用户的日记 - user_title: "%{user} 的日记" + user_title: "%{user}的日记" location: edit: 编辑 - location: 位置: + location: 地点: view: 查看 new: - title: 新日记条目 + title: 新日记文章 no_such_entry: - body: 对不起,没有 id 为 %{id} 的日记条目或者评论。请检查拼写,或者您点击的链接有误。 - heading: 关于此 id:%{id} 没有条目 - title: 没有这个日记条目 + body: 对不起,没有id为%{id}的日记文章或评论。请检查你的拼写,或是你可能点击了错误的链接。 + heading: 没有文章ID为:%{id} + title: 没有这篇日记文章 view: leave_a_comment: 留下评论 login: 登录 - login_to_leave_a_comment: "%{login_link} 以留下评论" + login_to_leave_a_comment: "%{login_link}以留下评论" save_button: 保存 - title: "%{user} 的日记 | %{title}" - user_title: "%{user} 的日记" + title: "%{user}的日记 | %{title}" + user_title: "%{user}的日记" editor: - default: 默认(目前为 %{name}) + default: 默认(目前为%{name}) + id: + description: iD(浏览器内编辑器) + name: iD potlatch: - description: Potlatch 1(在浏览器中编辑) + description: Potlatch 1(浏览器内编辑器) name: Potlatch 1 potlatch2: - description: Potlatch 2(在浏览器中编辑) + description: Potlatch 2(浏览器内编辑器) name: Potlatch 2 remote: - description: 远程控制(JOSM 或 Merkaartor) + description: 远程控制(JOSM或Merkaartor) name: 远程控制 export: start: - add_marker: 对地图添加一个标记 - area_to_export: 输出区域 - embeddable_html: 嵌入 HTML - export_button: 输出 - export_details: OpenStreetMap 数据是以知识共享 署名-相同方式 2.0 许可授权。 + add_marker: 添加标记至地图 + area_to_export: 要导出的区域 + embeddable_html: 可嵌入HTML + export_button: 导出 + export_details: OpenStreetMap数据采用开放数据共享开放数据库许可协议(ODbL)授权。 format: 格式 - format_to_export: 输出格式 - image_size: 图像尺寸 + format_to_export: 要导出的格式 + image_size: 图像大小 latitude: 纬度: - licence: 协议 + licence: 许可协议 longitude: 经度: - manually_select: 手动选择一个不同的区域 - map_image: 地图图片(显示于标准图层) + manually_select: 手动选择不同的区域 + map_image: 地图图像(显示标准图层) max: 最大 options: 选项 - osm_xml_data: OpenStreetMap XML 数据 - output: 输出 - paste_html: 在网页上粘贴 HTML - scale: 比率 + osm_xml_data: OpenStreetMap XML数据 + output: 导出 + paste_html: 粘贴可嵌入网站的HTML + scale: 比例 too_large: - body: 这个区域太大,无法导出 OpenStreetMap XML 数据。请放大或选择一个较小的区域。 - heading: 区域太大 - zoom: 变焦 - start_rjs: - add_marker: 标记地图 - change_marker: 更改标记位置 - click_add_marker: 点击地图来添加一个标记 - drag_a_box: 通过拖曳窗口来选择区域 - export: 输出 - manually_select: 手动选择一个不同区域 - view_larger_map: 查看放大地图 + advice: 如果用上面的导出工具失败了,请考虑使用下面列出的来源来导出: + body: 该区域过大,不能导出为OpenStreetMap XML数据。请放大地图或选择一个更小的区域,或使用以下大量数据下载来源之一: + geofabrik: + description: 定期更新的洲、 国家和特定城市的摘录 + title: Geofabrik下载 + metro: + description: 世界主要城市和周边地区的摘录 + title: 大城市摘录 + other: + description: OpenStreetMap wiki上列出的其他来源 + title: 其他来源 + overpass: + description: 从OpenStreetMap数据库的一个镜像下载此定界框 + title: Overpass API + planet: + description: 定期更新的完整OpenStreetMap数据库副本 + title: OSM星球 + zoom: 缩放 + title: 导出 + fixthemap: + how_to_help: + join_the_community: + title: 加入社区 + title: 如何帮助 + other_concerns: + title: 其他问题 + title: 报告问题/修复地图 geocoder: description: title: - geonames: 来自 GeoNames 的位置 - osm_namefinder: 来自 OpenStreetMap 名称查找器的%{types} - osm_nominatim: 来自 OpenStreetMap Nominatim 的位置 + geonames: GeoNames中的位置 + osm_nominatim: OpenStreetMap Nominatim中的位置 types: cities: 城市 places: 地区 - towns: 乡镇 - description_osm_namefinder: - prefix: 以%{direction} %{distance}的%{type} + towns: 城镇 direction: east: 东 north: 北 @@ -449,55 +382,63 @@ zh-CN: south_west: 西南 west: 西 distance: - one: 大约 1 公里 - other: 大约 %{count} 公里 - zero: 1 公里以内 + one: 约1千米 + other: 约%{count}千米 + zero: 小于1千米 results: more_results: 更多结果 - no_results: 没有发现结果 + no_results: 无结果 search: title: - ca_postcode: 来自 Geocoder.CA 的结果 - geonames: 来自 GeoNames 的结果 + ca_postcode: 来自Geocoder.CA的结果 + geonames: 来自GeoNames的结果 + geonames_reverse: 来自GeoNames的结果 latlon: 来自 内部 的结果 - osm_namefinder: 来自 OpenStreetMap 名称查询器的结果 - osm_nominatim: 来自 OpenStreetMap Nominatim 的结果 - uk_postcode: 来自 NPEMap / FreeThe Postcode 的结果 - us_postcode: 来自 Geocoder.us 的结果 - search_osm_namefinder: - prefix: "%{type}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} / %{parentname})" - suffix_place: ,位于 %{placename} 以%{distance} %{direction} 处 - suffix_suburb: "%{suffix},%{parentname}" + osm_nominatim: 来自OpenStreetMap Nominatim的结果 + osm_nominatim_reverse: 来自OpenStreetMap Nominatim的结果 + uk_postcode: 来自NPEMap / FreeThe Postcode的结果 + us_postcode: 来自Geocoder.us的结果 search_osm_nominatim: + admin_levels: + level10: 郊区界 + level2: 国界 + level4: 州界 + level5: 地区界 + level6: 县界 + level8: 市界 + level9: 村界 prefix: + aerialway: + chair_lift: 登山吊椅 + drag_lift: 上山牵引机 + station: 缆车站台 aeroway: - aerodrome: 机场 - apron: 机坪 - gate: 门 + aerodrome: 小型飞机场 + apron: 停机坪 + gate: 登机口 helipad: 直升机停机坪 runway: 跑道 taxiway: 滑行道 terminal: 航站楼 amenity: - WLAN: WiFi 接入 + WLAN: WiFi热点 airport: 机场 arts_centre: 艺术中心 artwork: 艺术品 - atm: 自动取款机(ATM) + atm: 自动提款机(ATM) auditorium: 礼堂 bank: 银行 bar: 酒吧 bbq: 烧烤 - bench: 长凳 - bicycle_parking: 自行车停车 - bicycle_rental: 自行车租赁 - biergarten: 啤酒花园 + bench: 长椅 + bicycle_parking: 自行车停车处 + bicycle_rental: 自行车出租点 + biergarten: 露天啤酒店 brothel: 妓院 - bureau_de_change: 货币兑换 - bus_station: 公交主站 - cafe: 咖啡馆 - car_rental: 租车服务 + bureau_de_change: 外汇兑换点 + bus_station: 公共汽车枢纽 + cafe: 咖啡厅 + car_rental: 汽车租赁 car_sharing: 汽车共享 car_wash: 洗车 casino: 赌场 @@ -507,10 +448,10 @@ zh-CN: club: 俱乐部 college: 学院 community_centre: 社区中心 - courthouse: 法庭 + courthouse: 法院 crematorium: 火葬场 - dentist: 牙医 - doctors: 医生 + dentist: 牙科 + doctors: 医生办公室 dormitory: 宿舍 drinking_water: 饮用水 driving_school: 驾驶学校 @@ -520,16 +461,16 @@ zh-CN: ferry_terminal: 轮渡码头 fire_hydrant: 消防栓 fire_station: 消防局 - food_court: 食阁 + food_court: 美食广场 fountain: 喷泉 - fuel: 燃料 + fuel: 加油站 grave_yard: 墓地 gym: 健身中心/健身房 - hall: 小山 - health_centre: 健康中心 + hall: 会堂 + health_centre: 医疗中心 hospital: 医院 hotel: 酒店 - hunting_stand: 狩猎台 + hunting_stand: 狩猎站 ice_cream: 冰淇淋 kindergarten: 幼儿园 library: 图书馆 @@ -537,33 +478,34 @@ zh-CN: marketplace: 市场 mountain_rescue: 山地救援 nightclub: 夜总会 - nursery: 幼儿园 - nursing_home: 护理院 + nursery: 托儿所 + nursing_home: 疗养院 office: 办公室 park: 公园 parking: 停车场 - pharmacy: 药房 + pharmacy: 药店 place_of_worship: 宗教场所 - police: 警察 - post_box: 邮箱 + police: 警察局 + post_box: 信箱 post_office: 邮局 preschool: 学前教育 prison: 监狱 pub: 酒馆 public_building: 公共建筑 public_market: 集市 - reception_area: 接待区域 + reception_area: 接待区 recycling: 回收点 - restaurant: 餐厅 + restaurant: 餐馆 retirement_home: 养老院 sauna: 桑拿 school: 学校 - shelter: 庇护所 + shelter: 亭 shop: 商店 shopping: 购物 shower: 淋浴 social_centre: 社区中心 social_club: 社交俱乐部 + social_facility: 公共设施 studio: 工作室 supermarket: 超市 swimming_pool: 游泳池 @@ -576,8 +518,8 @@ zh-CN: vending_machine: 自动售货机 veterinary: 兽医 village_hall: 村政厅 - waste_basket: 废纸篓 - wifi: WiFi 接入 + waste_basket: 垃圾桶 + wifi: WiFi热点 youth_centre: 青少年中心 boundary: administrative: 行政区边界 @@ -585,52 +527,57 @@ zh-CN: national_park: 国家公园 protected_area: 保护区 bridge: - aqueduct: 输水管道 + aqueduct: 沟渠 suspension: 悬索桥 - swing: 索桥 + swing: 平旋桥 viaduct: 高架桥 "yes": 桥 building: "yes": 建筑物 + emergency: + fire_hydrant: 消防栓 + phone: 紧急电话 highway: bridleway: 马道 - bus_guideway: 导轨公交专用道 - bus_stop: 公交停靠站 - byway: 非机动车道(英国) - construction: 在建道路 - cycleway: 单车径 - emergency_access_point: 紧急接入点 - footway: 步行道 + bus_guideway: 导轨公交车道 + bus_stop: 公共汽车站 + byway: 小路 + construction: 在建公路 + cycleway: 自行车道 + emergency_access_point: 紧急求救点 + footway: 人行道 ford: 浅滩 - living_street: 生活街道 + living_street: 生活街 milestone: 里程碑 minor: 次要道路 motorway: 高速公路 motorway_junction: 高速公路连接线 motorway_link: 高速公路 path: 小径 - pedestrian: 行人道路 - platform: 站台 - primary: 一级道路 - primary_link: 一级道路 - raceway: 滚道 - residential: 住宅 + pedestrian: 步行街 + platform: 车站 + primary: 主要道路 + primary_link: 主要道路 + proposed: 规划道路 + raceway: 赛道 + residential: 住宅道路 rest_area: 休息区 road: 道路 secondary: 二级公路 secondary_link: 二级公路 service: 服务道路 services: 高速公路服务区 - speed_camera: 超速照相机 + speed_camera: 测速摄像头 steps: 楼梯 stile: 跨越围栏的台阶 + street_lamp: 路灯 tertiary: 三级道路 tertiary_link: 三级道路 - track: 辙迹 - trail: 轨迹 - trunk: 快速道路 - trunk_link: 快速道路 - unclassified: 未分类道路 + track: 小路 + trail: 小路 + trunk: 干道 + trunk_link: 干道 + unclassified: 无等级道路 unsurfaced: 无铺面道路 historic: archaeological_site: 遗址 @@ -639,39 +586,41 @@ zh-CN: building: 建筑物 castle: 城堡 church: 教堂 - fort: 堡 + citywalls: 城墙 + fort: 堡垒 house: 房屋 icon: 圣像画 manor: 庄园 - memorial: 纪念馆 + memorial: 纪念碑 mine: 矿井 monument: 纪念碑 museum: 博物馆 ruins: 遗迹 + tomb: 墓 tower: 塔 - wayside_cross: 十字路旁 - wayside_shrine: 路旁的神社 - wreck: 废墟 + wayside_cross: 路旁十字架 + wayside_shrine: 路旁神龛 + wreck: 残骸 landuse: - allotments: 拨款 + allotments: 小块园地 basin: 盆地 - brownfield: 棕色地带 + brownfield: 棕地 cemetery: 公墓 commercial: 商业区 - conservation: 保留地 - construction: 建设 + conservation: 保护 + construction: 在建 farm: 农场 farmland: 农田 farmyard: 农家庭院 forest: 森林 garages: 车库 - grass: 草地 - greenfield: 绿色地带 + grass: 草坪 + greenfield: 绿地 industrial: 工业区 landfill: 垃圾填埋场 - meadow: 草甸 + meadow: 草地 military: 军事区 - mine: 矿区 + mine: 矿井 nature_reserve: 自然保护区 orchard: 果园 park: 公园 @@ -680,74 +629,76 @@ zh-CN: railway: 铁路 recreation_ground: 游乐场 reservoir: 水库 - reservoir_watershed: 库区 + reservoir_watershed: 水库库区 residential: 住宅区 - retail: 零售 - road: 道路面积 - village_green: 绿色村庄 + retail: 商店区 + road: 道路区 + village_green: 乡村草坪 vineyard: 葡萄园 wetland: 湿地 - wood: 林 + wood: 树林 leisure: beach_resort: 海滩度假村 - bird_hide: 鸟隐藏 - common: 公共土地 + bird_hide: 野生动物观察站 + common: 公共用地 fishing: 垂钓区 - fitness_station: 健身站 + fitness_station: 健身设施 garden: 花园 golf_course: 高尔夫球场 - ice_rink: 冰场 - marina: 码头 - miniature_golf: 迷你高尔夫 + ice_rink: 滑冰场 + marina: 小船坞 + miniature_golf: 迷你高尔夫球场 nature_reserve: 自然保护区 park: 公园 pitch: 体育场 - playground: 游乐场 + playground: 儿童游乐场 recreation_ground: 游乐场 sauna: 桑拿 - slipway: 船入水滑道 - sports_centre: 体育馆 + slipway: 船台 + sports_centre: 体育中心 stadium: 体育场 swimming_pool: 游泳池 - track: 赛道 - water_park: 水上乐园 + track: 跑道 + water_park: 水上公园 military: airfield: 军用机场 - barracks: 军营 - bunker: 碉堡 + barracks: 营房 + bunker: 掩体 + mountain_pass: + "yes": 山口 natural: - bay: 海湾 - beach: 海滩 + bay: 湾 + beach: 滩 cape: 海岬 cave_entrance: 洞口 channel: 海峡 - cliff: 悬崖 + cliff: 峭壁 crater: 火山口 dune: 沙丘 feature: 特征 - fell: 下跌 + fell: 费尔地貌 fjord: 峡湾 forest: 森林 - geyser: 喷泉 + geyser: 间歇泉 glacier: 冰川 - heath: 荒地 - hill: 小山 + heath: 希思地貌 + hill: 希尔地貌 island: 岛 land: 陆地 marsh: 沼泽 - moor: 泊 + moor: 停泊区 mud: 泥地 peak: 山顶 point: 点 reef: 礁 - ridge: 岭 + ridge: 山脊 river: 河 rock: 岩 - scree: 堆积物 - scrub: 灌木 - shoal: 浅滩 + scree: 岩屑堆 + scrub: 灌木丛 + shoal: 暗沙 spring: 泉 - stone: 商店 + stone: 石 strait: 海峡 tree: 树 valley: 山谷 @@ -755,16 +706,17 @@ zh-CN: water: 水 wetland: 湿地 wetlands: 湿地 - wood: 林 + wood: 树林 office: - accountant: 会计事务所 + accountant: 会计师事务所 + architect: 设计院 company: 公司 - employment_agency: 职业中介 - estate_agent: 房产中介 - government: 政府办事处 - insurance: 保险 + employment_agency: 职业介绍所 + estate_agent: 地产代理 + government: 政府办公室 + insurance: 保险办公室 lawyer: 律师事务所 - ngo: 非政府组织办事处 + ngo: 非政府组织办公室 telecommunication: 电信办公室 travel_agent: 旅行社 "yes": 办公室 @@ -781,40 +733,44 @@ zh-CN: islet: 屿 isolated_dwelling: 独立的住宅 locality: 地区 - moor: 系泊 - municipality: 都市 - postcode: 邮编 - region: 区 + moor: 荒野 + municipality: 自治市 + neighbourhood: 居住区 + postcode: 邮政编码 + region: 地区 sea: 海 - state: 国家 + state: 洲 subdivision: 细分 suburb: 郊区 town: 镇 - unincorporated_area: 团的区 + unincorporated_area: 非建制地区 village: 村 railway: - abandoned: 废弃铁路 + abandoned: 已拆除铁路 construction: 在建铁路 - disused: 不使用的铁路 - disused_station: 不使用的火车站 + disused: 废弃铁路 + disused_station: 废弃火车站 funicular: 缆索铁路 - halt: 火车停靠站 + halt: 火车停车点 historic_station: 历史火车站 junction: 铁路枢纽 level_crossing: 平交道口 light_rail: 轻轨 - monorail: 单轨 + miniature: 微型铁路 + monorail: 单轨铁路 narrow_gauge: 窄轨铁路 - platform: 站台 + platform: 铁路站台 preserved: 保留铁路 + proposed: 规划铁路 spur: 铁路支线 station: 火车站 + stop: 火车停车点 subway: 地铁站 subway_entrance: 地铁入口 - switch: 铁路点 - tram: 缆车 - tram_stop: 有轨电车停靠站 - yard: 铁路货场 + switch: 道岔 + tram: 电车轨道 + tram_stop: 有轨电车站 + yard: 车辆段 shop: alcohol: 无许可证 antiques: 古玩店 @@ -824,10 +780,11 @@ zh-CN: beverages: 饮料店 bicycle: 自行车店 books: 书店 - butcher: 屠宰 - car: 车店 - car_parts: 汽车零件 - car_repair: 汽车维修 + boutique: 精品店 + butcher: 肉店 + car: 汽车店 + car_parts: 汽车零部件商店 + car_repair: 汽车修理店 carpet: 地毯店 charity: 慈善商店 chemist: 化学品店 @@ -837,211 +794,286 @@ zh-CN: convenience: 便利店 copyshop: 复印店 cosmetics: 化妆品店 - department_store: 百货商店 - discount: 折扣精品店 + deli: 熟食店 + department_store: 百货商场 + discount: 折扣商品店 doityourself: DIY - dry_cleaning: 干洗 - electronics: 电子产品商店 - estate_agent: 房产中介 + dry_cleaning: 干洗店 + electronics: 电子产品店 + estate_agent: 地产代理 farm: 农家店 fashion: 时装店 fish: 鱼店 - florist: 鲜花 + florist: 花店 food: 食品店 - funeral_directors: 丧葬 - furniture: 家具 + funeral_directors: 殡仪馆 + furniture: 家具店 gallery: 画廊 - garden_centre: 园艺中心 - general: 一般商店 + garden_centre: 园艺品店 + general: 杂货店 gift: 礼品店 greengrocer: 蔬菜水果店 grocery: 杂货店 hairdresser: 理发店 hardware: 五金店 hifi: Hi-Fi - insurance: 保险 + insurance: 保险公司 jewelry: 珠宝店 - kiosk: 礼品店 - laundry: 洗衣房 - mall: 商城 + kiosk: 售货亭 + laundry: 洗衣店 + mall: 购物中心 market: 市场 mobile_phone: 手机店 motorcycle: 摩托车店 - music: 音乐店 + music: 音乐商店 newsagent: 报摊 - optician: 配镜 + optician: 眼镜店 organic: 有机食品店 - outdoor: 户外店 + outdoor: 户外用品店 pet: 宠物店 + pharmacy: 药店 photo: 照相馆 - salon: 沙龙 + salon: 美容院 + second_hand: 二手商品商店 shoes: 鞋店 shopping_centre: 购物中心 sports: 体育用品店 stationery: 文具店 supermarket: 超市 + tailor: 裁缝店 toys: 玩具店 travel_agency: 旅行社 - video: 影视店 - wine: 无许可证 + video: 音像店 + wine: 无执照 + "yes": 商店 tourism: alpine_hut: 高山小屋 artwork: 艺术品 attraction: 景点 - bed_and_breakfast: 床和早餐 + bed_and_breakfast: 家庭旅馆 cabin: 小木屋 - camp_site: 野营地 - caravan_site: 拖车营地 - chalet: 木屋 - guest_house: 宾馆 - hostel: 旅馆 + camp_site: 宿营地 + caravan_site: 房车宿营地 + chalet: 小屋 + guest_house: 旅馆 + hostel: 招待所 hotel: 酒店 information: 信息 - lean_to: 主要面向 + lean_to: 棚屋 motel: 汽车旅馆 museum: 博物馆 picnic_site: 野餐地 theme_park: 主题公园 valley: 谷 - viewpoint: 景点 + viewpoint: 观景点 zoo: 动物园 tunnel: + culvert: 排水管 "yes": 隧道 waterway: - artificial: 运河 + artificial: 人工航道 boatyard: 船坞 canal: 运河 connector: 航道连接器 dam: 水坝 - derelict_canal: 废弃的运河 + derelict_canal: 废弃运河 ditch: 沟 dock: 码头 drain: 渠 lock: 船闸 lock_gate: 船闸 mineral_spring: 矿泉 - mooring: 系泊 - rapids: 湍流 + mooring: 系泊设备 + rapids: 急流 river: 河 riverbank: 河岸 - stream: 溪流 + stream: 溪 wadi: 干河 - water_point: 水路点 + water_point: 取水点 waterfall: 瀑布 weir: 堰 prefix_format: "%{name}" + help_page: + help: + description: 在 OSM 的问答网站提问或查找回答。 + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + title: 获得帮助 + welcome: + description: 本快速指南涵盖了快速入门 OpenStreetMap 的基本知识。 + title: 欢迎使用 OSM + url: /welcome + wiki: + description: 浏览 wiki 深入了解 OSM 文档。 + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ html: dir: ltr javascripts: + close: 关闭 + edit_help: 移动地图并在你想编辑的位置放大,然后点击这里。 + key: + title: 图例 + tooltip: 图例 + tooltip_disabled: 图例仅适用于标准图层 map: base: - cycle_map: Cycle Map + cycle_map: 自行车地图 + hot: Humanitarian mapquest: MapQuest Open standard: 标准 - transport_map: Transport Map - overlays: - maplint: Maplint + transport_map: 交通地图 + copyright: © OpenStreetMap贡献者 + donate_link_text: + layers: + data: 地图数据 + header: 地图图层 + notes: 地图注释 + overlays: 启用解决地图问题的覆盖层 + title: 图层 + locate: + popup: 你离该点还有{distance}{unit} + title: 显示我的位置 + zoom: + in: 放大 + out: 缩小 + notes: + new: + add: 添加注释 + intro: 为了改进地图,你输入的信息将会向其他绘图者显示,所以在将标记移动到正确的位置,并在下面输入你的注释时,请尽可能地清晰准确。 + show: + anonymous_warning: 该注释包括来自匿名用户的应该独立核实的评论。 + comment: 评论 + comment_and_resolve: 评论与解决 + hide: 隐藏 + reactivate: 重启 + resolve: 解决 + share: + cancel: 取消 + center_marker: 以标记作为地图中心 + custom_dimensions: 设置自定义尺寸 + download: 下载 + embed: HTML + format: 格式: + image: 图像 + image_size: 标准图层图像显示尺寸 + include_marker: 包含标记 + link: 链接或HTML + long_link: 链接 + paste_html: 粘贴HTML以嵌入网站 + scale: 比例: + short_link: 短链接 + short_url: 短URL + title: 分享 + view_larger_map: 查看更大的地图 site: - edit_disabled_tooltip: 放大以编辑地图 + createnote_disabled_tooltip: 放大地图以添加注释 + createnote_tooltip: 添加注释至地图 + edit_disabled_tooltip: 放大地图以编辑 edit_tooltip: 编辑地图 - edit_zoom_alert: 您必须先放大才能编辑地图 - history_disabled_tooltip: 放大以编辑此区域 - history_tooltip: 查看对此区域的编辑 - history_zoom_alert: 您必须先放大才能编辑此区域 + map_data_zoom_in_tooltip: 放大地图以查看数据 + map_notes_zoom_in_tooltip: 放大地图以查看注释 layouts: + about: 关于 community: 社区 community_blogs: 社区博客 - community_blogs_title: OpenStreetMap 社区成员的博客 - copyright: 版权及许可 - documentation: 文档 - documentation_title: 该项目的文档 - donate: 给硬件升级基金%{link}以支持 OpenStreetMap。 - donate_link_text: 捐款 + community_blogs_title: OpenStreetMap社区成员的博客 + copyright: 版权 + data: 数据 + donate: 通过给硬件升级基金%{link}支持OpenStreetMap。 edit: 编辑 - edit_with: 使用 %{editor} 编辑 + edit_with: 使用%{editor}编辑 export: 输出 - export_tooltip: 输出地图数据 + export_data: 导出数据 foundation: 基金会 - foundation_title: OpenStreetMap 基金会 - gps_traces: GPS 轨迹 - gps_traces_tooltip: 管理 GPS 轨迹 + foundation_title: OpenStreetMap基金会 + gps_traces: GPS轨迹 + gps_traces_tooltip: 管理GPS轨迹 help: 帮助 - help_centre: 帮助中心 - help_title: 项目的帮助网站 - help_url: http://help.openstreetmap.org/ history: 历史 - home: 主页 - home_tooltip: 回到主页位置 - inbox: 收件箱(%{count}) - inbox_tooltip: - one: 您的收件箱有 1 封未读消息 - other: 您的收件箱有 %{count} 封未读消息 - zero: 您的收件箱中没有未读消息 - intro_1: OpenStreetMap 是一个可供自由编辑的世界地图,它是由像您这样的用户创造的 - intro_2_create_account: 创建用户帐户 - intro_2_download: 下载 - intro_2_html: 数据可以免费%{download},并依据%{license}%{use}。%{create_account}以改善地图。 - intro_2_license: 开放许可协议 - intro_2_use: 使用 - license: - alt: 知识共享 署名-相同方式共享 2.0 - title: OpenStreetMap 数据是以知识共享 署名-相同方式共享 2.0 通用许可授权 + home: 返回家位置 + intro_2_create_account: 创建用户账户 + intro_header: 欢迎来到 OpenStreetMap! + intro_text: OpenStreetMap 是一个世界地图,由像你这样的人们所建立,在开放授权下可以自由使用。 + learn_more: 详细了解 log_in: 登录 - log_in_tooltip: 使用现有帐户登录 + log_in_tooltip: 使用已有账户登录 logo: - alt_text: OpenStreetMap 标志 - logout: 退出 - logout_tooltip: 退出 + alt_text: OpenStreetMap标志 + logout: 注销 make_a_donation: text: 捐款 - title: 捐款支持 OpenStreetMap - osm_offline: OpenStreetMap 的数据库目前离线中,直到必要的数据库维护工作完成为止。 - osm_read_only: OpenStreetMap 数据库目前处于只读模式中,数据库的维护工作正在进行中。 - partners_bytemark: Bytemark 主机 + title: 通过捐款支持OpenStreetMap + more: 更多 + osm_offline: 由于正在进行基本的数据库维护工作,OpenStreetMap数据库目前处于脱机状态。 + osm_read_only: 由于正在进行基本的数据库维护工作,OpenStreetMap数据库目前处于只读模式。 + partners_bytemark: Bytemark主机 partners_html: 主机由%{ucl}、%{ic}、%{bytemark}和其他%{partners}所支持。 - partners_ic: 英国伦敦帝国学院 + partners_ic: 伦敦帝国学院 partners_partners: 合作伙伴 - partners_ucl: 伦敦大学学院 VR 中心 + partners_ucl: 伦敦大学学院虚拟现实中心 project_name: h1: OpenStreetMap title: OpenStreetMap sign_up: 注册 - sign_up_tooltip: 创建一个可编辑账户 - tag_line: 免费维基世界地图 + sign_up_tooltip: 创建可编辑账户 + start_mapping: 开始绘制地图 + tag_line: 自由的wiki世界地图 user_diaries: 用户日记 user_diaries_tooltip: 查看用户日记 - view: 查看 - view_tooltip: 查看地图 - welcome_user: 欢迎,%{user_link} - welcome_user_link_tooltip: 您的用户页面 - wiki: 维基 - wiki_title: 项目的维基网站 - wiki_url: http://wiki.openstreetmap.org/ license_page: foreign: - english_link: 英文原文 - text: 这个翻译页面和%{english_original_link}在事件上有冲突时,以英文页面为准 - title: 关于这个翻译 - legal_babble: "

    版权和许可

    \n

    \n OpenStreetMap 是开放数据的,采用知识\n 共享 署名-相同方式共享 2.0协议(CC BY-SA)授权。\n

    \n

    \n 您可以自由地复制、发行、传播和创作演绎我们的地图\n 和数据,只要您信任 OpenStreetMap 和它的\n 贡献者。如果您改变、转换或者以我们的地图或数据为基础进行创作,您\n 只能采用与本协议相同的许可协议发布您的作品。完整\n 的法律\n 文本阐明了您的权利和义务。\n

    \n\n

    How to credit OpenStreetMap

    \n

    \n If you are using OpenStreetMap map images, we request that\n your credit reads at least “© OpenStreetMap\n contributors, CC BY-SA”. If you are using map data only,\n we request “Map data © OpenStreetMap contributors,\n CC BY-SA”.\n

    \n

    \n Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/\n and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If\n you are using a medium where links are not possible (e.g. a\n printed work), we suggest you direct your readers to\n www.openstreetmap.org (perhaps by expanding\n ‘OpenStreetMap’ to this full address) and to\n www.creativecommons.org.\n

    \n\n

    了解更多

    \n

    \n 阅读更多关于使用我们数据的 常见\n 法律问题。\n

    \n

    \n OSM contributors are reminded never to add data from any\n copyrighted sources (e.g. Google Maps or printed maps) without\n explicit permission from the copyright holders.\n

    \n

    \n 虽然 OpenStreetMap 是开放数据的,我们无法为\n 第三方开发者提供一个免费的地图 API。\n\n 请参阅我们的 API 使用政策、\n 拼贴使用政策\n 和 Nominatim 使用政策。\n

    \n\n

    我们的贡献者

    \n

    \n Our CC BY-SA licence requires you to “give the Original\n Author credit reasonable to the medium or means You are\n utilising”. Individual OSM mappers do not request a\n credit over and above that to “OpenStreetMap\n contributors”, but where data from a national mapping\n agency or other major source has been included in\n OpenStreetMap, it may be reasonable to credit them by directly\n reproducing their credit or by linking to it on this page.\n

    \n\n\n\n
      \n
    • 澳大利亚:Contains suburb data based\n on Australian Bureau of Statistics data.
    • \n
    • 奥地利:包含来自于 \n Stadt Wien 基于 \n CC BY 授权的数据。
    • \n
    • 加拿大:Contains data from\n GeoBase®, GeoGratis (© Department of Natural\n Resources Canada), CanVec (© Department of Natural\n Resources Canada), and StatCan (Geography Division,\n Statistics Canada).
    • \n
    • 法国:Contains data sourced from\n Direction Générale des Impôts.
    • \n
    • 新西兰:Contains data sourced from\n Land Information New Zealand. Crown Copyright reserved.
    • \n
    • 波兰:Contains data from UMP-pcPL maps. Copyright\n UMP-pcPL contributors.
    • \n
    • 英国:Contains Ordnance\n Survey data © Crown copyright and database right\n 2010.
    • \n
    \n\n

    \n Inclusion of data in OpenStreetMap does not imply that the original\n data provider endorses OpenStreetMap, provides any warranty, or\n accepts any liability.\n

    " + english_link: 英语原文 + text: 当该翻译页面与%{english_original_link}冲突时,英语页面会被优先采用 + title: 关于该翻译 + legal_babble: + attribution_example: + alt: 如何在网页上署名OpenStreetMap的示例 + title: 署名示例 + contributors_at_html: 奥地利:包含来自 Stadt Wien(CC BY协议)、Land Vorarlberg及 Land Tirol(修订的CC-BY AT协议)的数据。 + contributors_ca_html: 加拿大:含有来自GeoBase®,GeoGratis(© 加拿大自然资源部),CanVec(© 加拿大自然资源部)和StatCan(加拿大统计局地理处)的数据。 + contributors_footer_1_html: "关于其进一步的细节,及其他被用来帮助提升 OpenStreetMap 的来源,详见 OpenStreetMap Wiki 的贡献者页面。" + contributors_footer_2_html: OpenStreetMap 纳入数据并不意味着原始数据提供者认可 OpenStreetMap、提供任何担保或担负任何法律责任。 + contributors_fr_html: 法国:含有来自Direction Générale des Impôts的数据。 + contributors_gb_html: 英国:包含来自 Ordnance 的调查数据,© Crown 版权所有及数据库权利,2010-12。 + contributors_intro_html: 我们的数据来源于成千上万人的贡献。但我们也从国家测绘机构等处获取公共版权的数据,其中包括: + contributors_nl_html: 荷兰:含有© AND data, 2007(www.and.com) + contributors_nz_html: 新西兰:包含来自新西兰土地信息部的数据。Crown 版权所有。 + contributors_title_html: 我们的贡献者 + contributors_za_html: 南非:包含来自行政局:国家地球空间信息,国家版权所有。 + credit_1_html: 我们需要你署名“© OpenStreetMap贡献者”。 + credit_2_html: 你必须明确注明,我们的数据使用开放式数据库协议,若使用我们的地图瓦片,其协议须为 CC-BY-SA。你可以链接此版权页以注明。另外,若你要以数据形式发布 OSM,你可以属名并直接链接协议。若某些媒介无法进行链接(如印刷品),我们建议你引导你的读者至 openstreetmap.org(或OpenStreetMap的完整网址)、opendatacommons.org,及可能相关的creativecommons.org。 + credit_3_html: "对于可浏览的电子地图,标记会出现在地图的右下角。\n例如:" + credit_title_html: 如何表明作者是OpenStreetMap + infringement_1_html: OSM的贡献者会被提醒,绝不要在没有著作权人的明确许可时添加来自任何有著作权的来源的数据(如谷歌地图或印刷地图)。 + infringement_2_html: 如果你认为版权的材料已被不恰当地添加的 OpenStreetMap 数据库或该网站,请参见我们的撤除程序,或直接在我们的在线申报页面上提出。 + infringement_title_html: 著作权侵犯 + intro_1_html: "OpenStreetMap是开放数据,采用开放数据共享开放数据库许可协议(ODbL)授权。" + intro_2_html: 只要你表明来源为OpenStreetMap及其贡献者,你就可以自由地复制、分发、传送和改编我们的数据。如果你想转换或者以我们的数据为基础进行创作,你只能采用相同的许可协议发表你的作品。完整的法律文本阐明了你的权利和义务。 + intro_3_html: 创作我们的地图瓦片及文档须在知识共享署名-相同方式共享 2.0(CC-BY-SA)协议下进行的。 + more_1_html: "请在法律常见问题阅读更多关于使用我们的数据,以及如何表明我们是作者的信息。" + more_2_html: 虽然 OpenStreetMap 是一个开发的数据库,但我们无法为第三方开发人员提供免费的地图 API。详见我们的API使用政策地图瓦片使用政策名称服务使用政策。 + more_title_html: 了解更多 + title_html: 著作权与许可 native: - mapping_link: 开始制图 - native_link: 简体中文版 - text: 您正在查看英文版的版权页。您可以返回这个网页的%{native_link},或者您可以停止阅读版权并%{mapping_link}。 - title: 关于此页 + mapping_link: 开始绘制地图 + native_link: 简体中文版本 + text: 你正在查看英语版本的著作权页面。你可以返回该页面的%{native_link},或停止阅读著作权信息并%{mapping_link}。 + title: 关于该页 message: delete: deleted: 消息已删除 inbox: date: 日期 - from: 来自 - messages: 您有 %{new_messages}和 %{old_messages} + from: 发件人 + messages: 你有 %{new_messages}和 %{old_messages} my_inbox: 我的收件箱 new_messages: "%{count} 条新消息" - no_messages_yet: 您还没有消息,何不联系一些%{people_mapping_nearby_link}? + no_messages_yet: 你还没有消息,何不联系一些%{people_mapping_nearby_link}? old_messages: "%{count} 条旧消息" outbox: 发件箱 - people_mapping_nearby: 在您附近的人 - subject: 标题 + people_mapping_nearby: 在附近绘制地图的人 + subject: 主题 title: 收件箱 mark: as_read: 标记消息为已读 @@ -1053,13 +1085,13 @@ zh-CN: unread_button: 标记为未读 new: back_to_inbox: 返回收件箱 - body: 主体 - limit_exceeded: 您刚刚发送了很多消息。在尝试发送其他消息之前请稍等一会儿。 - message_sent: 已发送消息 + body: 正文 + limit_exceeded: 你刚发送了很多消息。在尝试发送其他消息之前,请稍等一会儿。 + message_sent: 信息已发出 send_button: 发送 - send_message_to: 发送新消息给 %{name} - subject: 标题 - title: 发送消息 + send_message_to: 发送新信息给%{name} + subject: 主题 + title: 发信息 no_such_message: body: 对不起,没有具有该 id 的消息。 heading: 没有此消息 @@ -1067,53 +1099,82 @@ zh-CN: outbox: date: 日期 inbox: 收件箱 - messages: 您有 %{count} 条已发送消息 + messages: + one: 你有%{count}条已发送信息 + other: 你有%{count}条已发送信息 my_inbox: 我的%{inbox_link} - no_sent_messages: 您尚未发送信息。何不联系一些%{people_mapping_nearby_link}? + no_sent_messages: 你尚未发送信息。何不联系一些%{people_mapping_nearby_link}? outbox: 发件箱 - people_mapping_nearby: 在您附近的人 + people_mapping_nearby: 在附近绘制地图的人 subject: 主题 title: 发件箱 - to: 给 + to: 收件人 read: - back_to_inbox: 返回收件箱 - back_to_outbox: 返回发件箱 + back: 返回 date: 日期 - from: 来自 - reading_your_messages: 正在阅读您的信息 - reading_your_sent_messages: 正在阅读您所发送的信息 + from: 发件人 reply_button: 回复 subject: 主题 - title: 阅读消息 - to: 给 + title: 阅读信息 + to: 收件人 unread_button: 标记为未读 - wrong_user: 您已经以 '%{user}' 的身份登录,但是您想要阅读的消息并非寄给这个用户。请以正确的用户身份登录以阅读这个消息。 + wrong_user: 你已经以 '%{user}' 的身份登录,但是你想要阅读的消息并非寄给这个用户。请以正确的用户身份登录以阅读这个消息。 reply: - wrong_user: 您已经以 '%{user}' 的身份登录,但是您想要回复的消息并非寄给这个用户。请以正确的用户身份登录以回复这个消息。 + wrong_user: 你已经以 '%{user}' 的身份登录,但是你想要回复的消息并非寄给这个用户。请以正确的用户身份登录以回复这个消息。 sent_message_summary: delete_button: 删除 + note: + description: + closed_at_by_html: "%{user}于%{when}前解决" + closed_at_html: 于%{when}前解决 + commented_at_by_html: "%{user}于%{when}前更新" + commented_at_html: 于%{when}前更新 + opened_at_by_html: "%{user}于%{when}前创建" + opened_at_html: 于%{when}前创建 + reopened_at_by_html: "%{user}于%{when}前重启" + reopened_at_html: 于%{when}前重启 + entry: + comment: 评论 + full: 完整注释 + mine: + ago_html: "%{when}前" + created_at: 创建于 + creator: 创建者 + description: 说明 + heading: "%{user}的注释" + id: ID + last_changed: 最后变更 + subheading: "%{user}提交或评论的注释" + title: "%{user}提交或评论的注释" + rss: + closed: 关闭的注释(靠近%{place}) + commented: 新评论(靠近%{place}) + description_area: 在你的区域[(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]报告、评论或关闭的注释的列表 + description_item: 注释%{id}的RSS feed + opened: 新注释(靠近%{place}) + reopened: 重启的注释(靠近%{place}) + title: OpenStreetMap注释 notifier: diary_comment_notification: - footer: 您也可以通过%{readurl}来读取评论,并且在%{commenturl}来撰写评论或者通过%{replyurl}回复 - header: "%{from_user} 在您最近 OpenStreetMap 标题为 %{subject} 的日记条目留下了评论:" - hi: "%{to_user} 您好," - subject: "[OpenStreetMap] %{user} 在您的日记项目留下了评论" + footer: 你也可以通过%{readurl}来读取评论,并且在%{commenturl}来撰写评论或者通过%{replyurl}回复 + header: "%{from_user}评论了在你最近的主题为%{subject}的OpenStreetMap日记文章:" + hi: 嗨,%{to_user}: + subject: "[OpenStreetMap] %{user} 在你的日记项目留下了评论" email_confirm: - subject: "[OpenStreetMap] 确认您的电子邮件地址" + subject: "[OpenStreetMap] 确认你的电子邮件地址" email_confirm_html: - click_the_link: 如果这是您,请点击下面的链接以确认更改。 - greeting: 您好, - hopefully_you: 某人(希望是您)想要更改他们的电子邮件地址 %{server_url} 为 %{new_address}。 + click_the_link: 如果这是你,请点击下面的链接以确认变更。 + greeting: 嗨, + hopefully_you: 某人(希望是你)想要变更他们的电子邮件地址 %{server_url} 为 %{new_address}。 email_confirm_plain: - click_the_link: 如果这是您,请点击下面的链接以确认更改。 - greeting: 您好, - hopefully_you_1: 某人(希望是您)想要更改他们的电子邮件地址 - hopefully_you_2: "%{server_url} 为 %{new_address}。" + click_the_link: 如果这是你,请点击下面的链接以确认变更。 + greeting: 嗨, + hopefully_you: 有人(希望是你)想要在%{server_url}将他的电子邮件地址变更为%{new_address}。 friend_notification: - befriend_them: 您可以在 %{befriendurl} 把他们加为朋友。 - had_added_you: "%{user} 已经在 Openstreetmap 上加您为好友。" - see_their_profile: 您可以在 %{userurl} 上查看他们的个人信息。 - subject: "[OpenStreetMap] %{user} 已加您为好友" + befriend_them: 你也可以在%{befriendurl}添加他们为朋友。 + had_added_you: "%{user}已经在OpenStreetMap添加你为朋友。" + see_their_profile: 你可以在%{userurl}查看他们的个人资料。 + subject: "[OpenStreetMap]%{user}添加你为朋友" gpx_notification: and_no_tags: 并且没有标签。 and_the_tags: 和以下标签: @@ -1122,75 +1183,75 @@ zh-CN: import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures more_info_1: 更多有关 GPX 导入失败的详细信息,以及如何避免 more_info_2: 它们的信息可以在这里找到: - subject: "[OpenStreetMap] GPX 导入失败" - greeting: 您好, + subject: "[OpenStreetMap]GPX导入失败" + greeting: 你好, success: loaded_successfully: 成功载入可能 %{possible_points} 点中的 %{trace_points} 点。 - subject: "[OpenStreetMap] GPX 导入成功" - with_description: 带有描述 - your_gpx_file: 看起来像是您的 GPX 文件 + subject: "[OpenStreetMap]GPX导入成功" + with_description: 有说明 + your_gpx_file: 看起来像是你的 GPX 文件 lost_password: - subject: "[OpenStreetMap] 密码重设请求" + subject: "[OpenStreetMap] 密码重置请求" lost_password_html: - click_the_link: 如果这是您,请点击下面的链接重置您的密码。 - greeting: 您好, - hopefully_you: 某人(可能是您)已要求对此电子邮件地址上的 openstreetmap.org 账户重置密码 + click_the_link: 如果这是你,请点击下面的链接重置你的密码。 + greeting: 你好, + hopefully_you: 某人(可能是你)已要求重置该电子邮件地址上的 openstreetmap.org 账户密码 lost_password_plain: - click_the_link: 如果这是您,请点击下面的链接重置您的密码。 - greeting: 您好, - hopefully_you_1: 某人(可能是您)已要求对此 - hopefully_you_2: 电子邮件地址上的 openstreetmap.org 账户重置密码。 + click_the_link: 如果这是你,请点击下面的链接重置你的密码。 + greeting: 嗨, + hopefully_you: 某人(可能是你)已要求重置该电子邮件地址上的 openstreetmap.org 帐户密码。 message_notification: - footer1: 您可以在 %{readurl} 阅读这条消息 - footer2: 并且您可以在 %{replyurl} 回复 - header: "%{from_user} 已经通过 OpenStreetMap 向您发送标题为 %{subject} 的消息:" - hi: "%{to_user} 您好," - subject_header: "[OpenStreetMap] %{subject}" + footer_html: 你还可以在%{readurl}阅读这条信息并在%{replyurl}回复 + header: "%{from_user}已经通过OpenStreetMap给你发送了一条主题为%{subject}的信息:" + hi: 嗨,%{to_user}: + subject_header: "[OpenStreetMap]%{subject}" + note_comment_notification: + anonymous: 匿名用户 + closed: + commented_note: "%{commenter} 解决了你感兴趣的一个地图注释。该注释位于 %{place} 附近。" + subject_other: "[OpenStreetMap]%{commenter}已经解决了一个你感兴趣的注释" + subject_own: "[OpenStreetMap] %{commenter} 解决了你的一个注释" + your_note: "%{commenter} 解决了你在 %{place} 附近的一个注释。" + commented: + commented_note: "%{commenter} 评论了你感兴趣的一个地图注释。该注释位于 %{place} 附近。" + subject_other: "[OpenStreetMap] %{commenter} 评论了你感兴趣的一个注释" + subject_own: "[OpenStreetMap] %{commenter} 评论了你的一个注释" + your_note: "%{commenter} 评论了你在 %{place} 附近的一个注释。" + details: 更多关于注释的详细信息可以在%{url}找到。 + greeting: 你好, + reopened: + commented_note: "%{commenter} 重新激活了你感兴趣的一个地图注释。该注释位于 %{place} 附近。" + subject_other: "[OpenStreetMap] %{commenter} 重新激活了你感兴趣的一个注释" + subject_own: "[OpenStreetMap] %{commenter} 重新激活了你的一个注释" + your_note: "%{commenter} 重新激活了你在 %{place} 附近的一个注释。" signup_confirm: - subject: "[OpenStreetMap] 确认您的电子邮件地址" - signup_confirm_html: - ask_questions: 您可以在我们的问答站点问关于 OpenStreetMap 的任何问题。 - click_the_link: 如果这是您,欢迎您!请点击下面的链接来确认帐户,并阅读更多关于 OpenStreetMap 的信息 - current_user: 一个基于其所处位置的,当前用户分类列表可从这里获得Category:Users_by_geographical_region. - get_reading: 在维基中阅读更多关于 OpenStreetMap 的资料或通过 OpenStreetMap 博客Twitter 了解最新的消息,或者浏览 OpenStreetMap 创始人 Steve Coast 的 OpenGeoData 博客了解这个计划的历史,其中也有播客可以听! - greeting: 您好! - hopefully_you: 某人(希望是您)想要建立一个账户 - introductory_video: 您可以观看一部%{introductory_video_link}。 - more_videos: 这里有更多%{more_videos_link}。 - more_videos_here: 有更多的影片 - user_wiki_page: 推荐您创立一个用户维基页面,它包括分类标签,用来提醒您所在位置,例如 [[Category:Users_in_London]]。 - video_to_openstreetmap: 关于 OpenStreetMap 的介绍影片 - wiki_signup: 您可能也想要注册到 OpenStreetMap 维基。 - signup_confirm_plain: - ask_questions: 您可以在我们的问答站点问关于 OpenStreetMap 的任何问题: - blog_and_twitter: 通过 OpenStreetMap 的博客或 Twitter 以了解最新消息: - click_the_link_1: 如果这是您,欢迎您!请点击下面的链接来确认您的 - click_the_link_2: 帐户,并阅读更多 OpenStreetMap 的信息。 - current_user_1: 一个当前不同分类的用户列表,他们是基于所在地理位置来分类 - current_user_2: 来自于: - greeting: 您好! - hopefully_you: 某人(希望是您)希望创建一个账号 - introductory_video: 您可以在这里观看 OpenStreetMap 的介绍视频: - more_videos: 更多的视频请看这里: - opengeodata: OpenGeoData.org 是 OpenStreetMap 创始人 Steve Coast 的博客,在上面也有播客: - the_wiki: 在维基上阅读 OpenStreetMap 的介绍: - the_wiki_url: http://wiki.openstreetmap.org/wiki/Beginners%27_Guide - user_wiki_1: 推荐您创建一个维基的用户页,它包括 - user_wiki_2: 分类标签表明您的位置,例如 [[Category:Users_in_London]]。 - wiki_signup: 您可能也想在 OpenStreetMap 维基上注册: - wiki_signup_url: http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page + confirm: 在开始之前,我们需要确认这个请求来自于你。如果确实这样,那么请点击以下链接以确认你的帐户: + created: 有人(希望是你)刚在%{site_url}创建了一个账户。 + greeting: 你好! + subject: "[OpenStreetMap]欢迎加入OpenStreetMap" + welcome: 等你确认帐号后,我们将提供一些额外的信息以帮助你开始使用。 oauth: oauthorize: - allow_read_gpx: 读取您的私人 GPS 轨迹。 - allow_read_prefs: 读取您的首选项。 - allow_to: 允许客户端应用程序: + allow_read_gpx: 读取你的私人 GPS 轨迹。 + allow_read_prefs: 读取你的用户设置。 + allow_to: 允许客户应用程序: allow_write_api: 修改地图。 - allow_write_diary: 创建日记、评论和交朋友。 - allow_write_gpx: 上传 GPS 轨迹。 - allow_write_prefs: 修改您的用户首选项。 - request_access: "%{user},应用程序 %{app_name} 要求访问您的帐户。请确定您要让此应用程序使用下列功能。您可以按照自己的意思选择几个。" + allow_write_diary: 创建日记文章,评论和交朋友。 + allow_write_gpx: 上传GPS轨迹。 + allow_write_notes: 修改注释。 + allow_write_prefs: 修改你的用户设置。 + request_access: "%{user},应用程序 %{app_name} 要求访问你的帐户。请确定你要让此应用程序使用下列功能。你可以按照自己的意思选择几个。" + title: 授权访问你的账户 + oauthorize_failure: + denied: 你已经拒绝应用程序%{app_name}访问你的账户。 + invalid: 授权令牌无效。 + title: 授权请求失败 + oauthorize_success: + allowed: 你已授权 %{app_name} 应用访问你的账户。 + title: 已允许授权申请 + verification: 验证码为%{code}。 revoke: - flash: 您已经注销 %{application} 的记号。 + flash: 你已经注销 %{application} 的令牌。 oauth_clients: create: flash: 注册信息成功 @@ -1198,106 +1259,122 @@ zh-CN: flash: 已破坏此客户端应用程序注册 edit: submit: 编辑 - title: 编辑您的应用程序 + title: 编辑你的应用程序 form: - allow_read_gpx: 读取他们的私有 GPS 轨迹。 - allow_read_prefs: 读取他们的用户首选项。 + allow_read_gpx: 读取他们的私有GPS轨迹。 + allow_read_prefs: 读取他们的用户设置。 allow_write_api: 修改地图。 - allow_write_diary: 创建日记、评论和交朋友。 - allow_write_gpx: 上传 GPS 轨迹。 - allow_write_prefs: 修改他们的用户参数设置。 + allow_write_diary: 创建日记文章、评论和交朋友。 + allow_write_gpx: 上传GPS轨迹。 + allow_write_notes: 修改注释。 + allow_write_prefs: 修改他们的用户设置。 callback_url: 回调 URL name: 名称 - requests: 向用户要求下列权限: + requests: 向用户请求以下权限: required: 必要 support_url: 支持 URL url: 主要应用程序 URL index: application: 应用程序名称 issued_at: 发出于 - list_tokens: 下列令牌已发给您名下的应用程序: - my_apps: 我的客户端应用程序 + list_tokens: 下列令牌已发给你名下的应用程序: + my_apps: 我的客户应用程序 my_tokens: 我的已授权应用程序 - no_apps: 您是否有想要注册使用 %{oauth} 标准的应用程序?您必须先注册您的网页应用程序,才能对这个服务进行OAuth 要求。 - register_new: 注册您的应用程序 - registered_apps: 您已经注册下列客户端应用程序: + no_apps: 你是否有想要注册使用 %{oauth} 标准的应用程序?你必须先注册你的网页应用程序,才能对这个服务进行OAuth 要求。 + register_new: 注册你的应用程序 + registered_apps: 你已注册以下客户应用程序: revoke: 撤销! - title: 我的 OAuth 详细信息 + title: 我的OAuth详细信息 new: submit: 注册 - title: 注册新的应用程序 + title: 注册新应用程序 not_found: - sorry: 对不起,找不到 %{type}。 + sorry: 对不起,无法找到那个%{type}。 show: access_url: 访问令牌 URL: - allow_read_gpx: 读取他们私人的 GPS 轨迹。 - allow_read_prefs: 读取他们的用户首选项。 + allow_read_gpx: 读取他们的私人GPS轨迹。 + allow_read_prefs: 读取他们的用户设置。 allow_write_api: 修改地图。 - allow_write_diary: 创建日记、评论和交朋友。 - allow_write_gpx: 上传 GPS 轨迹。 - allow_write_prefs: 修改他们的用户首选项。 + allow_write_diary: 创建日记文章、评论和交朋友。 + allow_write_gpx: 上传GPS轨迹。 + allow_write_notes: 修改注释。 + allow_write_prefs: 修改他们的用户设置。 authorize_url: 授权 URL: - confirm: 您确定吗? + confirm: 你确定吗? + delete: 删除客户端 edit: 编辑详细信息 key: 用户键: - requests: 要向用户要求下列权限: + requests: 向用户请求以下权限: secret: 用户密钥: - support_notice: 我们支持 HMAC-SHA1 (推荐)和 ssl 模式的纯文字。 - title: "%{app_name} 的 OAuth 详细信息" + support_notice: 我们支持HMAC-SHA1(推荐)和RSA-SHA1签名。 + title: "%{app_name}的OAuth详细信息" url: 请求令牌 URL: update: flash: 更新客户端信息成功 printable_name: - with_id: "%{id}" - with_name: "%{name} (%{id})" - with_version: "%{id},版本 %{version}" + with_version: "%{id},版本%{version}" redaction: + create: + flash: 修订已创建。 + destroy: + error: 销毁该修订时出错。 + flash: 修订已销毁。 + not_empty: 修订非空。请在销毁该修订前清除所有属于它的版本。 edit: description: 说明 + heading: 编辑修订 + submit: 保存修订 + title: 编辑修订 + index: + empty: 没有可显示的修订。 + heading: 修订列表 + title: 修订列表 new: description: 说明 + heading: 请输入新修订的信息 + submit: 创建修订 + title: 创建新修订 show: - confirm: 您确定吗? + confirm: 你确定吗? description: 说明: - user: "创建者:" + destroy: 删除该修订 + edit: 编辑该修订 + heading: 显示修订“%{title}” + title: 显示修订 + user: 创建者: update: - flash: 更改已保存。 + flash: 变更已保存。 site: edit: anon_edits: (%{link}) - anon_edits_link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits anon_edits_link_text: 了解为什么这很重要。 - flash_player_required: 您需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。您可以从 Adobe.com 下载 Flash Player其他几种选择也可以用来编辑 OpenStreetMap。 - no_iframe_support: 您的浏览器不支持 HTML 嵌入式框架,这是此功能所需要的。 - not_public: 您尚未公开您的编辑。 - not_public_description: 您将无法再编辑此地图,直到您做到如上所述。您可以通过您的%{user_page}公开您的编辑。 + flash_player_required: 你需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。你可以从 Adobe.com 下载 Flash Player其他几种选择也可以用来编辑 OpenStreetMap。 + id_not_configured: iD 尚未配置 + no_iframe_support: 你的浏览器不支持 HTML 嵌入式框架,这是此功能所需要的。 + not_public: 你尚未公开你的编辑。 + not_public_description: 你将无法再编辑此地图,直到你做到如上所述。你可以通过你的%{user_page}公开你的编辑。 potlatch2_not_configured: 尚未配置 Potlatch 2 - 请参阅 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 以获得更多信息 - potlatch2_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 2 中保存,您应该点击保存。) - potlatch_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 中保存,如果在在线模式下编辑,您需要取消选择当前的路径或节点;或者点击保存,如果有保存按钮。) - user_page_link: 用户页 + potlatch2_unsaved_changes: 你有尚未保存的修改。(要在 Potlatch 2 中保存,你应该点击保存。) + potlatch_unsaved_changes: 你有尚未保存的修改。(要在 Potlatch 中保存,如果在在线模式下编辑,你需要取消选择当前的路径或节点;或者点击保存,如果有保存按钮。) + user_page_link: 用户页面 index: - js_1: 您或许正在使用不支持 JavaScript 的浏览器,或许您禁用了 JavaScript。 + createnote: 添加注释 + js_1: 你或许正在使用不支持 JavaScript 的浏览器,或你禁用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。 license: - license_name: 知识共享 署名-相同方式共享 2.0 - license_url: http://creativecommons.org/licenses/by-sa/2.0/ - notice: 由 %{project_name}和它的贡献者基于%{license_name} 协议授权。 - project_name: OpenStreetMap 项目 - project_url: http://openstreetmap.org + copyright: 版权所有 OpenStreetMap及其贡献者,采用开放授权协议 permalink: 固定链接 remote_failed: 编辑失败 - 请确保已加载 JOSM 或 Merkaartor 并启用了远程控制 shortlink: 短链接 key: - map_key: 图例 - map_key_tooltip: 地图的图例 table: entry: admin: 行政区边界 - allotments: 拨款 + allotments: 小块园地 apron: - 机场停机坪 - 航站楼 - bridge: 黑色套管 = 桥 + bridge: 双实线 = 桥 bridleway: 马道 brownfield: 棕色地块 building: 特殊建筑物 @@ -1318,6 +1395,7 @@ zh-CN: footway: 步道 forest: 森林 golf: 高尔夫球场 + heathland: 荒坡 industrial: 工业区 lake: - 湖 @@ -1339,19 +1417,19 @@ zh-CN: school: - 学校 - 大学 - secondary: 二级公路 + secondary: 二级道路 station: 火车站 subway: 地铁 summit: - 山峰 - 高峰 tourist: 旅游景点 - track: 辙迹 + track: 小路 tram: - 轻轨 - 电车 trunk: 快速道路 - tunnel: 虚线套管 = 隧道 + tunnel: 双虚线 = 隧道 unclassified: 未分类道路 unsurfaced: 无铺面道路 wood: 林 @@ -1366,7 +1444,7 @@ zh-CN: second: 第二项 subheading: 副标题 text: 文本 - title_html: 按照 Markdown 来解析 + title_html: 使用Markdown解析 unordered: 无序列表 url: URL richtext_area: @@ -1374,22 +1452,27 @@ zh-CN: preview: 预览 search: search: 搜索 - search_help: 例如:'Alkmaar','Regent Street, Cambridge','CB2 5AQ',或 'post offices near Lünen' 更多例子... submit_text: 开始 - where_am_i: 我在哪里? - where_am_i_title: 使用搜索引擎描述当前的位置 + where_am_i: 我在哪里? + where_am_i_title: 使用搜索引擎说明当前位置 sidebar: close: 关闭 search_results: 搜索结果 time: formats: - friendly: "%Y 年%B %e 日 %H:%M" + blog: "%Y年%B月%e日" + friendly: "%Y年%B月%e日 %H:%M" trace: create: - trace_uploaded: 您的 GPX 文件已经被上传,正等待被输入数据库。这通常在半小时之内,当上传结束后会发邮件通知您。 - upload_trace: 上传 GPS 轨迹 + trace_uploaded: 你的 GPX 文件已经被上传,正等待被输入数据库。这通常在半小时之内,当上传结束后会发邮件通知你。 + upload_trace: 上传GPS轨迹 delete: - scheduled_for_deletion: 计划被删除的路径 + scheduled_for_deletion: 计划删除的轨迹 + description: + description_with_count: + one: GPX file with %{count} point from %{user} + other: 来自%{user}的带%{count}点的GPX文件 + description_without_count: 来自%{user}的GPX文件 edit: description: 说明: download: 下载 @@ -1397,22 +1480,26 @@ zh-CN: filename: 文件名: heading: 编辑轨迹 %{name} map: 地图 - owner: 所有者: + owner: 所有人: points: 点: - save_button: 保存修改 + save_button: 保存变更 start_coord: 起始坐标: tags: 标签: tags_help: 用逗号分隔 - title: 编辑轨迹 %{name} - uploaded_at: 上传时间: + title: 编辑轨迹%{name} + uploaded_at: 上传于: visibility: 可见性: visibility_help: 这是什么意思? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces + georss: + title: OpenStreetMap GPS跟踪 list: - public_traces: 公开的 GPS 轨迹 - public_traces_from: "%{user} 的公开 GPS 轨迹" - tagged_with: " 标记为 %{tags}" - your_traces: 您的 GPS 轨迹 + description: 浏览最近上传的GPS轨迹 + empty_html: 尚无轨迹。上传新轨迹或在维基页面上了解 GPS 轨迹。 + public_traces: 公开GPS轨迹 + public_traces_from: 来自%{user}的公开GPS轨迹 + tagged_with: 以%{tags}标记 + your_traces: 你的GPS轨迹 make_public: made_public: 公开化路径 offline: @@ -1421,19 +1508,19 @@ zh-CN: offline_warning: message: GPX 文件上传系统当前不可用 trace: - ago: "%{time_in_words_ago}之前" - by: 由 - count_points: "%{count} 个点" + ago: "%{time_in_words_ago}前" + by: 被 + count_points: "%{count}个点" edit: 编辑 edit_map: 编辑地图 identifiable: 可识别 in: 于 map: 地图 more: 更多 - pending: 【挂起】 + pending: 挂起 private: 私有 public: 公开 - trace_details: 查看路径详情 + trace_details: 查看轨迹详细信息 trackable: 可追踪 view_map: 查看地图 trace_form: @@ -1443,21 +1530,21 @@ zh-CN: tags: 标签: tags_help: 用逗号分隔 upload_button: 上传 - upload_gpx: 上传 GPX 文件: + upload_gpx: 上传GPX文件: visibility: 可见性: visibility_help: 这是什么意思? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces trace_header: see_all_traces: 查看所有轨迹 - see_your_traces: 查看您的所有轨迹 - traces_waiting: 您有 %{count} 条追踪路径正等待上传,请再您上传更多路径前等待这些传完,以确保不会给其他用户造成队列拥堵。 + see_your_traces: 查看你的轨迹 + traces_waiting: 你有 %{count} 条轨迹正等待上传,请在上传更多轨迹前等待这些传完,以确保不会给其他用户造成队列拥堵。 upload_trace: 上传轨迹 trace_optionals: tags: 标签 trace_paging_nav: - next: 下一页 » - previous: « 上一页 - showing_page: 显示第 %{page} 页 + newer: 较新轨迹 + older: 较旧轨迹 + showing_page: 第%{page}页 view: delete_track: 删除这条轨迹 description: 说明: @@ -1465,15 +1552,15 @@ zh-CN: edit: 编辑 edit_track: 编辑这条轨迹 filename: 文件名: - heading: 查看路径 %{name} + heading: 查看轨迹%{name} map: 地图 none: 空 - owner: 所有者: + owner: 所有人: pending: 挂起 points: 点: start_coordinates: 起始坐标: - tags: 标签 - title: 查看路径 %{name} + tags: 标签: + title: 查看轨迹%{name} trace_not_found: 未找到轨迹! uploaded: 上传于: visibility: 可见性: @@ -1485,189 +1572,194 @@ zh-CN: user: account: contributor terms: - agreed: 您已同意新的贡献者条款。 - agreed_with_pd: 您也将您的编辑释于公有领域。 + agreed: 你已同意新的贡献者条款。 + agreed_with_pd: 你也将你的编辑释于公共领域。 heading: 贡献者条款: link: http://www.osmfoundation.org/wiki/License/Contributor_Terms link text: 这是什么? - not yet agreed: 您还没有同意新的贡献者条款。 - review link text: 请跟随此链接,方便您查看并接受新的贡献者条款。 + not yet agreed: 你还没有同意新的贡献者条款。 + review link text: 请跟随此链接,方便你查看并接受新的贡献者条款。 current email address: 当前电子邮件地址: - delete image: 删除当前图片 - email never displayed publicly: (从不公开显示) + delete image: 删除当前图像 + email never displayed publicly: (不公开显示) flash update success: 成功更新用户信息。 - flash update success confirm needed: 成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。 + flash update success confirm needed: 成功更新用户信息。 查看你的邮箱以确认你的新邮箱地址。 + gravatar: + gravatar: 使用Gravatar + link text: 这是什么? home location: 所在位置: image: 图像: image size hint: (方形图片的大小至少为 100x100 时效果最好) - keep image: 保持当前图片 + keep image: 保持当前图像 latitude: 纬度: longitude: 经度: make edits public button: 公开我所有的编辑 my settings: 我的设置 new email address: 新电子邮件地址: - new image: 添加图片 - no home location: 您尚未输入所在位置。 + new image: 添加图像 + no home location: 你尚未输入所在位置。 openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: 这是什么? openid: OpenID: - preferred editor: 喜欢的编辑器: - preferred languages: 选择语言: - profile description: 基本信息描述: + preferred editor: 首选编辑器: + preferred languages: 首选语言: + profile description: 基本信息说明: public editing: disabled: 禁用且无法编辑数据,所有过去的编辑均为匿名。 - disabled link text: 为什么我无法编辑? - enabled: 启动。非匿名并可编辑数据。 + disabled link text: 为什么我不能编辑? + enabled: 启用。非匿名用户,可以编辑数据。 enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: 这是什么? heading: 公开编辑: public editing note: heading: 公开编辑 - text: 目前您的编辑是匿名的,人们不能发送邮件给您或看到您的位置。为了显示您的编辑,让别人通过网站与您联系,请点击下面的按钮。由于 0.6 API 的转换,只有公开的用户可以编辑地图数据。(知道为什么)。
    • 您的电子邮件地址将不会被因为成为公开用户而被透露。
    • 此操作无法撤销,所有新用户现在都默认为公开的。
    - replace image: 替换当前的图像 + text: 目前你的编辑是匿名的,人们不能发送邮件给你或看到你的位置。为了显示你的编辑,让别人通过网站与你联系,请点击下面的按钮。由于 0.6 API 的转换,只有公开的用户可以编辑地图数据。(知道为什么)。
    • 你的电子邮件地址将不会被因为成为公开用户而被透露。
    • 此操作无法撤销,所有新用户现在都默认为公开的。
    + replace image: 替换当前图像 return to profile: 返回基本信息 - save changes button: 保存更改 + save changes button: 保存变更 title: 编辑账户 update home location on click: 点击地图时更新所在位置? confirm: - already active: 已确认此帐户。 - before you start: 我们知道您可能急于开始制图,但在此之前,您可能希望在下面的表单中填写一些有关自己的信息。 + already active: 该账户已经确认。 button: 确认 - heading: 确认用户帐户 - press confirm button: 按下面的确认键激活您的帐户。 - reconfirm: 如果您注册已经有一段时间了,您可能需要发送一封新的确认电子邮件。 - success: 已确认您的账号,感谢您的注册! - unknown token: 该标记似乎不存在。 + heading: 检查你的电子邮件! + introduction_1: 我们给你发送了确认邮件。 + introduction_2: 点击电子邮件中的链接确认你的账户,然后你就可以开始绘制地图了。 + press confirm button: 按下面的确认按钮激活你的账户。 + reconfirm_html: 如果你需要我们重新发送确认邮件,请点击这里。 + unknown token: 确认码已经过期或不存在。 confirm_email: button: 确认 - failure: 具有此记号的电子邮件地址已经确认过了。 + failure: 具有此令牌的电子邮件地址已经确认过了。 heading: 确认电子邮件地址变更 - press confirm button: 按下面的确认按钮以确认您的新电子邮件地址。 - success: 已确认您的电子邮件地址,感谢您的注册! + press confirm button: 按下面的确认按钮以确认你的新电子邮件地址。 + success: 已确认你的电子邮件地址,感谢你的注册! confirm_resend: failure: 用户 %{name} 未找到。 - success: 我们已经发送一封新的确认电子邮件到 %{email},只要您确认您的帐户,您就可以开始制图了。

    如果您使用的反垃圾邮件系统发送确认请求,那么请确保您的白名单中有 webmaster@openstreetmap.org,因为我们无法回复任何确认请求。 + success: 我们已经发送一封新的确认电子邮件到 %{email},只要你确认你的帐户,你就可以开始制图了。

    如果你使用的反垃圾邮件系统发送确认请求,那么请确保你的白名单中有 webmaster@openstreetmap.org,因为我们无法回复任何确认请求。 filter: - not_an_administrator: 您必须是管理员才能执行该操作。 + not_an_administrator: 你必须是管理员才能执行该操作。 go_public: - flash success: 您的所有编辑现在均已公开,现在允许您开始编辑。 + flash success: 你的所有编辑现在均已公开,现在允许你开始编辑。 list: confirm: 确认所选用户 empty: 没有找到匹配的用户 heading: 用户 hide: 隐藏所选用户 showing: - one: 显示页面 %{page} (%{first_item}/%{items}) - other: 显示页面 %{page} (%{first_item}-%{last_item}/%{items}) + one: "%{page}页(%{items}的第%{first_item}页)" + other: "%{page}页(%{items}的第%{first_item}至%{last_item}页)" summary: "%{name} 由 %{ip_address} 于 %{date} 创建" summary_no_ip: "%{name} 创建于 %{date}" title: 用户 login: - account is suspended: 对不起,您的帐户因可疑活动已被暂停。
    如果你想讨论这个,请联系网站管理员。 - account not active: 对不起,您的账户尚未激活。
    请点击在账户确认邮件中的链接来激活您的账户,或请求新的确认电子邮件。 - auth failure: 对不起,凭这些信息您无法登录。 - create account minute: 创建一个帐户。只需要一分钟。 + account is suspended: 对不起,你的帐户因可疑活动已被暂停。
    如果你想讨论这个,请联系网站管理员。 + account not active: 对不起,你的账户尚未激活。
    请点击在账户确认邮件中的链接来激活你的账户,或请求新的确认电子邮件。 + auth failure: 对不起,凭这些信息你无法登录。 + create account minute: 创建账户。只需要一分钟。 email or username: 电子邮件地址或用户名: heading: 登录 login_button: 登录 - lost password link: 找回密码? + lost password link: 忘记密码? new to osm: 第一次来到 OpenStreetMap? no account: 还没有帐户? - notice: 了解有关 OpenStreetMap 即将更换许可协议的信息 (翻译) (讨论) - notice_terms: OpenStreetMap 将于 2012 年 4 月 1 日更换到新的许可。这和当前的许可一样开放,但法律地位更适合我们的地图数据库。我们很乐意在 OpenStreetMap 保留您的贡献,但我们只能在您同意让我们根据新的许可证分发时,才能这么做。否则,我们将不得不从数据库中删除您的贡献。

    请登录,然后花几秒钟查看并接受新的条款。谢谢! - openid: "%{logo} OpenID:" - openid invalid: 对不起,您的 OpenID 格式似乎不正确 - openid missing provider: 对不起,无法联系您的 OpenID 提供者 - openid_logo_alt: 使用 OpenID 登录 + openid: "%{logo}OpenID:" + openid invalid: 对不起,你的 OpenID 格式似乎不正确 + openid missing provider: 对不起,无法联系你的 OpenID 提供者 + openid_logo_alt: 使用OpenID登录 openid_providers: aol: - alt: 使用一个 AOL OpenID 登录 + alt: 使用AOL OpenID登录 title: 使用 AOL 登录 google: - alt: 使用一个 Google OpenID 登录 + alt: 使用Google OpenID登录 title: 使用 Google 登录 myopenid: - alt: 使用一个 myOpenID OpenID 登录 + alt: 使用myOpenID OpenID登录 title: 使用 myOpenID 登录 openid: - alt: 使用一个 OpenID URL 登录 - title: 使用 OpenID 登录 + alt: 使用OpenID URL登录 + title: 使用OpenID登录 wordpress: - alt: 使用一个 Wordpress OpenID 登录 + alt: 使用Wordpress OpenID登录 title: 使用 Wordpress 登录 yahoo: - alt: 使用一个 Yahoo OpenID 登录 + alt: 使用Yahoo OpenID登录 title: 使用 Yahoo 登录 password: 密码: - register now: 立即注册 - remember: 记住我: + register now: 现在就注册 + remember: 记住我 title: 登录 - to make changes: 要修改 OpenStreetMap 的数据,您必须拥有一个帐户。 - with openid: 或者请使用您的 OpenID 登录: - with username: 已经有一个 OpenStreetMap 帐户?请使用您的用户名和密码登录: + to make changes: 要修改 OpenStreetMap 的数据,你必须拥有一个帐户。 + with openid: 或使用OpenID登录: + with username: 已经有OpenStreetMap账户?请使用你的用户名和密码登录: logout: heading: 从 OpenStreetMap 注销 logout_button: 注销 - title: 注销 + title: 登出 lost_password: email address: 电子邮件地址: - heading: 忘记密码? - help_text: 输入您的电子邮件地址来注册,我们会寄出链接给它,而您可以用它来重设密码。 - new password button: 发送新密码 + heading: 忘记密码? + help_text: 输入你的电子邮件地址来注册,我们会寄出链接给它,这样你就可以用它来重置密码。 + new password button: 重置密码 notice email cannot find: 对不起,无法找到邮箱。 - notice email on way: 对不起您的密码丢失 :-( 但是您可以根据发送的邮件重设密码。 - title: 丢失密码 + notice email on way: 对不起,你忘记了密码 :-( 但是邮件正在发送,一会你就可以重置它。 + title: 忘记密码 make_friend: - already_a_friend: 您已经和 %{name} 是朋友了。 + already_a_friend: 你已经和 %{name} 是朋友了。 + button: 添加为好友 failed: 对不起,未能添加 %{name} 为朋友。 - success: "%{name} 现在是您的朋友。" + heading: 将 %{user} 加为好友? + success: "%{name}现在是你的好友!" new: - confirm email address: 确认邮箱: + about: + header: 自由且可编辑 + html: "

    不同于其他地图,OpenStreetMap是完全由像你一样的人创建的,并且免费提供给任何人用以修正、更新、下载和使用。

    \n

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

    " + confirm email address: 确认电子邮件地址: confirm password: 确认密码: - contact_webmaster: 请联系网站管理员来安排创建一个账户 - 我们将尽快尝试处理您的请求。 - continue: 继续 - display name: 显示姓名: - display name description: 您公开显示的用户名。您可以稍后在首选项中更改。 - email address: 邮箱: - fill_form: 填写表格,我们将尽快向您发送一封邮件来激活您的帐户。 - flash create success message: 感谢您的注册。我们已经寄出确认邮件到 %{email},只要您确认您的帐户后就可以制作地图了。

    如果您使用会送出确认要求的防垃圾信系统,请确定您将 webmaster@openstreetmap.org 加入白名单中,因为我们无法回复任何确认请求。 - heading: 创建用户帐户 - license_agreement: 当您确认您的帐户时,您需要同意贡献者条款。 - no_auto_account_create: 很遗憾,我们目前无法为您自动创建一个帐户。 + contact_webmaster: 请联系网站管理员来安排创建一个账户 - 我们将尽快尝试处理你的请求。 + continue: 登录 + display name: 显示名称: + display name description: 你公开显示的用户名。你可以稍后在设置中进行变更。 + email address: 电子邮件地址: + license_agreement: 当你确认你的帐户时,你需要同意贡献者条款。 + no_auto_account_create: 很遗憾,我们目前无法为你自动创建一个帐户。 not displayed publicly: 不公开显示(参阅隐私政策) - openid: "%{logo} OpenID:" - openid association: "

    您的 OpenID 尚未与一个 OpenStreetMap 帐户相关联。

    \n
      \n
    • 如果您是新来到 OpenStreetMap,请使用下面的表单创建一个新的帐户。
    • \n
    • \n 如果您已经有一个帐户,您可以使用您的\n 用户名和密码登录到您的帐户,然后在您\n 的用户设置中关联您的 OpenID。\n
    • \n
    " + openid: "%{logo}OpenID:" + openid association: "

    你的 OpenID 尚未与一个 OpenStreetMap 帐户相关联。

    \n
      \n
    • 如果你是新来到 OpenStreetMap,请使用下面的表单创建一个新的帐户。
    • \n
    • \n 如果你已经有一个帐户,你可以使用你的\n 用户名和密码登录到你的帐户,然后在你\n 的用户设置中关联你的 OpenID。\n
    • \n
    " openid no password: 使用 OpenID 时密码不是必需的,但一些额外的工具或服务器可能需要一个。 password: 密码: - terms accepted: 感谢您接受新的贡献条款! - terms declined: 我们很遗憾您已决定不接受新的贡献者条款。有关详细信息,请参阅此维基页面. + terms accepted: 感谢你接受新的贡献条款! + terms declined: 我们很遗憾你已决定不接受新的贡献者条款。有关详细信息,请参阅此维基页面. terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined - title: 创建帐户 + title: 登录 use openid: 或者,使用 %{logo} OpenID 登录 no_such_user: - body: 对不起,没有名为 %{user} 的用户。请检查您的拼写,或者可能是点击了错误的链接。 - heading: 用户 %{user} 不存在 + body: 对不起,没有名为 %{user} 的用户。请检查你的拼写,或者可能是点击了错误的链接。 + heading: 用户%{user}不存在 title: 没有此用户 popup: friend: 朋友 nearby mapper: 附近用户 - your location: 您的位置 + your location: 你的位置 remove_friend: - not_a_friend: "%{name} 不是您的朋友。" - success: "%{name} 已从您的朋友中删除。" + button: 删除朋友 + heading: 删除朋友%{user}? + not_a_friend: "%{name}不是你的朋友。" + success: "%{name}已从你的朋友中删除。" reset_password: confirm password: 确认密码: - flash changed: 您的密码已更改。 + flash changed: 你的密码已经变更。 flash token bad: 未找到标记,建议检查 URL? heading: 重置 %{user} 的密码 password: 密码: reset: 重置密码 title: 重置密码 set_home: - flash success: 成功保存您所在位置 + flash success: 成功保存你所在位置 suspended: - body: "

    \n对不起,您的帐户已因可疑\n活动被自动暂停。\n

    \n

    \n这项决定将在短时间内由管理员审核,或者如果您想讨论这一点\n,可以联系%{webmaster}。\n

    " + body: "

    \n对不起,你的帐户已因可疑\n活动被自动暂停。\n

    \n

    \n这项决定将在短时间内由管理员审核,或者如果你想讨论这一点\n,可以联系%{webmaster}。\n

    " heading: 帐户已暂停 title: 帐户已暂停 webmaster: 网站管理员 @@ -1684,23 +1776,23 @@ zh-CN: france: 法国 italy: 意大利 rest_of_world: 世界其他地区 - legale_select: 请选择您居住的国家: - read and accept: 请阅读下面的协议并按同意按钮,以确认为您现有的和将来的贡献接受本协议的条款。 + legale_select: 请选择你居住的国家: + read and accept: 请阅读下面的协议并按同意按钮,以确认为你现有的和将来的贡献接受本协议的条款。 title: 贡献者条款 you need to accept or decline: 请先阅读,然后接受或拒绝新的贡献者条款,再继续。 view: activate_user: 启用该用户 - add as friend: 添加为好友 + add as friend: 添加朋友 ago: (%{time_in_words_ago}之前) - block_history: 查看接受的封禁 - blocks by me: 被我所封禁 - blocks on me: 对我的封禁 + block_history: 接受的封禁 + blocks by me: 被我封禁 + blocks on me: 我的封禁 comments: 注释 confirm: 确认 confirm_user: 确认此用户 create_block: 阻止此用户 - created from: 建立于: - ct accepted: 于%{ago}以前接受 + created from: 创建于: + ct accepted: 接受于%{ago}前 ct declined: 已拒绝 ct status: 贡献者条款: ct undecided: 未决定 @@ -1710,28 +1802,32 @@ zh-CN: diary: 日记 edits: 编辑 email address: 电子邮件地址: - friends_changesets: 浏览朋友的所有修改集合 - friends_diaries: 浏览朋友的所有日记条目 + friends_changesets: 朋友的变更集 + friends_diaries: 朋友的日记文章 hide_user: 隐藏此用户 - if set location: 如果您设定您的位置,一张精美的地图及其他相关信息将出现在下方。您可以通过您的%{settings_link}页面来设置您的位置。 - km away: "%{count} 公里之外" - latest edit: 上次编辑于%{ago}: - m away: "%{count} 米之外" - mapper since: 成为制图者于: - moderator_history: 查看封禁来自 + if set location: 如果你设定你的位置,一张精美的地图及其他相关信息将出现在下方。你可以通过你的%{settings_link}页面来设置你的位置。 + km away: "%{count}千米远" + latest edit: "%{ago}的最后编辑:" + m away: "%{count}米远" + mapper since: 绘制地图始于: + moderator_history: 执行封禁者 my comments: 我的评论 my diary: 我的日记 my edits: 我的编辑 + my messages: 我的消息 + my notes: 我的注释 + my profile: 我的资料 my settings: 我的设置 my traces: 我的轨迹 - nearby users: 附近的其他用户 - nearby_changesets: 浏览附近用户的所有修改集合 - nearby_diaries: 浏览附近用户的所有日记条目 - new diary entry: 新日记入口 - no friends: 您还没有添加任何好友。 + nearby users: 其他附近的用户 + nearby_changesets: 附近用户的变更集 + nearby_diaries: 附近用户的日记文章 + new diary entry: 新日记文章 + no friends: 你还没有添加任何好友。 no nearby users: 附近没有在进行制图的用户。 - oauth settings: OAuth 设置 - remove as friend: 删除好友 + notes: 地图注释 + oauth settings: OAuth设置 + remove as friend: 删除朋友 role: administrator: 此用户是管理员 grant: @@ -1742,49 +1838,49 @@ zh-CN: administrator: 撤销管理员权限 moderator: 撤销管理员权限 send message: 发送信息 - settings_link_text: 设定 + settings_link_text: 设置 spam score: 垃圾邮件评分: status: 状态: traces: 轨迹 unhide_user: 取消隐藏此用户 user location: 用户位置 - your friends: 您的朋友 + your friends: 你的朋友 user_block: blocks_by: - empty: "%{name}没有执行任何封禁。" + empty: "%{name}还没有执行任何封禁。" heading: "%{name}执行的封禁列表" title: "%{name}执行的封禁" blocks_on: empty: "%{name}还没有被封禁。" - heading: 对 %{name} 的封禁列表 - title: 对 %{name} 的封禁 + heading: 对%{name}的封禁列表 + title: 对%{name}的封禁 create: flash: 已建立对用户 %{name} 的封禁 try_contacting: 在封禁用户之前请先尝试联系他们,并给予他们一段合理的时间来回应。 try_waiting: 在封禁用户之前,请尝试给用户一段合理的时间来回应。 edit: back: 查看所有封禁 - heading: 正在编辑对 %{name} 的封禁 + heading: 编辑对%{name}的封禁 needs_view: 在清除这个封禁之前,是否需要用户先登录? period: 从现在开始,该用户要被封禁不能使用 API 多久。 reason: "%{name} 之所以被封禁的原因。请以冷静、合理的态度,尽量详细的说明有关情况。请记住,并非所有用户都了解社区的术语,所以请尝试使用较通俗的说法。" show: 查看此封禁 submit: 更新封禁 - title: 正在编辑对 %{name} 的封禁 + title: 编辑对%{name}的封禁 filter: block_expired: 这个封禁已经过期,并且不能再编辑。 block_period: 封禁时期必须是在下拉菜单中可选择的数值之一。 helper: - time_future: 结束于 %{time}。 - time_past: "%{time}前已结束。" - until_login: 作用到此用户登录为止。 + time_future: 结束于%{time}。 + time_past: 结束于%{time}前。 + until_login: 用户登录时激活。 index: empty: 尚未设置任何封禁。 heading: 用户封禁列表 title: 用户的封禁 model: - non_moderator_revoke: 必须撤消块的主持人。 - non_moderator_update: 必须创建或更新一个块的主持人。 + non_moderator_revoke: 必须为管理员才能撤消块。 + non_moderator_update: 必须为管理员才能创建或更新一个块。 new: back: 查看所有封禁 heading: 正在建立对 %{name} 的封禁 @@ -1799,41 +1895,44 @@ zh-CN: back: 返回索引 sorry: 对不起,未找到 ID 为 %{id} 的用户封禁。 partial: - confirm: 您确定吗? + confirm: 你确定吗? creator_name: 创建者 - display_name: 已封禁的用户 + display_name: 封禁的用户 edit: 编辑 - not_revoked: (不撤销) + next: 下一页 » + not_revoked: (未撤销) + previous: « 上一页 reason: 封禁的原因 revoke: 撤销! - revoker_name: 撤销由 + revoker_name: 撤销者 show: 显示 + showing_page: 第%{page}页 status: 状态 period: - one: 1 小时 - other: "%{count} 小时" + one: 1小时 + other: "%{count}小时" revoke: - confirm: 您确定要撤销此封禁? - flash: 此封禁已被撤销。 + confirm: 你确定要撤销该封禁? + flash: 该封禁已经被撤销。 heading: 正在撤销 %{block_by} 对 %{block_on} 的封禁 past: 此封禁已在 %{time} 之前结束,现在不能被撤销。 - revoke: 撤销! + revoke: 撤销! time_future: 此封禁将于 %{time} 结束。 title: 正在撤销对 %{block_on} 的封禁 show: back: 查看所有封禁 - confirm: 您确定吗? + confirm: 你确定吗? edit: 编辑 - heading: "%{block_on} 被 %{block_by} 封禁" - needs_view: 用户需要先登录,然后此封禁将被清除。 + heading: "%{block_on}被%{block_by}封禁" + needs_view: 用户需要在该封禁清除前登录。 reason: 封禁的原因: - revoke: 撤销! + revoke: 撤销! revoker: 撤销者: show: 显示 status: 状态 - time_future: 结束于 %{time} - time_past: 结束于 %{time} 之前 - title: "%{block_on} 被 %{block_by} 封禁" + time_future: 结束于%{time} + time_past: 结束于%{time}前 + title: "%{block_on}被%{block_by}封禁" update: only_creator_can_edit: 只有执行封禁的管理员能编辑它。 success: 封禁已更新。 @@ -1842,16 +1941,38 @@ zh-CN: already_has_role: 这个用户已经有角色 %{role}。 doesnt_have_role: 这个用户没有角色 %{role}。 not_a_role: 字串 '%{role}' 不是有效的角色。 - not_an_administrator: 只有管理员可以执行用户角色管理,而您不是管理员。 + not_an_administrator: 只有管理员可以执行用户角色管理,而你不是管理员。 grant: - are_you_sure: 您确定要赋予用户 '%{name}' 角色 '%{role}' 吗? + are_you_sure: 你确定要赋予用户 '%{name}' 角色 '%{role}' 吗? confirm: 确认 fail: 无法授予用户 '%{name}' 角色 '%{role}'。请检查用户和角色是否都正确。 heading: 确认角色授予 title: 确认角色授予 revoke: - are_you_sure: 您确定要吊销用户 '%{name}' 角色 '%{role}' 吗? + are_you_sure: 你确定要吊销用户 '%{name}' 角色 '%{role}' 吗? confirm: 确认 fail: 无法吊销用户 '%{name}' 角色 '%{role}'。请检查用户和角色是否都正确。 heading: 确认角色吊销 title: 确认角色吊销 + welcome_page: + add_a_note: + paragraph_1_html: 如果你这是想做一些微小改动而没有时间登录来学习如何编辑,那做一些注释是非常容易的。 + paragraph_2_html: 只要去地图并单击注释图标: 。这将在地图上添加一个标记,你可以拖动它,并添加你的注释,然后单击保存,其他人可以确认是否正确。 + title: 没有时间编辑?添加注释! + basic_terms: + editor_html: 编辑器是你可以用于编辑地图的程序或网站。 + node_html: 节点是地图上的点,例如一个餐馆或一棵树。 + paragraph_1_html: OpenStreetMap有一些自己的术语。这里是一些常用的关键词。 + tag_html: 标签是关于节点或路径的简短数据,例如餐馆的名字或者道路的速度限制。 + title: 绘制地图的基本术语 + way_html: 路径是线或区域,例如一条路、一条溪、一个湖或一个建筑物。 + introduction_html: 欢迎访问OpenStreeMap,自由且可编辑的世界地图。你已经登录,可以开始绘制地图。这里是含有你需要知道的最重要的信息的快速指南。 + questions: + paragraph_1_html: 需要协助画地图,或者对如何使用OpenStreetMap不是很清楚?在帮助网站得到你想要的答案。 + title: 还有疑问吗? + start_mapping: 开始绘制地图 + title: 欢迎! + whats_on_the_map: + off_html: 当然它不包含一些激进的数据,譬如评分、历史或者假设的特性,以及有版权的来源。除非你具有特殊权利,否则不要复制在线的或者纸质地图。 + on_html: OpenStreetMap是一个真实而且最新的地图,它包含数百万的建筑、道路以及其他的位置细节。你基本可以编辑现实世界中你感兴趣的任何东西。 + title: 地图上有什么 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 22dec11c12d..f4656650cb6 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1,11 +1,28 @@ -# Messages for Traditional Chinese (‪中文(繁體)‬) +# Messages for Traditional Chinese (中文(繁體)‎) # Exported from translatewiki.net # Export driver: syck-pecl # Author: Anakmalaysia +# Author: Cwlin0416 +# Author: Foothsu +# Author: Justincheng12345 # Author: Mmyangfl +# Author: Orinx # Author: Pesder +# Author: Shangkuanlc +# Author: Simon Shek +# Author: StephDC # Author: Wrightbus zh-TW: + about_page: + community_driven_title: 社群參與 + copyright_html: ©OpenStreetMap
    貢獻者 + lede_text: OpenStreetMap 是由製圖者社群所建立的,維護的資料包含世界上的道路、步道、咖啡館、火車站等等。 + local_knowledge_html: "OpenStreetMap 強調當地的知道。貢獻者使用\n航照圖、GPS 裝置與低科技的地區地圖來驗證 OSM\n是正確而即時的。" + local_knowledge_title: 當地的知識 + next: 下一頁 + open_data_title: 開放資料 + partners_title: 合作夥伴 + used_by: "%{name} 提供數以百計的網站、行動 app 與硬體設備地圖資料" activerecord: attributes: diary_comment: @@ -77,83 +94,37 @@ zh-TW: application: require_cookies: cookies_needed: 您似乎已停用 cookies - 請在瀏覽器中啟用 cookies,然後繼續。 + require_moderator: + not_a_moderator: 您需要一個管理者來執行該動作。 setup_user_auth: blocked: 您對 API 的存取已經被阻擋了。請登入網頁介面以了解更多資訊。 need_to_see_terms: 我們已暫時中止您存取API的權限,請登入網頁介面查閱貢獻者條款,您不需要同意有關條款,但必須查閱全部。 browse: + anonymous: 匿名 changeset: - changeset: 變更組合: + belongs_to: 作者 changesetxml: 變更組合 XML - download: 下載 %{changeset_xml_link} 或 %{osmchange_xml_link} feed: title: 變更組合 %{id} title_comment: 變更組合 %{id} - %{comment} + node: 節點 (%{count}) osmchangexml: osmChange XML - title: 變更組合 - changeset_details: - belongs_to: 屬於: - bounding_box: 綁定方塊: - box: 方塊 - closed_at: 關閉於: - created_at: 建立於: - has_nodes: - one: 有下列 %{count} 個節點: - other: 有下列 %{count} 個節點: - has_relations: - one: 有下列 %{count} 個關係: - other: 有下列 %{count} 個關係: - has_ways: - one: 有下列 %{count} 個路徑: - other: 有下列 %{count} 個路徑: - no_bounding_box: 這個變更組合沒有儲存綁定方塊。 - show_area_box: 顯示區域方塊 - common_details: - changeset_comment: 評論: - edited_at: 編輯於: - edited_by: 編輯者: - in_changeset: 於變更組合: - version: 版本: + title: 變更組合:%{id} + closed: 已關閉 + closed_by_html: 由 %{user} 關閉於 %{time} 以前 + closed_html: 關閉於 %{time} 以前 containing_relation: entry: 關係 %{relation_name} entry_role: 關係 %{relation_name} (做為 %{relation_role}) - map: - deleted: 已刪除 - larger: - area: 在較大的地圖檢視區域 - node: 在較大的地圖檢視節點 - relation: 在較大的地圖檢視關係 - way: 在較大的地圖檢視路徑 - loading: 正在載入... - navigation: - all: - next_changeset_tooltip: 下一個變更組合 - next_node_tooltip: 下一個節點 - next_relation_tooltip: 下一個關係 - next_way_tooltip: 下一條路徑 - prev_changeset_tooltip: 上一個變更組合 - prev_node_tooltip: 上一個節點 - prev_relation_tooltip: 上一個關係 - prev_way_tooltip: 前一條路徑 - user: - name_changeset_tooltip: 檢視由 %{user} 進行的編輯 - next_changeset_tooltip: 下一個 %{user} 的編輯 - prev_changeset_tooltip: 上一個 %{user} 的編輯 - node: - download: "%{download_xml_link} 或 %{view_history_link}" - download_xml: 下載 XML - edit: 編輯 - node: 節點 - node_title: 節點: %{node_name} - view_history: 檢視歷史 - node_details: - coordinates: 坐標: - part_of: 部分: - node_history: - download: "%{download_xml_link} 或 %{view_details_link}" - download_xml: 下載 XML - node_history: 節點歷史 - node_history_title: 節點歷史: %{node_name} - view_details: 檢視詳細資訊 + created: 已建立 + created_by_html: 由 %{user} 建立於 %{time} 以前 + created_html: 建立於 %{time} 以前 + deleted_by_html: 由 %{user} 刪除於 %{time} 以前 + download_xml: 下載 XML + edited_by_html: 由 %{user} 編輯於 %{time} 以前 + in_changeset: 變更組合 + location: 位置: + no_comment: (沒有評論) not_found: sorry: 抱歉,找不到 id %{id} 的 %{type}。 type: @@ -161,69 +132,32 @@ zh-TW: node: 節點 relation: 關係 way: 路徑 - paging_nav: - of: / - showing_page: 正在顯示頁面 + note: + closed_title: 已解決的筆記:%{note_name} + new_note: 新增節點 + open_title: "未解決的筆記: %{note_name}" + title: 節點:%{id} + part_of: 部分: + redacted: + message_html: 此 %{type} 中的版本 %{version} 不能被顯示,因爲它已被編輯過。請參閱 %{redaction_link} 的詳細資訊。 + redaction: 修訂版 %{id} + type: + node: 節點 + relation: 關係 + way: 路徑 relation: - download: "%{download_xml_link} 或 %{view_history_link}" - download_xml: 下載 XML - relation: 關係 - relation_title: 關係: %{relation_name} - view_history: 檢視歷史 - relation_details: - members: 成員: - part_of: 部分: - relation_history: - download: "%{download_xml_link} 或 %{view_details_link}" - download_xml: 下載 XML - relation_history: 關係歷史 - relation_history_title: 關係歷史: %{relation_name} - view_details: 檢視詳細資料 + members: 成員 relation_member: entry_role: "%{type} %{name} 做為 %{role}" type: node: 節點 relation: 關係 way: 路徑 - start: - manually_select: 手動選擇不同的區域 - view_data: 目前地圖檢視的檢視資料 start_rjs: - data_frame_title: 資料 - data_layer_name: 資料 - details: 詳細資訊 - drag_a_box: 在地圖上拖曳出一個方塊來選擇一個區域 - edited_by_user_at_timestamp: 由 [[user]] 於 [[timestamp]] 編輯 - hide_areas: 隱藏區域 - history_for_feature: "[[feature]] 的歷史" load_data: 載入資料 - loaded_an_area_with_num_features: 您已經載入了包含 [[num_features]] 項功能的區域。通常,有些瀏覽器無法正常顯示這個數量的資料。一般而言,瀏覽器在一次顯示 100 個以下的功能時最適當:超過這個數量會使您的瀏覽器變慢/停止回應。如果確定要顯示這個資料,請按下面的按鈕。 loading: 正在載入... - manually_select: 手動選擇不同的區域 - object_list: - api: 從 API 取回這個區域 - back: 顯示物件清單 - details: 詳細資訊 - heading: 物件清單 - history: - type: - node: 節點 [[id]] - way: 路徑 [[id]] - selected: - type: - node: 節點 [[id]] - way: 路徑 [[id]] - type: - node: 節點 - way: 路徑 - private_user: 個人使用者 - show_areas: 顯示區域 - show_history: 顯示歷史 - unable_to_load_size: 無法載入:綁定方塊的大小 [[bbox_size]] 太過巨大 (必須小於 %{max_bbox_size}) - wait: 等待... - zoom_or_select: 放大或選擇要檢視的地圖區域 tag_details: - tags: 標籤: + tags: 標籤 wiki_link: key: "%{key} 標籤的 wiki 描述頁面" tag: "%{key}=%{value} 標籤的 wiki 描述頁面" @@ -235,38 +169,20 @@ zh-TW: node: 節點 relation: 關係 way: 路徑 + version: 版本 + view_details: 檢視詳細資訊 + view_history: 檢視歷史 way: - download: "%{download_xml_link} 或 %{view_history_link}" - download_xml: 下載 XML - edit: 編輯 - view_history: 檢視歷史 - way: 路徑 - way_title: 路徑: %{way_name} - way_details: - also_part_of: - one: 也是路徑 %{related_ways} 的一部分 - other: 也是路徑 %{related_ways} 的一部分 - nodes: 節點: - part_of: 部分: - way_history: - download: "%{download_xml_link} 或 %{view_details_link}" - download_xml: 下載 XML - view_details: 檢視詳細資訊 - way_history: 路徑歷史 - way_history_title: 路徑歷史: %{way_name} + nodes: 節點 changeset: changeset: anonymous: 匿名 - big_area: (大) - no_comment: (沒有) no_edits: (沒有編輯) - show_area_box: 顯示區域方塊 - still_editing: (尚在編輯) view_changeset_details: 檢視變更組合詳細資訊 changeset_paging_nav: next: 下一頁 » previous: « 上一頁 - showing_page: 正在顯示第 %{page} 頁 + showing_page: 第 %{page}頁 changesets: area: 區域 comment: 註解 @@ -274,29 +190,37 @@ zh-TW: saved_at: 儲存於 user: 使用者 list: - description: 最近的變更組合 - description_bbox: "%{bbox} 裡的變更組合" - description_user: "%{user} 的變更組合" - description_user_bbox: "%{user} 在 %{bbox} 裡的變更組合" - heading: 變更組合 - heading_bbox: 變更組合 - heading_user: 變更組合 - heading_user_bbox: 變更組合 + empty: 發現沒有變更集。 + empty_area: 這一地區沒有變更集。 + empty_user: 此用戶沒有變更集。 + load_more: 載入更多 + no_more: 沒有更多變更集。 + no_more_area: 這一地區沒有更多變更集。 + no_more_user: 此用戶沒有更多變更集。 title: 變更組合 - title_bbox: "%{bbox} 裡的變更組合" + title_friend: 您朋友的變更組合 + title_nearby: 鄰近使用者的變更組合 title_user: "%{user} 的變更組合" - title_user_bbox: "%{user} 在 %{bbox} 裡的變更組合" timeout: sorry: 對不起,您要求的變更組合集清單取回時花了太長時間。 diary_entry: + comments: + ago: "%{ago} 前" + comment: 評論 + has_commented_on: "%{display_name} 在以下的日記項目發表了評論" + newer_comments: 較新的評論 + older_comments: 較舊的評論 + post: 張貼 + when: 於 diary_comment: comment_from: 由 %{link_user} 於 %{comment_created_at} 發表評論 confirm: 確認 hide_link: 隱藏此評論 diary_entry: comment_count: - one: 1 個評論 - other: "%{count} 個評論" + one: 1個評論 + other: "%{count}個評論" + zero: 無評論 comment_link: 對這個項目的評論 confirm: 確認 edit_link: 編輯此項目 @@ -331,8 +255,10 @@ zh-TW: newer_entries: 較新的項目 no_entries: 沒有日記項目 older_entries: 較舊的項目 - recent_entries: 最近的日記項目: + recent_entries: 最近的日記項目 title: 日記 + title_friends: 朋友的日記 + title_nearby: 附近的使用者的日記 user_title: "%{user} 的日記" location: edit: 編輯 @@ -351,13 +277,27 @@ zh-TW: save_button: 儲存 title: "%{user} 的日記 | %{title}" user_title: "%{user}的日記" + editor: + default: 預設 (目前 %{name}) + id: + description: iD (網頁版編輯器) + name: iD + potlatch: + description: Potlatch 1 (瀏覽器內編輯) + name: Potlatch 1 + potlatch2: + description: Potlatch 2 (瀏覽器內編輯) + name: Potlatch 2 + remote: + description: 遠端控制 (JOSM 或 Merkaartor) + name: 遠端控制 export: start: add_marker: 在地圖加上標記 area_to_export: 要匯出的區域 embeddable_html: 內嵌式 HTML export_button: 匯出 - export_details: OpenStreetMap 資料是以創用 CC 姓名標示-相同方式分享 2.0 條款授權。 + export_details: OpenStreetMap 資料是以開放資料共用 開放資料庫(ODbL)授權。 format: 格式 format_to_export: 要匯出的格式 image_size: 圖片大小 @@ -365,6 +305,7 @@ zh-TW: licence: 授權 longitude: 經度: manually_select: 手動選擇不同的區域 + map_image: 地圖影像 (顯示標準圖層) max: 最大 options: 選項 osm_xml_data: OpenStreetMap XML 資料 @@ -372,29 +313,30 @@ zh-TW: paste_html: 貼上 HTML 內嵌於網站 scale: 比例 too_large: - body: 這個區域太大,無法匯出 OpenStreetMap XML 資料。請拉近或選擇一個較小的區域。 - heading: 區域太大 + body: 這個區域太大,無法匯出 OpenStreetMap XML 資料。請拉近選擇一個較小的區域或使用下列大量資料下載源: + geofabrik: + description: 定期更新的洲、國家及特定城市之摘要 + title: Geofabrik下載 + metro: + description: 世界主要城市與附近地區的摘要 + title: 城市摘要 + other: + description: OpenStreetMap wiki 上列出的其他來源 + title: 其他來源 + planet: + description: 定期更新的完整OpenStreetMap資料庫副本 + title: 地球OSM zoom: 變焦 - start_rjs: - add_marker: 加入標記至地圖 - change_marker: 改變標記地點 - click_add_marker: 在地圖上點選以加上標記 - drag_a_box: 在地圖上拖曳出一個方塊以選擇區域 - export: 匯出 - manually_select: 手動選擇不同的區域 - view_larger_map: 檢視較大的地圖 + title: 匯出 geocoder: description: title: geonames: 位置來自 GeoNames - osm_namefinder: "%{types} 來自 OpenStreetMap Namefinder" osm_nominatim: 來自 OpenStreetMap Nominatim 的位置 types: cities: 城市 places: 地區 towns: 鄉鎮 - description_osm_namefinder: - prefix: "%{distance} %{direction} / %{type}" direction: east: 東方 north: 北方 @@ -415,183 +357,596 @@ zh-TW: title: ca_postcode: 來自Geocoder.CA的結果 geonames: 來自GeoNames的結果 + geonames_reverse: 來自GeoNames的結果 latlon: 來自內部的結果 - osm_namefinder: 來自OpenStreetMap Namefinder的結果 osm_nominatim: 來自 OpenStreetMap Nominatim 的結果 + osm_nominatim_reverse: 來自OpenStreetMap Nominatim的結果 uk_postcode: 來自NPEMap / FreeThe Postcode的結果 us_postcode: 來自Geocoder.us的結果 - search_osm_namefinder: - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} / %{parentname})" - suffix_place: ", %{direction} %{distance} / %{placename}" search_osm_nominatim: + admin_levels: + level10: 郊區邊界 + level2: 國界 + level4: 州界 + level5: 區界 + level6: 縣界 + level8: 市界 + level9: 村界 prefix: + aerialway: + chair_lift: 登山吊椅 + drag_lift: 上山牽引梯 + station: 航空站 + aeroway: + aerodrome: 機場 + apron: 停機坪 + gate: 登機口 + helipad: 直升機停機坪 + runway: 跑道 + taxiway: 滑行道 + terminal: 終端 amenity: + WLAN: 無線網路 airport: 機場 + arts_centre: 藝術中心 + artwork: 藝術品 atm: ATM + auditorium: 禮堂 bank: 銀行 + bar: 酒吧 + bbq: 燒烤場 + bench: 長椅 + bicycle_parking: 單車停車 bicycle_rental: 自行車租賃 + biergarten: 啤酒花園 + brothel: 妓院 + bureau_de_change: 找換店 + bus_station: 巴士站 + cafe: 咖啡廳 + car_rental: 租車 + car_sharing: 汽車共用 + car_wash: 洗車 casino: 賭場 + charging_station: 充電站 cinema: 電影院 clinic: 診所 club: 俱樂部 - community_centre: 社區中心 + college: 學院 + community_centre: 社群中心 + courthouse: 法庭 crematorium: 火葬場 dentist: 牙醫 + doctors: 醫生 + dormitory: 宿舍 + drinking_water: 飲用水 driving_school: 駕駛學校 embassy: 大使館 emergency_phone: 緊急電話 fast_food: 快餐 + ferry_terminal: 渡輪碼頭 fire_hydrant: 消防栓 fire_station: 消防局 + food_court: 美食廣場 + fountain: 噴泉 + fuel: 油店 grave_yard: 墓地 + gym: 健身中心 / 健身房 + hall: 大廳 health_centre: 健康中心 hospital: 醫院 hotel: 酒店 + hunting_stand: 狩獵站 ice_cream: 冰淇淋 + kindergarten: 幼稚園 library: 圖書館 + market: 市場 + marketplace: 市場 + mountain_rescue: 山地救援 nightclub: 夜總會 + nursery: 托兒所 + nursing_home: 護理院 office: 辦公室 + park: 公園 + parking: 停車場 pharmacy: 藥房 place_of_worship: 宗教場所 police: 警察 post_box: 郵箱 post_office: 郵局 + preschool: 學前教育 prison: 監獄 + pub: 酒吧 + public_building: 公共建築 + public_market: 市集 + reception_area: 接待區 + recycling: 回收點 + restaurant: 餐廳 + retirement_home: 安老院 sauna: 桑拿 school: 學校 + shelter: 庇護所 + shop: 商店 + shopping: 購物 + shower: 淋浴 + social_centre: 社交中心 + social_club: 社交場合 + social_facility: 社區設施 + studio: 錄音室 supermarket: 超級市場 + swimming_pool: 游泳池 taxi: 出租車 telephone: 公共電話 + theatre: 劇院 toilets: 洗手間 + townhall: 市政廳 university: 大學 + vending_machine: 自動販賣機 + veterinary: 獸醫 + village_hall: 村公所 + waste_basket: 垃圾桶 + wifi: 無線網路 + youth_centre: 青少年中心 + boundary: + administrative: 行政區邊界 + census: 人口普查邊界 + national_park: 國家公園 + protected_area: 保護區 + bridge: + aqueduct: 水道 + suspension: 懸索橋 + swing: 平旋橋 + viaduct: 高架橋 + "yes": 橋 + building: + "yes": 建築物 + emergency: + fire_hydrant: 消防栓 + phone: 緊急電話 + highway: + bridleway: 馬道 + bus_guideway: 軌道巴士線 + bus_stop: 巴士站 + byway: 小路 + construction: 建造中公路 + cycleway: 單車徑 + emergency_access_point: 緊急求助點 + footway: 行人路 + ford: 淺灘 + living_street: 生活街 + milestone: 里程碑 + minor: 次要道路 + motorway: 高速公路 + motorway_junction: 高速公路交匯處 + motorway_link: 高速公路 + path: 小徑 + pedestrian: 人行道 + platform: 車站月台 + primary: 主要道路 + primary_link: 主要道路 + proposed: 擬議道路 + raceway: 賽道 + residential: 住宅 + rest_area: 休息區 + road: 道路 + secondary: 次要道路 + secondary_link: 次級公路 + service: 服務道路 + services: 高速公路休息區 + speed_camera: 測速照相機 + steps: 步驟 + stile: 跨越圍欄的台階 + street_lamp: 路燈 + tertiary: 三級道路 + tertiary_link: 三級道路 + track: 軌道 + trail: 徑 + trunk: 主幹線 + trunk_link: 主幹線 + unclassified: 無分級道路 + unsurfaced: 未平整道路 historic: + archaeological_site: 考古遺址 + battlefield: 戰場 + boundary_stone: 界碑 + building: 建築物 + castle: 城堡 + church: 教堂 + citywalls: 城牆 + fort: 堡 + house: 房屋 + icon: 圖示 + manor: 莊園 + memorial: 紀念館 + mine: 礦產 + monument: 古蹟 museum: 博物館 + ruins: 廢墟 + tomb: 墳墓 + tower: 塔 + wayside_cross: 路邊十字 + wayside_shrine: 路邊神龕 + wreck: 殘骸 landuse: + allotments: 小園地 + basin: 盆地 + brownfield: 棕地 cemetery: 墳場 + commercial: 商業區 + conservation: 保育 + construction: 建設中 + farm: 農場 + farmland: 農地 + farmyard: 農家 + forest: 森林 + garages: 車庫 + grass: 草地 + greenfield: 綠地 + industrial: 工業區 + landfill: 垃圾埋填區 + meadow: 草地 military: 軍事區 + mine: 礦產 + nature_reserve: 自然保護區 + orchard: 果園 + park: 公園 + piste: 滑雪場 + quarry: 採石場 + railway: 鐵路 + recreation_ground: 遊樂場 reservoir: 水庫 + reservoir_watershed: 水庫集水區 + residential: 住宅區 + retail: 零售 + road: 道路區 + village_green: 鄉村草地 + vineyard: 葡萄園 + wetland: 濕地 + wood: 樹林 + leisure: + beach_resort: 海灘度假村 + bird_hide: 鳥類觀察站 + common: 公共用地 + fishing: 垂釣區 + fitness_station: 健身站 + garden: 花園 + golf_course: 高爾夫球道 + ice_rink: 溜冰場 + marina: 小船塢 + miniature_golf: 小型高爾夫球場 + nature_reserve: 自然保護區 + park: 公園 + pitch: 運動場 + playground: 遊樂場 + recreation_ground: 遊樂場 + sauna: 桑拿 + slipway: 船臺 + sports_centre: 運動中心 + stadium: 運動場 + swimming_pool: 游泳池 + track: 跑道 + water_park: 水上公園 + military: + airfield: 軍用機場 + barracks: 營房 + bunker: 掩體 + mountain_pass: + "yes": 山口 natural: + bay: 灣 + beach: 海灘 + cape: 海角 + cave_entrance: 洞穴入口 + channel: 海峽 + cliff: 峭壁 + crater: 火山口 + dune: 沙丘 + feature: 特征 + fell: 費爾地貌 + fjord: 峽灣 + forest: 森林 + geyser: 間歇泉 + glacier: 冰川 + heath: 希思地貌 + hill: 小山 + island: 島 + land: 陸地 + marsh: 沼澤 + moor: 停泊處 + mud: 泥地 + peak: 山頂 + point: 點 + reef: 礁 + ridge: 山脊 + river: 河 + rock: 岩石 + scree: 岩屑堆 + scrub: 灌木 + shoal: 暗沙 + spring: 泉 + stone: 石 + strait: 海峡 + tree: 樹 + valley: 谷 volcano: 火山 + water: 水 + wetland: 濕地 + wetlands: 濕地 + wood: 樹林 + office: + accountant: 會計師事務所 + architect: 建築院 + company: 公司 + employment_agency: 就業中介 + estate_agent: 地產代理 + government: 政府辦事處 + insurance: 保險 + lawyer: 律師 + ngo: 非政府組織辦公室 + telecommunication: 電信辦公室 + travel_agent: 旅行社 + "yes": 辦公室 place: airport: 機場 + city: 城市 + country: 國家 + county: 縣 + farm: 農場 + hamlet: 村莊 + house: 房屋 + houses: 房屋 + island: 島 + islet: 嶼 + isolated_dwelling: 獨立住宅 + locality: 地區 + moor: 荒野 + municipality: 自治市 + neighbourhood: 居住區 + postcode: 郵政編號 + region: 區域 + sea: 海 + state: 狀態 + subdivision: 細分 + suburb: 郊區 + town: 鄉鎮 + unincorporated_area: 非建制地區 + village: 村落 railway: + abandoned: 廢棄鐵路 construction: 建造中鐵路 + disused: 廢棄鐵路 + disused_station: 廢棄火車站 + funicular: 纜索鐵道 + halt: 列車站 + historic_station: 歷史火車站 + junction: 鐵路交匯處 + level_crossing: 道口 + light_rail: 輕鐵 + miniature: 微型鐵路 + monorail: 單軌 + narrow_gauge: 窄軌鐵路 + platform: 鐵路月臺 + preserved: 保留鐵路 + proposed: 規劃鐵路 + spur: 鐵路支線 + station: 火車站 + stop: 火車停車處 + subway: 地鐵站 + subway_entrance: 地鐵出入口 + switch: 道岔 + tram: 電車軌道 tram_stop: 電車站 + yard: 鐵路站場 shop: + alcohol: 無許可證 + antiques: 古玩店 + art: 藝術品店 bakery: 麵包店 beauty: 美容店 + beverages: 飲料店 bicycle: 自行車店 books: 書店 + boutique: 精品店 + butcher: 屠夫 + car: 車店 car_parts: 汽車零件 car_repair: 汽車維修 + carpet: 地毯店 + charity: 慈善商店 + chemist: 化學品店 + clothes: 服裝店 computer: 電腦商店 + confectionery: 糖果店 convenience: 便利店 copyshop: 複印店 cosmetics: 化妝品店 + deli: 熟食店 department_store: 百貨商店 discount: 特價商品店 + doityourself: DIY dry_cleaning: 乾洗 electronics: 電子產品商店 estate_agent: 地產代理 + farm: 農場商店 fashion: 時裝店 fish: 魚店 + florist: 花店 food: 食品店 funeral_directors: 殮葬服務 furniture: 傢俬 + gallery: 畫廊 + garden_centre: 園藝中心 + general: 一般商店 gift: 禮品店 + greengrocer: 蔬菜水果店 + grocery: 雜貨店 + hairdresser: 理髮店 + hardware: 五金店 hifi: 音響店 insurance: 保險 jewelry: 珠寶店 + kiosk: 售貨亭 laundry: 洗衣房 + mall: 購物商場 + market: 市集 mobile_phone: 手機店 motorcycle: 摩托車店 + music: 唱片行 + newsagent: 報刊亭 + optician: 驗眼師 organic: 有機食品店 + outdoor: 戶外店 pet: 寵物店 + pharmacy: 藥房 + photo: 照相館 + salon: 美容院 + second_hand: 二手店 shoes: 鞋店 shopping_centre: 購物中心 sports: 體育用品店 stationery: 文具店 supermarket: 超級市場 + tailor: 裁縫店 toys: 玩具店 travel_agency: 旅行社 + video: 音像店 + wine: 無許可證 + "yes": 商店 tourism: + alpine_hut: 高山小屋 artwork: 美工 + attraction: 景點 + bed_and_breakfast: 家庭旅館 + cabin: 小木屋 camp_site: 營地 + caravan_site: 房車宿營地 + chalet: 小屋 guest_house: 賓館 hostel: 旅舍 hotel: 酒店 information: 資訊 + lean_to: 棚屋 motel: 汽車旅館 museum: 博物館 picnic_site: 野餐地 + theme_park: 主題公園 + valley: 谷 + viewpoint: 觀景點 zoo: 動物園 + tunnel: + culvert: 排水管 + "yes": 隧道 waterway: + artificial: 人工航道 + boatyard: 船塢 + canal: 運河 + connector: 水路連接器 dam: 水壩 + derelict_canal: 廢棄運河 + ditch: 溝 + dock: 碼頭 + drain: 渠 + lock: 鎖 + lock_gate: 船閘 + mineral_spring: 礦泉 + mooring: 系泊設備 + rapids: 急流 + river: 河 + riverbank: 河岸 + stream: 溪 + wadi: 乾河 + water_point: 取水處 + waterfall: 瀑布 + weir: 堰 + help_page: + help: + title: help.openstreetmap.org + url: https://help.openstreetmap.org/ + welcome: + description: 這個快速指南涵蓋了 OpenStreetMap 基礎知識。 + title: 歡迎來到 OSM + url: /welcome + wiki: + title: wiki.openstreetmap.org + url: http://wiki.openstreetmap.org/ javascripts: + close: 關閉 + map: + base: + cycle_map: Cycle Map + standard: 標準 + transport_map: Transport Map + share: + cancel: 取消 + custom_dimensions: 設置自訂的尺寸 + embed: HTML + format: 格式: + image: 圖片 + link: 連結或 HTML + long_link: 連結 + scale: 比例 + short_link: 簡短連結 + title: 分享 site: edit_disabled_tooltip: 拉近以編輯地圖 edit_tooltip: 編輯地圖 - edit_zoom_alert: 您必須拉近以編輯地圖 - history_disabled_tooltip: 拉近以編輯這個區域 - history_tooltip: 檢視對這個區域的編輯 - history_zoom_alert: 您必須先拉近才能編輯這個區域 layouts: + about: 關於 + community: 社群 community_blogs: 社群部落格 community_blogs_title: OpenStreetMap 社群成員的部落格 - copyright: 版權 & 授權條款 - documentation: 文件 - documentation_title: 該專案的文件 + copyright: 版權 + data: 資料 donate: 以 %{link} 給硬體升級基金來支援 OpenStreetMap。 - donate_link_text: 捐獻 edit: 編輯 edit_with: 以 %{editor} 編輯 export: 匯出 - export_tooltip: 匯出地圖資料 + export_data: 匯出資料 foundation: 基金會 foundation_title: OpenStreetMap 基金會 gps_traces: GPS 軌跡 gps_traces_tooltip: 管理 GPS 軌跡 help: 求助 - help_centre: 求助中心 - help_title: 專案的說明網站 history: 歷史 - home: 家 - home_tooltip: 移至家位置 - inbox: 收件匣 (%{count}) - inbox_tooltip: - one: 您的收件匣有 1 個未閱讀的訊息 - other: 您的收件匣有 %{count} 個未閱讀的訊息 - zero: 您的收件匣沒有未閱讀的訊息 - intro_1: OpenStreetMap 是一個自由、可編輯的全世界地圖。它是由像您這樣的人所製作的。 - license: - title: OpenStreetMap 資料是以創用 CC 姓名標示-相同方式分享 2.0 通用條款授權 + home: 移至家的位置 + intro_2_create_account: 建立使用者帳號 + intro_header: 歡迎來到 OpenStreetMap! + intro_text: OpenStreetMap 是一個世界地圖,由像您這樣的人們所建立,在開放授權下可以自由使用。 + learn_more: 了解更多 log_in: 登入 log_in_tooltip: 以設定好的帳號登入 logo: alt_text: OpenStreetMap 標誌 logout: 登出 - logout_tooltip: 登出 make_a_donation: text: 進行捐款 title: 以捐贈金錢來支持 OpenStreetMap + more: 更多 osm_offline: OpenStreetMap 資料庫目前離線中,直到必要的資料庫維護工作完成為止。 osm_read_only: OpenStreetMap 資料庫目前是唯讀模式,直到必要的資料庫維護工作完成為止。 + partners_bytemark: Bytemark 主機代管 + partners_html: 主機由%{ucl}、%{ic}、%{bytemark} 和其他 %{partners} 所支援。 + partners_ic: 倫敦帝國學院 + partners_partners: 合作夥伴 + partners_ucl: 倫敦大學學院 VR 中心 sign_up: 註冊 sign_up_tooltip: 建立一個帳號以便能編輯 + start_mapping: 開始製圖 tag_line: 自由的 Wiki 世界地圖 user_diaries: 日記 user_diaries_tooltip: 檢視日記 - view: 檢視 - view_tooltip: 檢視地圖 - welcome_user: 歡迎,%{user_link} - welcome_user_link_tooltip: 您的使用者頁面 - wiki: Wiki - wiki_title: 專案的 Wiki 網站 license_page: foreign: english_link: 英文原文 text: 這這個翻譯頁面和 %{english_original_link} 在事件上有衝突時,英文(English)網頁會有較高的優先權 title: 關於這個翻譯 + legal_babble: + contributors_footer_1_html: "需要這些進一步資訊,以及其他用來協助改進\n OpenStreetMap 的資源,請查閱 OpenStreetMap Wiki 上的 貢獻者\n頁面。" + contributors_title_html: 我們的貢獻者 + credit_title_html: 如何標明作者是OpenStreetMap + infringement_title_html: 侵犯版權 + intro_1_html: OpenStreetMap為開放資料,以開放資料共用 開放資料庫(ODbL)授權。 + more_title_html: 了解更多 + title_html: 版權與授權條款 native: mapping_link: 開始製圖 native_link: 正體中文版 @@ -641,12 +996,8 @@ zh-TW: title: 寄件匣 to: 收件者 read: - back_to_inbox: 回到收件匣 - back_to_outbox: 回到寄件匣 date: 日期 from: 寄件者 - reading_your_messages: 閱讀您的訊息 - reading_your_sent_messages: 閱讀您寄出的訊息 reply_button: 回覆 subject: 主旨 title: 閱讀訊息 @@ -657,6 +1008,14 @@ zh-TW: wrong_user: 您已經以「%{user}」的身分登入,但是您想要回覆的訊息並非寄給這個使用者。請以正確的使用者身分登入以回覆這個訊息。 sent_message_summary: delete_button: 刪除 + note: + mine: + ago_html: "%{when} 前" + created_at: 建立於: + description: 描述 + last_changed: 最新變更 + rss: + title: OpenStreetMap 筆記 notifier: diary_comment_notification: footer: 您也可以在 %{readurl} 閱讀評論,並且在 %{commenturl} 留下評論或在 %{replyurl} 回覆 @@ -672,8 +1031,6 @@ zh-TW: email_confirm_plain: click_the_link: 如果這是您,請按下列連結確認此變更。 greeting: 您好, - hopefully_you_1: 有人 (希望是您) 想要改變他的電子郵件位址 - hopefully_you_2: "%{server_url} 為 %{new_address}。" friend_notification: befriend_them: 您可以在 %{befriendurl} 把他們加為朋友。 had_added_you: "%{user} 已在 OpenStreetMap 將您加入為朋友。" @@ -702,42 +1059,15 @@ zh-TW: lost_password_plain: click_the_link: 如果這是您,請按下列連結重設您的密碼。 greeting: 您好, - hopefully_you_1: 有人 (希望是您) 要求重設這個電子郵件位址 - hopefully_you_2: 的 openstreetmap.org 帳號密碼。 message_notification: - footer1: 您也可以在 %{readurl} 閱讀訊息, - footer2: 並在 %{replyurl} 回覆 header: "%{from_user} 透過 OpenStreetMap 寄給您主旨為 %{subject} 的訊息:" hi: "%{to_user}您好," + note_comment_notification: + anonymous: 匿名使用者 + greeting: 您好, signup_confirm: - subject: "[OpenStreetMap] 確認您的電子郵件" - signup_confirm_html: - click_the_link: 如果這是您,歡迎!請按下列連結來確認您的帳號並了解更多 OpenStreetMap 的資訊。 - current_user: 一份目前使用者的清單,以他們在世界上何處為基礎的分類,可在這裡取得:Category:Users_by_geographical_region。 - get_reading: 在 wiki 中閱讀更多關於 OpenStreetMap 的資料或透過 OpenStreetMap 部落格Twitter 了解最新的消息。或是瀏覽 OpenStreetMap 創始人 Steve Coast 的 OpenGeoData blog 了解這個計畫的歷史,其中也有 podcasts 可以聽! greeting: 您好! - hopefully_you: 有人 (希望是您) 想要建立一個新帳號到 - introductory_video: 您可以在 %{introductory_video_link}。 - more_videos: 這裡還有更多 %{more_videos_link}。 - more_videos_here: 影片 - user_wiki_page: 建議您建立一個使用者 wiki 頁面,其中包含註記您住哪裡的分類標籤,如 [[Category:Users_in_London]]。 - video_to_openstreetmap: 觀看 OpenStreetMap 的導覽影片 - wiki_signup: 您可能也想在 OpenStreetMap wiki 註冊。 - signup_confirm_plain: - blog_and_twitter: 透過 OpenStreetMap部落格或 Twitter 了解最新消息: - click_the_link_1: 如果這是您,歡迎!請按下列連結來確認您的 - click_the_link_2: 帳號並了解更多 OpenStreetMap 的資訊。 - current_user_1: 一份目前使用者的清單,以他們在世界上何處為基礎 - current_user_2: 的分類,可在這裡取得: - greeting: 您好! - hopefully_you: 有人 (希望是您) 想要建立一個新帳號到 - introductory_video: 您可以在這裡觀看 OpenStreetMap 的導覽影片: - more_videos: 這裡還有更多影片: - opengeodata: OpenGeoData.org 是 OpenStreetMap 的創始人 Steve Coast 的部落格,它也有 podcasts: - the_wiki: 在 wiki 中閱讀更多 OpenStreetMap 訊息: - user_wiki_1: 建議您建立一個使用者 wiki 頁面,其中包含 - user_wiki_2: 註記您住哪裡的分類標籤,如 [[Category:Users_in_London]]。 - wiki_signup: 您可能也想在 OpenStreetMap wiki 註冊: + subject: "[OpenStreetMap] 歡迎加入OpenStreetMap" oauth: oauthorize: allow_read_gpx: 讀取您的私人 GPS 軌跡。 @@ -746,8 +1076,17 @@ zh-TW: allow_write_api: 修改地圖。 allow_write_diary: 建立日記、註解和設定朋友。 allow_write_gpx: 上傳 GPS 軌跡。 + allow_write_notes: 修改節點。 allow_write_prefs: 修改您的使用者偏好設定。 - request_access: 應用程式 %{app_name} 要求存取您的帳號。請確定您要讓此應用程式使用下列功能。您可以依自己的意思選擇。 + request_access: 應用程式 %{app_name} 要求存取您的帳號,%{user}。請確定您要讓此應用程式使用下列功能。您可以依自己的意思選擇。 + oauthorize_failure: + denied: 您已拒絕應用程式 %{app_name} 存取您的帳號。 + invalid: 授權記號是不正確。 + title: 授權請求失敗 + oauthorize_success: + allowed: 您已授權應用程式 %{app_name} 存取您的帳號。 + title: 授權請求允許 + verification: 驗證碼是 %{code}。 revoke: flash: 您已經註銷 %{application} 的記號。 oauth_clients: @@ -796,19 +1135,33 @@ zh-TW: allow_write_gpx: 上傳 GPS 軌跡。 allow_write_prefs: 修改他們的使用者偏好設定。 authorize_url: 授權 URL: + confirm: 您確定嗎? + delete: 刪除用戶端 edit: 編輯詳細資料 key: 消費者金鑰: requests: 向使用者要求下列權限: secret: 消費者密鑰: - support_notice: 我們支援 HMAC-SHA1 (建議值) 和 ssl 模式的純文字。 + support_notice: 我們支援 HMAC-SHA1 (建議) 和RSA-SHA1署名。 title: "%{app_name} 的 OAuth 詳細資料" url: 要求記號 URL: update: flash: 更新客戶端資訊成功 + redaction: + edit: + description: 描述 + new: + description: 描述 + show: + confirm: 您確定嗎? + description: 描述: + user: 建立者: + update: + flash: 已儲存更改。 site: edit: anon_edits_link_text: 了解為什麼這很重要。 flash_player_required: 您需要 Flash player 才能使用 Potlatch,OpenStreetMap Flash 編輯器。您可以在 Adobe.com 下載 Flash Player還有其他許多選擇也可以編輯 OpenStreetMap。 + id_not_configured: iD 尚未設定 no_iframe_support: 您的瀏覽器不支持 HTML 嵌入式框架,這是這項功能所必要的。 not_public: 您尚未將您的編輯開放至公領域。 not_public_description: 在您這麼做之前將無法再編輯地圖。您可以在您的%{user_page}將自己的編輯設定為公領域。 @@ -816,18 +1169,13 @@ zh-TW: potlatch_unsaved_changes: 您還有未儲存的變更。 (要在 Potlatch 中儲存,您應該取消選擇目前的路徑或節點(如果是在清單模式編輯),或是點選儲存(如果有儲存按鈕)。) user_page_link: 使用者頁面 index: + createnote: 添加注釋 js_1: 您使用不支援 JavaScript 的瀏覽器,或者停用了 JavaScript。 js_2: OpenStreetMap 使用 JavaScript 讓地圖更平順。 - license: - license_name: 創用 CC 姓名標示-相同方式分享 2.0 - notice: 由 %{project_name} 和它的貢獻者依 %{license_name} 條款授權。 - project_name: OpenStreetMap 計畫 - permalink: 靜態連結 + permalink: 永久鏈接 remote_failed: 編輯失敗 - 請確定已載入 JOSM 或 Merkaartor 並啟用遠端控制選項 shortlink: 簡短連結 key: - map_key: 圖例 - map_key_tooltip: 地圖的圖例 table: entry: admin: 行政區邊界 @@ -860,9 +1208,11 @@ zh-TW: motorway: 高速公路 park: 公園 primary: 主要道路 + private: 私有 rail: 鐵路 reserve: 自然保留區 resident: 住宅區 + retail: 零售區 runway: - 機場跑道 - 飛機滑行道 @@ -873,8 +1223,9 @@ zh-TW: station: 火車站 subway: 地下鐵 summit: - - Summit + - 提交 - peak + tourist: 旅遊景站 track: 產業道路 tram: - 輕軌電車 @@ -883,9 +1234,25 @@ zh-TW: unclassified: 未分類道路 unsurfaced: 無鋪面道路 wood: 樹木 + markdown_help: + alt: 替代文字 + first: 第一項 + heading: 標題 + headings: 標題 + image: 圖片 + link: 連結 + ordered: 有序清單 + second: 第二項 + subheading: 副標題 + text: 文字 + title_html: 以 Markdown 解析 + unordered: 無序清單 + url: URL + richtext_area: + edit: 編輯 + preview: 預覽 search: search: 搜尋 - search_help: 範例: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或 'post offices near Lünen' 更多範例... submit_text: 出發 where_am_i: 我在哪裡? where_am_i_title: 使用搜索引擎描述目前的位置 @@ -901,6 +1268,8 @@ zh-TW: upload_trace: 上傳 GPS 軌跡 delete: scheduled_for_deletion: 軌跡已預定刪除 + description: + description_without_count: "%{user} 的 GPX 檔案" edit: description: 描述: download: 下載 @@ -918,7 +1287,11 @@ zh-TW: uploaded_at: 上傳於: visibility: 可見性: visibility_help: 這是什麼意思? + georss: + title: OpenStreetMap GPS 軌跡 list: + description: 流覽最近的 GPS 軌跡上傳 + empty_html: 還沒有軌跡。上傳新的軌跡或在 wiki 頁面上瞭解更多有關 GPS 軌跡的資訊。 public_traces: 公開 GPS 軌跡 public_traces_from: "%{user} 的公開 GPS 軌跡" tagged_with: " 標籤為 %{tags}" @@ -947,13 +1320,13 @@ zh-TW: trackable: 可追蹤 view_map: 檢視地圖 trace_form: - description: 描述 + description: 描述: help: 求助 - tags: 標籤 + tags: 標籤: tags_help: 以逗點分隔 upload_button: 上傳 - upload_gpx: 上傳 GPX 檔案 - visibility: 可見性 + upload_gpx: 上傳 GPX 檔案: + visibility: 可見性: visibility_help: 這是什麼意思? trace_header: see_all_traces: 查看所有的軌跡 @@ -963,9 +1336,9 @@ zh-TW: trace_optionals: tags: 標籤 trace_paging_nav: - next: 下一頁 » - previous: « 上一頁 - showing_page: 顯示頁面 %{page} + newer: 較新軌跡 + older: 較舊軌跡 + showing_page: 第%{page}頁 view: delete_track: 刪除這個軌跡 description: 描述: @@ -1002,6 +1375,8 @@ zh-TW: email never displayed publicly: (永遠不公開顯示) flash update success: 使用者資訊成功的更新。 flash update success confirm needed: 使用者資訊成功的更新。請檢查您的電子郵件是否收到確認新電子郵件位址的通知。 + gravatar: + link text: 這是什麼? home location: 家的位置: image: 圖片: image size hint: (方形圖片至少 100x100 的效果最好) @@ -1013,6 +1388,11 @@ zh-TW: new email address: 新的電子郵件位址: new image: 加入圖片 no home location: 您尚未輸入家的位置。 + openid: + link: HTTP://wiki.openstreetmap.org/wiki/OpenID + link text: 這是什麼? + openid: OpenID: + preferred editor: "偏好編輯器:" preferred languages: 偏好的語言: profile description: 個人檔案描述: public editing: @@ -1032,9 +1412,9 @@ zh-TW: update home location on click: 當我點選地圖時更新家的位置? confirm: button: 確認 - heading: 確認使用者帳號 + heading: 請檢查您的電子郵件 + introduction_1: 我們寄給您一封確認電子郵件。 press confirm button: 按下確認按鈕以啟用您的帳號。 - success: 已確認您的帳號,感謝您的註冊! confirm_email: button: 確認 failure: 具有此記號的電子郵件位址已經確認過了。 @@ -1059,6 +1439,7 @@ zh-TW: summary_no_ip: "%{name} 建立於: %{date}" title: 使用者 login: + account is suspended: 很抱歉,您的帳戶已經因可疑活動被暫停。
    請如果您想要討論這個問題,請與網站管理員聯繫。 account not active: 抱歉,您的帳號尚未啟用。
    請點選帳號確認電子郵件中的連結來啟用您的帳號,或是要求寄一封新的確認信。 auth failure: 抱歉,無法以這些資料登入。 create account minute: 建立一個帳號。只需要一分鐘。 @@ -1067,12 +1448,37 @@ zh-TW: login_button: 登入 lost password link: 忘記您的密碼? new to osm: 第一次來到 OpenStreetMap? - notice: 了解更多有關 OpenStreetMap 即將改動的授權 (翻譯) (討論) + no account: 還沒有帳號嗎? + openid: "%{logo} OpenID:" + openid invalid: 很抱歉,您的 OpenID 格式似乎不正確 + openid missing provider: 很抱歉,無法聯繫您的 OpenID 提供者 + openid_logo_alt: 使用 OpenID 登入 + openid_providers: + aol: + alt: 使用 AOL OpenID 登入 + title: 使用 AOL 登入 + google: + alt: 使用 Google OpenID 登入 + title: 使用 Google 登入 + myopenid: + alt: 使用 myOpenID OpenID 登入 + title: 使用 myOpenID 登入 + openid: + alt: 使用 OpenID URL 登入 + title: 使用 OpenID 登入 + wordpress: + alt: 使用 Wordpress OpenID 登入 + title: 使用 Wordpress 登入 + yahoo: + alt: 使用 Yahoo OpenID 登入 + title: 使用 Yahoo 登入 password: 密碼: register now: 立即註冊 remember: 記住我: title: 登入 to make changes: 要更改的 OpenStreetMap 的資料,您必須擁有一個帳號。 + with openid: 或者請使用 OpenID 登錄: + with username: 已經有 OpenStreetMap 的帳號嗎?請使用您的使用者名和密碼登錄: logout: heading: 從 OpenStreetMap 登出 logout_button: 登出 @@ -1087,25 +1493,27 @@ zh-TW: title: 遺失密碼 make_friend: already_a_friend: 您已經是 %{name} 的朋友了。 + button: 加入朋友 failed: 抱歉,無法將 %{name} 加入為朋友。 - success: "%{name} 現在成為您的朋友。" + heading: 將 %{user} 加為朋友? + success: "%{name} 現在成為您的朋友!" new: confirm email address: 確認電子郵件位址: confirm password: 確認密碼: contact_webmaster: 請連絡 網站管理者安排要建立的帳號,我們會儘快嘗試並處理這個要求。 - continue: 繼續 + continue: 註冊 display name: 顯示名稱: display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。 email address: 電子郵件位址: - fill_form: 填好下列表單,我們會寄給您一封電子郵件來啟用您的帳號。 - flash create success message: 感謝您的註冊。我們已經寄出確認信到 %{email},只要您確認您的帳號後就可以製作地圖了。

    如果您使用會送出確認要求的防垃圾信系統,請確定您將 webmaster@openstreetmap.org 加入白名單中,因為我們無法回覆任何確認要求。 - heading: 建立使用者帳號 license_agreement: 當您確認您的帳號,您需要同意貢獻者條款 。 no_auto_account_create: 很不幸的我們現在無法自動為您建立帳號。 not displayed publicly: 不要公開顯示 (請看 隱私權政策) + openid: "%{logo} OpenID:" + openid no password: 使用 OpenID 時密碼不是必需的,但可能仍需要一些額外的工具或伺服器。 password: 密碼: terms accepted: 感謝您接受新的貢獻條款! - title: 建立帳號 + title: 註冊 + use openid: 或者,使用 %{logo} OpenID 登入 no_such_user: body: 抱歉,沒有名為 %{user} 的使用者。請檢查您的拼字,或者可能是按到錯誤的連結。 heading: 使用者 %{user} 不存在 @@ -1115,6 +1523,8 @@ zh-TW: nearby mapper: 附近的製圖者 your location: 您的位置 remove_friend: + button: 移除朋友 + heading: 移除朋友%{user}? not_a_friend: "%{name} 並不在您的朋友裡。" success: "%{name} 已從您的朋友中移除。" reset_password: @@ -1131,6 +1541,7 @@ zh-TW: body: "

    \n對不起,您的帳戶已因可疑\n活動被自動暫停。 \n

    \n

    \n這項決定將在短期內由管理員審核,或是如果你想討論這一點\n,可以聯絡%{webmaster}。 \n

    " heading: 帳號已暫停 title: 帳號已暫停 + webmaster: 網站管理員 terms: agree: 同意 consider_pd: 除了上述協議,我同意將我的貢獻授權為公共領域 @@ -1147,13 +1558,18 @@ zh-TW: activate_user: 啟用這個使用者 add as friend: 加入朋友 ago: (%{time_in_words_ago} 之前) - block_history: 檢視接收到的區塊 + block_history: 接受封禁 blocks by me: 被我所阻擋 blocks on me: 對我的阻擋 + comments: 評論 confirm: 確認 confirm_user: 確認這個使用者 create_block: 阻擋這個使用者 created from: 建立於: + ct accepted: 於 %{ago} 前接受 + ct declined: 已拒絕 + ct status: 貢獻者條款: + ct undecided: 未決定 deactivate_user: 停用這個使用者 delete_user: 刪除這個使用者 description: 描述 @@ -1161,26 +1577,33 @@ zh-TW: edits: 編輯 email address: 電子郵件位址: hide_user: 隱藏這個使用者 - if set location: 如果您設定了位置,一張漂亮的地圖和小指標會出現在下面。您可以在%{settings_link}頁面設定您的家位置。 + if set location: 您可以在%{settings_link}頁面設定您家的位置,以查看附近的用戶。 km away: "%{count} 公里遠" latest edit: 上次編輯於 %{ago}: m away: "%{count} 公尺遠" mapper since: 成為製圖者於: - moderator_history: 檢視阻擋來自 + moderator_history: 執行封禁者 + my comments: 我的評論 my diary: 我的日記 my edits: 我的編輯 + my notes: 我的筆記 + my profile: 我的設定檔 my settings: 我的設定值 my traces: 我的軌跡 nearby users: 其他附近的使用者 new diary entry: 新增日記 no friends: 您尚未加入任何朋友。 no nearby users: 附近沒有在進行製圖的使用者。 + notes: 地圖筆記 oauth settings: oauth 設定值 remove as friend: 移除朋友 role: administrator: 這個使用者是管理者 + grant: + administrator: 授予管理員存取權限 + moderator: 此使用者是一個管理者 send message: 傳送訊息 - settings_link_text: 設定值 + settings_link_text: 設定 spam score: 垃圾郵件分數: status: 狀態: traces: 軌跡 @@ -1238,11 +1661,14 @@ zh-TW: creator_name: 創造者 display_name: 被阻擋的使用者 edit: 編輯 + next: 下一頁 » not_revoked: (不註銷) + previous: « 上一頁 reason: 阻擋的理由 revoke: 註銷! revoker_name: 提出註銷者 show: 顯示 + showing_page: 第%{page}頁 status: 狀態 period: one: 1 小時 @@ -1289,3 +1715,16 @@ zh-TW: fail: 無法註銷使用者「%{name}」的角色「%{role}」。請檢查使用者和角色是否都正確。 heading: 確認角色的註銷 title: 確認角色註銷 + welcome_page: + add_a_note: + title: 沒有時間編輯嗎?幫忙加上注釋! + basic_terms: + title: 繪製地圖的基本術語 + introduction_html: 歡迎來到 OpenStreetMap,自由和可編輯的世界地圖。您目前已經登錄 ,可以開始繪製地圖。這裡有一份重要的快速指南。 + questions: + title: 有任何問題嗎? + start_mapping: 開始製圖 + title: 歡迎! + whats_on_the_map: + on_html: "OpenStreetMap 是一個製作真實且即時地圖的地方 -\n它包含數以百萬計的建築物、道路以及關於位置其他詳細資料。您可以\n在地圖上畫出任何現實世界中令您感興趣的事物。" + title: 地圖上有什麼 diff --git a/config/openlayers.cfg b/config/openlayers.cfg index b671faa3e6f..6f6b778a8cd 100644 --- a/config/openlayers.cfg +++ b/config/openlayers.cfg @@ -6,6 +6,7 @@ OpenLayers/Map.js OpenLayers/Control/ArgParser.js OpenLayers/Control/Attribution.js +OpenLayers/Control/DragFeature.js OpenLayers/Control/DrawFeature.js OpenLayers/Control/LayerSwitcher.js OpenLayers/Control/Navigation.js @@ -25,12 +26,16 @@ OpenLayers/Tile.js OpenLayers/Tile/Image.js OpenLayers/Feature/Vector.js OpenLayers/Strategy/Fixed.js +OpenLayers/Strategy/BBOX.js OpenLayers/Protocol/HTTP.js +OpenLayers/Format/QueryStringFilter.js +OpenLayers/Format/GeoJSON.js OpenLayers/Format/OSM.js OpenLayers/Geometry/Point.js OpenLayers/Geometry/LinearRing.js OpenLayers/Handler/Point.js OpenLayers/Handler/RegularPolygon.js +OpenLayers/Protocol/HTTP.js OpenLayers/Renderer.js OpenLayers/Renderer/Canvas.js OpenLayers/Renderer/SVG.js @@ -76,6 +81,7 @@ OpenLayers/Lang/nds.js OpenLayers/Lang/nl.js OpenLayers/Lang/nn.js OpenLayers/Lang/oc.js +OpenLayers/Lang/pl.js OpenLayers/Lang/pt-BR.js OpenLayers/Lang/pt.js OpenLayers/Lang/ru.js diff --git a/config/preinitializer.rb b/config/preinitializer.rb index 1cc3f62c780..ec05a6070b9 100644 --- a/config/preinitializer.rb +++ b/config/preinitializer.rb @@ -1,7 +1,12 @@ require 'yaml' -config = YAML.load_file(File.expand_path("../application.yml", __FILE__)) -env = ENV['RAILS_ENV'] || 'development' +if defined?(Rake.application) && Rake.application.top_level_tasks.grep(/^(default$|test(:|$))/).any? + env = "test" +else + env = ENV['RAILS_ENV'] || 'development' +end + +config = YAML.load_file(File.expand_path(env == "test" ? "../example.application.yml" : "../application.yml", __FILE__)) ENV.each do |key,value| if key.match(/^OSM_(.*)$/) diff --git a/config/routes.rb b/config/routes.rb index 6b816453784..3b00cbf6a92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -57,13 +57,15 @@ match 'api/0.6/relations/search' => 'search#search_relations', :via => :get match 'api/0.6/nodes/search' => 'search#search_nodes', :via => :get + match 'api/0.6/user/:id' => 'user#api_read', :via => :get, :id => /\d+/ match 'api/0.6/user/details' => 'user#api_details', :via => :get + match 'api/0.6/user/gpx_files' => 'user#api_gpx_files', :via => :get + match 'api/0.6/user/preferences' => 'user_preference#read', :via => :get match 'api/0.6/user/preferences/:preference_key' => 'user_preference#read_one', :via => :get match 'api/0.6/user/preferences' => 'user_preference#update', :via => :put match 'api/0.6/user/preferences/:preference_key' => 'user_preference#update_one', :via => :put match 'api/0.6/user/preferences/:preference_key' => 'user_preference#delete_one', :via => :delete - match 'api/0.6/user/gpx_files' => 'user#api_gpx_files', :via => :get match 'api/0.6/gpx/create' => 'trace#api_create', :via => :post match 'api/0.6/gpx/:id' => 'trace#api_read', :via => :get, :id => /\d+/ @@ -73,42 +75,84 @@ match 'api/0.6/gpx/:id/data' => 'trace#api_data', :via => :get # AMF (ActionScript) API - match 'api/0.6/amf/read' => 'amf#amf_read', :via => :post match 'api/0.6/amf/write' => 'amf#amf_write', :via => :post match 'api/0.6/swf/trackpoints' => 'swf#trackpoints', :via => :get + # Map notes API + scope "api/0.6" do + resources :notes, :except => [ :new, :edit, :update ], :constraints => { :id => /\d+/ }, :defaults => { :format => "xml" } do + collection do + get 'search' + get 'feed', :defaults => { :format => "rss" } + end + + member do + post 'comment' + post 'close' + post 'reopen' + end + end + + match 'notes/addPOIexec' => 'notes#create', :via => :post + match 'notes/closePOIexec' => 'notes#close', :via => :post + match 'notes/editPOIexec' => 'notes#comment', :via => :post + match 'notes/getGPX' => 'notes#index', :via => :get, :format => "gpx" + match 'notes/getRSSfeed' => 'notes#feed', :via => :get, :format => "rss" + end + # Data browsing - match '/browse/start' => 'browse#start', :via => :get - match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/ - match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ - match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/ - match '/browse/node/:id/history' => 'browse#node_history', :via => :get, :id => /\d+/ - match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/ - match '/browse/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/ - match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/ - match '/user/:display_name/edits' => 'changeset#list', :via => :get - match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :format => :atom - match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets" - match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets" - match '/browse/changesets' => 'changeset#list', :via => :get - match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :format => :atom - match '/browse' => 'changeset#list', :via => :get + match '/way/:id' => 'browse#way', :via => :get, :id => /\d+/, :as => :way + match '/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ + match '/node/:id' => 'browse#node', :via => :get, :id => /\d+/, :as => :node + match '/node/:id/history' => 'browse#node_history', :via => :get, :id => /\d+/ + match '/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/, :as => :relation + match '/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/ + match '/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/ + match '/note/:id' => 'browse#note', :via => :get, :id => /\d+/, :as => "browse_note" + match '/note/new' => 'browse#new_note', :via => :get + match '/user/:display_name/history' => 'changeset#list', :via => :get + match '/user/:display_name/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } + match '/user/:display_name/notes' => 'notes#mine', :via => :get + match '/history/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets" + match '/history/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets" + + get '/browse/way/:id', :to => redirect(:path => '/way/%{id}') + get '/browse/way/:id/history', :to => redirect(:path => '/way/%{id}/history') + get '/browse/node/:id', :to => redirect(:path => '/node/%{id}') + get '/browse/node/:id/history', :to => redirect(:path => '/node/%{id}/history') + get '/browse/relation/:id', :to => redirect(:path => '/relation/%{id}') + get '/browse/relation/:id/history', :to => redirect(:path => '/relation/%{id}/history') + get '/browse/changeset/:id', :to => redirect(:path => '/changeset/%{id}') + get '/browse/note/:id', :to => redirect(:path => '/note/%{id}') + get '/user/:display_name/edits', :to => redirect(:path => '/user/%{display_name}/history') + get '/user/:display_name/edits/feed', :to => redirect(:path => '/user/%{display_name}/history/feed') + get '/browse/friends', :to => redirect(:path => '/history/friends') + get '/browse/nearby', :to => redirect(:path => '/history/nearby') + get '/browse/changesets/feed', :to => redirect(:path => '/history/feed') + get '/browse/changesets', :to => redirect(:path => '/history') + get '/browse', :to => redirect(:path => '/history') # web site root :to => 'site#index', :via => [:get, :post] - match '/edit' => 'site#edit', :via => :get + match '/edit' => 'site#edit', :via => :get, :as => :edit match '/copyright/:copyright_locale' => 'site#copyright', :via => :get match '/copyright' => 'site#copyright', :via => :get + match '/welcome' => 'site#welcome', :via => :get, :as => :welcome + match '/fixthemap' => 'site#fixthemap', :via => :get, :as => :fixthemap + match '/help' => 'site#help', :via => :get, :as => :help + match '/about' => 'site#about', :via => :get, :as => :about match '/history' => 'changeset#list', :via => :get - match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom + match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } match '/export' => 'site#export', :via => :get match '/login' => 'user#login', :via => [:get, :post] match '/logout' => 'user#logout', :via => [:get, :post] match '/offline' => 'site#offline', :via => :get - match '/key' => 'site#key', :via => :post + match '/key' => 'site#key', :via => :get + match '/id' => 'site#id', :via => :get match '/user/new' => 'user#new', :via => :get - match '/user/terms' => 'user#terms', :via => [:get, :post] + match '/user/new' => 'user#create', :via => :post + match '/user/terms' => 'user#terms', :via => :get match '/user/save' => 'user#save', :via => :post match '/user/:display_name/confirm/resend' => 'user#confirm_resend', :via => :get match '/user/:display_name/confirm' => 'user#confirm', :via => [:get, :post] @@ -119,23 +163,23 @@ match '/user/forgot-password' => 'user#lost_password', :via => [:get, :post] match '/user/suspended' => 'user#suspended', :via => :get - match '/index.html' => 'site#index', :via => :get - match '/create-account.html' => 'user#new', :via => :get - match '/forgot-password.html' => 'user#lost_password', :via => :get + get '/index.html', :to => redirect(:path => "/") + get '/create-account.html', :to => redirect(:path => "/user/new") + get '/forgot-password.html', :to => redirect(:path => "/user/forgot-password") # permalink match '/go/:code' => 'site#permalink', :via => :get, :code => /[a-zA-Z0-9_@~]+[=-]*/ # rich text preview - match '/preview/:format' => 'site#preview', :as => :preview + match '/preview/:format' => 'site#preview', :via => :post, :as => :preview # traces match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list', :via => :get match '/user/:display_name/traces/tag/:tag' => 'trace#list', :via => :get match '/user/:display_name/traces/page/:page' => 'trace#list', :via => :get match '/user/:display_name/traces' => 'trace#list', :via => :get - match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get - match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get + match '/user/:display_name/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } + match '/user/:display_name/traces/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } match '/user/:display_name/traces/:id' => 'trace#view', :via => :get match '/user/:display_name/traces/:id/picture' => 'trace#picture', :via => :get match '/user/:display_name/traces/:id/icon' => 'trace#icon', :via => :get @@ -143,24 +187,24 @@ match '/traces/tag/:tag' => 'trace#list', :via => :get match '/traces/page/:page' => 'trace#list', :via => :get match '/traces' => 'trace#list', :via => :get - match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get - match '/traces/rss' => 'trace#georss', :via => :get + match '/traces/tag/:tag/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } + match '/traces/rss' => 'trace#georss', :via => :get, :defaults => { :format => :rss } match '/traces/mine/tag/:tag/page/:page' => 'trace#mine', :via => :get match '/traces/mine/tag/:tag' => 'trace#mine', :via => :get match '/traces/mine/page/:page' => 'trace#mine', :via => :get match '/traces/mine' => 'trace#mine', :via => :get match '/trace/create' => 'trace#create', :via => [:get, :post] - match '/trace/:id/data' => 'trace#data', :via => :get - match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :put] - match '/trace/:id/delete' => 'trace#delete', :via => :post + match '/trace/:id/data' => 'trace#data', :via => :get, :id => /\d+/ + match '/trace/:id/edit' => 'trace#edit', :via => [:get, :post, :patch], :id => /\d+/, :as => "trace_edit" + match '/trace/:id/delete' => 'trace#delete', :via => :post, :id => /\d+/ # diary pages match '/diary/new' => 'diary_entry#new', :via => [:get, :post] match '/diary/friends' => 'diary_entry#list', :friends => true, :via => :get, :as => "friend_diaries" match '/diary/nearby' => 'diary_entry#list', :nearby => true, :via => :get, :as => "nearby_diaries" - match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss - match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :format => :rss - match '/diary/rss' => 'diary_entry#rss', :via => :get, :format => :rss + match '/user/:display_name/diary/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss } + match '/diary/:language/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss } + match '/diary/rss' => 'diary_entry#rss', :via => :get, :defaults => { :format => :rss } match '/user/:display_name/diary/comments/:page' => 'diary_entry#comments', :via => :get, :page => /\d+/ match '/user/:display_name/diary/comments/' => 'diary_entry#comments', :via => :get match '/user/:display_name/diary' => 'diary_entry#list', :via => :get @@ -174,8 +218,8 @@ # user pages match '/user/:display_name' => 'user#view', :via => :get, :as => "user" - match '/user/:display_name/make_friend' => 'user#make_friend', :via => :get - match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => :get + match '/user/:display_name/make_friend' => 'user#make_friend', :via => [:get, :post], :as => "make_friend" + match '/user/:display_name/remove_friend' => 'user#remove_friend', :via => [:get, :post], :as => "remove_friend" match '/user/:display_name/account' => 'user#account', :via => [:get, :post] match '/user/:display_name/set_status' => 'user#set_status', :via => :get, :as => :set_status_user match '/user/:display_name/delete' => 'user#delete', :via => :get, :as => :delete_user @@ -185,22 +229,22 @@ match '/users/:status' => 'user#list', :via => [:get, :post] # geocoder - match '/geocoder/search' => 'geocoder#search', :via => :post + match '/search' => 'geocoder#search', :via => :get, :as => :search match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get match '/geocoder/search_ca_postcode' => 'geocoder#search_ca_postcode', :via => :get - match '/geocoder/search_osm_namefinder' => 'geocoder#search_osm_namefinder', :via => :get match '/geocoder/search_osm_nominatim' => 'geocoder#search_osm_nominatim', :via => :get match '/geocoder/search_geonames' => 'geocoder#search_geonames', :via => :get - match '/geocoder/description' => 'geocoder#description', :via => :post - match '/geocoder/description_osm_namefinder' => 'geocoder#description_osm_namefinder', :via => :get - match '/geocoder/description_osm_nominatim' => 'geocoder#description_osm_nominatim', :via => :get - match '/geocoder/description_geonames' => 'geocoder#description_geonames', :via => :get + match '/geocoder/search_osm_nominatim_reverse' => 'geocoder#search_osm_nominatim_reverse', :via => :get + match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get + + # directions + match '/directions' => 'directions#search', :via => :get, :as => :directions # export - match '/export/start' => 'export#start', :via => :get match '/export/finish' => 'export#finish', :via => :post + match '/export/embed' => 'export#embed', :via => :get # messages match '/user/:display_name/inbox' => 'message#inbox', :via => :get, :as => "inbox" @@ -215,12 +259,12 @@ scope "/user/:display_name" do resources :oauth_clients end - match '/oauth/revoke' => 'oauth#revoke' - match '/oauth/authorize' => 'oauth#authorize', :as => :authorize - match '/oauth/token' => 'oauth#token', :as => :token - match '/oauth/request_token' => 'oauth#request_token', :as => :request_token - match '/oauth/access_token' => 'oauth#access_token', :as => :access_token - match '/oauth/test_request' => 'oauth#test_request', :as => :test_request + match '/oauth/revoke' => 'oauth#revoke', :via => [:get, :post] + match '/oauth/authorize' => 'oauth#authorize', :via => [:get, :post], :as => :authorize + match '/oauth/token' => 'oauth#token', :via => :get, :as => :token + match '/oauth/request_token' => 'oauth#request_token', :via => [:get, :post], :as => :request_token + match '/oauth/access_token' => 'oauth#access_token', :via => [:get, :post], :as => :access_token + match '/oauth/test_request' => 'oauth#test_request', :via => :get, :as => :test_request # roles and banning pages match '/user/:display_name/role/:role/grant' => 'user_roles#grant', :via => :post, :as => "grant_role" diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml index 8b6b774e723..3e0f48acd6e 100644 --- a/config/wiki_pages.yml +++ b/config/wiki_pages.yml @@ -2,147 +2,350 @@ # PROGRAM DO NOT MANUALLY EDIT IT --- -cz: +az: + tag: + craft=locksmith: Az:Tag:craft=locksmith + highway=speed_camera: Az:Tag:highway=speed camera +bg: key: - historic: Cz:Key:historic - railway: Cz:Key:railway - tracktype: Cz:Key:tracktype + lanes: Bg:Key:lanes + tag: + railway=crossing: Bg:Tag:railway=crossing + railway=level_crossing: Bg:Tag:railway=level crossing +ca: tag: - route=trolleybus: Cz:Tag:route=trolleybus + leisure=swimming_pool: Ca:Tag:leisure=swimming pool da: key: - access: Da:Key:access fee: Da:Key:fee lit: Da:Key:lit maxheight: Da:Key:maxheight + maxspeed: Da:Key:maxspeed tag: - highway=tertiary: Da:Tag:highway=tertiary - highway=track: Da:Tag:highway=track - route=ferry: Da:Tag:route=ferry + amenity=place_of_worship: Da:Tag:amenity=place of worship de: key: + AlpinRes_ID: DE:Key:AlpinRes ID abutters: DE:Key:abutters access: DE:Key:access addr: DE:Key:addr aerialway: DE:Key:aerialway aeroway: DE:Key:aeroway amenity: DE:Key:amenity + area: DE:Key:area + asb: DE:Key:asb barrier: DE:Key:barrier basin: DE:Key:basin - bridge: DE:Key:bridge - building: DE:Key:building + beds: DE:Key:beds + bicycle: DE:Key:bicycle + bicycle_parking: DE:Key:bicycle parking + bicycle_road: DE:Key:bicycle road + biosphärenwirt: DE:Key:biosphärenwirt + bollard: DE:Key:bollard + brewery: DE:Key:brewery + building:condition: DE:Key:building:condition + building:material: DE:Key:building:material + capacity: DE:Key:capacity + clothes: DE:Key:clothes comment: DE:Key:comment + construction: DE:Key:construction + contact: DE:Key:contact + content: DE:Key:content + country: DE:Key:country + covered: DE:Key:covered + created_by: DE:Key:created by crossing: DE:Key:crossing + cuisine: DE:Key:cuisine + currency: DE:Key:currency + cutting: DE:Key:cutting cycleway: DE:Key:cycleway + de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel + de:regionalschluessel: DE:Key:de:regionalschluessel denomination: DE:Key:denomination + denotation: DE:Key:denotation description: DE:Key:description + designation: DE:Key:designation destination: DE:Key:destination - disused: DE:Key:disused + diaper: DE:Key:diaper + direction: DE:Key:direction drink: DE:Key:drink + drive_through: DE:Key:drive through + ele: DE:Key:ele + electrified: DE:Key:electrified embankment: DE:Key:embankment emergency: DE:Key:emergency + entrance: DE:Key:entrance + fee: DE:Key:fee + fetish: DE:Key:fetish fixme: DE:Key:fixme + foot: DE:Key:foot + footway: DE:Key:footway + ford: DE:Key:ford + generator:method: DE:Key:generator:method + generator:output: DE:Key:generator:output + generator:source: DE:Key:generator:source geological: DE:Key:geological + hazard: DE:Key:hazard hazmat: DE:Key:hazmat + height: DE:Key:height highway: DE:Key:highway historic: DE:Key:historic + horse: DE:Key:horse + ice_road: DE:Key:ice road + importance: DE:Key:importance incline: DE:Key:incline + informal: DE:Key:informal + information: DE:Key:information + intermittent: DE:Key:intermittent + internet_access: DE:Key:internet access + junction: DE:Key:junction landuse: DE:Key:landuse lanes: DE:Key:lanes layer: DE:Key:layer leisure: DE:Key:leisure + level: DE:Key:level lit: DE:Key:lit + lock: DE:Key:lock man_made: DE:Key:man made + manhole: DE:Key:manhole maxheight: DE:Key:maxheight maxspeed: DE:Key:maxspeed + maxstay: DE:Key:maxstay maxweight: DE:Key:maxweight + maxwidth: DE:Key:maxwidth military: DE:Key:military + minspeed: DE:Key:minspeed + motorroad: DE:Key:motorroad mtb:scale: DE:Key:mtb:scale name: DE:Key:name natural: DE:Key:natural + network: DE:Key:network noexit: DE:Key:noexit note: DE:Key:note - oneway: DE:Key:oneway + office: DE:Key:office + onkz: DE:Key:onkz opening_hours: DE:Key:opening hours operator: DE:Key:operator + osmc:status: DE:Key:osmc:status osmc:symbol: DE:Key:osmc:symbol + overtaking: DE:Key:overtaking + parking:lane: DE:Key:parking:lane + phone: DE:Key:phone + piste:difficulty: DE:Key:piste:difficulty + piste:type: DE:Key:piste:type place: DE:Key:place + playground: DE:Key:playground + population: DE:Key:population power: DE:Key:power - power_rating: DE:Key:power rating + priority: DE:Key:priority + priority_road: DE:Key:priority road + proposed: DE:Key:proposed + public_transport: DE:Key:public transport railway: DE:Key:railway + recycling_type: DE:Key:recycling type + ref: DE:Key:ref + ref:bufa: DE:Key:ref:bufa + ref:mobil-parken.de: DE:Key:ref:mobil-parken.de + religion: DE:Key:religion + resource: DE:Key:resource + roof:material: DE:Key:roof:material + rooms: DE:Key:rooms route: DE:Key:route + ruins: DE:Key:ruins sac_scale: DE:Key:sac scale seamark: DE:Key:seamark + seamark:fixme: DE:Key:seamark:fixme + seamark:type: DE:Key:seamark:type + segregated: DE:Key:segregated service: DE:Key:service + shelter_type: DE:Key:shelter type shop: DE:Key:shop + sidewalk: DE:Key:sidewalk smoking: DE:Key:smoking smoothness: DE:Key:smoothness + social_facility: DE:Key:social facility + source: DE:Key:source + source:maxspeed: DE:Key:source:maxspeed + speisebezirk: DE:Key:speisebezirk sport: DE:Key:sport + start_date: DE:Key:start date step_count: DE:Key:step count surface: DE:Key:surface + symbol: DE:Key:symbol + tactile_paving: DE:Key:tactile paving + toll: DE:Key:toll tourism: DE:Key:tourism tracktype: DE:Key:tracktype + traffic_calming: DE:Key:traffic calming + traffic_sign: DE:Key:traffic sign trail_visibility: DE:Key:trail visibility - tunnel: DE:Key:tunnel + turn: DE:Key:turn + type: DE:Key:type + usage: DE:Key:usage + verbindung: DE:Key:verbindung voltage: DE:Key:voltage waterway: DE:Key:waterway wheelchair: DE:Key:wheelchair + width: DE:Key:width + wiki:symbol: DE:Key:wiki:symbol + wikipedia: DE:Key:wikipedia wires: DE:Key:wires wood: DE:Key:wood + zone:maxspeed: DE:Key:zone:maxspeed tag: + abandoned=village: DE:Tag:abandoned=village + abandoned=yes: DE:Tag:abandoned=yes + access=designated: DE:Tag:access=designated + access=private: DE:Tag:access=private + aerialway=cable_car: DE:Tag:aerialway=cable car + aeroway=helipad: DE:Tag:aeroway=helipad + amenity=administration: DE:Tag:amenity=administration + amenity=animal_boarding: DE:Tag:amenity=animal boarding + amenity=animal_shelter: DE:Tag:amenity=animal shelter + amenity=arts_centre: DE:Tag:amenity=arts centre amenity=atm: DE:Tag:amenity=atm amenity=baby_hatch: DE:Tag:amenity=baby hatch amenity=bank: DE:Tag:amenity=bank + amenity=bar: DE:Tag:amenity=bar + amenity=bbq: DE:Tag:amenity=bbq amenity=bench: DE:Tag:amenity=bench + amenity=bicycle_parking: DE:Tag:amenity=bicycle parking amenity=bicycle_rental: DE:Tag:amenity=bicycle rental amenity=biergarten: DE:Tag:amenity=biergarten + amenity=brothel: DE:Tag:amenity=brothel + amenity=bureau_de_change: DE:Tag:amenity=bureau de change amenity=bus_station: DE:Tag:amenity=bus station + amenity=cafe: DE:Tag:amenity=cafe + amenity=car_rental: DE:Tag:amenity=car rental + amenity=car_sharing: DE:Tag:amenity=car sharing + amenity=car_wash: DE:Tag:amenity=car wash + amenity=charging_station: DE:Tag:amenity=charging station + amenity=cinema: DE:Tag:amenity=cinema amenity=clock: DE:Tag:amenity=clock amenity=compressed_air: DE:Tag:amenity=compressed air + amenity=courthouse: DE:Tag:amenity=courthouse + amenity=crematorium: DE:Tag:amenity=crematorium + amenity=customs: DE:Tag:amenity=customs amenity=drinking_water: DE:Tag:amenity=drinking water + amenity=driving_school: DE:Tag:amenity=driving school + amenity=embassy: DE:Tag:amenity=embassy amenity=emergency_phone: DE:Tag:amenity=emergency phone + amenity=fast_food: DE:Tag:amenity=fast food + amenity=ferry_terminal: DE:Tag:amenity=ferry terminal + amenity=fire_station: DE:Tag:amenity=fire station + amenity=fountain: DE:Tag:amenity=fountain amenity=fuel: DE:Tag:amenity=fuel + amenity=grave_yard: DE:Tag:amenity=grave yard amenity=grit_bin: DE:Tag:amenity=grit bin amenity=hospital: DE:Tag:amenity=hospital amenity=hunting_stand: DE:Tag:amenity=hunting stand + amenity=ice_cream: DE:Tag:amenity=ice cream + amenity=kindergarten: DE:Tag:amenity=kindergarten + amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure + amenity=library: DE:Tag:amenity=library + amenity=marketplace: DE:Tag:amenity=marketplace + amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking amenity=nightclub: DE:Tag:amenity=nightclub amenity=nursing_home: DE:Tag:amenity=nursing home amenity=parking: DE:Tag:amenity=parking + amenity=parking_entrance: DE:Tag:amenity=parking entrance + amenity=parking_space: DE:Tag:amenity=parking space amenity=pharmacy: DE:Tag:amenity=pharmacy amenity=place_of_worship: DE:Tag:amenity=place of worship + amenity=police: DE:Tag:amenity=police amenity=post_box: DE:Tag:amenity=post box + amenity=post_office: DE:Tag:amenity=post office + amenity=prison: DE:Tag:amenity=prison amenity=pub: DE:Tag:amenity=pub amenity=recycling: DE:Tag:amenity=recycling amenity=register_office: DE:Tag:amenity=register office amenity=restaurant: DE:Tag:amenity=restaurant amenity=school: DE:Tag:amenity=school + amenity=shelter: DE:Tag:amenity=shelter + amenity=social_facility: DE:Tag:amenity=social facility + amenity=studio: DE:Tag:amenity=studio + amenity=taxi: DE:Tag:amenity=taxi amenity=telephone: DE:Tag:amenity=telephone + amenity=theatre: DE:Tag:amenity=theatre amenity=toilets: DE:Tag:amenity=toilets + amenity=townhall: DE:Tag:amenity=townhall + amenity=university: DE:Tag:amenity=university amenity=vending_machine: DE:Tag:amenity=vending machine + amenity=veterinary: DE:Tag:amenity=veterinary amenity=waste_basket: DE:Tag:amenity=waste basket + atm=yes: DE:Tag:atm=yes + barrier=bollard: DE:Tag:barrier=bollard + barrier=cattle_grid: DE:Tag:barrier=cattle grid barrier=cycle_barrier: DE:Tag:barrier=cycle barrier + barrier=fence: DE:Tag:barrier=fence + barrier=gate: DE:Tag:barrier=gate + barrier=hedge: DE:Tag:barrier=hedge + barrier=hedge_bank: DE:Tag:barrier=hedge bank + barrier=kissing_gate: DE:Tag:barrier=kissing gate barrier=lift_gate: DE:Tag:barrier=lift gate + barrier=retaining_wall: DE:Tag:barrier=retaining wall + barrier=sally_port: DE:Tag:barrier=sally port + barrier=toll_booth: DE:Tag:barrier=toll booth + barrier=wall: DE:Tag:barrier=wall + biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes + boundary=national_park: DE:Tag:boundary=national park + boundary=protected_area: DE:Tag:boundary=protected area boundary=water_protection_area: DE:Tag:boundary=water protection area - club-mate=yes: DE:Tag:club-mate=yes + building=barn: DE:Tag:building=barn + building=entrance: DE:Tag:building=entrance + building=garage: DE:Tag:building=garage + building=garages: DE:Tag:building=garages + building=industrial: DE:Tag:building=industrial + building=roof: DE:Tag:building=roof + building=school: DE:Tag:building=school + building=stable: DE:Tag:building=stable + craft=car_repair: DE:Tag:craft=car repair + craft=hvac: DE:Tag:craft=hvac + craft=information_electronics: DE:Tag:craft=information electronics + craft=optician: DE:Tag:craft=optician + craft=painter: DE:Tag:craft=painter + craft=paperhanger: DE:Tag:craft=paperhanger + craft=plumber: DE:Tag:craft=plumber + craft=scaffolder: DE:Tag:craft=scaffolder + craft=stonemason: DE:Tag:craft=stonemason + emergency=ambulance_station: DE:Tag:emergency=ambulance station + emergency=defibrillator: DE:Tag:emergency=defibrillator emergency=fire_hydrant: DE:Tag:emergency=fire hydrant + emergency=fire_water_pond: DE:Tag:emergency=fire water pond + emergency=life_ring: DE:Tag:emergency=life ring + emergency=phone: DE:Tag:emergency=phone + emergency=siren: DE:Tag:emergency=siren + emergency=suction_point: DE:Tag:emergency=suction point + footway=sidewalk: DE:Tag:footway=sidewalk + generator:source=solar: DE:Tag:generator:source=solar + generator:source=wind: DE:Tag:generator:source=wind + highway=bridleway: DE:Tag:highway=bridleway highway=bus_stop: DE:Tag:highway=bus stop highway=crossing: DE:Tag:highway=crossing highway=cycleway: DE:Tag:highway=cycleway + highway=elevator: DE:Tag:highway=elevator highway=emergency_access_point: DE:Tag:highway=emergency access point highway=footway: DE:Tag:highway=footway + highway=give_way: DE:Tag:highway=give way highway=living_street: DE:Tag:highway=living street highway=mini_roundabout: DE:Tag:highway=mini roundabout highway=motorway: DE:Tag:highway=motorway + highway=motorway_junction: DE:Tag:highway=motorway junction highway=motorway_link: DE:Tag:highway=motorway link highway=path: DE:Tag:highway=path highway=pedestrian: DE:Tag:highway=pedestrian + highway=platform: DE:Tag:highway=platform highway=primary: DE:Tag:highway=primary + highway=raceway: DE:Tag:highway=raceway highway=residential: DE:Tag:highway=residential + highway=rest_area: DE:Tag:highway=rest area highway=road: DE:Tag:highway=road highway=secondary: DE:Tag:highway=secondary highway=service: DE:Tag:highway=service highway=services: DE:Tag:highway=services + highway=speed_camera: DE:Tag:highway=speed camera highway=steps: DE:Tag:highway=steps + highway=street_lamp: DE:Tag:highway=street lamp highway=tertiary: DE:Tag:highway=tertiary highway=track: DE:Tag:highway=track highway=traffic_signals: DE:Tag:highway=traffic signals @@ -150,164 +353,513 @@ de: highway=trunk_link: DE:Tag:highway=trunk link highway=turning_circle: DE:Tag:highway=turning circle highway=unclassified: DE:Tag:highway=unclassified + historic=aircraft: DE:Tag:historic=aircraft historic=archaeological_site: DE:Tag:historic=archaeological site + historic=boundary_stone: DE:Tag:historic=boundary stone historic=castle: DE:Tag:historic=castle + historic=city_gate: DE:Tag:historic=city gate + historic=citywalls: DE:Tag:historic=citywalls + historic=fort: DE:Tag:historic=fort + historic=gallows: DE:Tag:historic=gallows historic=manor: DE:Tag:historic=manor + historic=memorial: DE:Tag:historic=memorial + historic=milestone: DE:Tag:historic=milestone + historic=mine: DE:Tag:historic=mine historic=monastery: DE:Tag:historic=monastery + historic=monument: DE:Tag:historic=monument + historic=pillory: DE:Tag:historic=pillory + historic=ship: DE:Tag:historic=ship + historic=stone: DE:Tag:historic=stone + historic=wayside_cross: DE:Tag:historic=wayside cross + historic=wayside_shrine: DE:Tag:historic=wayside shrine + historic=wreck: DE:Tag:historic=wreck junction=roundabout: DE:Tag:junction=roundabout landuse=allotments: DE:Tag:landuse=allotments + landuse=basin: DE:Tag:landuse=basin + landuse=brownfield: DE:Tag:landuse=brownfield landuse=cemetery: DE:Tag:landuse=cemetery + landuse=commercial: DE:Tag:landuse=commercial + landuse=farm: DE:Tag:landuse=farm landuse=farmland: DE:Tag:landuse=farmland landuse=farmyard: DE:Tag:landuse=farmyard landuse=forest: DE:Tag:landuse=forest + landuse=garages: DE:Tag:landuse=garages + landuse=grass: DE:Tag:landuse=grass + landuse=greenfield: DE:Tag:landuse=greenfield + landuse=industrial: DE:Tag:landuse=industrial + landuse=landfill: DE:Tag:landuse=landfill landuse=meadow: DE:Tag:landuse=meadow + landuse=military: DE:Tag:landuse=military landuse=orchard: DE:Tag:landuse=orchard + landuse=plant_nursery: DE:Tag:landuse=plant nursery landuse=quarry: DE:Tag:landuse=quarry + landuse=railway: DE:Tag:landuse=railway + landuse=recreation_ground: DE:Tag:landuse=recreation ground + landuse=reservoir: DE:Tag:landuse=reservoir landuse=residential: DE:Tag:landuse=residential + landuse=retail: DE:Tag:landuse=retail landuse=village_green: DE:Tag:landuse=village green + landuse=vineyard: DE:Tag:landuse=vineyard + leisure=beach_resort: DE:Tag:leisure=beach resort leisure=dog_park: DE:Tag:leisure=dog park leisure=garden: DE:Tag:leisure=garden + leisure=golf_course: DE:Tag:leisure=golf course + leisure=ice_rink: DE:Tag:leisure=ice rink + leisure=marina: DE:Tag:leisure=marina + leisure=miniature_golf: DE:Tag:leisure=miniature golf + leisure=nature_reserve: DE:Tag:leisure=nature reserve + leisure=park: DE:Tag:leisure=park + leisure=pitch: DE:Tag:leisure=pitch leisure=playground: DE:Tag:leisure=playground leisure=slipway: DE:Tag:leisure=slipway + leisure=sports_centre: DE:Tag:leisure=sports centre + leisure=stadium: DE:Tag:leisure=stadium + leisure=swimming_pool: DE:Tag:leisure=swimming pool + leisure=track: DE:Tag:leisure=track + leisure=water_park: DE:Tag:leisure=water park + level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled + man_made=adit: DE:Tag:man made=adit + man_made=bunker_silo: DE:Tag:man made=bunker silo + man_made=communications_tower: DE:Tag:man made=communications tower man_made=crane: DE:Tag:man made=crane + man_made=cutline: DE:Tag:man made=cutline + man_made=dyke: DE:Tag:man made=dyke + man_made=embankment: DE:Tag:man made=embankment + man_made=gasometer: DE:Tag:man made=gasometer + man_made=groyne: DE:Tag:man made=groyne + man_made=lighthouse: DE:Tag:man made=lighthouse + man_made=mast: DE:Tag:man made=mast man_made=mineshaft: DE:Tag:man made=mineshaft man_made=pier: DE:Tag:man made=pier man_made=pipeline: DE:Tag:man made=pipeline + man_made=reservoir_covered: DE:Tag:man made=reservoir covered + man_made=surveillance: DE:Tag:man made=surveillance man_made=survey_point: DE:Tag:man made=survey point + man_made=tower: DE:Tag:man made=tower man_made=wastewater_plant: DE:Tag:man made=wastewater plant + man_made=water_tower: DE:Tag:man made=water tower + man_made=water_works: DE:Tag:man made=water works + man_made=watermill: DE:Tag:man made=watermill + man_made=windmill: DE:Tag:man made=windmill microbrewery=yes: DE:Tag:microbrewery=yes military=bunker: DE:Tag:military=bunker + natural=arete: DE:Tag:natural=arete + natural=bare_rock: DE:Tag:natural=bare rock + natural=bay: DE:Tag:natural=bay + natural=beach: DE:Tag:natural=beach + natural=cliff: DE:Tag:natural=cliff + natural=glacier: DE:Tag:natural=glacier + natural=grassland: DE:Tag:natural=grassland + natural=heath: DE:Tag:natural=heath + natural=ridge: DE:Tag:natural=ridge + natural=scree: DE:Tag:natural=scree + natural=scrub: DE:Tag:natural=scrub + natural=sinkhole: DE:Tag:natural=sinkhole + natural=spring: DE:Tag:natural=spring natural=stone: DE:Tag:natural=stone natural=tree: DE:Tag:natural=tree + natural=tree_row: DE:Tag:natural=tree row + natural=volcano: DE:Tag:natural=volcano natural=water: DE:Tag:natural=water natural=wetland: DE:Tag:natural=wetland natural=wood: DE:Tag:natural=wood + office=lawyer: DE:Tag:office=lawyer + office=political_party: DE:Tag:office=political party pipeline=marker: DE:Tag:pipeline=marker + place=archipelago: DE:Tag:place=archipelago + place=city: DE:Tag:place=city + place=hamlet: DE:Tag:place=hamlet + place=island: DE:Tag:place=island + place=isolated_dwelling: DE:Tag:place=isolated dwelling + place=locality: DE:Tag:place=locality + place=neighbourhood: DE:Tag:place=neighbourhood + place=suburb: DE:Tag:place=suburb + place=town: DE:Tag:place=town + place=village: DE:Tag:place=village power=cable: DE:Tag:power=cable power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet power=generator: DE:Tag:power=generator power=line: DE:Tag:power=line power=minor_line: DE:Tag:power=minor line power=pole: DE:Tag:power=pole + power=station: DE:Tag:power=station power=sub_station: DE:Tag:power=sub station + power=substation: DE:Tag:power=substation power=tower: DE:Tag:power=tower + public_transport=platform: DE:Tag:public transport=platform + public_transport=stop_area: DE:Tag:public transport=stop area + public_transport=stop_position: DE:Tag:public transport=stop position + railway=abandoned: DE:Tag:railway=abandoned railway=crossing: DE:Tag:railway=crossing + railway=disused: DE:Tag:railway=disused railway=halt: DE:Tag:railway=halt + railway=level_crossing: DE:Tag:railway=level crossing railway=monorail: DE:Tag:railway=monorail railway=platform: DE:Tag:railway=platform + railway=rail: DE:Tag:railway=rail railway=station: DE:Tag:railway=station railway=tram: DE:Tag:railway=tram railway=tram_stop: DE:Tag:railway=tram stop railway=turntable: DE:Tag:railway=turntable route=ferry: DE:Tag:route=ferry + route=ski: DE:Tag:route=ski + service=driveway: DE:Tag:service=driveway service=parking_aisle: DE:Tag:service=parking aisle + shelter_type=lean_to: DE:Tag:shelter type=lean to + shop=baby_goods: DE:Tag:shop=baby goods + shop=bag: DE:Tag:shop=bag shop=bakery: DE:Tag:shop=bakery + shop=beverages: DE:Tag:shop=beverages + shop=bicycle: DE:Tag:shop=bicycle + shop=books: DE:Tag:shop=books + shop=butcher: DE:Tag:shop=butcher + shop=car: DE:Tag:shop=car + shop=car_parts: DE:Tag:shop=car parts + shop=car_repair: DE:Tag:shop=car repair + shop=charity: DE:Tag:shop=charity + shop=chemist: DE:Tag:shop=chemist + shop=clothes: DE:Tag:shop=clothes + shop=computer: DE:Tag:shop=computer + shop=convenience: DE:Tag:shop=convenience + shop=copyshop: DE:Tag:shop=copyshop + shop=deli: DE:Tag:shop=deli + shop=doityourself: DE:Tag:shop=doityourself + shop=dry_cleaning: DE:Tag:shop=dry cleaning + shop=electronics: DE:Tag:shop=electronics + shop=fabric: DE:Tag:shop=fabric + shop=florist: DE:Tag:shop=florist + shop=funeral_directors: DE:Tag:shop=funeral directors + shop=garden_centre: DE:Tag:shop=garden centre shop=general: DE:Tag:shop=general + shop=hairdresser: DE:Tag:shop=hairdresser + shop=hardware: DE:Tag:shop=hardware + shop=houseware: DE:Tag:shop=houseware + shop=kiosk: DE:Tag:shop=kiosk + shop=kitchen: DE:Tag:shop=kitchen + shop=laundry: DE:Tag:shop=laundry + shop=mall: DE:Tag:shop=mall + shop=medical_supply: DE:Tag:shop=medical supply + shop=newsagent: DE:Tag:shop=newsagent + shop=outdoor: DE:Tag:shop=outdoor + shop=photo: DE:Tag:shop=photo + shop=shoes: DE:Tag:shop=shoes + shop=spare_parts: DE:Tag:shop=spare parts + shop=stationery: DE:Tag:shop=stationery + shop=supermarket: DE:Tag:shop=supermarket + shop=toys: DE:Tag:shop=toys + shop=vacant: DE:Tag:shop=vacant + shop=variety_store: DE:Tag:shop=variety store + shop=window_blind: DE:Tag:shop=window blind + source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery + sport=9pin: DE:Tag:sport=9pin + sport=climbing: DE:Tag:sport=climbing + sport=free_flying: DE:Tag:sport=free flying + sport=golf: DE:Tag:sport=golf + sport=scuba_diving: DE:Tag:sport=scuba diving + sport=soccer: DE:Tag:sport=soccer + summit:cross=yes: DE:Tag:summit:cross=yes + tourism=alpine_hut: DE:Tag:tourism=alpine hut + tourism=aquarium: DE:Tag:tourism=aquarium + tourism=artwork: DE:Tag:tourism=artwork tourism=camp_site: DE:Tag:tourism=camp site tourism=caravan_site: DE:Tag:tourism=caravan site + tourism=chalet: DE:Tag:tourism=chalet + tourism=gallery: DE:Tag:tourism=gallery + tourism=guest_house: DE:Tag:tourism=guest house + tourism=hostel: DE:Tag:tourism=hostel + tourism=hotel: DE:Tag:tourism=hotel + tourism=information: DE:Tag:tourism=information + tourism=motel: DE:Tag:tourism=motel + tourism=museum: DE:Tag:tourism=museum tourism=picnic_site: DE:Tag:tourism=picnic site + tourism=viewpoint: DE:Tag:tourism=viewpoint + tourism=zoo: DE:Tag:tourism=zoo vending=bicycle_tube: DE:Tag:vending=bicycle tube + waterway=canal: DE:Tag:waterway=canal + waterway=dam: DE:Tag:waterway=dam + waterway=ditch: DE:Tag:waterway=ditch waterway=dock: DE:Tag:waterway=dock + waterway=drain: DE:Tag:waterway=drain + waterway=fish_pass: DE:Tag:waterway=fish pass waterway=lock_gate: DE:Tag:waterway=lock gate waterway=river: DE:Tag:waterway=river waterway=riverbank: DE:Tag:waterway=riverbank waterway=stream: DE:Tag:waterway=stream + waterway=weir: DE:Tag:waterway=weir en: key: - Demolished: Key:Demolished + 3dr:type: Key:3dr:type + AND_nosr_r: Key:AND nosr r + CEMT: Key:CEMT + DGPS_correction: Key:DGPS correction + IBGE:tipo: Key:IBGE:tipo + NHS: Key:NHS + RLIS:bicycle: Key:RLIS:bicycle + RLIS:reviewed: Key:RLIS:reviewed TMC:Direction: Key:TMC:Direction TMC:LocationCode: Key:TMC:LocationCode TMC:NextLocationCode: Key:TMC:NextLocationCode TMC:PrevLocationCode: Key:TMC:PrevLocationCode + abandoned: Key:abandoned abutters: Key:abutters access: Key:access + access:lhv: Key:access:lhv + access:roadtrain: Key:access:roadtrain + access:roadtrain:trailers: Key:access:roadtrain:trailers addr: Key:addr addr:conscriptionnumber: Key:addr:conscriptionnumber + addr:flats: Key:addr:flats + addr:place: Key:addr:place addr:provisionalnumber: Key:addr:provisionalnumber addr:streetnumber: Key:addr:streetnumber + addr:suburb: Key:addr:suburb + adr_les: Key:adr les aerialway: Key:aerialway aeroway: Key:aeroway + airmark: Key:airmark amenity: Key:amenity architect: Key:architect area: Key:area + artwork_type: Key:artwork type + ascent: Key:ascent + asset_ref: Key:asset ref atv: Key:atv + automatic_door: Key:automatic door + backrest: Key:backrest + bar: Key:bar barrier: Key:barrier + barrier:personnel: Key:barrier:personnel basin: Key:basin beacon: Key:beacon + beds: Key:beds + bench: Key:bench bicycle: Key:bicycle + bicycle_parking: Key:bicycle parking + bicycle_road: Key:bicycle road + bin: Key:bin + board_type: Key:board type boat: Key:boat + bollard: Key:bollard + books: Key:books border_type: Key:border type boundary: Key:boundary + brand: Key:brand + brewery: Key:brewery bridge: Key:bridge building: Key:building + building:condition: Key:building:condition + building:cullis:height: Key:building:cullis:height + building:fireproof: Key:building:fireproof + building:levels: Key:building:levels + building:levels:underground: Key:building:levels:underground + building:material: Key:building:material + building:min_level: Key:building:min level + building:obm: Key:building:obm + building:part: Key:building:part bunker_type: Key:bunker type buoy: Key:buoy + busway: Key:busway + button_operated: Key:button operated + cables: Key:cables capacity: Key:capacity + carriageway_ref: Key:carriageway ref + castle_type: Key:castle type + castle_type:de: Key:castle type:de + centralkey: Key:centralkey + centre_turn_lane: Key:centre turn lane cep: Key:cep + check_date: Key:check date + checkpoint: Key:checkpoint + circuits: Key:circuits + circumference: Key:circumference clothes: Key:clothes + club: Key:club + coastline:survey_quality: Key:coastline:survey quality collection_times: Key:collection times + colour: Key:colour comment: Key:comment + common_good_land: Key:common good land construction: Key:construction + construction_end_expected: Key:construction end expected contact: Key:contact + content: Key:content + conveying: Key:conveying + country: Key:country covered: Key:covered + craft: Key:craft created_by: Key:created by + crop: Key:crop crossing: Key:crossing cuisine: Key:cuisine + cultivation_method: Key:cultivation method + currency: Key:currency cutting: Key:cutting + cyclability: Key:cyclability + cyclestreets_id: Key:cyclestreets id cycleway: Key:cycleway + cycleway:buffer: Key:cycleway:buffer + de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel + de:regionalschluessel: Key:de:regionalschluessel + deanery: Key:deanery + delivery: Key:delivery denomination: Key:denomination + denotation: Key:denotation depth: Key:depth + descent: Key:descent description: Key:description + description:restrictions: Key:description:restrictions designation: Key:designation destination: Key:destination + diaper: Key:diaper + diet: Key:diet + diocese: Key:diocese direction: Key:direction + dirtbike:scale: Key:dirtbike:scale disabled: Key:disabled dispensing: Key:dispensing + distance: Key:distance disused: Key:disused + door: Key:door drink: Key:drink + drinking_water: Key:drinking water + drive_in: Key:drive in + drive_through: Key:drive through + driving_side: Key:driving side + duration: Key:duration easy_overtaking: Key:easy overtaking ele: Key:ele electrified: Key:electrified + email: Key:email embankment: Key:embankment emergency: Key:emergency end_date: Key:end date enforcement: Key:enforcement + entrance: Key:entrance + escalator: Key:escalator + esperanto: Key:esperanto + european_cultural_path: Key:european cultural path + exit: Key:exit + exit_to: Key:exit to + expressway: Key:expressway + fair_trade: Key:fair trade fee: Key:fee + female: Key:female fence_type: Key:fence type fenced: Key:fenced + ferry: Key:ferry + fetish: Key:fetish + fishing: Key:fishing fixme: Key:fixme flood_prone: Key:flood prone + floor:material: Key:floor:material fog_signal: Key:fog signal foot: Key:foot + footway: Key:footway ford: Key:ford + fork: Key:fork + format: Key:format + frequency: Key:frequency + fruit: Key:fruit + fuel: Key:fuel fuel:discount: Key:fuel:discount + furniture: Key:furniture + gambling: Key:gambling gauge: Key:gauge + generator:method: Key:generator:method + generator:output: Key:generator:output + generator:output:electricity: Key:generator:output:electricity + generator:output:hot_air: Key:generator:output:hot air + generator:output:hot_water: Key:generator:output:hot water + generator:output:steam: Key:generator:output:steam + generator:plant: Key:generator:plant + generator:source: Key:generator:source + generator:type: Key:generator:type + genus: Key:genus + geocodigo: Key:geocodigo geological: Key:geological + gnis:feature_id: Key:gnis:feature id + golf: Key:golf + group_only: Key:group only + guidepost: Key:guidepost + habitat: Key:habitat + handrail: Key:handrail + harbour: Key:harbour + harbour:access:swell: Key:harbour:access:swell + harbour:access:tide: Key:harbour:access:tide + harbour:category: Key:harbour:category + harbour:main: Key:harbour:main + hazard_intensity: Key:hazard intensity + hazard_occurrence: Key:hazard occurrence + hazard_prone: Key:hazard prone + hazard_return_period: Key:hazard return period + hazard_type: Key:hazard type hazmat: Key:hazmat healthcare: Key:healthcare height: Key:height highway: Key:highway + hiking: Key:hiking historic: Key:historic + historic:civilization: Key:historic:civilization + history: Key:history horse: Key:horse + hov: Key:hov + iata: Key:iata + ice_road: Key:ice road + image: Key:image + importance: Key:importance incline: Key:incline + informal: Key:informal information: Key:information + inline_skates: Key:inline skates + inscription: Key:inscription + intermittent: Key:intermittent internet_access: Key:internet access is_in: Key:is in + jel: Key:jel junction: Key:junction + junction_number: Key:junction number + kerb: Key:kerb + kms: Key:kms + kms:county_name: Key:kms:county name + kms:county_no: Key:kms:county no + kms:house_no: Key:kms:house no + kms:last_updated: Key:kms:last updated + kms:municipality_name: Key:kms:municipality name + kms:municipality_no: Key:kms:municipality no + kms:street_name: Key:kms:street name + kms:street_no: Key:kms:street no + kms:zip_code: Key:kms:zip code + kms:zip_name: Key:kms:zip name + kp: Key:kp + label: Key:label landmark: Key:landmark landuse: Key:landuse + lane_hint: Key:lane hint lanes: Key:lanes + lanes:psv: Key:lanes:psv layer: Key:layer lcn_ref: Key:lcn ref leisure: Key:leisure length: Key:length + level: Key:level light: Key:light + lines: Key:lines + listed_status: Key:listed status lit: Key:lit lit:perceived: Key:lit:perceived + local_ref: Key:local ref + location: Key:location lock: Key:lock + lock_name: Key:lock name + maintained: Key:maintained + maintenance: Key:maintenance + male: Key:male man_made: Key:man made managed: Key:managed manhole: Key:manhole + massage: Key:massage + material: Key:material + max_age: Key:max age maxage: Key:maxage maxairdraft: Key:maxairdraft maxaxleload: Key:maxaxleload @@ -318,18 +870,31 @@ en: maxheight:physical: Key:maxheight:physical maxlength: Key:maxlength maxspeed: Key:maxspeed + maxspeed:type: Key:maxspeed:type maxstay: Key:maxstay maxweight: Key:maxweight maxwidth: Key:maxwidth military: Key:military + min_age: Key:min age + min_height: Key:min height minage: Key:minage minspeed: Key:minspeed + mofa: Key:mofa + monitoring:air_quality: Key:monitoring:air quality + monitoring:galileo: Key:monitoring:galileo monitoring:glonass: Key:monitoring:glonass monitoring:gps: Key:monitoring:gps + monitoring:noise: Key:monitoring:noise + monitoring:seismic_activity: Key:monitoring:seismic activity + monitoring:tide_gauge: Key:monitoring:tide gauge + monitoring:water_level: Key:monitoring:water level + monitoring:weather: Key:monitoring:weather mooring: Key:mooring + motorboat: Key:motorboat motorcar: Key:motorcar motorcycle: Key:motorcycle motorroad: Key:motorroad + motorway: Key:motorway mountain_pass: Key:mountain pass mtb:description: Key:mtb:description mtb:scale: Key:mtb:scale @@ -337,104 +902,364 @@ en: name:cy: Key:name:cy narrow: Key:narrow natural: Key:natural + navibot:categorize: Key:navibot:categorize + navibot:connect: Key:navibot:connect + ncat: Key:ncat + ncn_milepost: Key:ncn milepost ncn_ref: Key:ncn ref + network: Key:network noexit: Key:noexit noname: Key:noname + not_served_by: Key:not served by note: Key:note + note:deplacer4mE: Key:note:deplacer4mE + notes: Key:notes office: Key:office + offshore: Key:offshore + ois:fixme: Key:ois:fixme + old_ref_legislative: Key:old ref legislative oneway: Key:oneway + opening_date: Key:opening date opening_hours: Key:opening hours + openplaques:id: Key:openplaques:id + openplaques_plaque: Key:openplaques plaque + opensource: Key:opensource operator: Key:operator + operator:type: Key:operator:type + organic: Key:organic + origin: Key:origin + osak:identifier: Key:osak:identifier + osak:municipality_no: Key:osak:municipality no + osak:revision: Key:osak:revision + osak:street_name: Key:osak:street name + osak:street_no: Key:osak:street no + osak:subdivision: Key:osak:subdivision osmarender:nameDirection: Key:osmarender:nameDirection osmarender:render: Key:osmarender:render osmarender:renderName: Key:osmarender:renderName osmarender:renderRef: Key:osmarender:renderRef osmc:symbol: Key:osmc:symbol overtaking: Key:overtaking + owner: Key:owner + ownership: Key:ownership parking: Key:parking + parking:lane: Key:parking:lane passing_places: Key:passing places paved:date: Key:paved:date + payment: Key:payment + phoenixbikeguide: Key:phoenixbikeguide phone: Key:phone + pilotage: Key:pilotage + pipeline: Key:pipeline + piste:difficulty: Key:piste:difficulty + piste:grooming: Key:piste:grooming + piste:type: Key:piste:type + pk: Key:pk place: Key:place + place:fr: Key:place:fr + place_name: Key:place name + placement: Key:placement + planned: Key:planned + plant:output: Key:plant:output + plant_community: Key:plant community + platforms: Key:platforms + playground: Key:playground + police: Key:police population: Key:population + post_office:type: Key:post office:type postal_code: Key:postal code power: Key:power - power_rating: Key:power rating - power_source: Key:power source + power_output: Key:power output + power_supply: Key:power supply + priority: Key:priority + priority_road: Key:priority road + produce: Key:produce + product: Key:product proposed: Key:proposed + protect_class: Key:protect class + protect_id: Key:protect id + protection_title: Key:protection title + prow_ref: Key:prow ref psv: Key:psv + public_transport: Key:public transport + pump: Key:pump + pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa + rack: Key:rack + radar_conspicious: Key:radar conspicious + radar_reflector: Key:radar reflector + radar_transponder: Key:radar transponder + radar_transponder:signal_group: Key:radar transponder:signal group + radio_transponder: Key:radio transponder + radio_transponder:AIS: Key:radio transponder:AIS + radio_transponder:signal_frequency: Key:radio transponder:signal frequency railway: Key:railway ramp: Key:ramp + ramsar: Key:ramsar rcn_ref: Key:rcn ref + real_ale: Key:real ale + real_cider: Key:real cider + recycling_type: Key:recycling type + reef: Key:reef ref: Key:ref + ref:ERDF:gdo: Key:ref:ERDF:gdo + ref:FR:42C: Key:ref:FR:42C + ref:FR:CEF: Key:ref:FR:CEF + ref:FR:FINESS: Key:ref:FR:FINESS + ref:FR:SIRET: Key:ref:FR:SIRET + ref:INSEE: Key:ref:INSEE + ref:ISTAT: Key:ref:ISTAT + ref:UAI: Key:ref:UAI + ref:at:gkz: Key:ref:at:gkz + ref:at:okz: Key:ref:at:okz + ref:bam.brno.cz: Key:ref:bam.brno.cz + ref:bufa: Key:ref:bufa + ref:colour: Key:ref:colour ref:isil: Key:ref:isil + ref:mhs: Key:ref:mhs + ref:mobil-parken.de: Key:ref:mobil-parken.de + ref:ortsnetz: Key:ref:ortsnetz + ref:sandre: Key:ref:sandre + ref:taskey: Key:ref:taskey + ref:vatin: Key:ref:vatin + ref:vorwahl: Key:ref:vorwahl + ref:wawa: Key:ref:wawa + reference_point: Key:reference point religion: Key:religion + removed: Key:removed + repair: Key:repair + reservation: Key:reservation resource: Key:resource + retreat: Key:retreat + retroreflecting: Key:retroreflecting + roof:material: Key:roof:material + room: Key:room + rooms: Key:rooms + roundtrip: Key:roundtrip route: Key:route + route_master: Key:route master + route_ref: Key:route ref + royal_cypher: Key:royal cypher + rtc_rate: Key:rtc rate + rugby: Key:rugby + ruins: Key:ruins + rwn_ref: Key:rwn ref sac_scale: Key:sac scale sagns_id: Key:sagns id + scenic: Key:scenic + school: Key:school seabed_surface: Key:seabed surface 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 + seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour + pattern + seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape + seamark:bridge:category: Key:seamark:bridge:category + seamark:bridge:clearance_height: Key:seamark:bridge:clearance height + seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed + seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open + seamark:bridge:clearance_width: Key:seamark:bridge:clearance width + seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity + seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity + seamark:cable_overhead:category: Key:seamark:cable overhead:category + seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical + clearance safe + seamark:cable_submarine:category: Key:seamark:cable submarine:category + seamark:conspicuity: Key:seamark:conspicuity + seamark:distance_mark:category: Key:seamark:distance mark:category + seamark:distance_mark:distance: Key:seamark:distance mark:distance + seamark:distance_mark:units: Key:seamark:distance mark:units + seamark:fixme: Key:seamark:fixme + seamark:fog_signal: Key:seamark:fog signal + seamark:fog_signal:category: Key:seamark:fog signal:category + seamark:fog_signal:group: Key:seamark:fog signal:group + seamark:fog_signal:period: Key:seamark:fog signal:period + seamark:fog_signal:range: Key:seamark:fog signal:range + seamark:fog_signal:sequence: Key:seamark:fog signal:sequence + seamark:fog_signal:status: Key:seamark:fog signal:status + seamark:landmark:category: Key:seamark:landmark:category + seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity + seamark:landmark:function: Key:seamark:landmark:function + seamark:light:exhibition: Key:seamark:light:exhibition + seamark:light:status: Key:seamark:light:status + seamark:light:visibility: Key:seamark:light:visibility + seamark:light_vessel:colour: Key:seamark:light vessel:colour + seamark:obstruction:category: Key:seamark:obstruction:category + seamark:pilot_boarding:category: Key:seamark:pilot boarding:category + seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category + seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name + seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product + seamark:platform:category: Key:seamark:platform:category + seamark:radar_reflector: Key:seamark:radar reflector + seamark:radar_station:category: Key:seamark:radar station:category + seamark:radar_station:channel: Key:seamark:radar station:channel + seamark:radar_transponder:category: Key:seamark:radar transponder:category + seamark:radar_transponder:group: Key:seamark:radar transponder:group + seamark:radar_transponder:period: Key:seamark:radar transponder:period + seamark:radar_transponder:range: Key:seamark:radar transponder:range + seamark:radar_transponder:sector_end: Key:seamark:radar transponder:sector end + seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start + seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence + seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength + seamark:radio_station:group: Key:seamark:radio station:group + seamark:reflectivity: Key:seamark:reflectivity + seamark:restricted_area:category: Key:seamark:restricted area:category + seamark:restricted_area:name: Key:seamark:restricted area:name + seamark:restricted_area:restriction: Key:seamark:restricted area:restriction + seamark:sea_area:category: Key:seamark:sea area:category + seamark:seabed_area:surface: Key:seamark:seabed area:surface + seamark:shoreline_construction:category: Key:seamark:shoreline construction:category + seamark:small_craft_facility:category: Key:seamark:small craft facility:category + seamark:small_craft_facility:name: Key:seamark:small craft facility:name + seasonal: Key:seasonal seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime + second_hand: Key:second hand + segregated: Key:segregated service: Key:service + service_times: Key:service times + shade: Key:shade + shelter: Key:shelter + shelter_type: Key:shelter type shop: Key:shop + side_road: Key:side road + sidewalk: Key:sidewalk + sign: Key:sign + signal_station: Key:signal station + site_type: Key:site type ski: Key:ski + ski_tour_difficulty: Key:ski tour difficulty smoothness: Key:smoothness + snowmobile: Key:snowmobile snowplowing: Key:snowplowing snowplowing:category: Key:snowplowing:category + social_facility: Key:social facility + sorting_name: Key:sorting name source: Key:source + source:addr: Key:source:addr + source:date: Key:source:date + source:loc: Key:source:loc + source:maxspeed: Key:source:maxspeed + species: Key:species + speech_output: Key:speech output + speisebezirk: Key:speisebezirk sport: Key:sport stars: Key:stars start_date: Key:start date + station: Key:station + status: Key:status step_count: Key:step count stop: Key:stop + storage_area: Key:storage area + stranded: Key:stranded + stream: Key:stream sub_sea: Key:sub sea - sulky: Key:sulky surface: Key:surface + surveillance: Key:surveillance + surveillance:type: Key:surveillance:type + surveillance:zone: Key:surveillance:zone + sustrans_ref: Key:sustrans ref + symbol: Key:symbol tactile_paving: Key:tactile paving + takeaway: Key:takeaway + taxon: Key:taxon + technology: Key:technology + tidal: Key:tidal + tiger: Key:tiger timezone: Key:timezone + toilets:wheelchair: Key:toilets:wheelchair toll: Key:toll + topmark: Key:topmark + touring: Key:touring tourism: Key:tourism + tourist_bus: Key:tourist bus + tracks: Key:tracks tracktype: Key:tracktype traffic:hourly: Key:traffic:hourly traffic_calming: Key:traffic calming traffic_sign: Key:traffic sign + traffic_signals: Key:traffic signals + traffic_signals:arrow: Key:traffic signals:arrow + traffic_signals:direction: Key:traffic signals:direction + traffic_signals:floor_vibration: Key:traffic signals:floor vibration + traffic_signals:minimap: Key:traffic signals:minimap + traffic_signals:sound: Key:traffic signals:sound + traffic_signals:vibration: Key:traffic signals:vibration trail_visibility: Key:trail visibility + trees: Key:trees trolley_wire: Key:trolley wire tunnel: Key:tunnel + turn: Key:turn + turning_radius: Key:turning radius + twitter: Key:twitter type: Key:type + uic_name: Key:uic name + uic_ref: Key:uic ref + unisex: Key:unisex + url: Key:url + url:restrictions: Key:url:restrictions + usage: Key:usage + validate:no_name: Key:validate:no name + validate:no_ref: Key:validate:no ref voltage: Key:voltage + waste: Key:waste + water: Key:water waterway: Key:waterway website: Key:website wheelchair: Key:wheelchair + wholesale: Key:wholesale width: Key:width + wiki:symbol: Key:wiki:symbol wikipedia: Key:wikipedia + winter_road: Key:winter road wires: Key:wires woeid: Key:woeid wood: Key:wood + xmas:feature: Key:xmas:feature + zone:maxspeed: Key:zone:maxspeed + zone:traffic: Key:zone:traffic zoo: Key:zoo tag: 4wd_only=yes: Tag:4wd only=yes - abandoned=yes: Tag:abandoned=yes + FIXME=Position_estimated: Tag:FIXME=Position estimated access=designated: Tag:access=designated + access=exclusion_zone: Tag:access=exclusion zone + access=license: Tag:access=license access=official: Tag:access=official + access=private: Tag:access=private + admin_level=aboriginal_land: Tag:admin level=aboriginal land aerialway=cable_car: Tag:aerialway=cable car + aerialway=canopy: Tag:aerialway=canopy aerialway=chair_lift: Tag:aerialway=chair lift aerialway=drag_lift: Tag:aerialway=drag lift aerialway=gondola: Tag:aerialway=gondola + aerialway=goods: Tag:aerialway=goods + aerialway=j-bar: Tag:aerialway=j-bar + aerialway=magic_carpet: Tag:aerialway=magic carpet aerialway=mixed_lift: Tag:aerialway=mixed lift + aerialway=platter: Tag:aerialway=platter aerialway=pylon: Tag:aerialway=pylon + aerialway=rope_tow: Tag:aerialway=rope tow aerialway=station: Tag:aerialway=station + aerialway=t-bar: Tag:aerialway=t-bar aeroway=aerodrome: Tag:aeroway=aerodrome + aeroway=airport: Tag:aeroway=airport aeroway=apron: Tag:aeroway=apron - aeroway=control_tower: Tag:aeroway=control tower aeroway=gate: Tag:aeroway=gate + aeroway=hangar: Tag:aeroway=hangar aeroway=helipad: Tag:aeroway=helipad aeroway=navigationaid: Tag:aeroway=navigationaid + aeroway=parking_position: Tag:aeroway=parking position aeroway=runway: Tag:aeroway=runway aeroway=taxiway: Tag:aeroway=taxiway aeroway=terminal: Tag:aeroway=terminal aeroway=windsock: Tag:aeroway=windsock + airmark=beacon: Tag:airmark=beacon + ale_supply=limited: Tag:ale supply=limited + allotments=plot: Tag:allotments=plot + amenity=Kneippbecken: Tag:amenity=Kneippbecken + amenity=animal_boarding: Tag:amenity=animal boarding + amenity=animal_breeding: Tag:amenity=animal breeding + amenity=animal_shelter: Tag:amenity=animal shelter amenity=architect_office: Tag:amenity=architect office amenity=arts_centre: Tag:amenity=arts centre amenity=atm: Tag:amenity=atm @@ -446,7 +1271,9 @@ en: amenity=bench: Tag:amenity=bench amenity=bicycle_parking: Tag:amenity=bicycle parking amenity=bicycle_rental: Tag:amenity=bicycle rental + amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing amenity=biergarten: Tag:amenity=biergarten + amenity=bikeshed: Tag:amenity=bikeshed amenity=boat_storage: Tag:amenity=boat storage amenity=brothel: Tag:amenity=brothel amenity=bureau_de_change: Tag:amenity=bureau de change @@ -454,52 +1281,93 @@ en: amenity=cafe: Tag:amenity=cafe amenity=car_rental: Tag:amenity=car rental amenity=car_sharing: Tag:amenity=car sharing + amenity=car_wash: Tag:amenity=car wash amenity=casino: Tag:amenity=casino + amenity=charging_station: Tag:amenity=charging station amenity=cinema: Tag:amenity=cinema + amenity=clinic: Tag:amenity=clinic amenity=clock: Tag:amenity=clock amenity=coast_guard: Tag:amenity=coast guard + amenity=coast_radar_station: Tag:amenity=coast radar station amenity=college: Tag:amenity=college amenity=community_centre: Tag:amenity=community centre amenity=compressed_air: Tag:amenity=compressed air amenity=courthouse: Tag:amenity=courthouse + amenity=coworking_space: Tag:amenity=coworking space amenity=crematorium: Tag:amenity=crematorium + amenity=crucifix: Tag:amenity=crucifix + amenity=crypt: Tag:amenity=crypt + amenity=customs: Tag:amenity=customs + amenity=dead_pub: Tag:amenity=dead pub amenity=dentist: Tag:amenity=dentist amenity=doctors: Tag:amenity=doctors + amenity=dojo: Tag:amenity=dojo amenity=drinking_water: Tag:amenity=drinking water + amenity=driving_school: Tag:amenity=driving school amenity=embassy: Tag:amenity=embassy + amenity=ev_charging: Tag:amenity=ev charging amenity=fast_food: Tag:amenity=fast food amenity=ferry_terminal: Tag:amenity=ferry terminal + amenity=festival_grounds: Tag:amenity=festival grounds + amenity=fire_hydrant: Tag:amenity=fire hydrant amenity=fire_station: Tag:amenity=fire station amenity=food_court: Tag:amenity=food court amenity=fountain: Tag:amenity=fountain amenity=fuel: Tag:amenity=fuel + amenity=gambling: Tag:amenity=gambling + amenity=game_feeding: Tag:amenity=game feeding amenity=grave_yard: Tag:amenity=grave yard amenity=grit_bin: Tag:amenity=grit bin + amenity=harbourmaster: Tag:amenity=harbourmaster amenity=hospital: Tag:amenity=hospital amenity=hunting_stand: Tag:amenity=hunting stand + amenity=ice_cream: Tag:amenity=ice cream + amenity=jobcentre: Tag:amenity=jobcentre amenity=kindergarten: Tag:amenity=kindergarten + amenity=kneipp_water_cure: Tag:amenity=kneipp water cure amenity=library: Tag:amenity=library amenity=life_ring: Tag:amenity=life ring + amenity=lifeboat_station: Tag:amenity=lifeboat station + amenity=love_hotel: Tag:amenity=love hotel amenity=marketplace: Tag:amenity=marketplace amenity=milk_dispenser: Tag:amenity=milk dispenser + amenity=mobile_library: Tag:amenity=mobile library + amenity=motorcycle_parking: Tag:amenity=motorcycle parking + amenity=music_venue: Tag:amenity=music venue amenity=nightclub: Tag:amenity=nightclub amenity=nursing_home: Tag:amenity=nursing home amenity=parking: Tag:amenity=parking + amenity=parking_entrance: Tag:amenity=parking entrance + amenity=parking_space: Tag:amenity=parking space amenity=pharmacy: Tag:amenity=pharmacy + amenity=photo_booth: Tag:amenity=photo booth amenity=place_of_worship: Tag:amenity=place of worship + amenity=planetarium: Tag:amenity=planetarium amenity=police: Tag:amenity=police amenity=post_box: Tag:amenity=post box amenity=post_office: Tag:amenity=post office amenity=prison: Tag:amenity=prison amenity=pub: Tag:amenity=pub + amenity=public_bath: Tag:amenity=public bath amenity=public_building: Tag:amenity=public building + amenity=ranger_station: Tag:amenity=ranger station amenity=recycling: Tag:amenity=recycling amenity=register_office: Tag:amenity=register office + amenity=rescue_box: Tag:amenity=rescue box amenity=restaurant: Tag:amenity=restaurant + amenity=retirement_home: Tag:amenity=retirement home amenity=sauna: Tag:amenity=sauna amenity=school: Tag:amenity=school + amenity=security_booth: Tag:amenity=security booth + amenity=shelter: Tag:amenity=shelter + amenity=shower: Tag:amenity=shower + amenity=social_centre: Tag:amenity=social centre + amenity=social_facility: Tag:amenity=social facility + amenity=spa: Tag:amenity=spa amenity=stripclub: Tag:amenity=stripclub amenity=studio: Tag:amenity=studio + amenity=swimming_pool: Tag:amenity=swimming pool + amenity=swingerclub: Tag:amenity=swingerclub amenity=taxi: Tag:amenity=taxi amenity=telephone: Tag:amenity=telephone amenity=theatre: Tag:amenity=theatre @@ -511,68 +1379,278 @@ en: amenity=waste_basket: Tag:amenity=waste basket amenity=waste_disposal: Tag:amenity=waste disposal amenity=waste_transfer_station: Tag:amenity=waste transfer station + amenity=water_point: Tag:amenity=water point amenity=watering_place: Tag:amenity=watering place - atm=no: Tag:atm=no + amenity=weighbridge: Tag:amenity=weighbridge atm=yes: Tag:atm=yes barrier=block: Tag:barrier=block barrier=bollard: Tag:barrier=bollard + barrier=border_control: Tag:barrier=border control + barrier=bus_trap: Tag:barrier=bus trap barrier=cattle_grid: Tag:barrier=cattle grid + barrier=chain: Tag:barrier=chain barrier=city_wall: Tag:barrier=city wall barrier=cycle_barrier: Tag:barrier=cycle barrier barrier=ditch: Tag:barrier=ditch + barrier=entrance: Tag:barrier=entrance barrier=fence: Tag:barrier=fence barrier=gate: Tag:barrier=gate + barrier=guard_rail: Tag:barrier=guard rail barrier=hedge: Tag:barrier=hedge barrier=horse_stile: Tag:barrier=horse stile barrier=kent_carriage_gap: Tag:barrier=kent carriage gap + barrier=kent_carriage_gate: Tag:barrier=kent carriage gate + barrier=kerb: Tag:barrier=kerb barrier=kissing_gate: Tag:barrier=kissing gate barrier=lift_gate: Tag:barrier=lift gate + barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier + barrier=ohm:military:wireObstacle: Tag:barrier=ohm:military:wireObstacle barrier=retaining_wall: Tag:barrier=retaining wall barrier=sally_port: Tag:barrier=sally port barrier=stile: Tag:barrier=stile + barrier=sump_buster: Tag:barrier=sump buster + barrier=swing_gate: Tag:barrier=swing gate barrier=toll_booth: Tag:barrier=toll booth barrier=turnstile: Tag:barrier=turnstile barrier=wall: Tag:barrier=wall + 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=civil: Tag:boundary=civil + boundary=historic: Tag:boundary=historic + boundary=local_authority: Tag:boundary=local authority boundary=maritime: Tag:boundary=maritime boundary=national: Tag:boundary=national boundary=national_park: Tag:boundary=national park 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=vice_county: Tag:boundary=vice county + bridge=bascule: Tag:bridge=bascule + bridge=beam: Tag:bridge=beam + bridge=drawbridge: Tag:bridge=drawbridge + bridge=lift: Tag:bridge=lift + bridge=opening: Tag:bridge=opening + bridge=pontoon: Tag:bridge=pontoon + bridge=suspension: Tag:bridge=suspension + bridge=transporter: Tag:bridge=transporter + bridge=viaduct: Tag:bridge=viaduct + building=apartments: Tag:building=apartments + building=barn: Tag:building=barn + building=bridge: Tag:building=bridge + building=bunker: Tag:building=bunker + building=cabin: Tag:building=cabin + building=cathedral: Tag:building=cathedral + building=chapel: Tag:building=chapel + building=church: Tag:building=church + building=civic: Tag:building=civic + building=commercial: Tag:building=commercial + building=construction: Tag:building=construction + building=cowshed: Tag:building=cowshed + building=detached: Tag:building=detached building=dormitory: Tag:building=dormitory building=entrance: Tag:building=entrance - building=parliament: Tag:building=parliament + building=farm: Tag:building=farm + building=farm_auxiliary: Tag:building=farm auxiliary + building=garage: Tag:building=garage + building=garages: Tag:building=garages + building=greenhouse: Tag:building=greenhouse + building=ground_station: Tag:building=ground station + building=hangar: Tag:building=hangar + building=hospital: Tag:building=hospital + building=hotel: Tag:building=hotel + building=house: Tag:building=house + building=houseboat: Tag:building=houseboat + building=hut: Tag:building=hut + building=industrial: Tag:building=industrial + building=manufacture: Tag:building=manufacture + building=mosque: Tag:building=mosque + building=office: Tag:building=office + building=public: Tag:building=public + building=residential: Tag:building=residential + building=retail: Tag:building=retail + building=roof: Tag:building=roof + building=school: Tag:building=school + building=shed: Tag:building=shed + building=stable: Tag:building=stable + building=static_caravan: Tag:building=static caravan + building=sty: Tag:building=sty + building=supermarket: Tag:building=supermarket + building=terrace: Tag:building=terrace + building=train_station: Tag:building=train station + building=transformer_tower: Tag:building=transformer tower + building=transportation: Tag:building=transportation + building=university: Tag:building=university + building=warehouse: Tag:building=warehouse bunker_type=munitions: Tag:bunker type=munitions bunker_type=pillbox: Tag:bunker type=pillbox + busway=lane: Tag:busway=lane + busway=opposite_lane: Tag:busway=opposite lane + cafe=time-cafe: Tag:cafe=time-cafe clothes=sports: Tag:clothes=sports - club-mate=yes: Tag:club-mate=yes + coastline:survey_quality=complete: Tag:coastline:survey quality=complete + coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate + craft=agricultural_engines: Tag:craft=agricultural engines + craft=basket_maker: Tag:craft=basket maker + craft=beekeeper: Tag:craft=beekeeper + craft=blacksmith: Tag:craft=blacksmith + craft=boatbuilder: Tag:craft=boatbuilder + craft=bookbinder: Tag:craft=bookbinder + craft=brewery: Tag:craft=brewery + craft=car_repair: Tag:craft=car repair + craft=carpenter: Tag:craft=carpenter + craft=carpet_layer: Tag:craft=carpet layer + craft=caterer: Tag:craft=caterer + craft=clockmaker: Tag:craft=clockmaker + craft=confectionery: Tag:craft=confectionery + craft=dressmaker: Tag:craft=dressmaker + craft=electrician: Tag:craft=electrician + craft=falles: Tag:craft=falles + craft=gardener: Tag:craft=gardener + craft=glaziery: Tag:craft=glaziery + craft=handicraft: Tag:craft=handicraft + craft=hvac: Tag:craft=hvac + craft=information_electronics: Tag:craft=information electronics + craft=insulation: Tag:craft=insulation + craft=jeweller: Tag:craft=jeweller + craft=key_cutter: Tag:craft=key cutter + craft=locksmith: Tag:craft=locksmith + craft=metal_construction: Tag:craft=metal construction + craft=optician: Tag:craft=optician + craft=painter: Tag:craft=painter + craft=parquet_layer: Tag:craft=parquet layer + craft=photographer: Tag:craft=photographer + craft=photographic_laboratory: Tag:craft=photographic laboratory + craft=plasterer: Tag:craft=plasterer + craft=plumber: Tag:craft=plumber + craft=pottery: Tag:craft=pottery + craft=rigger: Tag:craft=rigger + craft=roofer: Tag:craft=roofer + craft=saddler: Tag:craft=saddler + craft=sailmaker: Tag:craft=sailmaker + craft=sawmill: Tag:craft=sawmill + craft=scaffolder: Tag:craft=scaffolder + craft=sculptor: Tag:craft=sculptor + craft=shoemaker: Tag:craft=shoemaker + craft=stand_builder: Tag:craft=stand builder + craft=stonemason: Tag:craft=stonemason + craft=sun_protection: Tag:craft=sun protection + craft=sweep: Tag:craft=sweep + craft=tailor: Tag:craft=tailor + craft=tiler: Tag:craft=tiler + craft=tinsmith: Tag:craft=tinsmith + craft=upholsterer: Tag:craft=upholsterer + craft=watchmaker: Tag:craft=watchmaker + craft=window_construction: Tag:craft=window construction + crop=asparagus: Tag:crop=asparagus + crop=bananas: Tag:crop=bananas + crop=barley: Tag:crop=barley + crop=coffee: Tag:crop=coffee + crop=corn: Tag:crop=corn + crop=flowers: Tag:crop=flowers + crop=grape: Tag:crop=grape + crop=grass: Tag:crop=grass + crop=hay: Tag:crop=hay + crop=maize: Tag:crop=maize + crop=oats: Tag:crop=oats + crop=rape: Tag:crop=rape + crop=rice: Tag:crop=rice + crop=rye: Tag:crop=rye + crop=strawberry: Tag:crop=strawberry + crop=sugar: Tag:crop=sugar + crop=tea: Tag:crop=tea + crop=wheat: Tag:crop=wheat + cuisine=brazilian: Tag:cuisine=brazilian + cuisine=coffee_shop: Tag:cuisine=coffee shop + cycleway=asl: Tag:cycleway=asl cycleway=bike_box: Tag:cycleway=bike box + cycleway=share_busway: Tag:cycleway=share busway denomination=mormon: Tag:denomination=mormon + denomination=reformed: Tag:denomination=reformed + denotation=landmark: Tag:denotation=landmark emergency=ambulance_station: Tag:emergency=ambulance station + emergency=coast_guard: Tag:emergency=coast guard + emergency=defibrillator: Tag:emergency=defibrillator + emergency=fire_detection_system: Tag:emergency=fire detection system emergency=fire_extinguisher: Tag:emergency=fire extinguisher emergency=fire_flapper: Tag:emergency=fire flapper emergency=fire_hose: Tag:emergency=fire hose emergency=fire_hydrant: Tag:emergency=fire hydrant + emergency=fire_water_pond: Tag:emergency=fire water pond + emergency=life_ring: Tag:emergency=life ring + emergency=lifeboat_station: Tag:emergency=lifeboat station + emergency=marine_refuge: Tag:emergency=marine refuge emergency=phone: Tag:emergency=phone emergency=ses_station: Tag:emergency=ses station emergency=siren: Tag:emergency=siren + emergency=suction_point: Tag:emergency=suction point + emergency=water_rescue_station: Tag:emergency=water rescue station + emergency=water_tank: Tag:emergency=water tank + emergency_service=technical: Tag:emergency service=technical + esperanto=esperanto: Tag:esperanto=esperanto + estuary=yes: Tag:estuary=yes + fast_food=cafeteria: Tag:fast food=cafeteria + footway=crossing: Tag:footway=crossing + footway=sidewalk: Tag:footway=sidewalk + generator:method=fission: Tag:generator:method=fission + generator:method=fusion: Tag:generator:method=fusion + generator:plant=intermediate: Tag:generator:plant=intermediate + generator:plant=output: Tag:generator:plant=output + generator:source=hydro: Tag:generator:source=hydro + generator:source=nuclear: Tag:generator:source=nuclear + generator:source=solar: Tag:generator:source=solar + generator:source=wind: Tag:generator:source=wind + geological=outcrop: Tag:geological=outcrop geological=palaeontological_site: Tag:geological=palaeontological site + harbour:category=RoRo: Tag:harbour:category=RoRo + harbour:category=bulk: Tag:harbour:category=bulk + harbour:category=container: Tag:harbour:category=container + harbour:category=ferry: Tag:harbour:category=ferry + harbour:category=fishing: Tag:harbour:category=fishing + harbour:category=general: Tag:harbour:category=general + harbour:category=industrial: Tag:harbour:category=industrial + harbour:category=marina: Tag:harbour:category=marina + harbour:category=military: Tag:harbour:category=military + harbour:category=oil_platform: Tag:harbour:category=oil platform + harbour:category=passenger: Tag:harbour:category=passenger + harbour:category=seaport: Tag:harbour:category=seaport + harbour:category=shipyard: Tag:harbour:category=shipyard + harbour:category=tanker: Tag:harbour:category=tanker + harbour:category=tourism: Tag:harbour:category=tourism + harbour:category=yacht: Tag:harbour:category=yacht + harbour=dolphin: Tag:harbour=dolphin + harbour=drinking_water: Tag:harbour=drinking water + harbour=harbour_master: Tag:harbour=harbour master + harbour=jetty: Tag:harbour=jetty + harbour=slipway: Tag:harbour=slipway + harbour=yes: Tag:harbour=yes + 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 highway=bridleway: Tag:highway=bridleway highway=bus_guideway: Tag:highway=bus guideway highway=bus_stop: Tag:highway=bus stop highway=byway: Tag:highway=byway highway=crossing: Tag:highway=crossing highway=cycleway: Tag:highway=cycleway + highway=elevator: Tag:highway=elevator highway=emergency_access_point: Tag:highway=emergency access point + highway=escape: Tag:highway=escape highway=footway: Tag:highway=footway highway=ford: Tag:highway=ford highway=give_way: Tag:highway=give way + highway=incline: Tag:highway=incline + highway=lane: Tag:highway=lane highway=living_street: Tag:highway=living street + highway=milestone: Tag:highway=milestone highway=mini_roundabout: Tag:highway=mini roundabout highway=motorway: Tag:highway=motorway highway=motorway_junction: Tag:highway=motorway junction highway=motorway_link: Tag:highway=motorway link + highway=ohm:military:Trench: Tag:highway=ohm:military:Trench highway=passing_place: Tag:highway=passing place highway=path: Tag:highway=path highway=pedestrian: Tag:highway=pedestrian @@ -592,35 +1670,87 @@ en: highway=street_lamp: Tag:highway=street lamp highway=tertiary: Tag:highway=tertiary highway=track: Tag:highway=track + highway=traffic_mirror: Tag:highway=traffic mirror highway=traffic_signals: Tag:highway=traffic signals highway=trail: Tag:highway=trail highway=trunk: Tag:highway=trunk highway=turning_circle: Tag:highway=turning circle + highway=turning_loop: Tag:highway=turning loop highway=unclassified: Tag:highway=unclassified + highway=unsurfaced: Tag:highway=unsurfaced + highway=via_ferrata: Tag:highway=via ferrata + historic=aircraft: Tag:historic=aircraft historic=archaeological_site: Tag:historic=archaeological site historic=battlefield: Tag:historic=battlefield + historic=boundary_stone: Tag:historic=boundary stone + historic=cannon: Tag:historic=cannon historic=castle: Tag:historic=castle + historic=city_gate: Tag:historic=city gate + historic=citywalls: Tag:historic=citywalls + historic=farm: Tag:historic=farm + historic=fort: Tag:historic=fort + historic=gallows: Tag:historic=gallows historic=manor: Tag:historic=manor historic=memorial: Tag:historic=memorial + historic=milestone: Tag:historic=milestone + historic=mine: Tag:historic=mine historic=monastery: Tag:historic=monastery historic=monument: Tag:historic=monument + historic=pa: Tag:historic=pa historic=paleontological_site: Tag:historic=paleontological site + historic=pillory: Tag:historic=pillory historic=ruins: Tag:historic=ruins + historic=rune_stone: Tag:historic=rune stone + historic=ship: Tag:historic=ship + historic=stone: Tag:historic=stone + historic=tree_shrine: Tag:historic=tree shrine historic=wayside_cross: Tag:historic=wayside cross historic=wayside_shrine: Tag:historic=wayside shrine historic=wreck: Tag:historic=wreck hunting=raised_hide: Tag:hunting=raised hide + industrial=auto_wrecker: Tag:industrial=auto wrecker + industrial=well_cluster: Tag:industrial=well cluster information=guidepost: Tag:information=guidepost + information=tactile_model: Tag:information=tactile model + junction=crossing: Tag:junction=crossing + junction=filter: Tag:junction=filter junction=roundabout: Tag:junction=roundabout + landform=esker: Tag:landform=esker + landform=raised_beach: Tag:landform=raised beach + landmark=beacon: Tag:landmark=beacon + landmark=cairn: Tag:landmark=cairn + landmark=cemetery: Tag:landmark=cemetery + landmark=chimney: Tag:landmark=chimney + landmark=cross: Tag:landmark=cross + landmark=dish_aerial: Tag:landmark=dish aerial + landmark=flare_stack: Tag:landmark=flare stack + landmark=large_rock: Tag:landmark=large rock + landmark=mast: Tag:landmark=mast + landmark=memorial_plaque: Tag:landmark=memorial plaque + landmark=monument: Tag:landmark=monument + landmark=obelisk: Tag:landmark=obelisk + landmark=pillar: Tag:landmark=pillar + landmark=radar_scanner: Tag:landmark=radar scanner + landmark=rock_pinnacle: Tag:landmark=rock pinnacle + landmark=spire: Tag:landmark=spire + landmark=tower: Tag:landmark=tower + landmark=windmill: Tag:landmark=windmill + landmark=windmotor: Tag:landmark=windmotor + landmark=windsock: Tag:landmark=windsock + landuse=agriculture: Tag:landuse=agriculture landuse=allotments: Tag:landuse=allotments + landuse=aquaculture: Tag:landuse=aquaculture landuse=basin: Tag:landuse=basin landuse=brownfield: Tag:landuse=brownfield landuse=cemetery: Tag:landuse=cemetery + landuse=churchyard: Tag:landuse=churchyard landuse=commercial: Tag:landuse=commercial landuse=construction: Tag:landuse=construction + landuse=depot: Tag:landuse=depot landuse=farm: Tag:landuse=farm - landuse=farmland: Tag:landuse=farmland landuse=farmyard: Tag:landuse=farmyard + landuse=field: Tag:landuse=field + landuse=fishfarm: Tag:landuse=fishfarm landuse=forest: Tag:landuse=forest landuse=garages: Tag:landuse=garages landuse=grass: Tag:landuse=grass @@ -630,9 +1760,13 @@ en: landuse=landfill: Tag:landuse=landfill landuse=meadow: Tag:landuse=meadow landuse=military: Tag:landuse=military + landuse=observatory: Tag:landuse=observatory landuse=orchard: Tag:landuse=orchard landuse=peat_cutting: Tag:landuse=peat cutting + landuse=plant_nursery: Tag:landuse=plant nursery + landuse=plantation: Tag:landuse=plantation landuse=pond: Tag:landuse=pond + landuse=prison: Tag:landuse=prison landuse=quarry: Tag:landuse=quarry landuse=railway: Tag:landuse=railway landuse=recreation_ground: Tag:landuse=recreation ground @@ -641,55 +1775,99 @@ en: landuse=retail: Tag:landuse=retail landuse=salt_pond: Tag:landuse=salt pond landuse=street: Tag:landuse=street + landuse=traffic_island: Tag:landuse=traffic island + landuse=utility: Tag:landuse=utility landuse=village_green: Tag:landuse=village green landuse=vineyard: Tag:landuse=vineyard + landuse=well: Tag:landuse=well + landuse=wellsite: Tag:landuse=wellsite + lane=buffered: Tag:lane=buffered + leisure=adult_gaming_centre: Tag:leisure=adult gaming centre + leisure=amusement_arcade: Tag:leisure=amusement arcade + leisure=bathing_place: Tag:leisure=bathing place + leisure=bbq: Tag:leisure=bbq leisure=beach_resort: Tag:leisure=beach resort + leisure=bird_hide: Tag:leisure=bird hide leisure=common: Tag:leisure=common leisure=dance: Tag:leisure=dance leisure=dog_park: Tag:leisure=dog park + leisure=firepit: Tag:leisure=firepit leisure=fishing: Tag:leisure=fishing + leisure=fitness_station: Tag:leisure=fitness station leisure=garden: Tag:leisure=garden leisure=golf_course: Tag:leisure=golf course leisure=hackerspace: Tag:leisure=hackerspace leisure=ice_rink: Tag:leisure=ice rink + leisure=landscape_reserve: Tag:leisure=landscape reserve leisure=marina: Tag:leisure=marina leisure=miniature_golf: Tag:leisure=miniature golf leisure=nature_reserve: Tag:leisure=nature reserve leisure=paddling_pool: Tag:leisure=paddling pool leisure=park: Tag:leisure=park + leisure=picnic: Tag:leisure=picnic + leisure=picnic_site: Tag:leisure=picnic site leisure=picnic_table: Tag:leisure=picnic table leisure=pitch: Tag:leisure=pitch leisure=playground: Tag:leisure=playground + leisure=red_light_district: Tag:leisure=red light district + leisure=sailing_club: Tag:leisure=sailing club leisure=ski_playground: Tag:leisure=ski playground leisure=slipway: Tag:leisure=slipway leisure=sports_centre: Tag:leisure=sports centre + leisure=stadium: Tag:leisure=stadium + leisure=swimming_pool: Tag:leisure=swimming pool leisure=track: Tag:leisure=track leisure=video_arcade: Tag:leisure=video arcade leisure=water_park: Tag:leisure=water park + leisure=wildlife_hide: Tag:leisure=wildlife hide + level_crossing=uncontrolled: Tag:level crossing=uncontrolled + lines=phone: Tag:lines=phone man_made=adit: Tag:man made=adit + man_made=antenna: Tag:man made=antenna man_made=archimedes_screw: Tag:man made=archimedes screw man_made=beacon: Tag:man made=beacon + man_made=breakwater: Tag:man made=breakwater + man_made=bridge: Tag:man made=bridge + man_made=bunker_silo: Tag:man made=bunker silo + man_made=cairn: Tag:man made=cairn man_made=chimney: Tag:man made=chimney + man_made=communications_tower: Tag:man made=communications tower man_made=compass_rose: Tag:man made=compass rose man_made=crane: Tag:man made=crane + man_made=cross: Tag:man made=cross man_made=cutline: Tag:man made=cutline man_made=dyke: Tag:man made=dyke - man_made=fish_passage: Tag:man made=fish passage + man_made=embankment: Tag:man made=embankment + man_made=flagpole: Tag:man made=flagpole man_made=flare: Tag:man made=flare + man_made=floating_storage: Tag:man made=floating storage + man_made=gasometer: Tag:man made=gasometer + man_made=goods_conveyor: Tag:man made=goods conveyor man_made=ground_station: Tag:man made=ground station man_made=groyne: Tag:man made=groyne man_made=jetty: Tag:man made=jetty + man_made=kiln: Tag:man made=kiln man_made=lighthouse: Tag:man made=lighthouse + man_made=mast: Tag:man made=mast man_made=mineshaft: Tag:man made=mineshaft man_made=monitoring_station: Tag:man made=monitoring station + man_made=offshore_platform: Tag:man made=offshore platform + man_made=oil_well: Tag:man made=oil well + man_made=petroleum_well: Tag:man made=petroleum well man_made=pier: Tag:man made=pier + man_made=pillar: Tag:man made=pillar man_made=pipeline: Tag:man made=pipeline man_made=pumping_rig: Tag:man made=pumping rig man_made=reservoir_covered: Tag:man made=reservoir covered + man_made=school_sentry: Tag:man made=school sentry + man_made=silo: Tag:man made=silo + man_made=snow_fence: Tag:man made=snow fence man_made=storage_tank: Tag:man made=storage tank + man_made=submarine_cable: Tag:man made=submarine cable man_made=surveillance: Tag:man made=surveillance man_made=survey_point: Tag:man made=survey point man_made=tower: Tag:man made=tower + man_made=utility_pole: Tag:man made=utility pole man_made=wastewater_plant: Tag:man made=wastewater plant man_made=water_tower: Tag:man made=water tower man_made=water_well: Tag:man made=water well @@ -697,51 +1875,107 @@ en: man_made=watermill: Tag:man made=watermill man_made=well: Tag:man made=well man_made=wildlife_crossing: Tag:man made=wildlife crossing + man_made=wildlife_opening: Tag:man made=wildlife opening man_made=windmill: Tag:man made=windmill man_made=windpump: Tag:man made=windpump man_made=works: Tag:man made=works + medical=witchdoctor: Tag:medical=witchdoctor microbrewery=yes: Tag:microbrewery=yes military=airfield: Tag:military=airfield + military=barracks: Tag:military=barracks military=bunker: Tag:military=bunker + military=checkpoint: Tag:military=checkpoint + military=danger_area: Tag:military=danger area + military=exclusion_zone: Tag:military=exclusion zone military=naval_base: Tag:military=naval base + military=obstacle_course: Tag:military=obstacle course + military=range: Tag:military=range + military=training_area: Tag:military=training area + mooring=commercial: Tag:mooring=commercial + mooring=cruise: Tag:mooring=cruise + mooring=declaration: Tag:mooring=declaration + mooring=ferry: Tag:mooring=ferry + mooring=guest: Tag:mooring=guest + mooring=monobuoy: Tag:mooring=monobuoy + mooring=ring: Tag:mooring=ring + mooring=sbm: Tag:mooring=sbm + mooring=spm: Tag:mooring=spm + mooring=visitor: Tag:mooring=visitor + mooring=yes: Tag:mooring=yes + natural=arete: Tag:natural=arete + natural=avalanche_dam: Tag:natural=avalanche dam + natural=bare_rock: Tag:natural=bare rock natural=bay: Tag:natural=bay natural=beach: Tag:natural=beach + natural=bedrock: Tag:natural=bedrock + natural=breaker: Tag:natural=breaker + natural=cape: Tag:natural=cape natural=cave_entrance: Tag:natural=cave entrance natural=cliff: Tag:natural=cliff natural=coastline: Tag:natural=coastline + natural=continental_shelf: Tag:natural=continental shelf + natural=desert: Tag:natural=desert natural=dune: Tag:natural=dune + natural=esker: Tag:natural=esker natural=fell: Tag:natural=fell natural=glacier: Tag:natural=glacier + natural=grassland: Tag:natural=grassland natural=heath: Tag:natural=heath natural=lake: Tag:natural=lake natural=land: Tag:natural=land + natural=landform: Tag:natural=landform + natural=lava: Tag:natural=lava + natural=moor: Tag:natural=moor + natural=moraine: Tag:natural=moraine + natural=mud: Tag:natural=mud natural=peak: Tag:natural=peak + natural=reef: Tag:natural=reef + natural=ridge: Tag:natural=ridge natural=rock: Tag:natural=rock + natural=saddle: Tag:natural=saddle + natural=sand: Tag:natural=sand natural=scree: Tag:natural=scree natural=scrub: Tag:natural=scrub + natural=shoal: Tag:natural=shoal + natural=sinkhole: Tag:natural=sinkhole natural=spring: Tag:natural=spring natural=stone: Tag:natural=stone + natural=tidal: Tag:natural=tidal natural=tree: Tag:natural=tree + natural=tree_row: Tag:natural=tree row + natural=tundra: Tag:natural=tundra natural=volcano: Tag:natural=volcano natural=water: Tag:natural=water natural=wetland: Tag:natural=wetland natural=wood: Tag:natural=wood + odbl=clean: Tag:odbl=clean office=accountant: Tag:office=accountant + office=administrative: Tag:office=administrative office=architect: Tag:office=architect + office=camping: Tag:office=camping office=company: Tag:office=company + office=educational_institution: Tag:office=educational institution office=employment_agency: Tag:office=employment agency office=estate_agent: Tag:office=estate agent + office=foundation: Tag:office=foundation office=government: Tag:office=government office=insurance: Tag:office=insurance + office=it: Tag:office=it office=lawyer: Tag:office=lawyer office=newspaper: Tag:office=newspaper office=ngo: Tag:office=ngo + office=political_party: Tag:office=political party office=quango: Tag:office=quango office=research: Tag:office=research + office=surveyor: Tag:office=surveyor office=telecommunication: Tag:office=telecommunication office=travel_agent: Tag:office=travel agent + pilotage=boarding_point: Tag:pilotage=boarding point + pilotage=office: Tag:pilotage=office pipeline=marker: Tag:pipeline=marker pipeline=valve: Tag:pipeline=valve + place=allotments: Tag:place=allotments + place=archipelago: Tag:place=archipelago place=city: Tag:place=city place=continent: Tag:place=continent place=country: Tag:place=country @@ -752,78 +1986,409 @@ en: place=islet: Tag:place=islet place=isolated_dwelling: Tag:place=isolated dwelling place=locality: Tag:place=locality + place=neighbourhood: Tag:place=neighbourhood + place=ocean: Tag:place=ocean place=region: Tag:place=region + place=sea: Tag:place=sea place=state: Tag:place=state place=suburb: Tag:place=suburb place=town: Tag:place=town place=village: Tag:place=village + placement=right_of:1: Tag:placement=right of:1 + placement=transition: Tag:placement=transition + power=cable: Tag:power=cable power=cable_distribution_cabinet: Tag:power=cable distribution cabinet power=generator: Tag:power=generator + power=heliostat: Tag:power=heliostat power=line: Tag:power=line power=minor_line: Tag:power=minor line + power=plant: Tag:power=plant power=pole: Tag:power=pole power=station: Tag:power=station power=sub_station: Tag:power=sub station + power=substation: Tag:power=substation power=tower: Tag:power=tower + power=transformer: Tag:power=transformer + power=underground_cable: Tag:power=underground cable public_transport=pay_scale_area: Tag:public transport=pay scale area + public_transport=platform: Tag:public transport=platform + public_transport=station: Tag:public transport=station + public_transport=stop_area: Tag:public transport=stop area + public_transport=stop_position: Tag:public transport=stop position + pump=manual: Tag:pump=manual + pump=no: Tag:pump=no + pump=powered: Tag:pump=powered + radar_transponder=ramark: Tag:radar transponder=ramark + radio_transponder:category=aeronautical: Tag:radio transponder:category=aeronautical + radio_transponder:category=circular: Tag:radio transponder:category=circular + radio_transponder:category=coast_radio: Tag:radio transponder:category=coast radio + radio_transponder:category=consol: Tag:radio transponder:category=consol + radio_transponder:category=direction_finding: Tag:radio transponder:category=direction + finding + radio_transponder:category=directional: Tag:radio transponder:category=directional + radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating + pattern railway=PRT: Tag:railway=PRT + railway=abandoned: Tag:railway=abandoned + railway=buffer_stop: Tag:railway=buffer stop railway=crossing: Tag:railway=crossing + railway=derail: Tag:railway=derail + railway=disused: Tag:railway=disused + railway=funicular: Tag:railway=funicular railway=halt: Tag:railway=halt railway=level_crossing: Tag:railway=level crossing + railway=light_rail: Tag:railway=light rail + railway=milestone: Tag:railway=milestone railway=miniature: Tag:railway=miniature railway=monorail: Tag:railway=monorail + railway=narrow_gauge: Tag:railway=narrow gauge railway=platform: Tag:railway=platform + railway=preserved: Tag:railway=preserved railway=rail: Tag:railway=rail + railway=roundhouse: Tag:railway=roundhouse railway=station: Tag:railway=station railway=stop: Tag:railway=stop railway=subway: Tag:railway=subway railway=subway_entrance: Tag:railway=subway entrance + railway=switch: Tag:railway=switch railway=tram: Tag:railway=tram railway=tram_stop: Tag:railway=tram stop railway=turntable: Tag:railway=turntable religion=pagan: Tag:religion=pagan + resource=aggregate: Tag:resource=aggregate + resource=gravel: Tag:resource=gravel + resource=sand: Tag:resource=sand route=bus: Tag:route=bus route=canal: Tag:route=canal route=detour: Tag:route=detour route=ferry: Tag:route=ferry + route=fitness_trail: Tag:route=fitness trail + route=monorail: Tag:route=monorail + route=pipeline: Tag:route=pipeline route=railway: Tag:route=railway route=road: Tag:route=road route=share_taxi: Tag:route=share taxi route=ski: Tag:route=ski + route=subway: Tag:route=subway route=train: Tag:route=train route=tram: Tag:route=tram route=trolleybus: Tag:route=trolleybus + sea_mark=day_beacon: Tag:sea mark=day beacon + seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour + pattern=horizontal + seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower + seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated + danger:colour=black;red;black + seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated + danger:colour pattern=horizontal + seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower + seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green + seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green + seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white + seamark:beacon_lateral:colour=red: Tag:seamark:beacon lateral:colour=red + seamark:beacon_lateral:colour=red;green;red: Tag:seamark:beacon lateral:colour=red;green;red + seamark:beacon_lateral:colour=red;white;red;white: Tag:seamark:beacon lateral:colour=red;white;red;white + seamark:beacon_lateral:colour_pattern=horizontal: Tag:seamark:beacon lateral:colour + pattern=horizontal + seamark:beacon_lateral:shape=perch: Tag:seamark:beacon lateral:shape=perch + seamark:beacon_lateral:shape=pole: Tag:seamark:beacon lateral:shape=pole + seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower + seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy + seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white + seamark:beacon_safe_water:colour_pattern=vertical: Tag:seamark:beacon safe water:colour + pattern=vertical + seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower + seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable + seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice + seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing + seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning + seamark:beacon_special_purpose:colour=black: Tag:seamark:beacon special purpose:colour=black + seamark:beacon_special_purpose:colour=blue: Tag:seamark:beacon special purpose:colour=blue + seamark:beacon_special_purpose:colour=green: Tag:seamark:beacon special purpose:colour=green + seamark:beacon_special_purpose:colour=grey: Tag:seamark:beacon special purpose:colour=grey + seamark:beacon_special_purpose:colour=orange: Tag:seamark:beacon special purpose:colour=orange + seamark:beacon_special_purpose:colour=red: Tag:seamark:beacon special purpose:colour=red + seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white + seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow + seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn + seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole + seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower + seamark:buoy_cardinal:colour_pattern=horizontal: Tag:seamark:buoy cardinal:colour + pattern=horizontal + seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can + seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical + seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar + seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar + seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical + seamark:buoy_isolated_danger:colour=black;red;black: Tag:seamark:buoy isolated + danger:colour=black;red;black + seamark:buoy_isolated_danger:colour_pattern=horizontal: Tag:seamark:buoy isolated + danger:colour pattern=horizontal + seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can + seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical + seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar + seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar + seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical + seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green + seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green + seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white + seamark:buoy_lateral:colour=red: Tag:seamark:buoy lateral:colour=red + seamark:buoy_lateral:colour=red;green;red: Tag:seamark:buoy lateral:colour=red;green;red + seamark:buoy_lateral:colour=red;white;red;white: Tag:seamark:buoy lateral:colour=red;white;red;white + seamark:buoy_lateral:colour_pattern=horizontal: Tag:seamark:buoy lateral:colour + pattern=horizontal + seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can + seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical + seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar + seamark:buoy_lateral:shape=spar: Tag:seamark:buoy lateral:shape=spar + seamark:buoy_lateral:shape=spherical: Tag:seamark:buoy lateral:shape=spherical + seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white + seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour + pattern=vertical + seamark:buoy_safe_water:shape=can: Tag:seamark:buoy safe water:shape=can + seamark:buoy_safe_water:shape=conical: Tag:seamark:buoy safe water:shape=conical + seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar + seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar + seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical + seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas + seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing + seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black + seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue + seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green + seamark:buoy_special_purpose:colour=orange: Tag:seamark:buoy special purpose:colour=orange + seamark:buoy_special_purpose:colour=red: Tag:seamark:buoy special purpose:colour=red + seamark:buoy_special_purpose:colour=white: Tag:seamark:buoy special purpose:colour=white + seamark:buoy_special_purpose:colour=yellow: Tag:seamark:buoy special purpose:colour=yellow + seamark:buoy_special_purpose:colour_pattern=diagonal: Tag:seamark:buoy special + purpose:colour pattern=diagonal + seamark:buoy_special_purpose:colour_pattern=horizontal: Tag:seamark:buoy special + purpose:colour pattern=horizontal + seamark:buoy_special_purpose:colour_pattern=vertical: Tag:seamark:buoy special + purpose:colour pattern=vertical + seamark:buoy_special_purpose:shape=barrel: Tag:seamark:buoy special purpose:shape=barrel + seamark:buoy_special_purpose:shape=can: Tag:seamark:buoy special purpose:shape=can + seamark:buoy_special_purpose:shape=conical: Tag:seamark:buoy special purpose:shape=conical + seamark:buoy_special_purpose:shape=pillar: Tag:seamark:buoy special purpose:shape=pillar + seamark:buoy_special_purpose:shape=spar: Tag:seamark:buoy special purpose:shape=spar + seamark:buoy_special_purpose:shape=spherical: Tag:seamark:buoy special purpose:shape=spherical + seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy + seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power + seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone + seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous + 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: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 + seamark:fog_signal:category=gong: Tag:seamark:fog signal:category=gong + seamark:fog_signal:category=gun: Tag:seamark:fog signal:category=gun + seamark:fog_signal:category=horn: Tag:seamark:fog signal:category=horn + seamark:fog_signal:category=nautophone: Tag:seamark:fog signal:category=nautophone + seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren + seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle + seamark:fog_signal:status=wave_activated: Tag:seamark:fog signal:status=wave activated + seamark:fog_signal=yes: Tag:seamark:fog signal=yes + seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn + seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery + seamark:landmark:category=chimney: Tag:seamark:landmark:category=chimney + seamark:landmark:category=column: Tag:seamark:landmark:category=column + seamark:landmark:category=cross: Tag:seamark:landmark:category=cross + seamark:landmark:category=dish_aerial: Tag:seamark:landmark:category=dish aerial + seamark:landmark:category=dome: Tag:seamark:landmark:category=dome + seamark:landmark:category=flagstaff: Tag:seamark:landmark:category=flagstaff + seamark:landmark:category=flare_stack: Tag:seamark:landmark:category=flare stack + seamark:landmark:category=mast: Tag:seamark:landmark:category=mast + seamark:landmark:category=memorial: Tag:seamark:landmark:category=memorial + seamark:landmark:category=minaret: Tag:seamark:landmark:category=minaret + seamark:landmark:category=monument: Tag:seamark:landmark:category=monument + seamark:landmark:category=obelisk: Tag:seamark:landmark:category=obelisk + seamark:landmark:category=radar_scanner: Tag:seamark:landmark:category=radar scanner + 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 + seamark:landmark:conspicuity=conspicuous: Tag:seamark:landmark:conspicuity=conspicuous + seamark:landmark:function=buddhist_temple: Tag:seamark:landmark:function=buddhist + temple + seamark:landmark:function=chapel: Tag:seamark:landmark:function=chapel + seamark:landmark:function=church: Tag:seamark:landmark:function=church + seamark:landmark:function=marabout: Tag:seamark:landmark:function=marabout + seamark:landmark:function=mosque: Tag:seamark:landmark:function=mosque + seamark:landmark:function=pagoda: Tag:seamark:landmark:function=pagoda + seamark:landmark:function=shinto_shrine: Tag:seamark:landmark:function=shinto + shrine + seamark:landmark:function=temple: Tag:seamark:landmark:function=temple + seamark:light:category=aero: Tag:seamark:light:category=aero + seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction + seamark:light:category=directional: Tag:seamark:light:category=directional + seamark:light:category=floodlight: Tag:seamark:light:category=floodlight + seamark:light:category=fog_detector: Tag:seamark:light:category=fog detector + seamark:light:category=front: Tag:seamark:light:category=front + seamark:light:category=lower: Tag:seamark:light:category=lower + seamark:light:category=moire: Tag:seamark:light:category=moire + seamark:light:category=rear: Tag:seamark:light:category=rear + seamark:light:category=striplight: Tag:seamark:light:category=striplight + seamark:light:category=subsidiary: Tag:seamark:light:category=subsidiary + seamark:light:category=upper: Tag:seamark:light:category=upper + seamark:light:exhibition=day: Tag:seamark:light:exhibition=day + seamark:light:exhibition=fog: Tag:seamark:light:exhibition=fog + seamark:light:exhibition=on_demand: Tag:seamark:light:exhibition=on demand + seamark:light:status=extinguished: Tag:seamark:light:status=extinguished + seamark:light:status=private: Tag:seamark:light:status=private + seamark:light:status=temporary: Tag:seamark:light:status=temporary + seamark:light:status=unreliable: Tag:seamark:light:status=unreliable + seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified + seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured + seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified + seamark:mooring:category=wall: Tag:seamark:mooring:category=wall + seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom + seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon + seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark + seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka + seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial + broadcast + seamark:radio_station:category=public_communication: Tag:seamark:radio station:category=public + communication + seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time + signal + seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological + reserve + seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul + ground + seamark:restricted_area:category=military: Tag:seamark:restricted area:category=military + seamark:restricted_area:category=nature_reserve: Tag:seamark:restricted area:category=nature + reserve + seamark:restricted_area:category=no_wake: Tag:seamark:restricted area:category=no + wake + seamark:restricted_area:category=noise_limit: Tag:seamark:restricted area:category=noise + limit + seamark:restricted_area:restriction=berthing_prohibited: Tag:seamark:restricted + area:restriction=berthing prohibited + seamark:restricted_area:restriction=berthing_restricted: Tag:seamark:restricted + area:restriction=berthing restricted + seamark:restricted_area:restriction=entry_prohibited: Tag:seamark:restricted area:restriction=entry + prohibited + seamark:restricted_area:restriction=no_anchoring: Tag:seamark:restricted area:restriction=no + anchoring + seamark:restricted_area:restriction=no_boating: Tag:seamark:restricted area:restriction=no + boating + seamark:restricted_area:restriction=no_diving: Tag:seamark:restricted area:restriction=no + diving + seamark:restricted_area:restriction=no_entry: Tag:seamark:restricted area:restriction=no + entry + seamark:restricted_area:restriction=no_fishing: Tag:seamark:restricted area:restriction=no + fishing + seamark:restricted_area:restriction=no_wake: Tag:seamark:restricted area:restriction=no + wake + seamark:restricted_area:restriction=overtaking_prohibited: Tag:seamark:restricted + area:restriction=overtaking prohibited + seamark:restricted_area:restriction=passing_or_overtaking_prohibited: Tag:seamark:restricted + area:restriction=passing or overtaking prohibited + seamark:restricted_area:restriction=restricted_fairway_depth: Tag:seamark:restricted + area:restriction=restricted fairway depth + seamark:restricted_area:restriction=restricted_speed: Tag:seamark:restricted area:restriction=restricted + speed + seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted + area:restriction=turning prohibited + seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat + hoist + seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard + seamark:small_craft_facility:category=chandler: Tag:seamark:small craft facility:category=chandler + seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity + seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel + station + seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette + seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out + seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers + seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway + seamark:small_craft_facility:category=toilets: Tag:seamark:small craft facility:category=toilets + seamark:small_craft_facility:category=visitor_berth: Tag:seamark:small craft facility:category=visitor + berth + seamark:small_craft_facility:category=water: Tag:seamark:small craft facility:category=water + seamark:topmark:colour=black: Tag:seamark:topmark:colour=black + seamark:topmark:colour=green: Tag:seamark:topmark:colour=green + seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey + seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange + seamark:topmark:colour=red: Tag:seamark:topmark:colour=red + seamark:topmark:colour=white: Tag:seamark:topmark:colour=white + seamark:topmark:colour=yellow: Tag:seamark:topmark:colour=yellow + seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones + base together + seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down + seamark:topmark:shape=2_cones_point_together: Tag:seamark:topmark:shape=2 cones + point together + seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up + seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres + seamark:topmark:shape=board: Tag:seamark:topmark:shape=board + seamark:topmark:shape=cone: Tag:seamark:topmark:shape=cone + seamark:topmark:shape=cone,_point_down: Tag:seamark:topmark:shape=cone, point + down + seamark:topmark:shape=cone,_point_up: Tag:seamark:topmark:shape=cone, point up + seamark:topmark:shape=cylinder: Tag:seamark:topmark:shape=cylinder + seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond + seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag + seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle + seamark:topmark:shape=rhombus: Tag:seamark:topmark:shape=rhombus + seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere + seamark:topmark:shape=square: Tag:seamark:topmark:shape=square + seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross + seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape + seamark=anchorage: Tag:seamark=anchorage + seamark=beacon: Tag:seamark=beacon + seamark=buoy: Tag:seamark=buoy + seamark=lighthouse: Tag:seamark=lighthouse + segregated=no: Tag:segregated=no + segregated=yes: Tag:segregated=yes service=alley: Tag:service=alley service=drive-through: Tag:service=drive-through service=driveway: Tag:service=driveway service=emergency_access: Tag:service=emergency access service=parking_aisle: Tag:service=parking aisle + service=parts: Tag:service=parts service=siding: Tag:service=siding service=spur: Tag:service=spur service=yard: Tag:service=yard + shelter_type=basic_hut: Tag:shelter type=basic hut + shelter_type=lean_to: Tag:shelter type=lean to shop=SpotColor: Tag:shop=SpotColor shop=alcohol: Tag:shop=alcohol + shop=anime: Tag:shop=anime + shop=antiques: Tag:shop=antiques shop=art: Tag:shop=art + shop=auto_parts: Tag:shop=auto parts + shop=baby_goods: Tag:shop=baby goods shop=bakery: Tag:shop=bakery + shop=bathroom_furnishing: Tag:shop=bathroom furnishing shop=beauty: Tag:shop=beauty shop=bed: Tag:shop=bed + shop=betting: Tag:shop=betting shop=beverages: Tag:shop=beverages shop=bicycle: Tag:shop=bicycle + shop=bookmaker: Tag:shop=bookmaker shop=books: Tag:shop=books shop=boutique: Tag:shop=boutique shop=butcher: Tag:shop=butcher + shop=canoe_hire: Tag:shop=canoe hire shop=car: Tag:shop=car + shop=car_bodyshop: Tag:shop=car bodyshop + shop=car_parts: Tag:shop=car parts shop=car_repair: Tag:shop=car repair - shop=cell_phones: Tag:shop=cell phones + shop=carpet: Tag:shop=carpet + shop=chandler: Tag:shop=chandler shop=charity: Tag:shop=charity + shop=cheese: Tag:shop=cheese shop=chemist: Tag:shop=chemist shop=clothes: Tag:shop=clothes - shop=communication: Tag:shop=communication shop=computer: Tag:shop=computer shop=confectionery: Tag:shop=confectionery shop=convenience: Tag:shop=convenience shop=copyshop: Tag:shop=copyshop shop=curtain: Tag:shop=curtain + shop=dairy: Tag:shop=dairy shop=deli: Tag:shop=deli shop=department_store: Tag:shop=department store shop=dive: Tag:shop=dive @@ -831,86 +2396,162 @@ en: shop=dry_cleaning: Tag:shop=dry cleaning shop=electronics: Tag:shop=electronics shop=erotic: Tag:shop=erotic + shop=estate_agent: Tag:shop=estate agent shop=fabric: Tag:shop=fabric shop=farm: Tag:shop=farm + shop=fashion: Tag:shop=fashion + shop=fish: Tag:shop=fish + shop=fishmonger: Tag:shop=fishmonger shop=florist: Tag:shop=florist shop=food: Tag:shop=food shop=frame: Tag:shop=frame shop=funeral_directors: Tag:shop=funeral directors shop=furnace: Tag:shop=furnace shop=furniture: Tag:shop=furniture + shop=gambling: Tag:shop=gambling shop=garden_centre: Tag:shop=garden centre + shop=gas: Tag:shop=gas shop=general: Tag:shop=general shop=gift: Tag:shop=gift shop=glaziery: Tag:shop=glaziery shop=greengrocer: Tag:shop=greengrocer shop=hairdresser: Tag:shop=hairdresser + shop=hairdresser_supply: Tag:shop=hairdresser supply shop=hardware: Tag:shop=hardware shop=hearing_aids: Tag:shop=hearing aids + shop=herbalist: Tag:shop=herbalist shop=hifi: Tag:shop=hifi shop=houseware: Tag:shop=houseware + shop=hunting: Tag:shop=hunting shop=ice_cream: Tag:shop=ice cream + shop=insurance: Tag:shop=insurance + shop=interior_decoration: Tag:shop=interior decoration shop=jewelry: Tag:shop=jewelry shop=kiosk: Tag:shop=kiosk + shop=kitchen: Tag:shop=kitchen shop=laundry: Tag:shop=laundry + shop=leather: Tag:shop=leather shop=locksmith: Tag:shop=locksmith + shop=lottery: Tag:shop=lottery shop=mall: Tag:shop=mall shop=massage: Tag:shop=massage + shop=medical_supply: Tag:shop=medical supply + shop=military_surplus: Tag:shop=military surplus shop=mobile_phone: Tag:shop=mobile phone shop=money_lender: Tag:shop=money lender shop=motorcycle: Tag:shop=motorcycle shop=motorcycle_repair: Tag:shop=motorcycle repair + shop=music: Tag:shop=music shop=musical_instrument: Tag:shop=musical instrument shop=newsagent: Tag:shop=newsagent + shop=office_supplies: Tag:shop=office supplies shop=optician: Tag:shop=optician shop=organic: Tag:shop=organic shop=outdoor: Tag:shop=outdoor shop=paint: Tag:shop=paint + shop=pastry: Tag:shop=pastry shop=pawnbroker: Tag:shop=pawnbroker + shop=perfumery: Tag:shop=perfumery shop=pet: Tag:shop=pet + shop=photo: Tag:shop=photo + shop=printing: Tag:shop=printing + shop=radiotechnics: Tag:shop=radiotechnics + shop=salon: Tag:shop=salon + shop=scuba_diving: Tag:shop=scuba diving shop=seafood: Tag:shop=seafood shop=second_hand: Tag:shop=second hand + shop=ship_chandler: Tag:shop=ship chandler shop=shoes: Tag:shop=shoes + shop=shopping_centre: Tag:shop=shopping centre shop=sports: Tag:shop=sports shop=stationery: Tag:shop=stationery shop=supermarket: Tag:shop=supermarket shop=systembolaget: Tag:shop=systembolaget shop=tattoo: Tag:shop=tattoo + shop=tea: Tag:shop=tea + shop=ticket: Tag:shop=ticket + shop=tobacco: Tag:shop=tobacco shop=toys: Tag:shop=toys shop=trade: Tag:shop=trade + shop=travel_agency: Tag:shop=travel agency + shop=tyres: Tag:shop=tyres + shop=vacant: Tag:shop=vacant shop=vacuum_cleaner: Tag:shop=vacuum cleaner shop=variety_store: Tag:shop=variety store shop=video: Tag:shop=video + shop=video_games: Tag:shop=video games + shop=window_blind: Tag:shop=window blind + shop=windows: Tag:shop=windows + shop=wine: Tag:shop=wine + shop=winery: Tag:shop=winery + sign=no: Tag:sign=no + sign=yes: Tag:sign=yes + signal_station=bridge: Tag:signal station=bridge + signal_station=control: Tag:signal station=control + signal_station=danger: Tag:signal station=danger + signal_station=distress: Tag:signal station=distress + signal_station=firing: Tag:signal station=firing + signal_station=ice: Tag:signal station=ice + signal_station=international_port_traffic: Tag:signal station=international port + traffic + signal_station=lock: Tag:signal station=lock + signal_station=storm: Tag:signal station=storm + signal_station=stream: Tag:signal station=stream + signal_station=telegraph: Tag:signal station=telegraph + signal_station=tide: Tag:signal station=tide + signal_station=tide_gauge: Tag:signal station=tide gauge + signal_station=tide_scale: Tag:signal station=tide scale + signal_station=time: Tag:signal station=time + signal_station=traffic: Tag:signal station=traffic + signal_station=weather: Tag:signal station=weather + social_facility=assisted_living: Tag:social facility=assisted living + social_facility=food_bank: Tag:social facility=food bank + social_facility=group_home: Tag:social facility=group home + social_facility=outreach: Tag:social facility=outreach + social_facility=shelter: Tag:social facility=shelter source:ele=barometric: Tag:source:ele=barometric + source:maxspeed=implicit: Tag:source:maxspeed=implicit + source=Bymiljøetaten: Tag:source=Bymiljøetaten + source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn source=GURS: Tag:source=GURS - source=IBGE: Tag:source=IBGE + source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government 1:25000 map (2007) source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government aerial imagery (2001) + source=NAIP: Tag:source=NAIP sport=10pin: Tag:sport=10pin sport=9pin: Tag:sport=9pin + sport=aikido: Tag:sport=aikido sport=american_football: Tag:sport=american football sport=archery: Tag:sport=archery sport=athletics: Tag:sport=athletics sport=australian_football: Tag:sport=australian football sport=badminton: Tag:sport=badminton + sport=base: Tag:sport=base sport=baseball: Tag:sport=baseball sport=basketball: Tag:sport=basketball sport=beachvolleyball: Tag:sport=beachvolleyball + sport=billards: Tag:sport=billards + sport=bmx: Tag:sport=bmx sport=boules: Tag:sport=boules sport=bowls: Tag:sport=bowls sport=canadian_football: Tag:sport=canadian football sport=canoe: Tag:sport=canoe sport=chess: Tag:sport=chess + sport=cliff_diving: Tag:sport=cliff diving sport=climbing: Tag:sport=climbing + sport=climbing_adventure: Tag:sport=climbing adventure + sport=cockfighting: Tag:sport=cockfighting sport=cricket: Tag:sport=cricket sport=cricket_nets: Tag:sport=cricket nets sport=croquet: Tag:sport=croquet sport=cycling: Tag:sport=cycling + sport=darts: Tag:sport=darts sport=diving: Tag:sport=diving sport=dog_racing: Tag:sport=dog racing sport=equestrian: Tag:sport=equestrian + sport=free_flying: Tag:sport=free flying sport=gaelic_football: Tag:sport=gaelic football sport=gaelic_games: Tag:sport=gaelic games sport=golf: Tag:sport=golf @@ -919,17 +2560,22 @@ en: sport=horse_racing: Tag:sport=horse racing sport=horseshoes: Tag:sport=horseshoes sport=ice_stock: Tag:sport=ice stock + sport=kitesurfing: Tag:sport=kitesurfing sport=korfball: Tag:sport=korfball + sport=model_aerodrome: Tag:sport=model aerodrome sport=motor: Tag:sport=motor sport=multi: Tag:sport=multi + sport=obstacle_course: Tag:sport=obstacle course sport=orienteering: Tag:sport=orienteering sport=paddle_tennis: Tag:sport=paddle tennis sport=paragliding: Tag:sport=paragliding sport=pelota: Tag:sport=pelota sport=racquet: Tag:sport=racquet sport=rowing: Tag:sport=rowing + sport=rugby: Tag:sport=rugby sport=rugby_league: Tag:sport=rugby league sport=rugby_union: Tag:sport=rugby union + sport=scuba_diving: Tag:sport=scuba diving sport=shooting: Tag:sport=shooting sport=skateboard: Tag:sport=skateboard sport=skating: Tag:sport=skating @@ -937,6 +2583,7 @@ en: sport=soccer: Tag:sport=soccer sport=surfing: Tag:sport=surfing sport=swimming: Tag:sport=swimming + sport=table_soccer: Tag:sport=table soccer sport=table_tennis: Tag:sport=table tennis sport=team_handball: Tag:sport=team handball sport=tennis: Tag:sport=tennis @@ -944,6 +2591,12 @@ en: sport=volleyball: Tag:sport=volleyball sport=water_ski: Tag:sport=water ski sub_sea=reef: Tag:sub sea=reef + summit:cross=yes: Tag:summit:cross=yes + surface=pebbles: Tag:surface=pebbles + tidal=mud: Tag:tidal=mud + tidal=pebbles: Tag:tidal=pebbles + tidal=rocks: Tag:tidal=rocks + tidal=sand: Tag:tidal=sand tourism=alpine_hut: Tag:tourism=alpine hut tourism=aquarium: Tag:tourism=aquarium tourism=artwork: Tag:tourism=artwork @@ -951,6 +2604,7 @@ en: tourism=camp_site: Tag:tourism=camp site tourism=caravan_site: Tag:tourism=caravan site tourism=chalet: Tag:tourism=chalet + tourism=gallery: Tag:tourism=gallery tourism=guest_house: Tag:tourism=guest house tourism=hostel: Tag:tourism=hostel tourism=hotel: Tag:tourism=hotel @@ -960,38 +2614,130 @@ en: tourism=picnic_site: Tag:tourism=picnic site tourism=theme_park: Tag:tourism=theme park tourism=viewpoint: Tag:tourism=viewpoint + tourism=wilderness_hut: Tag:tourism=wilderness hut tourism=zoo: Tag:tourism=zoo + tower:construction=dish: Tag:tower:construction=dish + tower:construction=dome: Tag:tower:construction=dome + tower:construction=freestanding: Tag:tower:construction=freestanding + tower:construction=lattice: Tag:tower:construction=lattice + tower:type=lattice: Tag:tower:type=lattice + 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=island: Tag:traffic calming=island tunnel=culvert: Tag:tunnel=culvert - type=site: Tag:type=site + type=autopass: Tag:type=autopass + type=benchmark: Tag:type=benchmark + type=fixed_point: Tag:type=fixed point + type=leading_light: Tag:type=leading light + type=leading_line: Tag:type=leading line + type=observation_spot: Tag:type=observation spot + type=public_transport: Tag:type=public transport + type=street: Tag:type=street + type=triangulation: Tag:type=triangulation vending=bicycle_tube: Tag:vending=bicycle tube + wall=dry_stone: Tag:wall=dry stone + wall=no: Tag:wall=no + wall=seawall: Tag:wall=seawall + wall=training_wall: Tag:wall=training wall + water=intermittent: Tag:water=intermittent + water=tidal: Tag:water=tidal + waterway=boat_lift: Tag:waterway=boat lift waterway=boatyard: Tag:waterway=boatyard + waterway=brook: Tag:waterway=brook waterway=canal: Tag:waterway=canal waterway=dam: Tag:waterway=dam + waterway=deep_well: Tag:waterway=deep well waterway=derelict_canal: Tag:waterway=derelict canal + waterway=ditch: Tag:waterway=ditch waterway=dock: Tag:waterway=dock waterway=drain: Tag:waterway=drain + waterway=dredged_area: Tag:waterway=dredged area + waterway=fish_pass: Tag:waterway=fish pass waterway=lock_gate: Tag:waterway=lock gate + waterway=milestone: Tag:waterway=milestone + waterway=offshore_field: Tag:waterway=offshore field + waterway=rapids: Tag:waterway=rapids waterway=river: Tag:waterway=river waterway=riverbank: Tag:waterway=riverbank waterway=seaway: Tag:waterway=seaway waterway=stream: Tag:waterway=stream + waterway=swept_area: Tag:waterway=swept area waterway=turning_point: Tag:waterway=turning point + waterway=wadi: Tag:waterway=wadi waterway=water_point: Tag:waterway=water point waterway=waterfall: Tag:waterway=waterfall waterway=weir: Tag:waterway=weir + wood=casuarina: Tag:wood=casuarina + wood=coniferous: Tag:wood=coniferous + wood=deciduous: Tag:wood=deciduous + wood=eucalypt: Tag:wood=eucalypt + wood=evergreen: Tag:wood=evergreen + wood=filao: Tag:wood=filao + wood=mixed: Tag:wood=mixed + wood=nipa_palm: Tag:wood=nipa palm + wood=palm: Tag:wood=palm zoo=petting_zoo: Tag:zoo=petting zoo es: + key: + amenity: ES:Key:amenity + highway: ES:Key:highway + proposed: ES:Key:proposed + stars: ES:Key:stars + traffic_calming: ES:Key:traffic calming tag: + aerialway=cable_car: ES:Tag:aerialway=cable car + amenity=atm: ES:Tag:amenity=atm amenity=bar: ES:Tag:amenity=bar + amenity=bicycle_parking: ES:Tag:amenity=bicycle parking + amenity=bicycle_rental: ES:Tag:amenity=bicycle rental + amenity=fuel: ES:Tag:amenity=fuel amenity=recycling: ES:Tag:amenity=recycling + amenity=university: ES:Tag:amenity=university + emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher highway=bus_stop: ES:Tag:highway=bus stop + highway=escape: ES:Tag:highway=escape + highway=living_street: ES:Tag:highway=living street + highway=motorway_junction: ES:Tag:highway=motorway junction + highway=motorway_link: ES:Tag:highway=motorway link + highway=pedestrian: ES:Tag:highway=pedestrian + highway=residential: ES:Tag:highway=residential + highway=stop: ES:Tag:highway=stop + landuse=allotments: ES:Tag:landuse=allotments + landuse=industrial: ES:Tag:landuse=industrial + leisure=playground: ES:Tag:leisure=playground + leisure=water_park: ES:Tag:leisure=water park + natural=beach: ES:Tag:natural=beach + natural=glacier: ES:Tag:natural=glacier + natural=saddle: ES:Tag:natural=saddle + natural=tree: ES:Tag:natural=tree + natural=water: ES:Tag:natural=water + power=pole: ES:Tag:power=pole + power=tower: ES:Tag:power=tower railway=level_crossing: ES:Tag:railway=level crossing + shop=alcohol: ES:Tag:shop=alcohol + shop=computer: ES:Tag:shop=computer + shop=lottery: ES:Tag:shop=lottery + tourism=alpine_hut: ES:Tag:tourism=alpine hut + tourism=artwork: ES:Tag:tourism=artwork + tourism=camp_site: ES:Tag:tourism=camp site et: key: + addr: Et:Key:addr + backrest: Et:Key:backrest highway: Et:Key:highway + tag: + amenity=bench: Et:Tag:amenity=bench + amenity=cafe: Et:Tag:amenity=cafe + amenity=library: Et:Tag:amenity=library + amenity=taxi: Et:Tag:amenity=taxi + building=roof: Et:Tag:building=roof fi: key: amenity: Fi:Key:amenity + bicycle_parking: Fi:Key:bicycle parking bridge: Fi:Key:bridge crossing: Fi:Key:crossing description: Fi:Key:description @@ -1004,15 +2750,23 @@ fi: leisure: Fi:Key:leisure man_made: Fi:Key:man made manhole: Fi:Key:manhole + maxspeed: Fi:Key:maxspeed + mtb:scale: Fi:Key:mtb:scale + name: Fi:Key:name narrow: Fi:Key:narrow natural: Fi:Key:natural note: Fi:Key:note operator: Fi:Key:operator - parking:lane:both: Fi:Key:parking:lane:both + parking:lane: Fi:Key:parking:lane + priority_road: Fi:Key:priority road + pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa shop: Fi:Key:shop + snowmobile: Fi:Key:snowmobile + snowplowing: Fi:Key:snowplowing surface: Fi:Key:surface tracktype: Fi:Key:tracktype traffic_calming: Fi:Key:traffic calming + traffic_sign: Fi:Key:traffic sign tunnel: Fi:Key:tunnel waterway: Fi:Key:waterway wheelchair: Fi:Key:wheelchair @@ -1021,6 +2775,8 @@ fi: amenity=atm: Fi:Tag:amenity=atm amenity=baby_hatch: Fi:Tag:amenity=baby hatch amenity=bank: Fi:Tag:amenity=bank + amenity=bicycle_parking: Fi:Tag:amenity=bicycle parking + amenity=bicycle_rental: Fi:Tag:amenity=bicycle rental amenity=bureau_de_change: Fi:Tag:amenity=bureau de change amenity=car_rental: Fi:Tag:amenity=car rental amenity=car_sharing: Fi:Tag:amenity=car sharing @@ -1041,11 +2797,17 @@ fi: amenity=theatre: Fi:Tag:amenity=theatre amenity=townhall: Fi:Tag:amenity=townhall amenity=veterinary: Fi:Tag:amenity=veterinary + building=garage: Fi:Tag:building=garage + building=garages: Fi:Tag:building=garages + highway=crossing: Fi:Tag:highway=crossing + highway=footway: Fi:Tag:highway=footway highway=secondary: Fi:Tag:highway=secondary + highway=speed_camera: Fi:Tag:highway=speed camera highway=steps: Fi:Tag:highway=steps highway=tertiary: Fi:Tag:highway=tertiary highway=track: Fi:Tag:highway=track highway=unclassified: Fi:Tag:highway=unclassified + leisure=dance: Fi:Tag:leisure=dance leisure=dog_park: Fi:Tag:leisure=dog park leisure=slipway: Fi:Tag:leisure=slipway man_made=wastewater_plant: Fi:Tag:man made=wastewater plant @@ -1071,314 +2833,1297 @@ fi: waterway=stream: Fi:Tag:waterway=stream fr: key: + CEMT: FR:Key:CEMT + abutters: FR:Key:abutters + access: FR:Key:access addr: FR:Key:addr + advertising: FR:Key:advertising + aeroway: FR:Key:aeroway amenity: FR:Key:amenity + area: FR:Key:area barrier: FR:Key:barrier + basin: FR:Key:basin + bench: FR:Key:bench + bicycle: FR:Key:bicycle + bicycle_parking: FR:Key:bicycle parking + boat: FR:Key:boat + bollard: FR:Key:bollard + books: FR:Key:books boundary: FR:Key:boundary bridge: FR:Key:bridge building: FR:Key:building + capacity: FR:Key:capacity + clothes: FR:Key:clothes collection_times: FR:Key:collection times + colour: FR:Key:colour + comment: FR:Key:comment + construction: FR:Key:construction + contact: FR:Key:contact + covered: FR:Key:covered + craft: FR:Key:craft + crop: FR:Key:crop + crossing: FR:Key:crossing + cutting: FR:Key:cutting cycleway: FR:Key:cycleway + denomination: FR:Key:denomination + description: FR:Key:description + designation: FR:Key:designation + destination: FR:Key:destination + diet:*: FR:Key:diet:* + dispensing: FR:Key:dispensing + distance: FR:Key:distance + drink: FR:Key:drink + ele: FR:Key:ele + email: FR:Key:email + embankment: FR:Key:embankment enforcement: FR:Key:enforcement + entrance: FR:Key:entrance + fee: FR:Key:fee + fixme: FR:Key:fixme + flood_prone: FR:Key:flood prone + foot: FR:Key:foot + footway: FR:Key:footway + generator:method: FR:Key:generator:method + generator:output: FR:Key:generator:output + generator:output:electricity: FR:Key:generator:output:electricity + generator:output:hot_air: FR:Key:generator:output:hot air + generator:output:hot_water: FR:Key:generator:output:hot water + generator:output:steam: FR:Key:generator:output:steam + generator:source: FR:Key:generator:source + height: FR:Key:height highway: FR:Key:highway + historic: FR:Key:historic + incline: FR:Key:incline + information: FR:Key:information + intermittent: FR:Key:intermittent + junction: FR:Key:junction landuse: FR:Key:landuse lanes: FR:Key:lanes leisure: FR:Key:leisure + length: FR:Key:length + level: FR:Key:level + lit: FR:Key:lit + lock: FR:Key:lock man_made: FR:Key:man made + manufacturer: FR:Key:manufacturer + maxage: FR:Key:maxage + maxheight: FR:Key:maxheight + maxheight:physical: FR:Key:maxheight:physical + maxlength: FR:Key:maxlength + maxspeed: FR:Key:maxspeed + maxstay: FR:Key:maxstay maxweight: FR:Key:maxweight + maxwidth: FR:Key:maxwidth + military: FR:Key:military + minage: FR:Key:minage + mountain_pass: FR:Key:mountain pass + mtb:scale: FR:Key:mtb:scale name: FR:Key:name natural: FR:Key:natural + network: FR:Key:network noname: FR:Key:noname + note: FR:Key:note + office: FR:Key:office + oneway: FR:Key:oneway opening_hours: FR:Key:opening hours operator: FR:Key:operator parking: FR:Key:parking + parking:lane: FR:Key:parking:lane + paved:date: FR:Key:paved:date + phone: FR:Key:phone place: FR:Key:place + place:fr: FR:Key:place:fr + post_office:type: FR:Key:post office:type power: FR:Key:power + power_supply: FR:Key:power supply + priority: FR:Key:priority + proposed: FR:Key:proposed + psv: FR:Key:psv + public_transport: FR:Key:public transport + railway: FR:Key:railway + ref: FR:Key:ref + ref:CEF: FR:Key:ref:CEF + ref:ERDF:gdo: FR:Key:ref:ERDF:gdo + ref:FR:42C: FR:Key:ref:FR:42C + ref:FR:FINESS: FR:Key:ref:FR:FINESS + ref:INSEE: FR:Key:ref:INSEE + ref:UAI: FR:Key:ref:UAI + ref:mhs: FR:Key:ref:mhs + ref:sandre: FR:Key:ref:sandre + religion: FR:Key:religion + resource: FR:Key:resource sac_scale: FR:Key:sac scale + second_hand: FR:Key:second hand + segregated: FR:Key:segregated + service: FR:Key:service + shelter_type: FR:Key:shelter type shop: FR:Key:shop smoothness: FR:Key:smoothness + social_facility: FR:Key:social facility + source: FR:Key:source + source:maxspeed: FR:Key:source:maxspeed sport: FR:Key:sport surface: FR:Key:surface + surveillance: FR:Key:surveillance + tactile_paving: FR:Key:tactile paving + takeaway: FR:Key:takeaway + timezone: FR:Key:timezone + toll: FR:Key:toll + tourism: FR:Key:tourism tracktype: FR:Key:tracktype + traffic_calming: FR:Key:traffic calming + traffic_sign: FR:Key:traffic sign + trail_visibility: FR:Key:trail visibility + tunnel: FR:Key:tunnel + turn: FR:Key:turn + turning_radius: FR:Key:turning radius + type: FR:Key:type + url: FR:Key:url + voltage: FR:Key:voltage + waste: FR:Key:waste + water: FR:Key:water waterway: FR:Key:waterway + website: FR:Key:website + wheelchair: FR:Key:wheelchair + width: FR:Key:width + wikipedia: FR:Key:wikipedia tag: + FIXME=Position_estimated: FR:Tag:FIXME=Position estimated + abandoned=yes: FR:Tag:abandoned=yes + access=private: FR:Tag:access=private + aerialway=cable_car: FR:Tag:aerialway=cable car + aerialway=chair_lift: FR:Tag:aerialway=chair lift + aeroway=helipad: FR:Tag:aeroway=helipad aeroway=runway: FR:Tag:aeroway=runway + amenity=animal_boarding: FR:Tag:amenity=animal boarding + amenity=animal_breeding: FR:Tag:amenity=animal breeding + amenity=animal_shelter: FR:Tag:amenity=animal shelter + amenity=atm: FR:Tag:amenity=atm + amenity=bench: FR:Tag:amenity=bench amenity=bicycle_parking: FR:Tag:amenity=bicycle parking amenity=bicycle_rental: FR:Tag:amenity=bicycle rental + amenity=cafe: FR:Tag:amenity=cafe + amenity=car_rental: FR:Tag:amenity=car rental + amenity=car_sharing: FR:Tag:amenity=car sharing amenity=community_centre: FR:Tag:amenity=community centre + amenity=compressed_air: FR:Tag:amenity=compressed air + amenity=coworking_space: FR:Tag:amenity=coworking space + amenity=crematorium: FR:Tag:amenity=crematorium + amenity=crypt: FR:Tag:amenity=crypt + amenity=drinking_water: FR:Tag:amenity=drinking water amenity=fire_station: FR:Tag:amenity=fire station + amenity=fountain: FR:Tag:amenity=fountain + amenity=fuel: FR:Tag:amenity=fuel + amenity=grave_yard: FR:Tag:amenity=grave yard + amenity=hospital: FR:Tag:amenity=hospital + amenity=kindergarten: FR:Tag:amenity=kindergarten amenity=library: FR:Tag:amenity=library + amenity=marketplace: FR:Tag:amenity=marketplace + amenity=parking: FR:Tag:amenity=parking + amenity=parking_space: FR:Tag:amenity=parking space amenity=pharmacy: FR:Tag:amenity=pharmacy + amenity=photo_booth: FR:Tag:amenity=photo booth + amenity=place_of_worship: FR:Tag:amenity=place of worship + amenity=police: FR:Tag:amenity=police amenity=recycling: FR:Tag:amenity=recycling + amenity=restaurant: FR:Tag:amenity=restaurant + amenity=school: FR:Tag:amenity=school + amenity=shelter: FR:Tag:amenity=shelter + amenity=social_centre: FR:Tag:amenity=social centre + amenity=social_facility: FR:Tag:amenity=social facility + amenity=taxi: FR:Tag:amenity=taxi amenity=telephone: FR:Tag:amenity=telephone + amenity=toilets: FR:Tag:amenity=toilets amenity=townhall: FR:Tag:amenity=townhall + amenity=university: FR:Tag:amenity=university + amenity=veterinary: FR:Tag:amenity=veterinary + amenity=waste_basket: FR:Tag:amenity=waste basket barrier=bollard: FR:Tag:barrier=bollard + barrier=cycle_barrier: FR:Tag:barrier=cycle barrier barrier=gate: FR:Tag:barrier=gate + barrier=hedge: FR:Tag:barrier=hedge + barrier=retaining_wall: FR:Tag:barrier=retaining wall + barrier=wall: FR:Tag:barrier=wall + building=house: FR:Tag:building=house + building=roof: FR:Tag:building=roof + craft=beekeeper: FR:Tag:craft=beekeeper + craft=car_repair: FR:Tag:craft=car repair + cycleway=asl: FR:Tag:cycleway=asl cycleway=bike_box: FR:Tag:cycleway=bike box + disused=yes: FR:Tag:disused=yes + emergency=defibrillator: FR:Tag:emergency=defibrillator + emergency=fire_hydrant: FR:Tag:emergency=fire hydrant + emergency=phone: FR:Tag:emergency=phone + footway=sidewalk: FR:Tag:footway=sidewalk + generator:method=combustion: FR:Tag:generator:method=combustion + generator:method=fission: FR:Tag:generator:method=fission + generator:method=fusion: FR:Tag:generator:method=fusion + generator:method=gasification: FR:Tag:generator:method=gasification + generator:method=photovoltaic: FR:Tag:generator:method=photovoltaic + generator:method=thermal: FR:Tag:generator:method=thermal + generator:source=biofuel: FR:Tag:generator:source=biofuel + generator:source=biogas: FR:Tag:generator:source=biogas + generator:source=biomass: FR:Tag:generator:source=biomass + generator:source=coal: FR:Tag:generator:source=coal + generator:source=gas: FR:Tag:generator:source=gas + generator:source=hydro: FR:Tag:generator:source=hydro + generator:source=nuclear: FR:Tag:generator:source=nuclear + generator:source=oil: FR:Tag:generator:source=oil + generator:source=solar: FR:Tag:generator:source=solar + generator:source=tidal: FR:Tag:generator:source=tidal + generator:source=wind: FR:Tag:generator:source=wind highway=bus_guideway: FR:Tag:highway=bus guideway highway=bus_stop: FR:Tag:highway=bus stop highway=crossing: FR:Tag:highway=crossing highway=cycleway: FR:Tag:highway=cycleway + highway=elevator: FR:Tag:highway=elevator + highway=emergency_access_point: FR:Tag:highway=emergency access point + highway=footway: FR:Tag:highway=footway highway=give_way: FR:Tag:highway=give way + highway=living_street: FR:Tag:highway=living street + highway=mini_roundabout: FR:Tag:highway=mini roundabout highway=motorway: FR:Tag:highway=motorway highway=motorway_link: FR:Tag:highway=motorway link + highway=path: FR:Tag:highway=path + highway=pedestrian: FR:Tag:highway=pedestrian + highway=primary: FR:Tag:highway=primary + highway=raceway: FR:Tag:highway=raceway + highway=residential: FR:Tag:highway=residential + highway=rest_area: FR:Tag:highway=rest area + highway=road: FR:Tag:highway=road + highway=secondary: FR:Tag:highway=secondary + highway=service: FR:Tag:highway=service + highway=services: FR:Tag:highway=services + highway=steps: FR:Tag:highway=steps + highway=stop: FR:Tag:highway=stop + highway=tertiary: FR:Tag:highway=tertiary highway=track: FR:Tag:highway=track + highway=trunk: FR:Tag:highway=trunk + highway=turning_circle: FR:Tag:highway=turning circle + highway=unclassified: FR:Tag:highway=unclassified + historic=battlefield: FR:Tag:historic=battlefield + historic=memorial: FR:Tag:historic=memorial + junction=roundabout: FR:Tag:junction=roundabout + landuse=allotments: FR:Tag:landuse=allotments + landuse=basin: FR:Tag:landuse=basin + landuse=cemetery: FR:Tag:landuse=cemetery + landuse=farm: FR:Tag:landuse=farm + landuse=farmland: FR:Tag:landuse=farmland landuse=farmyard: FR:Tag:landuse=farmyard landuse=forest: FR:Tag:landuse=forest + landuse=grass: FR:Tag:landuse=grass + landuse=orchard: FR:Tag:landuse=orchard + landuse=plant_nursery: FR:Tag:landuse=plant nursery + landuse=pond: FR:Tag:landuse=pond + landuse=residential: FR:Tag:landuse=residential + landuse=salt_pond: FR:Tag:landuse=salt pond + landuse=village_green: FR:Tag:landuse=village green + leisure=dog_park: FR:Tag:leisure=dog park + leisure=golf_course: FR:Tag:leisure=golf course + leisure=park: FR:Tag:leisure=park + leisure=pitch: FR:Tag:leisure=pitch leisure=playground: FR:Tag:leisure=playground + leisure=stadium: FR:Tag:leisure=stadium + leisure=swimming_pool: FR:Tag:leisure=swimming pool + leisure=track: FR:Tag:leisure=track + man_made=adit: FR:Tag:man made=adit man_made=cutline: FR:Tag:man made=cutline + man_made=pier: FR:Tag:man made=pier 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_works: FR:Tag:man made=water works + man_made=watermill: FR:Tag:man made=watermill + man_made=windmill: FR:Tag:man made=windmill + man_made=windpump: FR:Tag:man made=windpump + natural=cliff: FR:Tag:natural=cliff + natural=spring: FR:Tag:natural=spring + natural=stone: FR:Tag:natural=stone natural=tree: FR:Tag:natural=tree + natural=tree_row: FR:Tag:natural=tree row natural=water: FR:Tag:natural=water + natural=wetland: FR:Tag:natural=wetland + office=estate_agent: FR:Tag:office=estate agent + office=ngo: FR:Tag:office=ngo place=city: FR:Tag:place=city place=hamlet: FR:Tag:place=hamlet + place=isolated_dwelling: FR:Tag:place=isolated dwelling place=locality: FR:Tag:place=locality + place=neighbourhood: FR:Tag:place=neighbourhood place=town: FR:Tag:place=town place=village: FR:Tag:place=village power=generator: FR:Tag:power=generator + power=heliostat: FR:Tag:power=heliostat power=line: FR:Tag:power=line + power=minor_line: FR:Tag:power=minor line + power=pole: FR:Tag:power=pole + power=station: FR:Tag:power=station + power=sub_station: FR:Tag:power=sub station power=tower: FR:Tag:power=tower + power=transformer: FR:Tag:power=transformer + public_transport=platform: FR:Tag:public transport=platform + public_transport=station: FR:Tag:public transport=station + railway=level_crossing: FR:Tag:railway=level crossing + railway=rail: FR:Tag:railway=rail railway=station: FR:Tag:railway=station railway=subway_entrance: FR:Tag:railway=subway entrance + route=piste: FR:Tag:route=piste + service=alley: FR:Tag:service=alley + service=parking_aisle: FR:Tag:service=parking aisle + shelter_type=basic_hut: FR:Tag:shelter type=basic hut + shop=alcohol: FR:Tag:shop=alcohol + shop=anime: FR:Tag:shop=anime + shop=baby_goods: FR:Tag:shop=baby goods shop=bakery: FR:Tag:shop=bakery + shop=bathroom_furnishing: FR:Tag:shop=bathroom furnishing + shop=beauty: FR:Tag:shop=beauty + shop=bed: FR:Tag:shop=bed + shop=beverages: FR:Tag:shop=beverages + shop=bicycle: FR:Tag:shop=bicycle + shop=books: FR:Tag:shop=books + shop=boutique: FR:Tag:shop=boutique + shop=butcher: FR:Tag:shop=butcher + shop=car: FR:Tag:shop=car + shop=car_repair: FR:Tag:shop=car repair + shop=carpet: FR:Tag:shop=carpet + shop=charity: FR:Tag:shop=charity + shop=clothes: FR:Tag:shop=clothes + shop=confectionery: FR:Tag:shop=confectionery + shop=convenience: FR:Tag:shop=convenience + shop=copyshop: FR:Tag:shop=copyshop + shop=deli: FR:Tag:shop=deli + shop=dive: FR:Tag:shop=dive + shop=doityourself: FR:Tag:shop=doityourself + shop=farm: FR:Tag:shop=farm + shop=frame: FR:Tag:shop=frame + shop=funeral_directors: FR:Tag:shop=funeral directors + shop=furnace: FR:Tag:shop=furnace + shop=garden_centre: FR:Tag:shop=garden centre + shop=gift: FR:Tag:shop=gift + shop=hairdresser: FR:Tag:shop=hairdresser + shop=hunting: FR:Tag:shop=hunting + shop=kitchen: FR:Tag:shop=kitchen + shop=military_surplus: FR:Tag:shop=military surplus + shop=newsagent: FR:Tag:shop=newsagent + shop=photo: FR:Tag:shop=photo + shop=second_hand: FR:Tag:shop=second hand shop=supermarket: FR:Tag:shop=supermarket + shop=toys: FR:Tag:shop=toys + shop=trade: FR:Tag:shop=trade + shop=video: FR:Tag:shop=video + sport=free_flying: FR:Tag:sport=free flying + sport=shooting: FR:Tag:sport=shooting + tourism=alpine_hut: FR:Tag:tourism=alpine hut + tourism=artwork: FR:Tag:tourism=artwork + tourism=camp_site: FR:Tag:tourism=camp site + tourism=hostel: FR:Tag:tourism=hostel + tourism=hotel: FR:Tag:tourism=hotel + tourism=information: FR:Tag:tourism=information + tourism=viewpoint: FR:Tag:tourism=viewpoint + tunnel=culvert: FR:Tag:tunnel=culvert + type=associatedStreet: FR:Tag:type=associatedStreet + wall=no: FR:Tag:wall=no + waterway=boatyard: FR:Tag:waterway=boatyard + waterway=canal: FR:Tag:waterway=canal + waterway=lock_gate: FR:Tag:waterway=lock gate waterway=river: FR:Tag:waterway=river waterway=riverbank: FR:Tag:waterway=riverbank waterway=stream: FR:Tag:waterway=stream - waterway=weir: FR:Tag:waterway=weir hr: key: + amenity: Hr:Key:amenity + historic: Hr:Key:historic + leisure: Hr:Key:leisure + man_made: Hr:Key:man made + military: Hr:Key:military + natural: Hr:Key:natural + railway: Hr:Key:railway + shop: Hr:Key:shop + tourism: Hr:Key:tourism tracktype: Hr:Key:tracktype tag: amenity=atm: Hr:Tag:amenity=atm + amenity=bank: Hr:Tag:amenity=bank +ht: + key: + intermittent: Ht:Key:intermittent + pump: Ht:Key:pump + tag: + landuse=residential: Ht:Tag:landuse=residential hu: key: - aeroway: HU:Key:aeroway - shop: HU:Key:shop - tourism: HU:Key:tourism + amenity: Hu:Key:amenity + building: Hu:Key:building + jel: Hu:Key:jel + office: Hu:Key:office + symbol: Hu:Key:symbol + wood: Hu:Key:wood + tag: + boundary=administrative: Hu:Tag:boundary=administrative it: key: + abutters: IT:Key:abutters + access: IT:Key:access + addr: IT:Key:addr aerialway: IT:Key:aerialway aeroway: IT:Key:aeroway amenity: IT:Key:amenity barrier: IT:Key:barrier basin: IT:Key:basin + bicycle_parking: IT:Key:bicycle parking boundary: IT:Key:boundary bridge: IT:Key:bridge building: IT:Key:building + cables: IT:Key:cables + circuits: IT:Key:circuits construction: IT:Key:construction + craft: IT:Key:craft cutting: IT:Key:cutting cycleway: IT:Key:cycleway denomination: IT:Key:denomination + ele: IT:Key:ele embankment: IT:Key:embankment enforcement: IT:Key:enforcement + ford: IT:Key:ford + generator:output: IT:Key:generator:output geological: IT:Key:geological highway: IT:Key:highway historic: IT:Key:historic incline: IT:Key:incline + internet_access: IT:Key:internet access junction: IT:Key:junction landuse: IT:Key:landuse + lanes:psv: IT:Key:lanes:psv leisure: IT:Key:leisure lock: IT:Key:lock man_made: IT:Key:man made + maxaxleload: IT:Key:maxaxleload maxheight: IT:Key:maxheight + maxlength: IT:Key:maxlength + maxweight: IT:Key:maxweight maxwidth: IT:Key:maxwidth military: IT:Key:military mooring: IT:Key:mooring + mountain_pass: IT:Key:mountain pass + mtb:scale: IT:Key:mtb:scale name: IT:Key:name natural: IT:Key:natural + noexit: IT:Key:noexit + note: IT:Key:note + operator: IT:Key:operator osmc:symbol: IT:Key:osmc:symbol + parking:lane:both: IT:Key:parking:lane:both passing_places: IT:Key:passing places place: IT:Key:place + playground: IT:Key:playground power: IT:Key:power proposed: IT:Key:proposed railway: IT:Key:railway ref: IT:Key:ref + ref:vatin: IT:Key:ref:vatin religion: IT:Key:religion route: IT:Key:route sac_scale: IT:Key:sac scale service: IT:Key:service - shop: IT:Key:shop + smoothness: IT:Key:smoothness sport: IT:Key:sport stop: IT:Key:stop + summit:cross: IT:Key:summit:cross + surveillance: IT:Key:surveillance tourism: IT:Key:tourism tracktype: IT:Key:tracktype traffic_calming: IT:Key:traffic calming trail_visibility: IT:Key:trail visibility tunnel: IT:Key:tunnel type: IT:Key:type + voltage: IT:Key:voltage waterway: IT:Key:waterway wheelchair: IT:Key:wheelchair width: IT:Key:width + wires: IT:Key:wires tag: + amenity=animal_boarding: IT:Tag:amenity=animal boarding + amenity=animal_breeding: IT:Tag:amenity=animal breeding + amenity=animal_shelter: IT:Tag:amenity=animal shelter + amenity=bar: IT:Tag:amenity=bar amenity=bicycle_rental: IT:Tag:amenity=bicycle rental + amenity=cinema: IT:Tag:amenity=cinema amenity=college: IT:Tag:amenity=college amenity=fountain: IT:Tag:amenity=fountain amenity=fuel: IT:Tag:amenity=fuel amenity=hospital: IT:Tag:amenity=hospital + amenity=hunting_stand: IT:Tag:amenity=hunting stand + amenity=ice_cream: IT:Tag:amenity=ice cream amenity=kindergarten: IT:Tag:amenity=kindergarten + amenity=milk_dispenser: IT:Tag:amenity=milk dispenser amenity=parking: IT:Tag:amenity=parking 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=recycling: IT:Tag:amenity=recycling amenity=school: IT:Tag:amenity=school + amenity=spa: IT:Tag:amenity=spa amenity=university: IT:Tag:amenity=university amenity=waste_basket: IT:Tag:amenity=waste basket + barrier=ditch: IT:Tag:barrier=ditch + barrier=fence: IT:Tag:barrier=fence barrier=toll_booth: IT:Tag:barrier=toll booth + footway=crossing: IT:Tag:footway=crossing + footway=sidewalk: IT:Tag:footway=sidewalk geological=palaeontological_site: IT:Tag:geological=palaeontological site highway=cycleway: IT:Tag:highway=cycleway + highway=footway: IT:Tag:highway=footway highway=ford: IT:Tag:highway=ford highway=mini_roundabout: IT:Tag:highway=mini roundabout highway=motorway: IT:Tag:highway=motorway highway=motorway_link: IT:Tag:highway=motorway link + highway=path: IT:Tag:highway=path highway=pedestrian: IT:Tag:highway=pedestrian highway=primary: IT:Tag:highway=primary highway=primary_link: IT:Tag:highway=primary link + highway=residential: IT:Tag:highway=residential + highway=rest_area: IT:Tag:highway=rest area + highway=secondary: IT:Tag:highway=secondary + highway=services: IT:Tag:highway=services + highway=tertiary: IT:Tag:highway=tertiary + highway=track: IT:Tag:highway=track highway=trunk: IT:Tag:highway=trunk highway=trunk_link: IT:Tag:highway=trunk link historic=paleontological_site: IT:Tag:historic=paleontological site + historic=wayside_shrine: IT:Tag:historic=wayside shrine junction=roundabout: IT:Tag:junction=roundabout landuse=construction: IT:Tag:landuse=construction leisure=beach_resort: IT:Tag:leisure=beach resort leisure=dog_park: IT:Tag:leisure=dog park leisure=marina: IT:Tag:leisure=marina + leisure=playground: IT:Tag:leisure=playground + leisure=swimming_pool: IT:Tag:leisure=swimming pool + man_made=mast: IT:Tag:man made=mast + natural=grassland: IT:Tag:natural=grassland + natural=scree: IT:Tag:natural=scree + natural=spring: IT:Tag:natural=spring + natural=wetland: IT:Tag:natural=wetland + place=village: IT:Tag:place=village + power=cable: IT:Tag:power=cable + power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet + power=generator: IT:Tag:power=generator + power=line: IT:Tag:power=line + power=plant: IT:Tag:power=plant + power=pole: IT:Tag:power=pole + power=substation: IT:Tag:power=substation + power=tower: IT:Tag:power=tower + power=transformer: IT:Tag:power=transformer railway=level_crossing: IT:Tag:railway=level crossing + route=bus: IT:Tag:route=bus shop=butcher: IT:Tag:shop=butcher shop=car: IT:Tag:shop=car shop=clothes: IT:Tag:shop=clothes + shop=confectionery: IT:Tag:shop=confectionery shop=florist: IT:Tag:shop=florist + shop=greengrocer: IT:Tag:shop=greengrocer + shop=hifi: IT:Tag:shop=hifi + shop=kiosk: IT:Tag:shop=kiosk + shop=mall: IT:Tag:shop=mall shop=newsagent: IT:Tag:shop=newsagent + shop=tobacco: IT:Tag:shop=tobacco + sport=surfing: IT:Tag:sport=surfing tourism=artwork: IT:Tag:tourism=artwork + waterway=stream: IT:Tag:waterway=stream ja: key: - abutters: JA:Key:abutters access: JA:Key:access + addr: JA:Key:addr aerialway: JA:Key:aerialway - aeroway: JA:Key:aeroway - amenity: JA:Key:amenity - barrier: JA:Key:barrier - boundary: JA:Key:boundary + area: JA:Key:area + books: JA:Key:books + brand: JA:Key:brand bridge: JA:Key:bridge building: JA:Key:building + building:material: JA:Key:building:material + building:part: JA:Key:building:part + building:parts: JA:Key:building:parts + capacity: JA:Key:capacity + clothes: JA:Key:clothes + contact: JA:Key:contact crossing: JA:Key:crossing cuisine: JA:Key:cuisine cycleway: JA:Key:cycleway + denomination: JA:Key:denomination + description: JA:Key:description + diet:*: JA:Key:diet:* + disused: JA:Key:disused + drive_in: JA:Key:drive in + drive_through: JA:Key:drive through + easy_overtaking: JA:Key:easy overtaking electrified: JA:Key:electrified + emergency: JA:Key:emergency + end_date: JA:Key:end date + fee: JA:Key:fee fixme: JA:Key:fixme foot: JA:Key:foot - highway: JA:Key:highway - historic: JA:Key:historic + footway: JA:Key:footway + furniture: JA:Key:furniture + geological: JA:Key:geological + hazard_type: JA:Key:hazard type + height: JA:Key:height incline: JA:Key:incline - information: JA:Key:information - internet_access: JA:Key:internet access - landuse: JA:Key:landuse lanes: JA:Key:lanes - leisure: JA:Key:leisure - man_made: JA:Key:man made - military: JA:Key:military + level: JA:Key:level + lit: JA:Key:lit + mountain_pass: JA:Key:mountain pass name: JA:Key:name - natural: JA:Key:natural + note: JA:Key:note + oneway: JA:Key:oneway + opening_hours: JA:Key:opening hours operator: JA:Key:operator + overtaking: JA:Key:overtaking phone: JA:Key:phone power: JA:Key:power power_source: JA:Key:power source - railway: JA:Key:railway + public_transport: JA:Key:public transport ref: JA:Key:ref - route: JA:Key:route - shop: JA:Key:shop + religion: JA:Key:religion + roof:material: JA:Key:roof:material + room: JA:Key:room + seamark:fixme: JA:Key:seamark:fixme + segregated: JA:Key:segregated + social_facility: JA:Key:social facility + sport: JA:Key:sport + start_date: JA:Key:start date step_count: JA:Key:step count surface: JA:Key:surface tactile_paving: JA:Key:tactile paving - tourism: JA:Key:tourism + takeaway: JA:Key:takeaway tracktype: JA:Key:tracktype type: JA:Key:type - waterway: JA:Key:waterway + url: JA:Key:url + website: JA:Key:website wheelchair: JA:Key:wheelchair + width: JA:Key:width wikipedia: JA:Key:wikipedia + winter_road: JA:Key:winter road wood: JA:Key:wood tag: - amenity=arts_centre: JA:Tag:amenity=arts centre + abandoned=yes: JA:Tag:abandoned=yes + access=designated: JA:Tag:access=designated + aeroway=apron: JA:Tag:aeroway=apron + aeroway=helipad: JA:Tag:aeroway=helipad + aeroway=runway: JA:Tag:aeroway=runway + aeroway=taxiway: JA:Tag:aeroway=taxiway amenity=baby_hatch: JA:Tag:amenity=baby hatch + amenity=bank: JA:Tag:amenity=bank + amenity=bbq: JA:Tag:amenity=bbq + amenity=bench: JA:Tag:amenity=bench + amenity=bicycle_parking: JA:Tag:amenity=bicycle parking + amenity=bicycle_rental: JA:Tag:amenity=bicycle rental + amenity=biergarten: JA:Tag:amenity=biergarten + amenity=boat_storage: JA:Tag:amenity=boat storage + amenity=brothel: JA:Tag:amenity=brothel + amenity=bureau_de_change: JA:Tag:amenity=bureau de change amenity=bus_station: JA:Tag:amenity=bus station - amenity=cafe: JA:Tag:amenity=cafe - amenity=crematorium: JA:Tag:amenity=crematorium - amenity=drinking_water: JA:Tag:amenity=drinking water - amenity=fast_food: JA:Tag:amenity=fast food + amenity=car_rental: JA:Tag:amenity=car rental + amenity=car_wash: JA:Tag:amenity=car wash + amenity=clock: JA:Tag:amenity=clock + amenity=college: JA:Tag:amenity=college + amenity=courthouse: JA:Tag:amenity=courthouse + amenity=dentist: JA:Tag:amenity=dentist + amenity=embassy: JA:Tag:amenity=embassy + amenity=ferry_terminal: JA:Tag:amenity=ferry terminal amenity=fire_station: JA:Tag:amenity=fire station + amenity=food_court: JA:Tag:amenity=food court + amenity=fountain: JA:Tag:amenity=fountain + amenity=grave_yard: JA:Tag:amenity=grave yard + amenity=hunting_stand: JA:Tag:amenity=hunting stand + amenity=kindergarten: JA:Tag:amenity=kindergarten + amenity=library: JA:Tag:amenity=library + amenity=nightclub: JA:Tag:amenity=nightclub + amenity=nursing_home: JA:Tag:amenity=nursing home amenity=parking: JA:Tag:amenity=parking - amenity=place_of_worship: JA:Tag:amenity=place of worship - amenity=pub: JA:Tag:amenity=pub + amenity=parking_entrance: JA:Tag:amenity=parking entrance + amenity=parking_space: JA:Tag:amenity=parking space + amenity=pharmacy: JA:Tag:amenity=pharmacy + amenity=police: JA:Tag:amenity=police + amenity=post_box: JA:Tag:amenity=post box + amenity=post_office: JA:Tag:amenity=post office + amenity=recycling: JA:Tag:amenity=recycling amenity=restaurant: JA:Tag:amenity=restaurant - amenity=toilets: JA:Tag:amenity=toilets - amenity=vending_machine: JA:Tag:amenity=vending machine - amenity=veterinary: JA:Tag:amenity=veterinary + amenity=sauna: JA:Tag:amenity=sauna + amenity=shelter: JA:Tag:amenity=shelter + amenity=social_centre: JA:Tag:amenity=social centre + amenity=stripclub: JA:Tag:amenity=stripclub + amenity=studio: JA:Tag:amenity=studio + amenity=taxi: JA:Tag:amenity=taxi + amenity=university: JA:Tag:amenity=university + amenity=waste_basket: JA:Tag:amenity=waste basket + amenity=waste_disposal: JA:Tag:amenity=waste disposal + amenity=watering_place: JA:Tag:amenity=watering place + atm=yes: JA:Tag:atm=yes + barrier=bollard: JA:Tag:barrier=bollard + barrier=fence: JA:Tag:barrier=fence barrier=lift_gate: JA:Tag:barrier=lift gate + barrier=toll_booth: JA:Tag:barrier=toll booth + boundary=administrative: JA:Tag:boundary=administrative + boundary=national_park: JA:Tag:boundary=national park + boundary=protected_area: JA:Tag:boundary=protected area + bridge=viaduct: JA:Tag:bridge=viaduct + craft=brewery: JA:Tag:craft=brewery + emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher + emergency=fire_hydrant: JA:Tag:emergency=fire hydrant highway=crossing: JA:Tag:highway=crossing - highway=footway: JA:Tag:highway=footway - highway=pedestrian: JA:Tag:highway=pedestrian + highway=cycleway: JA:Tag:highway=cycleway + highway=motorway_link: JA:Tag:highway=motorway link + highway=path: JA:Tag:highway=path highway=residential: JA:Tag:highway=residential - highway=steps: JA:Tag:highway=steps + highway=rest_area: JA:Tag:highway=rest area + highway=road: JA:Tag:highway=road + highway=secondary: JA:Tag:highway=secondary + highway=services: JA:Tag:highway=services + highway=tertiary: JA:Tag:highway=tertiary highway=track: JA:Tag:highway=track highway=traffic_signals: JA:Tag:highway=traffic signals + highway=trunk: JA:Tag:highway=trunk + highway=unclassified: JA:Tag:highway=unclassified historic=archaeological_site: JA:Tag:historic=archaeological site + historic=battlefield: JA:Tag:historic=battlefield + historic=boundary_stone: JA:Tag:historic=boundary stone + historic=monument: JA:Tag:historic=monument + information=guidepost: JA:Tag:information=guidepost + landuse=allotments: JA:Tag:landuse=allotments + landuse=basin: JA:Tag:landuse=basin + landuse=brownfield: JA:Tag:landuse=brownfield + landuse=cemetery: JA:Tag:landuse=cemetery + landuse=commercial: JA:Tag:landuse=commercial + landuse=construction: JA:Tag:landuse=construction + landuse=farmyard: JA:Tag:landuse=farmyard landuse=forest: JA:Tag:landuse=forest landuse=garages: JA:Tag:landuse=garages + landuse=grass: JA:Tag:landuse=grass + landuse=greenfield: JA:Tag:landuse=greenfield + landuse=industrial: JA:Tag:landuse=industrial + landuse=landfill: JA:Tag:landuse=landfill + landuse=meadow: JA:Tag:landuse=meadow + landuse=military: JA:Tag:landuse=military + landuse=orchard: JA:Tag:landuse=orchard + landuse=plant_nursery: JA:Tag:landuse=plant nursery + landuse=quarry: JA:Tag:landuse=quarry + landuse=railway: JA:Tag:landuse=railway + landuse=recreation_ground: JA:Tag:landuse=recreation ground + landuse=reservoir: JA:Tag:landuse=reservoir + landuse=residential: JA:Tag:landuse=residential + landuse=retail: JA:Tag:landuse=retail + landuse=salt_pond: JA:Tag:landuse=salt pond + landuse=village_green: JA:Tag:landuse=village green landuse=wood: JA:Tag:landuse=wood + leisure=beach_resort: JA:Tag:leisure=beach resort + leisure=bird_hide: JA:Tag:leisure=bird hide + leisure=dance: JA:Tag:leisure=dance leisure=dog_park: JA:Tag:leisure=dog park - leisure=ice_rink: JA:Tag:leisure=ice rink + leisure=garden: JA:Tag:leisure=garden + leisure=golf_course: JA:Tag:leisure=golf course + leisure=marina: JA:Tag:leisure=marina + leisure=miniature_golf: JA:Tag:leisure=miniature golf + leisure=nature_reserve: JA:Tag:leisure=nature reserve + leisure=playground: JA:Tag:leisure=playground + leisure=slipway: JA:Tag:leisure=slipway + leisure=sports_centre: JA:Tag:leisure=sports centre + leisure=swimming_pool: JA:Tag:leisure=swimming pool + leisure=track: JA:Tag:leisure=track + man_made=adit: JA:Tag:man made=adit + man_made=breakwater: JA:Tag:man made=breakwater + man_made=crane: JA:Tag:man made=crane + man_made=cutline: JA:Tag:man made=cutline + man_made=flagpole: JA:Tag:man made=flagpole + man_made=groyne: JA:Tag:man made=groyne + man_made=kiln: JA:Tag:man made=kiln man_made=lighthouse: JA:Tag:man made=lighthouse - natural=coastline: JA:Tag:natural=coastline + man_made=mineshaft: JA:Tag:man made=mineshaft + man_made=pier: JA:Tag:man made=pier + man_made=tower: JA:Tag:man made=tower + man_made=water_well: JA:Tag:man made=water well + man_made=works: JA:Tag:man made=works + natural=heath: JA:Tag:natural=heath + natural=scree: JA:Tag:natural=scree + natural=tree_row: JA:Tag:natural=tree row natural=wood: JA:Tag:natural=wood + place=island: JA:Tag:place=island + place=islet: JA:Tag:place=islet + place=neighbourhood: JA:Tag:place=neighbourhood + place=suburb: JA:Tag:place=suburb power=generator: JA:Tag:power=generator + public_transport=platform: JA:Tag:public transport=platform railway=crossing: JA:Tag:railway=crossing railway=level_crossing: JA:Tag:railway=level crossing railway=rail: JA:Tag:railway=rail - railway=station: JA:Tag:railway=station + railway=tram: JA:Tag:railway=tram + route=road: JA:Tag:route=road + service=parking_aisle: JA:Tag:service=parking aisle + shop=alcohol: JA:Tag:shop=alcohol + shop=art: JA:Tag:shop=art + shop=bakery: JA:Tag:shop=bakery + shop=beauty: JA:Tag:shop=beauty + shop=bicycle: JA:Tag:shop=bicycle + shop=books: JA:Tag:shop=books + shop=boutique: JA:Tag:shop=boutique + shop=charity: JA:Tag:shop=charity + shop=chemist: JA:Tag:shop=chemist + shop=clothes: JA:Tag:shop=clothes + shop=confectionery: JA:Tag:shop=confectionery + shop=convenience: JA:Tag:shop=convenience + shop=deli: JA:Tag:shop=deli + shop=department_store: JA:Tag:shop=department store shop=doityourself: JA:Tag:shop=doityourself - shop=garden_centre: JA:Tag:shop=garden centre - shop=gift: JA:Tag:shop=gift + shop=florist: JA:Tag:shop=florist + shop=general: JA:Tag:shop=general + shop=hairdresser: JA:Tag:shop=hairdresser shop=motorcycle: JA:Tag:shop=motorcycle - shop=outdoor: JA:Tag:shop=outdoor - tourism=hostel: JA:Tag:tourism=hostel + shop=pet: JA:Tag:shop=pet + shop=second_hand: JA:Tag:shop=second hand + shop=supermarket: JA:Tag:shop=supermarket + shop=tobacco: JA:Tag:shop=tobacco tourism=hotel: JA:Tag:tourism=hotel - tourism=information: JA:Tag:tourism=information - tourism=viewpoint: JA:Tag:tourism=viewpoint - waterway=riverbank: JA:Tag:waterway=riverbank + tourism=museum: JA:Tag:tourism=museum + tourism=picnic_site: JA:Tag:tourism=picnic site + waterway=dam: JA:Tag:waterway=dam + waterway=ditch: JA:Tag:waterway=ditch + waterway=drain: JA:Tag:waterway=drain waterway=water_point: JA:Tag:waterway=water point + waterway=weir: JA:Tag:waterway=weir +ko: + key: + ele: Ko:Key:ele + wikipedia: Ko:Key:wikipedia + tag: + craft=tailor: Ko:Tag:craft=tailor + shop=garden_centre: Ko:Tag:shop=garden centre + shop=gift: Ko:Tag:shop=gift nl: key: - cycleway: NL:Key:cycleway + AND_nosr_r: NL:Key:AND nosr r + crossing: NL:Key:crossing + scenic: NL:Key:scenic + wheelchair: NL:Key:wheelchair tag: - highway=motorway: NL:Tag:highway=motorway - landuse=industrial: NL:Tag:landuse=industrial - shop=car: NL:Tag:shop=car - zoo=petting_zoo: NL:Tag:zoo=petting zoo + amenity=post_office: NL:Tag:amenity=post office + highway=footway: NL:Tag:highway=footway + highway=path: NL:Tag:highway=path + man_made=windmill: NL:Tag:man made=windmill no: key: amenity: No:Key:amenity boundary: No:Key:boundary + building: No:Key:building fenced: No:Key:fenced maxheight:legal: No:Key:maxheight:legal maxheight:marine: No:Key:maxheight:marine maxheight:physical: No:Key:maxheight:physical tag: amenity=bank: No:Tag:amenity=bank + amenity=fuel: No:Tag:amenity=fuel amenity=marketplace: No:Tag:amenity=marketplace amenity=pharmacy: No:Tag:amenity=pharmacy amenity=place_of_worship: No:Tag:amenity=place of worship boundary=maritime: No:Tag:boundary=maritime pl: key: + abutters: Pl:Key:abutters + access: Pl:Key:access + addr: Pl:Key:addr + addr:flats: Pl:Key:addr:flats + addr:place: Pl:Key:addr:place + addr:suburb: Pl:Key:addr:suburb + aerialway: Pl:Key:aerialway + aeroway: Pl:Key:aeroway + amenity: Pl:Key:amenity + area: Pl:Key:area + automatic_door: Pl:Key:automatic door + backrest: Pl:Key:backrest + bar: Pl:Key:bar + barrier: Pl:Key:barrier + bench: Pl:Key:bench + bicycle: Pl:Key:bicycle + bicycle_parking: Pl:Key:bicycle parking + bicycle_road: Pl:Key:bicycle road + bollard: Pl:Key:bollard + border_type: Pl:Key:border type + boundary: Pl:Key:boundary + brand: Pl:Key:brand + bridge: Pl:Key:bridge + building: Pl:Key:building + building:cullis:height: Pl:Key:building:cullis:height + building:levels: Pl:Key:building:levels + building:material: Pl:Key:building:material + building:min_level: Pl:Key:building:min level + building:part: Pl:Key:building:part + bunker_type: Pl:Key:bunker type + busway: Pl:Key:busway + capacity: Pl:Key:capacity + circumference: Pl:Key:circumference + colour: Pl:Key:colour + comment: Pl:Key:comment + construction: Pl:Key:construction + contact: Pl:Key:contact + covered: Pl:Key:covered + crop: Pl:Key:crop + crossing: Pl:Key:crossing + cutting: Pl:Key:cutting + deanery: Pl:Key:deanery + denomination: Pl:Key:denomination + denotation: Pl:Key:denotation + designation: Pl:Key:designation + destination: Pl:Key:destination + diocese: Pl:Key:diocese + ele: Pl:Key:ele + embankment: Pl:Key:embankment + emergency: Pl:Key:emergency + entrance: Pl:Key:entrance + fee: Pl:Key:fee + fixme: Pl:Key:fixme + foot: Pl:Key:foot + footway: Pl:Key:footway + generator:output: Pl:Key:generator:output height: Pl:Key:height + highway: Pl:Key:highway + historic: Pl:Key:historic + information: Pl:Key:information + inscription: Pl:Key:inscription + intermittent: Pl:Key:intermittent + is_in: Pl:Key:is in + junction: Pl:Key:junction + kerb: Pl:Key:kerb + landuse: Pl:Key:landuse + lanes: Pl:Key:lanes + lanes:psv: Pl:Key:lanes:psv + leisure: Pl:Key:leisure + lit: Pl:Key:lit + location: Pl:Key:location + lock: Pl:Key:lock + lock_name: Pl:Key:lock name + man_made: Pl:Key:man made + manhole: Pl:Key:manhole + maxheight: Pl:Key:maxheight + maxspeed: Pl:Key:maxspeed + maxstay: Pl:Key:maxstay + mooring: Pl:Key:mooring + name: Pl:Key:name + natural: Pl:Key:natural + noexit: Pl:Key:noexit + note: Pl:Key:note + office: Pl:Key:office oneway: Pl:Key:oneway + opening_hours: Pl:Key:opening hours + operator: Pl:Key:operator + overtaking: Pl:Key:overtaking + owner: Pl:Key:owner + ownership: Pl:Key:ownership + parking: Pl:Key:parking + parking:lane: Pl:Key:parking:lane + place: Pl:Key:place + place_name: Pl:Key:place name + power: Pl:Key:power + psv: Pl:Key:psv + public_transport: Pl:Key:public transport + railway: Pl:Key:railway + railway:area: Pl:Key:railway:area + ramp: Pl:Key:ramp + recycling_type: Pl:Key:recycling type + religion: Pl:Key:religion + roof:material: Pl:Key:roof:material + route: Pl:Key:route + route_master: Pl:Key:route master + sac_scale: Pl:Key:sac scale + seamark:fixme: Pl:Key:seamark:fixme + service: Pl:Key:service + service_times: Pl:Key:service times + shop: Pl:Key:shop + sidewalk: Pl:Key:sidewalk + step_count: Pl:Key:step count + surface: Pl:Key:surface + surveillance: Pl:Key:surveillance + surveillance:type: Pl:Key:surveillance:type + surveillance:zone: Pl:Key:surveillance:zone + tomb: Pl:Key:tomb + tourism: Pl:Key:tourism + tracktype: Pl:Key:tracktype + traffic_calming: Pl:Key:traffic calming + turn: Pl:Key:turn + type: Pl:Key:type + url: Pl:Key:url + usage: Pl:Key:usage + voltage: Pl:Key:voltage + waterway: Pl:Key:waterway + website: Pl:Key:website + wheelchair: Pl:Key:wheelchair + wikipedia: Pl:Key:wikipedia + wood: Pl:Key:wood + zoo: Pl:Key:zoo + tag: + access=designated: Pl:Tag:access=designated + access=official: Pl:Tag:access=official + access=private: Pl:Tag:access=private + aeroway=hangar: Pl:Tag:aeroway=hangar + amenity=atm: Pl:Tag:amenity=atm + amenity=baby_hatch: Pl:Tag:amenity=baby hatch + amenity=bank: Pl:Tag:amenity=bank + amenity=bench: Pl:Tag:amenity=bench + amenity=bicycle_parking: Pl:Tag:amenity=bicycle parking + amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental + amenity=brothel: Pl:Tag:amenity=brothel + amenity=compressed_air: Pl:Tag:amenity=compressed air + amenity=crypt: Pl:Tag:amenity=crypt + amenity=doctors: Pl:Tag:amenity=doctors + amenity=drinking_water: Pl:Tag:amenity=drinking water + amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal + amenity=fire_station: Pl:Tag:amenity=fire station + amenity=fuel: Pl:Tag:amenity=fuel + amenity=grave_yard: Pl:Tag:amenity=grave yard + amenity=parking: Pl:Tag:amenity=parking + amenity=parking_entrance: Pl:Tag:amenity=parking entrance + amenity=parking_space: Pl:Tag:amenity=parking space + amenity=pharmacy: Pl:Tag:amenity=pharmacy + amenity=place_of_worship: Pl:Tag:amenity=place of worship + amenity=post_box: Pl:Tag:amenity=post box + amenity=post_office: Pl:Tag:amenity=post office + amenity=recycling: Pl:Tag:amenity=recycling + amenity=school: Pl:Tag:amenity=school + amenity=taxi: Pl:Tag:amenity=taxi + amenity=vending_machine: Pl:Tag:amenity=vending machine + amenity=waste_disposal: Pl:Tag:amenity=waste disposal + atm=yes: Pl:Tag:atm=yes + barrier=block: Pl:Tag:barrier=block + barrier=bollard: Pl:Tag:barrier=bollard + barrier=bus_trap: Pl:Tag:barrier=bus trap + barrier=cattle_grid: Pl:Tag:barrier=cattle grid + barrier=chain: Pl:Tag:barrier=chain + barrier=city_wall: Pl:Tag:barrier=city wall + barrier=cycle_barrier: Pl:Tag:barrier=cycle barrier + barrier=ditch: Pl:Tag:barrier=ditch + barrier=entrance: Pl:Tag:barrier=entrance + barrier=fence: Pl:Tag:barrier=fence + barrier=gate: Pl:Tag:barrier=gate + barrier=guard_rail: Pl:Tag:barrier=guard rail + barrier=hedge: Pl:Tag:barrier=hedge + barrier=kerb: Pl:Tag:barrier=kerb + barrier=lift_gate: Pl:Tag:barrier=lift gate + barrier=retaining_wall: Pl:Tag:barrier=retaining wall + barrier=toll_booth: Pl:Tag:barrier=toll booth + barrier=turnstile: Pl:Tag:barrier=turnstile + barrier=wall: Pl:Tag:barrier=wall + boundary=administrative: Pl:Tag:boundary=administrative + boundary=religious_administration: Pl:Tag:boundary=religious administration + building=apartments: Pl:Tag:building=apartments + building=barn: Pl:Tag:building=barn + building=bridge: Pl:Tag:building=bridge + building=bunker: Pl:Tag:building=bunker + building=cabin: Pl:Tag:building=cabin + building=chapel: Pl:Tag:building=chapel + building=church: Pl:Tag:building=church + building=civic: Pl:Tag:building=civic + building=commercial: Pl:Tag:building=commercial + building=construction: Pl:Tag:building=construction + building=detached: Pl:Tag:building=detached + building=dormitory: Pl:Tag:building=dormitory + building=farm_auxiliary: Pl:Tag:building=farm auxiliary + building=garage: Pl:Tag:building=garage + building=garages: Pl:Tag:building=garages + building=greenhouse: Pl:Tag:building=greenhouse + building=hangar: Pl:Tag:building=hangar + building=hospital: Pl:Tag:building=hospital + building=hotel: Pl:Tag:building=hotel + building=house: Pl:Tag:building=house + building=hut: Pl:Tag:building=hut + building=industrial: Pl:Tag:building=industrial + building=manufacture: Pl:Tag:building=manufacture + building=office: Pl:Tag:building=office + building=public: Pl:Tag:building=public + building=residential: Pl:Tag:building=residential + building=retail: Pl:Tag:building=retail + building=roof: Pl:Tag:building=roof + building=school: Pl:Tag:building=school + building=shed: Pl:Tag:building=shed + building=supermarket: Pl:Tag:building=supermarket + building=terrace: Pl:Tag:building=terrace + building=train_station: Pl:Tag:building=train station + building=transportation: Pl:Tag:building=transportation + building=university: Pl:Tag:building=university + building=warehouse: Pl:Tag:building=warehouse + emergency=defibrillator: Pl:Tag:emergency=defibrillator + emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher + emergency=fire_flapper: Pl:Tag:emergency=fire flapper + emergency=fire_hose: Pl:Tag:emergency=fire hose + emergency=fire_hydrant: Pl:Tag:emergency=fire hydrant + emergency=fire_water_pond: Pl:Tag:emergency=fire water pond + emergency=suction_point: Pl:Tag:emergency=suction point + emergency=water_tank: Pl:Tag:emergency=water tank + footway=crossing: Pl:Tag:footway=crossing + footway=sidewalk: Pl:Tag:footway=sidewalk + highway=bridleway: Pl:Tag:highway=bridleway + highway=bus_stop: Pl:Tag:highway=bus stop + highway=crossing: Pl:Tag:highway=crossing + highway=cycleway: Pl:Tag:highway=cycleway + highway=footway: Pl:Tag:highway=footway + highway=give_way: Pl:Tag:highway=give way + highway=living_street: Pl:Tag:highway=living street + highway=milestone: Pl:Tag:highway=milestone + highway=motorway: Pl:Tag:highway=motorway + highway=path: Pl:Tag:highway=path + highway=pedestrian: Pl:Tag:highway=pedestrian + highway=primary: Pl:Tag:highway=primary + highway=proposed: Pl:Tag:highway=proposed + highway=raceway: Pl:Tag:highway=raceway + highway=residential: Pl:Tag:highway=residential + highway=road: Pl:Tag:highway=road + highway=secondary: Pl:Tag:highway=secondary + highway=service: Pl:Tag:highway=service + highway=speed_camera: Pl:Tag:highway=speed camera + highway=street_lamp: Pl:Tag:highway=street lamp + highway=tertiary: Pl:Tag:highway=tertiary + highway=track: Pl:Tag:highway=track + highway=trunk: Pl:Tag:highway=trunk + highway=unclassified: Pl:Tag:highway=unclassified + historic=battlefield: Pl:Tag:historic=battlefield + historic=city_gate: Pl:Tag:historic=city gate + historic=memorial: Pl:Tag:historic=memorial + historic=monument: Pl:Tag:historic=monument + historic=ruins: Pl:Tag:historic=ruins + historic=tomb: Pl:Tag:historic=tomb + historic=wayside_shrine: Pl:Tag:historic=wayside shrine + information=guidepost: Pl:Tag:information=guidepost + junction=roundabout: Pl:Tag:junction=roundabout + landuse=allotments: Pl:Tag:landuse=allotments + landuse=brownfield: Pl:Tag:landuse=brownfield + landuse=cemetery: Pl:Tag:landuse=cemetery + landuse=farm: Pl:Tag:landuse=farm + landuse=farmyard: Pl:Tag:landuse=farmyard + landuse=forest: Pl:Tag:landuse=forest + landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture + landuse=landfill: Pl:Tag:landuse=landfill + landuse=meadow: Pl:Tag:landuse=meadow + landuse=plant_nursery: Pl:Tag:landuse=plant nursery + landuse=quarry: Pl:Tag:landuse=quarry + landuse=railway: Pl:Tag:landuse=railway + landuse=religious: Pl:Tag:landuse=religious + leisure=firepit: Pl:Tag:leisure=firepit + leisure=fishing: Pl:Tag:leisure=fishing + man_made=cross: Pl:Tag:man made=cross + man_made=cutline: Pl:Tag:man made=cutline + man_made=dyke: Pl:Tag:man made=dyke + man_made=embankment: Pl:Tag:man made=embankment + man_made=surveillance: Pl:Tag:man made=surveillance + man_made=tower: Pl:Tag:man made=tower + man_made=watermill: Pl:Tag:man made=watermill + man_made=windmill: Pl:Tag:man made=windmill + mooring=ferry: Pl:Tag:mooring=ferry + natural=bay: Pl:Tag:natural=bay + natural=cave_entrance: Pl:Tag:natural=cave entrance + natural=grassland: Pl:Tag:natural=grassland + natural=heath: Pl:Tag:natural=heath + natural=scrub: Pl:Tag:natural=scrub + natural=sinkhole: Pl:Tag:natural=sinkhole + natural=tree: Pl:Tag:natural=tree + natural=tree_row: Pl:Tag:natural=tree row + natural=wetland: Pl:Tag:natural=wetland + natural=wood: Pl:Tag:natural=wood + place=city: Pl:Tag:place=city + place=farm: Pl:Tag:place=farm + place=hamlet: Pl:Tag:place=hamlet + place=isolated_dwelling: Pl:Tag:place=isolated dwelling + place=locality: Pl:Tag:place=locality + place=neighbourhood: Pl:Tag:place=neighbourhood + place=suburb: Pl:Tag:place=suburb + place=town: Pl:Tag:place=town + place=village: Pl:Tag:place=village + power=generator: Pl:Tag:power=generator + power=line: Pl:Tag:power=line + power=minor_line: Pl:Tag:power=minor line + power=pole: Pl:Tag:power=pole + power=sub_station: Pl:Tag:power=sub station + power=tower: Pl:Tag:power=tower + power=transformer: Pl:Tag:power=transformer + public_transport=platform: Pl:Tag:public transport=platform + public_transport=stop_area: Pl:Tag:public transport=stop area + public_transport=stop_position: Pl:Tag:public transport=stop position + railway=abandoned: Pl:Tag:railway=abandoned + railway=crossing: Pl:Tag:railway=crossing + railway=crossing_controller: Pl:Tag:railway=crossing controller + railway=level_crossing: Pl:Tag:railway=level crossing + service=alley: Pl:Tag:service=alley + service=drive-through: Pl:Tag:service=drive-through + service=driveway: Pl:Tag:service=driveway + service=emergency_access: Pl:Tag:service=emergency access + service=parking_aisle: Pl:Tag:service=parking aisle + service=parts: Pl:Tag:service=parts + service=siding: Pl:Tag:service=siding + service=spur: Pl:Tag:service=spur + service=yard: Pl:Tag:service=yard + shop=baby_goods: Pl:Tag:shop=baby goods + shop=bicycle: Pl:Tag:shop=bicycle + shop=funeral_directors: Pl:Tag:shop=funeral directors + sport=aikido: Pl:Tag:sport=aikido + tourism=artwork: Pl:Tag:tourism=artwork + tourism=camp_site: Pl:Tag:tourism=camp site + tourism=caravan_site: Pl:Tag:tourism=caravan site + tourism=chalet: Pl:Tag:tourism=chalet + tourism=guest_house: Pl:Tag:tourism=guest house + tourism=hostel: Pl:Tag:tourism=hostel + tourism=hotel: Pl:Tag:tourism=hotel + tourism=information: Pl:Tag:tourism=information + tourism=motel: Pl:Tag:tourism=motel + tourism=museum: Pl:Tag:tourism=museum + tourism=picnic_site: Pl:Tag:tourism=picnic site + tourism=theme_park: Pl:Tag:tourism=theme park + tourism=viewpoint: Pl:Tag:tourism=viewpoint + tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut + tourism=zoo: Pl:Tag:tourism=zoo + tunnel=culvert: Pl:Tag:tunnel=culvert + type=public_transport: Pl:Tag:type=public transport + waterway=boatyard: Pl:Tag:waterway=boatyard + waterway=canal: Pl:Tag:waterway=canal + waterway=dam: Pl:Tag:waterway=dam + waterway=ditch: Pl:Tag:waterway=ditch + waterway=drain: Pl:Tag:waterway=drain + waterway=fish_pass: Pl:Tag:waterway=fish pass + waterway=lock_gate: Pl:Tag:waterway=lock gate + waterway=river: Pl:Tag:waterway=river + waterway=riverbank: Pl:Tag:waterway=riverbank + waterway=stream: Pl:Tag:waterway=stream + waterway=weir: Pl:Tag:waterway=weir + wood=coniferous: Pl:Tag:wood=coniferous + wood=deciduous: Pl:Tag:wood=deciduous + wood=evergreen: Pl:Tag:wood=evergreen + wood=mixed: Pl:Tag:wood=mixed +pt: + key: + postal_code: Pt:Key:postal code + sport: Pt:Key:sport + tag: + amenity=hospital: Pt:Tag:amenity=hospital + highway=primary: Pt:Tag:highway=primary + leisure=fishing: Pt:Tag:leisure=fishing + leisure=garden: Pt:Tag:leisure=garden + leisure=golf_course: Pt:Tag:leisure=golf course + leisure=marina: Pt:Tag:leisure=marina + leisure=nature_reserve: Pt:Tag:leisure=nature reserve + leisure=park: Pt:Tag:leisure=park + leisure=pitch: Pt:Tag:leisure=pitch + leisure=playground: Pt:Tag:leisure=playground + leisure=slipway: Pt:Tag:leisure=slipway + leisure=sports_centre: Pt:Tag:leisure=sports centre + leisure=stadium: Pt:Tag:leisure=stadium + leisure=track: Pt:Tag:leisure=track + leisure=water_park: Pt:Tag:leisure=water park + sport=golf: Pt:Tag:sport=golf pt-br: key: + IBGE:tipo: Pt-br:Key:IBGE:tipo + TMC: Pt-br:Key:TMC abutters: Pt-br:Key:abutters access: Pt-br:Key:access addr: Pt-br:Key:addr + aerialway: Pt-br:Key:aerialway aeroway: Pt-br:Key:aeroway amenity: Pt-br:Key:amenity + area: Pt-br:Key:area barrier: Pt-br:Key:barrier bicycle: Pt-br:Key:bicycle boat: Pt-br:Key:boat @@ -1386,23 +4131,42 @@ pt-br: boundary: Pt-br:Key:boundary bridge: Pt-br:Key:bridge building: Pt-br:Key:building + cables: Pt-br:Key:cables cep: Pt-br:Key:cep construction: Pt-br:Key:construction + contact: Pt-br:Key:contact + craft: Pt-br:Key:craft + created_by: Pt-br:Key:created by + crossing: Pt-br:Key:crossing + cuisine: Pt-br:Key:cuisine + cutting: Pt-br:Key:cutting cycleway: Pt-br:Key:cycleway ele: Pt-br:Key:ele + electrified: Pt-br:Key:electrified + embankment: Pt-br:Key:embankment emergency: Pt-br:Key:emergency fenced: Pt-br:Key:fenced foot: Pt-br:Key:foot + frequency: Pt-br:Key:frequency geological: Pt-br:Key:geological hgv: Pt-br:Key:hgv highway: Pt-br:Key:highway historic: Pt-br:Key:historic horse: Pt-br:Key:horse + iata: Pt-br:Key:iata + icao: Pt-br:Key:icao + ice_road: Pt-br:Key:ice road + incline: Pt-br:Key:incline + intermittent: Pt-br:Key:intermittent internet_access: Pt-br:Key:internet access + is_in: Pt-br:Key:is in + junction: Pt-br:Key:junction landuse: Pt-br:Key:landuse lanes: Pt-br:Key:lanes leisure: Pt-br:Key:leisure + listed_status: Pt-br:Key:listed status lit: Pt-br:Key:lit + lock: Pt-br:Key:lock man_made: Pt-br:Key:man made maxdraught: Pt-br:Key:maxdraught maxheight: Pt-br:Key:maxheight @@ -1412,195 +4176,865 @@ pt-br: maxspeed: Pt-br:Key:maxspeed maxweight: Pt-br:Key:maxweight military: Pt-br:Key:military + mooring: Pt-br:Key:mooring motorcar: Pt-br:Key:motorcar motorcycle: Pt-br:Key:motorcycle + motorroad: Pt-br:Key:motorroad + mountain_pass: Pt-br:Key:mountain pass + mtb: Pt-br:Key:mtb name: Pt-br:Key:name natural: Pt-br:Key:natural noname: Pt-br:Key:noname office: Pt-br:Key:office oneway: Pt-br:Key:oneway operator: Pt-br:Key:operator + overtaking: Pt-br:Key:overtaking + passing_places: Pt-br:Key:passing places + place: Pt-br:Key:place + population: Pt-br:Key:population + postal_code: Pt-br:Key:postal code + power: Pt-br:Key:power psv: Pt-br:Key:psv + public_transport: Pt-br:Key:public transport railway: Pt-br:Key:railway + ref: Pt-br:Key:ref religion: Pt-br:Key:religion route: Pt-br:Key:route + sac_scale: Pt-br:Key:sac scale seamark: Pt-br:Key:seamark + seasonal: Pt-br:Key:seasonal service: Pt-br:Key:service shop: Pt-br:Key:shop ski: Pt-br:Key:ski + smoothness: Pt-br:Key:smoothness source: Pt-br:Key:source sport: Pt-br:Key:sport surface: Pt-br:Key:surface tourism: Pt-br:Key:tourism tracktype: Pt-br:Key:tracktype traffic_calming: Pt-br:Key:traffic calming + trail_visibility: Pt-br:Key:trail visibility + tunnel: Pt-br:Key:tunnel type: Pt-br:Key:type + usage: Pt-br:Key:usage + voltage: Pt-br:Key:voltage waterway: Pt-br:Key:waterway + winter_road: Pt-br:Key:winter road + wires: Pt-br:Key:wires tag: + aerialway=cable_car: Pt-br:Tag:aerialway=cable car + aerialway=station: Pt-br:Tag:aerialway=station + aeroway=aerodrome: Pt-br:Tag:aeroway=aerodrome + aeroway=apron: Pt-br:Tag:aeroway=apron + aeroway=gate: Pt-br:Tag:aeroway=gate + aeroway=helipad: Pt-br:Tag:aeroway=helipad + aeroway=runway: Pt-br:Tag:aeroway=runway + aeroway=taxiway: Pt-br:Tag:aeroway=taxiway + aeroway=terminal: Pt-br:Tag:aeroway=terminal + aeroway=windsock: Pt-br:Tag:aeroway=windsock + amenity=architect_office: Pt-br:Tag:amenity=architect office + amenity=arts_centre: Pt-br:Tag:amenity=arts centre + amenity=atm: Pt-br:Tag:amenity=atm + amenity=baby_hatch: Pt-br:Tag:amenity=baby hatch amenity=bank: Pt-br:Tag:amenity=bank + amenity=bar: Pt-br:Tag:amenity=bar + amenity=bbq: Pt-br:Tag:amenity=bbq + amenity=bench: Pt-br:Tag:amenity=bench + amenity=bicycke_parking: Pt-br:Tag:amenity=bicycke parking + amenity=bicycle_rental: Pt-br:Tag:amenity=bicycle rental + amenity=biergarten: Pt-br:Tag:amenity=biergarten amenity=brothel: Pt-br:Tag:amenity=brothel + amenity=bureau_de_change: Pt-br:Tag:amenity=bureau de change + amenity=bus_station: Pt-br:Tag:amenity=bus station + amenity=cafe: Pt-br:Tag:amenity=cafe + amenity=car_rental: Pt-br:Tag:amenity=car rental + amenity=car_sharing: Pt-br:Tag:amenity=car sharing + amenity=car_wash: Pt-br:Tag:amenity=car wash + amenity=cinema: Pt-br:Tag:amenity=cinema + amenity=clock: Pt-br:Tag:amenity=clock + amenity=college: Pt-br:Tag:amenity=college + amenity=community_centre: Pt-br:Tag:amenity=community centre + amenity=courthouse: Pt-br:Tag:amenity=courthouse + amenity=crematorium: Pt-br:Tag:amenity=crematorium + amenity=dentist: Pt-br:Tag:amenity=dentist + amenity=doctors: Pt-br:Tag:amenity=doctors + amenity=drinking_water: Pt-br:Tag:amenity=drinking water + amenity=embassy: Pt-br:Tag:amenity=embassy + amenity=ev_charging: Pt-br:Tag:amenity=ev charging + amenity=fast_food: Pt-br:Tag:amenity=fast food + amenity=ferry_terminal: Pt-br:Tag:amenity=ferry terminal + amenity=fire_hydrant: Pt-br:Tag:amenity=fire hydrant + amenity=fire_station: Pt-br:Tag:amenity=fire station + amenity=food_court: Pt-br:Tag:amenity=food court + amenity=fountain: Pt-br:Tag:amenity=fountain amenity=fuel: Pt-br:Tag:amenity=fuel + amenity=grave_yard: Pt-br:Tag:amenity=grave yard + amenity=grit_bin: Pt-br:Tag:amenity=grit bin + amenity=hospital: Pt-br:Tag:amenity=hospital + amenity=hunting_stand: Pt-br:Tag:amenity=hunting stand + amenity=ice_cream: Pt-br:Tag:amenity=ice cream + amenity=kindergarten: Pt-br:Tag:amenity=kindergarten + amenity=library: Pt-br:Tag:amenity=library + amenity=love_hotel: Pt-br:Tag:amenity=love hotel amenity=marketplace: Pt-br:Tag:amenity=marketplace amenity=nightclub: Pt-br:Tag:amenity=nightclub + amenity=nursing_home: Pt-br:Tag:amenity=nursing home + amenity=parking: Pt-br:Tag:amenity=parking + amenity=pharmacy: Pt-br:Tag:amenity=pharmacy amenity=place_of_worship: Pt-br:Tag:amenity=place of worship + amenity=police: Pt-br:Tag:amenity=police + amenity=post_box: Pt-br:Tag:amenity=post box + amenity=post_office: Pt-br:Tag:amenity=post office + amenity=prison: Pt-br:Tag:amenity=prison + amenity=pub: Pt-br:Tag:amenity=pub + amenity=public_building: Pt-br:Tag:amenity=public building + amenity=recycling: Pt-br:Tag:amenity=recycling + amenity=restaurant: Pt-br:Tag:amenity=restaurant + amenity=sauna: Pt-br:Tag:amenity=sauna + amenity=school: Pt-br:Tag:amenity=school + amenity=shelter: Pt-br:Tag:amenity=shelter + amenity=social_centre: Pt-br:Tag:amenity=social centre + amenity=social_facility: Pt-br:Tag:amenity=social facility amenity=stripclub: Pt-br:Tag:amenity=stripclub + amenity=studio: Pt-br:Tag:amenity=studio + amenity=taxi: Pt-br:Tag:amenity=taxi + amenity=telephone: Pt-br:Tag:amenity=telephone + amenity=theatre: Pt-br:Tag:amenity=theatre + amenity=toilets: Pt-br:Tag:amenity=toilets + amenity=townhall: Pt-br:Tag:amenity=townhall + amenity=university: Pt-br:Tag:amenity=university + amenity=vending_machine: Pt-br:Tag:amenity=vending machine + amenity=veterinary: Pt-br:Tag:amenity=veterinary + amenity=waste_basket: Pt-br:Tag:amenity=waste basket + amenity=waste_disposal: Pt-br:Tag:amenity=waste disposal + amenity=watering_place: Pt-br:Tag:amenity=watering place + barrier=city_wall: Pt-br:Tag:barrier=city wall + barrier=ditch: Pt-br:Tag:barrier=ditch + barrier=fence: Pt-br:Tag:barrier=fence + barrier=gate: Pt-br:Tag:barrier=gate + barrier=hedge: Pt-br:Tag:barrier=hedge + barrier=lift_gate: Pt-br:Tag:barrier=lift gate + barrier=retaining_wall: Pt-br:Tag:barrier=retaining wall + barrier=toll_booth: Pt-br:Tag:barrier=toll booth + barrier=wall: Pt-br:Tag:barrier=wall + boundary=administrative: Pt-br:Tag:boundary=administrative + boundary=civil: Pt-br:Tag:boundary=civil boundary=maritime: Pt-br:Tag:boundary=maritime + boundary=national_park: Pt-br:Tag:boundary=national park + boundary=political: Pt-br:Tag:boundary=political + boundary=protected_area: Pt-br:Tag:boundary=protected area + building=house: Pt-br:Tag:building=house + craft=agricultural_engines: Pt-br:Tag:craft=agricultural engines + craft=basket_maker: Pt-br:Tag:craft=basket maker + craft=beekeeper: Pt-br:Tag:craft=beekeeper + craft=blacksmith: Pt-br:Tag:craft=blacksmith + craft=boatbuilder: Pt-br:Tag:craft=boatbuilder + craft=bookbinder: Pt-br:Tag:craft=bookbinder + craft=brewery: Pt-br:Tag:craft=brewery + craft=carpenter: Pt-br:Tag:craft=carpenter + craft=carpet_layer: Pt-br:Tag:craft=carpet layer + craft=caterer: Pt-br:Tag:craft=caterer + craft=clockmaker: Pt-br:Tag:craft=clockmaker + craft=confectionery: Pt-br:Tag:craft=confectionery + craft=dressmaker: Pt-br:Tag:craft=dressmaker + craft=electrician: Pt-br:Tag:craft=electrician + craft=gardener: Pt-br:Tag:craft=gardener + craft=glaziery: Pt-br:Tag:craft=glaziery + craft=handicraft: Pt-br:Tag:craft=handicraft + craft=hvac: Pt-br:Tag:craft=hvac + craft=insulation: Pt-br:Tag:craft=insulation + craft=jeweller: Pt-br:Tag:craft=jeweller + craft=key_cutter: Pt-br:Tag:craft=key cutter + craft=locksmith: Pt-br:Tag:craft=locksmith + craft=metal_construction: Pt-br:Tag:craft=metal construction + craft=optician: Pt-br:Tag:craft=optician + craft=painter: Pt-br:Tag:craft=painter + craft=parquet_layer: Pt-br:Tag:craft=parquet layer + craft=photographer: Pt-br:Tag:craft=photographer + craft=photographic_laboratory: Pt-br:Tag:craft=photographic laboratory + craft=plasterer: Pt-br:Tag:craft=plasterer + craft=plumber: Pt-br:Tag:craft=plumber + craft=pottery: Pt-br:Tag:craft=pottery + craft=rigger: Pt-br:Tag:craft=rigger + craft=roofer: Pt-br:Tag:craft=roofer + craft=saddler: Pt-br:Tag:craft=saddler + craft=sailmaker: Pt-br:Tag:craft=sailmaker + craft=sawmill: Pt-br:Tag:craft=sawmill + craft=scaffolder: Pt-br:Tag:craft=scaffolder + craft=sculptor: Pt-br:Tag:craft=sculptor + craft=shoemaker: Pt-br:Tag:craft=shoemaker + craft=stand_builder: Pt-br:Tag:craft=stand builder + craft=stonemason: Pt-br:Tag:craft=stonemason + craft=sun_protection: Pt-br:Tag:craft=sun protection + craft=sweep: Pt-br:Tag:craft=sweep + craft=tailor: Pt-br:Tag:craft=tailor + craft=tiler: Pt-br:Tag:craft=tiler + craft=tinsmith: Pt-br:Tag:craft=tinsmith + craft=upholstrer: Pt-br:Tag:craft=upholstrer + craft=watchmaker: Pt-br:Tag:craft=watchmaker + emergency=ambulance_station: Pt-br:Tag:emergency=ambulance station + emergency=fire_hydrant: Pt-br:Tag:emergency=fire hydrant + emergency=phone: Pt-br:Tag:emergency=phone + emergency=siren: Pt-br:Tag:emergency=siren + geological=palaeontological_site: Pt-br:Tag:geological=palaeontological site + highway=bridleway: Pt-br:Tag:highway=bridleway + highway=bus_guideway: Pt-br:Tag:highway=bus guideway + highway=bus_stop: Pt-br:Tag:highway=bus stop + highway=byway: Pt-br:Tag:highway=byway + highway=crossing: Pt-br:Tag:highway=crossing + highway=cycleway: Pt-br:Tag:highway=cycleway + highway=emergency_access_point: Pt-br:Tag:highway=emergency access point + highway=footway: Pt-br:Tag:highway=footway + highway=ford: Pt-br:Tag:highway=ford + highway=give_way: Pt-br:Tag:highway=give way + highway=living_street: Pt-br:Tag:highway=living street + highway=mini_roundabout: Pt-br:Tag:highway=mini roundabout highway=motorway: Pt-br:Tag:highway=motorway highway=motorway_junction: Pt-br:Tag:highway=motorway junction highway=motorway_link: Pt-br:Tag:highway=motorway link + highway=passing_place: Pt-br:Tag:highway=passing place + highway=path: Pt-br:Tag:highway=path + highway=pedestrian: Pt-br:Tag:highway=pedestrian + highway=platform: Pt-br:Tag:highway=platform + highway=primary: Pt-br:Tag:highway=primary + highway=raceway: Pt-br:Tag:highway=raceway + highway=residential: Pt-br:Tag:highway=residential + highway=rest_area: Pt-br:Tag:highway=rest area highway=road: Pt-br:Tag:highway=road + highway=secondary: Pt-br:Tag:highway=secondary + highway=service: Pt-br:Tag:highway=service + highway=services: Pt-br:Tag:highway=services + highway=speed_camera: Pt-br:Tag:highway=speed camera + highway=steps: Pt-br:Tag:highway=steps highway=stop: Pt-br:Tag:highway=stop + highway=street_lamp: Pt-br:Tag:highway=street lamp + highway=tertiary: Pt-br:Tag:highway=tertiary + highway=track: Pt-br:Tag:highway=track + highway=traffic_signals: Pt-br:Tag:highway=traffic signals + highway=trunk: Pt-br:Tag:highway=trunk + highway=turning_circle: Pt-br:Tag:highway=turning circle highway=unclassified: Pt-br:Tag:highway=unclassified + historic=archaeological_site: Pt-br:Tag:historic=archaeological site + historic=battlefield: Pt-br:Tag:historic=battlefield + historic=boundary_stone: Pt-br:Tag:historic=boundary stone + historic=castle: Pt-br:Tag:historic=castle + historic=city_gate: Pt-br:Tag:historic=city gate + historic=memorial: Pt-br:Tag:historic=memorial + historic=monument: Pt-br:Tag:historic=monument + historic=ruins: Pt-br:Tag:historic=ruins + historic=wayside_cross: Pt-br:Tag:historic=wayside cross + historic=wayside_shrine: Pt-br:Tag:historic=wayside shrine + historic=wreck: Pt-br:Tag:historic=wreck + junction=roundabout: Pt-br:Tag:junction=roundabout + landuse=allotments: Pt-br:Tag:landuse=allotments + landuse=basin: Pt-br:Tag:landuse=basin + landuse=brownfield: Pt-br:Tag:landuse=brownfield landuse=cemetery: Pt-br:Tag:landuse=cemetery + landuse=commercial: Pt-br:Tag:landuse=commercial + landuse=farm: Pt-br:Tag:landuse=farm + landuse=farmyard: Pt-br:Tag:landuse=farmyard + landuse=forest: Pt-br:Tag:landuse=forest + landuse=garages: Pt-br:Tag:landuse=garages + landuse=grass: Pt-br:Tag:landuse=grass + landuse=greenfield: Pt-br:Tag:landuse=greenfield + landuse=greenhouse_horticulture: Pt-br:Tag:landuse=greenhouse horticulture + landuse=industrial: Pt-br:Tag:landuse=industrial + landuse=landfill: Pt-br:Tag:landuse=landfill landuse=meadow: Pt-br:Tag:landuse=meadow + landuse=military: Pt-br:Tag:landuse=military + landuse=orchard: Pt-br:Tag:landuse=orchard + landuse=quarry: Pt-br:Tag:landuse=quarry + landuse=railway: Pt-br:Tag:landuse=railway + landuse=recreation_ground: Pt-br:Tag:landuse=recreation ground + landuse=reservoir: Pt-br:Tag:landuse=reservoir + landuse=residential: Pt-br:Tag:landuse=residential + landuse=retail: Pt-br:Tag:landuse=retail + landuse=salt_pond: Pt-br:Tag:landuse=salt pond + landuse=village_green: Pt-br:Tag:landuse=village green + landuse=vineyard: Pt-br:Tag:landuse=vineyard + leisure=common: Pt-br:Tag:leisure=common + leisure=dance: Pt-br:Tag:leisure=dance + leisure=dog_park: Pt-br:Tag:leisure=dog park + leisure=garden: Pt-br:Tag:leisure=garden + leisure=golf_course: Pt-br:Tag:leisure=golf course + leisure=ice_rink: Pt-br:Tag:leisure=ice rink + leisure=marina: Pt-br:Tag:leisure=marina + leisure=miniature_golf: Pt-br:Tag:leisure=miniature golf + leisure=nature_reserve: Pt-br:Tag:leisure=nature reserve + leisure=park: Pt-br:Tag:leisure=park + leisure=pitch: Pt-br:Tag:leisure=pitch + leisure=playground: Pt-br:Tag:leisure=playground + leisure=slipway: Pt-br:Tag:leisure=slipway + leisure=sports_centre: Pt-br:Tag:leisure=sports centre + leisure=stadium: Pt-br:Tag:leisure=stadium + leisure=swimming_pool: Pt-br:Tag:leisure=swimming pool + leisure=track: Pt-br:Tag:leisure=track + leisure=water_park: Pt-br:Tag:leisure=water park + man_made=adit: Pt-br:Tag:man made=adit + man_made=antenna: Pt-br:Tag:man made=antenna + man_made=beacon: Pt-br:Tag:man made=beacon + man_made=breakwater: Pt-br:Tag:man made=breakwater + man_made=crane: Pt-br:Tag:man made=crane + man_made=cutline: Pt-br:Tag:man made=cutline + man_made=flagpole: Pt-br:Tag:man made=flagpole + man_made=groyne: Pt-br:Tag:man made=groyne + man_made=jetty: Pt-br:Tag:man made=jetty + man_made=lighthouse: Pt-br:Tag:man made=lighthouse + man_made=mineshaft: Pt-br:Tag:man made=mineshaft + man_made=monitoring_station: Pt-br:Tag:man made=monitoring station + man_made=petroleum_well: Pt-br:Tag:man made=petroleum well + man_made=pier: Pt-br:Tag:man made=pier + man_made=pipeline: Pt-br:Tag:man made=pipeline + man_made=reservoir_covered: Pt-br:Tag:man made=reservoir covered + man_made=surveillance: Pt-br:Tag:man made=surveillance man_made=survey_point: Pt-br:Tag:man made=survey point + man_made=tower: Pt-br:Tag:man made=tower + man_made=wastewater_plant: Pt-br:Tag:man made=wastewater plant + man_made=water_tower: Pt-br:Tag:man made=water tower + man_made=water_well: Pt-br:Tag:man made=water well + man_made=water_works: Pt-br:Tag:man made=water works + man_made=watermill: Pt-br:Tag:man made=watermill + man_made=windmill: Pt-br:Tag:man made=windmill + man_made=works: Pt-br:Tag:man made=works + military=airfield: Pt-br:Tag:military=airfield + military=barracks: Pt-br:Tag:military=barracks + military=bunker: Pt-br:Tag:military=bunker + military=danger_area: Pt-br:Tag:military=danger area + military=naval_base: Pt-br:Tag:military=naval base + military=range: Pt-br:Tag:military=range + natural=bay: Pt-br:Tag:natural=bay natural=beach: Pt-br:Tag:natural=beach + natural=cave_entrance: Pt-br:Tag:natural=cave entrance + natural=cliff: Pt-br:Tag:natural=cliff + natural=coastline: Pt-br:Tag:natural=coastline + natural=fell: Pt-br:Tag:natural=fell + natural=glacier: Pt-br:Tag:natural=glacier + natural=grassland: Pt-br:Tag:natural=grassland + natural=heath: Pt-br:Tag:natural=heath + natural=mud: Pt-br:Tag:natural=mud + natural=peak: Pt-br:Tag:natural=peak + natural=sand: Pt-br:Tag:natural=sand + natural=scree: Pt-br:Tag:natural=scree + natural=scrub: Pt-br:Tag:natural=scrub + natural=spring: Pt-br:Tag:natural=spring + natural=stone: Pt-br:Tag:natural=stone + natural=tree: Pt-br:Tag:natural=tree + natural=volcano: Pt-br:Tag:natural=volcano + natural=water: Pt-br:Tag:natural=water natural=wetland: Pt-br:Tag:natural=wetland + natural=wood: Pt-br:Tag:natural=wood + office=accountant: Pt-br:Tag:office=accountant + office=administrative: Pt-br:Tag:office=administrative + office=architect: Pt-br:Tag:office=architect + office=camping: Pt-br:Tag:office=camping + office=company: Pt-br:Tag:office=company + office=educational_institution: Pt-br:Tag:office=educational institution + office=employment_agency: Pt-br:Tag:office=employment agency + office=estate_agent: Pt-br:Tag:office=estate agent + office=government: Pt-br:Tag:office=government + office=insurance: Pt-br:Tag:office=insurance + office=it: Pt-br:Tag:office=it + office=lawyer: Pt-br:Tag:office=lawyer + office=newspaper: Pt-br:Tag:office=newspaper + office=ngo: Pt-br:Tag:office=ngo + office=quango: Pt-br:Tag:office=quango + office=research: Pt-br:Tag:office=research + office=telecommunication: Pt-br:Tag:office=telecommunication + office=travel_agent: Pt-br:Tag:office=travel agent + place=city: Pt-br:Tag:place=city + place=continent: Pt-br:Tag:place=continent + place=country: Pt-br:Tag:place=country + place=county: Pt-br:Tag:place=county + place=farm: Pt-br:Tag:place=farm + place=hamlet: Pt-br:Tag:place=hamlet + place=island: Pt-br:Tag:place=island + place=islet: Pt-br:Tag:place=islet + place=isolated_dwelling: Pt-br:Tag:place=isolated dwelling + place=locality: Pt-br:Tag:place=locality + place=region: Pt-br:Tag:place=region + place=state: Pt-br:Tag:place=state + place=suburb: Pt-br:Tag:place=suburb + place=town: Pt-br:Tag:place=town + place=village: Pt-br:Tag:place=village + power=cable_distribution_cabinet: Pt-br:Tag:power=cable distribution cabinet + power=generator: Pt-br:Tag:power=generator + power=line: Pt-br:Tag:power=line + power=minor_line: Pt-br:Tag:power=minor line + power=pole: Pt-br:Tag:power=pole + power=station: Pt-br:Tag:power=station + power=sub_station: Pt-br:Tag:power=sub station + power=tower: Pt-br:Tag:power=tower + railway=buffer_stop: Pt-br:Tag:railway=buffer stop + railway=crossing: Pt-br:Tag:railway=crossing + railway=derail: Pt-br:Tag:railway=derail + railway=funicular: Pt-br:Tag:railway=funicular + railway=halt: Pt-br:Tag:railway=halt + railway=level_crossing: Pt-br:Tag:railway=level crossing + railway=monorail: Pt-br:Tag:railway=monorail + railway=platform: Pt-br:Tag:railway=platform railway=rail: Pt-br:Tag:railway=rail + railway=station: Pt-br:Tag:railway=station + railway=subway: Pt-br:Tag:railway=subway + railway=subway_entrance: Pt-br:Tag:railway=subway entrance + railway=switch: Pt-br:Tag:railway=switch + railway=tram: Pt-br:Tag:railway=tram + railway=tram_stop: Pt-br:Tag:railway=tram stop + railway=turntable: Pt-br:Tag:railway=turntable + route=bus: Pt-br:Tag:route=bus + route=detour: Pt-br:Tag:route=detour + route=ferry: Pt-br:Tag:route=ferry + route=railway: Pt-br:Tag:route=railway + route=road: Pt-br:Tag:route=road + route=train: Pt-br:Tag:route=train + route=tram: Pt-br:Tag:route=tram + service=alley: Pt-br:Tag:service=alley + service=driveway: Pt-br:Tag:service=driveway + service=parking_aisle: Pt-br:Tag:service=parking aisle + service=siding: Pt-br:Tag:service=siding + service=spur: Pt-br:Tag:service=spur + service=yard: Pt-br:Tag:service=yard + shop=alcohol: Pt-br:Tag:shop=alcohol + shop=anime: Pt-br:Tag:shop=anime + shop=art: Pt-br:Tag:shop=art + shop=baby_goods: Pt-br:Tag:shop=baby goods + shop=bakery: Pt-br:Tag:shop=bakery + shop=bathroom_furnishing: Pt-br:Tag:shop=bathroom furnishing + shop=beauty: Pt-br:Tag:shop=beauty + shop=bed: Pt-br:Tag:shop=bed + shop=beverages: Pt-br:Tag:shop=beverages + shop=bicycle: Pt-br:Tag:shop=bicycle + shop=books: Pt-br:Tag:shop=books + shop=boutique: Pt-br:Tag:shop=boutique + shop=butcher: Pt-br:Tag:shop=butcher + shop=car: Pt-br:Tag:shop=car + shop=car_repair: Pt-br:Tag:shop=car repair + shop=charity: Pt-br:Tag:shop=charity + shop=chemist: Pt-br:Tag:shop=chemist + shop=clothes: Pt-br:Tag:shop=clothes + shop=computer: Pt-br:Tag:shop=computer + shop=confectionery: Pt-br:Tag:shop=confectionery + shop=convenience: Pt-br:Tag:shop=convenience + shop=copyshop: Pt-br:Tag:shop=copyshop + shop=curtain: Pt-br:Tag:shop=curtain + shop=deli: Pt-br:Tag:shop=deli + shop=department_store: Pt-br:Tag:shop=department store + shop=dive: Pt-br:Tag:shop=dive + shop=doityourself: Pt-br:Tag:shop=doityourself + shop=dry_cleaning: Pt-br:Tag:shop=dry cleaning + shop=electronics: Pt-br:Tag:shop=electronics + shop=erotic: Pt-br:Tag:shop=erotic + shop=fabric: Pt-br:Tag:shop=fabric + shop=farm: Pt-br:Tag:shop=farm + shop=florist: Pt-br:Tag:shop=florist + shop=frame: Pt-br:Tag:shop=frame + shop=funeral_directors: Pt-br:Tag:shop=funeral directors + shop=furnace: Pt-br:Tag:shop=furnace + shop=furniture: Pt-br:Tag:shop=furniture + shop=garden_centre: Pt-br:Tag:shop=garden centre + shop=gas: Pt-br:Tag:shop=gas + shop=general: Pt-br:Tag:shop=general + shop=gift: Pt-br:Tag:shop=gift + shop=glaziery: Pt-br:Tag:shop=glaziery + shop=greengrocer: Pt-br:Tag:shop=greengrocer + shop=hairdresser: Pt-br:Tag:shop=hairdresser + shop=hardware: Pt-br:Tag:shop=hardware + shop=hearing_aids: Pt-br:Tag:shop=hearing aids + shop=hifi: Pt-br:Tag:shop=hifi + shop=hunting: Pt-br:Tag:shop=hunting + shop=insurance: Pt-br:Tag:shop=insurance + shop=interior_decoration: Pt-br:Tag:shop=interior decoration + shop=jewelry: Pt-br:Tag:shop=jewelry + shop=kiosk: Pt-br:Tag:shop=kiosk + shop=kitchen: Pt-br:Tag:shop=kitchen + shop=laundry: Pt-br:Tag:shop=laundry shop=mall: Pt-br:Tag:shop=mall + shop=massage: Pt-br:Tag:shop=massage + shop=mobile_phone: Pt-br:Tag:shop=mobile phone + shop=money_lender: Pt-br:Tag:shop=money lender + shop=motorcycle: Pt-br:Tag:shop=motorcycle + shop=musical_instrument: Pt-br:Tag:shop=musical instrument + shop=newsagent: Pt-br:Tag:shop=newsagent + shop=optician: Pt-br:Tag:shop=optician + shop=organic: Pt-br:Tag:shop=organic + shop=outdoor: Pt-br:Tag:shop=outdoor + shop=paint: Pt-br:Tag:shop=paint + shop=pawnbroker: Pt-br:Tag:shop=pawnbroker + shop=pet: Pt-br:Tag:shop=pet + shop=radiotechnics: Pt-br:Tag:shop=radiotechnics + shop=seafood: Pt-br:Tag:shop=seafood + shop=second_hand: Pt-br:Tag:shop=second hand + shop=shoes: Pt-br:Tag:shop=shoes + shop=sports: Pt-br:Tag:shop=sports shop=stationery: Pt-br:Tag:shop=stationery + shop=supermarket: Pt-br:Tag:shop=supermarket + shop=tattoo: Pt-br:Tag:shop=tattoo + shop=tobacco: Pt-br:Tag:shop=tobacco + shop=toys: Pt-br:Tag:shop=toys + shop=trade: Pt-br:Tag:shop=trade + shop=vacant: Pt-br:Tag:shop=vacant + shop=vacuum_cleaner: Pt-br:Tag:shop=vacuum cleaner + shop=variety_store: Pt-br:Tag:shop=variety store + shop=video: Pt-br:Tag:shop=video source=IBGE: Pt-br:Tag:source=IBGE + sport=soccer: Pt-br:Tag:sport=soccer + tourism=alpine_hut: Pt-br:Tag:tourism=alpine hut + tourism=artwork: Pt-br:Tag:tourism=artwork + tourism=attraction: Pt-br:Tag:tourism=attraction + tourism=camp_site: Pt-br:Tag:tourism=camp site + tourism=caravan_site: Pt-br:Tag:tourism=caravan site + tourism=chalet: Pt-br:Tag:tourism=chalet + tourism=guest_house: Pt-br:Tag:tourism=guest house + tourism=hostel: Pt-br:Tag:tourism=hostel + tourism=hotel: Pt-br:Tag:tourism=hotel + tourism=information: Pt-br:Tag:tourism=information + tourism=motel: Pt-br:Tag:tourism=motel + tourism=museum: Pt-br:Tag:tourism=museum + tourism=picnic_site: Pt-br:Tag:tourism=picnic site + tourism=theme_park: Pt-br:Tag:tourism=theme park tourism=viewpoint: Pt-br:Tag:tourism=viewpoint + tourism=zoo: Pt-br:Tag:tourism=zoo + waterway=boatyard: Pt-br:Tag:waterway=boatyard + waterway=canal: Pt-br:Tag:waterway=canal + waterway=dam: Pt-br:Tag:waterway=dam + waterway=ditch: Pt-br:Tag:waterway=ditch + waterway=dock: Pt-br:Tag:waterway=dock + waterway=drain: Pt-br:Tag:waterway=drain + waterway=lock_gate: Pt-br:Tag:waterway=lock gate + waterway=river: Pt-br:Tag:waterway=river waterway=riverbank: Pt-br:Tag:waterway=riverbank + waterway=stream: Pt-br:Tag:waterway=stream + waterway=turning_point: Pt-br:Tag:waterway=turning point + waterway=weir: Pt-br:Tag:waterway=weir ro: + key: + leisure: Ro:Key:leisure + tracktype: Ro:Key:tracktype tag: + amenity=nightclub: Ro:Tag:amenity=nightclub junction=roundabout: Ro:Tag:junction=roundabout -ro-md: - tag: - amenity=nightclub: Ro-md:Tag:amenity=nightclub ru: key: abutters: RU:Key:abutters access: RU:Key:access addr: RU:Key:addr + addr:flats: RU:Key:addr:flats + addr:place: RU:Key:addr:place + addr:suburb: RU:Key:addr:suburb aerialway: RU:Key:aerialway aeroway: RU:Key:aeroway amenity: RU:Key:amenity area: RU:Key:area + area:highway: RU:Key:area:highway barrier: RU:Key:barrier + bench: RU:Key:bench bicycle: RU:Key:bicycle + bicycle_parking: RU:Key:bicycle parking + bin: RU:Key:bin boat: RU:Key:boat border_type: RU:Key:border type boundary: RU:Key:boundary + brand: RU:Key:brand bridge: RU:Key:bridge building: RU:Key:building + building:levels: RU:Key:building:levels + building:material: RU:Key:building:material + building:min_level: RU:Key:building:min level + building:part: RU:Key:building:part + building:parts: RU:Key:building:parts bunker_type: RU:Key:bunker type + cafe: RU:Key:cafe capacity: RU:Key:capacity + check_date: RU:Key:check date + clothes: RU:Key:clothes + club: RU:Key:club + colour: RU:Key:colour comment: RU:Key:comment construction: RU:Key:construction + contact: RU:Key:contact covered: RU:Key:covered + craft: RU:Key:craft created_by: RU:Key:created by + crop: RU:Key:crop crossing: RU:Key:crossing cuisine: RU:Key:cuisine cutting: RU:Key:cutting denomination: RU:Key:denomination description: RU:Key:description + designation: RU:Key:designation direction: RU:Key:direction + dispensing: RU:Key:dispensing disused: RU:Key:disused + drive_in: RU:Key:drive in ele: RU:Key:ele + electrified: RU:Key:electrified embankment: RU:Key:embankment + emergency: RU:Key:emergency + entrance: RU:Key:entrance + exit: RU:Key:exit + fast_food: RU:Key:fast food fee: RU:Key:fee + fence_type: RU:Key:fence type + ferry: RU:Key:ferry fixme: RU:Key:fixme foot: RU:Key:foot + footway: RU:Key:footway + ford: RU:Key:ford + fuel: RU:Key:fuel gauge: RU:Key:gauge + generator:output: RU:Key:generator:output + generator:source: RU:Key:generator:source + gvr:code: RU:Key:gvr:code + handrail: RU:Key:handrail height: RU:Key:height highway: RU:Key:highway historic: RU:Key:historic horse: RU:Key:horse + ice_road: RU:Key:ice road + incline: RU:Key:incline information: RU:Key:information + inscription: RU:Key:inscription + intermittent: RU:Key:intermittent internet_access: RU:Key:internet access junction: RU:Key:junction + kerb: RU:Key:kerb + landmark: RU:Key:landmark landuse: RU:Key:landuse lanes: RU:Key:lanes + layer: RU:Key:layer leisure: RU:Key:leisure + length: RU:Key:length + level: RU:Key:level man_made: RU:Key:man made + manhole: RU:Key:manhole + maxaxleload: RU:Key:maxaxleload maxheight: RU:Key:maxheight maxlength: RU:Key:maxlength maxspeed: RU:Key:maxspeed + maxspeed:practical: RU:Key:maxspeed:practical + maxstay: RU:Key:maxstay maxweight: RU:Key:maxweight maxwidth: RU:Key:maxwidth military: RU:Key:military + min_height: RU:Key:min height minspeed: RU:Key:minspeed + motorroad: RU:Key:motorroad name: RU:Key:name natural: RU:Key:natural noexit: RU:Key:noexit note: RU:Key:note + office: RU:Key:office oneway: RU:Key:oneway + opening_date: RU:Key:opening date opening_hours: RU:Key:opening hours operator: RU:Key:operator + overtaking: RU:Key:overtaking parking: RU:Key:parking + parking:lane: RU:Key:parking:lane passing_places: RU:Key:passing places paved:date: RU:Key:paved:date + payment: RU:Key:payment phone: RU:Key:phone + piste:type: RU:Key:piste:type place: RU:Key:place + playground: RU:Key:playground population: RU:Key:population power: RU:Key:power - power_source: RU:Key:power source + priority_road: RU:Key:priority road + psv: RU:Key:psv railway: RU:Key:railway + ramp: RU:Key:ramp ref: RU:Key:ref religion: RU:Key:religion + resource: RU:Key:resource + roof:material: RU:Key:roof:material route: RU:Key:route + ruins: RU:Key:ruins + seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime service: RU:Key:service + shelter: RU:Key:shelter + shelter_type: RU:Key:shelter type shop: RU:Key:shop + side_road: RU:Key:side road + sidewalk: RU:Key:sidewalk + smoking: RU:Key:smoking smoothness: RU:Key:smoothness + snowplowing: RU:Key:snowplowing + social_facility: RU:Key:social facility + sorting_name: RU:Key:sorting name source: RU:Key:source + source:maxspeed: RU:Key:source:maxspeed + species: RU:Key:species + sport: RU:Key:sport surface: RU:Key:surface + surveillance: RU:Key:surveillance + tactile_paving: RU:Key:tactile paving + toll: RU:Key:toll tourism: RU:Key:tourism tracktype: RU:Key:tracktype traffic_calming: RU:Key:traffic calming + traffic_sign: RU:Key:traffic sign + tunnel: RU:Key:tunnel + turn: RU:Key:turn type: RU:Key:type + voltage: RU:Key:voltage + water: RU:Key:water waterway: RU:Key:waterway website: RU:Key:website + wheelchair: RU:Key:wheelchair width: RU:Key:width wikipedia: RU:Key:wikipedia + winter_road: RU:Key:winter road wood: RU:Key:wood tag: + abandoned=yes: RU:Tag:abandoned=yes access=designated: RU:Tag:access=designated aeroway=aerodrome: RU:Tag:aeroway=aerodrome aeroway=apron: RU:Tag:aeroway=apron aeroway=gate: RU:Tag:aeroway=gate aeroway=helipad: RU:Tag:aeroway=helipad + aeroway=navigationaid: RU:Tag:aeroway=navigationaid aeroway=runway: RU:Tag:aeroway=runway aeroway=taxiway: RU:Tag:aeroway=taxiway aeroway=terminal: RU:Tag:aeroway=terminal + aeroway=windsock: RU:Tag:aeroway=windsock + amenity=animal_boarding: RU:Tag:amenity=animal boarding + amenity=animal_shelter: RU:Tag:amenity=animal shelter + amenity=arts_centre: RU:Tag:amenity=arts centre + amenity=atm: RU:Tag:amenity=atm amenity=bank: RU:Tag:amenity=bank + amenity=bar: RU:Tag:amenity=bar + amenity=bbq: RU:Tag:amenity=bbq + amenity=bench: RU:Tag:amenity=bench + amenity=bicycle_parking: RU:Tag:amenity=bicycle parking amenity=bicycle_rental: RU:Tag:amenity=bicycle rental + amenity=biergarten: RU:Tag:amenity=biergarten + amenity=boat_storage: RU:Tag:amenity=boat storage amenity=brothel: RU:Tag:amenity=brothel + amenity=bureau_de_change: RU:Tag:amenity=bureau de change amenity=bus_station: RU:Tag:amenity=bus station + amenity=cafe: RU:Tag:amenity=cafe amenity=car_rental: RU:Tag:amenity=car rental amenity=car_sharing: RU:Tag:amenity=car sharing + amenity=car_wash: RU:Tag:amenity=car wash + amenity=casino: RU:Tag:amenity=casino + amenity=cinema: RU:Tag:amenity=cinema + amenity=clinic: RU:Tag:amenity=clinic + amenity=clock: RU:Tag:amenity=clock + amenity=college: RU:Tag:amenity=college + amenity=community_centre: RU:Tag:amenity=community centre + amenity=compressed_air: RU:Tag:amenity=compressed air + amenity=courthouse: RU:Tag:amenity=courthouse amenity=crematorium: RU:Tag:amenity=crematorium + amenity=dentist: RU:Tag:amenity=dentist + amenity=doctors: RU:Tag:amenity=doctors + amenity=drinking_water: RU:Tag:amenity=drinking water + amenity=driving_school: RU:Tag:amenity=driving school + amenity=embassy: RU:Tag:amenity=embassy amenity=fast_food: RU:Tag:amenity=fast food + amenity=ferry_terminal: RU:Tag:amenity=ferry terminal amenity=fire_station: RU:Tag:amenity=fire station + amenity=food_court: RU:Tag:amenity=food court amenity=fountain: RU:Tag:amenity=fountain amenity=fuel: RU:Tag:amenity=fuel amenity=grave_yard: RU:Tag:amenity=grave yard + amenity=hospital: RU:Tag:amenity=hospital + amenity=kindergarten: RU:Tag:amenity=kindergarten + amenity=library: RU:Tag:amenity=library + amenity=love_hotel: RU:Tag:amenity=love hotel + amenity=marketplace: RU:Tag:amenity=marketplace + amenity=monastery: RU:Tag:amenity=monastery + amenity=mortuary: RU:Tag:amenity=mortuary amenity=nightclub: RU:Tag:amenity=nightclub + amenity=nursing_home: RU:Tag:amenity=nursing home amenity=parking: RU:Tag:amenity=parking + amenity=parking_entrance: RU:Tag:amenity=parking entrance + amenity=parking_space: RU:Tag:amenity=parking space + amenity=payment_terminal: RU:Tag:amenity=payment terminal amenity=pharmacy: RU:Tag:amenity=pharmacy amenity=place_of_worship: RU:Tag:amenity=place of worship + amenity=police: RU:Tag:amenity=police + amenity=post_box: RU:Tag:amenity=post box + amenity=post_office: RU:Tag:amenity=post office + amenity=prison: RU:Tag:amenity=prison + amenity=pub: RU:Tag:amenity=pub + amenity=public_building: RU:Tag:amenity=public building + amenity=recycling: RU:Tag:amenity=recycling + amenity=register_office: RU:Tag:amenity=register office amenity=restaurant: RU:Tag:amenity=restaurant + amenity=sauna: RU:Tag:amenity=sauna amenity=school: RU:Tag:amenity=school + amenity=shelter: RU:Tag:amenity=shelter + amenity=shower: RU:Tag:amenity=shower + amenity=social_facility: RU:Tag:amenity=social facility amenity=stripclub: RU:Tag:amenity=stripclub amenity=taxi: RU:Tag:amenity=taxi amenity=telephone: RU:Tag:amenity=telephone amenity=theatre: RU:Tag:amenity=theatre amenity=toilets: RU:Tag:amenity=toilets + amenity=townhall: RU:Tag:amenity=townhall + amenity=university: RU:Tag:amenity=university amenity=vending_machine: RU:Tag:amenity=vending machine + amenity=veterinary: RU:Tag:amenity=veterinary amenity=waste_basket: RU:Tag:amenity=waste basket amenity=waste_disposal: RU:Tag:amenity=waste disposal atm=yes: RU:Tag:atm=yes + barrier=block: RU:Tag:barrier=block + barrier=bollard: RU:Tag:barrier=bollard + barrier=city_wall: RU:Tag:barrier=city wall + barrier=ditch: RU:Tag:barrier=ditch + barrier=entrance: RU:Tag:barrier=entrance barrier=fence: RU:Tag:barrier=fence + barrier=gate: RU:Tag:barrier=gate + barrier=hedge: RU:Tag:barrier=hedge barrier=lift_gate: RU:Tag:barrier=lift gate + barrier=retaining_wall: RU:Tag:barrier=retaining wall + barrier=sally_port: RU:Tag:barrier=sally port barrier=toll_booth: RU:Tag:barrier=toll booth + barrier=turnstile: RU:Tag:barrier=turnstile + barrier=wall: RU:Tag:barrier=wall + building=detached: RU:Tag:building=detached + building=dormitory: RU:Tag:building=dormitory building=entrance: RU:Tag:building=entrance + building=roof: RU:Tag:building=roof + building=shed: RU:Tag:building=shed + building=stable: RU:Tag:building=stable + building=train_station: RU:Tag:building=train station + bunker_type=pillbox: RU:Tag:bunker type=pillbox + cafe=time-cafe: RU:Tag:cafe=time-cafe + craft=agricultural_engines: RU:Tag:craft=agricultural engines + craft=basket_maker: RU:Tag:craft=basket maker + craft=beekeeper: RU:Tag:craft=beekeeper + craft=blacksmith: RU:Tag:craft=blacksmith + craft=boatbuilder: RU:Tag:craft=boatbuilder + craft=bookbinder: RU:Tag:craft=bookbinder + craft=brewery: RU:Tag:craft=brewery + craft=carpenter: RU:Tag:craft=carpenter + craft=carpet_layer: RU:Tag:craft=carpet layer + craft=caterer: RU:Tag:craft=caterer + craft=clockmaker: RU:Tag:craft=clockmaker + craft=dressmaker: RU:Tag:craft=dressmaker + craft=electrician: RU:Tag:craft=electrician + craft=glaziery: RU:Tag:craft=glaziery + craft=handicraft: RU:Tag:craft=handicraft + craft=shoemaker: RU:Tag:craft=shoemaker + craft=tailor: RU:Tag:craft=tailor + emergency=ambulance_station: RU:Tag:emergency=ambulance station + emergency=fire_hydrant: RU:Tag:emergency=fire hydrant + emergency=fire_water_pond: RU:Tag:emergency=fire water pond + fast_food=cafeteria: RU:Tag:fast food=cafeteria + footway=crossing: RU:Tag:footway=crossing + footway=sidewalk: RU:Tag:footway=sidewalk + geological=palaeontological_site: RU:Tag:geological=palaeontological site highway=bridleway: RU:Tag:highway=bridleway highway=bus_stop: RU:Tag:highway=bus stop + highway=construction: RU:Tag:highway=construction highway=crossing: RU:Tag:highway=crossing highway=cycleway: RU:Tag:highway=cycleway + highway=elevator: RU:Tag:highway=elevator highway=emergency_access_point: RU:Tag:highway=emergency access point highway=footway: RU:Tag:highway=footway highway=ford: RU:Tag:highway=ford + highway=give_way: RU:Tag:highway=give way highway=living_street: RU:Tag:highway=living street highway=mini_roundabout: RU:Tag:highway=mini roundabout highway=motorway: RU:Tag:highway=motorway @@ -1613,6 +5047,7 @@ ru: highway=primary: RU:Tag:highway=primary highway=primary_link: RU:Tag:highway=primary link highway=residential: RU:Tag:highway=residential + highway=rest_area: RU:Tag:highway=rest area highway=road: RU:Tag:highway=road highway=secondary: RU:Tag:highway=secondary highway=secondary_link: RU:Tag:highway=secondary link @@ -1622,6 +5057,7 @@ ru: highway=steps: RU:Tag:highway=steps highway=stop: RU:Tag:highway=stop highway=tertiary: RU:Tag:highway=tertiary + highway=tertiary_link: RU:Tag:highway=tertiary link highway=track: RU:Tag:highway=track highway=traffic_signals: RU:Tag:highway=traffic signals highway=trunk: RU:Tag:highway=trunk @@ -1630,77 +5066,288 @@ ru: highway=unclassified: RU:Tag:highway=unclassified historic=archaeological_site: RU:Tag:historic=archaeological site historic=battlefield: RU:Tag:historic=battlefield + historic=boundary_stone: RU:Tag:historic=boundary stone + historic=castle: RU:Tag:historic=castle + historic=city_gate: RU:Tag:historic=city gate + historic=fort: RU:Tag:historic=fort + historic=memorial: RU:Tag:historic=memorial + historic=monument: RU:Tag:historic=monument + historic=ruins: RU:Tag:historic=ruins + historic=rune_stone: RU:Tag:historic=rune stone + historic=ship: RU:Tag:historic=ship + historic=tree_shrine: RU:Tag:historic=tree shrine + historic=wayside_cross: RU:Tag:historic=wayside cross + historic=wayside_shrine: RU:Tag:historic=wayside shrine + historic=wreck: RU:Tag:historic=wreck information=guidepost: RU:Tag:information=guidepost junction=roundabout: RU:Tag:junction=roundabout landuse=allotments: RU:Tag:landuse=allotments + landuse=basin: RU:Tag:landuse=basin landuse=cemetery: RU:Tag:landuse=cemetery + landuse=commercial: RU:Tag:landuse=commercial + landuse=construction: RU:Tag:landuse=construction + landuse=farm: RU:Tag:landuse=farm landuse=forest: RU:Tag:landuse=forest landuse=garages: RU:Tag:landuse=garages + landuse=grass: RU:Tag:landuse=grass + landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture landuse=industrial: RU:Tag:landuse=industrial + landuse=landfill: RU:Tag:landuse=landfill landuse=meadow: RU:Tag:landuse=meadow landuse=military: RU:Tag:landuse=military + landuse=orchard: RU:Tag:landuse=orchard landuse=peat_cutting: RU:Tag:landuse=peat cutting + landuse=plant_nursery: RU:Tag:landuse=plant nursery + landuse=pond: RU:Tag:landuse=pond + landuse=quarry: RU:Tag:landuse=quarry landuse=railway: RU:Tag:landuse=railway + landuse=recreation_ground: RU:Tag:landuse=recreation ground landuse=reservoir: RU:Tag:landuse=reservoir landuse=residential: RU:Tag:landuse=residential + landuse=retail: RU:Tag:landuse=retail + landuse=village_green: RU:Tag:landuse=village green + landuse=vineyard: RU:Tag:landuse=vineyard + leisure=beach_resort: RU:Tag:leisure=beach resort + leisure=dance: RU:Tag:leisure=dance + leisure=firepit: RU:Tag:leisure=firepit + leisure=ice_rink: RU:Tag:leisure=ice rink leisure=marina: RU:Tag:leisure=marina + leisure=park: RU:Tag:leisure=park + leisure=pitch: RU:Tag:leisure=pitch + leisure=playground: RU:Tag:leisure=playground + leisure=sports_centre: RU:Tag:leisure=sports centre + leisure=stadium: RU:Tag:leisure=stadium + leisure=swimming_pool: RU:Tag:leisure=swimming pool + leisure=track: RU:Tag:leisure=track leisure=water_park: RU:Tag:leisure=water park + man_made=adit: RU:Tag:man made=adit man_made=beacon: RU:Tag:man made=beacon + man_made=breakwater: RU:Tag:man made=breakwater man_made=cutline: RU:Tag:man made=cutline man_made=lighthouse: RU:Tag:man made=lighthouse + man_made=monitoring_station: RU:Tag:man made=monitoring station 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=reservoir_covered: RU:Tag:man made=reservoir covered + man_made=surveillance: RU:Tag:man made=surveillance + man_made=tower: RU:Tag:man made=tower + man_made=wastewater_plant: RU:Tag:man made=wastewater plant + man_made=water_tower: RU:Tag:man made=water tower + man_made=water_works: RU:Tag:man made=water works + military=airfield: RU:Tag:military=airfield + natural=arete: RU:Tag:natural=arete natural=beach: RU:Tag:natural=beach + natural=cliff: RU:Tag:natural=cliff + natural=coastline: RU:Tag:natural=coastline + natural=desert: RU:Tag:natural=desert natural=fell: RU:Tag:natural=fell + natural=grassland: RU:Tag:natural=grassland + natural=heath: RU:Tag:natural=heath + natural=peak: RU:Tag:natural=peak + natural=ridge: RU:Tag:natural=ridge + natural=saddle: RU:Tag:natural=saddle + natural=sand: RU:Tag:natural=sand + natural=scrub: RU:Tag:natural=scrub natural=spring: RU:Tag:natural=spring natural=tree: RU:Tag:natural=tree + natural=tree_row: RU:Tag:natural=tree row + natural=volcano: RU:Tag:natural=volcano natural=water: RU:Tag:natural=water natural=wetland: RU:Tag:natural=wetland natural=wood: RU:Tag:natural=wood + office=accountant: RU:Tag:office=accountant + office=administrative: RU:Tag:office=administrative + office=architect: RU:Tag:office=architect + office=company: RU:Tag:office=company + office=educational_institution: RU:Tag:office=educational institution + office=employment_agency: RU:Tag:office=employment agency + office=estate_agent: RU:Tag:office=estate agent + office=government: RU:Tag:office=government + office=insurance: RU:Tag:office=insurance + office=it: RU:Tag:office=it office=lawyer: RU:Tag:office=lawyer + office=newspaper: RU:Tag:office=newspaper + office=ngo: RU:Tag:office=ngo + office=political_party: RU:Tag:office=political party + office=research: RU:Tag:office=research + office=telecommunication: RU:Tag:office=telecommunication + office=travel_agent: RU:Tag:office=travel agent opening_hours=24/7: RU:Tag:opening hours=24/7 + pipeline=marker: RU:Tag:pipeline=marker + place=allotments: RU:Tag:place=allotments + place=city: RU:Tag:place=city + place=hamlet: RU:Tag:place=hamlet place=island: RU:Tag:place=island + place=islet: RU:Tag:place=islet + place=isolated_dwelling: RU:Tag:place=isolated dwelling + place=locality: RU:Tag:place=locality + place=neighbourhood: RU:Tag:place=neighbourhood + place=suburb: RU:Tag:place=suburb place=town: RU:Tag:place=town place=village: RU:Tag:place=village power=generator: RU:Tag:power=generator power=line: RU:Tag:power=line + power=minor_line: RU:Tag:power=minor line + power=plant: RU:Tag:power=plant power=station: RU:Tag:power=station power=sub_station: RU:Tag:power=sub station + power=substation: RU:Tag:power=substation power=tower: RU:Tag:power=tower + public_transport=platform: RU:Tag:public transport=platform + public_transport=station: RU:Tag:public transport=station + public_transport=stop_position: RU:Tag:public transport=stop position railway=crossing: RU:Tag:railway=crossing + railway=level_crossing: RU:Tag:railway=level crossing + railway=miniature: RU:Tag:railway=miniature + railway=narrow_gauge: RU:Tag:railway=narrow gauge + railway=preserved: RU:Tag:railway=preserved + railway=rail: RU:Tag:railway=rail + railway=station: RU:Tag:railway=station + railway=subway: RU:Tag:railway=subway railway=subway_entrance: RU:Tag:railway=subway entrance + railway=tram: RU:Tag:railway=tram route=bus: RU:Tag:route=bus + route=ferry: RU:Tag:route=ferry route=railway: RU:Tag:route=railway route=train: RU:Tag:route=train route=tram: RU:Tag:route=tram service=alley: RU:Tag:service=alley service=driveway: RU:Tag:service=driveway service=parking_aisle: RU:Tag:service=parking aisle + shop=alcohol: RU:Tag:shop=alcohol + shop=anime: RU:Tag:shop=anime + shop=antiques: RU:Tag:shop=antiques + shop=art: RU:Tag:shop=art + shop=baby_goods: RU:Tag:shop=baby goods + shop=bag: RU:Tag:shop=bag shop=bakery: RU:Tag:shop=bakery + shop=bathroom_furnishing: RU:Tag:shop=bathroom furnishing + shop=beauty: RU:Tag:shop=beauty + shop=bed: RU:Tag:shop=bed + shop=beverages: RU:Tag:shop=beverages shop=bicycle: RU:Tag:shop=bicycle + shop=books: RU:Tag:shop=books + shop=boutique: RU:Tag:shop=boutique + shop=butcher: RU:Tag:shop=butcher shop=car: RU:Tag:shop=car + shop=car_parts: RU:Tag:shop=car parts + shop=car_repair: RU:Tag:shop=car repair + shop=carpet: RU:Tag:shop=carpet + shop=charity: RU:Tag:shop=charity + shop=chemist: RU:Tag:shop=chemist shop=clothes: RU:Tag:shop=clothes shop=computer: RU:Tag:shop=computer shop=confectionery: RU:Tag:shop=confectionery + shop=convenience: RU:Tag:shop=convenience + shop=copyshop: RU:Tag:shop=copyshop + shop=curtain: RU:Tag:shop=curtain + shop=dairy: RU:Tag:shop=dairy + shop=deli: RU:Tag:shop=deli shop=department_store: RU:Tag:shop=department store + shop=dive: RU:Tag:shop=dive + shop=doityourself: RU:Tag:shop=doityourself + shop=dry_cleaning: RU:Tag:shop=dry cleaning + shop=electronics: RU:Tag:shop=electronics + shop=erotic: RU:Tag:shop=erotic + shop=fabric: RU:Tag:shop=fabric shop=fabrics: RU:Tag:shop=fabrics + shop=farm: RU:Tag:shop=farm + shop=fishing: RU:Tag:shop=fishing shop=florist: RU:Tag:shop=florist + shop=frame: RU:Tag:shop=frame + shop=funeral_directors: RU:Tag:shop=funeral directors + shop=furnace: RU:Tag:shop=furnace + shop=furniture: RU:Tag:shop=furniture + shop=garden_centre: RU:Tag:shop=garden centre + shop=gas: RU:Tag:shop=gas + shop=gift: RU:Tag:shop=gift + shop=glaziery: RU:Tag:shop=glaziery + shop=greengrocer: RU:Tag:shop=greengrocer + shop=haberdashery: RU:Tag:shop=haberdashery shop=hairdresser: RU:Tag:shop=hairdresser + shop=hardware: RU:Tag:shop=hardware + shop=hearing_aids: RU:Tag:shop=hearing aids + shop=herbalist: RU:Tag:shop=herbalist + shop=hifi: RU:Tag:shop=hifi + shop=hunting: RU:Tag:shop=hunting + shop=interior_decoration: RU:Tag:shop=interior decoration + shop=jewelry: RU:Tag:shop=jewelry shop=kiosk: RU:Tag:shop=kiosk + shop=kitchen: RU:Tag:shop=kitchen + shop=laundry: RU:Tag:shop=laundry + shop=mall: RU:Tag:shop=mall + shop=massage: RU:Tag:shop=massage + shop=mobile_phone: RU:Tag:shop=mobile phone + shop=money_lender: RU:Tag:shop=money lender + shop=motorcycle: RU:Tag:shop=motorcycle + shop=musical_instrument: RU:Tag:shop=musical instrument + shop=newsagent: RU:Tag:shop=newsagent + shop=optician: RU:Tag:shop=optician + shop=organic: RU:Tag:shop=organic + shop=outdoor: RU:Tag:shop=outdoor + shop=paint: RU:Tag:shop=paint + shop=pawnbroker: RU:Tag:shop=pawnbroker + shop=pet: RU:Tag:shop=pet + 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=ship_chandler: RU:Tag:shop=ship chandler + shop=shoes: RU:Tag:shop=shoes + shop=sports: RU:Tag:shop=sports + shop=stationery: RU:Tag:shop=stationery shop=supermarket: RU:Tag:shop=supermarket + shop=tattoo: RU:Tag:shop=tattoo + shop=ticket: RU:Tag:shop=ticket + shop=tobacco: RU:Tag:shop=tobacco + shop=toys: RU:Tag:shop=toys + shop=trade: RU:Tag:shop=trade shop=travel_agency: RU:Tag:shop=travel agency + shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner + shop=variety_store: RU:Tag:shop=variety store + shop=video: RU:Tag:shop=video + shop=window_blind: RU:Tag:shop=window blind + social_facility=group_home: RU:Tag:social facility=group home + sport=archery: RU:Tag:sport=archery + sport=scuba_diving: RU:Tag:sport=scuba diving + tourism=artwork: RU:Tag:tourism=artwork + tourism=attraction: RU:Tag:tourism=attraction + tourism=camp_site: RU:Tag:tourism=camp site + tourism=chalet: RU:Tag:tourism=chalet + tourism=hostel: RU:Tag:tourism=hostel tourism=hotel: RU:Tag:tourism=hotel tourism=information: RU:Tag:tourism=information + tourism=museum: RU:Tag:tourism=museum + tourism=picnic_site: RU:Tag:tourism=picnic site + tourism=theme_park: RU:Tag:tourism=theme park + tourism=viewpoint: RU:Tag:tourism=viewpoint + tunnel=culvert: RU:Tag:tunnel=culvert + type=site: RU:Tag:type=site + waterway=boatyard: RU:Tag:waterway=boatyard + waterway=canal: RU:Tag:waterway=canal waterway=dam: RU:Tag:waterway=dam + waterway=dock: RU:Tag:waterway=dock + waterway=drain: RU:Tag:waterway=drain waterway=rapids: RU:Tag:waterway=rapids waterway=river: RU:Tag:waterway=river waterway=riverbank: RU:Tag:waterway=riverbank waterway=stream: RU:Tag:waterway=stream waterway=weir: RU:Tag:waterway=weir + wood=mixed: RU:Tag:wood=mixed +sq: + key: + highway: Sq:Key:highway sv: key: access: Sv:Key:access tag: + aerialway=cable_car: Sv:Tag:aerialway=cable car amenity=place_of_worship: Sv:Tag:amenity=place of worship + highway=rest_area: Sv:Tag:highway=rest area + junction=roundabout: Sv:Tag:junction=roundabout + leisure=dog_park: Sv:Tag:leisure=dog park + railway=rail: Sv:Tag:railway=rail tr: key: amenity: Tr:Key:amenity @@ -1712,18 +5359,39 @@ tr: sport: Tr:Key:sport uk: key: - access: Uk:Key:access - highway: Uk:Key:highway - place: Uk:Key:place + bicycle_parking: Uk:Key:bicycle parking + tag: + amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking + amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental + shop=antiques: Uk:Tag:shop=antiques + shop=bicycle: Uk:Tag:shop=bicycle + shop=second_hand: Uk:Tag:shop=second hand + vending=bicycle_tube: Uk:Tag:vending=bicycle tube +zh-hans: + key: + cuisine: Zh-hans:Key:cuisine + name: Zh-hans:Key:name + tag: + amenity=cafe: Zh-hans:Tag:amenity=cafe +zh-hant: + key: + amenity: Zh-hant:Key:amenity + fixme: Zh-hant:Key:fixme + fuel: Zh-hant:Key:fuel + noexit: Zh-hant:Key:noexit + opening_hours: Zh-hant:Key:opening hours + tracktype: Zh-hant:Key:tracktype + trail_visibility: Zh-hant:Key:trail visibility tag: - highway=motorway: Uk:Tag:highway=motorway - highway=motorway_link: Uk:Tag:highway=motorway link - highway=primary: Uk:Tag:highway=primary - highway=primary_link: Uk:Tag:highway=primary link - highway=secondary: Uk:Tag:highway=secondary - highway=secondary_link: Uk:Tag:highway=secondary link - highway=tertiary: Uk:Tag:highway=tertiary - highway=trunk: Uk:Tag:highway=trunk - highway=trunk_link: Uk:Tag:highway=trunk link - highway=unclassified: Uk:Tag:highway=unclassified + amenity=bench: Zh-hant:Tag:amenity=bench + amenity=crematorium: Zh-hant:Tag:amenity=crematorium + amenity=fuel: Zh-hant:Tag:amenity=fuel + amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship + amenity=toilets: Zh-hant:Tag:amenity=toilets + highway=bus_stop: Zh-hant:Tag:highway=bus stop + landuse=cemetery: Zh-hant:Tag:landuse=cemetery + natural=peak: Zh-hant:Tag:natural=peak + shop=funeral_directors: Zh-hant:Tag:shop=funeral directors + shop=gas: Zh-hant:Tag:shop=gas + tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut diff --git a/db/migrate/001_create_osm_db.rb b/db/migrate/001_create_osm_db.rb index 8ddc68bcd16..d952c0a0769 100644 --- a/db/migrate/001_create_osm_db.rb +++ b/db/migrate/001_create_osm_db.rb @@ -78,11 +78,11 @@ def self.up create_table "gps_points", myisam_table do |t| t.column "altitude", :float - t.column "user_id", :integer, :limit => 20 + t.column "user_id", :integer t.column "trackid", :integer t.column "latitude", :integer t.column "longitude", :integer - t.column "gpx_id", :integer, :limit => 20 + t.column "gpx_id", :integer t.column "timestamp", :datetime end diff --git a/db/migrate/031_create_countries.rb b/db/migrate/031_create_countries.rb index cc0627cd291..923d943f791 100644 --- a/db/migrate/031_create_countries.rb +++ b/db/migrate/031_create_countries.rb @@ -13,24 +13,6 @@ def self.up end add_index :countries, [:code], :name => "countries_code_idx", :unique => true - - Net::HTTP.start('ws.geonames.org') do |http| - xml = REXML::Document.new(http.get("/countryInfo").body) - - xml.elements.each("geonames/country") do |ele| - code = ele.get_text("countryCode").to_s - minlon = ele.get_text("bBoxWest").to_s - minlat = ele.get_text("bBoxSouth").to_s - maxlon = ele.get_text("bBoxEast").to_s - maxlat = ele.get_text("bBoxNorth").to_s - - Country.create({ - :code => code, - :min_lat => minlat.to_f, :max_lat => maxlat.to_f, - :min_lon => minlon.to_f, :max_lon => maxlon.to_f - }, :without_protection => true) - end - end end def self.down diff --git a/db/migrate/053_add_map_bug_tables.rb b/db/migrate/053_add_map_bug_tables.rb new file mode 100644 index 00000000000..6851a20b4d4 --- /dev/null +++ b/db/migrate/053_add_map_bug_tables.rb @@ -0,0 +1,34 @@ +require 'migrate' + +class AddMapBugTables < ActiveRecord::Migration + def self.up + create_enumeration :map_bug_status_enum, ["open", "closed", "hidden"] + + create_table :map_bugs do |t| + t.integer :latitude, :null => false + t.integer :longitude, :null => false + t.column :tile, :bigint, :null => false + t.datetime :last_changed, :null => false + t.datetime :date_created, :null => false + t.string :nearby_place + t.string :text + t.column :status, :map_bug_status_enum, :null => false + end + + change_column :map_bugs, :id, :bigint + + add_index :map_bugs, [:tile, :status], :name => "map_bugs_tile_idx" + add_index :map_bugs, [:last_changed], :name => "map_bugs_changed_idx" + add_index :map_bugs, [:date_created], :name => "map_bugs_created_idx" + end + + def self.down + remove_index :map_bugs, :name => "map_bugs_tile_idx" + remove_index :map_bugs, :name => "map_bugs_changed_idx" + remove_index :map_bugs, :name => "map_bugs_created_idx" + + drop_table :map_bugs + + drop_enumeration :map_bug_status_enum + end +end diff --git a/db/migrate/054_refactor_map_bug_tables.rb b/db/migrate/054_refactor_map_bug_tables.rb new file mode 100644 index 00000000000..d9410503555 --- /dev/null +++ b/db/migrate/054_refactor_map_bug_tables.rb @@ -0,0 +1,35 @@ +require 'migrate' + +class RefactorMapBugTables < ActiveRecord::Migration + def self.up + create_table :map_bug_comment do |t| + t.column :bug_id, :bigint, :null => false + t.boolean :visible, :null => false + t.datetime :date_created, :null => false + t.string :commenter_name + t.string :commenter_ip + t.column :commenter_id, :bigint + t.string :comment + end + + remove_column :map_bugs, :text + + change_column :map_bug_comment, :id, :bigint + + add_index :map_bug_comment, [:bug_id], :name => "map_bug_comment_id_idx" + + add_foreign_key :map_bug_comment, [:bug_id], :map_bugs, [:id] + add_foreign_key :map_bug_comment, [:commenter_id], :users, [:id] + end + + def self.down + remove_foreign_key :map_bug_comment, [:commenter_id] + remove_foreign_key :map_bug_comment, [:bug_id] + + remove_index :map_bugs, :name => "map_bug_comment_id_idx" + + add_column :map_bugs, :text, :string + + drop_table :map_bug_comment + end +end diff --git a/db/migrate/055_change_map_bug_comment_type.rb b/db/migrate/055_change_map_bug_comment_type.rb new file mode 100644 index 00000000000..35186100dd6 --- /dev/null +++ b/db/migrate/055_change_map_bug_comment_type.rb @@ -0,0 +1,11 @@ +require 'migrate' + +class ChangeMapBugCommentType < ActiveRecord::Migration + def self.up + change_column :map_bug_comment, :comment, :text + end + + def self.down + change_column :map_bug_comment, :comment, :string + end +end diff --git a/db/migrate/056_add_date_closed.rb b/db/migrate/056_add_date_closed.rb new file mode 100644 index 00000000000..bb4c19c1a00 --- /dev/null +++ b/db/migrate/056_add_date_closed.rb @@ -0,0 +1,11 @@ +require 'migrate' + +class AddDateClosed < ActiveRecord::Migration + def self.up + add_column :map_bugs, :date_closed, :timestamp + end + + def self.down + remove_column :map_bugs, :date_closed + end +end diff --git a/db/migrate/057_add_map_bug_comment_event.rb b/db/migrate/057_add_map_bug_comment_event.rb new file mode 100644 index 00000000000..f28aee7d843 --- /dev/null +++ b/db/migrate/057_add_map_bug_comment_event.rb @@ -0,0 +1,15 @@ +require 'migrate' + +class AddMapBugCommentEvent < ActiveRecord::Migration + def self.up + create_enumeration :map_bug_event_enum, ["opened", "closed", "reopened", "commented", "hidden"] + + add_column :map_bug_comment, :event, :map_bug_event_enum + end + + def self.down + remove_column :map_bug_comment, :event + + drop_enumeration :map_bug_event_enum + end +end diff --git a/db/migrate/20110508145337_cleanup_bug_tables.rb b/db/migrate/20110508145337_cleanup_bug_tables.rb new file mode 100644 index 00000000000..e7dfcb793b3 --- /dev/null +++ b/db/migrate/20110508145337_cleanup_bug_tables.rb @@ -0,0 +1,25 @@ +class CleanupBugTables < ActiveRecord::Migration + def self.up + rename_column :map_bugs, :date_created, :created_at + rename_column :map_bugs, :last_changed, :updated_at + rename_column :map_bugs, :date_closed, :closed_at + + rename_column :map_bug_comment, :date_created, :created_at + rename_column :map_bug_comment, :commenter_name, :author_name + rename_column :map_bug_comment, :commenter_ip, :author_ip + rename_column :map_bug_comment, :commenter_id, :author_id + rename_column :map_bug_comment, :comment, :body + end + + def self.down + rename_column :map_bug_comment, :body, :comment + rename_column :map_bug_comment, :author_id, :commenter_id + rename_column :map_bug_comment, :author_ip, :commenter_ip + rename_column :map_bug_comment, :author_name, :commenter_name + rename_column :map_bug_comment, :created_at, :date_created + + rename_column :map_bugs, :closed_at, :date_closed + rename_column :map_bugs, :updated_at, :last_changed + rename_column :map_bugs, :created_at, :date_created + end +end diff --git a/db/migrate/20110521142405_rename_bugs_to_notes.rb b/db/migrate/20110521142405_rename_bugs_to_notes.rb new file mode 100644 index 00000000000..2934b73fd7a --- /dev/null +++ b/db/migrate/20110521142405_rename_bugs_to_notes.rb @@ -0,0 +1,51 @@ +require 'migrate' + +class RenameBugsToNotes < ActiveRecord::Migration + def self.up + rename_enumeration "map_bug_status_enum", "note_status_enum" + rename_enumeration "map_bug_event_enum", "note_event_enum" + + rename_table :map_bugs, :notes + rename_index :notes, "map_bugs_pkey", "notes_pkey" + rename_index :notes, "map_bugs_changed_idx", "notes_updated_at_idx" + rename_index :notes, "map_bugs_created_idx", "notes_created_at_idx" + rename_index :notes, "map_bugs_tile_idx", "notes_tile_status_idx" + + remove_foreign_key :map_bug_comment, [:bug_id], :map_bugs, [:id] + rename_column :map_bug_comment, :author_id, :commenter_id + remove_foreign_key :map_bug_comment, [:commenter_id], :users, [:id] + rename_column :map_bug_comment, :commenter_id, :author_id + + rename_table :map_bug_comment, :note_comments + rename_column :note_comments, :bug_id, :note_id + rename_index :note_comments, "map_bug_comment_pkey", "note_comments_pkey" + rename_index :note_comments, "map_bug_comment_id_idx", "note_comments_note_id_idx" + + add_foreign_key :note_comments, [:note_id], :notes, [:id] + add_foreign_key :note_comments, [:author_id], :users, [:id] + end + + def self.down + remove_foreign_key :note_comments, [:author_id], :users, [:id] + remove_foreign_key :note_comments, [:note_id], :notes, [:id] + + rename_index :note_comments, "note_comments_note_id_idx", "map_bug_comment_id_idx" + rename_index :notes, "note_comments_pkey", "map_bug_comment_pkey" + rename_column :note_comments, :note_id, :bug_id + rename_table :note_comments, :map_bug_comment + + rename_column :map_bug_comment, :author_id, :commenter_id + add_foreign_key :map_bug_comment, [:commenter_id], :users, [:id] + rename_column :map_bug_comment, :commenter_id, :author_id + add_foreign_key :map_bug_comment, [:bug_id], :notes, [:id] + + rename_index :notes, "notes_tile_status_idx", "map_bugs_tile_idx" + rename_index :notes, "notes_created_at_idx", "map_bugs_created_idx" + rename_index :notes, "notes_updated_at_idx", "map_bugs_changed_idx" + rename_index :notes, "notes_pkey", "map_bugs_pkey" + rename_table :notes, :map_bugs + + rename_enumeration "note_event_enum", "map_bug_event_enum" + rename_enumeration "note_status_enum", "map_bug_status_enum" + end +end diff --git a/db/migrate/20120808231205_add_counter_caches.rb b/db/migrate/20120808231205_add_counter_caches.rb new file mode 100644 index 00000000000..a26f204da59 --- /dev/null +++ b/db/migrate/20120808231205_add_counter_caches.rb @@ -0,0 +1,19 @@ +class AddCounterCaches < ActiveRecord::Migration + def self.up + add_column :users, :changesets_count, :integer, :null => false, :default => 0 + add_column :users, :traces_count, :integer, :null => false, :default => 0 + + Changeset.group(:user_id).pluck(:user_id).each do |user_id| + User.reset_counters(user_id, :changesets) + end + + Trace.group(:user_id).pluck(:user_id).each do |user_id| + User.reset_counters(user_id, :traces) + end + end + + def self.down + remove_column :users, :changesets_count + remove_column :users, :traces_count + end +end diff --git a/db/migrate/20121005195010_add_diary_entry_counter_caches.rb b/db/migrate/20121005195010_add_diary_entry_counter_caches.rb new file mode 100644 index 00000000000..9c2c7271059 --- /dev/null +++ b/db/migrate/20121005195010_add_diary_entry_counter_caches.rb @@ -0,0 +1,13 @@ +class AddDiaryEntryCounterCaches < ActiveRecord::Migration + def self.up + add_column :users, :diary_entries_count, :integer, :null => false, :default => 0 + + DiaryEntry.group(:user_id).pluck(:user_id).each do |user_id| + User.reset_counters(user_id, :diary_entries) + end + end + + def self.down + remove_column :users, :diary_entries_count + end +end diff --git a/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb new file mode 100644 index 00000000000..e430d5b3cde --- /dev/null +++ b/db/migrate/20121012044047_add_image_use_gravatar_to_users.rb @@ -0,0 +1,14 @@ +class AddImageUseGravatarToUsers < ActiveRecord::Migration + def self.up + add_column :users, :image_use_gravatar, :boolean, :null => false, :default => false + + # For people who don't have images on osm.org, enable Gravatar. + User.where(:image_file_name => nil).update_all(:image_use_gravatar => true) + + change_column_default :users, :image_use_gravatar, true + end + + def self.down + remove_column :users, :image_use_gravatar + end +end diff --git a/db/migrate/20121119165817_drop_nearby_place_from_notes.rb b/db/migrate/20121119165817_drop_nearby_place_from_notes.rb new file mode 100644 index 00000000000..bbef259467d --- /dev/null +++ b/db/migrate/20121119165817_drop_nearby_place_from_notes.rb @@ -0,0 +1,9 @@ +class DropNearbyPlaceFromNotes < ActiveRecord::Migration + def up + remove_column :notes, :nearby_place + end + + def down + add_column :notes, :nearby_place, :string + end +end diff --git a/db/migrate/20121202155309_remove_author_name_from_note_comment.rb b/db/migrate/20121202155309_remove_author_name_from_note_comment.rb new file mode 100644 index 00000000000..60d0ab23bd0 --- /dev/null +++ b/db/migrate/20121202155309_remove_author_name_from_note_comment.rb @@ -0,0 +1,9 @@ +class RemoveAuthorNameFromNoteComment < ActiveRecord::Migration + def up + remove_column :note_comments, :author_name + end + + def down + add_column :note_comments, :author_name, :string + end +end diff --git a/db/migrate/20121203124841_change_note_address_to_inet.rb b/db/migrate/20121203124841_change_note_address_to_inet.rb new file mode 100644 index 00000000000..e4e53e35a81 --- /dev/null +++ b/db/migrate/20121203124841_change_note_address_to_inet.rb @@ -0,0 +1,9 @@ +class ChangeNoteAddressToInet < ActiveRecord::Migration + def up + execute "ALTER TABLE note_comments ALTER COLUMN author_ip TYPE inet USING CAST(author_ip AS inet)" + end + + def down + change_column :note_comments, :author_ip, :string + end +end diff --git a/db/migrate/20130328184137_add_write_notes_permission.rb b/db/migrate/20130328184137_add_write_notes_permission.rb new file mode 100644 index 00000000000..c7da1740f9c --- /dev/null +++ b/db/migrate/20130328184137_add_write_notes_permission.rb @@ -0,0 +1,11 @@ +class AddWriteNotesPermission < ActiveRecord::Migration + def up + add_column :oauth_tokens, :allow_write_notes, :boolean, :null => false, :default => false + add_column :client_applications, :allow_write_notes, :boolean, :null => false, :default => false + end + + def down + remove_column :client_applications, :allow_write_notes + remove_column :oauth_tokens, :allow_write_notes + end +end diff --git a/db/migrate/20131212124700_add_created_at_index_to_note_comments.rb b/db/migrate/20131212124700_add_created_at_index_to_note_comments.rb new file mode 100644 index 00000000000..8322047345a --- /dev/null +++ b/db/migrate/20131212124700_add_created_at_index_to_note_comments.rb @@ -0,0 +1,5 @@ +class AddCreatedAtIndexToNoteComments < ActiveRecord::Migration + def change + add_index :note_comments, :created_at + end +end diff --git a/db/migrate/20140115192822_add_text_index_to_note_comments.rb b/db/migrate/20140115192822_add_text_index_to_note_comments.rb new file mode 100644 index 00000000000..e4337459523 --- /dev/null +++ b/db/migrate/20140115192822_add_text_index_to_note_comments.rb @@ -0,0 +1,11 @@ +require 'migrate' + +class AddTextIndexToNoteComments < ActiveRecord::Migration + def up + add_index :note_comments, [], :columns => "to_tsvector('english', body)", :method => "GIN", :name => "index_note_comments_on_body" + end + + def down + remove_index :note_comments, :name => "index_note_comments_on_body" + end +end diff --git a/db/migrate/20140117185510_drop_countries.rb b/db/migrate/20140117185510_drop_countries.rb new file mode 100644 index 00000000000..fe9144cbb28 --- /dev/null +++ b/db/migrate/20140117185510_drop_countries.rb @@ -0,0 +1,5 @@ +class DropCountries < ActiveRecord::Migration + def change + drop_table :countries + end +end diff --git a/db/migrate/20140210003018_add_user_image_content_type.rb b/db/migrate/20140210003018_add_user_image_content_type.rb new file mode 100644 index 00000000000..d212931fc05 --- /dev/null +++ b/db/migrate/20140210003018_add_user_image_content_type.rb @@ -0,0 +1,5 @@ +class AddUserImageContentType < ActiveRecord::Migration + def change + add_column :users, :image_content_type, :string + end +end diff --git a/db/structure.sql b/db/structure.sql index 42e9733b181..1d6170bc416 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -3,6 +3,7 @@ -- SET statement_timeout = 0; +SET lock_timeout = 0; SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SET check_function_bodies = false; @@ -61,6 +62,30 @@ CREATE TYPE gpx_visibility_enum AS ENUM ( ); +-- +-- Name: note_event_enum; Type: TYPE; Schema: public; Owner: - +-- + +CREATE TYPE note_event_enum AS ENUM ( + 'opened', + 'closed', + 'reopened', + 'commented', + 'hidden' +); + + +-- +-- Name: note_status_enum; Type: TYPE; Schema: public; Owner: - +-- + +CREATE TYPE note_status_enum AS ENUM ( + 'open', + 'closed', + 'hidden' +); + + -- -- Name: nwr_enum; Type: TYPE; Schema: public; Owner: - -- @@ -225,7 +250,8 @@ CREATE TABLE client_applications ( allow_write_diary boolean DEFAULT false NOT NULL, allow_write_api boolean DEFAULT false NOT NULL, allow_read_gpx boolean DEFAULT false NOT NULL, - allow_write_gpx boolean DEFAULT false NOT NULL + allow_write_gpx boolean DEFAULT false NOT NULL, + allow_write_notes boolean DEFAULT false NOT NULL ); @@ -248,39 +274,6 @@ CREATE SEQUENCE client_applications_id_seq ALTER SEQUENCE client_applications_id_seq OWNED BY client_applications.id; --- --- Name: countries; Type: TABLE; Schema: public; Owner: -; Tablespace: --- - -CREATE TABLE countries ( - id integer NOT NULL, - code character varying(2) NOT NULL, - min_lat double precision NOT NULL, - max_lat double precision NOT NULL, - min_lon double precision NOT NULL, - max_lon double precision NOT NULL -); - - --- --- Name: countries_id_seq; Type: SEQUENCE; Schema: public; Owner: - --- - -CREATE SEQUENCE countries_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; - - --- --- Name: countries_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - --- - -ALTER SEQUENCE countries_id_seq OWNED BY countries.id; - - -- -- Name: current_node_tags; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -700,6 +693,76 @@ CREATE TABLE nodes ( ); +-- +-- Name: note_comments; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- + +CREATE TABLE note_comments ( + id integer NOT NULL, + note_id bigint NOT NULL, + visible boolean NOT NULL, + created_at timestamp without time zone NOT NULL, + author_ip inet, + author_id bigint, + body text, + event note_event_enum +); + + +-- +-- Name: note_comments_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE note_comments_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: note_comments_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE note_comments_id_seq OWNED BY note_comments.id; + + +-- +-- Name: notes; Type: TABLE; Schema: public; Owner: -; Tablespace: +-- + +CREATE TABLE notes ( + id integer NOT NULL, + latitude integer NOT NULL, + longitude integer NOT NULL, + tile bigint NOT NULL, + updated_at timestamp without time zone NOT NULL, + created_at timestamp without time zone NOT NULL, + status note_status_enum NOT NULL, + closed_at timestamp without time zone +); + + +-- +-- Name: notes_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE notes_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: notes_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE notes_id_seq OWNED BY notes.id; + + -- -- Name: oauth_nonces; Type: TABLE; Schema: public; Owner: -; Tablespace: -- @@ -756,7 +819,8 @@ CREATE TABLE oauth_tokens ( callback_url character varying(255), verifier character varying(20), scope character varying(255), - valid_to timestamp without time zone + valid_to timestamp without time zone, + allow_write_notes boolean DEFAULT false NOT NULL ); @@ -1004,7 +1068,12 @@ CREATE TABLE users ( terms_seen boolean DEFAULT false NOT NULL, openid_url character varying(255), description_format format_enum DEFAULT 'html'::format_enum NOT NULL, - image_fingerprint character varying(255) + image_fingerprint character varying(255), + changesets_count integer DEFAULT 0 NOT NULL, + traces_count integer DEFAULT 0 NOT NULL, + diary_entries_count integer DEFAULT 0 NOT NULL, + image_use_gravatar boolean DEFAULT true NOT NULL, + image_content_type character varying(255) ); @@ -1086,13 +1155,6 @@ ALTER TABLE ONLY changesets ALTER COLUMN id SET DEFAULT nextval('changesets_id_s ALTER TABLE ONLY client_applications ALTER COLUMN id SET DEFAULT nextval('client_applications_id_seq'::regclass); --- --- Name: id; Type: DEFAULT; Schema: public; Owner: - --- - -ALTER TABLE ONLY countries ALTER COLUMN id SET DEFAULT nextval('countries_id_seq'::regclass); - - -- -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- @@ -1156,6 +1218,20 @@ ALTER TABLE ONLY gpx_files ALTER COLUMN id SET DEFAULT nextval('gpx_files_id_seq ALTER TABLE ONLY messages ALTER COLUMN id SET DEFAULT nextval('messages_id_seq'::regclass); +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY note_comments ALTER COLUMN id SET DEFAULT nextval('note_comments_id_seq'::regclass); + + +-- +-- Name: id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY notes ALTER COLUMN id SET DEFAULT nextval('notes_id_seq'::regclass); + + -- -- Name: id; Type: DEFAULT; Schema: public; Owner: - -- @@ -1229,14 +1305,6 @@ ALTER TABLE ONLY client_applications ADD CONSTRAINT client_applications_pkey PRIMARY KEY (id); --- --- Name: countries_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: --- - -ALTER TABLE ONLY countries - ADD CONSTRAINT countries_pkey PRIMARY KEY (id); - - -- -- Name: current_node_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -1373,6 +1441,22 @@ ALTER TABLE ONLY nodes ADD CONSTRAINT nodes_pkey PRIMARY KEY (node_id, version); +-- +-- Name: note_comments_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- + +ALTER TABLE ONLY note_comments + ADD CONSTRAINT note_comments_pkey PRIMARY KEY (id); + + +-- +-- Name: notes_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- + +ALTER TABLE ONLY notes + ADD CONSTRAINT notes_pkey PRIMARY KEY (id); + + -- -- Name: oauth_nonces_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -1534,13 +1618,6 @@ CREATE INDEX changesets_user_id_created_at_idx ON changesets USING btree (user_i CREATE INDEX changesets_user_id_id_idx ON changesets USING btree (user_id, id); --- --- Name: countries_code_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE UNIQUE INDEX countries_code_idx ON countries USING btree (code); - - -- -- Name: current_nodes_tile_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -1667,6 +1744,20 @@ CREATE INDEX gpx_files_visible_visibility_idx ON gpx_files USING btree (visible, CREATE UNIQUE INDEX index_client_applications_on_key ON client_applications USING btree (key); +-- +-- Name: index_note_comments_on_body; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX index_note_comments_on_body ON note_comments USING gin (to_tsvector('english'::regconfig, body)); + + +-- +-- Name: index_note_comments_on_created_at; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX index_note_comments_on_created_at ON note_comments USING btree (created_at); + + -- -- Name: index_oauth_nonces_on_nonce_and_timestamp; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -1723,6 +1814,34 @@ CREATE INDEX nodes_tile_idx ON nodes USING btree (tile); CREATE INDEX nodes_timestamp_idx ON nodes USING btree ("timestamp"); +-- +-- Name: note_comments_note_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX note_comments_note_id_idx ON note_comments USING btree (note_id); + + +-- +-- Name: notes_created_at_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX notes_created_at_idx ON notes USING btree (created_at); + + +-- +-- Name: notes_tile_status_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX notes_tile_status_idx ON notes USING btree (tile, status); + + +-- +-- Name: notes_updated_at_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: +-- + +CREATE INDEX notes_updated_at_idx ON notes USING btree (updated_at); + + -- -- Name: points_gpxid_idx; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -2057,6 +2176,22 @@ ALTER TABLE ONLY nodes ADD CONSTRAINT nodes_redaction_id_fkey FOREIGN KEY (redaction_id) REFERENCES redactions(id); +-- +-- Name: note_comments_author_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY note_comments + ADD CONSTRAINT note_comments_author_id_fkey FOREIGN KEY (author_id) REFERENCES users(id); + + +-- +-- Name: note_comments_note_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY note_comments + ADD CONSTRAINT note_comments_note_id_fkey FOREIGN KEY (note_id) REFERENCES notes(id); + + -- -- Name: oauth_tokens_client_application_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -2205,6 +2340,8 @@ ALTER TABLE ONLY ways -- PostgreSQL database dump complete -- +SET search_path TO "$user",public; + INSERT INTO schema_migrations (version) VALUES ('1'); INSERT INTO schema_migrations (version) VALUES ('10'); @@ -2241,6 +2378,10 @@ INSERT INTO schema_migrations (version) VALUES ('20101114011429'); INSERT INTO schema_migrations (version) VALUES ('20110322001319'); +INSERT INTO schema_migrations (version) VALUES ('20110508145337'); + +INSERT INTO schema_migrations (version) VALUES ('20110521142405'); + INSERT INTO schema_migrations (version) VALUES ('20110925112722'); INSERT INTO schema_migrations (version) VALUES ('20111116184519'); @@ -2263,6 +2404,28 @@ INSERT INTO schema_migrations (version) VALUES ('20120328090602'); INSERT INTO schema_migrations (version) VALUES ('20120404205604'); +INSERT INTO schema_migrations (version) VALUES ('20120808231205'); + +INSERT INTO schema_migrations (version) VALUES ('20121005195010'); + +INSERT INTO schema_migrations (version) VALUES ('20121012044047'); + +INSERT INTO schema_migrations (version) VALUES ('20121119165817'); + +INSERT INTO schema_migrations (version) VALUES ('20121202155309'); + +INSERT INTO schema_migrations (version) VALUES ('20121203124841'); + +INSERT INTO schema_migrations (version) VALUES ('20130328184137'); + +INSERT INTO schema_migrations (version) VALUES ('20131212124700'); + +INSERT INTO schema_migrations (version) VALUES ('20140115192822'); + +INSERT INTO schema_migrations (version) VALUES ('20140117185510'); + +INSERT INTO schema_migrations (version) VALUES ('20140210003018'); + INSERT INTO schema_migrations (version) VALUES ('21'); INSERT INTO schema_migrations (version) VALUES ('22'); @@ -2333,10 +2496,20 @@ INSERT INTO schema_migrations (version) VALUES ('51'); INSERT INTO schema_migrations (version) VALUES ('52'); +INSERT INTO schema_migrations (version) VALUES ('53'); + +INSERT INTO schema_migrations (version) VALUES ('54'); + +INSERT INTO schema_migrations (version) VALUES ('55'); + +INSERT INTO schema_migrations (version) VALUES ('56'); + +INSERT INTO schema_migrations (version) VALUES ('57'); + INSERT INTO schema_migrations (version) VALUES ('6'); INSERT INTO schema_migrations (version) VALUES ('7'); INSERT INTO schema_migrations (version) VALUES ('8'); -INSERT INTO schema_migrations (version) VALUES ('9'); \ No newline at end of file +INSERT INTO schema_migrations (version) VALUES ('9'); diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb index e560dbefa6c..38b994d26a6 100644 --- a/lib/bounding_box.rb +++ b/lib/bounding_box.rb @@ -37,6 +37,13 @@ def self.from_lon_lat_params(params) from_bbox_array(bbox_array) end + def self.from_lrbt_params(params) + if params[:l] and params[:b] and params[:t] and params[:t] + bbox_array = [params[:l], params[:b], params[:r], params[:t]] + end + from_bbox_array(bbox_array) + end + def expand!(bbox, margin = 0) update!(bbox) unless complete? # only try to expand the bbox if there is a value for every coordinate @@ -71,10 +78,10 @@ def check_boundaries self end - def check_size + def check_size(max_area = MAX_REQUEST_AREA) # check the bbox isn't too large - if area > MAX_REQUEST_AREA - raise OSM::APIBadBoundingBox.new("The maximum bbox size is " + MAX_REQUEST_AREA.to_s + + if area > max_area + raise OSM::APIBadBoundingBox.new("The maximum bbox size is " + max_area.to_s + ", and your request was too large. Either request a smaller area, or use planet.osm") end self diff --git a/lib/classic_pagination/pagination.rb b/lib/classic_pagination/pagination.rb index 6a3e1a97b0f..fa1307beef8 100644 --- a/lib/classic_pagination/pagination.rb +++ b/lib/classic_pagination/pagination.rb @@ -173,21 +173,34 @@ def create_paginators_and_retrieve_collections #:nodoc: # the +model+ and given +conditions+. Override this method to implement a # custom counter. def count_collection_for_pagination(model, options) - model.count(:conditions => options[:conditions], - :joins => options[:join] || options[:joins], - :include => options[:include], - :select => (options[:group] ? "DISTINCT #{options[:group]}" : options[:count])) + collection = model.joins(options[:join] || options[:joins]) + collection = collection.where(options[:conditions]) + collection = collection.includes(options[:include]) + + if options[:group] + collection = collection.select(options[:group]).distinct + elsif options[:count] + collection = collection.select(options[:count]) + end + + collection.count end # Returns a collection of items for the given +model+ and +options[conditions]+, # ordered by +options[order]+, for the current page in the given +paginator+. # Override this method to implement a custom finder. def find_collection_for_pagination(model, options, paginator) - model.find(:all, :conditions => options[:conditions], - :order => options[:order_by] || options[:order], - :joins => options[:join] || options[:joins], :include => options[:include], - :select => options[:select], :limit => options[:per_page], - :group => options[:group], :offset => paginator.current.offset) + collection = model.joins(options[:join] || options[:joins]) + collection = collection.where(options[:conditions]) + collection = collection.order(options[:order_by] || options[:order]) + collection = collection.includes(options[:include]) + collection = collection.group(options[:group]) + + if options[:select] + collection = collection.select(options[:select]) + end + + collection.offset(paginator.current.offset).limit(options[:per_page]) end protected :create_paginators_and_retrieve_collections, diff --git a/lib/country.rb b/lib/country.rb new file mode 100644 index 00000000000..ea52efd77cc --- /dev/null +++ b/lib/country.rb @@ -0,0 +1,38 @@ +class Country + attr_reader :code, :min_lat, :max_lat, :min_lon, :max_lon + + def initialize(code, min_lat, max_lat, min_lon, max_lon) + @code = code + @min_lat = min_lat + @max_lat = max_lat + @min_lon = min_lon + @max_lon = max_lon + end + + def self.find_by_code(code) + countries[code] + end + +private + + def self.countries + @@countries ||= load_countries + end + + def self.load_countries + countries = Hash.new + xml = REXML::Document.new(File.read("config/countries.xml")) + + xml.elements.each("geonames/country") do |ele| + code = ele.get_text("countryCode").to_s + minlon = ele.get_text("west").to_s + minlat = ele.get_text("south").to_s + maxlon = ele.get_text("east").to_s + maxlat = ele.get_text("north").to_s + + countries[code] = Country.new(code, minlat.to_f, maxlat.to_f, minlon.to_f, maxlon.to_f) + end + + countries + end +end diff --git a/lib/editors.rb b/lib/editors.rb index ed1de5999d1..101a6f80c45 100644 --- a/lib/editors.rb +++ b/lib/editors.rb @@ -1,3 +1,4 @@ module Editors - ALL_EDITORS = [ "potlatch", "potlatch2", "remote" ] + ALL_EDITORS = [ "potlatch", "potlatch2", "id", "remote" ] + RECOMMENDED_EDITORS = [ "id", "potlatch2", "remote" ] end diff --git a/lib/geo_record.rb b/lib/geo_record.rb index 0d010eb869b..fbfb0c2ce07 100644 --- a/lib/geo_record.rb +++ b/lib/geo_record.rb @@ -5,7 +5,7 @@ module GeoRecord SCALE = 10000000 def self.included(base) - base.scope :bbox, lambda { |bbox| base.where(OSM.sql_for_area(bbox)) } + base.scope :bbox, ->(bbox) { base.where(OSM.sql_for_area(bbox)) } base.before_save :update_tile end @@ -45,4 +45,3 @@ def lat2y(a) 180/Math::PI * Math.log(Math.tan(Math::PI/4+a*(Math::PI/180)/2)) end end - diff --git a/lib/id.rb b/lib/id.rb new file mode 100644 index 00000000000..15b7f836742 --- /dev/null +++ b/lib/id.rb @@ -0,0 +1,3 @@ +module ID + LOCALES = Rails.root.join('vendor/assets/iD/iD/locales').entries.map {|p| p.basename.to_s[/(.*).json/] && $1 }.compact +end diff --git a/lib/mem_cache.rb b/lib/mem_cache.rb deleted file mode 100644 index ddb842b533a..00000000000 --- a/lib/mem_cache.rb +++ /dev/null @@ -1,31 +0,0 @@ -class MemCache < Memcached::Rails - DEFAULT_OPTIONS = Memcached::DEFAULTS.merge(Memcached::Rails::DEFAULTS) - - MemCacheError = Memcached::Error - - @@connections = [] - - def initialize(options = {}) - options.reverse_merge! :namespace_separator => ":" - - super(MEMCACHE_SERVERS, options) - - @@connections.push(self) - - ObjectSpace.define_finalizer(self, lambda { |connection| - @@connections.remove(connection) - }) - end - - def self.connections - @@connections - end -end - -if defined?(PhusionPassenger) - PhusionPassenger.on_event(:starting_worker_process) do |forked| - if forked - MemCache.connections.each { |connection| connection.reset } - end - end -end diff --git a/lib/memcache.rb b/lib/memcache.rb deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/lib/migrate.rb b/lib/migrate.rb index 7549add2abf..7c14333b30a 100644 --- a/lib/migrate.rb +++ b/lib/migrate.rb @@ -87,18 +87,23 @@ def enumerations @enumerations ||= Hash.new end - def create_enumeration (enumeration_name, values) + def create_enumeration(enumeration_name, values) enumerations[enumeration_name] = values - execute "create type #{enumeration_name} as enum ('#{values.join '\',\''}')" + execute "CREATE TYPE #{enumeration_name} AS ENUM ('#{values.join '\',\''}')" end - def drop_enumeration (enumeration_name) - execute "drop type #{enumeration_name}" + def drop_enumeration(enumeration_name) + execute "DROP TYPE #{enumeration_name}" enumerations.delete(enumeration_name) end + def rename_enumeration(old_name, new_name) + execute "ALTER TYPE #{quote_table_name(old_name)} RENAME TO #{quote_table_name(new_name)}" + end + def alter_primary_key(table_name, new_columns) - execute "alter table #{table_name} drop constraint #{table_name}_pkey; alter table #{table_name} add primary key (#{new_columns.join(',')})" + execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{table_name}_pkey" + execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{new_columns.join(',')})" end def interval_constant(interval) @@ -121,10 +126,17 @@ def add_index(table_name, column_name, options = {}) if Hash === options and options[:lowercase] quoted_column_names = quoted_column_names.map { |e| "LOWER(#{e})" } end + if Hash === options and options[:columns] + quoted_column_names = quoted_column_names + Array[options[:columns]] + end quoted_column_names = quoted_column_names.join(", ") execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} USING #{index_method} (#{quoted_column_names})" end + + def rename_index(table_name, old_name, new_name) + execute "ALTER INDEX #{quote_table_name(old_name)} RENAME TO #{quote_table_name(new_name)}" + end end end end diff --git a/lib/nominatim.rb b/lib/nominatim.rb new file mode 100644 index 00000000000..33a0c3e26ac --- /dev/null +++ b/lib/nominatim.rb @@ -0,0 +1,26 @@ +module Nominatim + extend ActionView::Helpers::NumberHelper + + def self.describe_location(lat, lon, zoom = nil, language = nil) + zoom = zoom || 14 + language = language || http_accept_language.user_preferred_languages.join(',') + + Rails.cache.fetch "/nominatim/location/#{lat}/#{lon}/#{zoom}/#{language}" do + url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}" + + begin + response = OSM::Timer.timeout(4) do + REXML::Document.new(Net::HTTP.get(URI.parse(url))) + end + rescue Exception + response = nil + end + + if response and result = response.get_text("reversegeocode/result") + result.to_s + else + "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}" + end + end + end +end diff --git a/lib/object_finder.rb b/lib/object_finder.rb deleted file mode 100644 index 26608a7f970..00000000000 --- a/lib/object_finder.rb +++ /dev/null @@ -1,5 +0,0 @@ -module ObjectFinder - def visible - find :all, :conditions => "#{proxy_reflection.table_name}.visible = 1" - end -end diff --git a/lib/object_metadata.rb b/lib/object_metadata.rb new file mode 100644 index 00000000000..4243c6437de --- /dev/null +++ b/lib/object_metadata.rb @@ -0,0 +1,41 @@ +module ObjectMetadata + def add_metadata_to_xml_node(el, osm, changeset_cache, user_display_name_cache) + el['changeset'] = osm.changeset_id.to_s + el['redacted'] = osm.redaction.id.to_s if osm.redacted? + el['timestamp'] = osm.timestamp.xmlschema + el['version'] = osm.version.to_s + el['visible'] = osm.visible.to_s + + if changeset_cache.key?(osm.changeset_id) + # use the cache if available + else + changeset_cache[osm.changeset_id] = osm.changeset.user_id + end + + user_id = changeset_cache[osm.changeset_id] + + if user_display_name_cache.key?(user_id) + # use the cache if available + elsif osm.changeset.user.data_public? + user_display_name_cache[user_id] = osm.changeset.user.display_name + else + user_display_name_cache[user_id] = nil + end + + unless user_display_name_cache[user_id].nil? + el['user'] = user_display_name_cache[user_id] + el['uid'] = user_id.to_s + end + end + + def add_tags_to_xml_node(el, tags) + tags.each do |tag| + tag_el = XML::Node.new('tag') + + tag_el['k'] = tag.k + tag_el['v'] = tag.v + + el << tag_el + end + end +end diff --git a/lib/osm.rb b/lib/osm.rb index 8902e6c9e25..9e819829921 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -5,7 +5,6 @@ module OSM require 'rexml/parsers/sax2parser' require 'rexml/text' require 'xml/libxml' - require 'digest/md5' if defined?(SystemTimer) Timer = SystemTimer @@ -281,6 +280,57 @@ def to_s end end + # Raised when the note provided is already closed + class APINoteAlreadyClosedError < APIError + def initialize(note) + @note = note + end + + attr_reader :note + + def status + :conflict + end + + def to_s + "The note #{@note.id} was closed at #{@note.closed_at}" + end + end + + # Raised when the note provided is already open + class APINoteAlreadyOpenError < APIError + def initialize(note) + @note = note + end + + attr_reader :note + + def status + :conflict + end + + def to_s + "The note #{@note.id} is already open" + end + end + + # raised when a two preferences have a duplicate key string. + class APIDuplicatePreferenceError < APIError + def initialize(key) + @key = key + end + + attr_reader :key + + def status + :bad_request + end + + def to_s + "Duplicate preferences with key #{@key}" + end + end + # Helper methods for going to/from mercator and lat/lng. class Mercator include Math @@ -349,7 +399,7 @@ def bounds(radius) begin lonradius = 2 * asin(sqrt(sin(radius / 6372.795 / 2) ** 2 / cos(@lat) ** 2)) - rescue Errno::EDOM + rescue Errno::EDOM, Math::DomainError lonradius = PI end @@ -367,92 +417,6 @@ def sql_for_distance(lat_field, lon_field) end end - class GeoRSS - def initialize(feed_title='OpenStreetMap GPS Traces', feed_description='OpenStreetMap GPS Traces', feed_url='http://www.openstreetmap.org/traces/') - @doc = XML::Document.new - @doc.encoding = XML::Encoding::UTF_8 - - rss = XML::Node.new 'rss' - @doc.root = rss - rss['version'] = "2.0" - rss['xmlns:geo'] = "http://www.w3.org/2003/01/geo/wgs84_pos#" - @channel = XML::Node.new 'channel' - rss << @channel - title = XML::Node.new 'title' - title << feed_title - @channel << title - description_el = XML::Node.new 'description' - @channel << description_el - - description_el << feed_description - link = XML::Node.new 'link' - link << feed_url - @channel << link - image = XML::Node.new 'image' - @channel << image - url = XML::Node.new 'url' - url << 'http://www.openstreetmap.org/images/mag_map-rss2.0.png' - image << url - title = XML::Node.new 'title' - title << "OpenStreetMap" - image << title - width = XML::Node.new 'width' - width << '100' - image << width - height = XML::Node.new 'height' - height << '100' - image << height - link = XML::Node.new 'link' - link << feed_url - image << link - end - - def add(latitude=0, longitude=0, title_text='dummy title', author_text='anonymous', url='http://www.example.com/', description_text='dummy description', timestamp=DateTime.now) - item = XML::Node.new 'item' - - title = XML::Node.new 'title' - item << title - title << title_text - link = XML::Node.new 'link' - link << url - item << link - - guid = XML::Node.new 'guid' - guid << url - item << guid - - description = XML::Node.new 'description' - description << description_text - item << description - - author = XML::Node.new 'author' - author << author_text - item << author - - pubDate = XML::Node.new 'pubDate' - pubDate << timestamp.to_s(:rfc822) - item << pubDate - - if latitude - lat_el = XML::Node.new 'geo:lat' - lat_el << latitude.to_s - item << lat_el - end - - if longitude - lon_el = XML::Node.new 'geo:long' - lon_el << longitude.to_s - item << lon_el - end - - @channel << item - end - - def to_s - return @doc.to_s - end - end - class API def get_xml_doc doc = XML::Document.new @@ -460,6 +424,9 @@ def get_xml_doc root = XML::Node.new 'osm' root['version'] = API_VERSION.to_s root['generator'] = GENERATOR + root['copyright'] = COPYRIGHT_OWNER + root['attribution'] = ATTRIBUTION_URL + root['license'] = LICENSE_URL doc.root = root return doc end @@ -477,7 +444,7 @@ def self.IPToCountry(ip_address) country = "GB" if country == "UK" end end - + return country.upcase end @@ -496,6 +463,13 @@ def self.IPLocation(ip_address) return nil end + # Parse a float, raising a specified exception on failure + def self.parse_float(str, klass, *args) + Float(str) + rescue + raise klass.new(*args) + end + # Construct a random token of a given length def self.make_token(length = 30) chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' @@ -508,12 +482,6 @@ def self.make_token(length = 30) return token end - # Return an encrypted version of a password - def self.encrypt_password(password, salt) - return Digest::MD5.hexdigest(password) if salt.nil? - return Digest::MD5.hexdigest(salt + password) - end - # Return an SQL fragment to select a given area of the globe def self.sql_for_area(bbox, prefix = nil) tilesql = QuadTile.sql_for_area(bbox, prefix) diff --git a/lib/password_hash.rb b/lib/password_hash.rb new file mode 100644 index 00000000000..5adfc7a3474 --- /dev/null +++ b/lib/password_hash.rb @@ -0,0 +1,55 @@ +require "securerandom" +require "openssl" +require "base64" +require "digest/md5" + +module PasswordHash + SALT_BYTE_SIZE = 32 + HASH_BYTE_SIZE = 32 + PBKDF2_ITERATIONS = 1000 + DIGEST_ALGORITHM = "sha512" + + def self.create(password) + salt = SecureRandom.base64(SALT_BYTE_SIZE) + hash = self.hash(password, salt, PBKDF2_ITERATIONS, HASH_BYTE_SIZE, DIGEST_ALGORITHM) + return hash, [DIGEST_ALGORITHM, PBKDF2_ITERATIONS, salt].join("!") + end + + def self.check(hash, salt, candidate) + if salt.nil? + candidate = Digest::MD5.hexdigest(candidate) + elsif salt =~ /!/ + algorithm, iterations, salt = salt.split("!") + size = Base64.strict_decode64(hash).length + candidate = self.hash(candidate, salt, iterations.to_i, size, algorithm) + else + candidate = Digest::MD5.hexdigest(salt + candidate) + end + + return hash == candidate + end + + def self.upgrade?(hash, salt) + if salt.nil? + return true + elsif salt =~ /!/ + algorithm, iterations, salt = salt.split("!") + return true if Base64.strict_decode64(salt).length != SALT_BYTE_SIZE + return true if Base64.strict_decode64(hash).length != HASH_BYTE_SIZE + return true if iterations.to_i != PBKDF2_ITERATIONS + return true if algorithm != DIGEST_ALGORITHM + else + return true + end + + return false + end + +private + + def self.hash(password, salt, iterations, size, algorithm) + digest = OpenSSL::Digest.new(algorithm) + pbkdf2 = OpenSSL::PKCS5::pbkdf2_hmac(password, salt, iterations, size, digest) + Base64.strict_encode64(pbkdf2) + end +end diff --git a/lib/potlatch.rb b/lib/potlatch.rb index 919eb012298..359492fa7f1 100644 --- a/lib/potlatch.rb +++ b/lib/potlatch.rb @@ -106,7 +106,8 @@ def self.encodevalue(n) end # Encode string with two-byte length - def self.encodestring(n) + 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 diff --git a/lib/potlatch2.rb b/lib/potlatch2.rb index 690df07dc42..95a86d4797a 100644 --- a/lib/potlatch2.rb +++ b/lib/potlatch2.rb @@ -2,17 +2,26 @@ module Potlatch2 LOCALES = { "ar" => "ar", "ast" => "ast", + "az" => "az", + "be" => "be", + "be-Tarask" => "be-tarask", + "bn" => "bn", "br" => "br", + "bs" => "bs", "ca" => "ca", "cs" => "cs_CZ", + "da" => "da", "de" => "de_DE", "diq" => "diq", "dsb" => "dsb", "en" => "en_US", "en-GB" => "en_GB", + "el" => "el", "es" => "es_ES", + "et" => "et", "fa" => "fa", "fi" => "fi", + "fo" => "fo", "fr" => "fr_FR", "ga" => "ga", "gl" => "gl", @@ -23,6 +32,8 @@ module Potlatch2 "it" => "it_IT", "ja" => "ja_JP", "ka" => "ka", + "ko" => "ko", + "ky" => "ky", "lb" => "lb", "lt" => "lt", "lv" => "lv", @@ -35,13 +46,14 @@ module Potlatch2 "pl" => "pl_PL", "pt" => "pt_PT", "pt-BR" => "pt_BR", + "ro" => "ro", "ru" => "ru", "rue" => "rue", "sk" => "sk", "sl" => "sl", "sq" => "sq", - "sr-EC" => "sr-ec", - "sr-EL" => "sr-el", + "sr" => "sr-ec", + "sr-Latn" => "sr-el", "sv" => "sv_SE", "ta" => "ta", "tl" => "tl", diff --git a/lib/redactable.rb b/lib/redactable.rb index d8367d7bdf7..620b2196eea 100644 --- a/lib/redactable.rb +++ b/lib/redactable.rb @@ -4,7 +4,7 @@ module Redactable def self.included(base) # this is used to extend activerecord bases, as these aren't # in scope for the module itself. - base.scope :unredacted, base.where(:redaction_id => nil) + base.scope :unredacted, -> { base.where(:redaction_id => nil) } end def redacted? diff --git a/lib/rich_text.rb b/lib/rich_text.rb index 87ea5893357..533c8fbb461 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -10,6 +10,7 @@ def self.new(format, text) class SimpleFormat include ActionView::Helpers::TextHelper + include ActionView::Helpers::OutputSafetyHelper def sanitize(text) Sanitize.clean(text, Sanitize::Config::OSM).html_safe diff --git a/lib/session_persistence.rb b/lib/session_persistence.rb index 7d45d1fc4e5..578039f5815 100644 --- a/lib/session_persistence.rb +++ b/lib/session_persistence.rb @@ -51,5 +51,7 @@ def persist_session if session[session_persistence_key] request.session_options[:expire_after] = session[session_persistence_key] end + rescue + reset_session end end diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake new file mode 100644 index 00000000000..7a915c22858 --- /dev/null +++ b/lib/tasks/testing.rake @@ -0,0 +1,5 @@ +namespace :test do + Rails::TestTask.new(lib: "test:prepare") do |t| + t.pattern = 'test/lib/**/*_test.rb' + end +end diff --git a/public/export/embed.html b/public/export/embed.html deleted file mode 100644 index a0398ab94bc..00000000000 --- a/public/export/embed.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - OpenStreetMap Embedded - - - - - - - -
    - - diff --git a/public/iD b/public/iD new file mode 120000 index 00000000000..5ef1ad48ef2 --- /dev/null +++ b/public/iD @@ -0,0 +1 @@ +../vendor/assets/iD/iD \ No newline at end of file diff --git a/public/robots.txt b/public/robots.txt index c0e70dfd8fb..d2801eab961 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,55 +1,8 @@ Sitemap: http://www.openstreetmap.org/sitemap.xml.gz User-agent: * -Disallow: /user/ -Disallow: /traces/tag/ -Disallow: /traces/page/ -Disallow: /api/ -Disallow: /edit -Allow: /browse/node/ -Allow: /browse/way/ -Allow: /browse/relation/ -Disallow: /browse -Disallow: /login -Disallow: /geocoder -Disallow: /history -Disallow: /message -Disallow: /trace/ -Disallow: /*lat= -Disallow: /*node= -Disallow: /*way= -Disallow: /*relation= - -User-agent: Slurp -Disallow: /user/*/traces/ -Disallow: /user/*/edits -Disallow: /user/*/diary/ -Allow: /user/ -Disallow: /traces/tag/ -Disallow: /traces/page/ -Disallow: /api/ -Disallow: /edit -Disallow: /browse/node/*/history -Disallow: /browse/way/*/history -Disallow: /browse/relation/*/history -Allow: /browse/node/ -Allow: /browse/way/ -Allow: /browse/relation/ -Disallow: /browse -Disallow: /login -Disallow: /geocoder -Disallow: /history -Disallow: /message -Disallow: /trace/ -Disallow: /*lat= -Disallow: /*node= -Disallow: /*way= -Disallow: /*relation= - -User-agent: Googlebot Disallow: /user/*/traces/ Disallow: /user/*/edits -Disallow: /user/*/diary/ Allow: /user/ Disallow: /traces/tag/ Disallow: /traces/page/ diff --git a/script/cleanup b/script/cleanup index 085c3aeef52..797193cce91 100755 --- a/script/cleanup +++ b/script/cleanup @@ -2,29 +2,6 @@ require File.dirname(__FILE__) + '/../config/environment' -last_session_id = 0 - -begin - sessions = Session.find(:all, - :conditions => ["updated_at < ? and id > ?", 1.week.ago, last_session_id], - :order => :id, :limit => 1000) - - sessions.each do |session| - last_session_id = session.id - - begin - if session[:user] and User.find(session[:user]) - session.destroy if session.updated_at < 1.month.ago - else - session.destroy - end - rescue Exception => ex - puts "Invalid session #{session.session_id}: #{ex.to_s}" - session.destroy - end - end -end while sessions.length > 0 - UserToken.delete_all("expiry < NOW()") exit 0 diff --git a/script/deliver-message b/script/deliver-message index 3fd641f8dbf..e713b2cfcab 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -7,16 +7,19 @@ exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/) if recipient[1] == "c" comment = DiaryComment.find(recipient[2]) digest = comment.digest + date = diary_comment.created_at from = comment.diary_entry.user to = comment.user else message = Message.find(recipient[2]) digest = message.digest + date = message.sent_on from = message.recipient to = message.sender end exit 0 unless recipient[3] == digest[0,6] +exit 0 if date < 1.month.ago message.update_attribute(:message_read, true) if message diff --git a/script/statistics b/script/statistics index 4ceb92cfcc4..c201f6c5773 100755 --- a/script/statistics +++ b/script/statistics @@ -1,7 +1,6 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/environment' -require 'generator' start_time = Time.now @@ -79,7 +78,7 @@ begin :joins => :changeset, :group => :user_id, :order => "count_all DESC", :limit => 60) - SyncEnumerator.new(day_users, week_users, month_users).each do |row| + day_users.zip(week_users, month_users).each do |row| puts "" row.each do |column| if column.nil? diff --git a/test/functional/amf_controller_test.rb b/test/controllers/amf_controller_test.rb similarity index 99% rename from test/functional/amf_controller_test.rb rename to test/controllers/amf_controller_test.rb index 757acf6acea..36b76c3293d 100644 --- a/test/functional/amf_controller_test.rb +++ b/test/controllers/amf_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'stringio' include Potlatch @@ -416,7 +416,7 @@ def test_putpoi_create_valid 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 = Node.find(:all, :conditions => { :id => result[3] }) + historic_nodes = Node.where(: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" @@ -456,7 +456,7 @@ def test_putpoi_create_valid 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 = Node.find(:all, :conditions => { :id => result[3] }) + historic_nodes = Node.where(: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" diff --git a/test/functional/api_controller_test.rb b/test/controllers/api_controller_test.rb similarity index 98% rename from test/functional/api_controller_test.rb rename to test/controllers/api_controller_test.rb index 01a227b37d6..6426184fcdb 100644 --- a/test/functional/api_controller_test.rb +++ b/test/controllers/api_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'api_controller' class ApiControllerTest < ActionController::TestCase @@ -266,14 +266,6 @@ def test_changes_zoom_valid end end - def test_start_end_time_invalid - - end - - def test_start_end_time_invalid - - end - def test_hours_invalid invalid = %w{ -21 335 -1 0 25 26 100 one two three ping pong : } invalid.each do |hour| @@ -299,6 +291,9 @@ def test_capabilities assert_select "area[maximum=#{MAX_REQUEST_AREA}]", :count => 1 assert_select "tracepoints[per_page=#{TRACEPOINTS_PER_PAGE}]", :count => 1 assert_select "changesets[maximum_elements=#{Changeset::MAX_ELEMENTS}]", :count => 1 + assert_select "status[database=online]", :count => 1 + assert_select "status[api=online]", :count => 1 + assert_select "status[gpx=online]", :count => 1 end end end diff --git a/test/functional/browse_controller_test.rb b/test/controllers/browse_controller_test.rb similarity index 50% rename from test/functional/browse_controller_test.rb rename to test/controllers/browse_controller_test.rb index 4cc19b2d66a..2ab9106f1f9 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'browse_controller' class BrowseControllerTest < ActionController::TestCase @@ -8,70 +8,73 @@ class BrowseControllerTest < ActionController::TestCase # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/browse/start", :method => :get }, - { :controller => "browse", :action => "start" } - ) - assert_routing( - { :path => "/browse/node/1", :method => :get }, + { :path => "/node/1", :method => :get }, { :controller => "browse", :action => "node", :id => "1" } ) assert_routing( - { :path => "/browse/node/1/history", :method => :get }, + { :path => "/node/1/history", :method => :get }, { :controller => "browse", :action => "node_history", :id => "1" } ) assert_routing( - { :path => "/browse/way/1", :method => :get }, + { :path => "/way/1", :method => :get }, { :controller => "browse", :action => "way", :id => "1" } ) assert_routing( - { :path => "/browse/way/1/history", :method => :get }, + { :path => "/way/1/history", :method => :get }, { :controller => "browse", :action => "way_history", :id => "1" } ) assert_routing( - { :path => "/browse/relation/1", :method => :get }, + { :path => "/relation/1", :method => :get }, { :controller => "browse", :action => "relation", :id => "1" } ) assert_routing( - { :path => "/browse/relation/1/history", :method => :get }, + { :path => "/relation/1/history", :method => :get }, { :controller => "browse", :action => "relation_history", :id => "1" } ) assert_routing( - { :path => "/browse/changeset/1", :method => :get }, + { :path => "/changeset/1", :method => :get }, { :controller => "browse", :action => "changeset", :id => "1" } ) + assert_routing( + { :path => "/note/1", :method => :get }, + { :controller => "browse", :action => "note", :id => "1" } + ) + assert_routing( + { :path => "/note/new", :method => :get }, + { :controller => "browse", :action => "new_note" } + ) end - def test_start - xhr :get, :start - assert_response :success - end - def test_read_relation - browse_check 'relation', relations(:visible_relation).relation_id + browse_check 'relation', relations(:visible_relation).relation_id, 'browse/feature' end - + def test_read_relation_history - browse_check 'relation_history', relations(:visible_relation).relation_id + browse_check 'relation_history', relations(:visible_relation).relation_id, 'browse/history' end - + def test_read_way - browse_check 'way', ways(:visible_way).way_id + browse_check 'way', ways(:visible_way).way_id, 'browse/feature' end - + def test_read_way_history - browse_check 'way_history', ways(:visible_way).way_id + browse_check 'way_history', ways(:visible_way).way_id, 'browse/history' end - + def test_read_node - browse_check 'node', nodes(:visible_node).node_id + browse_check 'node', nodes(:visible_node).node_id, 'browse/feature' end - + def test_read_node_history - browse_check 'node_history', nodes(:visible_node).node_id + browse_check 'node_history', nodes(:visible_node).node_id, 'browse/history' end - + def test_read_changeset - browse_check 'changeset', changesets(:normal_user_first_change).id + browse_check 'changeset', changesets(:normal_user_first_change).id, 'browse/changeset' + end + + def test_read_note + browse_check 'note', notes(:open_note).id, 'browse/note' end ## @@ -79,59 +82,82 @@ def test_read_changeset # # note that these are presently highly reliant on the structure of the # page for the selection tests, which doesn't work out particularly - # well if that structure changes. so... if you change the page layout + # well if that structure changes. so... if you change the page layout # then please make it more easily (and robustly) testable! ## + def test_redacted_node + get :node, :id => current_nodes(:redacted_node).id + assert_response :success + assert_template "feature" + + # check that we don't show lat/lon for a redacted node. + assert_select ".browse-section", 1 + assert_select ".browse-section.browse-node", 1 + assert_select ".browse-section.browse-node .latitude", 0 + assert_select ".browse-section.browse-node .longitude", 0 + end + def test_redacted_node_history get :node_history, :id => nodes(:redacted_node_redacted_version).node_id assert_response :success - assert_template 'node_history' - + assert_template "browse/history" + # there are 2 revisions of the redacted node, but only one - # should be showing up here. - assert_select "body div[id=content] table[class=browse_details]", 1 - assert_select "body div[id=content] table[class=browse_details][id=1]", 0 + # should be showing details here. + assert_select ".browse-section", 2 + assert_select ".browse-section.browse-redacted", 1 + assert_select ".browse-section.browse-node", 1 + assert_select ".browse-section.browse-node .latitude", 0 + assert_select ".browse-section.browse-node .longitude", 0 end - + def test_redacted_way_history get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id assert_response :success - assert_template 'way_history' - + assert_template 'browse/history' + # there are 4 revisions of the redacted way, but only 2 - # should be showing up here. - assert_select "body div[id=content] table[class=browse_details]", 2 - # redacted revisions are 2 & 3 - assert_select "body div[id=content] table[class=browse_details][id=2]", 0 - assert_select "body div[id=content] table[class=browse_details][id=3]", 0 + # should be showing details here. + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 2 + assert_select ".browse-section.browse-way", 2 end - + def test_redacted_relation_history get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id assert_response :success - assert_template 'relation_history' - + assert_template 'browse/history' + # there are 4 revisions of the redacted relation, but only 2 - # should be showing up here. - assert_select "body div[id=content] table[class=browse_details]", 2 - # redacted revisions are 2 & 3 - assert_select "body div[id=content] table[class=browse_details][id=2]", 0 - assert_select "body div[id=content] table[class=browse_details][id=3]", 0 + # should be showing details here. + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 2 + assert_select ".browse-section.browse-relation", 2 end - + +private + # This is a convenience method for most of the above checks # First we check that when we don't have an id, it will correctly return a 404 # then we check that we get the correct 404 when a non-existant id is passed # then we check that it will get a successful response, when we do pass an id - def browse_check(type, id) - assert_raise ActionController::RoutingError do + def browse_check(type, id, template) + assert_raise ActionController::UrlGenerationError do get type end - assert_raise ActionController::RoutingError do + + assert_raise ActionController::UrlGenerationError do get type, {:id => -10} # we won't have an id that's negative end + get type, {:id => id} assert_response :success - assert_template type + assert_template template + assert_template :layout => "map" + + xhr :get, type, {:id => id} + assert_response :success + assert_template template + assert_template :layout => "xhr" end end diff --git a/test/functional/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb similarity index 94% rename from test/functional/changeset_controller_test.rb rename to test/controllers/changeset_controller_test.rb index 21cae1f000a..25bb936d939 100644 --- a/test/functional/changeset_controller_test.rb +++ b/test/controllers/changeset_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'changeset_controller' class ChangesetControllerTest < ActionController::TestCase @@ -40,64 +40,52 @@ def test_routes { :controller => "changeset", :action => "query" } ) assert_routing( - { :path => "/user/name/edits", :method => :get }, + { :path => "/user/name/history", :method => :get }, { :controller => "changeset", :action => "list", :display_name => "name" } ) assert_routing( - { :path => "/user/name/edits/feed", :method => :get }, + { :path => "/user/name/history/feed", :method => :get }, { :controller => "changeset", :action => "feed", :display_name => "name", :format => :atom } ) assert_routing( - { :path => "/browse/friends", :method => :get }, + { :path => "/history/friends", :method => :get }, { :controller => "changeset", :action => "list", :friends => true } ) assert_routing( - { :path => "/browse/nearby", :method => :get }, + { :path => "/history/nearby", :method => :get }, { :controller => "changeset", :action => "list", :nearby => true } ) assert_routing( - { :path => "/browse/changesets", :method => :get }, + { :path => "/history", :method => :get }, { :controller => "changeset", :action => "list" } ) assert_routing( - { :path => "/browse/changesets/feed", :method => :get }, + { :path => "/history/feed", :method => :get }, { :controller => "changeset", :action => "feed", :format => :atom } ) - assert_recognizes( - { :controller => "changeset", :action => "list" }, - { :path => "/browse", :method => :get } - ) - assert_recognizes( - { :controller => "changeset", :action => "list" }, - { :path => "/history", :method => :get } - ) - assert_recognizes( - { :controller => "changeset", :action => "feed", :format => :atom }, - { :path => "/history/feed", :method => :get } - ) end # ----------------------- # Test simple changeset creation # ----------------------- - + def test_create basic_authorization users(:normal_user).email, "test" # Create the first user's changeset content "" + - "" + + "" + "" put :create assert_require_public_data - - + + basic_authorization users(:public_user).email, "test" # Create the first user's changeset content "" + - "" + + "" + "" put :create - + assert_response :success, "Creation of changeset did not return sucess status" newid = @response.body.to_i @@ -113,7 +101,7 @@ def test_create assert_equal 3600, duration.round, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})" end end - + def test_create_invalid basic_authorization users(:normal_user).email, "test" content "" @@ -131,23 +119,23 @@ def test_create_invalid_no_content ## First check with no auth put :create assert_response :unauthorized, "shouldn't be able to create a changeset with no auth" - + ## Now try to with the non-public user basic_authorization users(:normal_user).email, "test" put :create assert_require_public_data - + ## Try the inactive user basic_authorization users(:inactive_user).email, "test" put :create assert_inactive_user - + ## Now try to use the public user basic_authorization users(:public_user).email, "test" put :create assert_response :bad_request, "creating a changeset with no content should fail" end - + def test_create_wrong_method basic_authorization users(:public_user).email, "test" get :create @@ -163,11 +151,11 @@ def test_read changeset_id = changesets(:normal_user_first_change).id get :read, :id => changeset_id assert_response :success, "cannot get first changeset" - + assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1 assert_select "osm>changeset[id=#{changeset_id}]", 1 end - + ## # check that a changeset that doesn't exist returns an appropriate message def test_read_not_found @@ -175,26 +163,26 @@ def test_read_not_found begin get :read, :id => id assert_response :not_found, "should get a not found" - rescue ActionController::RoutingError => ex + rescue ActionController::UrlGenerationError => ex assert_match /No route matches/, ex.to_s end end end - + ## # test that the user who opened a change can close it def test_close ## Try without authentication put :close, :id => changesets(:public_user_first_change).id assert_response :unauthorized - - + + ## Try using the non-public user basic_authorization users(:normal_user).email, "test" put :close, :id => changesets(:normal_user_first_change).id assert_require_public_data - - + + ## The try with the public user basic_authorization users(:public_user).email, "test" @@ -204,7 +192,7 @@ def test_close # test that it really is closed now cs = Changeset.find(cs_id) - assert(!cs.is_open?, + assert(!cs.is_open?, "changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.") end @@ -217,56 +205,56 @@ def test_close_invalid assert_response :conflict assert_equal "The user doesn't own that changeset", @response.body end - + ## # test that you can't close using another method def test_close_method_invalid basic_authorization users(:public_user).email, "test" - + cs_id = changesets(:public_user_first_change).id get :close, :id => cs_id assert_response :method_not_allowed - + post :close, :id => cs_id assert_response :method_not_allowed end - + ## # check that you can't close a changeset that isn't found def test_close_not_found cs_ids = [0, -132, "123"] - + # First try to do it with no auth cs_ids.each do |id| begin put :close, :id => id assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" - rescue ActionController::RoutingError => ex + rescue ActionController::UrlGenerationError => ex assert_match /No route matches/, ex.to_s end end - + # Now try with auth basic_authorization users(:public_user).email, "test" cs_ids.each do |id| begin put :close, :id => id assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" - rescue ActionController::RoutingError => ex + rescue ActionController::UrlGenerationError => ex assert_match /No route matches/, ex.to_s end end end ## - # upload something simple, but valid and check that it can + # upload something simple, but valid and check that it can # be read back ok # Also try without auth and another user. def test_upload_simple_valid ## Try with no auth changeset_id = changesets(:public_user_first_change).id - # simple diff to change a node, way and relation by removing + # simple diff to change a node, way and relation by removing # their tags diff = < @@ -289,16 +277,16 @@ def test_upload_simple_valid # upload it content diff post :upload, :id => changeset_id - assert_response :unauthorized, + assert_response :unauthorized, "shouldnn't be able to upload a simple valid diff to changeset: #{@response.body}" - - - + + + ## Now try with a private user basic_authorization users(:normal_user).email, "test" changeset_id = changesets(:normal_user_first_change).id - # simple diff to change a node, way and relation by removing + # simple diff to change a node, way and relation by removing # their tags diff = < @@ -321,16 +309,16 @@ def test_upload_simple_valid # upload it content diff post :upload, :id => changeset_id - assert_response :forbidden, - "can't upload a simple valid diff to changeset: #{@response.body}" - - - + assert_response :forbidden, + "can't upload a simple valid diff to changeset: #{@response.body}" + + + ## Now try with the public user basic_authorization users(:public_user).email, "test" changeset_id = changesets(:public_user_first_change).id - # simple diff to change a node, way and relation by removing + # simple diff to change a node, way and relation by removing # their tags diff = < @@ -353,7 +341,7 @@ def test_upload_simple_valid # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload a simple valid diff to changeset: #{@response.body}" # check that the changes made it into the database @@ -361,7 +349,7 @@ def test_upload_simple_valid assert_equal 0, Way.find(1).tags.size, "way 1 should now have no tags" assert_equal 0, Relation.find(1).tags.size, "relation 1 should now have no tags" end - + ## # upload something which creates new objects using placeholders def test_upload_create_valid @@ -393,7 +381,7 @@ def test_upload_create_valid # upload it content diff post :upload, :id => cs_id - assert_response :success, + assert_response :success, "can't upload a simple valid creation to changeset: #{@response.body}" # check the returned payload @@ -423,7 +411,7 @@ def test_upload_create_valid assert_equal 0, Way.find(new_way_id).tags.size, "new way should have no tags" assert_equal 0, Relation.find(new_rel_id).tags.size, "new relation should have no tags" end - + ## # test a complex delete where we delete elements which rely on eachother # in the same transaction. @@ -442,15 +430,15 @@ def test_upload_delete # update the changeset to one that this user owns changeset_id = changesets(:public_user_first_change).id ["node", "way", "relation"].each do |type| - delete.find("//osmChange/delete/#{type}").each do |n| - n['changeset'] = changeset_id.to_s + delete.find("//osmChange/delete/#{type}").each do |n| + n['changeset'] = changeset_id.to_s end end # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" # check the response is well-formed @@ -478,7 +466,7 @@ def test_upload_nolatlon_delete # upload it content diff post :upload, :id => cs.id - assert_response :success, + assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" # check the response is well-formed @@ -491,10 +479,10 @@ def test_upload_nolatlon_delete def test_repeated_changeset_create 30.times do basic_authorization users(:public_user).email, "test" - + # create a temporary changeset content "" + - "" + + "" + "" assert_difference('Changeset.count', 1) do put :create @@ -512,8 +500,8 @@ def test_upload_large_changeset put :create assert_response :success, "Should be able to create a changeset: #{@response.body}" changeset_id = @response.body.to_i - - # upload some widely-spaced nodes, spiralling positive and negative to cause + + # upload some widely-spaced nodes, spiralling positive and negative to cause # largest bbox over-expansion possible. diff = < @@ -540,11 +528,11 @@ def test_upload_large_changeset EOF - # upload it, which used to cause an error like "PGError: ERROR: + # upload it, which used to cause an error like "PGError: ERROR: # integer out of range" (bug #2152). but shouldn't any more. content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload a spatially-large diff to changeset: #{@response.body}" # check that the changeset bbox is within bounds @@ -572,7 +560,7 @@ def test_upload_delete_invalid # upload it content diff post :upload, :id => 2 - assert_response :precondition_failed, + assert_response :precondition_failed, "shouldn't be able to upload a invalid deletion diff: #{@response.body}" assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body @@ -599,7 +587,7 @@ def test_upload_delete_if_unused # upload it content diff post :upload, :id => 2 - assert_response :success, + assert_response :success, "can't do a conditional delete of in use objects: #{@response.body}" # check the returned payload @@ -652,11 +640,11 @@ def test_upload_invalid_too_long_tag # upload it content diff post :upload, :id => cs_id - assert_response :bad_request, + assert_response :bad_request, "shoudln't be able to upload too long a tag to changeset: #{@response.body}" end - + ## # upload something which creates new objects and inserts them into # existing containers using placeholders. @@ -690,7 +678,7 @@ def test_upload_complex # upload it content diff post :upload, :id => cs_id - assert_response :success, + assert_response :success, "can't upload a complex diff to changeset: #{@response.body}" # check the returned payload @@ -712,7 +700,7 @@ def test_upload_complex end end end - + ## # create a diff which references several changesets, which should cause # a rollback and none of the diff gets committed @@ -752,14 +740,14 @@ def test_upload_invalid_changesets # upload it content diff post :upload, :id => cs_id - assert_response :conflict, + assert_response :conflict, "uploading a diff with multiple changsets should have failed" # check that objects are unmodified assert_nodes_are_equal(node, Node.find(1)) assert_ways_are_equal(way, Way.find(1)) end - + ## # upload multiple versions of the same element in the same diff. def test_upload_multiple_valid @@ -787,9 +775,9 @@ def test_upload_multiple_valid # upload it content diff post :upload, :id => cs_id - assert_response :success, + assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - + # check the response is well-formed. its counter-intuitive, but the # API will return multiple elements with the same ID and different # version numbers for each change we made. @@ -815,7 +803,7 @@ def test_upload_multiple_duplicate # upload it content diff post :upload, :id => cs_id - assert_response :conflict, + assert_response :conflict, "shouldn't be able to upload the same element twice in a diff: #{@response.body}" end @@ -836,16 +824,16 @@ def test_upload_missing_version # upload it content diff post :upload, :id => cs_id - assert_response :bad_request, + assert_response :bad_request, "shouldn't be able to upload an element without version: #{@response.body}" end - + ## # try to upload with commands other than create, modify, or delete def test_action_upload_invalid basic_authorization users(:public_user).email, "test" cs_id = changesets(:public_user_first_change).id - + diff = < @@ -868,12 +856,12 @@ def test_upload_whitespace_valid diff = < - - @@ -883,7 +871,7 @@ def test_upload_whitespace_valid # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload a valid diff with whitespace variations to changeset: #{@response.body}" # check the response is well-formed @@ -921,7 +909,7 @@ def test_upload_reuse_placeholder_valid # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}" # check the response is well-formed @@ -949,12 +937,12 @@ def test_upload_placeholder_invalid # upload it content diff post :upload, :id => changeset_id - assert_response :bad_request, + assert_response :bad_request, "shouldn't be able to re-use placeholder IDs" end ## - # test that uploading a way referencing invalid placeholders gives a + # test that uploading a way referencing invalid placeholders gives a # proper error, not a 500. def test_upload_placeholder_invalid_way basic_authorization users(:public_user).email, "test" @@ -979,7 +967,7 @@ def test_upload_placeholder_invalid_way # upload it content diff post :upload, :id => changeset_id - assert_response :bad_request, + assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" assert_equal "Placeholder node not found for reference -4 in way -1", @response.body @@ -1003,13 +991,13 @@ def test_upload_placeholder_invalid_way # upload it content diff post :upload, :id => changeset_id - assert_response :bad_request, + assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" assert_equal "Placeholder node not found for reference -4 in way 1", @response.body end ## - # test that uploading a relation referencing invalid placeholders gives a + # test that uploading a relation referencing invalid placeholders gives a # proper error, not a 500. def test_upload_placeholder_invalid_relation basic_authorization users(:public_user).email, "test" @@ -1034,7 +1022,7 @@ def test_upload_placeholder_invalid_relation # upload it content diff post :upload, :id => changeset_id - assert_response :bad_request, + assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body @@ -1058,7 +1046,7 @@ def test_upload_placeholder_invalid_relation # upload it content diff post :upload, :id => changeset_id - assert_response :bad_request, + assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" assert_equal "Placeholder Way not found for reference -1 in relation 1.", @response.body end @@ -1070,7 +1058,7 @@ def test_upload_node_move basic_authorization users(:public_user).email, "test" content "" + - "" + + "" + "" put :create assert_response :success @@ -1091,7 +1079,7 @@ def test_upload_node_move # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "diff should have uploaded OK" # check the bbox @@ -1108,7 +1096,7 @@ def test_upload_way_extend basic_authorization users(:public_user).email, "test" content "" + - "" + + "" + "" put :create assert_response :success @@ -1130,7 +1118,7 @@ def test_upload_way_extend # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "diff should have uploaded OK" # check the bbox @@ -1175,7 +1163,7 @@ def test_upload_xml_errors content diff error_format "xml" post :upload, :id => 2 - assert_response :success, + assert_response :success, "failed to return error in XML format" # check the returned payload @@ -1186,7 +1174,7 @@ def test_upload_xml_errors end ## - # when we make some simple changes we get the same changes back from the + # when we make some simple changes we get the same changes back from the # diff download. def test_diff_download_simple ## First try with the normal user, which should get a forbidden @@ -1194,19 +1182,19 @@ def test_diff_download_simple # create a temporary changeset content "" + - "" + + "" + "" put :create assert_response :forbidden - - - + + + ## Now try with the public user basic_authorization(users(:public_user).email, "test") # create a temporary changeset content "" + - "" + + "" + "" put :create assert_response :success @@ -1231,9 +1219,9 @@ def test_diff_download_simple # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - + get :download, :id => changeset_id assert_response :success @@ -1241,7 +1229,7 @@ def test_diff_download_simple assert_select "osmChange>modify", 8 assert_select "osmChange>modify>node", 8 end - + ## # culled this from josm to ensure that nothing in the way that josm # is formatting the request is causing it to fail. @@ -1252,7 +1240,7 @@ def test_josm_upload # create a temporary changeset content "" + - "" + + "" + "" put :create assert_response :success @@ -1290,9 +1278,9 @@ def test_josm_upload # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload a diff from JOSM: #{@response.body}" - + get :download, :id => changeset_id assert_response :success @@ -1304,14 +1292,14 @@ def test_josm_upload end ## - # when we make some complex changes we get the same changes back from the + # when we make some complex changes we get the same changes back from the # diff download. def test_diff_download_complex basic_authorization(users(:public_user).email, "test") # create a temporary changeset content "" + - "" + + "" + "" put :create assert_response :success @@ -1343,9 +1331,9 @@ def test_diff_download_complex # upload it content diff post :upload, :id => changeset_id - assert_response :success, + assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - + get :download, :id => changeset_id assert_response :success @@ -1354,7 +1342,7 @@ def test_diff_download_complex assert_select "osmChange>delete", 1 assert_select "osmChange>modify", 2 assert_select "osmChange>create>node", 3 - assert_select "osmChange>delete>node", 1 + assert_select "osmChange>delete>node", 1 assert_select "osmChange>modify>node", 1 assert_select "osmChange>modify>way", 1 end @@ -1373,7 +1361,7 @@ def test_changeset_download assert_select "create>node[id=#{nodes(:visible_node).node_id}]" end end - + ## # check that the bounding box of a changeset gets updated correctly ## FIXME: This should really be moded to a integration test due to the with_controller @@ -1385,7 +1373,7 @@ def test_changeset_bbox put :create assert_response :success, "Creating of changeset failed." changeset_id = @response.body.to_i - + # add a single node to it with_controller(NodeController.new) do content "" @@ -1431,7 +1419,7 @@ def test_changeset_bbox assert_select "osm>changeset[min_lon=1.0]", 1 assert_select "osm>changeset[max_lon=3.1]", 1 assert_select "osm>changeset[min_lat=1.0]", 1 - assert_select "osm>changeset[max_lat=3.1]", 1 + assert_select "osm>changeset[max_lat=3.1]", 1 end ## @@ -1446,7 +1434,7 @@ def test_changeset_include changeset_id = @response.body.to_i # NOTE: the include method doesn't over-expand, like inserting - # a real method does. this is because we expect the client to + # a real method does. this is because we expect the client to # know what it is doing! check_after_include(changeset_id, 1, 1, [ 1, 1, 1, 1]) check_after_include(changeset_id, 3, 3, [ 1, 1, 3, 3]) @@ -1455,21 +1443,21 @@ def test_changeset_include check_after_include(changeset_id, -1, -1, [-1, -1, 4, 3]) check_after_include(changeset_id, -2, 5, [-2, -1, 4, 5]) end - + ## # test that a not found, wrong method with the expand bbox works as expected def test_changeset_expand_bbox_error basic_authorization users(:public_user).display_name, "test" - + # create a new changeset content "" put :create assert_response :success, "Creating of changeset failed." changeset_id = @response.body.to_i - + lon=58.2 lat=-0.45 - + # Try and put content "" put :expand_bbox, :id => changeset_id @@ -1479,7 +1467,7 @@ def test_changeset_expand_bbox_error content "" get :expand_bbox, :id => changeset_id assert_response :method_not_allowed, "shouldn't be able to get a bbox expand" - + # Try to use a hopefully missing changeset content "" post :expand_bbox, :id => changeset_id+13245 @@ -1555,10 +1543,17 @@ def test_query get :query, :closed => 'true', :user => users(:public_user).id assert_response :success, "can't get changesets by closed-ness and user" assert_changesets [7] + + get :query, :changesets => '1,2,3' + assert_response :success, "can't get changesets by id (as comma-separated string)" + assert_changesets [1,2,3] + + get :query, :changesets => '' + assert_response :bad_request, "should be a bad request since changesets is empty" end ## - # check that errors are returned if garbage is inserted + # check that errors are returned if garbage is inserted # into query strings def test_query_invalid [ "abracadabra!", @@ -1614,8 +1609,8 @@ def test_changeset_update basic_authorization users(:normal_user).email, "test" put :update, :id => changeset.id assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset" - - + + ## Now try with the public user changeset = changesets(:public_user_first_change) new_changeset = changeset.to_xml @@ -1624,7 +1619,7 @@ def test_changeset_update new_tag['v'] = "valuetesting" new_changeset.find("//osm/changeset").first << new_tag content new_changeset - + # try without any authorization @request.env["HTTP_AUTHORIZATION"] = nil put :update, :id => changeset.id @@ -1644,7 +1639,7 @@ def test_changeset_update assert_select "osm>changeset>tag", 2 assert_select "osm>changeset>tag[k=tagtesting][v=valuetesting]", 1 end - + ## # check that a user different from the one who opened the changeset # can't modify it. @@ -1677,7 +1672,7 @@ def test_changeset_limits # start the counter just short of where the changeset should finish. offset = 10 - # alter the database to set the counter on the changeset directly, + # alter the database to set the counter on the changeset directly, # otherwise it takes about 6 minutes to fill all of them. changeset = Changeset.find(cs_id) changeset.num_changes = Changeset::MAX_ELEMENTS - offset @@ -1710,7 +1705,7 @@ def test_changeset_limits node_xml['lat'] = rand.to_s node_xml['lon'] = rand.to_s node_xml['version'] = offset.to_s - + content node_doc put :update, :id => node_id assert_response :conflict, "final attempt should have failed" @@ -1720,37 +1715,73 @@ def test_changeset_limits assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes # check that the changeset is now closed as well - assert(!changeset.is_open?, - "changeset should have been auto-closed by exceeding " + + assert(!changeset.is_open?, + "changeset should have been auto-closed by exceeding " + "element limit.") end - + ## # This should display the last 20 changesets closed. def test_list - changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['num_changes > 0'], :limit=> 20) - assert changesets.size <= 20 get :list, {:format => "html"} assert_response :success + assert_template "history" + assert_template :layout => "map" + assert_select "h2", :text => "Changesets", :count => 1 + + get :list, {:format => "html", :list => '1', :bbox => '-180,-90,90,180'} + assert_response :success assert_template "list" + + changesets = Changeset. + where("num_changes > 0 and min_lon is not null"). + order(:created_at => :desc). + limit(20) + assert changesets.size <= 20 + + # Now check that all 20 (or however many were returned) changesets are in the html + assert_select "li", :count => changesets.size + changesets.each do |changeset| + # FIXME this test needs rewriting - test for table contents + end + end + + ## + # This should display the last 20 changesets closed. + def test_list_xhr + xhr :get, :list, {:format => "html"} + assert_response :success + assert_template "history" + assert_template :layout => "xhr" + assert_select "h2", :text => "Changesets", :count => 1 + + get :list, {:format => "html", :list => '1', :bbox => '-180,-90,90,180'} + assert_response :success + assert_template "list" + + changesets = Changeset. + where("num_changes > 0 and min_lon is not null"). + order(:created_at => :desc). + limit(20) + assert changesets.size <= 20 + # Now check that all 20 (or however many were returned) changesets are in the html - assert_select "h1", :text => "Changesets", :count => 1 - assert_select "table[id='changeset_list'] tr", :count => changesets.size + assert_select "li", :count => changesets.size changesets.each do |changeset| # FIXME this test needs rewriting - test for table contents end end - + ## # Checks the display of the user changesets listing def test_list_user user = users(:public_user) get :list, {:format => "html", :display_name => user.display_name} assert_response :success - assert_template "changeset/_user" + assert_template "history" ## FIXME need to add more checks to see which if edits are actually shown if your data is public end - + ## # Check the not found of the list user changesets def test_list_user_not_found @@ -1758,11 +1789,11 @@ def test_list_user_not_found assert_response :not_found assert_template 'user/no_such_user' end - + ## # This should display the last 20 changesets closed. def test_feed - changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['num_changes > 0'], :limit=> 20) + changesets = Changeset.where("num_changes > 0").order(:created_at => :desc).limit(20) assert changesets.size <= 20 get :feed, {:format => "atom"} assert_response :success @@ -1781,7 +1812,8 @@ def test_feed_user user = users(:public_user) get :feed, {:format => "atom", :display_name => user.display_name} assert_response :success - assert_template "changeset/_user" + assert_template "list" + assert_equal "application/atom+xml", response.content_type ## FIXME need to add more checks to see which if edits are actually shown if your data is public end @@ -1791,7 +1823,7 @@ def test_feed_user_not_found get :feed, {:format => "atom", :display_name => "Some random user"} assert_response :not_found end - + ## # check that the changeset download for a changeset with a redacted # element in it doesn't contain that element. diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb new file mode 100644 index 00000000000..ad3d6787b1a --- /dev/null +++ b/test/controllers/diary_entry_controller_test.rb @@ -0,0 +1,467 @@ +require 'test_helper' + +class DiaryEntryControllerTest < ActionController::TestCase + fixtures :users, :diary_entries, :diary_comments, :languages + + include ActionView::Helpers::NumberHelper + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/diary", :method => :get }, + { :controller => "diary_entry", :action => "list" } + ) + assert_routing( + { :path => "/diary/language", :method => :get }, + { :controller => "diary_entry", :action => "list", :language => "language" } + ) + assert_routing( + { :path => "/user/username/diary", :method => :get }, + { :controller => "diary_entry", :action => "list", :display_name => "username" } + ) + assert_routing( + { :path => "/diary/friends", :method => :get }, + { :controller => "diary_entry", :action => "list", :friends => true } + ) + assert_routing( + { :path => "/diary/nearby", :method => :get }, + { :controller => "diary_entry", :action => "list", :nearby => true } + ) + + assert_routing( + { :path => "/diary/rss", :method => :get }, + { :controller => "diary_entry", :action => "rss", :format => :rss } + ) + assert_routing( + { :path => "/diary/language/rss", :method => :get }, + { :controller => "diary_entry", :action => "rss", :language => "language", :format => :rss } + ) + assert_routing( + { :path => "/user/username/diary/rss", :method => :get }, + { :controller => "diary_entry", :action => "rss", :display_name => "username", :format => :rss } + ) + + assert_routing( + { :path => "/user/username/diary/comments", :method => :get }, + { :controller => "diary_entry", :action => "comments", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/diary/comments/1", :method => :get }, + { :controller => "diary_entry", :action => "comments", :display_name => "username", :page => "1" } + ) + + assert_routing( + { :path => "/diary/new", :method => :get }, + { :controller => "diary_entry", :action => "new" } + ) + assert_routing( + { :path => "/diary/new", :method => :post }, + { :controller => "diary_entry", :action => "new" } + ) + assert_routing( + { :path => "/user/username/diary/1", :method => :get }, + { :controller => "diary_entry", :action => "view", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/edit", :method => :get }, + { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/edit", :method => :post }, + { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/newcomment", :method => :post }, + { :controller => "diary_entry", :action => "comment", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/hide", :method => :post }, + { :controller => "diary_entry", :action => "hide", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/diary/1/hidecomment/2", :method => :post }, + { :controller => "diary_entry", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" } + ) + end + + def test_showing_new_diary_entry + get :new + assert_response :redirect + assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new" + # Now pretend to login by using the session hash, with the + # id of the person we want to login as through session(:user)=user.id + get(:new, nil, {'user' => users(:normal_user).id}) + assert_response :success + #print @response.body + + #print @response.to_yaml + assert_select "title", :text => /New Diary Entry/, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => "New Diary Entry", :count => 1 + end + assert_select "div#content", :count => 1 do + # We don't care about the layout, we just care about the form fields + # that are available + assert_select "form[action='/diary/new']", :count => 1 do + assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1 + assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1 + assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1 + assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + end + end + end + + def test_editing_diary_entry + entry = diary_entries(:normal_user_entry_1) + + # Make sure that you are redirected to the login page when you are + # not logged in, without and with the id of the entry you want to edit + get :edit, :display_name => entry.user.display_name, :id => entry.id + assert_response :redirect + assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{entry.user.display_name}/diary/#{entry.id}/edit" + + # Verify that you get a not found error, when you pass a bogus id + get(:edit, {:display_name => entry.user.display_name, :id => 9999}, {'user' => entry.user.id}) + assert_response :not_found + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => "No entry with the id: 9999", :count => 1 + end + + # Now pass the id, and check that you can edit it, when using the same + # user as the person who created the entry + get(:edit, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}) + assert_response :success + assert_select "title", :text => /Edit diary entry/, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => /Edit diary entry/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do + assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1 + assert_select "select#diary_entry_language_code", :count => 1 + assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 + assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 + assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 + assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 + assert_select "input", :count => 7 + end + end + + # Now lets see if you can edit the diary entry + new_title = "New Title" + new_body = "This is a new body for the diary entry" + new_latitude = "1.1" + new_longitude = "2.2" + new_language_code = "en" + post(:edit, {:display_name => entry.user.display_name, :id => entry.id, 'commit' => 'save', + 'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude, + 'longitude' => new_longitude, 'language_code' => new_language_code} }, + {'user' => entry.user.id}) + assert_response :redirect + assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id + + # Now check that the new data is rendered, when logged in + get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} + assert_response :success + assert_template 'diary_entry/view' + assert_select "title", :text => /Users' diaries | /, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + # This next line won't work if the text has been run through the htmlize function + # due to formatting that could be introduced + assert_select "p", :text => /#{new_body}/, :count => 1 + assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 + # As we're not logged in, check that you cannot edit + #print @response.body + assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 + end + + # and when not logged in as the user who wrote the entry + get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} + assert_response :success + assert_template 'diary_entry/view' + assert_select "title", :text => /Users' diaries | /, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + # This next line won't work if the text has been run through the htmlize function + # due to formatting that could be introduced + assert_select "p", :text => /#{new_body}/, :count => 1 + assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 + # As we're not logged in, check that you cannot edit + assert_select "li[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do + assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 + end + end + end + + def test_edit_diary_entry_i18n + get :edit, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id} + assert_response :success + assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" + end + + def test_create_diary_entry + # Make sure that you are redirected to the login page when you + # are not logged in + get :new + assert_response :redirect + assert_redirected_to :controller => :user, :action => :login, :referer => "/diary/new" + + # Now try again when logged in + get :new, {}, {:user => users(:normal_user).id} + assert_response :success + assert_select "title", :text => /New Diary Entry/, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => /New Diary Entry/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "form[action='/diary/new'][method=post]", :count => 1 do + assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1 + assert_select "select#diary_entry_language_code", :count => 1 + assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 + assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 + assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 + assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 + assert_select "input", :count => 7 + end + end + + # Now try creating a diary entry + new_title = "New Title" + new_body = "This is a new body for the diary entry" + new_latitude = "1.1" + new_longitude = "2.2" + new_language_code = "en" + assert_difference "DiaryEntry.count", 1 do + post(:new, {'commit' => 'save', + 'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude, + 'longitude' => new_longitude, 'language_code' => new_language_code} }, + {:user => users(:normal_user).id}) + end + assert_response :redirect + assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + entry = DiaryEntry.find(6) + assert_equal users(:normal_user).id, entry.user_id + assert_equal new_title, entry.title + assert_equal new_body, entry.body + assert_equal new_latitude.to_f, entry.latitude + assert_equal new_longitude.to_f, entry.longitude + assert_equal new_language_code, entry.language_code + end + + def test_creating_diary_comment + entry = diary_entries(:normal_user_entry_1) + + # Make sure that you are denied when you are not logged in + post :comment, :display_name => entry.user.display_name, :id => entry.id + assert_response :forbidden + + # Verify that you get a not found error, when you pass a bogus id + post :comment, {:display_name => entry.user.display_name, :id => 9999}, {:user => users(:public_user).id} + assert_response :not_found + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => "No entry with the id: 9999", :count => 1 + end + + # Now try again with the right id + assert_difference "ActionMailer::Base.deliveries.size", 1 do + assert_difference "DiaryComment.count", 1 do + post :comment, {:display_name => entry.user.display_name, :id => entry.id, :diary_comment => {:body => "New comment"}}, {:user => users(:public_user).id} + end + end + assert_response :redirect + assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id + email = ActionMailer::Base.deliveries.first + assert_equal [ users(:normal_user).email ], email.to + assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on your diary entry", email.subject + assert_match /New comment/, email.text_part.decoded + assert_match /New comment/, email.html_part.decoded + ActionMailer::Base.deliveries.clear + comment = DiaryComment.find(5) + assert_equal entry.id, comment.diary_entry_id + assert_equal users(:public_user).id, comment.user_id + assert_equal "New comment", comment.body + + # Now view the diary entry, and check the new comment is present + get :view, :display_name => entry.user.display_name, :id => entry.id + assert_response :success + assert_select ".diary-comment", :count => 1 do + assert_select "#comment5", :count => 1 do + assert_select "a[href='/user/#{users(:public_user).display_name}']", :text => users(:public_user).display_name, :count => 1 + end + assert_select ".richtext", :text => /New comment/, :count => 1 + end + end + + # Check that you can get the expected response and template for all available languages + # Should test that there are no + def test_listing_diary_entries + get :list + assert_response :success, "Should be able to list the diary entries in locale" + assert_template 'list', "Should use the list template in locale" + assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries" + + # Now try to find a specific user's diary entry + get :list, {:display_name => users(:normal_user).display_name} + assert_response :success, "Should be able to list the diary entries for a user in locale" + assert_template 'list', "Should use the list template for a user in locale" + assert_no_missing_translations + end + + def test_rss + get :rss, {:format => :rss} + assert_response :success, "Should be able to get a diary RSS" + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "channel>title", :count => 1 + assert_select "image", :count => 1 + assert_select "channel>item", :count => 2 + end + end + end + + def test_rss_language + get :rss, {:language => diary_entries(:normal_user_entry_1).language_code, :format => :rss} + assert_response :success, "Should be able to get a specific language diary RSS" + assert_select "rss>channel>item", :count => 1 #, "Diary entries should be filtered by language" + end + +# def test_rss_nonexisting_language +# get :rss, {:language => 'xx', :format => :rss} +# assert_response :not_found, "Should not be able to get a nonexisting language diary RSS" +# end + + def test_rss_language_with_no_entries + get :rss, {:language => 'sl', :format => :rss} + assert_response :success, "Should be able to get a specific language diary RSS" + assert_select "rss>channel>item", :count => 0 #, "Diary entries should be filtered by language" + end + + def test_rss_user + get :rss, {:display_name => users(:normal_user).display_name, :format => :rss} + assert_response :success, "Should be able to get a specific users diary RSS" + assert_select "rss>channel>item", :count => 2 #, "Diary entries should be filtered by user" + end + + def test_rss_nonexisting_user + # Try a user that has never existed + get :rss, {:display_name => 'fakeUsername76543', :format => :rss} + assert_response :not_found, "Should not be able to get a nonexisting users diary RSS" + + # Try a suspended user + get :rss, {:display_name => users(:suspended_user).display_name, :format => :rss} + assert_response :not_found, "Should not be able to get a suspended users diary RSS" + + # Try a deleted user + get :rss, {:display_name => users(:deleted_user).display_name, :format => :rss} + assert_response :not_found, "Should not be able to get a deleted users diary RSS" + end + + def test_viewing_diary_entry + # Try a normal entry that should work + get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} + assert_response :success + assert_template :view + + # Try a deleted entry + get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:deleted_entry).id} + assert_response :not_found + + # Try an entry by a suspended user + get :view, {:display_name => users(:suspended_user).display_name, :id => diary_entries(:entry_by_suspended_user).id} + assert_response :not_found + + # Try an entry by a deleted user + get :view, {:display_name => users(:deleted_user).display_name, :id => diary_entries(:entry_by_deleted_user).id} + assert_response :not_found + end + + def test_viewing_hidden_comments + # Get a diary entry that has hidden comments + get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id} + assert_response :success + assert_template :view + assert_select "div.comments" do + assert_select "p#comment1", :count => 1 # visible comment + assert_select "p#comment2", :count => 0 # comment by suspended user + assert_select "p#comment3", :count => 0 # comment by deleted user + assert_select "p#comment4", :count => 0 # hidden comment + end + end + + def test_hide + # Try without logging in + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} + assert_response :forbidden + assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + + # Now try as a normal user + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id + assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + + # Finally try as an administrator + post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + assert_equal false, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + end + + def test_hidecomment + # Try without logging in + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id} + assert_response :forbidden + assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + + # Now try as a normal user + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id + assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + + # Finally try as an administrator + post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id + assert_equal false, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + end + + def test_comments + # Test a user with no comments + get :comments, :display_name => users(:normal_user).display_name + assert_response :success + assert_template :comments + assert_select "table.messages" do + assert_select "tr", :count => 1 # header, no comments + end + + # Test a user with a comment + get :comments, :display_name => users(:public_user).display_name + assert_response :success + assert_template :comments + assert_select "table.messages" do + assert_select "tr", :count => 2 # header and one comment + end + + # Test a suspended user + get :comments, :display_name => users(:suspended_user).display_name + assert_response :not_found + + # Test a deleted user + get :comments, :display_name => users(:deleted_user).display_name + assert_response :not_found + end +end diff --git a/test/functional/export_controller_test.rb b/test/controllers/export_controller_test.rb similarity index 56% rename from test/functional/export_controller_test.rb rename to test/controllers/export_controller_test.rb index 6b49700d80d..8d61b9911b5 100644 --- a/test/functional/export_controller_test.rb +++ b/test/controllers/export_controller_test.rb @@ -1,34 +1,42 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ExportControllerTest < ActionController::TestCase ## # test all routes which lead to this controller def test_routes - assert_routing( - { :path => "/export/start", :method => :get }, - { :controller => "export", :action => "start" } - ) assert_routing( { :path => "/export/finish", :method => :post }, { :controller => "export", :action => "finish" } ) + assert_routing( + { :path => "/export/embed", :method => :get }, + { :controller => "export", :action => "embed" } + ) end - def test_start - xhr :get, :start - assert_response :success - assert_template 'start' - end - + ### + # test the finish action for raw OSM data def test_finish_osm get :finish, {:minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => 'osm'} assert_response :redirect + assert_redirected_to "http://api.openstreetmap.org/api/#{API_VERSION}/map?bbox=0.0,50.0,1.0,51.0" end + ### + # test the finish action for mapnik images def test_finish_mapnik get :finish, {:minlon => 0, :minlat => 50, :maxlon => 1, :maxlat => 51, :format => 'mapnik', :mapnik_format => 'test', :mapnik_scale => '12'} assert_response :redirect + assert_redirected_to "http://render.openstreetmap.org/cgi-bin/export?bbox=0.0,50.0,1.0,51.0&scale=12&format=test" + end + + ## + # test the embed action + def test_embed + get :embed + assert_response :success + assert_template "export/embed" end end diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb new file mode 100644 index 00000000000..94cf7cf46c9 --- /dev/null +++ b/test/controllers/geocoder_controller_test.rb @@ -0,0 +1,312 @@ +# coding: utf-8 + +require 'test_helper' +require 'geocoder_controller' + +class GeocoderControllerTest < ActionController::TestCase + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/search", :method => :get }, + { :controller => "geocoder", :action => "search" } + ) + assert_routing( + { :path => "/geocoder/search_latlon", :method => :get }, + { :controller => "geocoder", :action => "search_latlon" } + ) + assert_routing( + { :path => "/geocoder/search_us_postcode", :method => :get }, + { :controller => "geocoder", :action => "search_us_postcode" } + ) + assert_routing( + { :path => "/geocoder/search_uk_postcode", :method => :get }, + { :controller => "geocoder", :action => "search_uk_postcode" } + ) + assert_routing( + { :path => "/geocoder/search_ca_postcode", :method => :get }, + { :controller => "geocoder", :action => "search_ca_postcode" } + ) + assert_routing( + { :path => "/geocoder/search_osm_nominatim", :method => :get }, + { :controller => "geocoder", :action => "search_osm_nominatim" } + ) + assert_routing( + { :path => "/geocoder/search_geonames", :method => :get }, + { :controller => "geocoder", :action => "search_geonames" } + ) + assert_routing( + { :path => "/geocoder/search_osm_nominatim_reverse", :method => :get }, + { :controller => "geocoder", :action => "search_osm_nominatim_reverse" } + ) + assert_routing( + { :path => "/geocoder/search_geonames_reverse", :method => :get }, + { :controller => "geocoder", :action => "search_geonames_reverse" } + ) + end + + ## + # Test identification of basic lat/lon pairs + def test_identify_latlon_basic + [ + '50.06773 14.37742', + '50.06773, 14.37742', + '+50.06773 +14.37742', + '+50.06773, +14.37742' + ].each do |code| + latlon_check code, 50.06773, 14.37742 + end + end + + ## + # Test identification of lat/lon pairs using N/E with degrees + def test_identify_latlon_ne_d + [ + 'N50.06773 E14.37742', + 'N50.06773, E14.37742', + '50.06773N 14.37742E', + '50.06773N, 14.37742E' + ].each do |code| + latlon_check code, 50.06773, 14.37742 + end + end + + ## + # Test identification of lat/lon pairs using N/W with degrees + def test_identify_latlon_nw_d + [ + 'N50.06773 W14.37742', + 'N50.06773, W14.37742', + '50.06773N 14.37742W', + '50.06773N, 14.37742W' + ].each do |code| + latlon_check code, 50.06773, -14.37742 + end + end + + ## + # Test identification of lat/lon pairs using S/E with degrees + def test_identify_latlon_se_d + [ + 'S50.06773 E14.37742', + 'S50.06773, E14.37742', + '50.06773S 14.37742E', + '50.06773S, 14.37742E' + ].each do |code| + latlon_check code, -50.06773, 14.37742 + end + end + + ## + # Test identification of lat/lon pairs using S/W with degrees + def test_identify_latlon_sw_d + [ + 'S50.06773 W14.37742', + 'S50.06773, W14.37742', + '50.06773S 14.37742W', + '50.06773S, 14.37742W' + ].each do |code| + latlon_check code, -50.06773, -14.37742 + end + end + + ## + # Test identification of lat/lon pairs using N/E with degrees/mins + def test_identify_latlon_ne_dm + [ + 'N 50° 04.064 E 014° 22.645', + "N 50° 04.064' E 014° 22.645", + "N 50° 04.064', E 014° 22.645'", + 'N50° 04.064 E14° 22.645', + 'N 50 04.064 E 014 22.645', + 'N50 4.064 E14 22.645', + "50° 04.064' N, 014° 22.645' E" + ].each do |code| + latlon_check code, 50.06773, 14.37742 + end + end + + ## + # Test identification of lat/lon pairs using N/W with degrees/mins + def test_identify_latlon_nw_dm + [ + 'N 50° 04.064 W 014° 22.645', + "N 50° 04.064' W 014° 22.645", + "N 50° 04.064', W 014° 22.645'", + 'N50° 04.064 W14° 22.645', + 'N 50 04.064 W 014 22.645', + 'N50 4.064 W14 22.645', + "50° 04.064' N, 014° 22.645' W" + ].each do |code| + latlon_check code, 50.06773, -14.37742 + end + end + + ## + # Test identification of lat/lon pairs using S/E with degrees/mins + def test_identify_latlon_se_dm + [ + 'S 50° 04.064 E 014° 22.645', + "S 50° 04.064' E 014° 22.645", + "S 50° 04.064', E 014° 22.645'", + 'S50° 04.064 E14° 22.645', + 'S 50 04.064 E 014 22.645', + 'S50 4.064 E14 22.645', + "50° 04.064' S, 014° 22.645' E" + ].each do |code| + latlon_check code, -50.06773, 14.37742 + end + end + + ## + # Test identification of lat/lon pairs using S/W with degrees/mins + def test_identify_latlon_sw_dm + [ + 'S 50° 04.064 W 014° 22.645', + "S 50° 04.064' W 014° 22.645", + "S 50° 04.064', W 014° 22.645'", + 'S50° 04.064 W14° 22.645', + 'S 50 04.064 W 014 22.645', + 'S50 4.064 W14 22.645', + "50° 04.064' S, 014° 22.645' W" + ].each do |code| + latlon_check code, -50.06773, -14.37742 + end + end + + ## + # Test identification of lat/lon pairs using N/E with degrees/mins/secs + def test_identify_latlon_ne_dms + [ + "N 50° 4' 03.828\" E 14° 22' 38.712\"", + "N 50° 4' 03.828\", E 14° 22' 38.712\"", + "N 50° 4′ 03.828″, E 14° 22′ 38.712″", + 'N50 4 03.828 E14 22 38.712', + 'N50 4 03.828, E14 22 38.712', + "50°4'3.828\"N 14°22'38.712\"E" + ].each do |code| + latlon_check code, 50.06773, 14.37742 + end + end + + ## + # Test identification of lat/lon pairs using N/W with degrees/mins/secs + def test_identify_latlon_nw_dms + [ + "N 50° 4' 03.828\" W 14° 22' 38.712\"", + "N 50° 4' 03.828\", W 14° 22' 38.712\"", + "N 50° 4′ 03.828″, W 14° 22′ 38.712″", + 'N50 4 03.828 W14 22 38.712', + 'N50 4 03.828, W14 22 38.712', + "50°4'3.828\"N 14°22'38.712\"W" + ].each do |code| + latlon_check code, 50.06773, -14.37742 + end + end + + ## + # Test identification of lat/lon pairs using S/E with degrees/mins/secs + def test_identify_latlon_se_dms + [ + "S 50° 4' 03.828\" E 14° 22' 38.712\"", + "S 50° 4' 03.828\", E 14° 22' 38.712\"", + "S 50° 4′ 03.828″, E 14° 22′ 38.712″", + 'S50 4 03.828 E14 22 38.712', + 'S50 4 03.828, E14 22 38.712', + "50°4'3.828\"S 14°22'38.712\"E" + ].each do |code| + latlon_check code, -50.06773, 14.37742 + end + end + + ## + # Test identification of lat/lon pairs using S/W with degrees/mins/secs + def test_identify_latlon_sw_dms + [ + "S 50° 4' 03.828\" W 14° 22' 38.712\"", + "S 50° 4' 03.828\", W 14° 22' 38.712\"", + "S 50° 4′ 03.828″, W 14° 22′ 38.712″", + 'S50 4 03.828 W14 22 38.712', + 'S50 4 03.828, W14 22 38.712', + "50°4'3.828\"S 14°22'38.712\"W" + ].each do |code| + latlon_check code, -50.06773, -14.37742 + end + end + + ## + # Test identification of US zipcodes + def test_identify_us_postcode + [ + '12345', + '12345-6789' + ].each do |code| + post :search, query: code + assert_response :success + assert_equal ['us_postcode', 'osm_nominatim'], assigns(:sources) + end + end + + ## + # Test identification of UK postcodes using examples from + # http://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom + def test_identify_uk_postcode + [ + 'EC1A 1BB', + 'W1A 1HQ', + 'M1 1AA', + 'B33 8TH', + 'CR2 6XH', + 'DN55 1PT' + ].each do |code| + search_check code, ['uk_postcode', 'osm_nominatim'] + end + end + + ## + # Test identification of Canadian postcodes + def test_identify_ca_postcode + search_check 'A1B 2C3', ['ca_postcode', 'osm_nominatim'] + end + + ## + # Test identification fall through to the default case + def test_identify_default + search_check 'foo bar baz', ['osm_nominatim'] + end + +private + def latlon_check(query, lat, lon) + post :search, :query => query + assert_response :success + assert_template "search" + assert_template :layout => "map" + assert_equal ['latlon' ,'osm_nominatim_reverse'], assigns(:sources) + assert_nil @controller.params[:query] + assert_in_delta lat, @controller.params[:lat] + assert_in_delta lon, @controller.params[:lon] + + xhr :post, :search, :query => query + assert_response :success + assert_template "search" + assert_template :layout => "xhr" + assert_equal ['latlon' ,'osm_nominatim_reverse'], assigns(:sources) + assert_nil @controller.params[:query] + assert_in_delta lat, @controller.params[:lat] + assert_in_delta lon, @controller.params[:lon] + end + + def search_check(query, sources) + post :search, :query => query + assert_response :success + assert_template "search" + assert_template :layout => "map" + assert_equal sources, assigns(:sources) + + xhr :post, :search, :query => query + assert_response :success + assert_template "search" + assert_template :layout => "xhr" + assert_equal sources, assigns(:sources) + end +end diff --git a/test/functional/message_controller_test.rb b/test/controllers/message_controller_test.rb similarity index 82% rename from test/functional/message_controller_test.rb rename to test/controllers/message_controller_test.rb index 8cb00c048bc..44271f5ddb4 100644 --- a/test/functional/message_controller_test.rb +++ b/test/controllers/message_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class MessageControllerTest < ActionController::TestCase fixtures :users, :messages @@ -53,7 +53,6 @@ def test_new # Login as a normal user session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that the new message page loads get :new, :display_name => users(:public_user).display_name @@ -66,6 +65,44 @@ def test_new assert_select "input[type='submit'][value='Send']", :count => 1 end + # Check that the subject is preserved over errors + assert_difference "ActionMailer::Base.deliveries.size", 0 do + assert_difference "Message.count", 0 do + post :new, + :display_name => users(:public_user).display_name, + :message => { :title => "Test Message", :body => "" } + end + end + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Send message" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title", :count => 1 do + assert_select "[value=Test Message]" + end + assert_select "textarea#message_body", :text => "", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + + # Check that the body text is preserved over errors + assert_difference "ActionMailer::Base.deliveries.size", 0 do + assert_difference "Message.count", 0 do + post :new, + :display_name => users(:public_user).display_name, + :message => { :title => "", :body => "Test message body" } + end + end + assert_response :success + assert_template "new" + assert_select "title", "OpenStreetMap | Send message" + assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do + assert_select "input#message_title", :count => 1 do + assert_select "[value=]" + end + assert_select "textarea#message_body", :text => "Test message body", :count => 1 + assert_select "input[type='submit'][value='Send']", :count => 1 + end + # Check that sending a message works assert_difference "ActionMailer::Base.deliveries.size", 1 do assert_difference "Message.count", 1 do @@ -85,7 +122,7 @@ def test_new m = Message.find(3) assert_equal users(:normal_user).id, m.from_user_id assert_equal users(:public_user).id, m.to_user_id - assert_in_delta Time.now, m.sent_on, 1 + assert_in_delta Time.now, m.sent_on, 2 assert_equal "Test Message", m.title assert_equal "Test message body", m.body assert_equal "markdown", m.body_format @@ -94,42 +131,41 @@ def test_new get :new, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" end ## # test the reply action def test_reply # Check that the message reply page requires us to login - get :reply, :message_id => messages(:read_message).id - assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:read_message).id)) + get :reply, :message_id => messages(:unread_message).id + assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:unread_message).id)) # Login as the wrong user session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that we can't reply to somebody else's message - get :reply, :message_id => messages(:read_message).id - assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:read_message).id)) + get :reply, :message_id => messages(:unread_message).id + assert_redirected_to login_path(:referer => reply_message_path(:message_id => messages(:unread_message).id)) assert_equal "You are logged in as `pulibc_test2' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply.", flash[:notice] # Login as the right user - session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name + session[:user] = users(:public_user).id # Check that the message reply page loads - get :reply, :message_id => messages(:read_message).id + get :reply, :message_id => messages(:unread_message).id assert_response :success assert_template "new" - assert_select "title", "OpenStreetMap | Re: test message 2" - assert_select "form[action='#{new_message_path(:display_name => users(:public_user).display_name)}']", :count => 1 do - assert_select "input#message_title[value='Re: test message 2']", :count => 1 + assert_select "title", "OpenStreetMap | Re: test message 1" + assert_select "form[action='#{new_message_path(:display_name => users(:normal_user).display_name)}']", :count => 1 do + assert_select "input#message_title[value='Re: test message 1']", :count => 1 assert_select "textarea#message_body", :count => 1 assert_select "input[type='submit'][value='Send']", :count => 1 end + assert_equal true, Message.find(messages(:unread_message).id).message_read # Asking to reply to a message with no ID should fail - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get :reply end @@ -148,7 +184,6 @@ def test_read # Login as the wrong user session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that we can't read the message get :read, :message_id => messages(:unread_message).id @@ -157,7 +192,6 @@ def test_read # Login as the message sender session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that the message sender can read the message get :read, :message_id => messages(:unread_message).id @@ -167,7 +201,6 @@ def test_read # Login as the message recipient session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that the message recipient can read the message get :read, :message_id => messages(:unread_message).id @@ -176,7 +209,7 @@ def test_read assert_equal true, Message.find(messages(:unread_message).id).message_read # Asking to read a message with no ID should fail - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get :read end @@ -195,7 +228,6 @@ def test_inbox # Login session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that we can view our inbox when logged in get :inbox, :display_name => users(:normal_user).display_name @@ -220,7 +252,6 @@ def test_outbox # Login session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that we can view our outbox when logged in get :outbox, :display_name => users(:normal_user).display_name @@ -245,7 +276,6 @@ def test_mark # Login as a user with no messages session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that marking a message we didn't send or receive fails post :mark, :message_id => messages(:read_message).id @@ -254,7 +284,6 @@ def test_mark # Login as the message recipient session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that the marking a message read works post :mark, :message_id => messages(:unread_message).id, :mark => "read" @@ -279,7 +308,7 @@ def test_mark assert_equal false, Message.find(messages(:unread_message).id).message_read # Asking to mark a message with no ID should fail - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do post :mark end @@ -298,7 +327,6 @@ def test_delete # Login as a user with no messages session[:user] = users(:second_public_user).id - cookies["_osm_username"] = users(:second_public_user).display_name # Check that deleting a message we didn't send or receive fails post :delete, :message_id => messages(:read_message).id @@ -307,7 +335,6 @@ def test_delete # Login as the message recipient session[:user] = users(:normal_user).id - cookies["_osm_username"] = users(:normal_user).display_name # Check that the deleting a received message works post :delete, :message_id => messages(:read_message).id @@ -326,7 +353,7 @@ def test_delete assert_equal true, m.to_user_visible # Asking to delete a message with no ID should fail - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do post :delete end diff --git a/test/functional/node_controller_test.rb b/test/controllers/node_controller_test.rb similarity index 91% rename from test/functional/node_controller_test.rb rename to test/controllers/node_controller_test.rb index 6903dd60b42..3d689bb3f4f 100644 --- a/test/functional/node_controller_test.rb +++ b/test/controllers/node_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class NodeControllerTest < ActionController::TestCase api_fixtures @@ -122,6 +122,22 @@ def test_create_invalid_xml assert_response :bad_request, "node upload did not return bad_request status" assert_equal "Cannot parse valid node from xml string . lon missing", @response.body + # test that the upload is rejected when lat is non-numeric + # create a minimal xml file + content("") + put :create + # hope for success + assert_response :bad_request, "node upload did not return bad_request status" + assert_equal "Cannot parse valid node from xml string . lat not a number", @response.body + + # test that the upload is rejected when lon is non-numeric + # create a minimal xml file + content("") + put :create + # hope for success + assert_response :bad_request, "node upload did not return bad_request status" + assert_equal "Cannot parse valid node from xml string . lon not a number", @response.body + # test that the upload is rejected when we have a tag which is too long content("") put :create @@ -402,6 +418,34 @@ def test_update assert_response :success, "a valid update request failed" end + ## + # test fetching multiple nodes + def test_nodes + # check error when no parameter provided + get :nodes + assert_response :bad_request + + # check error when no parameter value provided + get :nodes, :nodes => "" + assert_response :bad_request + + # test a working call + get :nodes, :nodes => "1,2,4,15,17" + assert_response :success + assert_select "osm" do + assert_select "node", :count => 5 + assert_select "node[id=1][visible=true]", :count => 1 + assert_select "node[id=2][visible=false]", :count => 1 + assert_select "node[id=4][visible=true]", :count => 1 + assert_select "node[id=15][visible=true]", :count => 1 + assert_select "node[id=17][visible=false]", :count => 1 + end + + # check error when a non-existent node is included + get :nodes, :nodes => "1,2,4,15,17,400" + assert_response :not_found + end + ## # test adding tags to a node def test_duplicate_tags diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb new file mode 100644 index 00000000000..6f212519326 --- /dev/null +++ b/test/controllers/notes_controller_test.rb @@ -0,0 +1,760 @@ +require 'test_helper' + +class NotesControllerTest < ActionController::TestCase + fixtures :users, :notes, :note_comments + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/notes", :method => :post }, + { :controller => "notes", :action => "create", :format => "xml" } + ) + assert_routing( + { :path => "/api/0.6/notes/1", :method => :get }, + { :controller => "notes", :action => "show", :id => "1", :format => "xml" } + ) + assert_recognizes( + { :controller => "notes", :action => "show", :id => "1", :format => "xml" }, + { :path => "/api/0.6/notes/1.xml", :method => :get } + ) + assert_routing( + { :path => "/api/0.6/notes/1.rss", :method => :get }, + { :controller => "notes", :action => "show", :id => "1", :format => "rss" } + ) + assert_routing( + { :path => "/api/0.6/notes/1.json", :method => :get }, + { :controller => "notes", :action => "show", :id => "1", :format => "json" } + ) + assert_routing( + { :path => "/api/0.6/notes/1.gpx", :method => :get }, + { :controller => "notes", :action => "show", :id => "1", :format => "gpx" } + ) + assert_routing( + { :path => "/api/0.6/notes/1/comment", :method => :post }, + { :controller => "notes", :action => "comment", :id => "1", :format => "xml" } + ) + assert_routing( + { :path => "/api/0.6/notes/1/close", :method => :post }, + { :controller => "notes", :action => "close", :id => "1", :format => "xml" } + ) + assert_routing( + { :path => "/api/0.6/notes/1/reopen", :method => :post }, + { :controller => "notes", :action => "reopen", :id => "1", :format => "xml" } + ) + assert_routing( + { :path => "/api/0.6/notes/1", :method => :delete }, + { :controller => "notes", :action => "destroy", :id => "1", :format => "xml" } + ) + + assert_routing( + { :path => "/api/0.6/notes", :method => :get }, + { :controller => "notes", :action => "index", :format => "xml" } + ) + assert_recognizes( + { :controller => "notes", :action => "index", :format => "xml" }, + { :path => "/api/0.6/notes.xml", :method => :get } + ) + assert_routing( + { :path => "/api/0.6/notes.rss", :method => :get }, + { :controller => "notes", :action => "index", :format => "rss" } + ) + assert_routing( + { :path => "/api/0.6/notes.json", :method => :get }, + { :controller => "notes", :action => "index", :format => "json" } + ) + assert_routing( + { :path => "/api/0.6/notes.gpx", :method => :get }, + { :controller => "notes", :action => "index", :format => "gpx" } + ) + + assert_routing( + { :path => "/api/0.6/notes/search", :method => :get }, + { :controller => "notes", :action => "search", :format => "xml" } + ) + assert_recognizes( + { :controller => "notes", :action => "search", :format => "xml" }, + { :path => "/api/0.6/notes/search.xml", :method => :get } + ) + assert_routing( + { :path => "/api/0.6/notes/search.rss", :method => :get }, + { :controller => "notes", :action => "search", :format => "rss" } + ) + assert_routing( + { :path => "/api/0.6/notes/search.json", :method => :get }, + { :controller => "notes", :action => "search", :format => "json" } + ) + assert_routing( + { :path => "/api/0.6/notes/search.gpx", :method => :get }, + { :controller => "notes", :action => "search", :format => "gpx" } + ) + + assert_routing( + { :path => "/api/0.6/notes/feed", :method => :get }, + { :controller => "notes", :action => "feed", :format => "rss" } + ) + + assert_recognizes( + { :controller => "notes", :action => "create" }, + { :path => "/api/0.6/notes/addPOIexec", :method => :post } + ) + assert_recognizes( + { :controller => "notes", :action => "close" }, + { :path => "/api/0.6/notes/closePOIexec", :method => :post } + ) + assert_recognizes( + { :controller => "notes", :action => "comment" }, + { :path => "/api/0.6/notes/editPOIexec", :method => :post } + ) + assert_recognizes( + { :controller => "notes", :action => "index", :format => "gpx" }, + { :path => "/api/0.6/notes/getGPX", :method => :get } + ) + assert_recognizes( + { :controller => "notes", :action => "feed", :format => "rss" }, + { :path => "/api/0.6/notes/getRSSfeed", :method => :get } + ) + + assert_routing( + { :path => "/user/username/notes", :method => :get }, + { :controller => "notes", :action => "mine", :display_name => "username" } + ) + end + + def test_create_success + assert_difference('Note.count') do + assert_difference('NoteComment.count') do + post :create, {:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json"} + end + end + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal "Point", js["geometry"]["type"] + assert_equal [-1.0, -1.0], js["geometry"]["coordinates"] + assert_equal "open", js["properties"]["status"] + assert_equal 1, js["properties"]["comments"].count + assert_equal "opened", js["properties"]["comments"].last["action"] + assert_equal "This is a comment", js["properties"]["comments"].last["text"] + assert_nil js["properties"]["comments"].last["user"] + id = js["properties"]["id"] + + get :show, {:id => id, :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal "Point", js["geometry"]["type"] + assert_equal [-1.0, -1.0], js["geometry"]["coordinates"] + assert_equal id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 1, js["properties"]["comments"].count + assert_equal "opened", js["properties"]["comments"].last["action"] + assert_equal "This is a comment", js["properties"]["comments"].last["text"] + assert_nil js["properties"]["comments"].last["user"] + end + + def test_create_fail + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lon => -1.0, :text => "This is a comment"} + end + end + assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lat => -1.0, :text => "This is a comment"} + end + end + assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lat => -1.0, :lon => -1.0} + end + end + assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lat => -1.0, :lon => -1.0, :text => ""} + end + end + assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lat => -100.0, :lon => -1.0, :text => "This is a comment"} + end + end + assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lat => -1.0, :lon => -200.0, :text => "This is a comment"} + end + end + assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lat => 'abc', :lon => -1.0, :text => "This is a comment"} + end + end + assert_response :bad_request + + assert_no_difference('Note.count') do + assert_no_difference('NoteComment.count') do + post :create, {:lat => -1.0, :lon => 'abc', :text => "This is a comment"} + end + end + assert_response :bad_request + end + + def test_comment_success + assert_difference('NoteComment.count') do + post :comment, {:id => notes(:open_note_with_comment).id, :text => "This is an additional comment", :format => "json"} + end + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:open_note_with_comment).id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 3, js["properties"]["comments"].count + assert_equal "commented", js["properties"]["comments"].last["action"] + assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] + assert_nil js["properties"]["comments"].last["user"] + + get :show, {:id => notes(:open_note_with_comment).id, :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:open_note_with_comment).id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 3, js["properties"]["comments"].count + assert_equal "commented", js["properties"]["comments"].last["action"] + assert_equal "This is an additional comment", js["properties"]["comments"].last["text"] + assert_nil js["properties"]["comments"].last["user"] + end + + def test_comment_fail + assert_no_difference('NoteComment.count') do + post :comment, {:text => "This is an additional comment"} + end + assert_response :bad_request + + assert_no_difference('NoteComment.count') do + post :comment, {:id => notes(:open_note_with_comment).id} + end + assert_response :bad_request + + assert_no_difference('NoteComment.count') do + post :comment, {:id => notes(:open_note_with_comment).id, :text => ""} + end + assert_response :bad_request + + assert_no_difference('NoteComment.count') do + post :comment, {:id => 12345, :text => "This is an additional comment"} + end + assert_response :not_found + + assert_no_difference('NoteComment.count') do + post :comment, {:id => notes(:hidden_note_with_comment).id, :text => "This is an additional comment"} + end + assert_response :gone + + assert_no_difference('NoteComment.count') do + post :comment, {:id => notes(:closed_note_with_comment).id, :text => "This is an additional comment"} + end + assert_response :conflict + end + + def test_close_success + post :close, {:id => notes(:open_note_with_comment).id, :text => "This is a close comment", :format => "json"} + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + post :close, {:id => notes(:open_note_with_comment).id, :text => "This is a close comment", :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:open_note_with_comment).id, js["properties"]["id"] + assert_equal "closed", js["properties"]["status"] + assert_equal 3, js["properties"]["comments"].count + assert_equal "closed", js["properties"]["comments"].last["action"] + assert_equal "This is a close comment", js["properties"]["comments"].last["text"] + assert_equal "test2", js["properties"]["comments"].last["user"] + + get :show, {:id => notes(:open_note_with_comment).id, :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:open_note_with_comment).id, js["properties"]["id"] + assert_equal "closed", js["properties"]["status"] + assert_equal 3, js["properties"]["comments"].count + assert_equal "closed", js["properties"]["comments"].last["action"] + assert_equal "This is a close comment", js["properties"]["comments"].last["text"] + assert_equal "test2", js["properties"]["comments"].last["user"] + end + + def test_close_fail + post :close + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + post :close + assert_response :bad_request + + post :close, {:id => 12345} + assert_response :not_found + + post :close, {:id => notes(:hidden_note_with_comment).id} + assert_response :gone + + post :close, {:id => notes(:closed_note_with_comment).id} + assert_response :conflict + end + + def test_reopen_success + post :reopen, {:id => notes(:closed_note_with_comment).id, :text => "This is a reopen comment", :format => "json"} + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + post :reopen, {:id => notes(:closed_note_with_comment).id, :text => "This is a reopen comment", :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:closed_note_with_comment).id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 2, js["properties"]["comments"].count + assert_equal "reopened", js["properties"]["comments"].last["action"] + assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"] + assert_equal "test2", js["properties"]["comments"].last["user"] + + get :show, {:id => notes(:closed_note_with_comment).id, :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:closed_note_with_comment).id, js["properties"]["id"] + assert_equal "open", js["properties"]["status"] + assert_equal 2, js["properties"]["comments"].count + assert_equal "reopened", js["properties"]["comments"].last["action"] + assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"] + assert_equal "test2", js["properties"]["comments"].last["user"] + end + + def test_reopen_fail + post :reopen, {:id => notes(:hidden_note_with_comment).id} + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + post :reopen, {:id => 12345} + assert_response :not_found + + post :reopen, {:id => notes(:hidden_note_with_comment).id} + assert_response :gone + + post :reopen, {:id => notes(:open_note_with_comment).id} + assert_response :conflict + end + + def test_show_success + get :show, {:id => notes(:open_note).id, :format => "xml"} + assert_response :success + assert_equal "application/xml", @response.content_type + assert_select "osm", :count => 1 do + assert_select "note[lat=#{notes(:open_note).lat}][lon=#{notes(:open_note).lon}]", :count => 1 do + assert_select "id", notes(:open_note).id + assert_select "url", note_url(notes(:open_note), :format => "xml") + assert_select "comment_url", comment_note_url(notes(:open_note), :format => "xml") + assert_select "close_url", close_note_url(notes(:open_note), :format => "xml") + assert_select "date_created", notes(:open_note).created_at.to_s + assert_select "status", notes(:open_note).status + assert_select "comments", :count => 1 do + assert_select "comment", :count => 1 + end + end + end + + get :show, {:id => notes(:open_note).id, :format => "rss"} + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 1 do + assert_select "link", browse_note_url(notes(:open_note)) + assert_select "guid", note_url(notes(:open_note)) + assert_select "pubDate", notes(:open_note).created_at.to_s(:rfc822) +# assert_select "geo:lat", notes(:open_note).lat.to_s +# assert_select "geo:long", notes(:open_note).lon +# assert_select "georss:point", "#{notes(:open_note).lon} #{notes(:open_note).lon}" + end + end + end + + get :show, {:id => notes(:open_note).id, :format => "json"} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal "Point", js["geometry"]["type"] + assert_equal notes(:open_note).lat, js["geometry"]["coordinates"][0] + assert_equal notes(:open_note).lon, js["geometry"]["coordinates"][1] + assert_equal notes(:open_note).id, js["properties"]["id"] + assert_equal note_url(notes(:open_note), :format => "json"), js["properties"]["url"] + assert_equal comment_note_url(notes(:open_note), :format => "json"), js["properties"]["comment_url"] + assert_equal close_note_url(notes(:open_note), :format => "json"), js["properties"]["close_url"] + assert_equal notes(:open_note).created_at, js["properties"]["date_created"] + assert_equal notes(:open_note).status, js["properties"]["status"] + + get :show, {:id => notes(:open_note).id, :format => "gpx"} + assert_response :success + assert_equal "application/gpx+xml", @response.content_type + assert_select "gpx", :count => 1 do + assert_select "wpt[lat=#{notes(:open_note).lat}][lon=#{notes(:open_note).lon}]", :count => 1 do + assert_select "extension", :count => 1 do + assert_select "id", notes(:open_note).id + assert_select "url", note_url(notes(:open_note), :format => "gpx") + assert_select "comment_url", comment_note_url(notes(:open_note), :format => "gpx") + assert_select "close_url", close_note_url(notes(:open_note), :format => "gpx") + end + end + end + end + + def test_show_hidden_comment + get :show, {:id => notes(:note_with_hidden_comment).id, :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:note_with_hidden_comment).id, js["properties"]["id"] + assert_equal 2, js["properties"]["comments"].count + assert_equal "Valid comment for note 5", js["properties"]["comments"][0]["text"] + assert_equal "Another valid comment for note 5", js["properties"]["comments"][1]["text"] + end + + def test_show_fail + get :show, {:id => 12345} + assert_response :not_found + + get :show, {:id => notes(:hidden_note_with_comment).id} + assert_response :gone + end + + def test_destroy_success + delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"} + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"} + assert_response :forbidden + + basic_authorization(users(:moderator_user).email, "test") + + delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"} + assert_response :success + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "Feature", js["type"] + assert_equal notes(:open_note_with_comment).id, js["properties"]["id"] + assert_equal "hidden", js["properties"]["status"] + assert_equal 3, js["properties"]["comments"].count + assert_equal "hidden", js["properties"]["comments"].last["action"] + assert_equal "This is a hide comment", js["properties"]["comments"].last["text"] + assert_equal "moderator", js["properties"]["comments"].last["user"] + + get :show, {:id => notes(:open_note_with_comment).id, :format => 'json'} + assert_response :gone + end + + def test_destroy_fail + delete :destroy, {:id => 12345, :format => "json"} + assert_response :unauthorized + + basic_authorization(users(:public_user).email, "test") + + delete :destroy, {:id => 12345, :format => "json"} + assert_response :forbidden + + basic_authorization(users(:moderator_user).email, "test") + + delete :destroy, {:id => 12345, :format => "json"} + assert_response :not_found + + delete :destroy, {:id => notes(:hidden_note_with_comment).id, :format => "json"} + assert_response :gone + end + + def test_index_success + get :index, {:bbox => '1,1,1.2,1.2', :format => 'rss'} + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 2 + end + end + + get :index, {:bbox => '1,1,1.2,1.2', :format => 'json'} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "FeatureCollection", js["type"] + assert_equal 2, js["features"].count + + get :index, {:bbox => '1,1,1.2,1.2', :format => 'xml'} + assert_response :success + assert_equal "application/xml", @response.content_type + assert_select "osm", :count => 1 do + assert_select "note", :count => 2 + end + + get :index, {:bbox => '1,1,1.2,1.2', :format => 'gpx'} + assert_response :success + assert_equal "application/gpx+xml", @response.content_type + assert_select "gpx", :count => 1 do + assert_select "wpt", :count => 2 + end + end + + def test_index_empty_area + get :index, {:bbox => '5,5,5.1,5.1', :format => 'rss'} + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 0 + end + end + + get :index, {:bbox => '5,5,5.1,5.1', :format => 'json'} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "FeatureCollection", js["type"] + assert_equal 0, js["features"].count + + get :index, {:bbox => '5,5,5.1,5.1', :format => 'xml'} + assert_response :success + assert_equal "application/xml", @response.content_type + assert_select "osm", :count => 1 do + assert_select "note", :count => 0 + end + + get :index, {:bbox => '5,5,5.1,5.1', :format => 'gpx'} + assert_response :success + assert_equal "application/gpx+xml", @response.content_type + assert_select "gpx", :count => 1 do + assert_select "wpt", :count => 0 + end + end + + def test_index_large_area + get :index, {:bbox => '-2.5,-2.5,2.5,2.5', :format => :json} + assert_response :success + assert_equal "application/json", @response.content_type + + get :index, {:l => '-2.5', :b => '-2.5', :r => '2.5', :t => '2.5', :format => :json} + assert_response :success + assert_equal "application/json", @response.content_type + + get :index, {:bbox => '-10,-10,12,12', :format => :json} + assert_response :bad_request + assert_equal "text/plain", @response.content_type + + get :index, {:l => '-10', :b => '-10', :r => '12', :t => '12', :format => :json} + assert_response :bad_request + assert_equal "text/plain", @response.content_type + end + + def test_index_closed + get :index, {:bbox => '1,1,1.7,1.7', :closed => '7', :format => 'json'} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "FeatureCollection", js["type"] + assert_equal 4, js["features"].count + + get :index, {:bbox => '1,1,1.7,1.7', :closed => '0', :format => 'json'} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "FeatureCollection", js["type"] + assert_equal 4, js["features"].count + + get :index, {:bbox => '1,1,1.7,1.7', :closed => '-1', :format => 'json'} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "FeatureCollection", js["type"] + assert_equal 6, js["features"].count + end + + def test_index_bad_params + get :index, {:bbox => '-2.5,-2.5,2.5'} + assert_response :bad_request + + get :index, {:bbox => '-2.5,-2.5,2.5,2.5,2.5'} + assert_response :bad_request + + get :index, {:b => '-2.5', :r => '2.5', :t => '2.5'} + assert_response :bad_request + + get :index, {:l => '-2.5', :r => '2.5', :t => '2.5'} + assert_response :bad_request + + get :index, {:l => '-2.5', :b => '-2.5', :t => '2.5'} + assert_response :bad_request + + get :index, {:l => '-2.5', :b => '-2.5', :r => '2.5'} + assert_response :bad_request + + get :index, {:bbox => '1,1,1.7,1.7', :limit => '0', :format => 'json'} + assert_response :bad_request + + get :index, {:bbox => '1,1,1.7,1.7', :limit => '10001', :format => 'json'} + assert_response :bad_request + end + + def test_search_success + get :search, {:q => 'note 1', :format => 'xml'} + assert_response :success + assert_equal "application/xml", @response.content_type + assert_select "osm", :count => 1 do + assert_select "note", :count => 1 + end + + get :search, {:q => 'note 1', :format => 'json'} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "FeatureCollection", js["type"] + assert_equal 1, js["features"].count + + get :search, {:q => 'note 1', :format => 'rss'} + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 1 + end + end + + get :search, {:q => 'note 1', :format => 'gpx'} + assert_response :success + assert_equal "application/gpx+xml", @response.content_type + assert_select "gpx", :count => 1 do + assert_select "wpt", :count => 1 + end + end + + def test_search_no_match + get :search, {:q => 'no match', :format => 'xml'} + assert_response :success + assert_equal "application/xml", @response.content_type + assert_select "osm", :count => 1 do + assert_select "note", :count => 0 + end + + get :search, {:q => 'no match', :format => 'json'} + assert_response :success + assert_equal "application/json", @response.content_type + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + assert_equal "FeatureCollection", js["type"] + assert_equal 0, js["features"].count + + get :search, {:q => 'no match', :format => 'rss'} + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 0 + end + end + + get :search, {:q => 'no match', :format => 'gpx'} + assert_response :success + assert_equal "application/gpx+xml", @response.content_type + assert_select "gpx", :count => 1 do + assert_select "wpt", :count => 0 + end + end + + def test_search_bad_params + get :search + assert_response :bad_request + + get :search, {:q => 'no match', :limit => '0', :format => 'json'} + assert_response :bad_request + + get :search, {:q => 'no match', :limit => '10001', :format => 'json'} + assert_response :bad_request + end + + def test_feed_success + get :feed, {:format => "rss"} + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 8 + end + end + + get :feed, {:bbox => "1,1,1.2,1.2", :format => "rss"} + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 3 + end + end + end + + def test_feed_fail + get :feed, {:bbox => "1,1,1.2", :format => "rss"} + assert_response :bad_request + + get :feed, {:bbox => "1,1,1.2,1.2,1.2", :format => "rss"} + assert_response :bad_request + + get :feed, {:bbox => "1,1,1.2,1.2", :limit => '0', :format => "rss"} + assert_response :bad_request + + get :feed, {:bbox => "1,1,1.2,1.2", :limit => '10001', :format => "rss"} + assert_response :bad_request + end + + def test_mine_success + get :mine, {:display_name => "test"} + assert_response :success + + get :mine, {:display_name => "pulibc_test2"} + assert_response :success + + get :mine, {:display_name => "non-existent"} + assert_response :not_found + end +end diff --git a/test/controllers/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb new file mode 100644 index 00000000000..a1df9f0f2a7 --- /dev/null +++ b/test/controllers/oauth_clients_controller_test.rb @@ -0,0 +1,211 @@ +require 'test_helper' + +class OauthClientsControllerTest < ActionController::TestCase + fixtures :users, :client_applications + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/user/username/oauth_clients", :method => :get }, + { :controller => "oauth_clients", :action => "index", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/oauth_clients/new", :method => :get }, + { :controller => "oauth_clients", :action => "new", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/oauth_clients", :method => :post }, + { :controller => "oauth_clients", :action => "create", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/oauth_clients/1", :method => :get }, + { :controller => "oauth_clients", :action => "show", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/oauth_clients/1/edit", :method => :get }, + { :controller => "oauth_clients", :action => "edit", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/oauth_clients/1", :method => :put }, + { :controller => "oauth_clients", :action => "update", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/oauth_clients/1", :method => :delete }, + { :controller => "oauth_clients", :action => "destroy", :display_name => "username", :id => "1" } + ) + end + + def test_index + user = users(:public_user) + + get :index, { :display_name => user.display_name } + assert_response :redirect + assert_redirected_to login_path(:referer => oauth_clients_path(:display_name => user.display_name)) + + get :index, { :display_name => user.display_name }, { :user => user } + assert_response :success + assert_template "index" + assert_select "div.client_application", 2 + end + + def test_new + user = users(:public_user) + + get :new, { :display_name => user.display_name } + assert_response :redirect + assert_redirected_to login_path(:referer => new_oauth_client_path(:display_name => user.display_name)) + + get :new, { :display_name => user.display_name }, { :user => user } + assert_response :success + assert_template "new" + assert_select "form", 1 do + assert_select "input#client_application_name", 1 + assert_select "input#client_application_url", 1 + assert_select "input#client_application_callback_url", 1 + assert_select "input#client_application_support_url", 1 + ClientApplication.all_permissions.each do |perm| + assert_select "input#client_application_#{perm}", 1 + end + end + end + + def test_create + user = users(:public_user) + + assert_difference "ClientApplication.count", 0 do + post :create, { :display_name => user.display_name } + end + assert_response :forbidden + + assert_difference "ClientApplication.count", 0 do + post :create, { + :display_name => user.display_name, + :client_application => { + :name => "Test Application" + } + }, { + :user => user + } + end + assert_response :success + assert_template "new" + + assert_difference "ClientApplication.count", 1 do + post :create, { + :display_name => user.display_name, + :client_application => { + :name => "Test Application", + :url => "http://test.example.com/" + } + }, { + :user => user + } + end + assert_response :redirect + assert_redirected_to oauth_client_path(:id => ClientApplication.find_by_name("Test Application").id) + end + + def test_show + user = users(:public_user) + client = client_applications(:oauth_web_app) + + get :show, { :display_name => user.display_name, :id => client.id } + assert_response :redirect + assert_redirected_to login_path(:referer => oauth_client_path(:display_name => user.display_name, :id => client.id)) + + get :show, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user } + assert_response :not_found + assert_template "not_found" + + get :show, { :display_name => user.display_name, :id => client.id }, { :user => user } + assert_response :success + assert_template "show" + end + + def test_edit + user = users(:public_user) + client = client_applications(:oauth_web_app) + + get :edit, { :display_name => user.display_name, :id => client.id } + assert_response :redirect + assert_redirected_to login_path(:referer => edit_oauth_client_path(:display_name => user.display_name, :id => client.id)) + + get :edit, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user } + assert_response :not_found + assert_template "not_found" + + get :edit, { :display_name => user.display_name, :id => client.id }, { :user => user } + assert_response :success + assert_template "edit" + assert_select "form", 1 do + assert_select "input#client_application_name", 1 + assert_select "input#client_application_url", 1 + assert_select "input#client_application_callback_url", 1 + assert_select "input#client_application_support_url", 1 + ClientApplication.all_permissions.each do |perm| + assert_select "input#client_application_#{perm}", 1 + end + end + end + + def test_update + user = users(:public_user) + client = client_applications(:oauth_web_app) + + put :update, { :display_name => user.display_name, :id => client.id } + assert_response :forbidden + + put :update, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user } + assert_response :not_found + assert_template "not_found" + + put :update, { + :display_name => user.display_name, + :id => client.id, + :client_application => { + :name => "New Name", + :url => nil + } + }, { + :user => user + } + assert_response :success + assert_template "edit" + + put :update, { + :display_name => user.display_name, + :id => client.id, + :client_application => { + :name => "New Name", + :url => "http://new.example.com/url" + } + }, { + :user => user + } + assert_response :redirect + assert_redirected_to oauth_client_path(:id => client.id) + end + + def test_destroy + user = users(:public_user) + client = client_applications(:oauth_web_app) + + assert_difference "ClientApplication.count", 0 do + delete :destroy, { :display_name => user.display_name, :id => client.id } + end + assert_response :forbidden + + assert_difference "ClientApplication.count", 0 do + delete :destroy, { :display_name => user.display_name, :id => client_applications(:normal_user_app).id }, { :user => user } + end + assert_response :not_found + assert_template "not_found" + + assert_difference "ClientApplication.count", -1 do + delete :destroy, { :display_name => user.display_name, :id => client.id }, { :user => user } + end + assert_response :redirect + assert_redirected_to oauth_clients_path(:display_name => user.display_name) + end +end diff --git a/test/controllers/oauth_controller_test.rb b/test/controllers/oauth_controller_test.rb new file mode 100644 index 00000000000..879e259c386 --- /dev/null +++ b/test/controllers/oauth_controller_test.rb @@ -0,0 +1,48 @@ +require 'test_helper' + +class OauthControllerTest < ActionController::TestCase + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/oauth/revoke", :method => :get }, + { :controller => "oauth", :action => "revoke" } + ) + assert_routing( + { :path => "/oauth/revoke", :method => :post }, + { :controller => "oauth", :action => "revoke" } + ) + assert_routing( + { :path => "/oauth/authorize", :method => :get }, + { :controller => "oauth", :action => "authorize" } + ) + assert_routing( + { :path => "/oauth/authorize", :method => :post }, + { :controller => "oauth", :action => "authorize" } + ) + assert_routing( + { :path => "/oauth/token", :method => :get }, + { :controller => "oauth", :action => "token" } + ) + assert_routing( + { :path => "/oauth/request_token", :method => :get }, + { :controller => "oauth", :action => "request_token" } + ) + assert_routing( + { :path => "/oauth/request_token", :method => :post }, + { :controller => "oauth", :action => "request_token" } + ) + assert_routing( + { :path => "/oauth/access_token", :method => :get }, + { :controller => "oauth", :action => "access_token" } + ) + assert_routing( + { :path => "/oauth/access_token", :method => :post }, + { :controller => "oauth", :action => "access_token" } + ) + assert_routing( + { :path => "/oauth/test_request", :method => :get }, + { :controller => "oauth", :action => "test_request" } + ) + end +end diff --git a/test/functional/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb similarity index 99% rename from test/functional/old_node_controller_test.rb rename to test/controllers/old_node_controller_test.rb index 44edc06a2f7..5b043634803 100644 --- a/test/functional/old_node_controller_test.rb +++ b/test/controllers/old_node_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'old_node_controller' class OldNodeControllerTest < ActionController::TestCase @@ -156,7 +156,7 @@ def test_not_found_version def check_not_found_id_version(id, version) get :version, :id => id, :version => version assert_response :not_found - rescue ActionController::RoutingError => ex + rescue ActionController::UrlGenerationError => ex assert_match /No route matches/, ex.to_s end diff --git a/test/functional/old_relation_controller_test.rb b/test/controllers/old_relation_controller_test.rb similarity index 99% rename from test/functional/old_relation_controller_test.rb rename to test/controllers/old_relation_controller_test.rb index 55e8a7377af..1db613cd473 100644 --- a/test/functional/old_relation_controller_test.rb +++ b/test/controllers/old_relation_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'old_relation_controller' class OldRelationControllerTest < ActionController::TestCase diff --git a/test/functional/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb similarity index 99% rename from test/functional/old_way_controller_test.rb rename to test/controllers/old_way_controller_test.rb index 2e9ec8263e3..40315caa5be 100644 --- a/test/functional/old_way_controller_test.rb +++ b/test/controllers/old_way_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'old_way_controller' class OldWayControllerTest < ActionController::TestCase diff --git a/test/functional/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb similarity index 85% rename from test/functional/redactions_controller_test.rb rename to test/controllers/redactions_controller_test.rb index a2bd75b100e..44a76069468 100644 --- a/test/functional/redactions_controller_test.rb +++ b/test/controllers/redactions_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'redactions_controller' class RedactionsControllerTest < ActionController::TestCase @@ -39,7 +39,6 @@ def test_routes def test_moderators_can_create session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name post :create, :redaction => { :title => "Foo", :description => "Description here." } assert_response :redirect @@ -48,7 +47,6 @@ def test_moderators_can_create def test_non_moderators_cant_create session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name post :create, :redaction => { :title => "Foo", :description => "Description here." } assert_response :forbidden @@ -56,7 +54,6 @@ def test_non_moderators_cant_create def test_moderators_can_delete_empty session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name # remove all elements from the redaction redaction = redactions(:example) @@ -71,7 +68,6 @@ def test_moderators_can_delete_empty def test_moderators_cant_delete_nonempty session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name # leave elements in the redaction redaction = redactions(:example) @@ -84,7 +80,6 @@ def test_moderators_cant_delete_nonempty def test_non_moderators_cant_delete session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name delete :destroy, :id => redactions(:example).id assert_response :forbidden @@ -92,7 +87,6 @@ def test_non_moderators_cant_delete def test_moderators_can_edit session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name get :edit, :id => redactions(:example).id assert_response :success @@ -100,7 +94,6 @@ def test_moderators_can_edit def test_non_moderators_cant_edit session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name get :edit, :id => redactions(:example).id assert_response :redirect @@ -109,7 +102,6 @@ def test_non_moderators_cant_edit def test_moderators_can_update session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name redaction = redactions(:example) @@ -120,7 +112,6 @@ def test_moderators_can_update def test_non_moderators_cant_update session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name redaction = redactions(:example) diff --git a/test/functional/relation_controller_test.rb b/test/controllers/relation_controller_test.rb similarity index 94% rename from test/functional/relation_controller_test.rb rename to test/controllers/relation_controller_test.rb index 1f2640d4615..66d6012840a 100644 --- a/test/functional/relation_controller_test.rb +++ b/test/controllers/relation_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'relation_controller' class RelationControllerTest < ActionController::TestCase @@ -114,6 +114,33 @@ def test_full end end + ## + # test fetching multiple relations + def test_relations + # check error when no parameter provided + get :relations + assert_response :bad_request + + # check error when no parameter value provided + get :relations, :relations => "" + assert_response :bad_request + + # test a working call + get :relations, :relations => "1,2,4,7" + assert_response :success + assert_select "osm" do + assert_select "relation", :count => 4 + assert_select "relation[id=1][visible=true]", :count => 1 + assert_select "relation[id=2][visible=false]", :count => 1 + assert_select "relation[id=4][visible=true]", :count => 1 + assert_select "relation[id=7][visible=true]", :count => 1 + end + + # check error when a non-existent relation is included + get :relations, :relations => "1,2,4,7,400" + assert_response :not_found + end + # ------------------------------------- # Test simple relation creation. # ------------------------------------- @@ -751,6 +778,31 @@ def test_history_ordering end end + ## + # remove all the members from a relation. the result is pretty useless, but + # still technically valid. + def test_remove_all_members + check_changeset_modify(BoundingBox.new(3,3,5,5)) do |changeset_id| + relation_xml = current_relations(:visible_relation).to_xml + relation_xml. + find("//osm/relation/member"). + each {|m| m.remove!} + + # update changeset ID to point to new changeset + update_changeset(relation_xml, changeset_id) + + # upload the change + content relation_xml + put :update, :id => current_relations(:visible_relation).id + assert_response :success, "can't update relation for remove all members test" + checkrelation = Relation.find(current_relations(:visible_relation).id) + assert_not_nil(checkrelation, + "uploaded relation not found in database after upload") + assert_equal(0, checkrelation.members.length, + "relation contains members but they should have all been deleted") + end + end + # ============================================================ # utility functions # ============================================================ @@ -891,7 +943,7 @@ def with_update_diff(rel) ## # returns a k->v hash of tags from an xml doc def get_tags_as_hash(a) - a.find("//osm/relation/tag").inject({}) do |h,v| + a.find("//osm/relation/tag").sort_by { |v| v['k'] }.inject({}) do |h,v| h[v['k']] = v['v'] h end diff --git a/test/functional/search_controller_test.rb b/test/controllers/search_controller_test.rb similarity index 93% rename from test/functional/search_controller_test.rb rename to test/controllers/search_controller_test.rb index 7fd060dc454..c7530477489 100644 --- a/test/functional/search_controller_test.rb +++ b/test/controllers/search_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class SearchControllerTest < ActionController::TestCase ## diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb new file mode 100644 index 00000000000..86a92490ac0 --- /dev/null +++ b/test/controllers/site_controller_test.rb @@ -0,0 +1,344 @@ +require 'test_helper' + +class SiteControllerTest < ActionController::TestCase + api_fixtures + + ## + # setup oauth keys + def setup + Object.const_set("ID_KEY", client_applications(:oauth_web_app).key) + Object.const_set("POTLATCH2_KEY", client_applications(:oauth_web_app).key) + end + + ## + # clear oauth keys + def teardown + Object.send("remove_const", "ID_KEY") + Object.send("remove_const", "POTLATCH2_KEY") + end + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/", :method => :get }, + { :controller => "site", :action => "index" } + ) + assert_routing( + { :path => "/", :method => :post }, + { :controller => "site", :action => "index" } + ) + assert_routing( + { :path => "/edit", :method => :get }, + { :controller => "site", :action => "edit" } + ) + assert_recognizes( + { :controller => "site", :action => "edit", :format => "html" }, + { :path => "/edit.html", :method => :get } + ) + assert_routing( + { :path => "/copyright", :method => :get }, + { :controller => "site", :action => "copyright" } + ) + assert_routing( + { :path => "/copyright/locale", :method => :get }, + { :controller => "site", :action => "copyright", :copyright_locale => "locale" } + ) + assert_routing( + { :path => "/welcome", :method => :get }, + { :controller => "site", :action => "welcome" } + ) + assert_routing( + { :path => "/fixthemap", :method => :get }, + { :controller => "site", :action => "fixthemap" } + ) + assert_routing( + { :path => "/export", :method => :get }, + { :controller => "site", :action => "export" } + ) + assert_recognizes( + { :controller => "site", :action => "export", :format => "html" }, + { :path => "/export.html", :method => :get } + ) + assert_routing( + { :path => "/offline", :method => :get }, + { :controller => "site", :action => "offline" } + ) + assert_routing( + { :path => "/key", :method => :get }, + { :controller => "site", :action => "key" } + ) + assert_routing( + { :path => "/go/shortcode", :method => :get }, + { :controller => "site", :action => "permalink", :code => "shortcode" } + ) + assert_routing( + { :path => "/preview/formatname", :method => :post }, + { :controller => "site", :action => "preview", :format => "formatname" } + ) + assert_routing( + { :path => "/id", :method => :get }, + { :controller => "site", :action => "id" } + ) + end + + # Test the index page + def test_index + get :index + assert_response :success + assert_template 'index' + end + + # Test the index page redirects + def test_index_redirect + get :index, :lat => 4, :lon => 5 + assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=5/4/5' + + get :index, :lat => 4, :lon => 5, :zoom => 3 + assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4/5' + + get :index, :layers => 'T' + assert_redirected_to :controller => :site, :action => :index, :anchor => 'layers=T' + + get :index, :notes => 'yes' + assert_redirected_to :controller => :site, :action => :index, :anchor => 'layers=N' + + get :index, :lat => 4, :lon => 5, :zoom => 3, :layers => 'T' + assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4/5&layers=T' + end + + # Test the permalink redirect + def test_permalink + get :permalink, :code => 'wBz3--' + assert_response :redirect + assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :m => '' + assert_response :redirect + assert_redirected_to :controller => :site, :action => :index, :mlat => '4.8779296875', :mlon => '3.955078125', :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :layers => 'T' + assert_response :redirect + assert_redirected_to :controller => :site, :action => :index, :layers => 'T', :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :node => 1 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :way => 2 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :relation => 3 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => 'map=3/4.8779296875/3.955078125' + + get :permalink, :code => 'wBz3--', :changeset => 4 + assert_response :redirect + assert_redirected_to :controller => :browse, :action => :changeset, :id => 4, :anchor => 'map=3/4.8779296875/3.955078125' + end + + # Test the key page + def test_key + xhr :get, :key + assert_response :success + assert_template "key" + assert_template :layout => false + end + + # Test the edit page redirects when you aren't logged in + def test_edit + get :edit + assert_response :redirect + assert_redirected_to :controller => :user, :action => :login, :referer => "/edit" + end + + # Test the right editor gets used when the user hasn't set a preference + def test_edit_without_preference + get :edit, nil, { :user => users(:public_user).id } + assert_response :success + assert_template "edit" + assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1 + end + + # Test the right editor gets used when the user has set a preference + def test_edit_with_preference + user = users(:public_user) + user.preferred_editor = "id" + user.save! + + get :edit, nil, { :user => user.id } + assert_response :success + assert_template "edit" + assert_template :partial => "_id", :count => 1 + + user = users(:public_user) + user.preferred_editor = "potlatch2" + user.save! + + get :edit, nil, { :user => user.id } + assert_response :success + assert_template "edit" + assert_template :partial => "_potlatch2", :count => 1 + + user = users(:public_user) + user.preferred_editor = "potlatch" + user.save! + + get :edit, nil, { :user => user.id } + assert_response :success + assert_template "edit" + assert_template :partial => "_potlatch", :count => 1 + + user = users(:public_user) + user.preferred_editor = "remote" + user.save! + + get :edit, nil, { :user => user.id } + assert_response :success + assert_template "index" + end + + # Test editing a specific node + def test_edit_with_node + user = users(:public_user) + node = current_nodes(:visible_node) + + get :edit, { :node => node.id }, { :user => user.id } + assert_response :success + assert_template "edit" + assert_equal 1.0, assigns(:lat) + assert_equal 1.0, assigns(:lon) + assert_equal 18, assigns(:zoom) + end + + # Test editing a specific way + def test_edit_with_way + user = users(:public_user) + way = current_ways(:visible_way) + + get :edit, { :way => way.id }, { :user => user.id } + assert_response :success + assert_template "edit" + assert_equal 3.0, assigns(:lat) + assert_equal 3.0, assigns(:lon) + assert_equal 17, assigns(:zoom) + end + + # Test editing a specific note + def test_edit_with_note + user = users(:public_user) + note = notes(:open_note) + + get :edit, { :note => note.id }, { :user => user.id } + assert_response :success + assert_template "edit" + assert_equal 1.0, assigns(:lat) + assert_equal 1.0, assigns(:lon) + assert_equal 17, assigns(:zoom) + end + + # Test editing a specific GPX trace + def test_edit_with_gpx + user = users(:public_user) + gpx = gpx_files(:public_trace_file) + + get :edit, { :gpx => gpx.id }, { :user => user.id } + assert_response :success + assert_template "edit" + assert_equal 1.0, assigns(:lat) + assert_equal 1.0, assigns(:lon) + assert_equal 16, assigns(:zoom) + end + + # Test the edit page redirects + def test_edit_redirect + get :edit, :lat => 4, :lon => 5 + assert_redirected_to :controller => :site, :action => :edit, :anchor => 'map=5/4/5' + + get :edit, :lat => 4, :lon => 5, :zoom => 3 + assert_redirected_to :controller => :site, :action => :edit, :anchor => 'map=3/4/5' + + get :edit, :lat => 4, :lon => 5, :zoom => 3, :editor => 'id' + assert_redirected_to :controller => :site, :action => :edit, :editor => 'id', :anchor => 'map=3/4/5' + end + + # Test the copyright page + def test_copyright + get :copyright + assert_response :success + assert_template "copyright" + end + + # Test the welcome page + def test_welcome + get :welcome + assert_response :redirect + assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome" + + get :welcome, nil, { :user => users(:public_user).id } + assert_response :success + assert_template "welcome" + end + + # Test the fixthemap page + def test_fixthemap + get :fixthemap + assert_response :success + assert_template "fixthemap" + end + + # Test the help page + def test_help + get :help + assert_response :success + assert_template "help" + end + + # Test the about page + def test_about + get :about + assert_response :success + assert_template "about" + end + + # Test the export page + def test_export + get :export + assert_response :success + assert_template "export" + assert_template :layout => "map" + + xhr :get, :export + assert_response :success + assert_template "export" + assert_template :layout => "xhr" + end + + # Test the offline page + def test_offline + get :offline + assert_response :success + assert_template "offline" + end + + # Test the rich text preview + def test_preview + xhr :post, :preview, :format => "html" + assert_response :success + + xhr :post, :preview, :format => "markdown" + assert_response :success + + xhr :post, :preview, :format => "text" + assert_response :success + end + + # Test the id frame + def test_id + get :id, nil, { :user => users(:public_user).id } + assert_response :success + assert_template "id" + assert_template :layout => false + end +end diff --git a/test/functional/swf_controller_test.rb b/test/controllers/swf_controller_test.rb similarity index 84% rename from test/functional/swf_controller_test.rb rename to test/controllers/swf_controller_test.rb index 09b8f3aae32..d7213133b9a 100644 --- a/test/functional/swf_controller_test.rb +++ b/test/controllers/swf_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class SwfControllerTest < ActionController::TestCase ## diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb new file mode 100644 index 00000000000..01c81a1aa5c --- /dev/null +++ b/test/controllers/trace_controller_test.rb @@ -0,0 +1,600 @@ +require 'test_helper' + +class TraceControllerTest < ActionController::TestCase + fixtures :users, :gpx_files + set_fixture_class :gpx_files => 'Trace' + + def setup + @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") + Object.const_set("GPX_TRACE_DIR", File.dirname(__FILE__) + "/../traces") + end + + def teardown + Object.send("remove_const", "GPX_TRACE_DIR") + Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir) + end + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/gpx/create", :method => :post }, + { :controller => "trace", :action => "api_create" } + ) + assert_routing( + { :path => "/api/0.6/gpx/1", :method => :get }, + { :controller => "trace", :action => "api_read", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/gpx/1", :method => :put }, + { :controller => "trace", :action => "api_update", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/gpx/1", :method => :delete }, + { :controller => "trace", :action => "api_delete", :id => "1" } + ) + assert_recognizes( + { :controller => "trace", :action => "api_read", :id => "1" }, + { :path => "/api/0.6/gpx/1/details", :method => :get } + ) + assert_routing( + { :path => "/api/0.6/gpx/1/data", :method => :get }, + { :controller => "trace", :action => "api_data", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/gpx/1/data.xml", :method => :get }, + { :controller => "trace", :action => "api_data", :id => "1", :format => "xml" } + ) + + assert_routing( + { :path => "/traces", :method => :get }, + { :controller => "trace", :action => "list" } + ) + assert_routing( + { :path => "/traces/page/1", :method => :get }, + { :controller => "trace", :action => "list", :page => "1" } + ) + assert_routing( + { :path => "/traces/tag/tagname", :method => :get }, + { :controller => "trace", :action => "list", :tag => "tagname" } + ) + assert_routing( + { :path => "/traces/tag/tagname/page/1", :method => :get }, + { :controller => "trace", :action => "list", :tag => "tagname", :page => "1" } + ) + assert_routing( + { :path => "/user/username/traces", :method => :get }, + { :controller => "trace", :action => "list", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/traces/page/1", :method => :get }, + { :controller => "trace", :action => "list", :display_name => "username", :page => "1" } + ) + assert_routing( + { :path => "/user/username/traces/tag/tagname", :method => :get }, + { :controller => "trace", :action => "list", :display_name => "username", :tag => "tagname" } + ) + assert_routing( + { :path => "/user/username/traces/tag/tagname/page/1", :method => :get }, + { :controller => "trace", :action => "list", :display_name => "username", :tag => "tagname", :page => "1" } + ) + + assert_routing( + { :path => "/traces/mine", :method => :get }, + { :controller => "trace", :action => "mine" } + ) + assert_routing( + { :path => "/traces/mine/page/1", :method => :get }, + { :controller => "trace", :action => "mine", :page => "1" } + ) + assert_routing( + { :path => "/traces/mine/tag/tagname", :method => :get }, + { :controller => "trace", :action => "mine", :tag => "tagname" } + ) + assert_routing( + { :path => "/traces/mine/tag/tagname/page/1", :method => :get }, + { :controller => "trace", :action => "mine", :tag => "tagname", :page => "1" } + ) + + assert_routing( + { :path => "/traces/rss", :method => :get }, + { :controller => "trace", :action => "georss", :format => :rss } + ) + assert_routing( + { :path => "/traces/tag/tagname/rss", :method => :get }, + { :controller => "trace", :action => "georss", :tag => "tagname", :format => :rss } + ) + assert_routing( + { :path => "/user/username/traces/rss", :method => :get }, + { :controller => "trace", :action => "georss", :display_name => "username", :format => :rss } + ) + assert_routing( + { :path => "/user/username/traces/tag/tagname/rss", :method => :get }, + { :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname", :format => :rss } + ) + + assert_routing( + { :path => "/user/username/traces/1", :method => :get }, + { :controller => "trace", :action => "view", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/traces/1/picture", :method => :get }, + { :controller => "trace", :action => "picture", :display_name => "username", :id => "1" } + ) + assert_routing( + { :path => "/user/username/traces/1/icon", :method => :get }, + { :controller => "trace", :action => "icon", :display_name => "username", :id => "1" } + ) + + assert_routing( + { :path => "/trace/create", :method => :get }, + { :controller => "trace", :action => "create" } + ) + assert_routing( + { :path => "/trace/create", :method => :post }, + { :controller => "trace", :action => "create" } + ) + assert_routing( + { :path => "/trace/1/data", :method => :get }, + { :controller => "trace", :action => "data", :id => "1" } + ) + assert_routing( + { :path => "/trace/1/data.xml", :method => :get }, + { :controller => "trace", :action => "data", :id => "1", :format => "xml" } + ) + assert_routing( + { :path => "/trace/1/edit", :method => :get }, + { :controller => "trace", :action => "edit", :id => "1" } + ) + assert_routing( + { :path => "/trace/1/edit", :method => :post }, + { :controller => "trace", :action => "edit", :id => "1" } + ) + assert_routing( + { :path => "/trace/1/edit", :method => :patch }, + { :controller => "trace", :action => "edit", :id => "1" } + ) + assert_routing( + { :path => "/trace/1/delete", :method => :post }, + { :controller => "trace", :action => "delete", :id => "1" } + ) + end + + # Check that the list of changesets is displayed + def test_list + get :list + check_trace_list Trace.public + + get :list, :tag => "London" + check_trace_list Trace.tagged("London").public + end + + # Check that I can get mine + def test_list_mine + # First try to get it when not logged in + get :mine + assert_redirected_to :controller => 'user', :action => 'login', :referer => '/traces/mine' + + # Now try when logged in + get :mine, {}, {:user => users(:public_user).id} + assert_redirected_to :controller => 'trace', :action => 'list', :display_name => users(:public_user).display_name + + # Fetch the actual list + get :list, {:display_name => users(:public_user).display_name}, {:user => users(:public_user).id} + check_trace_list users(:public_user).traces + end + + # Check the list of changesets for a specific user + def test_list_user + # Test a user with no traces + get :list, :display_name => users(:second_public_user).display_name + check_trace_list users(:second_public_user).traces.public + + # Test a user with some traces - should see only public ones + get :list, :display_name => users(:public_user).display_name + check_trace_list users(:public_user).traces.public + + # Should still see only public ones when authenticated as another user + get :list, {:display_name => users(:public_user).display_name}, {:user => users(:normal_user).id} + check_trace_list users(:public_user).traces.public + + # Should see all traces when authenticated as the target user + get :list, {:display_name => users(:public_user).display_name}, {:user => users(:public_user).id} + check_trace_list users(:public_user).traces + + # Should only see traces with the correct tag when a tag is specified + get :list, {:display_name => users(:public_user).display_name, :tag => "London"}, {:user => users(:public_user).id} + check_trace_list users(:public_user).traces.tagged("London") + end + + # Check that the rss loads + def test_rss + get :georss, :format => :rss + check_trace_feed Trace.public + + get :georss, :tag => "London", :format => :rss + check_trace_feed Trace.tagged("London").public + + get :georss, :display_name => users(:public_user).display_name, :format => :rss + check_trace_feed users(:public_user).traces.public + + get :georss, :display_name => users(:public_user).display_name, :tag => "Birmingham", :format => :rss + check_trace_feed users(:public_user).traces.tagged("Birmingham").public + end + + # Test viewing a trace + def test_view + # First with no auth, which should work since the trace is public + get :view, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id} + check_trace_view gpx_files(:public_trace_file) + + # Now with some other user, which should work since the trace is public + get :view, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + check_trace_view gpx_files(:public_trace_file) + + # And finally we should be able to do it with the owner of the trace + get :view, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + check_trace_view gpx_files(:public_trace_file) + end + + # Check an anonymous trace can't be viewed by another user + def test_view_anon + # First with no auth + get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id} + assert_response :redirect + assert_redirected_to :action => :list + + # Now with some other user, which should work since the trace is anon + get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :list + + # And finally we should be able to do it with the owner of the trace + get :view, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:public_user).id} + check_trace_view gpx_files(:anon_trace_file) + end + + # Test viewing a trace that doesn't exist + def test_view_not_found + # First with no auth, which should work since the trace is public + get :view, {:display_name => users(:public_user).display_name, :id => 0} + assert_response :redirect + assert_redirected_to :action => :list + + # Now with some other user, which should work since the trace is public + get :view, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :redirect + assert_redirected_to :action => :list + + # And finally we should be able to do it with the owner of the trace + get :view, {:display_name => users(:public_user).display_name, :id => 5}, {:user => users(:public_user).id} + assert_response :redirect + assert_redirected_to :action => :list + end + + # Test downloading a trace + def test_data + # First with no auth, which should work since the trace is public + get :data, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id} + check_trace_data gpx_files(:public_trace_file) + + # Now with some other user, which should work since the trace is public + get :data, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + check_trace_data gpx_files(:public_trace_file) + + # And finally we should be able to do it with the owner of the trace + get :data, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + check_trace_data gpx_files(:public_trace_file) + end + + # Test downloading a compressed trace + def test_data_compressed + # First get the data as is + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:identifiable_trace_file).id} + check_trace_data gpx_files(:identifiable_trace_file), "application/x-gzip", "gpx.gz" + + # Now ask explicitly for XML format + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:identifiable_trace_file).id, :format => "xml"} + check_trace_data gpx_files(:identifiable_trace_file), "application/xml", "xml" + + # Now ask explicitly for GPX format + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:identifiable_trace_file).id, :format => "gpx"} + check_trace_data gpx_files(:identifiable_trace_file) + end + + # Check an anonymous trace can't be downloaded by another user + def test_data_anon + # First with no auth + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id} + assert_response :not_found + + # Now with some other user, which should work since the trace is anon + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:normal_user).id} + assert_response :not_found + + # And finally we should be able to do it with the owner of the trace + get :data, {:display_name => users(:public_user).display_name, :id => gpx_files(:anon_trace_file).id}, {:user => users(:public_user).id} + check_trace_data gpx_files(:anon_trace_file) + end + + # Test downloading a trace that doesn't exist + def test_data_not_found + # First with no auth, which should work since the trace is public + get :data, {:display_name => users(:public_user).display_name, :id => 0} + assert_response :not_found + + # Now with some other user, which should work since the trace is public + get :data, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :not_found + + # And finally we should be able to do it with the owner of the trace + get :data, {:display_name => users(:public_user).display_name, :id => 5}, {:user => users(:public_user).id} + assert_response :not_found + end + + # Test fetching the edit page for a trace + def test_edit_get + # First with no auth + get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id} + assert_response :redirect + assert_redirected_to :controller => :user, :action => :login, :referer => trace_edit_path(:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id) + + # Now with some other user, which should fail + get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + assert_response :forbidden + + # Now with a trace which doesn't exist + get :edit, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :not_found + + # Now with a trace which has been deleted + get :edit, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id}, {:user => users(:public_user).id} + assert_response :not_found + + # Finally with a trace that we are allowed to edit + get :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + assert_response :success + end + + # Test saving edits to a trace + def test_edit_post + # New details + new_details = { :description => "Changed description", :tagstring => "new_tag", :visibility => "private" } + + # First with no auth + post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details} + assert_response :forbidden + + # Now with some other user, which should fail + post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details}, {:user => users(:public_user).id} + assert_response :forbidden + + # Now with a trace which doesn't exist + post :edit, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id, :trace => new_details} + assert_response :not_found + + # Now with a trace which has been deleted + post :edit, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id, :trace => new_details}, {:user => users(:public_user).id} + assert_response :not_found + + # Finally with a trace that we are allowed to edit + post :edit, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id, :trace => new_details}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + trace = Trace.find(gpx_files(:public_trace_file).id) + assert_equal new_details[:description], trace.description + assert_equal new_details[:tagstring], trace.tagstring + assert_equal new_details[:visibility], trace.visibility + end + + # Test deleting a trace + def test_delete + # First with no auth + post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id,} + assert_response :forbidden + + # Now with some other user, which should fail + post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:public_user).id} + assert_response :forbidden + + # Now with a trace which doesn't exist + post :delete, {:display_name => users(:public_user).display_name, :id => 0}, {:user => users(:public_user).id} + assert_response :not_found + + # Now with a trace has already been deleted + post :delete, {:display_name => users(:public_user).display_name, :id => gpx_files(:deleted_trace_file).id}, {:user => users(:public_user).id} + assert_response :not_found + + # Finally with a trace that we are allowed to delete + post :delete, {:display_name => users(:normal_user).display_name, :id => gpx_files(:public_trace_file).id}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name + trace = Trace.find(gpx_files(:public_trace_file).id) + assert_equal false, trace.visible + end + + # Check getting a specific trace through the api + def test_api_read + # First with no auth + get :api_read, :id => gpx_files(:public_trace_file).id + assert_response :unauthorized + + # Now with some other user, which should work since the trace is public + basic_authorization(users(:public_user).display_name, "test") + get :api_read, :id => gpx_files(:public_trace_file).id + assert_response :success + + # And finally we should be able to do it with the owner of the trace + basic_authorization(users(:normal_user).display_name, "test") + get :api_read, :id => gpx_files(:public_trace_file).id + assert_response :success + end + + # Check an anoymous trace can't be specifically fetched by another user + def test_api_read_anon + # Furst with no auth + get :api_read, :id => gpx_files(:anon_trace_file).id + assert_response :unauthorized + + # Now try with another user, which shouldn't work since the trace is anon + basic_authorization(users(:normal_user).display_name, "test") + get :api_read, :id => gpx_files(:anon_trace_file).id + assert_response :forbidden + + # And finally we should be able to get the trace details with the trace owner + basic_authorization(users(:public_user).display_name, "test") + get :api_read, :id => gpx_files(:anon_trace_file).id + assert_response :success + end + + # Check the api details for a trace that doesn't exist + def test_api_read_not_found + # Try first with no auth, as it should requure it + get :api_read, :id => 0 + assert_response :unauthorized + + # Login, and try again + basic_authorization(users(:public_user).display_name, "test") + get :api_read, :id => 0 + assert_response :not_found + + # Now try a trace which did exist but has been deleted + basic_authorization(users(:public_user).display_name, "test") + get :api_read, :id => 5 + assert_response :not_found + end + + # Check updating a trace through the api + def test_api_update + # First with no auth + content gpx_files(:public_trace_file).to_xml + put :api_update, :id => gpx_files(:public_trace_file).id + assert_response :unauthorized + + # Now with some other user, which should fail + basic_authorization(users(:public_user).display_name, "test") + content gpx_files(:public_trace_file).to_xml + put :api_update, :id => gpx_files(:public_trace_file).id + assert_response :forbidden + + # Now with a trace which doesn't exist + basic_authorization(users(:public_user).display_name, "test") + content gpx_files(:public_trace_file).to_xml + put :api_update, :id => 0 + assert_response :not_found + + # Now with a trace which did exist but has been deleted + basic_authorization(users(:public_user).display_name, "test") + content gpx_files(:deleted_trace_file).to_xml + put :api_update, :id => gpx_files(:deleted_trace_file).id + assert_response :not_found + + # Now try an update with the wrong ID + basic_authorization(users(:normal_user).display_name, "test") + content gpx_files(:anon_trace_file).to_xml + put :api_update, :id => gpx_files(:public_trace_file).id + assert_response :bad_request, + "should not be able to update a trace with a different ID from the XML" + + # And finally try an update that should work + basic_authorization(users(:normal_user).display_name, "test") + t = gpx_files(:public_trace_file) + t.description = "Changed description" + t.visibility = "private" + content t.to_xml + put :api_update, :id => t.id + assert_response :success + nt = Trace.find(t.id) + assert_equal nt.description, t.description + assert_equal nt.visibility, t.visibility + end + + # Check deleting a trace through the api + def test_api_delete + # First with no auth + delete :api_delete, :id => gpx_files(:public_trace_file).id + assert_response :unauthorized + + # Now with some other user, which should fail + basic_authorization(users(:public_user).display_name, "test") + delete :api_delete, :id => gpx_files(:public_trace_file).id + assert_response :forbidden + + # Now with a trace which doesn't exist + basic_authorization(users(:public_user).display_name, "test") + delete :api_delete, :id => 0 + assert_response :not_found + + # And finally we should be able to do it with the owner of the trace + basic_authorization(users(:normal_user).display_name, "test") + delete :api_delete, :id => gpx_files(:public_trace_file).id + assert_response :success + + # Try it a second time, which should fail + basic_authorization(users(:normal_user).display_name, "test") + delete :api_delete, :id => gpx_files(:public_trace_file).id + assert_response :not_found + end + +private + + def check_trace_feed(traces) + assert_response :success + assert_template "georss" + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "title" + assert_select "description" + assert_select "link" + assert_select "image" + assert_select "item", :count => traces.visible.count do |items| + traces.visible.order("timestamp DESC").zip(items).each do |trace,item| + assert_select item, "title", trace.name + assert_select item, "link", "http://test.host/user/#{trace.user.display_name}/traces/#{trace.id}" + assert_select item, "guid", "http://test.host/user/#{trace.user.display_name}/traces/#{trace.id}" + assert_select item, "description" +# assert_select item, "dc:creator", trace.user.display_name + assert_select item, "pubDate", trace.timestamp.rfc822 + end + end + end + end + end + + def check_trace_list(traces) + assert_response :success + assert_template "list" + + if traces.count > 0 + assert_select "table#trace_list tbody", :count => 1 do + assert_select "tr", :count => traces.visible.count do |rows| + traces.visible.order("timestamp DESC").zip(rows).each do |trace,row| + assert_select row, "span.trace_summary", Regexp.new(Regexp.escape("(#{trace.size} points)")) + assert_select row, "td", Regexp.new(Regexp.escape(trace.description)) + assert_select row, "td", Regexp.new(Regexp.escape("by #{trace.user.display_name}")) + end + end + end + else + assert_select "h4", /Nothing here yet/ + end + end + + def check_trace_view(trace) + assert_response :success + assert_template "view" + + assert_select "table", :count => 1 do + assert_select "td", /^#{Regexp.quote(trace.name)} / + assert_select "td", trace.user.display_name + assert_select "td", trace.description + end + end + + def check_trace_data(trace, content_type = "application/gpx+xml", extension = "gpx") + assert_response :success + assert_equal content_type, @response.content_type + assert_equal "attachment; filename=\"#{trace.id}.#{extension}\"", @response.header["Content-Disposition"] + end +end diff --git a/test/functional/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb similarity index 91% rename from test/functional/user_blocks_controller_test.rb rename to test/controllers/user_blocks_controller_test.rb index 29724592954..ffb5744ea25 100644 --- a/test/functional/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserBlocksControllerTest < ActionController::TestCase fixtures :users, :user_roles, :user_blocks @@ -76,7 +76,7 @@ def test_index # test the show action def test_show # Viewing a block should fail when no ID is given - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get :show end @@ -101,7 +101,6 @@ def test_show # Login as the blocked user session[:user] = users(:blocked_user).id - cookies["_osm_username"] = users(:blocked_user).display_name # Now viewing it should mark it as seen get :show, :id => user_blocks(:active_block) @@ -118,7 +117,6 @@ def test_new # Login as a normal user session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that normal users can't load the block creation page get :new, :display_name => users(:normal_user).display_name @@ -127,7 +125,6 @@ def test_new # Login as a moderator session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name # Check that the block creation page loads for moderators get :new, :display_name => users(:normal_user).display_name @@ -144,13 +141,13 @@ def test_new get :new assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user does not exist" + assert_select "h1", "The user does not exist" # We should get an error if the user doesn't exist get :new, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" end ## @@ -162,7 +159,6 @@ def test_edit # Login as a normal user session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that normal users can't load the block edit page get :edit, :id => user_blocks(:active_block).id @@ -171,7 +167,6 @@ def test_edit # Login as a moderator session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name # Check that the block edit page loads for moderators get :edit, :id => user_blocks(:active_block).id @@ -184,7 +179,7 @@ def test_edit end # We should get an error if no user is specified - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get :edit end @@ -204,7 +199,6 @@ def test_create # Login as a normal user session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that normal users can't create blocks post :create @@ -212,7 +206,6 @@ def test_create # Login as a moderator session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name # A bogus block period should result in an error assert_no_difference "UserBlock.count" do @@ -245,13 +238,13 @@ def test_create post :create assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user does not exist" + assert_select "h1", "The user does not exist" # We should get an error if the user doesn't exist post :create, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" end ## @@ -263,7 +256,6 @@ def test_update # Login as a normal user session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that normal users can't update blocks put :update, :id => user_blocks(:active_block).id @@ -271,7 +263,6 @@ def test_update # Login as the wrong moderator session[:user] = users(:second_moderator_user).id - cookies["_osm_username"] = users(:second_moderator_user).display_name # Check that only the person who created a block can update it assert_no_difference "UserBlock.count" do @@ -285,7 +276,6 @@ def test_update # Login as the correct moderator session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name # A bogus block period should result in an error assert_no_difference "UserBlock.count" do @@ -311,7 +301,7 @@ def test_update assert_equal "Vandalism", b.reason # We should get an error if no block ID is specified - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do put :update end @@ -331,7 +321,6 @@ def test_revoke # Login as a normal user session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Check that normal users can't load the block revoke page get :revoke, :id => user_blocks(:active_block).id @@ -340,7 +329,6 @@ def test_revoke # Login as a moderator session[:user] = users(:moderator_user).id - cookies["_osm_username"] = users(:moderator_user).display_name # Check that the block revoke page loads for moderators get :revoke, :id => user_blocks(:active_block).id @@ -358,7 +346,7 @@ def test_revoke assert_in_delta Time.now, b.ends_at, 1 # We should get an error if no block ID is specified - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get :revoke end @@ -373,7 +361,7 @@ def test_revoke # test the blocks_on action def test_blocks_on # Asking for a list of blocks with no user name should fail - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get :blocks_on end @@ -381,7 +369,7 @@ def test_blocks_on get :blocks_on, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Check the list of blocks for a user that has never been blocked get :blocks_on, :display_name => users(:normal_user).display_name @@ -411,7 +399,7 @@ def test_blocks_on # test the blocks_by action def test_blocks_by # Asking for a list of blocks with no user name should fail - assert_raise ActionController::RoutingError do + assert_raise ActionController::UrlGenerationError do get :blocks_by end @@ -419,7 +407,7 @@ def test_blocks_by get :blocks_by, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Check the list of blocks given by one moderator get :blocks_by, :display_name => users(:moderator_user).display_name diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb new file mode 100644 index 00000000000..c068ee40816 --- /dev/null +++ b/test/controllers/user_controller_test.rb @@ -0,0 +1,855 @@ +require 'test_helper' + +class UserControllerTest < ActionController::TestCase + fixtures :users + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/user/1", :method => :get }, + { :controller => "user", :action => "api_read", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/user/details", :method => :get }, + { :controller => "user", :action => "api_details" } + ) + assert_routing( + { :path => "/api/0.6/user/gpx_files", :method => :get }, + { :controller => "user", :action => "api_gpx_files" } + ) + + assert_routing( + { :path => "/login", :method => :get }, + { :controller => "user", :action => "login" } + ) + assert_routing( + { :path => "/login", :method => :post }, + { :controller => "user", :action => "login" } + ) + assert_recognizes( + { :controller => "user", :action => "login", :format => "html" }, + { :path => "/login.html", :method => :get } + ) + + assert_routing( + { :path => "/logout", :method => :get }, + { :controller => "user", :action => "logout" } + ) + assert_routing( + { :path => "/logout", :method => :post }, + { :controller => "user", :action => "logout" } + ) + assert_recognizes( + { :controller => "user", :action => "logout", :format => "html" }, + { :path => "/logout.html", :method => :get } + ) + + assert_routing( + { :path => "/user/new", :method => :get }, + { :controller => "user", :action => "new" } + ) + + assert_routing( + { :path => "/user/new", :method => :post }, + { :controller => "user", :action => "create" } + ) + + assert_routing( + { :path => "/user/terms", :method => :get }, + { :controller => "user", :action => "terms" } + ) + + assert_routing( + { :path => "/user/save", :method => :post }, + { :controller => "user", :action => "save" } + ) + + assert_routing( + { :path => "/user/username/confirm", :method => :get }, + { :controller => "user", :action => "confirm", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/confirm", :method => :post }, + { :controller => "user", :action => "confirm", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/confirm/resend", :method => :get }, + { :controller => "user", :action => "confirm_resend", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/confirm", :method => :get }, + { :controller => "user", :action => "confirm" } + ) + assert_routing( + { :path => "/user/confirm", :method => :post }, + { :controller => "user", :action => "confirm" } + ) + assert_routing( + { :path => "/user/confirm-email", :method => :get }, + { :controller => "user", :action => "confirm_email" } + ) + assert_routing( + { :path => "/user/confirm-email", :method => :post }, + { :controller => "user", :action => "confirm_email" } + ) + + assert_routing( + { :path => "/user/go_public", :method => :post }, + { :controller => "user", :action => "go_public" } + ) + + assert_routing( + { :path => "/user/forgot-password", :method => :get }, + { :controller => "user", :action => "lost_password" } + ) + assert_routing( + { :path => "/user/forgot-password", :method => :post }, + { :controller => "user", :action => "lost_password" } + ) + assert_routing( + { :path => "/user/reset-password", :method => :get }, + { :controller => "user", :action => "reset_password" } + ) + assert_routing( + { :path => "/user/reset-password", :method => :post }, + { :controller => "user", :action => "reset_password" } + ) + + assert_routing( + { :path => "/user/suspended", :method => :get }, + { :controller => "user", :action => "suspended" } + ) + + assert_routing( + { :path => "/user/username", :method => :get }, + { :controller => "user", :action => "view", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/username/account", :method => :get }, + { :controller => "user", :action => "account", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/account", :method => :post }, + { :controller => "user", :action => "account", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/username/make_friend", :method => :get }, + { :controller => "user", :action => "make_friend", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/make_friend", :method => :post }, + { :controller => "user", :action => "make_friend", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/remove_friend", :method => :get }, + { :controller => "user", :action => "remove_friend", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/remove_friend", :method => :post }, + { :controller => "user", :action => "remove_friend", :display_name => "username" } + ) + + assert_routing( + { :path => "/user/username/set_status", :method => :get }, + { :controller => "user", :action => "set_status", :display_name => "username" } + ) + assert_routing( + { :path => "/user/username/delete", :method => :get }, + { :controller => "user", :action => "delete", :display_name => "username" } + ) + + assert_routing( + { :path => "/users", :method => :get }, + { :controller => "user", :action => "list" } + ) + assert_routing( + { :path => "/users", :method => :post }, + { :controller => "user", :action => "list" } + ) + assert_routing( + { :path => "/users/status", :method => :get }, + { :controller => "user", :action => "list", :status => "status" } + ) + assert_routing( + { :path => "/users/status", :method => :post }, + { :controller => "user", :action => "list", :status => "status" } + ) + end + + # The user creation page loads + def test_user_create_view + get :new + assert_response :redirect + assert_redirected_to user_new_path(:cookie_test => "true") + + get :new, { :cookie_test => "true" }, { :cookie_test => true } + assert_response :success + + assert_select "html", :count => 1 do + assert_select "head", :count => 1 do + assert_select "title", :text => /Sign Up/, :count => 1 + end + assert_select "body", :count => 1 do + assert_select "div#content", :count => 1 do + assert_select "form[action='/user/new'][method=post]", :count => 1 do + assert_select "input[id=user_email]", :count => 1 + assert_select "input[id=user_email_confirmation]", :count => 1 + assert_select "input[id=user_display_name]", :count => 1 + assert_select "input[id=user_pass_crypt][type=password]", :count => 1 + assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1 + assert_select "input[type=submit][value=Sign Up]", :count => 1 + end + end + end + end + end + + def new_user + user = User.new + user.status = "pending" + user.display_name = "new_tester" + user.email = "newtester@osm.org" + user.email_confirmation = "newtester@osm.org" + user.pass_crypt = "testtest" + user.pass_crypt_confirmation = "testtest" + user + end + + def test_user_create_success + user = new_user + + assert_difference('User.count') do + assert_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} + end + end + + # Check the e-mail + register_email = ActionMailer::Base.deliveries.first + + assert_equal register_email.to[0], user.email + assert_match /#{@url}/, register_email.body.to_s + + # Check the page + assert_redirected_to :action => 'confirm', :display_name => user.display_name + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_submit_duplicate_email + user = new_user + user.email = users(:public_user).email + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} + end + end + + assert_response :success + assert_template 'new' + assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email" + end + + def test_user_create_submit_duplicate_email_uppercase + user = new_user + user.email = users(:public_user).email.upcase + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} + end + end + + assert_response :success + assert_template 'new' + assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email" + end + + def test_user_create_submit_duplicate_name + user = new_user + user.display_name = users(:public_user).display_name + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} + end + end + + assert_response :success + assert_template 'new' + assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" + end + + def test_user_create_submit_duplicate_name_uppercase + user = new_user + user.display_name = users(:public_user).display_name.upcase + + assert_no_difference('User.count') do + assert_no_difference('ActionMailer::Base.deliveries.size') do + post :save, {}, {:new_user => user} + end + end + + assert_response :success + assert_template 'new' + assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" + end + + def test_user_save_referer_params + user = new_user + + post :save, {}, {:new_user => user, + :referer => '/edit?editor=id#map=1/2/3'} + + assert_equal welcome_path(:editor => 'id', :zoom => 1, :lat => 2, :lon => 3), + user.tokens.order("id DESC").first.referer + end + + def test_user_confirm_expired_token + user = users(:inactive_user) + token = user.tokens.new + token.expiry = 1.day.ago + token.save! + + @request.cookies["_osm_session"] = user.display_name + post :confirm, :confirm_string => token.token + + assert_redirected_to :action => 'confirm' + assert_match /expired/, flash[:error] + end + + def test_user_already_confirmed + user = users(:normal_user) + token = user.tokens.create + + @request.cookies["_osm_session"] = user.display_name + post :confirm, :confirm_string => token.token + + assert_redirected_to :action => 'login' + assert_match /confirmed/, flash[:error] + end + + def test_user_terms_new_user + get :terms, {}, { "new_user" => User.new } + assert_response :success + assert_template :terms + end + + def test_user_terms_seen + user = users(:normal_user) + + get :terms, {}, { "user" => user } + assert_response :redirect + assert_redirected_to :action => :account, :display_name => user.display_name + end + + def test_user_go_public + post :go_public, {}, { :user => users(:normal_user) } + assert_response :redirect + assert_redirected_to :action => :account, :display_name => users(:normal_user).display_name + assert_equal true, User.find(users(:normal_user).id).data_public + end + + def test_user_lost_password + # Test fetching the lost password page + get :lost_password + assert_response :success + assert_template :lost_password + assert_select "div#notice", false + + # Test resetting using the address as recorded for a user that has an + # address which is duplicated in a different case by another user + assert_difference('ActionMailer::Base.deliveries.size', 1) do + post :lost_password, :user => { :email => users(:normal_user).email } + end + assert_response :redirect + assert_redirected_to :action => :login + assert_match /^Sorry you lost it/, flash[:notice] + assert_equal users(:normal_user).email, ActionMailer::Base.deliveries.last.to[0] + + # Test resetting using an address that matches a different user + # that has the same address in a different case + assert_difference('ActionMailer::Base.deliveries.size', 1) do + post :lost_password, :user => { :email => users(:normal_user).email.upcase } + end + assert_response :redirect + assert_redirected_to :action => :login + assert_match /^Sorry you lost it/, flash[:notice] + assert_equal users(:uppercase_user).email, ActionMailer::Base.deliveries.last.to[0] + + # Test resetting using an address that is a case insensitive match + # for more than one user but not an exact match for either + assert_difference('ActionMailer::Base.deliveries.size', 0) do + post :lost_password, :user => { :email => users(:normal_user).email.titlecase } + end + assert_response :success + assert_template :lost_password + assert_select ".error", /^Could not find that email address/ + + # Test resetting using the address as recorded for a user that has an + # address which is case insensitively unique + assert_difference('ActionMailer::Base.deliveries.size', 1) do + post :lost_password, :user => { :email => users(:public_user).email } + end + assert_response :redirect + assert_redirected_to :action => :login + assert_match /^Sorry you lost it/, flash[:notice] + assert_equal users(:public_user).email, ActionMailer::Base.deliveries.last.to[0] + + # Test resetting using an address that matches a user that has the + # same (case insensitively unique) address in a different case + assert_difference('ActionMailer::Base.deliveries.size', 1) do + post :lost_password, :user => { :email => users(:public_user).email.upcase } + end + assert_response :redirect + assert_redirected_to :action => :login + assert_match /^Sorry you lost it/, flash[:notice] + assert_equal users(:public_user).email, ActionMailer::Base.deliveries.last.to[0] + end + + def test_reset_password + # Test a request with no token + get :reset_password + assert_response :bad_request + + # Test a request with a bogus token + get :reset_password, :token => "made_up_token" + assert_response :redirect + assert_redirected_to :action => :lost_password + + # Create a valid token for a user + token = User.find(users(:inactive_user).id).tokens.create + + # Test a request with a valid token + get :reset_password, :token => token.token + assert_response :success + assert_template :reset_password + + # Test setting a new password + post :reset_password, :token => token.token, :user => { :pass_crypt => "new_password", :pass_crypt_confirmation => "new_password" } + assert_response :redirect + assert_redirected_to :action => :login + user = User.find(users(:inactive_user).id) + assert_equal "active", user.status + assert_equal true, user.email_valid + assert_equal user, User.authenticate(:username => "inactive@openstreetmap.org", :password => "new_password") + end + + def test_user_update + # Get a user to work with - note that this user deliberately + # conflicts with uppercase_user in the email and display name + # fields to test that we can change other fields without any + # validation errors being reported + user = users(:normal_user) + + # Make sure that you are redirected to the login page when + # you are not logged in + get :account, { :display_name => user.display_name } + assert_response :redirect + assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account" + + # Make sure that you are blocked when not logged in as the right user + get :account, { :display_name => user.display_name }, { "user" => users(:public_user).id } + assert_response :forbidden + + # Make sure we get the page when we are logged in as the right user + get :account, { :display_name => user.display_name }, { "user" => user } + assert_response :success + assert_template :account + + # Updating the description should work + user.description = "new description" + post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } + assert_response :success + assert_template :account + assert_select "div#errorExplanation", false + assert_select ".notice", /^User information updated successfully/ + assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description + + # Changing name to one that exists should fail + new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name) + post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id } + assert_response :success + assert_template :account + assert_select ".notice", false + assert_select "div#errorExplanation" + assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name" + + # Changing name to one that exists should fail, regardless of case + new_attributes = user.attributes.dup.merge(:display_name => users(:public_user).display_name.upcase) + post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id } + assert_response :success + assert_template :account + assert_select ".notice", false + assert_select "div#errorExplanation" + assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_display_name" + + # Changing name to one that doesn't exist should work + new_attributes = user.attributes.dup.merge(:display_name => "new tester") + post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id } + assert_response :success + assert_template :account + assert_select "div#errorExplanation", false + assert_select ".notice", /^User information updated successfully/ + assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester" + + # Record the change of name + user.display_name = "new tester" + + # Changing email to one that exists should fail + user.new_email = users(:public_user).email + post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } + assert_response :success + assert_template :account + assert_select ".notice", false + assert_select "div#errorExplanation" + assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email" + + # Changing email to one that exists should fail, regardless of case + user.new_email = users(:public_user).email.upcase + post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } + assert_response :success + assert_template :account + assert_select ".notice", false + assert_select "div#errorExplanation" + assert_select "form#accountForm > fieldset > div.form-row > input.field_with_errors#user_new_email" + + # Changing email to one that doesn't exist should work + user.new_email = "new_tester@example.com" + post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } + assert_response :success + assert_template :account + assert_select "div#errorExplanation", false + assert_select ".notice", /^User information updated successfully/ + assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email + end + + # Check that the user account page will display and contains some relevant + # information for the user + def test_user_view_account + # Test a non-existent user + get :view, {:display_name => "unknown"} + assert_response :not_found + + # Test a normal user + get :view, {:display_name => "test"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href^=/user/test/history]", 1 + assert_select "a[href=/user/test/traces]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 0 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 0 + end + + # Test a user who has been blocked + get :view, {:display_name => "blocked"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href^=/user/blocked/history]", 1 + assert_select "a[href=/user/blocked/traces]", 1 + assert_select "a[href=/user/blocked/diary]", 1 + assert_select "a[href=/user/blocked/diary/comments]", 1 + assert_select "a[href=/user/blocked/account]", 0 + assert_select "a[href=/user/blocked/blocks]", 1 + assert_select "a[href=/user/blocked/blocks_by]", 0 + assert_select "a[href=/blocks/new/blocked]", 0 + end + + # Test a moderator who has applied blocks + get :view, {:display_name => "moderator"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href^=/user/moderator/history]", 1 + assert_select "a[href=/user/moderator/traces]", 1 + assert_select "a[href=/user/moderator/diary]", 1 + assert_select "a[href=/user/moderator/diary/comments]", 1 + assert_select "a[href=/user/moderator/account]", 0 + assert_select "a[href=/user/moderator/blocks]", 0 + assert_select "a[href=/user/moderator/blocks_by]", 1 + assert_select "a[href=/blocks/new/moderator]", 0 + end + + # Login as a normal user + session[:user] = users(:normal_user).id + + # Test the normal user + get :view, {:display_name => "test"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href^=/user/test/history]", 1 + assert_select "a[href=/traces/mine]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 1 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 0 + end + + # Login as a moderator + session[:user] = users(:moderator_user).id + + # Test the normal user + get :view, {:display_name => "test"} + assert_response :success + assert_select "div#userinformation" do + assert_select "a[href^=/user/test/history]", 1 + assert_select "a[href=/user/test/traces]", 1 + assert_select "a[href=/user/test/diary]", 1 + assert_select "a[href=/user/test/diary/comments]", 1 + assert_select "a[href=/user/test/account]", 0 + assert_select "a[href=/user/test/blocks]", 0 + assert_select "a[href=/user/test/blocks_by]", 0 + assert_select "a[href=/blocks/new/test]", 1 + end + end + + def test_user_api_read + # check that a visible user is returned properly + get :api_read, :id => users(:normal_user).id + assert_response :success + + # check the data that is returned + assert_select "description", :count => 1, :text => "test" + assert_select "contributor-terms", :count => 1 do + assert_select "[agreed=true]" + end + assert_select "img", :count => 1 + assert_select "roles", :count => 1 do + assert_select "role", :count => 0 + end + assert_select "changesets", :count => 1 do + assert_select "[count=0]" + end + assert_select "traces", :count => 1 do + assert_select "[count=0]" + end + assert_select "blocks", :count => 1 do + assert_select "received", :count => 1 do + assert_select "[count=0][active=0]" + end + assert_select "issued", :count => 0 + end + + # check that we aren't revealing private information + assert_select "contributor-terms[pd]", false + assert_select "home", false + assert_select "languages", false + assert_select "messages", false + + # check that a suspended user is not returned + get :api_read, :id => users(:suspended_user).id + assert_response :gone + + # check that a deleted user is not returned + get :api_read, :id => users(:deleted_user).id + assert_response :gone + + # check that a non-existent user is not returned + get :api_read, :id => 0 + assert_response :not_found + end + + def test_user_api_details + # check that nothing is returned when not logged in + get :api_details + assert_response :unauthorized + + # check that we get a response when logged in + basic_authorization(users(:normal_user).email, "test") + get :api_details + assert_response :success + + # check the data that is returned + assert_select "description", :count => 1, :text => "test" + assert_select "contributor-terms", :count => 1 do + assert_select "[agreed=true][pd=false]" + end + assert_select "img", :count => 1 + assert_select "roles", :count => 1 do + assert_select "role", :count => 0 + end + assert_select "changesets", :count => 1 do + assert_select "[count=0]", :count => 1 + end + assert_select "traces", :count => 1 do + assert_select "[count=0]", :count => 1 + end + assert_select "blocks", :count => 1 do + assert_select "received", :count => 1 do + assert_select "[count=0][active=0]" + end + assert_select "issued", :count => 0 + end + assert_select "home", :count => 1 do + assert_select "[lat=12.1][lon=12.1][zoom=3]" + end + assert_select "languages", :count => 1 do + assert_select "lang", :count => 1, :text => "en" + end + assert_select "messages", :count => 1 do + assert_select "received", :count => 1 do + assert_select "[count=1][unread=0]" + end + assert_select "sent", :count => 1 do + assert_select "[count=1]" + end + end + end + + def test_user_make_friend + # Get users to work with + user = users(:normal_user) + friend = users(:second_public_user) + + # Check that the users aren't already friends + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When not logged in a GET should ask us to login + get :make_friend, {:display_name => friend.display_name} + assert_redirected_to :controller => :user, :action => "login", :referer => make_friend_path(:display_name => friend.display_name) + + # When not logged in a POST should error + post :make_friend, {:display_name => friend.display_name} + assert_response :forbidden + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a GET should get a confirmation page + get :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_response :success + assert_template :make_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer]", 0 + assert_select "input[type=submit]", 1 + end + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # The GET should preserve any referer + get :make_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user} + assert_response :success + assert_template :make_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer][value=/test]", 1 + assert_select "input[type=submit]", 1 + end + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a POST should add the friendship + post :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /is now your friend/, flash[:notice] + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # A second POST should report that the friendship already exists + post :make_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /You are already friends with/, flash[:warning] + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + end + + def test_user_remove_friend + # Get users to work with + user = users(:normal_user) + friend = users(:public_user) + + # Check that the users are friends + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When not logged in a GET should ask us to login + get :remove_friend, {:display_name => friend.display_name} + assert_redirected_to :controller => :user, :action => "login", :referer => remove_friend_path(:display_name => friend.display_name) + + # When not logged in a POST should error + post :remove_friend, {:display_name => friend.display_name} + assert_response :forbidden + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a GET should get a confirmation page + get :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_response :success + assert_template :remove_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer]", 0 + assert_select "input[type=submit]", 1 + end + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # The GET should preserve any referer + get :remove_friend, {:display_name => friend.display_name, :referer => "/test"}, {"user" => user} + assert_response :success + assert_template :remove_friend + assert_select "form" do + assert_select "input[type=hidden][name=referer][value=/test]", 1 + assert_select "input[type=submit]", 1 + end + assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # When logged in a POST should remove the friendship + post :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /was removed from your friends/, flash[:notice] + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + + # A second POST should report that the friendship does not exist + post :remove_friend, {:display_name => friend.display_name}, {"user" => user} + assert_redirected_to user_path(:display_name => friend.display_name) + assert_match /is not one of your friends/, flash[:error] + assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first + end + + def test_set_status + # Try without logging in + get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"} + assert_response :redirect + assert_redirected_to :action => :login, :referer => set_status_user_path(:status => "suspended") + + # Now try as a normal user + get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + + # Finally try as an administrator + get :set_status, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + assert_equal "suspended", User.find(users(:normal_user).id).status + end + + def test_delete + # Try without logging in + get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"} + assert_response :redirect + assert_redirected_to :action => :login, :referer => delete_user_path(:status => "suspended") + + # Now try as a normal user + get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:normal_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + + # Finally try as an administrator + get :delete, {:display_name => users(:normal_user).display_name, :status => "suspended"}, {:user => users(:administrator_user).id} + assert_response :redirect + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name + + # Check that the user was deleted properly + user = User.find(users(:normal_user).id) + assert_equal "user_1", user.display_name + assert_equal "", user.description + assert_nil user.home_lat + assert_nil user.home_lon + assert_equal false, user.image.file? + assert_equal false, user.email_valid + assert_nil user.new_email + assert_nil user.openid_url + assert_equal "deleted", user.status + end +end diff --git a/test/controllers/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb new file mode 100644 index 00000000000..f8cafe6a927 --- /dev/null +++ b/test/controllers/user_preference_controller_test.rb @@ -0,0 +1,206 @@ +require 'test_helper' + +class UserPreferenceControllerTest < ActionController::TestCase + fixtures :users, :user_preferences + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/user/preferences", :method => :get }, + { :controller => "user_preference", :action => "read" } + ) + assert_routing( + { :path => "/api/0.6/user/preferences", :method => :put }, + { :controller => "user_preference", :action => "update" } + ) + assert_routing( + { :path => "/api/0.6/user/preferences/key", :method => :get }, + { :controller => "user_preference", :action => "read_one", :preference_key => "key" } + ) + assert_routing( + { :path => "/api/0.6/user/preferences/key", :method => :put }, + { :controller => "user_preference", :action => "update_one", :preference_key => "key" } + ) + assert_routing( + { :path => "/api/0.6/user/preferences/key", :method => :delete }, + { :controller => "user_preference", :action => "delete_one", :preference_key => "key" } + ) + end + + ## + # test read action + def test_read + # first try without auth + get :read + assert_response :unauthorized, "should be authenticated" + + # authenticate as a user with no preferences + basic_authorization("test@example.com", "test") + + # try the read again + get :read + assert_select "osm" do + assert_select "preferences", :count => 1 do + assert_select "preference", :count => 0 + end + end + + # authenticate as a user with preferences + basic_authorization("test@openstreetmap.org", "test") + + # try the read again + get :read + assert_response :success + assert_equal "text/xml", @response.content_type + assert_select "osm" do + assert_select "preferences", :count => 1 do + assert_select "preference", :count => 2 + assert_select "preference[k=\"#{user_preferences(:a).k}\"][v=\"#{user_preferences(:a).v}\"]", :count => 1 + assert_select "preference[k=\"#{user_preferences(:two).k}\"][v=\"#{user_preferences(:two).v}\"]", :count => 1 + end + end + end + + ## + # test read_one action + def test_read_one + # try a read without auth + get :read_one, :preference_key => "key" + assert_response :unauthorized, "should be authenticated" + + # authenticate as a user with preferences + basic_authorization("test@openstreetmap.org", "test") + + # try the read again + get :read_one, :preference_key => "key" + assert_response :success + assert_equal "text/plain", @response.content_type + assert_equal "value", @response.body + + # try the read again for a non-existent key + get :read_one, :preference_key => "unknown_key" + assert_response :not_found + end + + ## + # test update action + def test_update + # try a put without auth + assert_no_difference "UserPreference.count" do + content "" + put :update + end + assert_response :unauthorized, "should be authenticated" + assert_equal "value", UserPreference.find(1, "key").v + assert_equal "some_value", UserPreference.find(1, "some_key").v + assert_raises ActiveRecord::RecordNotFound do + UserPreference.find(1, "new_key") + end + + # authenticate as a user with preferences + basic_authorization("test@openstreetmap.org", "test") + + # try the put again + assert_no_difference "UserPreference.count" do + content "" + put :update + end + assert_response :success + assert_equal "text/plain", @response.content_type + assert_equal "", @response.body + assert_equal "new_value", UserPreference.find(1, "key").v + assert_equal "value", UserPreference.find(1, "new_key").v + assert_raises ActiveRecord::RecordNotFound do + UserPreference.find(1, "some_key") + end + + # try a put with duplicate keys + assert_no_difference "UserPreference.count" do + content "" + put :update + end + assert_response :bad_request + assert_equal "text/plain", @response.content_type + assert_equal "Duplicate preferences with key key", @response.body + assert_equal "new_value", UserPreference.find(1, "key").v + + # try a put with invalid content + assert_no_difference "UserPreference.count" do + content "nonsense" + put :update + end + assert_response :bad_request + end + + ## + # test update_one action + def test_update_one + # try a put without auth + assert_no_difference "UserPreference.count" do + content "new_value" + put :update_one, :preference_key => "new_key" + end + assert_response :unauthorized, "should be authenticated" + assert_raises ActiveRecord::RecordNotFound do + UserPreference.find(1, "new_key") + end + + # authenticate as a user with preferences + basic_authorization("test@openstreetmap.org", "test") + + # try adding a new preference + assert_difference "UserPreference.count", 1 do + content "new_value" + put :update_one, :preference_key => "new_key" + end + assert_response :success + assert_equal "text/plain", @response.content_type + assert_equal "", @response.body + assert_equal "new_value", UserPreference.find(1, "new_key").v + + # try changing the value of a preference + assert_no_difference "UserPreference.count" do + content "newer_value" + put :update_one, :preference_key => "new_key" + end + assert_response :success + assert_equal "text/plain", @response.content_type + assert_equal "", @response.body + assert_equal "newer_value", UserPreference.find(1, "new_key").v + end + + ## + # test delete_one action + def test_delete_one + # try a delete without auth + assert_no_difference "UserPreference.count" do + delete :delete_one, :preference_key => "key" + end + assert_response :unauthorized, "should be authenticated" + assert_equal "value", UserPreference.find(1, "key").v + + # authenticate as a user with preferences + basic_authorization("test@openstreetmap.org", "test") + + # try the delete again + assert_difference "UserPreference.count", -1 do + get :delete_one, :preference_key => "key" + end + assert_response :success + assert_equal "text/plain", @response.content_type + assert_equal "", @response.body + assert_raises ActiveRecord::RecordNotFound do + UserPreference.find(1, "key") + end + + # try the delete again for the same key + assert_no_difference "UserPreference.count" do + get :delete_one, :preference_key => "key" + end + assert_response :not_found + assert_raises ActiveRecord::RecordNotFound do + UserPreference.find(1, "key") + end + end +end diff --git a/test/functional/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb similarity index 92% rename from test/functional/user_roles_controller_test.rb rename to test/controllers/user_roles_controller_test.rb index ed5d1a17d03..1d005824d2e 100644 --- a/test/functional/user_roles_controller_test.rb +++ b/test/controllers/user_roles_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserRolesControllerTest < ActionController::TestCase fixtures :users, :user_roles @@ -25,7 +25,6 @@ def test_grant # Login as an unprivileged user session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Granting should still fail post :grant, :display_name => users(:normal_user).display_name, :role => "moderator" @@ -34,7 +33,6 @@ def test_grant # Login as an administrator session[:user] = users(:administrator_user).id - cookies["_osm_username"] = users(:administrator_user).display_name UserRole::ALL_ROLES.each do |role| @@ -44,7 +42,7 @@ def test_grant end assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Granting a role from a user that already has it should fail assert_no_difference "UserRole.count" do @@ -85,7 +83,6 @@ def test_revoke # Login as an unprivileged user session[:user] = users(:public_user).id - cookies["_osm_username"] = users(:public_user).display_name # Revoking should still fail post :revoke, :display_name => users(:normal_user).display_name, :role => "moderator" @@ -94,7 +91,6 @@ def test_revoke # Login as an administrator session[:user] = users(:administrator_user).id - cookies["_osm_username"] = users(:administrator_user).display_name UserRole::ALL_ROLES.each do |role| @@ -104,7 +100,7 @@ def test_revoke end assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Removing a role from a user that doesn't have it should fail assert_no_difference "UserRole.count" do diff --git a/test/functional/way_controller_test.rb b/test/controllers/way_controller_test.rb similarity index 95% rename from test/functional/way_controller_test.rb rename to test/controllers/way_controller_test.rb index a4b5a192a1b..6e2ee3b0f2a 100644 --- a/test/functional/way_controller_test.rb +++ b/test/controllers/way_controller_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'way_controller' class WayControllerTest < ActionController::TestCase @@ -54,7 +54,7 @@ def test_read ## # check the "full" mode def test_full - Way.find(:all).each do |way| + Way.all.each do |way| get :full, :id => way.id # full call should say "gone" for non-visible ways... @@ -79,6 +79,33 @@ def test_full end end + ## + # test fetching multiple ways + def test_ways + # check error when no parameter provided + get :ways + assert_response :bad_request + + # check error when no parameter value provided + get :ways, :ways => "" + assert_response :bad_request + + # test a working call + get :ways, :ways => "1,2,4,6" + assert_response :success + assert_select "osm" do + assert_select "way", :count => 4 + assert_select "way[id=1][visible=true]", :count => 1 + assert_select "way[id=2][visible=false]", :count => 1 + assert_select "way[id=4][visible=true]", :count => 1 + assert_select "way[id=6][visible=true]", :count => 1 + end + + # check error when a non-existent way is included + get :ways, :ways => "1,2,4,6,400" + assert_response :not_found + end + # ------------------------------------- # Test simple way creation. # ------------------------------------- diff --git a/test/fixtures/client_applications.yml b/test/fixtures/client_applications.yml index e8087eb98df..2da7a9df86d 100644 --- a/test/fixtures/client_applications.yml +++ b/test/fixtures/client_applications.yml @@ -31,3 +31,18 @@ oauth_desktop_app: allow_write_api: true allow_read_gpx: true allow_write_gpx: false + +normal_user_app: + name: Some OAuth Desktop App + created_at: "2009-05-21 00:00:00" + support_url: http://some.desktop.app.org/support + updated_at: "2009-05-21 00:00:00" + user_id: 1 + secret: jgYx43yx1FAMQbG6T0qZhvvFsKEf6Pgd5XfHr5kFgv4 + key: N6KVhfeaT626fhBt9aCMeA + allow_read_prefs: true + allow_write_prefs: false + allow_write_diary: false + allow_write_api: true + allow_read_gpx: true + allow_write_gpx: false diff --git a/test/fixtures/current_node_tags.yml b/test/fixtures/current_node_tags.yml index 5087310e7db..9c41a375e44 100644 --- a/test/fixtures/current_node_tags.yml +++ b/test/fixtures/current_node_tags.yml @@ -33,3 +33,27 @@ public_v_t1: k: 'testvisible' v: 'yes' +nwn_name: + node_id: 18 + k: 'name' + v: 'Test Node' + +nwn_name_ru: + node_id: 18 + k: 'name:ru' + v: 'проверки узла' + +nwn_building: + node_id: 18 + k: 'building' + v: 'yes' + +nwn_tourism: + node_id: 18 + k: 'tourism' + v: 'museum' + +nwn_shop: + node_id: 18 + k: 'shop' + v: 'gift' diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml index 3f34ddabefa..af6ea01d513 100644 --- a/test/fixtures/current_nodes.yml +++ b/test/fixtures/current_nodes.yml @@ -171,3 +171,12 @@ redacted_node: tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 +node_with_name: + id: 18 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: true + version: 2 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 diff --git a/test/fixtures/current_relation_members.yml b/test/fixtures/current_relation_members.yml index 31dccbc229c..67911b8d57c 100644 --- a/test/fixtures/current_relation_members.yml +++ b/test/fixtures/current_relation_members.yml @@ -1,29 +1,34 @@ t1: relation_id: 1 + sequence_id: 1 member_role: "some" member_type: "Way" member_id: 3 t2: relation_id: 1 + sequence_id: 2 member_role: "some" member_type: "Node" member_id: 5 t3: relation_id: 1 + sequence_id: 3 member_role: "some" member_type: "Relation" member_id: 3 t4: relation_id: 3 + sequence_id: 1 member_role: "some" member_type: "Node" member_id: 5 t5: relation_id: 2 + sequence_id: 1 member_role: "some" member_type: "Node" member_id: 5 @@ -33,3 +38,24 @@ public_used: member_role: "used by other relation" member_type: "Relation" member_id: 5 + +r8_m1: + relation_id: 8 + sequence_id: 1 + member_role: "some node" + member_type: "Node" + member_id: 15 + +r8_m2: + relation_id: 8 + sequence_id: 2 + member_role: "some way" + member_type: "Way" + member_id: 4 + +r8_m3: + relation_id: 8 + sequence_id: 3 + member_role: "some relation" + member_type: "Relation" + member_id: 7 diff --git a/test/fixtures/current_relation_tags.yml b/test/fixtures/current_relation_tags.yml index 6030b985327..ab48f8e2213 100644 --- a/test/fixtures/current_relation_tags.yml +++ b/test/fixtures/current_relation_tags.yml @@ -32,3 +32,13 @@ mt_4: relation_id: 4 k: 'tag4' v: 'val4' + +rv_t1: + relation_id: 8 + k: 'testing' + v: 'added in relation version 3' + +rv_t2: + relation_id: 8 + k: 'testing two' + v: 'modified in relation version 4' diff --git a/test/fixtures/current_way_nodes.yml b/test/fixtures/current_way_nodes.yml index 75c4a9981ff..45ef92af497 100644 --- a/test/fixtures/current_way_nodes.yml +++ b/test/fixtures/current_way_nodes.yml @@ -27,3 +27,18 @@ w5_n2: way_id: 5 node_id: 4 sequence_id: 2 + +w7_n1: + way_id: 7 + node_id: 4 + sequence_id: 1 + +w7_n2: + way_id: 7 + node_id: 15 + sequence_id: 2 + +w7_n3: + way_id: 7 + node_id: 6 + sequence_id: 3 diff --git a/test/fixtures/current_way_tags.yml b/test/fixtures/current_way_tags.yml index c2c27414d9a..386b48f7174 100644 --- a/test/fixtures/current_way_tags.yml +++ b/test/fixtures/current_way_tags.yml @@ -13,3 +13,12 @@ t3: k: 'test' v: 'yes' +wv_t1: + way_id: 4 + k: 'testing' + v: 'added in way version 3' + +wv_t2: + way_id: 4 + k: 'testing two' + v: 'modified in way version 4' diff --git a/test/fixtures/current_ways.yml b/test/fixtures/current_ways.yml index 255be4a97c0..e6e5d841994 100644 --- a/test/fixtures/current_ways.yml +++ b/test/fixtures/current_ways.yml @@ -39,3 +39,10 @@ way_with_redacted_versions: timestamp: 2008-01-01 00:04:13 visible: true version: 4 + +way_with_multiple_nodes: + id: 7 + changeset_id: 4 + timestamp: 2008-01-01 00:00:00 + visible: true + version: 2 diff --git a/test/fixtures/diary_comments.yml b/test/fixtures/diary_comments.yml index b8fb5c853e8..247fc3abd48 100644 --- a/test/fixtures/diary_comments.yml +++ b/test/fixtures/diary_comments.yml @@ -5,6 +5,7 @@ comment_for_geo_post: body: Some comment text created_at: "2008-11-08 09:45:34" updated_at: "2008-11-08 10:34:34" + visible: true comment_by_suspended_user: id: 2 @@ -13,6 +14,7 @@ comment_by_suspended_user: body: Some comment text created_at: "2008-11-08 09:45:34" updated_at: "2008-11-08 10:34:34" + visible: true comment_by_deleted_user: id: 3 @@ -21,3 +23,13 @@ comment_by_deleted_user: body: Some comment text created_at: "2008-11-08 09:45:34" updated_at: "2008-11-08 10:34:34" + visible: true + +hidden_comment: + id: 4 + diary_entry_id: 2 + user_id: 2 + body: Some comment text + created_at: "2008-11-08 09:45:34" + updated_at: "2008-11-08 10:34:34" + visible: false diff --git a/test/fixtures/diary_entries.yml b/test/fixtures/diary_entries.yml index 864dc250d6c..27717302def 100644 --- a/test/fixtures/diary_entries.yml +++ b/test/fixtures/diary_entries.yml @@ -23,7 +23,6 @@ normal_user_geo_entry: visible: true deleted_entry: - id: 3 user_id: 1 title: Deleted Entry 1 @@ -34,3 +33,27 @@ deleted_entry: longitude: language_code: en visible: false + +entry_by_suspended_user: + id: 4 + user_id: 10 + title: Entry by suspended user + body: This is the body of a diary entry by a suspended user. + created_at: "2008-11-07 17:43:34" + updated_at: "2008-11-07 17:43:34" + latitude: + longitude: + language_code: en + visible: true + +entry_by_deleted_user: + id: 5 + user_id: 11 + title: Entry by deleted user + body: This is the body of a diary entry by a deleted user. + created_at: "2008-11-07 17:43:34" + updated_at: "2008-11-07 17:43:34" + latitude: + longitude: + language_code: en + visible: true diff --git a/test/fixtures/gpx_file_tags.yml b/test/fixtures/gpx_file_tags.yml index d914bfb8470..1dac0f26de5 100644 --- a/test/fixtures/gpx_file_tags.yml +++ b/test/fixtures/gpx_file_tags.yml @@ -2,3 +2,18 @@ first_trace_1: gpx_id: 1 tag: London id: 1 + +second_trace_1: + gpx_id: 2 + tag: London + id: 2 + +second_trace_2: + gpx_id: 2 + tag: Birmingham + id: 3 + +third_trace_1: + gpx_id: 4 + tag: Birmingham + id: 4 diff --git a/test/fixtures/node_tags.yml b/test/fixtures/node_tags.yml index 6b908aa54c7..21a63f5b12d 100644 --- a/test/fixtures/node_tags.yml +++ b/test/fixtures/node_tags.yml @@ -52,3 +52,62 @@ public_v_t1: v: 'yes' version: 1 +nwnv1_name: + node_id: 18 + k: 'name' + v: 'Test Node' + version: 1 + +nwnv1_name_ru: + node_id: 18 + k: 'name:ru' + v: 'проверки узла' + version: 1 + +nwnv1_building: + node_id: 18 + k: 'building' + v: 'yes' + version: 1 + +nwnv1_tourism: + node_id: 18 + k: 'tourism' + v: 'museum' + version: 1 + +nwnv1_shop: + node_id: 18 + k: 'shop' + v: 'gift' + version: 1 + +nwnv2_name: + node_id: 18 + k: 'name' + v: 'Test Node' + version: 2 + +nwnv2_name_ru: + node_id: 18 + k: 'name:ru' + v: 'проверки узла' + version: 2 + +nwnv2_building: + node_id: 18 + k: 'building' + v: 'yes' + version: 2 + +nwnv2_tourism: + node_id: 18 + k: 'tourism' + v: 'museum' + version: 2 + +nwnv2_shop: + node_id: 18 + k: 'shop' + v: 'gift' + version: 2 diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml index 5de3d94af01..7841c6e0eb6 100644 --- a/test/fixtures/nodes.yml +++ b/test/fixtures/nodes.yml @@ -211,3 +211,24 @@ redacted_node_current_version: version: 2 tile: <%= QuadTile.tile_for_point(1,1) %> timestamp: 2007-01-01 00:00:00 + +node_with_name_redacted_version: + node_id: 18 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: true + version: 1 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 + redaction_id: 1 + +node_with_name_current_version: + node_id: 18 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + changeset_id: 2 + visible: true + version: 2 + tile: <%= QuadTile.tile_for_point(1,1) %> + timestamp: 2007-01-01 00:00:00 diff --git a/test/fixtures/note_comments.yml b/test/fixtures/note_comments.yml new file mode 100644 index 00000000000..881adb6ace8 --- /dev/null +++ b/test/fixtures/note_comments.yml @@ -0,0 +1,107 @@ +t1: + id: 1 + note_id: 1 + visible: true + created_at: 2007-01-01 00:00:00 + author_ip: '192.168.1.1' + body: 'This is the initial description of the note 1' + +t2: + id: 2 + note_id: 2 + visible: true + created_at: 2007-01-01 00:00:00 + author_ip: '192.168.1.1' + body: 'This is the initial description of the note 2' + +t3: + id: 3 + note_id: 2 + visible: true + created_at: 2007-02-01 00:00:00 + author_ip: '192.168.1.1' + body: 'This is an additional comment for note 2' + +t4: + id: 4 + note_id: 3 + visible: true + created_at: 2007-01-01 00:00:00 + author_ip: '192.168.1.1' + body: 'This is the initial comment for note 3' + +t5: + id: 5 + note_id: 4 + visible: true + created_at: 2007-01-01 00:00:00 + author_ip: '192.168.1.1' + body: 'Spam for note 4' + +t6: + id: 6 + note_id: 5 + visible: true + created_at: 2007-01-01 00:00:00 + author_ip: '192.168.1.1' + body: 'Valid comment for note 5' + +t7: + id: 7 + note_id: 5 + visible: false + created_at: 2007-02-01 00:00:00 + author_ip: '192.168.1.1' + body: 'Spam for note 5' + +t8: + id: 8 + note_id: 5 + visible: true + created_at: 2007-02-01 00:00:00 + author_ip: '192.168.1.1' + body: 'Another valid comment for note 5' + +t9: + id: 9 + note_id: 6 + visible: true + created_at: 2007-01-01 00:00:00 + event: opened + author_id: 1 + body: 'This is a note with from a logged-in user' + +t10: + id: 10 + note_id: 6 + visible: true + created_at: 2007-02-01 00:00:00 + event: commented + author_id: 4 + body: 'A comment from another logged-in user' + +t11: + id: 11 + note_id: 7 + visible: true + event: opened + created_at: 2007-01-01 00:00:00 + author_ip: '192.168.1.1' + body: 'Initial note description' + +t12: + id: 12 + note_id: 7 + visible: true + event: commented + created_at: 2007-02-01 00:00:00 + author_ip: '192.168.1.1' + body: 'A comment description' + +t13: + id: 13 + note_id: 7 + visible: true + event: closed + created_at: 2007-03-01 00:00:00 + author_id: 4 diff --git a/test/fixtures/notes.yml b/test/fixtures/notes.yml new file mode 100644 index 00000000000..ffecba869f7 --- /dev/null +++ b/test/fixtures/notes.yml @@ -0,0 +1,67 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html +<% SCALE = 10000000 unless defined?(SCALE) %> + +open_note: + id: 1 + latitude: <%= 1*SCALE %> + longitude: <%= 1*SCALE %> + status: open + tile: <%= QuadTile.tile_for_point(1,1) %> + created_at: 2007-01-01 00:00:00 + updated_at: 2007-01-01 00:00:00 + +open_note_with_comment: + id: 2 + latitude: <%= 1.1*SCALE %> + longitude: <%= 1.1*SCALE %> + status: open + tile: <%= QuadTile.tile_for_point(1.1,1.1) %> + created_at: 2007-01-01 00:00:00 + updated_at: 2007-02-01 00:00:00 + +closed_note_with_comment: + id: 3 + latitude: <%= 1.2*SCALE %> + longitude: <%= 1.2*SCALE %> + status: closed + tile: <%= QuadTile.tile_for_point(1.2,1.2) %> + created_at: 2007-01-01 00:00:00 + updated_at: 2007-03-01 00:00:00 + closed_at: 2007-03-01 00:00:00 + +hidden_note_with_comment: + id: 4 + latitude: <%= 1.3*SCALE %> + longitude: <%= 1.3*SCALE %> + status: hidden + tile: <%= QuadTile.tile_for_point(1.3,1.3) %> + created_at: 2007-01-01 00:00:00 + updated_at: 2007-03-01 00:00:00 + +note_with_hidden_comment: + id: 5 + latitude: <%= 1.4*SCALE %> + longitude: <%= 1.4*SCALE %> + status: open + tile: <%= QuadTile.tile_for_point(1.4,1.4) %> + created_at: 2007-01-01 00:00:00 + updated_at: 2007-03-01 00:00:00 + +note_with_comments_by_users: + id: 6 + latitude: <%= 1.5*SCALE %> + longitude: <%= 1.5*SCALE %> + status: open + tile: <%= QuadTile.tile_for_point(1.5,1.5) %> + created_at: 2007-01-01 00:00:00 + updated_at: 2007-03-01 00:00:00 + +note_closed_by_user: + id: 7 + latitude: <%= 1.6*SCALE %> + longitude: <%= 1.6*SCALE %> + status: closed + tile: <%= QuadTile.tile_for_point(1.6,1.6) %> + created_at: 2007-01-01 00:00:00 + updated_at: 2007-03-01 00:00:00 + closed_at: 2007-03-01 00:00:00 diff --git a/test/fixtures/relation_members.yml b/test/fixtures/relation_members.yml index 931728dc7b8..a5f04f1ef28 100644 --- a/test/fixtures/relation_members.yml +++ b/test/fixtures/relation_members.yml @@ -1,23 +1,30 @@ t1: relation_id: 1 + sequence_id: 1 member_role: "some" member_type: "Way" member_id: 3 version: 1 + t2: relation_id: 1 + sequence_id: 2 member_role: "some" member_type: "Node" member_id: 5 version: 1 + t3: relation_id: 1 + sequence_id: 3 member_role: "some" member_type: "Relation" member_id: 3 version: 1 + t4: relation_id: 3 + sequence_id: 1 member_role: "some" member_type: "Node" member_id: 5 @@ -25,6 +32,7 @@ t4: t5: relation_id: 2 + sequence_id: 1 member_role: "some" member_type: "Node" member_id: 5 @@ -32,7 +40,64 @@ t5: public_used: relation_id: 6 + sequence_id: 1 member_role: "used by other relation" member_type: "Relation" member_id: 5 version: 1 + +r8_v1_m1: + relation_id: 8 + sequence_id: 1 + member_role: "some node" + member_type: "Node" + member_id: 15 + version: 1 + +r8_v2_m1: + relation_id: 8 + sequence_id: 1 + member_role: "some changed node" + member_type: "Node" + member_id: 15 + version: 2 + +r8_v3_m1: + relation_id: 8 + sequence_id: 1 + member_role: "some changed node" + member_type: "Node" + member_id: 15 + version: 3 + +r8_v3_m3: + relation_id: 8 + sequence_id: 2 + member_role: "some relation" + member_type: "Relation" + member_id: 7 + version: 3 + +r8_v4_m1: + relation_id: 8 + sequence_id: 1 + member_role: "some node" + member_type: "Node" + member_id: 15 + version: 4 + +r8_v4_m2: + relation_id: 8 + sequence_id: 2 + member_role: "some way" + member_type: "Way" + member_id: 4 + version: 4 + +r8_v4_m3: + relation_id: 8 + sequence_id: 3 + member_role: "some relation" + member_type: "Relation" + member_id: 7 + version: 4 diff --git a/test/fixtures/relation_tags.yml b/test/fixtures/relation_tags.yml index 31b329ed75c..beccd471c77 100644 --- a/test/fixtures/relation_tags.yml +++ b/test/fixtures/relation_tags.yml @@ -39,3 +39,33 @@ mt_4: k: 'tag4' v: 'val4' version: 1 + +rv3_t1: + relation_id: 8 + k: 'testing' + v: 'added in relation version 3' + version: 3 + +rv3_t2: + relation_id: 8 + k: 'testing two' + v: 'added in relation version 3' + version: 3 + +rv3_t3: + relation_id: 8 + k: 'testing three' + v: 'added in relation version 3' + version: 3 + +rv4_t1: + relation_id: 8 + k: 'testing' + v: 'added in relation version 3' + version: 4 + +rv4_t2: + relation_id: 8 + k: 'testing two' + v: 'modified in relation version 4' + version: 4 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index c1b7244cb71..8d1fcbd7a71 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -46,6 +46,7 @@ inactive_user: terms_agreed: "2010-01-01 11:22:33" terms_seen: true languages: en + email_valid: false second_public_user: id: 4 @@ -212,3 +213,17 @@ super_user: terms_agreed: "2010-01-01 11:22:33" terms_seen: true languages: en + +north_pole_user: + id: 17 + email: santa@example.com + status: active + pass_crypt: <%= Digest::MD5.hexdigest('test') %> + creation_time: "2008-05-01 01:23:45" + display_name: santa + data_public: true + terms_agreed: "2010-01-01 11:22:33" + terms_seen: true + languages: en + home_lat: 89.9 + home_lon: 146.8 diff --git a/test/fixtures/way_nodes.yml b/test/fixtures/way_nodes.yml index 262f29b3179..51bf4b878aa 100644 --- a/test/fixtures/way_nodes.yml +++ b/test/fixtures/way_nodes.yml @@ -130,6 +130,32 @@ w6_v4_n3: sequence_id: 3 version: 4 +w7_v1_n1: + way_id: 7 + node_id: 2 + sequence_id: 1 + version: 1 +w7_v1_n2: + way_id: 7 + node_id: 6 + sequence_id: 2 + version: 1 + +w7_v2_n1: + way_id: 7 + node_id: 4 + sequence_id: 1 + version: 2 +w7_v2_n2: + way_id: 7 + node_id: 15 + sequence_id: 2 + version: 2 +w7_v2_n3: + way_id: 7 + node_id: 6 + sequence_id: 3 + version: 2 diff --git a/test/fixtures/way_tags.yml b/test/fixtures/way_tags.yml index 6fb77d71b54..195be7e542a 100644 --- a/test/fixtures/way_tags.yml +++ b/test/fixtures/way_tags.yml @@ -16,6 +16,36 @@ t3: v: 'yes' version: 1 +wv3_t1: + way_id: 4 + k: 'testing' + v: 'added in way version 3' + version: 3 + +wv3_t2: + way_id: 4 + k: 'testing two' + v: 'added in way version 3' + version: 3 + +wv3_t3: + way_id: 4 + k: 'testing three' + v: 'added in way version 3' + version: 3 + +wv4_t1: + way_id: 4 + k: 'testing' + v: 'added in way version 3' + version: 4 + +wv4_t2: + way_id: 4 + k: 'testing two' + v: 'modified in way version 4' + version: 4 + t6_v1: way_id: 6 k: 'test' diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml index dfb48b4506c..94fd5aebda5 100644 --- a/test/fixtures/ways.yml +++ b/test/fixtures/ways.yml @@ -83,3 +83,17 @@ way_with_redacted_versions_v4: timestamp: 2008-01-01 00:04:13 visible: true version: 4 + +way_with_multiple_nodes_v1: + way_id: 7 + changeset_id: 2 + timestamp: 2007-01-01 00:00:00 + visible: true + version: 1 + +way_with_multiple_nodes_v2: + way_id: 7 + changeset_id: 4 + timestamp: 2008-01-01 00:00:00 + visible: true + version: 2 diff --git a/test/functional/changeset_tag_controller_test.rb b/test/functional/changeset_tag_controller_test.rb deleted file mode 100644 index db9710e63d3..00000000000 --- a/test/functional/changeset_tag_controller_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class ChangesetTagControllerTest < ActionController::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb deleted file mode 100644 index 88c2aeb9a4a..00000000000 --- a/test/functional/diary_entry_controller_test.rb +++ /dev/null @@ -1,311 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class DiaryEntryControllerTest < ActionController::TestCase - fixtures :users, :diary_entries, :diary_comments, :languages - - include ActionView::Helpers::NumberHelper - - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/diary", :method => :get }, - { :controller => "diary_entry", :action => "list" } - ) - assert_routing( - { :path => "/diary/language", :method => :get }, - { :controller => "diary_entry", :action => "list", :language => "language" } - ) - assert_routing( - { :path => "/user/username/diary", :method => :get }, - { :controller => "diary_entry", :action => "list", :display_name => "username" } - ) - assert_routing( - { :path => "/diary/friends", :method => :get }, - { :controller => "diary_entry", :action => "list", :friends => true } - ) - assert_routing( - { :path => "/diary/nearby", :method => :get }, - { :controller => "diary_entry", :action => "list", :nearby => true } - ) - - assert_routing( - { :path => "/diary/rss", :method => :get }, - { :controller => "diary_entry", :action => "rss", :format => :rss } - ) - assert_routing( - { :path => "/diary/language/rss", :method => :get }, - { :controller => "diary_entry", :action => "rss", :language => "language", :format => :rss } - ) - assert_routing( - { :path => "/user/username/diary/rss", :method => :get }, - { :controller => "diary_entry", :action => "rss", :display_name => "username", :format => :rss } - ) - - assert_routing( - { :path => "/user/username/diary/comments", :method => :get }, - { :controller => "diary_entry", :action => "comments", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/diary/comments/1", :method => :get }, - { :controller => "diary_entry", :action => "comments", :display_name => "username", :page => "1" } - ) - - assert_routing( - { :path => "/diary/new", :method => :get }, - { :controller => "diary_entry", :action => "new" } - ) - assert_routing( - { :path => "/diary/new", :method => :post }, - { :controller => "diary_entry", :action => "new" } - ) - assert_routing( - { :path => "/user/username/diary/1", :method => :get }, - { :controller => "diary_entry", :action => "view", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/diary/1/edit", :method => :get }, - { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/diary/1/edit", :method => :post }, - { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/diary/1/newcomment", :method => :post }, - { :controller => "diary_entry", :action => "comment", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/diary/1/hide", :method => :post }, - { :controller => "diary_entry", :action => "hide", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/diary/1/hidecomment/2", :method => :post }, - { :controller => "diary_entry", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" } - ) - end - - def test_showing_new_diary_entry - @request.cookies["_osm_username"] = users(:normal_user).display_name - - get :new - assert_response :redirect - assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new" - # Now pretend to login by using the session hash, with the - # id of the person we want to login as through session(:user)=user.id - get(:new, nil, {'user' => users(:normal_user).id}) - assert_response :success - #print @response.body - - #print @response.to_yaml - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /New Diary Entry/, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h1", :text => "New Diary Entry", :count => 1 - # We don't care about the layout, we just care about the form fields - # that are available - assert_select "form[action='/diary/new']", :count => 1 do - assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1 - assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1 - assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1 - assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1 - assert_select "input[name=commit][type=submit][value=Save]", :count => 1 - end - end - end - end - - end - - def test_editing_diary_entry - @request.cookies["_osm_username"] = users(:normal_user).display_name - entry = diary_entries(:normal_user_entry_1) - - # Make sure that you are redirected to the login page when you are - # not logged in, without and with the id of the entry you want to edit - get :edit, :display_name => entry.user.display_name, :id => entry.id - assert_response :redirect - assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{entry.user.display_name}/diary/#{entry.id}/edit" - - # Verify that you get a not found error, when you pass a bogus id - get(:edit, {:display_name => entry.user.display_name, :id => 9999}, {'user' => entry.user.id}) - assert_response :not_found - assert_select "html", :count => 1 do - assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h2", :text => "No entry with the id: 9999", :count => 1 - end - end - end - - # Now pass the id, and check that you can edit it, when using the same - # user as the person who created the entry - get(:edit, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}) - assert_response :success - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /Edit diary entry/, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h1", :text => /Edit diary entry/, :count => 1 - assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do - assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1 - assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1 - assert_select "select#diary_entry_language_code", :count => 1 - assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 - assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 - assert_select "input[name=commit][type=submit][value=Save]", :count => 1 - assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 - assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 - assert_select "input", :count => 7 - end - end - end - end - - # Now lets see if you can edit the diary entry - new_title = "New Title" - new_body = "This is a new body for the diary entry" - new_latitude = "1.1" - new_longitude = "2.2" - new_language_code = "en" - post(:edit, {:display_name => entry.user.display_name, :id => entry.id, 'commit' => 'save', - 'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude, - 'longitude' => new_longitude, 'language_code' => new_language_code} }, - {'user' => entry.user.id}) - assert_response :redirect - assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id - - # Now check that the new data is rendered, when logged in - get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} - assert_response :success - assert_template 'diary_entry/view' - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /Users' diaries | /, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 - assert_select "b", :text => /#{new_title}/, :count => 1 - # This next line won't work if the text has been run through the htmlize function - # due to formatting that could be introduced - assert_select "p", :text => /#{new_body}/, :count => 1 - assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 - # As we're not logged in, check that you cannot edit - #print @response.body - assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 - end - end - end - - @request.cookies["_osm_username"] = users(:public_user).display_name - - # and when not logged in as the user who wrote the entry - get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} - assert_response :success - assert_template 'diary_entry/view' - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /Users' diaries | /, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 - assert_select "b", :text => /#{new_title}/, :count => 1 - # This next line won't work if the text has been run through the htmlize function - # due to formatting that could be introduced - assert_select "p", :text => /#{new_body}/, :count => 1 - assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 - # As we're not logged in, check that you cannot edit - assert_select "span[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do - assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 - end - end - end - end - #print @response.body - - end - - def test_edit_diary_entry_i18n - @request.cookies["_osm_username"] = users(:normal_user).display_name - - get :edit, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id} - assert_response :success - assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" - end - - def test_create_diary_entry - #post :new - end - - def test_creating_diary_comment - - end - - # Check that you can get the expected response and template for all available languages - # Should test that there are no - def test_listing_diary_entries - get :list - assert_response :success, "Should be able to list the diary entries in locale" - assert_template 'list', "Should use the list template in locale" - assert_select "span[class=translation_missing]", false, "Missing translation in list of diary entries" - - # Now try to find a specific user's diary entry - get :list, {:display_name => users(:normal_user).display_name} - assert_response :success, "Should be able to list the diary entries for a user in locale" - assert_template 'list', "Should use the list template for a user in locale" - assert_no_missing_translations - end - - def test_rss - get :rss, {:format => :rss} - assert_response :success, "Should be able to get a diary RSS" - assert_select "rss", :count => 1 do - assert_select "channel", :count => 1 do - assert_select "channel>title", :count => 1 - assert_select "image", :count => 1 - assert_select "channel>item", :count => 2 - end - end - end - - def test_rss_language - get :rss, {:language => diary_entries(:normal_user_entry_1).language_code, :format => :rss} - assert_response :success, "Should be able to get a specific language diary RSS" - assert_select "rss>channel>item", :count => 1 #, "Diary entries should be filtered by language" - end - -# def test_rss_nonexisting_language -# get :rss, {:language => 'xx', :format => :rss} -# assert_response :not_found, "Should not be able to get a nonexisting language diary RSS" -# end - - def test_rss_language_with_no_entries - get :rss, {:language => 'sl', :format => :rss} - assert_response :success, "Should be able to get a specific language diary RSS" - assert_select "rss>channel>item", :count => 0 #, "Diary entries should be filtered by language" - end - - def test_rss_user - get :rss, {:display_name => users(:normal_user).display_name, :format => :rss} - assert_response :success, "Should be able to get a specific users diary RSS" - assert_select "rss>channel>item", :count => 2 #, "Diary entries should be filtered by user" - end - - def test_rss_nonexisting_user - get :rss, {:display_name => 'fakeUsername76543', :format => :rss} - assert_response :not_found, "Should not be able to get a nonexisting users diary RSS" - end - - def test_viewing_diary_entry - get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id} - assert_response :success - assert_template 'view' - end -end diff --git a/test/functional/friend_controller_test.rb b/test/functional/friend_controller_test.rb deleted file mode 100644 index d1f0e7df09f..00000000000 --- a/test/functional/friend_controller_test.rb +++ /dev/null @@ -1,8 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class FriendControllerTest < ActionController::TestCase - # Replace this with your real tests. - def test_truth - assert true - end -end diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb deleted file mode 100644 index b678125d2e4..00000000000 --- a/test/functional/geocoder_controller_test.rb +++ /dev/null @@ -1,58 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' -require 'geocoder_controller' - -class GeocoderControllerTest < ActionController::TestCase - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/geocoder/search", :method => :post }, - { :controller => "geocoder", :action => "search" } - ) - assert_routing( - { :path => "/geocoder/search_latlon", :method => :get }, - { :controller => "geocoder", :action => "search_latlon" } - ) - assert_routing( - { :path => "/geocoder/search_us_postcode", :method => :get }, - { :controller => "geocoder", :action => "search_us_postcode" } - ) - assert_routing( - { :path => "/geocoder/search_uk_postcode", :method => :get }, - { :controller => "geocoder", :action => "search_uk_postcode" } - ) - assert_routing( - { :path => "/geocoder/search_ca_postcode", :method => :get }, - { :controller => "geocoder", :action => "search_ca_postcode" } - ) - assert_routing( - { :path => "/geocoder/search_osm_namefinder", :method => :get }, - { :controller => "geocoder", :action => "search_osm_namefinder" } - ) - assert_routing( - { :path => "/geocoder/search_osm_nominatim", :method => :get }, - { :controller => "geocoder", :action => "search_osm_nominatim" } - ) - assert_routing( - { :path => "/geocoder/search_geonames", :method => :get }, - { :controller => "geocoder", :action => "search_geonames" } - ) - - assert_routing( - { :path => "/geocoder/description", :method => :post }, - { :controller => "geocoder", :action => "description" } - ) - assert_routing( - { :path => "/geocoder/description_osm_namefinder", :method => :get }, - { :controller => "geocoder", :action => "description_osm_namefinder" } - ) - assert_routing( - { :path => "/geocoder/description_osm_nominatim", :method => :get }, - { :controller => "geocoder", :action => "description_osm_nominatim" } - ) - assert_routing( - { :path => "/geocoder/description_geonames", :method => :get }, - { :controller => "geocoder", :action => "description_geonames" } - ) - end -end diff --git a/test/functional/oauth_clients_controller_test.rb b/test/functional/oauth_clients_controller_test.rb deleted file mode 100644 index 64a1e4e7293..00000000000 --- a/test/functional/oauth_clients_controller_test.rb +++ /dev/null @@ -1,36 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class OauthClientsControllerTest < ActionController::TestCase - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/user/username/oauth_clients", :method => :get }, - { :controller => "oauth_clients", :action => "index", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/oauth_clients/new", :method => :get }, - { :controller => "oauth_clients", :action => "new", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/oauth_clients", :method => :post }, - { :controller => "oauth_clients", :action => "create", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/oauth_clients/1", :method => :get }, - { :controller => "oauth_clients", :action => "show", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/oauth_clients/1/edit", :method => :get }, - { :controller => "oauth_clients", :action => "edit", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/oauth_clients/1", :method => :put }, - { :controller => "oauth_clients", :action => "update", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/oauth_clients/1", :method => :delete }, - { :controller => "oauth_clients", :action => "destroy", :display_name => "username", :id => "1" } - ) - end -end diff --git a/test/functional/oauth_controller_test.rb b/test/functional/oauth_controller_test.rb deleted file mode 100644 index b34416be6fe..00000000000 --- a/test/functional/oauth_controller_test.rb +++ /dev/null @@ -1,32 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class OauthControllerTest < ActionController::TestCase - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/oauth/revoke" }, - { :controller => "oauth", :action => "revoke" } - ) - assert_routing( - { :path => "/oauth/authorize" }, - { :controller => "oauth", :action => "authorize" } - ) - assert_routing( - { :path => "/oauth/token" }, - { :controller => "oauth", :action => "token" } - ) - assert_routing( - { :path => "/oauth/request_token" }, - { :controller => "oauth", :action => "request_token" } - ) - assert_routing( - { :path => "/oauth/access_token" }, - { :controller => "oauth", :action => "access_token" } - ) - assert_routing( - { :path => "/oauth/test_request" }, - { :controller => "oauth", :action => "test_request" } - ) - end -end diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb deleted file mode 100644 index 86445e551a4..00000000000 --- a/test/functional/site_controller_test.rb +++ /dev/null @@ -1,130 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class SiteControllerTest < ActionController::TestCase - fixtures :users - - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/", :method => :get }, - { :controller => "site", :action => "index" } - ) - assert_routing( - { :path => "/", :method => :post }, - { :controller => "site", :action => "index" } - ) - assert_recognizes( - { :controller => "site", :action => "index" }, - { :path => "/index.html", :method => :get } - ) - assert_routing( - { :path => "/edit", :method => :get }, - { :controller => "site", :action => "edit" } - ) - assert_recognizes( - { :controller => "site", :action => "edit", :format => "html" }, - { :path => "/edit.html", :method => :get } - ) - assert_routing( - { :path => "/copyright", :method => :get }, - { :controller => "site", :action => "copyright" } - ) - assert_routing( - { :path => "/copyright/locale", :method => :get }, - { :controller => "site", :action => "copyright", :copyright_locale => "locale" } - ) - assert_routing( - { :path => "/export", :method => :get }, - { :controller => "site", :action => "export" } - ) - assert_recognizes( - { :controller => "site", :action => "export", :format => "html" }, - { :path => "/export.html", :method => :get } - ) - assert_routing( - { :path => "/offline", :method => :get }, - { :controller => "site", :action => "offline" } - ) - assert_routing( - { :path => "/key", :method => :post }, - { :controller => "site", :action => "key" } - ) - assert_routing( - { :path => "/go/shortcode", :method => :get }, - { :controller => "site", :action => "permalink", :code => "shortcode" } - ) - assert_routing( - { :path => "/preview/formatname", :method => :get }, - { :controller => "site", :action => "preview", :format => "formatname" } - ) - end - - ## Lets check that we can get all the pages without any errors - # Get the index - def test_index - get :index - assert_response :success - assert_template 'index' - assert_site_partials - end - - # Get the edit page - def test_edit - get :edit - # Should be redirected - assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit" - end - - # Get the export page - def test_export - get :export - assert_response :success - assert_template 'index' - assert_site_partials - end - - # Offline page - def test_offline - get :offline - assert_response :success - assert_template 'offline' - assert_site_partials 0 - end - - def assert_site_partials(count = 1) - assert_template :partial => '_search', :count => count - assert_template :partial => '_key', :count => count - assert_template :partial => '_sidebar', :count => count - end - - # test the right editor gets used when the user hasn't set a preference - def test_edit_without_preference - @request.cookies["_osm_username"] = users(:public_user).display_name - - get(:edit, nil, { 'user' => users(:public_user).id }) - assert_response :success - assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1 - end - - # and when they have... - def test_edit_with_preference - @request.cookies["_osm_username"] = users(:public_user).display_name - - user = users(:public_user) - user.preferred_editor = "potlatch" - user.save! - - get(:edit, nil, { 'user' => user.id }) - assert_response :success - assert_template :partial => "_potlatch", :count => 1 - - user = users(:public_user) - user.preferred_editor = "remote" - user.save! - - get(:edit, nil, { 'user' => user.id }) - assert_response :success - assert_template "index" - end -end diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb deleted file mode 100644 index 8ff29c4377a..00000000000 --- a/test/functional/trace_controller_test.rb +++ /dev/null @@ -1,310 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class TraceControllerTest < ActionController::TestCase - fixtures :users, :gpx_files - set_fixture_class :gpx_files => 'Trace' - - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/api/0.6/gpx/create", :method => :post }, - { :controller => "trace", :action => "api_create" } - ) - assert_routing( - { :path => "/api/0.6/gpx/1", :method => :get }, - { :controller => "trace", :action => "api_read", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/gpx/1", :method => :put }, - { :controller => "trace", :action => "api_update", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/gpx/1", :method => :delete }, - { :controller => "trace", :action => "api_delete", :id => "1" } - ) - assert_recognizes( - { :controller => "trace", :action => "api_read", :id => "1" }, - { :path => "/api/0.6/gpx/1/details", :method => :get } - ) - assert_routing( - { :path => "/api/0.6/gpx/1/data", :method => :get }, - { :controller => "trace", :action => "api_data", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/gpx/1/data.xml", :method => :get }, - { :controller => "trace", :action => "api_data", :id => "1", :format => "xml" } - ) - - assert_routing( - { :path => "/traces", :method => :get }, - { :controller => "trace", :action => "list" } - ) - assert_routing( - { :path => "/traces/page/1", :method => :get }, - { :controller => "trace", :action => "list", :page => "1" } - ) - assert_routing( - { :path => "/traces/tag/tagname", :method => :get }, - { :controller => "trace", :action => "list", :tag => "tagname" } - ) - assert_routing( - { :path => "/traces/tag/tagname/page/1", :method => :get }, - { :controller => "trace", :action => "list", :tag => "tagname", :page => "1" } - ) - assert_routing( - { :path => "/user/username/traces", :method => :get }, - { :controller => "trace", :action => "list", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/traces/page/1", :method => :get }, - { :controller => "trace", :action => "list", :display_name => "username", :page => "1" } - ) - assert_routing( - { :path => "/user/username/traces/tag/tagname", :method => :get }, - { :controller => "trace", :action => "list", :display_name => "username", :tag => "tagname" } - ) - assert_routing( - { :path => "/user/username/traces/tag/tagname/page/1", :method => :get }, - { :controller => "trace", :action => "list", :display_name => "username", :tag => "tagname", :page => "1" } - ) - - assert_routing( - { :path => "/traces/mine", :method => :get }, - { :controller => "trace", :action => "mine" } - ) - assert_routing( - { :path => "/traces/mine/page/1", :method => :get }, - { :controller => "trace", :action => "mine", :page => "1" } - ) - assert_routing( - { :path => "/traces/mine/tag/tagname", :method => :get }, - { :controller => "trace", :action => "mine", :tag => "tagname" } - ) - assert_routing( - { :path => "/traces/mine/tag/tagname/page/1", :method => :get }, - { :controller => "trace", :action => "mine", :tag => "tagname", :page => "1" } - ) - - assert_routing( - { :path => "/traces/rss", :method => :get }, - { :controller => "trace", :action => "georss" } - ) - assert_routing( - { :path => "/traces/tag/tagname/rss", :method => :get }, - { :controller => "trace", :action => "georss", :tag => "tagname" } - ) - assert_routing( - { :path => "/user/username/traces/rss", :method => :get }, - { :controller => "trace", :action => "georss", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/traces/tag/tagname/rss", :method => :get }, - { :controller => "trace", :action => "georss", :display_name => "username", :tag => "tagname" } - ) - - assert_routing( - { :path => "/user/username/traces/1", :method => :get }, - { :controller => "trace", :action => "view", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/traces/1/picture", :method => :get }, - { :controller => "trace", :action => "picture", :display_name => "username", :id => "1" } - ) - assert_routing( - { :path => "/user/username/traces/1/icon", :method => :get }, - { :controller => "trace", :action => "icon", :display_name => "username", :id => "1" } - ) - - assert_routing( - { :path => "/trace/create", :method => :get }, - { :controller => "trace", :action => "create" } - ) - assert_routing( - { :path => "/trace/create", :method => :post }, - { :controller => "trace", :action => "create" } - ) - assert_routing( - { :path => "/trace/1/data", :method => :get }, - { :controller => "trace", :action => "data", :id => "1" } - ) - assert_routing( - { :path => "/trace/1/data.xml", :method => :get }, - { :controller => "trace", :action => "data", :id => "1", :format => "xml" } - ) - assert_routing( - { :path => "/trace/1/edit", :method => :get }, - { :controller => "trace", :action => "edit", :id => "1" } - ) - assert_routing( - { :path => "/trace/1/edit", :method => :post }, - { :controller => "trace", :action => "edit", :id => "1" } - ) - assert_routing( - { :path => "/trace/1/edit", :method => :put }, - { :controller => "trace", :action => "edit", :id => "1" } - ) - assert_routing( - { :path => "/trace/1/delete", :method => :post }, - { :controller => "trace", :action => "delete", :id => "1" } - ) - end - - # Check that the list of changesets is displayed - def test_list - get :list - assert_response :success - assert_template 'list' - end - - # Check that I can get mine - def test_list_mine - @request.cookies["_osm_username"] = users(:public_user).display_name - - # First try to get it when not logged in - get :mine - assert_redirected_to :controller => 'user', :action => 'login', :referer => '/traces/mine' - - # Now try when logged in - get :mine, {}, {:user => users(:public_user).id} - assert_redirected_to :controller => 'trace', :action => 'list', :display_name => users(:public_user).display_name - end - - # Check that the rss loads - def test_rss - get :georss - assert_rss_success - - get :georss, :display_name => users(:normal_user).display_name - assert_rss_success - end - - def assert_rss_success - assert_response :success - assert_template nil - assert_equal "application/rss+xml", @response.content_type - end - - # Check getting a specific trace through the api - def test_api_read - # First with no auth - get :api_read, :id => gpx_files(:public_trace_file).id - assert_response :unauthorized - - # Now with some other user, which should work since the trace is public - basic_authorization(users(:public_user).display_name, "test") - get :api_read, :id => gpx_files(:public_trace_file).id - assert_response :success - - # And finally we should be able to do it with the owner of the trace - basic_authorization(users(:normal_user).display_name, "test") - get :api_read, :id => gpx_files(:public_trace_file).id - assert_response :success - end - - # Check an anoymous trace can't be specifically fetched by another user - def test_api_read_anon - # Furst with no auth - get :api_read, :id => gpx_files(:anon_trace_file).id - assert_response :unauthorized - - # Now try with another user, which shouldn't work since the trace is anon - basic_authorization(users(:normal_user).display_name, "test") - get :api_read, :id => gpx_files(:anon_trace_file).id - assert_response :forbidden - - # And finally we should be able to get the trace details with the trace owner - basic_authorization(users(:public_user).display_name, "test") - get :api_read, :id => gpx_files(:anon_trace_file).id - assert_response :success - end - - # Check the api details for a trace that doesn't exist - def test_api_read_not_found - # Try first with no auth, as it should requure it - get :api_read, :id => 0 - assert_response :unauthorized - - # Login, and try again - basic_authorization(users(:public_user).display_name, "test") - get :api_read, :id => 0 - assert_response :not_found - - # Now try a trace which did exist but has been deleted - basic_authorization(users(:public_user).display_name, "test") - get :api_read, :id => 5 - assert_response :not_found - end - - # Check updating a trace through the api - def test_api_update - # First with no auth - content gpx_files(:public_trace_file).to_xml - put :api_update, :id => gpx_files(:public_trace_file).id - assert_response :unauthorized - - # Now with some other user, which should fail - basic_authorization(users(:public_user).display_name, "test") - content gpx_files(:public_trace_file).to_xml - put :api_update, :id => gpx_files(:public_trace_file).id - assert_response :forbidden - - # Now with a trace which doesn't exist - basic_authorization(users(:public_user).display_name, "test") - content gpx_files(:public_trace_file).to_xml - put :api_update, :id => 0 - assert_response :not_found - - # Now with a trace which did exist but has been deleted - basic_authorization(users(:public_user).display_name, "test") - content gpx_files(:deleted_trace_file).to_xml - put :api_update, :id => gpx_files(:deleted_trace_file).id - assert_response :not_found - - # Now try an update with the wrong ID - basic_authorization(users(:normal_user).display_name, "test") - content gpx_files(:anon_trace_file).to_xml - put :api_update, :id => gpx_files(:public_trace_file).id - assert_response :bad_request, - "should not be able to update a trace with a different ID from the XML" - - # And finally try an update that should work - basic_authorization(users(:normal_user).display_name, "test") - t = gpx_files(:public_trace_file) - t.description = "Changed description" - t.visibility = "private" - content t.to_xml - put :api_update, :id => t.id - assert_response :success - nt = Trace.find(t.id) - assert_equal nt.description, t.description - assert_equal nt.visibility, t.visibility - end - - # Check deleting a trace through the api - def test_api_delete - # First with no auth - delete :api_delete, :id => gpx_files(:public_trace_file).id - assert_response :unauthorized - - # Now with some other user, which should fail - basic_authorization(users(:public_user).display_name, "test") - delete :api_delete, :id => gpx_files(:public_trace_file).id - assert_response :forbidden - - # Now with a trace which doesn't exist - basic_authorization(users(:public_user).display_name, "test") - delete :api_delete, :id => 0 - assert_response :not_found - - # And finally we should be able to do it with the owner of the trace - basic_authorization(users(:normal_user).display_name, "test") - delete :api_delete, :id => gpx_files(:public_trace_file).id - assert_response :success - - # Try it a second time, which should fail - basic_authorization(users(:normal_user).display_name, "test") - delete :api_delete, :id => gpx_files(:public_trace_file).id - assert_response :not_found - end -end diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb deleted file mode 100644 index 4379a1d49d1..00000000000 --- a/test/functional/user_controller_test.rb +++ /dev/null @@ -1,448 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class UserControllerTest < ActionController::TestCase - fixtures :users - - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/api/0.6/user/details", :method => :get }, - { :controller => "user", :action => "api_details" } - ) - assert_routing( - { :path => "/api/0.6/user/gpx_files", :method => :get }, - { :controller => "user", :action => "api_gpx_files" } - ) - - assert_routing( - { :path => "/login", :method => :get }, - { :controller => "user", :action => "login" } - ) - assert_routing( - { :path => "/login", :method => :post }, - { :controller => "user", :action => "login" } - ) - assert_recognizes( - { :controller => "user", :action => "login", :format => "html" }, - { :path => "/login.html", :method => :get } - ) - - assert_routing( - { :path => "/logout", :method => :get }, - { :controller => "user", :action => "logout" } - ) - assert_routing( - { :path => "/logout", :method => :post }, - { :controller => "user", :action => "logout" } - ) - assert_recognizes( - { :controller => "user", :action => "logout", :format => "html" }, - { :path => "/logout.html", :method => :get } - ) - - assert_routing( - { :path => "/user/new", :method => :get }, - { :controller => "user", :action => "new" } - ) - assert_recognizes( - { :controller => "user", :action => "new" }, - { :path => "/create-account.html", :method => :get } - ) - - assert_routing( - { :path => "/user/terms", :method => :get }, - { :controller => "user", :action => "terms" } - ) - assert_routing( - { :path => "/user/terms", :method => :post }, - { :controller => "user", :action => "terms" } - ) - - assert_routing( - { :path => "/user/save", :method => :post }, - { :controller => "user", :action => "save" } - ) - - assert_routing( - { :path => "/user/username/confirm", :method => :get }, - { :controller => "user", :action => "confirm", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/confirm", :method => :post }, - { :controller => "user", :action => "confirm", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/confirm/resend", :method => :get }, - { :controller => "user", :action => "confirm_resend", :display_name => "username" } - ) - - assert_routing( - { :path => "/user/confirm", :method => :get }, - { :controller => "user", :action => "confirm" } - ) - assert_routing( - { :path => "/user/confirm", :method => :post }, - { :controller => "user", :action => "confirm" } - ) - assert_routing( - { :path => "/user/confirm-email", :method => :get }, - { :controller => "user", :action => "confirm_email" } - ) - assert_routing( - { :path => "/user/confirm-email", :method => :post }, - { :controller => "user", :action => "confirm_email" } - ) - - assert_routing( - { :path => "/user/go_public", :method => :post }, - { :controller => "user", :action => "go_public" } - ) - - assert_routing( - { :path => "/user/forgot-password", :method => :get }, - { :controller => "user", :action => "lost_password" } - ) - assert_routing( - { :path => "/user/forgot-password", :method => :post }, - { :controller => "user", :action => "lost_password" } - ) - assert_recognizes( - { :controller => "user", :action => "lost_password" }, - { :path => "/forgot-password.html", :method => :get } - ) - assert_routing( - { :path => "/user/reset-password", :method => :get }, - { :controller => "user", :action => "reset_password" } - ) - assert_routing( - { :path => "/user/reset-password", :method => :post }, - { :controller => "user", :action => "reset_password" } - ) - - assert_routing( - { :path => "/user/suspended", :method => :get }, - { :controller => "user", :action => "suspended" } - ) - - assert_routing( - { :path => "/user/username", :method => :get }, - { :controller => "user", :action => "view", :display_name => "username" } - ) - - assert_routing( - { :path => "/user/username/account", :method => :get }, - { :controller => "user", :action => "account", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/account", :method => :post }, - { :controller => "user", :action => "account", :display_name => "username" } - ) - - assert_routing( - { :path => "/user/username/make_friend", :method => :get }, - { :controller => "user", :action => "make_friend", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/remove_friend", :method => :get }, - { :controller => "user", :action => "remove_friend", :display_name => "username" } - ) - - assert_routing( - { :path => "/user/username/set_status", :method => :get }, - { :controller => "user", :action => "set_status", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/delete", :method => :get }, - { :controller => "user", :action => "delete", :display_name => "username" } - ) - - assert_routing( - { :path => "/users", :method => :get }, - { :controller => "user", :action => "list" } - ) - assert_routing( - { :path => "/users", :method => :post }, - { :controller => "user", :action => "list" } - ) - assert_routing( - { :path => "/users/status", :method => :get }, - { :controller => "user", :action => "list", :status => "status" } - ) - assert_routing( - { :path => "/users/status", :method => :post }, - { :controller => "user", :action => "list", :status => "status" } - ) - end - - # The user creation page loads - def test_user_create_view - get :new - assert_response :success - - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /Create account/, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div#content", :count => 1 do - assert_select "form[action='/user/terms'][method=post]", :count => 1 do - assert_select "input[id=user_email]", :count => 1 - assert_select "input[id=user_email_confirmation]", :count => 1 - assert_select "input[id=user_display_name]", :count => 1 - assert_select "input[id=user_pass_crypt][type=password]", :count => 1 - assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1 - assert_select "input[type=submit][value=Continue]", :count => 1 - end - end - end - end - end - - def test_user_create_success - new_email = "newtester@osm.org" - display_name = "new_tester" - assert_difference('User.count') do - assert_difference('ActionMailer::Base.deliveries.size') do - post :save, {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}} - end - end - - # Check the e-mail - register_email = ActionMailer::Base.deliveries.first - - assert_equal register_email.to[0], new_email - assert_match /#{@url}/, register_email.body.to_s - - # Check the page - assert_redirected_to :action => 'login', :referer => nil - - ActionMailer::Base.deliveries.clear - end - - def test_user_create_submit_duplicate_email - email = users(:public_user).email - display_name = "new_tester" - assert_difference('User.count', 0) do - assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} - end - end - assert_response :success - assert_template 'new' - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" - end - - def test_user_create_submit_duplicate_email_uppercase - email = users(:public_user).email.upcase - display_name = "new_tester" - assert_difference('User.count', 0) do - assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} - end - end - assert_response :success - assert_template 'new' - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" - end - - def test_user_create_submit_duplicate_name - email = "new_tester@example.com" - display_name = users(:public_user).display_name - assert_difference('User.count', 0) do - assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} - end - end - assert_response :success - assert_template 'new' - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" - end - - def test_user_create_submit_duplicate_name_uppercase - email = "new_tester@example.com" - display_name = users(:public_user).display_name.upcase - assert_difference('User.count', 0) do - assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :save, :user => { :email => email, :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} - end - end - assert_response :success - assert_template 'new' - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" - end - - def test_user_lost_password - # Test fetching the lost password page - get :lost_password - assert_response :success - assert_template :lost_password - assert_select "div#notice", false - - # Test resetting using the address as recorded for a user that has an - # address which is duplicated in a different case by another user - assert_difference('ActionMailer::Base.deliveries.size', 1) do - post :lost_password, :user => { :email => users(:normal_user).email } - end - assert_response :redirect - assert_redirected_to :action => :login - assert_match /^Sorry you lost it/, flash[:notice] - assert_equal users(:normal_user).email, ActionMailer::Base.deliveries.last.to[0] - - # Test resetting using an address that matches a different user - # that has the same address in a different case - assert_difference('ActionMailer::Base.deliveries.size', 1) do - post :lost_password, :user => { :email => users(:normal_user).email.upcase } - end - assert_response :redirect - assert_redirected_to :action => :login - assert_match /^Sorry you lost it/, flash[:notice] - assert_equal users(:uppercase_user).email, ActionMailer::Base.deliveries.last.to[0] - - # Test resetting using an address that is a case insensitive match - # for more than one user but not an exact match for either - assert_difference('ActionMailer::Base.deliveries.size', 0) do - post :lost_password, :user => { :email => users(:normal_user).email.titlecase } - end - assert_response :success - assert_template :lost_password - assert_select "div#error", /^Could not find that email address/ - - # Test resetting using the address as recorded for a user that has an - # address which is case insensitively unique - assert_difference('ActionMailer::Base.deliveries.size', 1) do - post :lost_password, :user => { :email => users(:public_user).email } - end - assert_response :redirect - assert_redirected_to :action => :login - assert_match /^Sorry you lost it/, flash[:notice] - assert_equal users(:public_user).email, ActionMailer::Base.deliveries.last.to[0] - - # Test resetting using an address that matches a user that has the - # same (case insensitively unique) address in a different case - assert_difference('ActionMailer::Base.deliveries.size', 1) do - post :lost_password, :user => { :email => users(:public_user).email.upcase } - end - assert_response :redirect - assert_redirected_to :action => :login - assert_match /^Sorry you lost it/, flash[:notice] - assert_equal users(:public_user).email, ActionMailer::Base.deliveries.last.to[0] - end - - def test_user_update - # Get a user to work with - note that this user deliberately - # conflicts with uppercase_user in the email and display name - # fields to test that we can change other fields without any - # validation errors being reported - user = users(:normal_user) - - # Set the username cookie - @request.cookies["_osm_username"] = user.display_name - - # Make sure that you are redirected to the login page when - # you are not logged in - get :account, { :display_name => user.display_name } - assert_response :redirect - assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account" - - # Make sure that you are redirected to the login page when - # you are not logged in as the right user - get :account, { :display_name => user.display_name }, { "user" => users(:public_user).id } - assert_response :redirect - assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/account" - - # Make sure we get the page when we are logged in as the right user - get :account, { :display_name => user.display_name }, { "user" => user } - assert_response :success - assert_template :account - - # Updating the description should work - user.description = "new description" - post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } - assert_response :success - assert_template :account - assert_select "div#errorExplanation", false - assert_select "div#notice", /^User information updated successfully/ - assert_select "table#accountForm > tr > td > div#user_description_container > div#user_description_content > textarea#user_description", user.description - - # Changing name to one that exists should fail - user.display_name = users(:public_user).display_name - post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } - assert_response :success - assert_template :account - assert_select "div#notice", false - assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_display_name" - - # Changing name to one that exists should fail, regardless of case - user.display_name = users(:public_user).display_name.upcase - post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } - assert_response :success - assert_template :account - assert_select "div#notice", false - assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_display_name" - - # Changing name to one that doesn't exist should work - user.display_name = "new tester" - post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } - assert_response :success - assert_template :account - assert_select "div#errorExplanation", false - assert_select "div#notice", /^User information updated successfully/ - assert_select "table#accountForm > tr > td > input#user_display_name[value=?]", user.display_name - - # Need to update cookies now to stay valid - @request.cookies["_osm_username"] = user.display_name - - # Changing email to one that exists should fail - user.new_email = users(:public_user).email - post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } - assert_response :success - assert_template :account - assert_select "div#notice", false - assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_new_email" - - # Changing email to one that exists should fail, regardless of case - user.new_email = users(:public_user).email.upcase - post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } - assert_response :success - assert_template :account - assert_select "div#notice", false - assert_select "div#errorExplanation" - assert_select "table#accountForm > tr > td > div[class=field_with_errors] > input#user_new_email" - - # Changing email to one that doesn't exist should work - user.new_email = "new_tester@example.com" - post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } - assert_response :success - assert_template :account - assert_select "div#errorExplanation", false - assert_select "div#notice", /^User information updated successfully/ - assert_select "table#accountForm > tr > td > input#user_new_email[value=?]", user.new_email - end - - # Check that the user account page will display and contains some relevant - # information for the user - def test_view_user_account - get :view, {:display_name => "unknown"} - assert_response :not_found - - get :view, {:display_name => "test"} - assert_response :success - end - - def test_user_api_details - get :api_details - assert_response :unauthorized - - basic_authorization(users(:normal_user).email, "test") - get :api_details - assert_response :success - end -end diff --git a/test/functional/user_preference_controller_test.rb b/test/functional/user_preference_controller_test.rb deleted file mode 100644 index 3921fe5362e..00000000000 --- a/test/functional/user_preference_controller_test.rb +++ /dev/null @@ -1,49 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class UserPreferenceControllerTest < ActionController::TestCase - fixtures :users, :user_preferences - - ## - # test all routes which lead to this controller - def test_routes - assert_routing( - { :path => "/api/0.6/user/preferences", :method => :get }, - { :controller => "user_preference", :action => "read" } - ) - assert_routing( - { :path => "/api/0.6/user/preferences", :method => :put }, - { :controller => "user_preference", :action => "update" } - ) - assert_routing( - { :path => "/api/0.6/user/preferences/key", :method => :get }, - { :controller => "user_preference", :action => "read_one", :preference_key => "key" } - ) - assert_routing( - { :path => "/api/0.6/user/preferences/key", :method => :put }, - { :controller => "user_preference", :action => "update_one", :preference_key => "key" } - ) - assert_routing( - { :path => "/api/0.6/user/preferences/key", :method => :delete }, - { :controller => "user_preference", :action => "delete_one", :preference_key => "key" } - ) - end - - def test_read - # first try without auth - get :read - assert_response :unauthorized, "should be authenticated" - - # now set the auth - basic_authorization("test@openstreetmap.org", "test") - - get :read - assert_response :success - assert_select "osm" do - assert_select "preferences", :count => 1 do - assert_select "preference", :count => 2 - assert_select "preference[k=\"#{user_preferences(:a).k}\"][v=\"#{user_preferences(:a).v}\"]", :count => 1 - assert_select "preference[k=\"#{user_preferences(:two).k}\"][v=\"#{user_preferences(:two).v}\"]", :count => 1 - end - end - end -end diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb new file mode 100644 index 00000000000..46c35f950de --- /dev/null +++ b/test/helpers/application_helper_test.rb @@ -0,0 +1,187 @@ +require 'test_helper' + +class ApplicationHelperTest < ActionView::TestCase + fixtures :users, :user_roles + + def setup + I18n.locale = "en" + end + + def test_linkify + %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link| + text = "Test #{link} is made into a link" + + html = linkify(text) + assert_equal false, html.html_safe? + assert_equal "Test #{link} is made into a link", html + + html = linkify(text.html_safe) + assert_equal true, html.html_safe? + assert_equal "Test #{link} is made into a link", html + end + + %w(test@example.com mailto:test@example.com).each do |link| + text = "Test #{link} is not made into a link" + + html = linkify(text) + assert_equal false, html.html_safe? + assert_equal text, html + + html = linkify(text.html_safe) + assert_equal true, html.html_safe? + assert_equal text, html + end + end + + def test_rss_link_to + link = rss_link_to(:controller => :diary_entry, :action => :rss) + assert_equal "\"Rss\"", link + end + + def test_atom_link_to + link = atom_link_to(:controller => :changeset, :action => :feed) + assert_equal "\"Rss\"", link + end + + def test_style_rules + @user = nil + + css = style_rules + assert_match /\.hidden /, css + assert_match /\.hide_unless_logged_in /, css + assert_no_match /\.hide_if_logged_in /, css + assert_no_match /\.hide_if_user_/, css + assert_no_match /\.show_if_user_/, css + assert_match /\.hide_unless_administrator /, css + assert_match /\.hide_unless_moderator /, css + + @user = users(:normal_user) + + css = style_rules + assert_match /\.hidden /, css + assert_no_match /\.hide_unless_logged_in /, css + assert_match /\.hide_if_logged_in /, css + assert_match /\.hide_if_user_1 /, css + assert_match /\.show_if_user_1 /, css + assert_match /\.hide_unless_administrator /, css + assert_match /\.hide_unless_moderator /, css + + @user = users(:moderator_user) + + css = style_rules + assert_match /\.hidden /, css + assert_no_match /\.hide_unless_logged_in /, css + assert_match /\.hide_if_logged_in /, css + assert_match /\.hide_if_user_5 /, css + assert_match /\.show_if_user_5 /, css + assert_match /\.hide_unless_administrator /, css + assert_no_match /\.hide_unless_moderator /, css + + @user = users(:administrator_user) + + css = style_rules + assert_match /\.hidden /, css + assert_no_match /\.hide_unless_logged_in /, css + assert_match /\.hide_if_logged_in /, css + assert_match /\.hide_if_user_6 /, css + assert_match /\.show_if_user_6 /, css + assert_no_match /\.hide_unless_administrator /, css + assert_match /\.hide_unless_moderator /, css + end + + def test_if_logged_in + html = if_logged_in { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_logged_in(:span) { "Test 2" } + assert_equal "Test 2", html + end + + def test_if_not_logged_in + html = if_not_logged_in { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_not_logged_in(:span) { "Test 2" } + assert_equal "Test 2", html + end + + def test_if_user + html = if_user(users(:normal_user)) { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_user(users(:normal_user), :span) { "Test 2" } + assert_equal "Test 2", html + + html = if_user(nil) { "Test 3" } + assert_nil html + + html = if_user(nil, :span) { "Test 4" } + assert_nil html + end + + def test_unless_user + html = unless_user(users(:normal_user)) { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = unless_user(users(:normal_user), :span) { "Test 2" } + assert_equal "Test 2", html + + html = unless_user(nil) { "Test 3" } + assert_equal "
    Test 3
    ", html + + html = unless_user(nil, :span) { "Test 4" } + assert_equal "Test 4", html + end + + def test_if_administrator + html = if_administrator { "Test 1" } + assert_equal "
    Test 1
    ", html + + html = if_administrator(:span) { "Test 2" } + assert_equal "Test 2", html + end + + def test_richtext_area + html = richtext_area(:message, :body, :cols => 40, :rows => 20) + assert_not_nil html + end + + def test_dir + assert_equal "ltr", dir + + params[:dir] = "rtl" + assert_equal "rtl", dir + params.delete(:dir) + + I18n.locale = "he" + + assert_equal "rtl", dir + + params[:dir] = "ltr" + assert_equal "ltr", dir + params.delete(:dir) + end + + def test_friendly_date + date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23)) + assert_match /^.*<\/span>$/, date + + date = friendly_date(Time.now - 1.hour) + assert_match /^about 1 hour<\/span>$/, date + + date = friendly_date(Time.now - 2.days) + assert_match /^2 days<\/span>$/, date + + date = friendly_date(Time.now - 3.weeks) + assert_match /^21 days<\/span>$/, date + + date = friendly_date(Time.now - 4.months) + assert_match /^4 months<\/span>$/, date + end + + def test_body_class + end + + def test_current_page_class + end +end diff --git a/test/helpers/asset_helper_test.rb b/test/helpers/asset_helper_test.rb new file mode 100644 index 00000000000..20e450ed540 --- /dev/null +++ b/test/helpers/asset_helper_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class AssetHelperTest < ActionView::TestCase + def test_assets + assert assets("iD").kind_of?(Hash) + end +end diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb new file mode 100644 index 00000000000..a48ac4df886 --- /dev/null +++ b/test/helpers/browse_helper_test.rb @@ -0,0 +1,151 @@ +# -*- coding: utf-8 -*- + +require 'test_helper' + +class BrowseHelperTest < ActionView::TestCase + include ERB::Util + include ApplicationHelper + + api_fixtures + + def setup + I18n.locale = "en" + end + + def test_printable_name + assert_equal "17", printable_name(current_nodes(:redacted_node)) + assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) + assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) + + I18n.locale = "ru" + + assert_equal "17", printable_name(current_nodes(:redacted_node)) + assert_equal "проверки узла (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "проверки узла (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) + assert_equal "проверки узла (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) + + I18n.locale = "de" + + assert_equal "17", printable_name(current_nodes(:redacted_node)) + assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name)) + assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version)) + assert_equal "18", printable_name(nodes(:node_with_name_redacted_version)) + assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true) + assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true) + end + + def test_link_class + assert_equal "node", link_class("node", current_nodes(:visible_node)) + assert_equal "node deleted", link_class("node", current_nodes(:invisible_node)) + assert_equal "node deleted", link_class("node", current_nodes(:redacted_node)) + assert_equal "node building yes shop gift tourism museum", link_class("node", current_nodes(:node_with_name)) + assert_equal "node building yes shop gift tourism museum", link_class("node", nodes(:node_with_name_current_version)) + assert_equal "node deleted", link_class("node", nodes(:node_with_name_redacted_version)) + end + + def test_link_title + assert_equal "", link_title(current_nodes(:visible_node)) + assert_equal "", link_title(current_nodes(:invisible_node)) + assert_equal "", link_title(current_nodes(:redacted_node)) + assert_equal "building=yes, shop=gift, and tourism=museum", link_title(current_nodes(:node_with_name)) + assert_equal "building=yes, shop=gift, and tourism=museum", link_title(nodes(:node_with_name_current_version)) + assert_equal "", link_title(nodes(:node_with_name_redacted_version)) + end + + def test_format_key + html = format_key("highway") + assert_equal "highway", html + + html = format_key("unknown") + assert_equal "unknown", html + end + + def test_format_value + html = format_value("highway", "primary") + assert_equal "primary", html + + html = format_value("highway", "unknown") + assert_equal "unknown", html + + html = format_value("unknown", "unknown") + assert_equal "unknown", html + end + + def test_icon_tags + tags = icon_tags(current_nodes(:node_with_name)) + assert_equal 3, tags.count + assert tags.include?(["building", "yes"]) + assert tags.include?(["tourism", "museum"]) + assert tags.include?(["shop", "gift"]) + + tags = icon_tags(nodes(:node_with_name_current_version)) + assert_equal 3, tags.count + assert tags.include?(["building", "yes"]) + assert tags.include?(["tourism", "museum"]) + assert tags.include?(["shop", "gift"]) + + tags = icon_tags(nodes(:node_with_name_redacted_version)) + assert_equal 3, tags.count + assert tags.include?(["building", "yes"]) + assert tags.include?(["tourism", "museum"]) + assert tags.include?(["shop", "gift"]) + end + + def test_wiki_link + link = wiki_link("key", "highway") + assert_equal "http://wiki.openstreetmap.org/wiki/Key:highway?uselang=en", link + + link = wiki_link("tag", "highway=primary") + assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=en", link + + I18n.locale = "de" + + link = wiki_link("key", "highway") + assert_equal "http://wiki.openstreetmap.org/wiki/DE:Key:highway?uselang=de", link + + link = wiki_link("tag", "highway=primary") + assert_equal "http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary?uselang=de", link + + I18n.locale = "tr" + + link = wiki_link("key", "highway") + assert_equal "http://wiki.openstreetmap.org/wiki/Tr:Key:highway?uselang=tr", link + + link = wiki_link("tag", "highway=primary") + assert_equal "http://wiki.openstreetmap.org/wiki/Tag:highway=primary?uselang=tr", link + end + + def test_wikipedia_link + link = wikipedia_link("wikipedia", "http://en.wikipedia.org/wiki/Full%20URL") + assert_nil link + + link = wikipedia_link("wikipedia", "https://en.wikipedia.org/wiki/Full%20URL") + assert_nil link + + link = wikipedia_link("wikipedia", "Test") + assert_equal "http://en.wikipedia.org/wiki/Test?uselang=en", link[:url] + assert_equal "Test", link[:title] + + link = wikipedia_link("wikipedia", "de:Test") + assert_equal "http://de.wikipedia.org/wiki/de:Test?uselang=en", link[:url] + assert_equal "de:Test", link[:title] + + link = wikipedia_link("wikipedia:fr", "de:Test") + assert_equal "http://fr.wikipedia.org/wiki/de:Test?uselang=en", link[:url] + assert_equal "de:Test", link[:title] + + I18n.locale = "pt-BR" + + link = wikipedia_link("wikipedia", "zh-classical:Test#Section") + assert_equal "http://zh-classical.wikipedia.org/wiki/zh-classical:Test?uselang=pt-BR#Section", link[:url] + assert_equal "zh-classical:Test#Section", link[:title] + + link = wikipedia_link("foo", "Test") + assert_nil link + end +end diff --git a/test/helpers/changeset_helper_test.rb b/test/helpers/changeset_helper_test.rb new file mode 100644 index 00000000000..3fa5d266da4 --- /dev/null +++ b/test/helpers/changeset_helper_test.rb @@ -0,0 +1,15 @@ +require 'test_helper' + +class ChangesetHelperTest < ActionView::TestCase + fixtures :changesets, :users + + def test_changeset_user_link + assert_equal "test2", changeset_user_link(changesets(:public_user_first_change)) + assert_equal "anonymous", changeset_user_link(changesets(:normal_user_first_change)) + end + + def test_changeset_details + assert_match /^Created .*<\/abbr> by anonymous$/, changeset_details(changesets(:normal_user_first_change)) + assert_match /^Closed .*<\/abbr> by test2<\/a>$/, changeset_details(changesets(:public_user_closed_change)) + end +end diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb new file mode 100644 index 00000000000..8fb2bc07338 --- /dev/null +++ b/test/helpers/note_helper_test.rb @@ -0,0 +1,21 @@ +require 'test_helper' + +class NoteHelperTest < ActionView::TestCase + include ERB::Util + include ApplicationHelper + + fixtures :users + + def test_note_event + date = Time.new(2014, 3, 5, 21, 37, 45) + + assert_match /^Created by anonymous .*<\/span> ago<\/abbr>$/, note_event("open", date, nil) + assert_match /^Resolved by test2<\/a> .*<\/span> ago<\/abbr>$/, note_event("closed", date, users(:public_user)) + end + + def test_note_author + assert_equal "", note_author(nil) + assert_equal "test2", note_author(users(:public_user)) + assert_equal "test2", note_author(users(:public_user), :only_path => false) + end +end diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb new file mode 100644 index 00000000000..cf7a1124398 --- /dev/null +++ b/test/helpers/title_helper_test.rb @@ -0,0 +1,13 @@ +require 'test_helper' + +class TitleHelperTest < ActionView::TestCase + def test_set_title + set_title(nil) + assert_equal "OpenStreetMap", response.header["X-Page-Title"] + assert_nil @title + + set_title("Test Title") + assert_equal "OpenStreetMap | Test Title", response.header["X-Page-Title"] + assert_equal "Test Title", @title + end +end diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index 80da36deb38..a2361d618f8 100644 --- a/test/integration/client_application_test.rb +++ b/test/integration/client_application_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class ClientApplicationTest < ActionController::IntegrationTest +class ClientApplicationTest < ActionDispatch::IntegrationTest fixtures :users, :client_applications ## @@ -17,10 +17,13 @@ def test_create_application follow_redirect! assert_response :success assert_template 'user/view' + get '/user/test2/account' + assert_response :success + assert_template 'user/account' # check that the form to allow new client application creations exists - assert_in_body do - assert_select "a[href='/user/test2/oauth_clients']" + assert_in_heading do + assert_select "ul.secondary-actions li a[href='/user/test2/oauth_clients']" end # now we follow the link to the oauth client list @@ -33,8 +36,10 @@ def test_create_application # now we follow the link to the new oauth client page get '/user/test2/oauth_clients/new' assert_response :success - assert_in_body do + assert_in_heading do assert_select "h1", "Register a new application" + end + assert_in_body do assert_select "form[action='/user/test2/oauth_clients']" do [ :name, :url, :callback_url, :support_url ].each do |inp| assert_select "input[name=?]", "client_application[#{inp}]" @@ -73,14 +78,17 @@ def test_3rd_party_token ## # utility method to make the HTML screening easier to read. - def assert_in_body - assert_select "html:root" do - assert_select "body" do - assert_select "div#content" do - yield - end - end + def assert_in_heading + assert_select "div.content-heading" do + yield end end + ## + # utility method to make the HTML screening easier to read. + def assert_in_body + assert_select "div#content" do + yield + end + end end diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb new file mode 100644 index 00000000000..f3581f6a21b --- /dev/null +++ b/test/integration/cors_test.rb @@ -0,0 +1,32 @@ +require 'test_helper' + +class CORSTest < ActionDispatch::IntegrationTest + # Rails 4 adds a built-in `options` method. When we upgrade, we can remove + # this definition. + unless instance_methods.include?(:options) + def options(*args) + reset! unless integration_session + @html_document = nil + integration_session.send(:process, :options, *args).tap do + copy_session_variables! + end + end + end + + def test_api_routes_allow_cross_origin_requests + options "/api/capabilities", nil, + 'HTTP_ORIGIN' => "http://www.example.com", + 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET' + + assert_response :success + assert_equal "http://www.example.com", response.headers['Access-Control-Allow-Origin'] + end + + def test_non_api_routes_dont_allow_cross_origin_requests + assert_raises ActionController::RoutingError do + options "/", nil, + 'HTTP_ORIGIN' => "http://www.example.com", + 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'GET' + end + end +end diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb index 2bda77379b4..dd03fde46ec 100644 --- a/test/integration/oauth_test.rb +++ b/test/integration/oauth_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class OAuthTest < ActionController::IntegrationTest +class OAuthTest < ActionDispatch::IntegrationTest fixtures :users, :client_applications, :gpx_files include OAuth::Helper @@ -285,7 +285,7 @@ def test_oauth10a_desktop_app :allow_read_prefs => true, :allow_write_prefs => true assert_response :success assert_template "authorize_success" - m = response.body.match("

    The verification code is ([A-Za-z0-9]+)

    ") + m = response.body.match("

    The verification code is ([A-Za-z0-9]+).

    ") assert_not_nil m verifier = m[1] token.reload @@ -328,7 +328,7 @@ def test_oauth10a_desktop_app def signed_get(uri, options) uri = URI.parse(uri) uri.scheme ||= "http" - uri.host ||= host + uri.host ||= "www.example.com" helper = OAuth::Client::Helper.new(nil, options) @@ -356,7 +356,7 @@ def parse_verifier(response) params = CGI.parse(URI.parse(response.location).query) assert_not_nil params["oauth_verifier"] - assert_present params["oauth_verifier"].first + assert params["oauth_verifier"].first.present? params["oauth_verifier"].first end diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb new file mode 100644 index 00000000000..a4ff2eb7ec0 --- /dev/null +++ b/test/integration/redirect_test.rb @@ -0,0 +1,107 @@ +require 'test_helper' + +class RedirectTest < ActionDispatch::IntegrationTest + def test_legacy_redirects + get "/index.html" + assert_response :redirect + assert_redirected_to "/" + + get "/create-account.html" + assert_response :redirect + assert_redirected_to "/user/new" + + get "/forgot-password.html" + assert_response :redirect + assert_redirected_to "/user/forgot-password" + end + + def test_search_redirects + get "/?query=test" + assert_response :redirect + assert_redirected_to "/search?query=test" + end + + def test_history_redirects + get "/browse" + assert_response :redirect + assert_redirected_to "/history" + + get "/browse/changesets" + assert_response :redirect + assert_redirected_to "/history" + + get "/browse/changesets?bbox=-80.54%2C40.358%2C-79.526%2C40.779" + assert_response :redirect + assert_redirected_to "/history?bbox=-80.54%2C40.358%2C-79.526%2C40.779" + + get "/browse/friends" + assert_response :redirect + assert_redirected_to "/history/friends" + + get "/browse/nearby" + assert_response :redirect + assert_redirected_to "/history/nearby" + + get "/user/name/edits" + assert_response :redirect + assert_redirected_to "/user/name/history" + + get "/user/name%20with%20spaces/edits" + assert_response :redirect + assert_redirected_to "/user/name%20with%20spaces/history" + end + + def test_history_feed_redirects + get "/browse/changesets/feed" + assert_response :redirect + assert_redirected_to "/history/feed" + + get "/browse/changesets/feed?bbox=-80.54%2C40.358%2C-79.526%2C40.779" + assert_response :redirect + assert_redirected_to "/history/feed?bbox=-80.54%2C40.358%2C-79.526%2C40.779" + + get "/user/name/edits/feed" + assert_response :redirect + assert_redirected_to "/user/name/history/feed" + + get "/user/name%20with%20spaces/edits/feed" + assert_response :redirect + assert_redirected_to "/user/name%20with%20spaces/history/feed" + end + + def test_browse_redirects + get "/browse/node/1" + assert_response :redirect + assert_redirected_to "/node/1" + + get "/browse/way/1" + assert_response :redirect + assert_redirected_to "/way/1" + + get "/browse/relation/1" + assert_response :redirect + assert_redirected_to "/relation/1" + + get "/browse/changeset/1" + assert_response :redirect + assert_redirected_to "/changeset/1" + + get "/browse/note/1" + assert_response :redirect + assert_redirected_to "/note/1" + end + + def test_browse_history_redirects + get "/browse/node/1/history" + assert_response :redirect + assert_redirected_to "/node/1/history" + + get "/browse/way/1/history" + assert_response :redirect + assert_redirected_to "/way/1/history" + + get "/browse/relation/1/history" + assert_response :redirect + assert_redirected_to "/relation/1/history" + end +end diff --git a/test/integration/short_link_test.rb b/test/integration/short_links_test.rb similarity index 70% rename from test/integration/short_link_test.rb rename to test/integration/short_links_test.rb index e99b290b9ca..b36082caca9 100644 --- a/test/integration/short_link_test.rb +++ b/test/integration/short_links_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class ShortLinkTest < ActionController::IntegrationTest +class ShortLinksTest < ActionDispatch::IntegrationTest ## # test the short link with various parameters and ensure they're # kept in the redirect. @@ -13,23 +13,24 @@ def test_short_link_params # utility method to test short links def assert_short_link_redirect(short_link) lon, lat, zoom = ShortLink::decode(short_link) + anchor = "map=#{zoom}/#{lat}/#{lon}" # test without marker get '/go/' + short_link - assert_redirected_to :controller => 'site', :action => 'index', :lat => lat.to_s, :lon => lon.to_s, :zoom => zoom.to_s + assert_redirected_to :controller => 'site', :action => 'index', :anchor => anchor # test with marker get '/go/' + short_link + "?m" - assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :zoom => zoom.to_s + assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :anchor => anchor # test with layers and a marker get '/go/' + short_link + "?m&layers=B000FTF" - assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :zoom => zoom.to_s, :layers => "B000FTF" + assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :layers => "B000FTF", :anchor => anchor get '/go/' + short_link + "?layers=B000FTF&m" - assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :zoom => zoom.to_s, :layers => "B000FTF" + assert_redirected_to :controller => 'site', :action => 'index', :mlat => lat.to_s, :mlon => lon.to_s, :layers => "B000FTF", :anchor => anchor # test with some random query parameters we haven't even implemented yet get '/go/' + short_link + "?foobar=yes" - assert_redirected_to :controller => 'site', :action => 'index', :lat => lat.to_s, :lon => lon.to_s, :zoom => zoom.to_s, :foobar => "yes" + assert_redirected_to :controller => 'site', :action => 'index', :foobar => "yes", :anchor => anchor end end diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb index 11fcae91a9a..db81117c338 100644 --- a/test/integration/user_blocks_test.rb +++ b/test/integration/user_blocks_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class UserBlocksTest < ActionController::IntegrationTest +class UserBlocksTest < ActionDispatch::IntegrationTest fixtures :users, :user_blocks, :user_roles def auth_header(user, pass) @@ -17,12 +17,12 @@ def test_api_blocked assert_response :success # now block the user - UserBlock.create({ + UserBlock.create( :user_id => blocked_user.id, :creator_id => users(:moderator_user).id, :reason => "testing", :ends_at => Time.now.getutc + 5.minutes - }, :without_protection => true) + ) get "/api/#{API_VERSION}/user/details", nil, auth_header(blocked_user.display_name, "test") assert_response :forbidden end @@ -31,12 +31,12 @@ def test_api_revoke blocked_user = users(:public_user) moderator = users(:moderator_user) - block = UserBlock.create({ + block = UserBlock.create( :user_id => blocked_user.id, :creator_id => moderator.id, :reason => "testing", :ends_at => Time.now.getutc + 5.minutes - }, :without_protection => true) + ) get "/api/#{API_VERSION}/user/details", nil, auth_header(blocked_user.display_name, "test") assert_response :forbidden diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index b5b3e91c7a9..503160e9daa 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class UserCreationTest < ActionController::IntegrationTest +class UserCreationTest < ActionDispatch::IntegrationTest fixtures :users def setup @@ -9,7 +9,7 @@ def setup def test_create_user_form I18n.available_locales.each do |locale| - get '/user/new', {}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s} + get_via_redirect '/user/new', {}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s} assert_response :success assert_template 'user/new' end @@ -21,7 +21,7 @@ def test_user_create_submit_duplicate_email display_name = "#{localer.to_s}_new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post '/user/save', + post '/user/new', {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, {"HTTP_ACCEPT_LANGUAGE" => localer.to_s} end @@ -29,8 +29,7 @@ def test_user_create_submit_duplicate_email assert_response :success assert_template 'user/new' assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email" + assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email" assert_no_missing_translations end end @@ -41,15 +40,14 @@ def test_user_create_submit_duplicate_username email = "#{locale.to_s}_new_tester" assert_difference('User.count', 0) do assert_difference('ActionMailer::Base.deliveries.size', 0) do - post '/user/save', + post '/user/new', {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s} end end assert_response :success assert_template 'user/new' - assert_select "div#errorExplanation" - assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name" + assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" assert_no_missing_translations end end @@ -58,10 +56,19 @@ def test_user_create_success I18n.available_locales.each do |locale| new_email = "#{locale.to_s}newtester@osm.org" display_name = "#{locale.to_s}_new_tester" + + assert_difference('User.count', 0) do + assert_difference('ActionMailer::Base.deliveries.size', 0) do + post "/user/new", + {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}} + end + end + + assert_redirected_to "/user/terms" + assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post_via_redirect "/user/save", - {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}, + post_via_redirect "/user/save", {}, {"HTTP_ACCEPT_LANGUAGE" => "#{locale.to_s}"} end end @@ -75,7 +82,7 @@ def test_user_create_success # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear end @@ -98,10 +105,9 @@ def test_user_create_redirect referer = "/traces/mine" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post "/user/terms", + post "/user/new", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password}, :referer => referer } - assert_response :success - assert_template 'terms' + assert_redirected_to "/user/terms" post_via_redirect "/user/save", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password} } end @@ -120,22 +126,20 @@ def test_user_create_redirect # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear # Go to the confirmation page - get 'user/confirm', { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", { :confirm_string => confirm_string } assert_response :success assert_template 'user/confirm' - post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' } - assert_response :redirect # to trace/mine in original referrer - follow_redirect! - assert_response :redirect # but it not redirects to /user//traces + post "user/#{display_name}/confirm", { :confirm_string => confirm_string } + assert_response :redirect follow_redirect! assert_response :success - assert_template 'trace/list' + assert_template 'site/welcome' end def test_user_create_openid_success @@ -144,13 +148,12 @@ def test_user_create_openid_success password = "testtest" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post "/user/terms", + post "/user/new", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}} assert_response :redirect res = openid_request(@response.redirect_url) - post '/user/terms', res - assert_response :success - assert_template 'terms' + get "/user/new", res + assert_redirected_to "/user/terms" post '/user/save', {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => password, :pass_crypt_confirmation => password}} assert_response :redirect @@ -160,7 +163,7 @@ def test_user_create_openid_success # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear end @@ -171,11 +174,11 @@ def test_user_create_openid_failure password = "testtest2" assert_difference('User.count',0) do assert_difference('ActionMailer::Base.deliveries.size',0) do - post "/user/terms", + post "/user/new", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.failure=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}} assert_response :redirect res = openid_request(@response.redirect_url) - post '/user/terms', res + get '/user/new', res assert_response :success assert_template 'user/new' end @@ -192,13 +195,12 @@ def test_user_create_openid_redirect referer = "/traces/mine" assert_difference('User.count') do assert_difference('ActionMailer::Base.deliveries.size', 1) do - post "/user/terms", + post "/user/new", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}, :referer => referer } - assert_response :redirect + assert_response :redirect res = openid_request(@response.location) - post '/user/terms', res - assert_response :success - assert_template 'terms' + get "/user/new", res + assert_redirected_to "/user/terms" post_via_redirect "/user/save", {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} } end @@ -217,21 +219,19 @@ def test_user_create_openid_redirect # Check the page assert_response :success - assert_template 'login' + assert_template 'user/confirm' ActionMailer::Base.deliveries.clear # Go to the confirmation page - get 'user/confirm', { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", { :confirm_string => confirm_string } assert_response :success assert_template 'user/confirm' - post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' } - assert_response :redirect # to trace/mine in original referrer - follow_redirect! - assert_response :redirect # but it not redirects to /user//traces + post "/user/#{display_name}/confirm", { :confirm_string => confirm_string } + assert_response :redirect follow_redirect! assert_response :success - assert_template "trace/list" + assert_template 'site/welcome' end end diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb index fab05894fe9..58e70bfd2c4 100644 --- a/test/integration/user_diaries_test.rb +++ b/test/integration/user_diaries_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class UserDiariesTest < ActionController::IntegrationTest +class UserDiariesTest < ActionDispatch::IntegrationTest fixtures :users, :diary_entries # Test the creation of a diary entry, making sure that you are redirected to @@ -36,17 +36,13 @@ def test_showing_create_diary_entry # functional tests rather than this integration test # There are some things that are specific to the integratio # that need to be tested, which can't be tested in the functional tests - assert_select "html:root" do - assert_select "body" do - assert_select "div#content" do - assert_select "h1", "New Diary Entry" - assert_select "form[action='/diary/new']" do - assert_select "input[id=diary_entry_title]" - end - end + assert_select "div.content-heading", :count => 1 do + assert_select "h1", "New Diary Entry" + end + assert_select "div#content" do + assert_select "form[action='/diary/new']" do + assert_select "input[id=diary_entry_title]" end end - - end end diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index cd6762dca95..66f8f4b0954 100644 --- a/test/integration/user_login_test.rb +++ b/test/integration/user_login_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class UserLoginTest < ActionController::IntegrationTest +class UserLoginTest < ActionDispatch::IntegrationTest fixtures :users def setup @@ -16,17 +16,17 @@ def test_login_email_password_normal follow_redirect! assert_response :success - post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_email_password_normal_upcase @@ -38,13 +38,13 @@ def test_login_email_password_normal_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -60,13 +60,13 @@ def test_login_email_password_normal_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -82,17 +82,17 @@ def test_login_email_password_public follow_redirect! assert_response :success - post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_email_password_public_upcase @@ -104,17 +104,17 @@ def test_login_email_password_public_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_email_password_public_titlecase @@ -126,17 +126,17 @@ def test_login_email_password_public_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_normal @@ -148,17 +148,17 @@ def test_login_username_password_normal follow_redirect! assert_response :success - post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_normal_upcase @@ -170,13 +170,13 @@ def test_login_username_password_normal_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -192,13 +192,13 @@ def test_login_username_password_normal_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -214,17 +214,17 @@ def test_login_username_password_public follow_redirect! assert_response :success - post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_public_upcase @@ -236,17 +236,17 @@ def test_login_username_password_public_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_public_titlecase @@ -258,17 +258,17 @@ def test_login_username_password_public_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_openid_success @@ -277,7 +277,7 @@ def test_login_openid_success assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" follow_redirect! assert_response :success - post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"} + post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/history"} assert_response :redirect res = openid_request(@response.redirect_url) @@ -286,7 +286,7 @@ def test_login_openid_success assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_openid_cancel diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb index 948bb895cd1..08031b4de52 100644 --- a/test/integration/user_roles_test.rb +++ b/test/integration/user_roles_test.rb @@ -1,6 +1,6 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class UserRolesTest < ActionController::IntegrationTest +class UserRolesTest < ActionDispatch::IntegrationTest fixtures :users, :user_roles test "grant" do diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb index 64a10102473..1bed53bce8a 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -1,14 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class UserTermsSeenTest < ActionController::IntegrationTest +class UserTermsSeenTest < ActionDispatch::IntegrationTest fixtures :users - def auth_header(user, pass) - {"HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}")} - end - def test_api_blocked - if REQUIRE_TERMS_SEEN + with_terms_seen(true) do user = users(:terms_not_seen_user) get "/api/#{API_VERSION}/user/preferences", nil, auth_header(user.display_name, "test") @@ -24,7 +20,7 @@ def test_api_blocked end def test_terms_presented_at_login - if REQUIRE_TERMS_SEEN + with_terms_seen(true) do user = users(:terms_not_seen_user) # try to log in @@ -42,7 +38,7 @@ def test_terms_presented_at_login post "/user/save", {'decline' => 'decline', 'referer' => '/'} assert_redirected_to "/" follow_redirect! - + # should be carried through to a normal login with a message assert_response :success assert !flash[:notice].nil? @@ -50,7 +46,7 @@ def test_terms_presented_at_login end def test_terms_cant_be_circumvented - if REQUIRE_TERMS_SEEN + with_terms_seen(true) do user = users(:terms_not_seen_user) # try to log in @@ -70,4 +66,20 @@ def test_terms_cant_be_circumvented assert_redirected_to "controller" => "user", "action" => "terms", :referer => "/traces/mine" end end + +private + + def auth_header(user, pass) + {"HTTP_AUTHORIZATION" => "Basic %s" % Base64.encode64("#{user}:#{pass}")} + end + + def with_terms_seen(value) + require_terms_seen = Object.send("remove_const", "REQUIRE_TERMS_SEEN") + Object.const_set("REQUIRE_TERMS_SEEN", value) + + yield + + Object.send("remove_const", "REQUIRE_TERMS_SEEN") + Object.const_set("REQUIRE_TERMS_SEEN", require_terms_seen) + end end diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js new file mode 100644 index 00000000000..d7fe4a2fd87 --- /dev/null +++ b/test/javascripts/osm_test.js @@ -0,0 +1,252 @@ +//= require jquery +//= require jquery.cookie +//= require osm +//= require leaflet +//= require leaflet.osm +//= require leaflet.map +//= require i18n/translations +//= require querystring + +var querystring = require('querystring-component'); + +describe("OSM", function () { + describe(".apiUrl", function () { + it("returns a URL for a way", function () { + expect(OSM.apiUrl({type: "way", id: 10})).to.eq("/api/0.6/way/10/full"); + }); + + it("returns a URL for a node", function () { + expect(OSM.apiUrl({type: "node", id: 10})).to.eq("/api/0.6/node/10"); + }); + + it("returns a URL for a specific version", function () { + expect(OSM.apiUrl({type: "node", id: 10, version: 2})).to.eq("/api/0.6/node/10/2"); + }); + }); + + describe(".params", function () { + it("parses params", function () { + var params = OSM.params("?foo=a&bar=b"); + expect(params).to.have.property("foo", "a"); + expect(params).to.have.property("bar", "b"); + }); + }); + + describe(".mapParams", function () { + beforeEach(function () { + delete OSM.home; + delete OSM.location; + document.location.hash = ""; + document.cookie = "_osm_location=; expires=Thu, 01 Jan 1970 00:00:00 GMT"; + + // Test with another cookie set. + document.cookie = "_osm_session=deadbeef"; + }); + + it("parses marker params", function () { + var params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845"); + expect(params).to.have.property("mlat", 57.6247); + expect(params).to.have.property("mlon", -3.6845); + expect(params).to.have.property("marker", true); + }); + + it("parses object params", function () { + var params = OSM.mapParams("?node=1"); + expect(params).to.have.property("object"); + expect(params.object).to.eql({type: "node", id: 1}); + + params = OSM.mapParams("?way=1"); + expect(params).to.have.property("object"); + expect(params.object).to.eql({type: "way", id: 1}); + + params = OSM.mapParams("?relation=1"); + expect(params).to.have.property("object"); + expect(params.object).to.eql({type: "relation", id: 1}); + }); + + it("parses bbox params", function () { + var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]); + var params = OSM.mapParams("?bbox=-3.6845,57.6247,-3.7845,57.7247"); + expect(params).to.have.property("bounds").deep.equal(expected); + + params = OSM.mapParams("?minlon=-3.6845&minlat=57.6247&maxlon=-3.7845&maxlat=57.7247"); + expect(params).to.have.property("bounds").deep.equal(expected); + }); + + it("parses lat/lon/zoom params", function () { + var params = OSM.mapParams("?lat=57.6247&lon=-3.6845"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 5); + + params = OSM.mapParams("?lat=57.6247&lon=-3.6845&zoom=10"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 10); + + params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 12); + + params = OSM.mapParams("?mlat=57.6247&mlon=-3.6845&zoom=16"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 16); + }); + + it("parses lat/lon/zoom from the hash", function () { + document.location.hash = "#map=16/57.6247/-3.6845"; + params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 16); + }); + + it("sets lat/lon from OSM.home", function () { + OSM.home = {lat: 57.6247, lon: -3.6845}; + var params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + }); + + it("sets bbox from OSM.location", function () { + OSM.location = {minlon: -3.6845, minlat: 57.6247, maxlon: -3.7845, maxlat: 57.7247}; + var expected = L.latLngBounds([57.6247, -3.6845], [57.7247, -3.7845]); + var params = OSM.mapParams("?"); + expect(params).to.have.property("bounds").deep.equal(expected); + }); + + it("parses params from the _osm_location cookie", function () { + document.cookie = "_osm_location=-3.6845|57.6247|5|M"; + var params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 57.6247); + expect(params).to.have.property("lon", -3.6845); + expect(params).to.have.property("zoom", 5); + expect(params).to.have.property("layers", "M"); + }); + + it("defaults lat/lon to London", function () { + var params = OSM.mapParams("?"); + expect(params).to.have.property("lat", 51.5); + expect(params).to.have.property("lon", -0.1); + expect(params).to.have.property("zoom", 5); + + params = OSM.mapParams("?zoom=10"); + expect(params).to.have.property("lat", 51.5); + expect(params).to.have.property("lon", -0.1); + expect(params).to.have.property("zoom", 10); + }); + + it("parses layers param", function () { + var params = OSM.mapParams("?"); + expect(params).to.have.property("layers", ""); + + document.cookie = "_osm_location=-3.6845|57.6247|5|C"; + params = OSM.mapParams("?"); + expect(params).to.have.property("layers", "C"); + + document.location.hash = "#map=5/57.6247/-3.6845&layers=M" + params = OSM.mapParams("?"); + expect(params).to.have.property("layers", "M"); + }); + }); + + describe(".parseHash", function () { + it("parses lat/lon/zoom params", function () { + var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M"); + expect(args).to.have.property("center").deep.equal(L.latLng(57.6247, -3.6845)); + expect(args).to.have.property("zoom", 5); + }); + + it("parses layers params", function () { + var args = OSM.parseHash("#map=5/57.6247/-3.6845&layers=M"); + expect(args).to.have.property("layers", "M"); + }); + }); + + describe(".formatHash", function () { + it("formats lat/lon/zoom params", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 9 }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845"); + }); + + it("respects zoomPrecision", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 5 }; + expect(OSM.formatHash(args)).to.eq("#map=5/57.625/-3.685"); + + args = { center: L.latLng(57.6247, -3.6845), zoom: 9 }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845"); + }); + + it("formats layers params", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "C" }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845&layers=C"); + }); + + it("ignores default layers", function () { + var args = { center: L.latLng(57.6247, -3.6845), zoom: 9, layers: "M" }; + expect(OSM.formatHash(args)).to.eq("#map=9/57.6247/-3.6845"); + }); + }); + + describe(".zoomPrecision", function () { + it("suggests 0 digits for z0-1", function () { + expect(OSM.zoomPrecision(0)).to.eq(0); + expect(OSM.zoomPrecision(1)).to.eq(0); + }); + + it("suggests 1 digit for z2", function () { + expect(OSM.zoomPrecision(2)).to.eq(1); + }); + + it("suggests 2 digits for z3-4", function () { + expect(OSM.zoomPrecision(3)).to.eq(2); + expect(OSM.zoomPrecision(4)).to.eq(2); + }); + + it("suggests 3 digits for z5-8", function () { + expect(OSM.zoomPrecision(5)).to.eq(3); + expect(OSM.zoomPrecision(6)).to.eq(3); + expect(OSM.zoomPrecision(7)).to.eq(3); + expect(OSM.zoomPrecision(8)).to.eq(3); + }); + + it("suggests 4 digits for z9-16", function () { + expect(OSM.zoomPrecision(9)).to.eq(4); + expect(OSM.zoomPrecision(10)).to.eq(4); + expect(OSM.zoomPrecision(11)).to.eq(4); + expect(OSM.zoomPrecision(12)).to.eq(4); + expect(OSM.zoomPrecision(13)).to.eq(4); + expect(OSM.zoomPrecision(14)).to.eq(4); + expect(OSM.zoomPrecision(15)).to.eq(4); + expect(OSM.zoomPrecision(16)).to.eq(4); + }); + + it("suggests 5 digits for z17-20", function () { + expect(OSM.zoomPrecision(17)).to.eq(5); + expect(OSM.zoomPrecision(18)).to.eq(5); + expect(OSM.zoomPrecision(19)).to.eq(5); + expect(OSM.zoomPrecision(20)).to.eq(5); + }); + }); + + describe(".locationCookie", function () { + it("creates a location cookie value", function () { + $("body").html($("
    ")); + var map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 }); + map.updateLayers(""); + expect(OSM.locationCookie(map)).to.eq("-3.6845|57.6247|9|M"); + }); + + it("respects zoomPrecision", function () { + $("body").html($("
    ")); + var map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 }); + map.updateLayers(""); + expect(OSM.locationCookie(map)).to.eq("-3.6845|57.6247|9|M"); + + map.setZoom(5); + expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|5|M"); + }); + }); +}); diff --git a/test/unit/bounding_box_test.rb b/test/lib/bounding_box_test.rb similarity index 99% rename from test/unit/bounding_box_test.rb rename to test/lib/bounding_box_test.rb index 1a1059ddfa6..a5e4a39e061 100644 --- a/test/unit/bounding_box_test.rb +++ b/test/lib/bounding_box_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class BoundingBoxTest < ActiveSupport::TestCase def setup diff --git a/test/lib/country_test.rb b/test/lib/country_test.rb new file mode 100644 index 00000000000..14827c05f3d --- /dev/null +++ b/test/lib/country_test.rb @@ -0,0 +1,28 @@ +require 'test_helper' + +class CountryTest < ActiveSupport::TestCase + def test_gb + gb = Country.find_by_code("GB") + assert_not_nil gb + assert_equal "GB", gb.code + assert_equal -8.623555, gb.min_lon + assert_equal 59.360249, gb.max_lat + assert_equal 1.759, gb.max_lon + assert_equal 49.906193, gb.min_lat + end + + def test_au + au = Country.find_by_code("AU") + assert_not_nil au + assert_equal "AU", au.code + assert_equal 112.911057, au.min_lon + assert_equal -10.062805, au.max_lat + assert_equal 153.639252, au.max_lon + assert_equal -43.64397, au.min_lat + end + + def test_xx + xx = Country.find_by_code("XX") + assert_nil xx + end +end diff --git a/test/unit/i18n_test.rb b/test/lib/i18n_test.rb similarity index 89% rename from test/unit/i18n_test.rb rename to test/lib/i18n_test.rb index c1dacbff2b6..ea67e084eea 100644 --- a/test/unit/i18n_test.rb +++ b/test/lib/i18n_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class I18nTest < ActiveSupport::TestCase I18n.available_locales.each do |locale| @@ -24,6 +24,10 @@ class I18nTest < ActiveSupport::TestCase end end + if key =~ /^(active(model|record)\.)?errors\./ + variables.push("attribute") + end + value = I18n.t(key, :locale => locale, :fallback => true) if value.is_a?(Hash) @@ -44,6 +48,8 @@ class I18nTest < ActiveSupport::TestCase end end end + + assert ["ltr", "rtl"].include?(I18n.t("html.dir", :locale => locale)), "html.dir must be ltr or rtl" end end private diff --git a/test/lib/password_hash_test.rb b/test/lib/password_hash_test.rb new file mode 100644 index 00000000000..bf253c0b811 --- /dev/null +++ b/test/lib/password_hash_test.rb @@ -0,0 +1,29 @@ +require 'test_helper' + +class PasswordHashTest < ActiveSupport::TestCase + def test_md5_without_salt + assert_equal true, PasswordHash.check("5f4dcc3b5aa765d61d8327deb882cf99", nil, "password") + assert_equal false, PasswordHash.check("5f4dcc3b5aa765d61d8327deb882cf99", nil, "wrong") + assert_equal true, PasswordHash.upgrade?("5f4dcc3b5aa765d61d8327deb882cf99", nil) + end + + def test_md5_with_salt + assert_equal true, PasswordHash.check("67a1e09bb1f83f5007dc119c14d663aa", "salt", "password") + assert_equal false, PasswordHash.check("67a1e09bb1f83f5007dc119c14d663aa", "salt", "wrong") + assert_equal false, PasswordHash.check("67a1e09bb1f83f5007dc119c14d663aa", "wrong", "password") + assert_equal true, PasswordHash.upgrade?("67a1e09bb1f83f5007dc119c14d663aa", "salt") + end + + def test_default + hash1, salt1 = PasswordHash.create("password") + hash2, salt2 = PasswordHash.create("password") + assert_not_equal hash1, hash2 + assert_not_equal salt1, salt2 + assert_equal true, PasswordHash.check(hash1, salt1, "password") + assert_equal false, PasswordHash.check(hash1, salt1, "wrong") + assert_equal true, PasswordHash.check(hash2, salt2, "password") + assert_equal false, PasswordHash.check(hash2, salt2, "wrong") + assert_equal false, PasswordHash.upgrade?(hash1, salt1) + assert_equal false, PasswordHash.upgrade?(hash2, salt2) + end +end diff --git a/test/unit/rich_text_test.rb b/test/lib/rich_text_test.rb similarity index 98% rename from test/unit/rich_text_test.rb rename to test/lib/rich_text_test.rb index c43dd0e9a24..e99d594a4e1 100644 --- a/test/unit/rich_text_test.rb +++ b/test/lib/rich_text_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RichTextTest < ActiveSupport::TestCase include ActionDispatch::Assertions::SelectorAssertions diff --git a/test/unit/short_link_test.rb b/test/lib/short_link_test.rb similarity index 96% rename from test/unit/short_link_test.rb rename to test/lib/short_link_test.rb index cdc6b3cfd80..7aa21f3636c 100644 --- a/test/unit/short_link_test.rb +++ b/test/lib/short_link_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ShortLinkTest < ActiveSupport::TestCase ## diff --git a/test/lib/utf8_test.rb b/test/lib/utf8_test.rb new file mode 100644 index 00000000000..1604b52f691 --- /dev/null +++ b/test/lib/utf8_test.rb @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +require 'test_helper' + +class UTF8Test < ActiveSupport::TestCase + def test_valid? + assert_equal true, UTF8.valid?("test") + assert_equal true, UTF8.valid?("vergrößern") + assert_equal true, UTF8.valid?("ルシステムにも対応します") + assert_equal true, UTF8.valid?("輕觸搖晃的遊戲") + + assert_equal false, UTF8.valid?("\xC0") # always invalid utf8 + assert_equal false, UTF8.valid?("\xC2\x4a") # 2-byte multibyte identifier, followed by plain ASCII + assert_equal false, UTF8.valid?("\xC2\xC2") # 2-byte multibyte identifier, followed by another one + assert_equal false, UTF8.valid?("\x4a\x82") # plain ASCII, followed by multibyte continuation + assert_equal false, UTF8.valid?("\x82\x82") # multibyte continuations without multibyte identifier + assert_equal false, UTF8.valid?("\xe1\x82\x4a") # three-byte identifier, contination and (incorrectly) plain ASCII + end +end diff --git a/test/unit/acl_test.rb b/test/models/acl_test.rb similarity index 70% rename from test/unit/acl_test.rb rename to test/models/acl_test.rb index 991e6eb8465..9d843191206 100644 --- a/test/unit/acl_test.rb +++ b/test/models/acl_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class AclTest < ActiveSupport::TestCase # Replace this with your real tests. diff --git a/test/unit/changeset_tag_test.rb b/test/models/changeset_tag_test.rb similarity index 93% rename from test/unit/changeset_tag_test.rb rename to test/models/changeset_tag_test.rb index 2939613c80e..1564361c470 100644 --- a/test/unit/changeset_tag_test.rb +++ b/test/models/changeset_tag_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ChangesetTagTest < ActiveSupport::TestCase api_fixtures @@ -59,7 +59,7 @@ def test_empty_tag_invalid def test_uniqueness tag = ChangesetTag.new - tag.changeset_id = changeset_tags(:changeset_1_tag_1).id + tag.changeset_id = changeset_tags(:changeset_1_tag_1).changeset_id tag.k = changeset_tags(:changeset_1_tag_1).k tag.v = changeset_tags(:changeset_1_tag_1).v assert tag.new_record? diff --git a/test/unit/changeset_test.rb b/test/models/changeset_test.rb similarity index 98% rename from test/unit/changeset_test.rb rename to test/models/changeset_test.rb index 9533cd55e0d..b6e5ba46ad4 100644 --- a/test/unit/changeset_test.rb +++ b/test/models/changeset_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class ChangesetTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/diary_comment_test.rb b/test/models/diary_comment_test.rb similarity index 60% rename from test/unit/diary_comment_test.rb rename to test/models/diary_comment_test.rb index e4ac3d4225a..e96c122300c 100644 --- a/test/unit/diary_comment_test.rb +++ b/test/models/diary_comment_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class DiaryCommentTest < ActiveSupport::TestCase api_fixtures fixtures :diary_comments def test_diary_comment_count - assert_equal 3, DiaryComment.count + assert_equal 4, DiaryComment.count end end diff --git a/test/unit/diary_entry_test.rb b/test/models/diary_entry_test.rb similarity index 83% rename from test/unit/diary_entry_test.rb rename to test/models/diary_entry_test.rb index 2d5c34f83ed..e8667bc74d5 100644 --- a/test/unit/diary_entry_test.rb +++ b/test/models/diary_entry_test.rb @@ -1,11 +1,11 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class DiaryEntryTest < ActiveSupport::TestCase api_fixtures fixtures :diary_entries, :diary_comments, :languages def test_diary_entry_count - assert_equal 3, DiaryEntry.count + assert_equal 5, DiaryEntry.count end def test_diary_entry_validations @@ -25,7 +25,7 @@ def test_diary_entry_validations end def test_diary_entry_visible - assert_equal 2, DiaryEntry.visible.count + assert_equal 4, DiaryEntry.visible.count assert_raise ActiveRecord::RecordNotFound do DiaryEntry.visible.find(diary_entries(:deleted_entry).id) end @@ -33,7 +33,7 @@ def test_diary_entry_visible def test_diary_entry_comments assert_equal 0, diary_entries(:normal_user_entry_1).comments.count - assert_equal 3, diary_entries(:normal_user_geo_entry).comments.count + assert_equal 4, diary_entries(:normal_user_geo_entry).comments.count end def test_diary_entry_visible_comments @@ -44,8 +44,8 @@ def test_diary_entry_visible_comments private def diary_entry_valid(attrs, result = true) - entry = DiaryEntry.new(diary_entries(:normal_user_entry_1).attributes, :without_protection => true) - entry.assign_attributes(attrs, :without_protection => true) + entry = DiaryEntry.new(diary_entries(:normal_user_entry_1).attributes) + entry.assign_attributes(attrs) assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}" end end diff --git a/test/unit/friend_test.rb b/test/models/friend_test.rb similarity index 74% rename from test/unit/friend_test.rb rename to test/models/friend_test.rb index 6416e38c7db..c9f671e7ec4 100644 --- a/test/unit/friend_test.rb +++ b/test/models/friend_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class FriendTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/language_test.rb b/test/models/language_test.rb similarity index 69% rename from test/unit/language_test.rb rename to test/models/language_test.rb index a171c1e2e1f..a9d6f5d6a22 100644 --- a/test/unit/language_test.rb +++ b/test/models/language_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class LanguageTest < ActiveSupport::TestCase test "language count" do diff --git a/test/unit/message_test.rb b/test/models/message_test.rb similarity index 99% rename from test/unit/message_test.rb rename to test/models/message_test.rb index 3da91de3836..079e10c4289 100644 --- a/test/unit/message_test.rb +++ b/test/models/message_test.rb @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class MessageTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/node_tag_test.rb b/test/models/node_tag_test.rb similarity index 95% rename from test/unit/node_tag_test.rb rename to test/models/node_tag_test.rb index 2f263179250..aa50b2f39a5 100644 --- a/test/unit/node_tag_test.rb +++ b/test/models/node_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class NodeTagTest < ActiveSupport::TestCase api_fixtures def test_tag_count - assert_equal 7, NodeTag.count + assert_equal 12, NodeTag.count node_tag_count(:visible_node, 1) node_tag_count(:invisible_node, 1) node_tag_count(:used_node_1, 1) diff --git a/test/unit/node_test.rb b/test/models/node_test.rb similarity index 94% rename from test/unit/node_test.rb rename to test/models/node_test.rb index 753e6a95c06..f6f5be2966c 100644 --- a/test/unit/node_test.rb +++ b/test/models/node_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class NodeTest < ActiveSupport::TestCase api_fixtures def test_node_count - assert_equal 17, Node.count + assert_equal 18, Node.count end def test_node_too_far_north @@ -77,13 +77,13 @@ def invalid_node_test(nod) # Check that you can create a node and store it def test_create - node_template = Node.new({ + node_template = Node.new( :latitude => 12.3456, :longitude => 65.4321, :changeset_id => changesets(:normal_user_first_change).id, :visible => 1, :version => 1 - }, :without_protection => true) + ) assert node_template.create_with_history(users(:normal_user)) node = Node.find(node_template.id) @@ -313,4 +313,22 @@ def test_from_xml_duplicate_k } assert_equal "Element node/23 has duplicate tags with key dup", message_update.message end + + def test_node_tags + node = current_nodes(:node_with_versions) + tags = Node.find(node.id).node_tags.order(:k) + assert_equal 2, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in node version 3", tags[0].v + assert_equal "testing two", tags[1].k + assert_equal "modified in node version 4", tags[1].v + end + + def test_tags + node = current_nodes(:node_with_versions) + tags = Node.find(node.id).tags + assert_equal 2, tags.size + assert_equal "added in node version 3", tags["testing"] + assert_equal "modified in node version 4", tags["testing two"] + end end diff --git a/test/unit/oauth_nonce_test.rb b/test/models/oauth_nonce_test.rb similarity index 91% rename from test/unit/oauth_nonce_test.rb rename to test/models/oauth_nonce_test.rb index def869a054b..ffbad0af6a4 100644 --- a/test/unit/oauth_nonce_test.rb +++ b/test/models/oauth_nonce_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OauthNonceTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/oauth_token_test.rb b/test/models/oauth_token_test.rb similarity index 80% rename from test/unit/oauth_token_test.rb rename to test/models/oauth_token_test.rb index ff03537910e..da2e449f15c 100644 --- a/test/unit/oauth_token_test.rb +++ b/test/models/oauth_token_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OauthTokenTest < ActiveSupport::TestCase api_fixtures @@ -15,9 +15,7 @@ def test_token_invalidation ## # check that an authorized token is authorised and can be invalidated def test_token_authorisation - tok = RequestToken.create({ - :client_application => client_applications(:oauth_web_app) - }, :without_protection => true) + tok = RequestToken.create(:client_application => client_applications(:oauth_web_app)) assert_equal false, tok.authorized?, "Token should be created unauthorised." tok.authorize!(users(:public_user)) assert_equal true, tok.authorized?, "Token should now be authorised." diff --git a/test/unit/old_node_tag_test.rb b/test/models/old_node_tag_test.rb similarity index 90% rename from test/unit/old_node_tag_test.rb rename to test/models/old_node_tag_test.rb index 064b5f198d1..249b810a9fe 100644 --- a/test/unit/old_node_tag_test.rb +++ b/test/models/old_node_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class OldNodeTest < ActiveSupport::TestCase +class OldNodeTagTest < ActiveSupport::TestCase api_fixtures def test_old_node_tag_count - assert_equal 9, OldNodeTag.count, "Unexpected number of fixtures loaded." + assert_equal 19, OldNodeTag.count, "Unexpected number of fixtures loaded." end def test_length_key_valid diff --git a/test/unit/old_node_test.rb b/test/models/old_node_test.rb similarity index 53% rename from test/unit/old_node_test.rb rename to test/models/old_node_test.rb index 84ea65b68ef..2ccf6d18c5d 100644 --- a/test/unit/old_node_test.rb +++ b/test/models/old_node_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldNodeTest < ActiveSupport::TestCase api_fixtures - def test_old_node_count - assert_equal 21, OldNode.count + def test_node_count + assert_equal 23, OldNode.count end def test_node_too_far_north @@ -74,4 +74,55 @@ def invalid_node_test(nod) #assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon) assert_equal false, node.valid? end + + def test_node_tags + node = nodes(:node_with_versions_v1) + tags = OldNode.find(node.id).old_tags.order(:k) + assert_equal 0, tags.count + + node = nodes(:node_with_versions_v2) + tags = OldNode.find(node.id).old_tags.order(:k) + assert_equal 0, tags.count + + node = nodes(:node_with_versions_v3) + tags = OldNode.find(node.id).old_tags.order(:k) + assert_equal 3, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in node version 3", tags[0].v + assert_equal "testing three", tags[1].k + assert_equal "added in node version 3", tags[1].v + assert_equal "testing two", tags[2].k + assert_equal "added in node version 3", tags[2].v + + node = nodes(:node_with_versions_v4) + tags = OldNode.find(node.id).old_tags.order(:k) + assert_equal 2, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in node version 3", tags[0].v + assert_equal "testing two", tags[1].k + assert_equal "modified in node version 4", tags[1].v + end + + def test_tags + node = nodes(:node_with_versions_v1) + tags = OldNode.find(node.id).tags + assert_equal 0, tags.size + + node = nodes(:node_with_versions_v2) + tags = OldNode.find(node.id).tags + assert_equal 0, tags.size + + node = nodes(:node_with_versions_v3) + tags = OldNode.find(node.id).tags + assert_equal 3, tags.size + assert_equal "added in node version 3", tags["testing"] + assert_equal "added in node version 3", tags["testing two"] + assert_equal "added in node version 3", tags["testing three"] + + node = nodes(:node_with_versions_v4) + tags = OldNode.find(node.id).tags + assert_equal 2, tags.size + assert_equal "added in node version 3", tags["testing"] + assert_equal "modified in node version 4", tags["testing two"] + end end diff --git a/test/unit/old_relation_tag_test.rb b/test/models/old_relation_tag_test.rb similarity index 94% rename from test/unit/old_relation_tag_test.rb rename to test/models/old_relation_tag_test.rb index 1d088082229..ec4987ee0f7 100644 --- a/test/unit/old_relation_tag_test.rb +++ b/test/models/old_relation_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class OldRelationTagTest < ActiveSupport::TestCase api_fixtures def test_tag_count - assert_equal 7, OldRelationTag.count + assert_equal 12, OldRelationTag.count end def test_length_key_valid diff --git a/test/models/old_relation_test.rb b/test/models/old_relation_test.rb new file mode 100644 index 00000000000..14fe8a72cc8 --- /dev/null +++ b/test/models/old_relation_test.rb @@ -0,0 +1,124 @@ +require 'test_helper' + +class OldRelationTest < ActiveSupport::TestCase + api_fixtures + + def test_db_count + assert_equal 14, OldRelation.count + end + + def test_relation_tags + relation = relations(:relation_with_versions_v1) + tags = OldRelation.find(relation.id).old_tags.order(:k) + assert_equal 0, tags.count + + relation = relations(:relation_with_versions_v2) + tags = OldRelation.find(relation.id).old_tags.order(:k) + assert_equal 0, tags.count + + relation = relations(:relation_with_versions_v3) + tags = OldRelation.find(relation.id).old_tags.order(:k) + assert_equal 3, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in relation version 3", tags[0].v + assert_equal "testing three", tags[1].k + assert_equal "added in relation version 3", tags[1].v + assert_equal "testing two", tags[2].k + assert_equal "added in relation version 3", tags[2].v + + relation = relations(:relation_with_versions_v4) + tags = OldRelation.find(relation.id).old_tags.order(:k) + assert_equal 2, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in relation version 3", tags[0].v + assert_equal "testing two", tags[1].k + assert_equal "modified in relation version 4", tags[1].v + end + + def test_relation_members + relation = relations(:relation_with_versions_v1) + members = OldRelation.find(relation.id).relation_members + assert_equal 1, members.count + assert_equal "some node", members[0].member_role + assert_equal "Node", members[0].member_type + assert_equal 15, members[0].member_id + + relation = relations(:relation_with_versions_v2) + members = OldRelation.find(relation.id).relation_members + assert_equal 1, members.count + assert_equal "some changed node", members[0].member_role + assert_equal "Node", members[0].member_type + assert_equal 15, members[0].member_id + + relation = relations(:relation_with_versions_v3) + members = OldRelation.find(relation.id).relation_members + assert_equal 2, members.count + assert_equal "some changed node", members[0].member_role + assert_equal "Node", members[0].member_type + assert_equal 15, members[0].member_id + assert_equal "some relation", members[1].member_role + assert_equal "Relation", members[1].member_type + assert_equal 7, members[1].member_id + + relation = relations(:relation_with_versions_v4) + members = OldRelation.find(relation.id).relation_members + assert_equal 3, members.count + assert_equal "some node", members[0].member_role + assert_equal "Node", members[0].member_type + assert_equal 15, members[0].member_id + assert_equal "some way", members[1].member_role + assert_equal "Way", members[1].member_type + assert_equal 4, members[1].member_id + assert_equal "some relation", members[2].member_role + assert_equal "Relation", members[2].member_type + assert_equal 7, members[2].member_id + end + + def test_relations + relation = relations(:relation_with_versions_v1) + members = OldRelation.find(relation.id).members + assert_equal 1, members.count + assert_equal ["Node", 15, "some node"], members[0] + + relation = relations(:relation_with_versions_v2) + members = OldRelation.find(relation.id).members + assert_equal 1, members.count + assert_equal ["Node", 15, "some changed node"], members[0] + + relation = relations(:relation_with_versions_v3) + members = OldRelation.find(relation.id).members + assert_equal 2, members.count + assert_equal ["Node", 15, "some changed node"], members[0] + assert_equal ["Relation", 7, "some relation"], members[1] + + relation = relations(:relation_with_versions_v4) + members = OldRelation.find(relation.id).members + assert_equal 3, members.count + assert_equal ["Node", 15, "some node"], members[0] + assert_equal ["Way", 4, "some way"], members[1] + assert_equal ["Relation", 7, "some relation"], members[2] + end + + def test_tags + relation = relations(:relation_with_versions_v1) + tags = OldRelation.find(relation.id).tags + assert_equal 0, tags.size + + relation = relations(:relation_with_versions_v2) + tags = OldRelation.find(relation.id).tags + assert_equal 0, tags.size + + relation = relations(:relation_with_versions_v3) + tags = OldRelation.find(relation.id).tags + assert_equal 3, tags.size + assert_equal "added in relation version 3", tags["testing"] + assert_equal "added in relation version 3", tags["testing two"] + assert_equal "added in relation version 3", tags["testing three"] + + relation = relations(:relation_with_versions_v4) + tags = OldRelation.find(relation.id).tags + assert_equal 2, tags.size + assert_equal "added in relation version 3", tags["testing"] + assert_equal "modified in relation version 4", tags["testing two"] + end +end diff --git a/test/unit/old_way_tag_test.rb b/test/models/old_way_tag_test.rb similarity index 92% rename from test/unit/old_way_tag_test.rb rename to test/models/old_way_tag_test.rb index 38023bb525c..07bdfbca87f 100644 --- a/test/unit/old_way_tag_test.rb +++ b/test/models/old_way_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' -class WayTagTest < ActiveSupport::TestCase +class OldWayTagTest < ActiveSupport::TestCase api_fixtures def test_tag_count - assert_equal 7, OldWayTag.count + assert_equal 12, OldWayTag.count end def test_length_key_valid diff --git a/test/models/old_way_test.rb b/test/models/old_way_test.rb new file mode 100644 index 00000000000..c002ebe39f0 --- /dev/null +++ b/test/models/old_way_test.rb @@ -0,0 +1,104 @@ +require 'test_helper' + +class OldWayTest < ActiveSupport::TestCase + api_fixtures + + def test_db_count + assert_equal 14, OldWay.count + end + + def test_old_nodes + way = ways(:way_with_multiple_nodes_v1) + nodes = OldWay.find(way.id).old_nodes.order(:sequence_id) + assert_equal 2, nodes.count + assert_equal 2, nodes[0].node_id + assert_equal 6, nodes[1].node_id + + way = ways(:way_with_multiple_nodes_v2) + nodes = OldWay.find(way.id).old_nodes.order(:sequence_id) + assert_equal 3, nodes.count + assert_equal 4, nodes[0].node_id + assert_equal 15, nodes[1].node_id + assert_equal 6, nodes[2].node_id + end + + def test_nds + way = ways(:way_with_multiple_nodes_v1) + nodes = OldWay.find(way.id).nds + assert_equal 2, nodes.count + assert_equal 2, nodes[0] + assert_equal 6, nodes[1] + + way = ways(:way_with_multiple_nodes_v2) + nodes = OldWay.find(way.id).nds + assert_equal 3, nodes.count + assert_equal 4, nodes[0] + assert_equal 15, nodes[1] + assert_equal 6, nodes[2] + end + + def test_way_tags + way = ways(:way_with_versions_v1) + tags = OldWay.find(way.id).old_tags.order(:k) + assert_equal 0, tags.count + + way = ways(:way_with_versions_v2) + tags = OldWay.find(way.id).old_tags.order(:k) + assert_equal 0, tags.count + + way = ways(:way_with_versions_v3) + tags = OldWay.find(way.id).old_tags.order(:k) + assert_equal 3, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in way version 3", tags[0].v + assert_equal "testing three", tags[1].k + assert_equal "added in way version 3", tags[1].v + assert_equal "testing two", tags[2].k + assert_equal "added in way version 3", tags[2].v + + way = ways(:way_with_versions_v4) + tags = OldWay.find(way.id).old_tags.order(:k) + assert_equal 2, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in way version 3", tags[0].v + assert_equal "testing two", tags[1].k + assert_equal "modified in way version 4", tags[1].v + end + + def test_tags + way = ways(:way_with_versions_v1) + tags = OldWay.find(way.id).tags + assert_equal 0, tags.size + + way = ways(:way_with_versions_v2) + tags = OldWay.find(way.id).tags + assert_equal 0, tags.size + + way = ways(:way_with_versions_v3) + tags = OldWay.find(way.id).tags + assert_equal 3, tags.size + assert_equal "added in way version 3", tags["testing"] + assert_equal "added in way version 3", tags["testing two"] + assert_equal "added in way version 3", tags["testing three"] + + way = ways(:way_with_versions_v4) + tags = OldWay.find(way.id).tags + assert_equal 2, tags.size + assert_equal "added in way version 3", tags["testing"] + assert_equal "modified in way version 4", tags["testing two"] + end + + def test_get_nodes_undelete + way = ways(:way_with_versions_v3) + nodes = OldWay.find(way.id).get_nodes_undelete + assert_equal 2, nodes.size + assert_equal [1.0, 1.0, 15, 4, {"testing" => "added in node version 3", "testing two" => "modified in node version 4"}, true], nodes[0] + assert_equal [3.0, 3.0, 3, 1, {"test" => "yes"}, true], nodes[1] + + way = ways(:way_with_redacted_versions_v2) + nodes = OldWay.find(way.id).get_nodes_undelete + assert_equal 2, nodes.size + assert_equal [3.0, 3.0, 3, 1, {"test" => "yes"}, true], nodes[0] + assert_equal [2.0, 2.0, 2, 1, {"testused" => "yes"}, false], nodes[1] + end +end diff --git a/test/unit/redaction_test.rb b/test/models/redaction_test.rb similarity index 95% rename from test/unit/redaction_test.rb rename to test/models/redaction_test.rb index c19570fc42b..61b64f21109 100644 --- a/test/unit/redaction_test.rb +++ b/test/models/redaction_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' require 'osm' class RedactionTest < ActiveSupport::TestCase diff --git a/test/unit/relation_member_test.rb b/test/models/relation_member_test.rb similarity index 54% rename from test/unit/relation_member_test.rb rename to test/models/relation_member_test.rb index b4f817b05c3..82eaa7e5843 100644 --- a/test/unit/relation_member_test.rb +++ b/test/models/relation_member_test.rb @@ -1,10 +1,9 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RelationMemberTest < ActiveSupport::TestCase api_fixtures def test_relation_member_count - assert_equal 6, RelationMember.count + assert_equal 9, RelationMember.count end - end diff --git a/test/unit/relation_tag_test.rb b/test/models/relation_tag_test.rb similarity index 96% rename from test/unit/relation_tag_test.rb rename to test/models/relation_tag_test.rb index 39a2ff82838..0b5bedb05e8 100644 --- a/test/unit/relation_tag_test.rb +++ b/test/models/relation_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RelationTagTest < ActiveSupport::TestCase api_fixtures def test_relation_tag_count - assert_equal 7, RelationTag.count + assert_equal 9, RelationTag.count end def test_length_key_valid diff --git a/test/unit/relation_test.rb b/test/models/relation_test.rb similarity index 69% rename from test/unit/relation_test.rb rename to test/models/relation_test.rb index a62320cc7d6..7141f54f0c6 100644 --- a/test/unit/relation_test.rb +++ b/test/models/relation_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class RelationTest < ActiveSupport::TestCase api_fixtures @@ -102,4 +102,46 @@ def test_from_xml_duplicate_k } assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message end + + def test_relation_members + relation = current_relations(:relation_with_versions) + members = Relation.find(relation.id).relation_members + assert_equal 3, members.count + assert_equal "some node", members[0].member_role + assert_equal "Node", members[0].member_type + assert_equal 15, members[0].member_id + assert_equal "some way", members[1].member_role + assert_equal "Way", members[1].member_type + assert_equal 4, members[1].member_id + assert_equal "some relation", members[2].member_role + assert_equal "Relation", members[2].member_type + assert_equal 7, members[2].member_id + end + + def test_relations + relation = current_relations(:relation_with_versions) + members = Relation.find(relation.id).members + assert_equal 3, members.count + assert_equal ["Node", 15, "some node"], members[0] + assert_equal ["Way", 4, "some way"], members[1] + assert_equal ["Relation", 7, "some relation"], members[2] + end + + def test_relation_tags + relation = current_relations(:relation_with_versions) + tags = Relation.find(relation.id).relation_tags.order(:k) + assert_equal 2, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in relation version 3", tags[0].v + assert_equal "testing two", tags[1].k + assert_equal "modified in relation version 4", tags[1].v + end + + def test_tags + relation = current_relations(:relation_with_versions) + tags = Relation.find(relation.id).tags + assert_equal 2, tags.size + assert_equal "added in relation version 3", tags["testing"] + assert_equal "modified in relation version 4", tags["testing two"] + end end diff --git a/test/unit/trace_test.rb b/test/models/trace_test.rb similarity index 58% rename from test/unit/trace_test.rb rename to test/models/trace_test.rb index b8cf6b88ada..9ec40f18f40 100644 --- a/test/unit/trace_test.rb +++ b/test/models/trace_test.rb @@ -1,24 +1,40 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class TraceTest < ActiveSupport::TestCase api_fixtures + def setup + @gpx_trace_dir = Object.send("remove_const", "GPX_TRACE_DIR") + Object.const_set("GPX_TRACE_DIR", File.dirname(__FILE__) + "/../traces") + end + + def teardown + Object.send("remove_const", "GPX_TRACE_DIR") + Object.const_set("GPX_TRACE_DIR", @gpx_trace_dir) + end + def test_trace_count assert_equal 5, Trace.count end def test_visible - check_query(Trace.visible, :public_trace_file, :anon_trace_file, :trackable_trace_file, :identifiable_trace_file) + check_query(Trace.visible, [:public_trace_file, :anon_trace_file, :trackable_trace_file, :identifiable_trace_file]) end def test_visible_to - check_query(Trace.visible_to(1), :public_trace_file, :identifiable_trace_file) - check_query(Trace.visible_to(2), :public_trace_file, :anon_trace_file, :trackable_trace_file, :identifiable_trace_file) - check_query(Trace.visible_to(3), :public_trace_file, :identifiable_trace_file) + check_query(Trace.visible_to(1), [:public_trace_file, :identifiable_trace_file]) + check_query(Trace.visible_to(2), [:public_trace_file, :anon_trace_file, :trackable_trace_file, :identifiable_trace_file]) + check_query(Trace.visible_to(3), [:public_trace_file, :identifiable_trace_file]) end def test_public - check_query(Trace.public, :public_trace_file, :identifiable_trace_file, :deleted_trace_file) + check_query(Trace.public, [:public_trace_file, :identifiable_trace_file, :deleted_trace_file]) + end + + def test_tagged + check_query(Trace.tagged("London"), [:public_trace_file, :anon_trace_file]) + check_query(Trace.tagged("Birmingham"), [:anon_trace_file, :identifiable_trace_file]) + check_query(Trace.tagged("Unknown"), []) end def test_validations @@ -76,16 +92,30 @@ def test_identifiable? assert_equal false, gpx_files(:deleted_trace_file).identifiable? end + def test_mime_type + assert_equal "application/gpx+xml", gpx_files(:public_trace_file).mime_type + assert_equal "application/gpx+xml", gpx_files(:anon_trace_file).mime_type + assert_equal "application/x-bzip2", gpx_files(:trackable_trace_file).mime_type + assert_equal "application/x-gzip", gpx_files(:identifiable_trace_file).mime_type + end + + def test_extension_name + assert_equal ".gpx", gpx_files(:public_trace_file).extension_name + assert_equal ".gpx", gpx_files(:anon_trace_file).extension_name + assert_equal ".gpx.bz2", gpx_files(:trackable_trace_file).extension_name + assert_equal ".gpx.gz", gpx_files(:identifiable_trace_file).extension_name + end + private - def check_query(query, *traces) + def check_query(query, traces) traces = traces.map { |t| gpx_files(t) }.sort assert_equal traces, query.order(:id) end def trace_valid(attrs, result = true) - entry = Trace.new(gpx_files(:public_trace_file).attributes, :without_protection => true) - entry.assign_attributes(attrs, :without_protection => true) + entry = Trace.new(gpx_files(:public_trace_file).attributes) + entry.assign_attributes(attrs) assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}" end end diff --git a/test/unit/tracepoint_test.rb b/test/models/tracepoint_test.rb similarity index 73% rename from test/unit/tracepoint_test.rb rename to test/models/tracepoint_test.rb index c49f9fbdcac..74a0d22f9fa 100644 --- a/test/unit/tracepoint_test.rb +++ b/test/models/tracepoint_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class TracepointTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/tracetag_test.rb b/test/models/tracetag_test.rb similarity index 80% rename from test/unit/tracetag_test.rb rename to test/models/tracetag_test.rb index 2112e589190..74a1d49aa59 100644 --- a/test/unit/tracetag_test.rb +++ b/test/models/tracetag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class TracetagTest < ActiveSupport::TestCase api_fixtures def test_tracetag_count - assert_equal 1, Tracetag.count + assert_equal 4, Tracetag.count end def test_validations @@ -24,8 +24,8 @@ def test_validations private def tracetag_valid(attrs, result = true) - entry = Tracetag.new(gpx_file_tags(:first_trace_1).attributes, :without_protection => true) - entry.assign_attributes(attrs, :without_protection => true) + entry = Tracetag.new(gpx_file_tags(:first_trace_1).attributes) + entry.assign_attributes(attrs) assert_equal result, entry.valid?, "Expected #{attrs.inspect} to be #{result}" end end diff --git a/test/unit/user_preference_test.rb b/test/models/user_preference_test.rb similarity index 96% rename from test/unit/user_preference_test.rb rename to test/models/user_preference_test.rb index d95989a4f50..4d485b27625 100644 --- a/test/unit/user_preference_test.rb +++ b/test/models/user_preference_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserPreferenceTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/user_test.rb b/test/models/user_test.rb similarity index 82% rename from test/unit/user_test.rb rename to test/models/user_test.rb index 225eca02b49..7f24469f625 100644 --- a/test/unit/user_test.rb +++ b/test/models/user_test.rb @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserTest < ActiveSupport::TestCase api_fixtures @@ -18,27 +18,27 @@ def test_invalid_with_empty_attributes end def test_unique_email - new_user = User.new({ + new_user = User.new( :email => users(:normal_user).email, :status => "active", :pass_crypt => Digest::MD5.hexdigest('test'), :display_name => "new user", :data_public => 1, :description => "desc" - }, :without_protection => true) + ) assert !new_user.save assert new_user.errors[:email].include?("has already been taken") end def test_unique_display_name - new_user = User.new({ + new_user = User.new( :email => "tester@openstreetmap.org", :status => "pending", :pass_crypt => Digest::MD5.hexdigest('test'), :display_name => users(:normal_user).display_name, :data_public => 1, :description => "desc" - }, :without_protection => true) + ) assert !new_user.save assert new_user.errors[:display_name].include?("has already been taken") end @@ -81,12 +81,12 @@ def test_display_name_valid # Due to sanitisation in the view some of these that you might not # expact are allowed # However, would they affect the xml planet dumps? - ok = [ "Name", "'me", "he\"", "#ping", "
    ", "*ho", "\"help\"@", + ok = [ "Name", "'me", "he\"", "
    ", "*ho", "\"help\"@", "vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲" ] # These need to be 3 chars in length, otherwise the length test above # should be used. bad = [ "
    ", "test@example.com", "s/f", "aa/", "aa;", "aa.", - "aa,", "aa?", "/;.,?", "も対応します/" ] + "aa,", "aa?", "/;.,?", "も対応します/", "#ping" ] ok.each do |display_name| user = users(:normal_user) user.display_name = display_name @@ -102,14 +102,14 @@ def test_display_name_valid end def test_friend_with - assert_equal true, users(:normal_user).is_friends_with?(users(:public_user)) - assert_equal false, users(:normal_user).is_friends_with?(users(:inactive_user)) - assert_equal false, users(:public_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:public_user).is_friends_with?(users(:inactive_user)) - assert_equal false, users(:inactive_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:inactive_user).is_friends_with?(users(:public_user)) + assert users(:normal_user).is_friends_with?(users(:public_user)) + assert !users(:normal_user).is_friends_with?(users(:inactive_user)) + assert !users(:public_user).is_friends_with?(users(:normal_user)) + assert !users(:public_user).is_friends_with?(users(:inactive_user)) + assert !users(:inactive_user).is_friends_with?(users(:normal_user)) + assert !users(:inactive_user).is_friends_with?(users(:public_user)) end - + def test_users_nearby # second user has their data public and is close by normal user assert_equal [users(:public_user)], users(:normal_user).nearby @@ -117,8 +117,10 @@ def test_users_nearby assert_equal [], users(:public_user).nearby # inactive_user has no user nearby assert_equal [], users(:inactive_user).nearby + # north_pole_user has no user nearby, and doesn't throw exception + assert_equal [], users(:north_pole_user).nearby end - + def test_friends_with # normal user is a friend of second user # it should be a one way friend accossitation @@ -132,13 +134,13 @@ def test_friends_with assert_equal [sec], norm.nearby assert_equal 1, norm.nearby.size assert_equal 1, Friend.count - assert_equal true, norm.is_friends_with?(sec) - assert_equal false, sec.is_friends_with?(norm) - assert_equal false, users(:normal_user).is_friends_with?(users(:inactive_user)) - assert_equal false, users(:public_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:public_user).is_friends_with?(users(:inactive_user)) - assert_equal false, users(:inactive_user).is_friends_with?(users(:normal_user)) - assert_equal false, users(:inactive_user).is_friends_with?(users(:public_user)) + assert norm.is_friends_with?(sec) + assert !sec.is_friends_with?(norm) + assert !users(:normal_user).is_friends_with?(users(:inactive_user)) + assert !users(:public_user).is_friends_with?(users(:normal_user)) + assert !users(:public_user).is_friends_with?(users(:inactive_user)) + assert !users(:inactive_user).is_friends_with?(users(:normal_user)) + assert !users(:inactive_user).is_friends_with?(users(:public_user)) #Friend.delete(friend) #assert_equal 0, Friend.count end @@ -155,7 +157,7 @@ def test_user_preferred_editor end def test_visible - assert_equal 14, User.visible.count + assert_equal 15, User.visible.count assert_raise ActiveRecord::RecordNotFound do User.visible.find(users(:suspended_user).id) end @@ -165,7 +167,7 @@ def test_visible end def test_active - assert_equal 13, User.active.count + assert_equal 14, User.active.count assert_raise ActiveRecord::RecordNotFound do User.active.find(users(:inactive_user).id) end @@ -178,7 +180,7 @@ def test_active end def test_public - assert_equal 15, User.public.count + assert_equal 16, User.public.count assert_raise ActiveRecord::RecordNotFound do User.public.find(users(:normal_user).id) end @@ -231,7 +233,7 @@ def test_delete user = users(:normal_user) user.delete assert_equal "user_#{user.id}", user.display_name - assert_blank user.description + assert user.description.blank? assert_equal nil, user.home_lat assert_equal nil, user.home_lon assert_equal false, user.image.file? diff --git a/test/unit/user_token_test.rb b/test/models/user_token_test.rb similarity index 76% rename from test/unit/user_token_test.rb rename to test/models/user_token_test.rb index 1fe2634541b..7be5a2cf7df 100644 --- a/test/unit/user_token_test.rb +++ b/test/models/user_token_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class UserTokenTest < ActiveSupport::TestCase api_fixtures diff --git a/test/unit/way_node_test.rb b/test/models/way_node_test.rb similarity index 53% rename from test/unit/way_node_test.rb rename to test/models/way_node_test.rb index 18162b44ab8..174fe0bdd2d 100644 --- a/test/unit/way_node_test.rb +++ b/test/models/way_node_test.rb @@ -1,9 +1,9 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class WayNodeTest < ActiveSupport::TestCase api_fixtures def test_way_nodes_count - assert_equal 6, WayNode.count + assert_equal 9, WayNode.count end end diff --git a/test/unit/way_tag_test.rb b/test/models/way_tag_test.rb similarity index 94% rename from test/unit/way_tag_test.rb rename to test/models/way_tag_test.rb index b338f9c2580..4d6116159d4 100644 --- a/test/unit/way_tag_test.rb +++ b/test/models/way_tag_test.rb @@ -1,10 +1,10 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class WayTagTest < ActiveSupport::TestCase api_fixtures def test_way_tag_count - assert_equal 3, WayTag.count + assert_equal 5, WayTag.count end def test_length_key_valid diff --git a/test/unit/way_test.rb b/test/models/way_test.rb similarity index 77% rename from test/unit/way_test.rb rename to test/models/way_test.rb index d2a447e408a..eb5baef10c3 100644 --- a/test/unit/way_test.rb +++ b/test/models/way_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require 'test_helper' class WayTest < ActiveSupport::TestCase api_fixtures @@ -6,7 +6,7 @@ class WayTest < ActiveSupport::TestCase # Check that we have the correct number of currnet ways in the db # This will need to updated whenever the current_ways.yml is updated def test_db_count - assert_equal 6, Way.count + assert_equal 7, Way.count end def test_bbox @@ -135,4 +135,49 @@ def test_from_xml_duplicate_k } assert_equal "Element way/23 has duplicate tags with key dup", message_update.message end + + def test_way_nodes + way = current_ways(:way_with_multiple_nodes) + nodes = Way.find(way.id).way_nodes + assert_equal 3, nodes.count + assert_equal 4, nodes[0].node_id + assert_equal 15, nodes[1].node_id + assert_equal 6, nodes[2].node_id + end + + def test_nodes + way = current_ways(:way_with_multiple_nodes) + nodes = Way.find(way.id).nodes + assert_equal 3, nodes.count + assert_equal 4, nodes[0].id + assert_equal 15, nodes[1].id + assert_equal 6, nodes[2].id + end + + def test_nds + way = current_ways(:way_with_multiple_nodes) + nodes = Way.find(way.id).nds + assert_equal 3, nodes.count + assert_equal 4, nodes[0] + assert_equal 15, nodes[1] + assert_equal 6, nodes[2] + end + + def test_way_tags + way = current_ways(:way_with_versions) + tags = Way.find(way.id).way_tags.order(:k) + assert_equal 2, tags.count + assert_equal "testing", tags[0].k + assert_equal "added in way version 3", tags[0].v + assert_equal "testing two", tags[1].k + assert_equal "modified in way version 4", tags[1].v + end + + def test_tags + way = current_ways(:way_with_versions) + tags = Way.find(way.id).tags + assert_equal 2, tags.size + assert_equal "added in way version 3", tags["testing"] + assert_equal "modified in way version 4", tags["testing two"] + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 703347c9c9d..4e95bb7a8db 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -53,6 +53,8 @@ def self.api_fixtures fixtures :client_applications fixtures :redactions + + fixtures :notes, :note_comments end ## diff --git a/test/traces/1.gpx b/test/traces/1.gpx new file mode 100644 index 00000000000..401d7a66d1d --- /dev/null +++ b/test/traces/1.gpx @@ -0,0 +1,25 @@ + + + + + + + + 134.0 + + 112.430000 + 0.072022 + 3d + 4 + 2.400000 + 2.600000 + 3.600000 + + + + diff --git a/test/traces/2.gpx b/test/traces/2.gpx new file mode 100644 index 00000000000..44713988b23 --- /dev/null +++ b/test/traces/2.gpx @@ -0,0 +1,24 @@ + + + + + + + + + 112.430000 + 0.072022 + 3d + 4 + 2.400000 + 2.600000 + 3.600000 + + + + diff --git a/test/traces/3.gpx b/test/traces/3.gpx new file mode 100644 index 00000000000..cdfa9413be1 Binary files /dev/null and b/test/traces/3.gpx differ diff --git a/test/traces/4.gpx b/test/traces/4.gpx new file mode 100644 index 00000000000..8cafa32c62b Binary files /dev/null and b/test/traces/4.gpx differ diff --git a/test/unit/country_test.rb b/test/unit/country_test.rb deleted file mode 100644 index 84bb2c4a18b..00000000000 --- a/test/unit/country_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require File.dirname(__FILE__) + '/../test_helper' - -class CountryTest < ActiveSupport::TestCase - fixtures :countries - - test "country count" do - assert_equal 2, Country.count - end -end diff --git a/vendor/assets/augment.js/augment.js b/vendor/assets/augment.js/augment.js new file mode 100644 index 00000000000..0bf2fd47cc8 --- /dev/null +++ b/vendor/assets/augment.js/augment.js @@ -0,0 +1,397 @@ +// augment.js JavaScript 1.8.5 methods for all, version: 0.4.2 +// using snippets from Mozilla - https://developer.mozilla.org/en/JavaScript +// (c) 2011 Oliver Nightingale +// +// Released under MIT license. +// +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every +if (!Array.prototype.every) { + Array.prototype.every = function(fun /*, thisp */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (typeof fun !== "function") + throw new TypeError(); + + var thisp = arguments[1]; + for (var i = 0; i < len; i++) { + if (i in t && !fun.call(thisp, t[i], i, t)) + return false; + } + + return true; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/filter +if (!Array.prototype.filter) { + Array.prototype.filter = function(fun /*, thisp */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (typeof fun !== "function") + throw new TypeError(); + + var res = []; + var thisp = arguments[1]; + for (var i = 0; i < len; i++) { + if (i in t) { + var val = t[i]; // in case fun mutates this + if (fun.call(thisp, val, i, t)) + res.push(val); + } + } + + return res; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach +if (!Array.prototype.forEach) { + Array.prototype.forEach = function(fun /*, thisp */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (typeof fun !== "function") + throw new TypeError(); + + var thisp = arguments[1]; + for (var i = 0; i < len; i++) { + if (i in t) + fun.call(thisp, t[i], i, t); + } + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf +if (!Array.prototype.indexOf) { + Array.prototype.indexOf = function(searchElement /*, fromIndex */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (len === 0) + return -1; + + var n = 0; + if (arguments.length > 0) { + n = Number(arguments[1]); + if (n !== n) // shortcut for verifying if it's NaN + n = 0; + else if (n !== 0 && n !== (Infinity) && n !== -(Infinity)) + n = (n > 0 || -1) * Math.floor(Math.abs(n)); + } + + if (n >= len) + return -1; + + var k = n >= 0 + ? n + : Math.max(len - Math.abs(n), 0); + + for (; k < len; k++) { + if (k in t && t[k] === searchElement) + return k; + } + return -1; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray +Array.isArray = Array.isArray || function(o) { return Object.prototype.toString.call(o) === '[object Array]'; }; +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf +if (!Array.prototype.lastIndexOf) { + Array.prototype.lastIndexOf = function(searchElement /*, fromIndex*/) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (len === 0) + return -1; + + var n = len; + if (arguments.length > 1) { + n = Number(arguments[1]); + if (n !== n) + n = 0; + else if (n !== 0 && n !== (Infinity) && n !== -(Infinity)) + n = (n > 0 || -1) * Math.floor(Math.abs(n)); + } + + var k = n >= 0 + ? Math.min(n, len - 1) + : len - Math.abs(n); + + for (; k >= 0; k--) { + if (k in t && t[k] === searchElement) + return k; + } + return -1; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/map +if (!Array.prototype.map) { + Array.prototype.map = function(fun /*, thisp */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (typeof fun !== "function") + throw new TypeError(); + + var res = new Array(len); + var thisp = arguments[1]; + for (var i = 0; i < len; i++) { + if (i in t) + res[i] = fun.call(thisp, t[i], i, t); + } + + return res; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/Reduce +if (!Array.prototype.reduce) { + Array.prototype.reduce = function(fun /*, initialValue */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (typeof fun !== "function") + throw new TypeError(); + + // no value to return if no initial value and an empty array + if (len == 0 && arguments.length == 1) + throw new TypeError(); + + var k = 0; + var accumulator; + if (arguments.length >= 2) { + accumulator = arguments[1]; + } else { + do { + if (k in t) { + accumulator = t[k++]; + break; + } + + // if array contains no values, no initial value to return + if (++k >= len) + throw new TypeError(); + } + while (true); + } + + while (k < len) { + if (k in t) + accumulator = fun.call(undefined, accumulator, t[k], k, t); + k++; + } + + return accumulator; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/ReduceRight +if (!Array.prototype.reduceRight) { + Array.prototype.reduceRight = function(callbackfn /*, initialValue */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (typeof callbackfn !== "function") + throw new TypeError(); + + // no value to return if no initial value, empty array + if (len === 0 && arguments.length === 1) + throw new TypeError(); + + var k = len - 1; + var accumulator; + if (arguments.length >= 2) { + accumulator = arguments[1]; + } else { + do { + if (k in this) { + accumulator = this[k--]; + break; + } + + // if array contains no values, no initial value to return + if (--k < 0) + throw new TypeError(); + } + while (true); + } + + while (k >= 0) { + if (k in t) + accumulator = callbackfn.call(undefined, accumulator, t[k], k, t); + k--; + } + + return accumulator; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some +if (!Array.prototype.some) { + Array.prototype.some = function(fun /*, thisp */) { + "use strict"; + + if (this === void 0 || this === null) + throw new TypeError(); + + var t = Object(this); + var len = t.length >>> 0; + if (typeof fun !== "function") + throw new TypeError(); + + var thisp = arguments[1]; + for (var i = 0; i < len; i++) { + if (i in t && fun.call(thisp, t[i], i, t)) + return true; + } + + return false; + }; +} +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Date/now +if (!Date.now) { + Date.now = function now () { + return +new Date(); + }; +} +if (!Date.prototype.toISOString) { + Date.prototype.toISOString = (function () { + + var pad = function (n, length) { + length = length || 2 + return (n = n + "", n.length === length) ? n : pad("0" + n, length); + } + + return function () { + var year = this.getUTCFullYear() + year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6); + + var date = [year, pad(this.getUTCMonth() + 1), pad(this.getUTCDate())].join("-") + var time = [pad(this.getUTCHours()), pad(this.getUTCMinutes()), pad(this.getUTCSeconds())].join(":") + "." + pad(this.getUTCMilliseconds(), 3) + return [date, time].join("T") + "Z" + } + })() +}; +if (!Date.prototype.toJSON) { + Date.prototype.toJSON = Date.prototype.toJSON +}; +// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function/bind +if (!Function.prototype.bind ) { + + Function.prototype.bind = function(obj) { + + if (typeof this !== 'function') throw new TypeError ("Function.prototype.bind - what is trying to be bound is not callable") + + var slice = Array.prototype.slice, + args = slice.call(arguments, 1), + self = this, + nop = function () {}, + bound = function () { + + if (nop.prototype && this instanceof nop) { + var result = self.apply(new nop, args.concat(slice.call(arguments))) + return (Object(result) === result) ? result : self + } else { + return self.apply(obj, args.concat(slice.call(arguments))) + }; + }; + + nop.prototype = self.prototype; + + bound.prototype = new nop(); + + return bound; + }; +} +;(function () { "use strict" + + var ensureIsObject = function (param) { + if (param !== Object(param)) throw new TypeError('Object.getPrototypeOf called on non-object'); + } + + if (!Object.getPrototypeOf) { + if (typeof "test".__proto__ === "object") { + Object.getPrototypeOf = function (obj) { + ensureIsObject(obj) + return obj.__proto__ + } + } else { + Object.getPrototypeOf = function (obj) { + ensureIsObject(obj) + return obj.constructor.prototype + } + }; + }; +})(); +// http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation +if (!Object.keys) { + Object.keys = (function () { + var hasOwnProperty = Object.prototype.hasOwnProperty, + hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'), + dontEnums = [ + 'toString', + 'toLocaleString', + 'valueOf', + 'hasOwnProperty', + 'isPrototypeOf', + 'propertyIsEnumerable', + 'constructor' + ], + dontEnumsLength = dontEnums.length + + return function (obj) { + if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) throw new TypeError('Object.keys called on non-object') + + var result = [] + + for (var prop in obj) { + if (hasOwnProperty.call(obj, prop)) result.push(prop) + } + + if (hasDontEnumBug) { + for (var i=0; i < dontEnumsLength; i++) { + if (hasOwnProperty.call(obj, dontEnums[i])) result.push(dontEnums[i]) + } + } + return result + } + })() +};if (!String.prototype.trim) { + String.prototype.trim = (function () { + + var trimLeft = /^\s+/, + trimRight = /\s+$/ + + return function () { + return this.replace(trimLeft, "").replace(trimRight, "") + } + })() +}; diff --git a/vendor/assets/bootstrap/bootstrap.dropdown.js b/vendor/assets/bootstrap/bootstrap.dropdown.js new file mode 100644 index 00000000000..d04da5d7bb7 --- /dev/null +++ b/vendor/assets/bootstrap/bootstrap.dropdown.js @@ -0,0 +1,169 @@ +/* ============================================================ + * bootstrap-dropdown.js v2.3.2 + * http://getbootstrap.com/2.3.2/javascript.html#dropdowns + * ============================================================ + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* DROPDOWN CLASS DEFINITION + * ========================= */ + + var toggle = '[data-toggle=dropdown]' + , Dropdown = function (element) { + var $el = $(element).on('click.dropdown.data-api', this.toggle) + $('html').on('click.dropdown.data-api', function () { + $el.parent().removeClass('open') + }) + } + + Dropdown.prototype = { + + constructor: Dropdown + + , toggle: function (e) { + var $this = $(this) + , $parent + , isActive + + if ($this.is('.disabled, :disabled')) return + + $parent = getParent($this) + + isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement) { + // if mobile we we use a backdrop because click events don't delegate + $('
      \n
    • Австралия. Данные пригородов от Австралийского бюро статистики.
    • \n
    • Австрия. Данные города Вена (на условиях CC BY)\nи земли Форарльберга.
    • \n
    • Канада. Данные от GeoBase ®, GeoGratis (© Департамент природных ресурсов Канады), CanVec (© Департамент природных ресурсов Канады) и StatCan (Отдел Географии, Статистическое ведомство Канады).
    • \n
    • Франция: Данные от Главного налогового управления.\n
    • Нидерланды: Contains © AND data, 2007 (www.and.com)
    • \n
    • Новая Зеландия. Данные из сведений о земельных ресурсах Новой Зеландии. Crown Copyright reserved.
    • \n\n\n
    • Польша: Данные с карт UMP-pcPL. Copyright участники UMP-pcPL.\n \n Подробнее об использовании данных UMP проектом OSM
    • \n
    • ЮАР: Данные из\n Chief Directorate:\n National Geo-Spatial Information, State copyright reserved.
    • \n
    • Великобритания. Данные Ordnance Survey © Crown copyright и права на базы данных 2010.
    • \n