From: Tom Hughes Date: Sat, 3 Feb 2018 16:12:51 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/1693' X-Git-Tag: live~3171 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9d2f920feb9dce028b985e8d452538d3df7a1d9c?hp=7a933cf928cfca83e5448c699fa84d1e209ba0a7 Merge remote-tracking branch 'upstream/pull/1693' --- diff --git a/.rubocop.yml b/.rubocop.yml index 55be8141c..5e7be9797 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -41,12 +41,18 @@ Naming/FileName: Rails/ApplicationRecord: Enabled: false +Rails/CreateTableWithTimestamps: + Enabled: false + Rails/HasManyOrHasOneDependent: Enabled: false Rails/HttpPositionalArguments: Enabled: false +Rails/InverseOf: + Enabled: false + Rails/SkipsModelValidations: Exclude: - 'db/migrate/*.rb' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index b4104079c..3ebd4d35f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -55,11 +55,6 @@ Lint/InterpolationCheck: Exclude: - 'test/controllers/node_controller_test.rb' -# Offense count: 2 -Lint/RescueWithoutErrorClass: - Exclude: - - 'app/helpers/browse_helper.rb' - # Offense count: 2 Lint/ShadowingOuterLocalVariable: Exclude: @@ -227,3 +222,8 @@ Style/NumericLiterals: # SupportedStyles: compact, exploded Style/RaiseArgs: Enabled: false + +# Offense count: 2 +Style/RescueStandardError: + Exclude: + - 'app/helpers/browse_helper.rb' diff --git a/CONFIGURE.md b/CONFIGURE.md index 9b7bb90e8..3cbe31cb9 100644 --- a/CONFIGURE.md +++ b/CONFIGURE.md @@ -6,7 +6,7 @@ After [installing](INSTALL.md) this software, you may need to carry out some of 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. -After installing but before creating any users or data, import an extract with [Osmosis](http://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task. +After installing but before creating any users or data, import an extract with [Osmosis](https://wiki.openstreetmap.org/wiki/Osmosis) and the [``--write-apidb``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--write-apidb_.28--wd.29) task. ``` osmosis --read-pbf greater-london-latest.osm.pbf \ @@ -14,7 +14,7 @@ osmosis --read-pbf greater-london-latest.osm.pbf \ user="openstreetmap" password="" validateSchemaVersion="no" ``` -Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](http://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates. +Loading an apidb database with Osmosis is about **twenty** times slower than loading the equivalent data with osm2pgsql into a rendering database. [``--log-progress``](https://wiki.openstreetmap.org/wiki/Osmosis/Detailed_Usage#--log-progress_.28--lp.29) may be desirable for status updates. To be able to edit the data you have loaded, you will need to use this [yet-to-be-written script](https://github.com/openstreetmap/openstreetmap-website/issues/282). @@ -94,7 +94,7 @@ 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) +If you have more problems, please ask on the [rails-dev@openstreetmap.org mailing list](https://lists.openstreetmap.org/listinfo/rails-dev) or on the [#osm-dev IRC Channel](https://wiki.openstreetmap.org/wiki/IRC) ## Maintaining your installation @@ -110,7 +110,7 @@ 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). +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](https://wiki.openstreetmap.org/wiki/Using_the_dev_server#Rails_Applications). # Contributing @@ -124,6 +124,6 @@ If you want to deploy The Rails Port for production use, you'll need to make a f * 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/). +* The included version of the GPX importer is slow and/or completely inoperable. You should consider using [the high-speed GPX importer](https://git.openstreetmap.org/gpx-import.git/). * Make sure you precompile the production assets: `RAILS_ENV=production rake assets:precompile` * Make sure the web server user as well as the rails user can read, write and create directories in `tmp/`. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 961377ec8..acb780746 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -* http://www.ruby-lang.org/ - The homepage of Ruby which has more links and some great tutorials. +* https://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 @@ -94,6 +94,6 @@ 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) +and send the details to the [rails-dev](https://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. +[rails-dev](https://lists.openstreetmap.org/listinfo/rails-dev) list. diff --git a/Gemfile b/Gemfile index 79d95f9d5..e05edebc4 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "psych", :platforms => :ruby_20 gem "json" # Use postgres as the database -gem "pg" +gem "pg", "~> 0.18" # Use SCSS for stylesheets gem "sass-rails", "~> 5.0" @@ -48,7 +48,7 @@ gem "http_accept_language", "~> 2.0.0" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" -gem "paperclip", "~> 4.0" +gem "paperclip", "~> 5.2" gem "rack-cors" gem "rails-i18n", "~> 4.0.0" gem "record_tag_helper" diff --git a/Gemfile.lock b/Gemfile.lock index 1cff44151..7dd619b61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,19 +48,19 @@ GEM rake (>= 10.4, < 13.0) arel (8.0.0) ast (2.3.0) - autoprefixer-rails (7.1.6) + autoprefixer-rails (7.2.5) execjs bigdecimal (1.1.0) builder (3.2.3) canonical-rails (0.2.1) rails (>= 4.1, < 5.2) - capybara (2.16.1) + capybara (2.17.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) climate_control (0.2.0) cliver (0.3.2) cocaine (0.5.8) @@ -72,8 +72,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - composite_primary_keys (10.0.1) - activerecord (~> 5.1.0) + composite_primary_keys (10.0.2) + activerecord (~> 5.1.0, >= 5.1.4) concurrent-ruby (1.0.5) coveralls (0.8.21) json (>= 1.8, < 3) @@ -89,7 +89,7 @@ GEM dynamic_form (1.1.4) erubi (1.7.0) execjs (2.7.0) - exifr (1.3.2) + exifr (1.3.3) factory_bot (4.8.2) activesupport (>= 3.0.0) factory_bot_rails (4.8.2) @@ -103,14 +103,14 @@ GEM globalid (0.4.1) activesupport (>= 4.2.0) hashdiff (0.3.7) - hashie (3.5.6) + hashie (3.5.7) htmlentities (4.3.4) http_accept_language (2.0.5) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) - i18n-js (3.0.2) + i18n-js (3.0.3) i18n (~> 0.6, >= 0.6.6) - image_optim (0.26.0) + image_optim (0.26.1) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -137,7 +137,7 @@ GEM actionpack jsonify (< 0.4.0) jwt (1.5.6) - kgio (2.11.0) + kgio (2.11.1) libv8 (3.16.14.19) libxml-ruby (3.0.0) listen (3.1.5) @@ -158,14 +158,14 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.0) + mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) - multi_json (1.12.2) + minitest (5.11.1) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nio4r (2.1.0) + nio4r (2.2.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) nokogumbo (1.4.13) @@ -182,7 +182,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.7.1) + omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) @@ -201,8 +201,8 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) @@ -211,25 +211,25 @@ GEM multi_json (~> 1.12) omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) - paperclip (4.3.7) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) + paperclip (5.2.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) cocaine (~> 0.5.5) mime-types - mimemagic (= 0.3.0) - parallel (1.12.0) + mimemagic (~> 0.3.0) + parallel (1.12.1) parser (2.4.0.2) ast (~> 2.3) pg (0.21.0) - poltergeist (1.16.0) + poltergeist (1.17.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.1) progress (3.4.0) - psych (2.2.4) + psych (3.0.2) public_suffix (3.0.1) - puma (3.11.0) + puma (3.11.2) r2 (0.2.7) rack (2.0.3) rack-cors (1.0.2) @@ -269,8 +269,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) rake (12.3.0) rb-fsevent (0.10.2) rb-inotify (0.9.10) @@ -279,14 +278,15 @@ GEM actionview (~> 5.x) redcarpet (3.4.0) ref (2.0.0) - request_store (1.3.2) - rinku (2.0.3) + request_store (1.4.0) + rack (>= 1.4) + rinku (2.0.4) rotp (3.3.0) - rubocop (0.51.0) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 2.2.2, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) @@ -297,7 +297,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.5.3) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -308,7 +308,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - secure_headers (5.0.3) + secure_headers (5.0.4) useragent (>= 0.15.0) simplecov (0.14.1) docile (~> 1.1.0) @@ -330,25 +330,25 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - tins (1.16.0) + tins (1.16.3) tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.4) execjs (>= 0.3.0, < 3) unicode-display_width (1.3.0) - useragent (0.16.8) + useragent (0.16.9) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - webmock (3.1.1) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -391,8 +391,8 @@ DEPENDENCIES omniauth-openid omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) - paperclip (~> 4.0) - pg + paperclip (~> 5.2) + pg (~> 0.18) poltergeist psych puma (~> 3.7) diff --git a/INSTALL.md b/INSTALL.md index d036673b1..7571cff50 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -69,7 +69,7 @@ For MacOSX, you will need XCode installed from the Mac App Store; OS X 10.7 (Lio Installing PostgreSQL: -* Install Postgres.app from http://postgresapp.com/ +* Install Postgres.app from https://postgresapp.com/ * Add PostgreSQL to your path, by editing your profile: `nano ~/.profile` @@ -80,9 +80,11 @@ and adding: Installing other dependencies: -* Install Homebrew from http://mxcl.github.io/homebrew/ +* Install Homebrew from https://brew.sh/ * Install the latest version of Ruby: `brew install ruby` * Install ImageMagick: `brew install imagemagick` +* Install libxml2: `brew install libxml2 --with-xml2-config` +* If you want to run the tests, you need `phantomjs` as well: `brew install phantomjs` * 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. diff --git a/README.md b/README.md index 6b929fef9..9162a38de 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ [![Coverage Status](https://coveralls.io/repos/openstreetmap/openstreetmap-website/badge.svg?branch=master)](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master) This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/) -application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API. +application that powers the [OpenStreetMap](https://www.openstreetmap.org) website and API. The software is also known as "openstreetmap-website". This repository consists of: * 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 XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6) +* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors * The Browse pages - a web front-end to the OpenStreetMap data * The GPX uploads, browsing and API. @@ -21,7 +21,7 @@ uses publicly-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), +This software is licensed under the [GNU General Public License 2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt), a copy of which can be found in the [LICENSE](LICENSE) file. # Installation @@ -36,7 +36,7 @@ We're always keen to have more developers! Pull requests are very welcome. * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues). * Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components * Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) -* There is a [rails-dev@openstreetmap.org](http://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. +* There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. * IRC - there is the #osm-dev channel on irc.oftc.net. More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTING.md) file. diff --git a/VAGRANT.md b/VAGRANT.md index 3825ad988..9dea61861 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -8,7 +8,7 @@ sudo apt-get install vagrant Other Linux distributions should have similar installation instructions using `dnf`, `pacman`, or similar. -Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](http://www.vagrantup.com/downloads.html) for more information. +Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](https://www.vagrantup.com/downloads.html) for more information. Note than until there are suitable _xenial64_ [vagrant boxes](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=&q=xenial64) for other providers, the only virtualization provider supported is virtualbox. You might need to install it and specify `--provider virtualbox` when setting up your environment. diff --git a/Vendorfile b/Vendorfile index d66dd80d8..e57ab21fe 100644 --- a/Vendorfile +++ b/Vendorfile @@ -11,16 +11,16 @@ folder 'vendor/assets' do end folder 'leaflet' do - file 'leaflet.js', 'https://unpkg.com/leaflet@1.2.0/dist/leaflet-src.js' - file 'leaflet.css', 'https://unpkg.com/leaflet@1.2.0/dist/leaflet.css' + file 'leaflet.js', 'https://unpkg.com/leaflet@1.3.1/dist/leaflet-src.js' + file 'leaflet.css', 'https://unpkg.com/leaflet@1.3.1/dist/leaflet.css' [ 'layers.png', 'layers-2x.png', 'marker-icon.png', 'marker-icon-2x.png', 'marker-shadow.png' ].each do |image| - file "images/#{image}", "https://unpkg.com/leaflet@1.2.0/dist/images/#{image}" + file "images/#{image}", "https://unpkg.com/leaflet@1.3.1/dist/images/#{image}" end - from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.2.1' do + from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.0' do file 'leaflet.contextmenu.js', 'dist/leaflet.contextmenu.js' file 'leaflet.contextmenu.css', 'dist/leaflet.contextmenu.css' end diff --git a/app/assets/images/banners/banner-sotmus2017.png b/app/assets/images/banners/banner-sotmus2017.png deleted file mode 100644 index 25382bf4a..000000000 Binary files a/app/assets/images/banners/banner-sotmus2017.png and /dev/null differ diff --git a/app/assets/images/banners/foss4g-it2018-banner.png b/app/assets/images/banners/foss4g-it2018-banner.png new file mode 100755 index 000000000..7ed898f8b Binary files /dev/null and b/app/assets/images/banners/foss4g-it2018-banner.png differ diff --git a/app/assets/images/banners/fossgis2018.png b/app/assets/images/banners/fossgis2018.png new file mode 100644 index 000000000..bff192990 Binary files /dev/null and b/app/assets/images/banners/fossgis2018.png differ diff --git a/app/assets/images/banners/osmf-membership-drive-2017.png b/app/assets/images/banners/osmf-membership-drive-2017.png deleted file mode 100644 index 0b62b2168..000000000 Binary files a/app/assets/images/banners/osmf-membership-drive-2017.png and /dev/null differ diff --git a/app/assets/images/banners/sotmasia-2017-banner.png b/app/assets/images/banners/sotmasia-2017-banner.png deleted file mode 100644 index f18f5bf72..000000000 Binary files a/app/assets/images/banners/sotmasia-2017-banner.png and /dev/null differ diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png index c511bd90f..e25617013 100644 Binary files a/app/assets/images/sprite.png and b/app/assets/images/sprite.png differ diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index df8e3e3d5..b9270279f 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,290 +1,68 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - ', + creditline: 'MapQuest ', draggable: false, getRoute: function (points, callback) { @@ -36,7 +36,7 @@ function MapQuestEngine(id, routeType) { var to = points[points.length - 1]; return $.ajax({ - url: document.location.protocol + OSM.MAPQUEST_DIRECTIONS_URL, + url: OSM.MAPQUEST_DIRECTIONS_URL, data: { key: OSM.MAPQUEST_KEY, from: from.lat + "," + from.lng, diff --git a/app/assets/javascripts/index/directions/mapzen.js b/app/assets/javascripts/index/directions/mapzen.js deleted file mode 100644 index 981fc3807..000000000 --- a/app/assets/javascripts/index/directions/mapzen.js +++ /dev/null @@ -1,109 +0,0 @@ -function MapzenEngine(id, costing) { - var MZ_INSTR_MAP = [ - 0, // kNone = 0; - 8, // kStart = 1; - 8, // kStartRight = 2; - 8, // kStartLeft = 3; - 14, // kDestination = 4; - 14, // kDestinationRight = 5; - 14, // kDestinationLeft = 6; - 0, // kBecomes = 7; - 0, // kContinue = 8; - 1, // kSlightRight = 9; - 2, // kRight = 10; - 3, // kSharpRight = 11; - 4, // kUturnRight = 12; - 4, // kUturnLeft = 13; - 7, // kSharpLeft = 14; - 6, // kLeft = 15; - 5, // kSlightLeft = 16; - 0, // kRampStraight = 17; - 24, // kRampRight = 18; - 25, // kRampLeft = 19; - 24, // kExitRight = 20; - 25, // kExitLeft = 21; - 0, // kStayStraight = 22; - 1, // kStayRight = 23; - 5, // kStayLeft = 24; - 20, // kMerge = 25; - 10, // kRoundaboutEnter = 26; - 11, // kRoundaboutExit = 27; - 17, // kFerryEnter = 28; - 0 // kFerryExit = 29; - ]; - - return { - id: id, - creditline: "Mapzen", - draggable: false, - - getRoute: function (points, callback) { - return $.ajax({ - url: document.location.protocol + OSM.MAPZEN_VALHALLA_URL, - data: { - api_key: OSM.MAPZEN_VALHALLA_KEY, - json: JSON.stringify({ - locations: points.map(function (p) { return { lat: p.lat, lon: p.lng }; }), - costing: costing, - directions_options: { - units: "km", - language: I18n.currentLocale() - } - }) - }, - dataType: "json", - success: function (data) { - var trip = data.trip; - - if (trip.status === 0) { - var line = []; - var steps = []; - var distance = 0; - var time = 0; - - trip.legs.forEach(function (leg) { - var legLine = L.PolylineUtil.decode(leg.shape, { - precision: 6 - }); - - line = line.concat(legLine); - - leg.maneuvers.forEach(function (manoeuvre) { - var point = legLine[manoeuvre.begin_shape_index]; - - steps.push([ - { lat: point[0], lng: point[1] }, - MZ_INSTR_MAP[manoeuvre.type], - manoeuvre.instruction, - manoeuvre.length * 1000, - [] - ]); - }); - - distance = distance + leg.summary.length; - time = time + leg.summary.time; - }); - - callback(false, { - line: line, - steps: steps, - distance: distance * 1000, - time: time - }); - } else { - callback(true); - } - }, - error: function () { - callback(true); - } - }); - } - }; -} - -if (OSM.MAPZEN_VALHALLA_KEY) { - OSM.Directions.addEngine(new MapzenEngine("mapzen_car", "auto"), true); - OSM.Directions.addEngine(new MapzenEngine("mapzen_bicycle", "bicycle"), true); - OSM.Directions.addEngine(new MapzenEngine("mapzen_foot", "pedestrian"), true); -} diff --git a/app/assets/javascripts/index/directions/osrm.js b/app/assets/javascripts/index/directions/osrm.js index 69191e65a..e7c91e9dc 100644 --- a/app/assets/javascripts/index/directions/osrm.js +++ b/app/assets/javascripts/index/directions/osrm.js @@ -127,7 +127,7 @@ function OSRMEngine() { return p.lng + ',' + p.lat; }).join(';'); - var req_url = document.location.protocol + OSM.OSRM_URL + encoded_coords; + var req_url = OSM.OSRM_URL + encoded_coords; var onResponse = function (data) { if (data.code !== 'Ok') diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js index 1efac1b31..48e950b21 100644 --- a/app/assets/javascripts/index/export.js +++ b/app/assets/javascripts/index/export.js @@ -43,7 +43,7 @@ OSM.Export = function(map) { $("#maxlat").val(bounds.getNorth().toFixed(precision)); $("#export_overpass").attr("href", - "http://overpass-api.de/api/map?bbox=" + + "https://overpass-api.de/api/map?bbox=" + $("#minlon").val() + "," + $("#minlat").val() + "," + $("#maxlon").val() + "," + $("#maxlat").val()); } diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js index 7ac613d71..c01caba70 100644 --- a/app/assets/javascripts/index/query.js +++ b/app/assets/javascripts/index/query.js @@ -1,8 +1,7 @@ //= require jquery.simulate OSM.Query = function(map) { - var protocol = document.location.protocol === "https:" ? "https:" : "http:", - url = protocol + OSM.OVERPASS_URL, + var url = OSM.OVERPASS_URL, queryButton = $(".control-query .control-button"), uninterestingTags = ['source', 'source_ref', 'source:ref', 'history', 'attribution', 'created_by', 'tiger:county', 'tiger:tlid', 'tiger:upload_uuid', 'KSJ2:curve_id', 'KSJ2:lat', 'KSJ2:lon', 'KSJ2:coordinate', 'KSJ2:filename', 'note:ja'], marker; diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index e8df0bd61..d952a7376 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -14,7 +14,7 @@ L.OSM.Map = L.Map.extend({ L.Map.prototype.initialize.call(this, id, options); var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); - var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'}); + var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'https://donate.openstreetmap.org'}); this.baseLayers = []; @@ -27,7 +27,7 @@ L.OSM.Map = L.Map.extend({ if (OSM.THUNDERFOREST_KEY) { this.baseLayers.push(new L.OSM.CycleMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", apikey: OSM.THUNDERFOREST_KEY, code: "C", keyid: "cyclemap", @@ -35,7 +35,7 @@ L.OSM.Map = L.Map.extend({ })); this.baseLayers.push(new L.OSM.TransportMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", apikey: OSM.THUNDERFOREST_KEY, code: "T", keyid: "transportmap", @@ -44,7 +44,7 @@ L.OSM.Map = L.Map.extend({ } this.baseLayers.push(new L.OSM.HOT({ - attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", + attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", code: "H", keyid: "hot", name: I18n.t("javascripts.map.base.hot") diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index ee1c6a115..971f80be3 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -14,16 +14,12 @@ OSM = { NOMINATIM_URL: <%= NOMINATIM_URL.to_json %>, GRAPHHOPPER_URL: <%= GRAPHHOPPER_URL.to_json %>, MAPQUEST_DIRECTIONS_URL: <%= MAPQUEST_DIRECTIONS_URL.to_json %>, - MAPZEN_VALHALLA_URL: <%= MAPZEN_VALHALLA_URL.to_json %>, OSRM_URL: <%= OSRM_URL.to_json %>, DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>, <% if defined?(MAPQUEST_KEY) %> MAPQUEST_KEY: <%= MAPQUEST_KEY.to_json %>, <% end %> -<% if defined?(MAPZEN_VALHALLA_KEY) %> - MAPZEN_VALHALLA_KEY: <%= MAPZEN_VALHALLA_KEY.to_json %>, -<% end %> <% if defined?(THUNDERFOREST_KEY) %> THUNDERFOREST_KEY: <%= THUNDERFOREST_KEY.to_json %>, <% end %> diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 2f1215b5d..6df4c14ac 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -163,24 +163,24 @@ small, aside { 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.search { /* no-r2 */ background-position: 0 0; } +.icon.donate { /* no-r2 */ background-position: -20px 0; } +.icon.zoomin { /* no-r2 */ background-position: -40px 0; } +.icon.zoomout { /* no-r2 */ background-position: -60px 0; } +.icon.geolocate { /* no-r2 */ background-position: -80px 0; } +.active .icon.geolocate { /* no-r2 */ background-position: -80px -20px; } +.icon.layers { /* no-r2 */ background-position: -100px 0; } +.icon.key { /* no-r2 */ background-position: -120px 0; } +.icon.share { /* no-r2 */ background-position: -140px 0; } +.icon.clipboard { /* no-r2 */ background-position: -160px 0; } +.icon.link { /* no-r2 */ background-position: -180px 0; } +.icon.close { /* no-r2 */ background-position: -200px 0; } .close-wrap:hover .icon.close, -.icon.close:hover { background-position: -200px -20px; } -.icon.check { background-position: -220px 0; } -.icon.note { background-position: -240px 0; } -.icon.note.grey { background-position: -240px -20px; } -.icon.query { background-position: -260px 0; } +.icon.close:hover { /* no-r2 */ background-position: -200px -20px; } +.icon.check { /* no-r2 */ background-position: -220px 0; } +.icon.note { /* no-r2 */ background-position: -240px 0; } +.icon.note.grey { /* no-r2 */ background-position: -240px -20px; } +.icon.query { /* no-r2 */ background-position: -260px 0; } /* Rules for links */ @@ -1214,9 +1214,8 @@ tr.turn:hover { } .warning { - margin: $lineheight/2 0; - padding: $lineheight/2; - font-size: 90%; + margin: 0 0 $lineheight/2 0; + padding: 0 $lineheight/2; } .note-comments li, .changeset-comments li { diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 5181280d9..9f909ea10 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -375,7 +375,7 @@ class AmfController < ApplicationController else begin # revert - timestamp = Time.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") + timestamp = Time.zone.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless old_way.nil? if old_way.visible @@ -508,14 +508,10 @@ class AmfController < ApplicationController rels = [] if searchterm.to_i > 0 rel = Relation.where(:id => searchterm.to_i).first - if rel && rel.visible - rels.push([rel.id, rel.tags, rel.members, rel.version]) - end + rels.push([rel.id, rel.tags, rel.members, rel.version]) if rel && rel.visible else RelationTag.where("v like ?", "%#{searchterm}%").limit(11).each do |t| - if t.relation.visible - rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version]) - end + rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version]) if t.relation.visible end end rels @@ -558,9 +554,7 @@ class AmfController < ApplicationController mid = renumberednodes[mid] if m[0] == "Node" mid = renumberedways[mid] if m[0] == "Way" end - if mid - typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")] - end + typedmembers << [m[0], mid, m[2].delete("\000-\037\ufffe\uffff", "^\011\012\015")] if mid end # assign new contents @@ -748,9 +742,7 @@ class AmfController < ApplicationController return [-4, "node", id] end - unless visible || node.ways.empty? - return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version - end + return -1, "Point #{id} has since become part of a way, so you cannot save it as a POI.", id, id, version unless visible || node.ways.empty? end # We always need a new node, based on the data that has been sent to us new_node = Node.new @@ -793,9 +785,7 @@ class AmfController < ApplicationController n = Node.where(:id => id).first if n v = n.version - unless timestamp == "" - n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first - end + n = OldNode.where("node_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless timestamp == "" end if n diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index c6cc3ba5f..f9b48cb1c 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -157,9 +157,7 @@ class ApiController < ApplicationController # - [0] in case some thing links to node 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this nodes_to_fetch = (list_of_way_nodes.uniq - node_ids) - [0] - unless nodes_to_fetch.empty? - nodes += Node.includes(:node_tags).find(nodes_to_fetch) - end + nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty? visible_nodes = {} changeset_cache = {} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index db5d086ec..a24df48e0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,9 +29,7 @@ class ApplicationController < ActionController::Base end end elsif session[:token] - if self.current_user = User.authenticate(:token => session[:token]) - session[:user] = current_user.id - end + session[:user] = current_user.id if self.current_user = User.authenticate(:token => session[:token]) end rescue StandardError => ex logger.info("Exception authorizing user: #{ex}") @@ -381,9 +379,7 @@ class ApplicationController < ActionController::Base ## # ensure that there is a "this_user" instance variable def lookup_this_user - unless @this_user = User.active.find_by(:display_name => params[:display_name]) - render_unknown_user params[:display_name] - end + render_unknown_user params[:display_name] unless @this_user = User.active.find_by(:display_name => params[:display_name]) end ## @@ -413,8 +409,8 @@ class ApplicationController < ActionController::Base def map_layout append_content_security_policy_directives( - :child_src => %w[127.0.0.1:8111 127.0.0.1:8112], - :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com], + :child_src => %w[127.0.0.1:8111], + :connect_src => %w[nominatim.openstreetmap.org overpass-api.de router.project-osrm.org], :form_action => %w[render.openstreetmap.org], :script_src => %w[graphhopper.com open.mapquestapi.com], :img_src => %w[developer.mapquest.com] @@ -469,9 +465,7 @@ class ApplicationController < ActionController::Base authdata = request.env["HTTP_AUTHORIZATION"].to_s.split end # only basic authentication supported - if authdata && authdata[0] == "Basic" - user, pass = Base64.decode64(authdata[1]).split(":", 2) - end + user, pass = Base64.decode64(authdata[1]).split(":", 2) if authdata && authdata[0] == "Basic" [user, pass] end diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 898afae4a..f294d23d5 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -7,12 +7,12 @@ class ChangesetController < ApplicationController skip_before_action :verify_authenticity_token, :except => [:list] before_action :authorize_web, :only => [:list, :feed, :comments_feed] before_action :set_locale, :only => [:list, :feed, :comments_feed] - before_action :authorize, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :authorize, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] before_action :require_moderator, :only => [:hide_comment, :unhide_comment] - before_action :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] - before_action :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close, :comment, :subscribe, :unsubscribe] - before_action :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] - before_action :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] + before_action :require_allow_write_api, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :require_public_data, :only => [:create, :update, :upload, :close, :comment, :subscribe, :unsubscribe] + before_action :check_api_writable, :only => [:create, :update, :upload, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] + before_action :check_api_readable, :except => [:create, :update, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] before_action(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) } around_action :api_call_handle_error, :except => [:list, :feed, :comments_feed] around_action :api_call_timeout, :except => [:list, :feed, :comments_feed, :upload] @@ -216,6 +216,12 @@ class ChangesetController < ApplicationController changesets = conditions_closed(changesets, params["closed"]) changesets = conditions_ids(changesets, params["changesets"]) + # sort and limit the changesets + changesets = changesets.order("created_at DESC").limit(100) + + # preload users, tags and comments + changesets = changesets.preload(:user, :changeset_tags, :comments) + # create the results document results = OSM::API.new.get_xml_doc @@ -290,9 +296,7 @@ class ChangesetController < ApplicationController changesets = changesets.where(:user_id => current_user.nearby) end - if @params[:max_id] - changesets = changesets.where("changesets.id <= ?", @params[:max_id]) - end + changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id] @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments) @@ -328,9 +332,7 @@ class ChangesetController < ApplicationController # Notify current subscribers of the new comment changeset.subscribers.visible.each do |user| - if current_user != user - Notifier.changeset_comment_notification(comment, user).deliver_now - end + Notifier.changeset_comment_notification(comment, user).deliver_now if current_user != user end # Add the commenter to the subscribers if necessary diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 9e0fd4991..6eb662bd8 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -65,9 +65,7 @@ class DiaryEntryController < ApplicationController # Notify current subscribers of the new comment @entry.subscribers.visible.each do |user| - if current_user != user - Notifier.diary_comment_notification(@diary_comment, user).deliver_now - end + Notifier.diary_comment_notification(@diary_comment, user).deliver_now if current_user != user end # Add the commenter to the subscribers if necessary diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 5d7ba9189..e9fa7f26a 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -87,7 +87,7 @@ class GeocoderController < ApplicationController @results = [] # ask geocoder.ca (note - they have a per-day limit) - response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") + response = fetch_xml("https://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") # parse the response if response.get_elements("geodata/error").empty? @@ -112,15 +112,13 @@ class GeocoderController < ApplicationController maxlat = params[:maxlat] # get view box - if minlon && minlat && maxlon && maxlat - viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" - end + viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" if minlon && minlat && maxlon && maxlat # get objects to excude exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude] # ask nominatim - response = fetch_xml("http:#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + response = fetch_xml("#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") # extract the results from the response results = response.elements["searchresults"] @@ -153,9 +151,7 @@ class GeocoderController < ApplicationController rank = (place.attributes["place_rank"].to_i + 1) / 2 prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name place.elements["extratags"].elements.each("tag") do |extratag| - if extratag.attributes["key"] == "place" - prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name - end + prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "place" end end prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name @@ -217,7 +213,7 @@ class GeocoderController < ApplicationController @results = [] # ask nominatim - response = fetch_xml("http:#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + 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| diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 29651bceb..20baf6bb4 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -40,9 +40,7 @@ class NodeController < ApplicationController node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - unless new_node && new_node.id == node.id - raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id node.update_from(new_node, current_user) render :plain => node.version.to_s @@ -55,24 +53,18 @@ class NodeController < ApplicationController node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - unless new_node && new_node.id == node.id - raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})" unless new_node && new_node.id == node.id node.delete_with_history!(new_node, current_user) render :plain => node.version.to_s end # Dump the details on many nodes whose ids are given in the "nodes" parameter. def nodes - unless params["nodes"] - raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" - end + raise OSM::APIBadUserInput, "The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]" unless params["nodes"] ids = params["nodes"].split(",").collect(&:to_i) - if ids.empty? - raise OSM::APIBadUserInput, "No nodes were given to search for" - end + raise OSM::APIBadUserInput, "No nodes were given to search for" if ids.empty? doc = OSM::API.new.get_xml_doc Node.find(ids).each do |node| diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb index 92f63e304..a51d70f90 100644 --- a/app/controllers/notes_controller.rb +++ b/app/controllers/notes_controller.rb @@ -350,9 +350,7 @@ class NotesController < ApplicationController comment = note.comments.create!(attributes) note.comments.map(&:author).uniq.each do |user| - if notify && user && user != current_user && user.visible? - Notifier.note_comment_notification(comment, user).deliver_now - end + Notifier.note_comment_notification(comment, user).deliver_now if notify && user && user != current_user && user.visible? end end end diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb index 734783a35..84bbcf185 100644 --- a/app/controllers/oauth_controller.rb +++ b/app/controllers/oauth_controller.rb @@ -63,9 +63,7 @@ class OauthController < ApplicationController "&oauth_token=#{@token.token}" end - unless @token.oauth10? - @redirect_url.query += "&oauth_verifier=#{@token.verifier}" - end + @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10? redirect_to @redirect_url.to_s end diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index 25532a95c..059fb8d7e 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -35,9 +35,7 @@ class RelationController < ApplicationController relation = Relation.find(params[:id]) new_relation = Relation.from_xml(request.raw_post) - unless new_relation && new_relation.id == relation.id - raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" unless new_relation && new_relation.id == relation.id relation.update_from new_relation, current_user render :plain => relation.version.to_s @@ -123,15 +121,11 @@ class RelationController < ApplicationController end def relations - unless params["relations"] - raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" - end + raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"] ids = params["relations"].split(",").collect(&:to_i) - if ids.empty? - raise OSM::APIBadUserInput, "No relations were given to search for" - end + raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty? doc = OSM::API.new.get_xml_doc diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 74dbc41f5..fa8ec5a1e 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -11,9 +11,7 @@ class SiteController < ApplicationController before_action :update_totp, :only => [:index] def index - unless STATUS == :database_readonly || STATUS == :database_offline - session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) - end + session[:location] ||= OSM.ip_location(request.env["REMOTE_ADDR"]) unless STATUS == :database_readonly || STATUS == :database_offline end def permalink @@ -147,9 +145,7 @@ class SiteController < ApplicationController def redirect_map_params anchor = [] - if params[:lat] && params[:lon] - anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" - end + anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}" if params[:lat] && params[:lon] if params[:layers] anchor << "layers=#{params.delete(:layers)}" @@ -157,8 +153,6 @@ class SiteController < ApplicationController anchor << "layers=N" end - if anchor.present? - redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) - end + redirect_to params.to_unsafe_h.merge(:anchor => anchor.join("&")) if anchor.present? end end diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 105405ccf..a720c5fff 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -119,9 +119,7 @@ class TraceController < ApplicationController if @trace.id flash[:notice] = t "trace.create.trace_uploaded" - if current_user.traces.where(:inserted => false).count > 4 - flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count - end + flash[:warning] = t "trace.trace_header.traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4 redirect_to :action => :list, :display_name => current_user.display_name end @@ -176,9 +174,7 @@ class TraceController < ApplicationController @trace.description = params[:trace][:description] @trace.tagstring = params[:trace][:tagstring] @trace.visibility = params[:trace][:visibility] - if @trace.save - redirect_to :action => "view", :display_name => current_user.display_name - end + redirect_to :action => "view", :display_name => current_user.display_name if @trace.save end end rescue ActiveRecord::RecordNotFound @@ -205,9 +201,7 @@ class TraceController < ApplicationController def georss @traces = Trace.visible_to_all.visible - if params[:display_name] - @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) - end + @traces = @traces.joins(:user).where(:users => { :display_name => params[:display_name] }) if params[:display_name] @traces = @traces.tagged(params[:tag]) if params[:tag] @traces = @traces.order("timestamp DESC") diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 5c41a79dc..0c3ad0b05 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -45,9 +45,7 @@ class UserController < ApplicationController if current_user current_user.terms_seen = true - if current_user.save - flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe - end + flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save if params[:referer] redirect_to params[:referer] @@ -533,9 +531,7 @@ class UserController < ApplicationController session[:new_user].auth_provider = provider session[:new_user].auth_uid = uid - if email_verified && email == session[:new_user].email - session[:new_user].status = "active" - end + session[:new_user].status = "active" if email_verified && email == session[:new_user].email redirect_to :action => "terms" else diff --git a/app/controllers/user_roles_controller.rb b/app/controllers/user_roles_controller.rb index 536790dc5..5ef68216b 100644 --- a/app/controllers/user_roles_controller.rb +++ b/app/controllers/user_roles_controller.rb @@ -15,7 +15,12 @@ class UserRolesController < ApplicationController end def revoke - UserRole.where(:user_id => @this_user.id, :role => @role).delete_all + # checks that administrator role is not revoked from current user + if current_user == @this_user && @role == "administrator" + flash[:error] = t("user_role.filter.not_revoke_admin_current_user") + else + UserRole.where(:user_id => @this_user.id, :role => @role).delete_all + end redirect_to :controller => "user", :action => "view", :display_name => @this_user.display_name end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a330eb5f9..adcf5c6c0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -40,9 +40,7 @@ module ApplicationHelper end def if_user(user, tag = :div, &block) - if user - content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") - end + content_tag(tag, capture(&block), :class => "hidden show_if_user_#{user.id}") if user end def unless_user(user, tag = :div, &block) @@ -110,9 +108,7 @@ module ApplicationHelper if current_user data[:user] = current_user.id.to_json - unless current_user.home_lon.nil? || current_user.home_lat.nil? - data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } - end + data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil? end data[:location] = session[:location] if session[:location] diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index c4ce41b06..b90e27f85 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -8,18 +8,14 @@ module BrowseHelper object.id end name = t "printable_name.with_id", :id => id.to_s - if version - name = t "printable_name.with_version", :id => name, :version => object.version.to_s - end + name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version # don't look at object tags if redacted, so as to avoid giving # away redacted version tag information. unless object.redacted? locale = I18n.locale.to_s - while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}") - locale = locale.sub(/-[^-]+/, "") - end + locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}") if object.tags.include? "name:#{locale}" name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s), :id => content_tag(:bdi, name) @@ -115,9 +111,9 @@ module BrowseHelper lookup_us = lookup.tr(" ", "_") if page = WIKI_PAGES.dig(locale, type, lookup_us) - url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" + url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" elsif page = WIKI_PAGES.dig("en", type, lookup_us) - url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" + url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}" end url @@ -158,7 +154,7 @@ module BrowseHelper end { - :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}", + :url => "https://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}", :title => value + section } end diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 37d26e0a7..2ec26ecee 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -238,7 +238,7 @@ class Changeset < ActiveRecord::Base bbox.to_unscaled.add_bounds_to(el1, "_") if bbox.complete? - el1["comments_count"] = comments.count.to_s + el1["comments_count"] = comments.length.to_s if include_discussion el2 = XML::Node.new("discussion") diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 67b86417a..c95ffc322 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -68,7 +68,7 @@ class ClientApplication < ActiveRecord::Base end def oauth_server - @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL) + @oauth_server ||= OAuth::Server.new("https://" + SERVER_URL) end def credentials diff --git a/app/models/relation.rb b/app/models/relation.rb index 157794cd6..2495830ee 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -182,9 +182,7 @@ class Relation < ActiveRecord::Base end def delete_with_history!(new_relation, user) - unless visible - raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) - end + raise OSM::APIAlreadyDeletedError.new("relation", new_relation.id) unless visible # need to start the transaction here, so that the database can # provide repeatable reads for the used-by checks. this means it @@ -208,9 +206,7 @@ class Relation < ActiveRecord::Base Relation.transaction do lock! check_consistency(self, new_relation, user) - unless new_relation.preconditions_ok?(members) - raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot update relation #{id}: data or member data is invalid." unless new_relation.preconditions_ok?(members) self.changeset_id = new_relation.changeset_id self.changeset = new_relation.changeset self.tags = new_relation.tags @@ -222,9 +218,7 @@ class Relation < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - unless preconditions_ok? - raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot create relation: data or member data is invalid." unless preconditions_ok? self.version = 0 self.visible = true save_with_history! @@ -259,9 +253,7 @@ class Relation < ActiveRecord::Base element = model.lock("for share").find_by(:id => m[1]) # and check that it is OK to use. - unless element && element.visible? && element.preconditions_ok? - raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" - end + raise OSM::APIPreconditionFailedError, "Relation with id #{id} cannot be saved due to #{m[0]} with id #{m[1]}" unless element && element.visible? && element.preconditions_ok? hash[m[1]] = true end diff --git a/app/models/user.rb b/app/models/user.rb index 7a8414ec0..9eeb98290 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -277,9 +277,7 @@ class User < ActiveRecord::Base ## # perform a spam check on a user def spam_check - if status == "active" && spam_score > SPAM_THRESHOLD - update(:status => "suspended") - end + update(:status => "suspended") if status == "active" && spam_score > SPAM_THRESHOLD end ## diff --git a/app/models/way.rb b/app/models/way.rb index 1954f744c..e5b73ceaa 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -120,14 +120,10 @@ class Way < ActiveRecord::Base way_nodes.each do |nd| if visible_nodes # if there is a list of visible nodes then use that to weed out deleted nodes - if visible_nodes[nd.node_id] - ordered_nodes[nd.sequence_id] = nd.node_id.to_s - end + ordered_nodes[nd.sequence_id] = nd.node_id.to_s if visible_nodes[nd.node_id] else # otherwise, manually go to the db to check things - if nd.node && nd.node.visible? - ordered_nodes[nd.sequence_id] = nd.node_id.to_s - end + ordered_nodes[nd.sequence_id] = nd.node_id.to_s if nd.node && nd.node.visible? end end @@ -184,9 +180,7 @@ class Way < ActiveRecord::Base Way.transaction do lock! check_consistency(self, new_way, user) - unless new_way.preconditions_ok?(nds) - raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot update way #{id}: data is invalid." unless new_way.preconditions_ok?(nds) self.changeset_id = new_way.changeset_id self.changeset = new_way.changeset @@ -199,9 +193,7 @@ class Way < ActiveRecord::Base def create_with_history(user) check_create_consistency(self, user) - unless preconditions_ok? - raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." - end + raise OSM::APIPreconditionFailedError, "Cannot create way: data is invalid." unless preconditions_ok? self.version = 0 self.visible = true save_with_history! @@ -209,9 +201,7 @@ class Way < ActiveRecord::Base def preconditions_ok?(old_nodes = []) return false if nds.empty? - if nds.length > MAX_NUMBER_OF_WAY_NODES - raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) - end + raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) if nds.length > MAX_NUMBER_OF_WAY_NODES # check only the new nodes, for efficiency - old nodes having been checked last time and can't # be deleted when they're in-use. diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 86d190680..6a3e85680 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -72,6 +72,10 @@ + <% else %> +
+ <%= t('browse.changeset.still_open') %> +
<% end %> <% unless @ways.empty? %> diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb index 49922494e..f6518daf2 100644 --- a/app/views/browse/new_note.html.erb +++ b/app/views/browse/new_note.html.erb @@ -10,7 +10,7 @@
- +
diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder index a3b7a2240..86dd966cc 100644 --- a/app/views/changeset/list.atom.builder +++ b/app/views/changeset/list.atom.builder @@ -9,7 +9,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, feed.logo image_url("mag_map-rss2.0.png") feed.rights :type => "xhtml" do |xhtml| - xhtml.a :href => "http://creativecommons.org/licenses/by-sa/2.0/" do |a| + xhtml.a :href => "https://creativecommons.org/licenses/by-sa/2.0/" do |a| a.img :src => image_url("cc_button.png"), :alt => "CC by-sa 2.0" end end diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 9bed9d274..534ff13c0 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -44,9 +44,9 @@

<%= t 'layouts.intro_text' %>

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.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"), + :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"), :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

<%= t('layouts.learn_more') %> diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb index 80dbc6079..f88d9316c 100644 --- a/app/views/oauth_clients/index.html.erb +++ b/app/views/oauth_clients/index.html.erb @@ -24,7 +24,7 @@ <% end %>

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

<% if @client_applications.empty? %> -

<%= raw(t('oauth_clients.index.no_apps', :oauth => "OAuth")) %>

+

<%= raw(t('oauth_clients.index.no_apps', :oauth => "OAuth")) %>

<% else %>

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

<% @client_applications.each do |client|%> @@ -33,4 +33,4 @@ <% end %> <% end %> <% end %> -

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

\ No newline at end of file +

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

diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb index ebc1877f3..0c8075c6e 100644 --- a/app/views/site/about.html.erb +++ b/app/views/site/about.html.erb @@ -33,9 +33,9 @@

<%= t "about_page.partners_title" %>

<%= t 'layouts.partners_html', - :ucl => link_to(t('layouts.partners_ucl'), "http://www.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"), + :ucl => link_to(t('layouts.partners_ucl'), "https://www.ucl.ac.uk"), + :ic => link_to(t('layouts.partners_ic'), "https://www.imperial.ac.uk/"), + :bytemark => link_to(t('layouts.partners_bytemark'), "https://www.bytemark.co.uk"), :partners => link_to(t('layouts.partners_partners'), "https://hardware.openstreetmap.org/thanks/") %>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index 128db5992..bf5376fb5 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -38,19 +38,16 @@
-
<%= t'export.start.too_large.overpass.title' %>
+
<%= 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.title' %>
<%= t'export.start.too_large.planet.description' %>
-
<%= t'export.start.too_large.geofabrik.title' %>
+
<%= 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.title' %>
<%= t'export.start.too_large.other.description' %>
<% end %> diff --git a/app/views/user/api_read.builder b/app/views/user/api_read.builder index 0e8bfa5ef..fe5af4bcf 100644 --- a/app/views/user/api_read.builder +++ b/app/views/user/api_read.builder @@ -10,9 +10,7 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do else xml.tag! "contributor-terms", :agreed => @this_user.terms_agreed.present? end - if @this_user.image.file? || @this_user.image_use_gravatar - xml.tag! "img", :href => user_image_url(@this_user, :size => 256) - end + xml.tag! "img", :href => user_image_url(@this_user, :size => 256) if @this_user.image.file? || @this_user.image_use_gravatar xml.tag! "roles" do @this_user.roles.each do |role| xml.tag! role.role diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 3d8cb22f7..13fad8840 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -46,8 +46,8 @@

<%= 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' %> + :summary => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', + :translations => 'https://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>

diff --git a/config/application.rb b/config/application.rb index 02dd1d2b2..9ba122daf 100644 --- a/config/application.rb +++ b/config/application.rb @@ -34,9 +34,7 @@ module OpenStreetMap config.paths["app/models"].skip_eager_load! if STATUS == :database_offline # Use memcached for caching if required - if defined?(MEMCACHE_SERVERS) - config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } - end + config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" } if defined?(MEMCACHE_SERVERS) # Use logstash for logging if required if defined?(LOGSTASH_PATH) diff --git a/config/banners.yml b/config/banners.yml index ce53c3f02..8cc7be5f0 100644 --- a/config/banners.yml +++ b/config/banners.yml @@ -1,18 +1,12 @@ -sotmasia2017: - id: sotmasia2017 - alt: State of the Map Asia 2017 - link: http://stateofthemap.asia/ - img: banners/sotmasia-2017-banner.png - enddate: 2017-sep-25 -sotmus2017: - id: sotmus2017 - alt: State of the Map US 2017 - link: https://2017.stateofthemap.us/ - img: banners/banner-sotmus2017.png - enddate: 2017-oct-20 -osmfmembership2017: - id: osmfmembership2017 - alt: Join the OpenStreetMap Foundation - link: https://blog.openstreetmap.org/2017/09/25/join-the-openstreetmap-foundation-now-and-help-shape-the-future-of-the-project/ - img: banners/osmf-membership-drive-2017.png - enddate: 2017-nov-11 +fossgis2018: + id: fossgis2018 + alt: FOSSGIS Conference 2018 + link: https://fossgis-konferenz.de/2018/ + img: banners/fossgis2018.png + enddate: 2018-mar-24 +osmit2018: + id: osmit2018 + alt: FOSS4G-IT 2018 + link: http://foss4g-it2018.gfoss.it/ + img: banners/foss4g-it2018-banner.png + enddate: 2018-feb-22 diff --git a/config/environments/development.rb b/config/environments/development.rb index 8e7213a9d..97226480c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -35,9 +35,7 @@ Rails.application.configure do config.active_support.deprecation = :log # Raise an error on page load if there are pending migrations. - unless STATUS == :database_offline - config.active_record.migration_error = :page_load - end + config.active_record.migration_error = :page_load unless STATUS == :database_offline # Debug mode disables concatenation and preprocessing of assets. # This option may cause significant delays in view rendering with a large diff --git a/config/environments/production.rb b/config/environments/production.rb index c4c98ad48..56bd22881 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -93,9 +93,7 @@ Rails.application.configure do end # Do not dump schema after migrations. - unless STATUS == :database_offline - config.active_record.dump_schema_after_migration = false - end + config.active_record.dump_schema_after_migration = false unless STATUS == :database_offline # Enable autoloading of dependencies. config.enable_dependency_loading = true diff --git a/config/example.application.yml b/config/example.application.yml index 5c60ccd16..1e78084cc 100644 --- a/config/example.application.yml +++ b/config/example.application.yml @@ -74,7 +74,7 @@ defaults: &defaults # Enable legacy OAuth 1.0 support oauth_10_support: true # URL of Nominatim instance to use for geocoding - nominatim_url: "//nominatim.openstreetmap.org/" + nominatim_url: "https://nominatim.openstreetmap.org/" # Default editor default_editor: "id" # OAuth consumer key for Potlatch 2 @@ -97,12 +97,11 @@ defaults: &defaults # Blacklist here - ".*\\.here\\.com[/:].*" # URL of Overpass instance to use for feature queries - overpass_url: "//overpass-api.de/api/interpreter" + overpass_url: "https://overpass-api.de/api/interpreter" # Routing endpoints - graphhopper_url: "//graphhopper.com/api/1/route" - mapquest_directions_url: "//open.mapquestapi.com/directions/v2/route" - mapzen_valhalla_url: "//valhalla.mapzen.com/route" - osrm_url: "//router.project-osrm.org/route/v1/driving/" + graphhopper_url: "https://graphhopper.com/api/1/route" + mapquest_directions_url: "https://open.mapquestapi.com/directions/v2/route" + osrm_url: "https://router.project-osrm.org/route/v1/driving/" # External authentication credentials #google_auth_id: "" #google_auth_secret: "" @@ -117,8 +116,6 @@ defaults: &defaults #wikipedia_auth_secret: "" # MapQuest authentication details #mapquest_key: "" - # Mapzen authentication details - #mapzen_valhalla_key: "" # Thunderforest authentication details #thunderforest_key: "" # Key for generating TOTP tokens diff --git a/config/image_optim.yml b/config/image_optim.yml index 29ee6d838..9100cd7f5 100644 --- a/config/image_optim.yml +++ b/config/image_optim.yml @@ -1,12 +1,4 @@ skip_missing_workers: true pngout: false -pngcrush: false -advpng: false -optipng: false -pngquant: false -jhead: false -jpegoptim: false -gifsicle: false -jpegtran: false svgo: disable_plugins: ["cleanupIDs", "removeUnknownsAndDefaults"] diff --git a/config/initializers/compressed_requests.rb b/config/initializers/compressed_requests.rb new file mode 100644 index 000000000..c6a84a103 --- /dev/null +++ b/config/initializers/compressed_requests.rb @@ -0,0 +1,42 @@ +module OpenStreetMap + class CompressedRequests + def initialize(app) + @app = app + end + + def method_handled?(env) + %w[POST PUT].include? env["REQUEST_METHOD"] + end + + def encoding_handled?(env) + %w[gzip deflate].include? env["HTTP_CONTENT_ENCODING"] + end + + def call(env) + if method_handled?(env) && encoding_handled?(env) + extracted = decode(env["rack.input"], env["HTTP_CONTENT_ENCODING"]) + + env.delete("HTTP_CONTENT_ENCODING") + env["CONTENT_LENGTH"] = extracted.bytesize + env["rack.input"] = StringIO.new(extracted) + end + + if env["HTTP_CONTENT_ENCODING"] + [415, {}, []] + else + @app.call(env) + end + end + + def decode(input, content_encoding) + input.rewind + + case content_encoding + when "gzip" then Zlib::GzipReader.new(input).read + when "deflate" then Zlib::Inflate.inflate(input.read) + end + end + end +end + +Rails.configuration.middleware.use OpenStreetMap::CompressedRequests diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index 320c1db2c..2bd558d2f 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -7,9 +7,7 @@ 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 + headers["Cache-Control"] = "no-cache" if headers["Access-Control-Allow-Origin"] [status, headers, body] end end @@ -25,5 +23,8 @@ Rails.configuration.middleware.use OpenStreetMap::Cors do origins "*" resource "/oauth/*", :headers => :any, :methods => [:get, :post] resource "/api/*", :headers => :any, :methods => [:get, :post, :put, :delete] + resource "/diary/rss", :headers => :any, :methods => [:get] + resource "/diary/*/rss", :headers => :any, :methods => [:get] + resource "/user/*/diary/rss", :headers => :any, :methods => [:get] end end diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index 3b4f06a2e..421ca2bf9 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -47,6 +47,25 @@ module OpenStreetMap end end end + + module OAuthFilter + def oauth1_verify(request, options = {}, &block) + signature = OAuth::Signature.build(request, options, &block) + return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp) + value = signature.verify + if request.ssl? && !value + http_request = request.dup + http_request.define_singleton_method(:scheme) { "http" } + http_request.define_singleton_method(:port) { 80 } + signature = OAuth::Signature.build(http_request, options, &block) + value = signature.verify + end + value + rescue OAuth::Signature::UnknownSignatureMethod + false + end + end end OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController) +OAuth::Rack::OAuthFilter.prepend(OpenStreetMap::OAuthFilter) diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 180469bfc..7e499c0e6 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -26,9 +26,7 @@ windowslive_options = { :name => "windowslive", :scope => "wl.signin,wl.emails" github_options = { :name => "github", :scope => "user:email" } wikipedia_options = { :name => "wikipedia", :client_options => { :site => "https://meta.wikimedia.org" } } -if defined?(GOOGLE_OPENID_REALM) - google_options[:openid_realm] = GOOGLE_OPENID_REALM -end +google_options[:openid_realm] = GOOGLE_OPENID_REALM if defined?(GOOGLE_OPENID_REALM) Rails.application.config.middleware.use OmniAuth::Builder do provider :openid, openid_options diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb index f30a4b86c..b0b45aa13 100644 --- a/config/initializers/secure_headers.rb +++ b/config/initializers/secure_headers.rb @@ -27,7 +27,7 @@ cookie_policy = { } SecureHeaders::Configuration.default do |config| - config.hsts = "max-age=0" + config.hsts = SecureHeaders::OPT_OUT config.csp = SecureHeaders::OPT_OUT config.csp_report_only = csp_policy config.cookies = cookie_policy diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 8a0fd8f03..a9c735d62 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -2,8 +2,6 @@ if defined?(MEMCACHE_SERVERS) Rails.application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session" -elsif Rails.application.config.cache_store != :null_store - Rails.application.config.session_store :cache_store, :key => "_osm_session" else - Rails.application.config.session_store :cookie_store, :key => "_osm_session" + Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new end diff --git a/config/locales/af.yml b/config/locales/af.yml index c0989fcfc..2da4b90fc 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -400,33 +400,26 @@ af: crematorium: Krematorium dentist: Tandarts doctors: Dokters - dormitory: Studentehuis drinking_water: Drinkwater driving_school: Bestuurskool embassy: Ambassade - emergency_phone: Noodtelefoon fast_food: Wegneemetes ferry_terminal: Pontterminaal - fire_hydrant: Brandkraan fire_station: Brandweerstasie food_court: Kosarea fountain: Fontein fuel: Brandstof gambling: Dobbelary grave_yard: Begraafplaas - gym: Fiksheidsentrum / Gim - health_centre: Gesondheidsentrum hospital: Hospitaal hunting_stand: Jagtoring ice_cream: Roomys kindergarten: Kleuterskool library: Biblioteek - market: Mark marketplace: Markplein monastery: Monnikeklooster motorcycle_parking: Motorfietsparkering nightclub: Nagklub - nursery: Kleuterskool nursing_home: Verpleging- en versorgingshuis office: Kantoor parking: Parkering @@ -440,7 +433,6 @@ af: prison: Tronk pub: Kroeg public_building: Openbare Gebou - reception_area: Ontvangsarea recycling: Herwinningspunt restaurant: Restaurant retirement_home: Ouetehuis @@ -530,7 +522,6 @@ af: trunk: Hoofroete trunk_link: Hoofroete unclassified: Ongeklassifiseerde pad - unsurfaced: Grondpad "yes": Straat historic: archaeological_site: Argeologiese werf @@ -590,7 +581,6 @@ af: leisure: beach_resort: Strandoord bird_hide: Voëlkykhuisie - club: Klub dog_park: Hondepark fishing: Visvanggebied fitness_centre: Fiksheidsentrum @@ -678,8 +668,6 @@ af: "yes": Kantoor place: allotments: Toekennings - block: Blokkeer - airport: Lughawe city: Stad country: Land county: Distrik @@ -691,7 +679,6 @@ af: islet: Eilandjie isolated_dwelling: Geïsoleerde woning locality: Ligging - moor: Vleiland municipality: Munisipaliteit neighbourhood: Woonbuurt postcode: Poskode @@ -708,10 +695,8 @@ af: abandoned: Verlate Spoorweg construction: Spoor in aanbou disused: Spoorweg in onbruik - disused_station: Spoorwegstasie in onbruik funicular: Kabelspoorweg halt: Treinhalte - historic_station: Historiese spoorwegstasie junction: Spoorwegkruising level_crossing: Spooroorgang light_rail: Ligte spoor @@ -772,7 +757,6 @@ af: hairdresser: Haarkapper hardware: Hardewarewinkel hifi: Hoëtrou - insurance: Versekering jewelry: Juwelierswinkel kiosk: Kiosk laundry: Wassery @@ -788,10 +772,8 @@ af: pet: Troeteldierwinkel pharmacy: Apteek photo: Fotowinkel - salon: Skoonheidssalon second_hand: Tweedehandswinkel shoes: Skoenwinkel - shopping_centre: Winkelsentrum sports: Sportwinkel stationery: Skryfbehoeftewinkel supermarket: Supermark @@ -1599,8 +1581,6 @@ af: mapquest_bicycle: Fiets (MapQuest) mapquest_car: Kar (MapQuest) osrm_car: Kar (OSRM) - mapzen_bicycle: Fiets (Mapzen) - mapzen_car: Motor (Mapzen) time: Tyd query: node: Knooppunt diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 6d8730d99..23ab08ead 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -271,29 +271,22 @@ aln: crematorium: Krematorium dentist: Mjeku i dhomve doctors: Mjekët - dormitory: Konvikt drinking_water: Pirja e ujit driving_school: Auto shkollë embassy: Ambasada - emergency_phone: Urgjencës Phone fast_food: Ushqim I shpejtë ferry_terminal: Terminali i Trageteve - fire_hydrant: Zjarri hydrant fire_station: Zjarrëfiksat fountain: Burim fuel: Lëndë djegëse grave_yard: Varrezë - gym: Qendra Kalitje fizike / palestër - health_centre: Qendër e Shëndetësore hospital: Spital hunting_stand: Gjuetia Stand ice_cream: Akullore kindergarten: Kopshti i fëmijëve library: Bibliotekë - market: Treg marketplace: Treg nightclub: Night Club - nursery: Fidanishte nursing_home: shtëpi pleqsh office: Zyrë parking: Parking @@ -306,7 +299,6 @@ aln: prison: Burg pub: Pijetore public_building: Publike Ndërtimi - reception_area: Zona e pritjes recycling: Pika riciklimit restaurant: Restorant retirement_home: Daljes në pension Home @@ -363,7 +355,6 @@ aln: trunk: rrugën kryesore trunk_link: rrugën kryesore unclassified: Paklasifikuara Road - unsurfaced: Rrugë pa sipërfaqe historic: archaeological_site: Arkeologjik Faqes battlefield: Fushë beteje @@ -463,7 +454,6 @@ aln: wetland: Lagunat wood: Dru place: - airport: Aeroport city: Qyteti country: Veni county: Qark @@ -474,7 +464,6 @@ aln: island: Ishull islet: Ishull locality: Lokalitet - moor: Knete municipality: Komuna postcode: Post kodi region: Regjioni @@ -489,10 +478,8 @@ aln: abandoned: Braktisur hekurudhave construction: Hekurudhave në ndërtim disused: Hekurudhave papërdorur - disused_station: Stacioni hekurudhor Historike funicular: Me litar hekurudhave halt: Trajnimi Stop - historic_station: Stacioni hekurudhor Historike junction: Hekurudhave kryqëzim level_crossing: Kalim në nivel light_rail: hekurudhor Lehta @@ -550,7 +537,6 @@ aln: hairdresser: Floktar hardware: dyqan mjet hifi: dyqan hi-fi - insurance: Sigurim jewelry: Bizhuteri Shop kiosk: kiosk laundry: Lavanderi @@ -565,9 +551,7 @@ aln: outdoor: dyqan në natyrë pet: Shitore e kafshëve photo: dyqan fotografik - salon: Sallon shoes: dyqan këpucësh - shopping_centre: Qendra tregtare sports: Sport Dyqani stationery: dyqan shkrimi supermarket: Supermarket diff --git a/config/locales/ar.yml b/config/locales/ar.yml index a0dfc880c..3e66d93f0 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -455,33 +455,26 @@ ar: crematorium: محرقة جثث dentist: طبيب أسنان doctors: أطباء - dormitory: عنبر نوم drinking_water: مياه عذبة driving_school: مدرسة تعليم قيادة embassy: سفارة - emergency_phone: هاتف طوارئ fast_food: وجبات سريعة ferry_terminal: مرسى عبّارة - fire_hydrant: مواد مكافحة حرائق fire_station: فوج إطفاء food_court: مطعم وجبات سريعة fountain: نافورة fuel: وقود gambling: مقامرة grave_yard: مقبرة - gym: مركز للرشاقة/الرياضة - health_centre: مركز صحي hospital: مستشفى hunting_stand: مربط للصيد ice_cream: مثلجات kindergarten: حضانة أطفال library: مكتبة - market: سوق marketplace: سوق monastery: دير motorcycle_parking: مرآب دراجات نارية nightclub: نادي ليلي - nursery: رعاية تمريضية nursing_home: دار رعاية مسنين/معاقين office: مكتب parking: موقف سيارات @@ -495,7 +488,6 @@ ar: prison: سجن pub: حانة public_building: مبنى عام - reception_area: منطقة استقبال recycling: نقطة إعادة تصنيع restaurant: مطعم retirement_home: بيت مسنين @@ -591,7 +583,6 @@ ar: trunk: طريق رئيسي trunk_link: طريق رئيسي unclassified: طريق غير مصنّف - unsurfaced: طريق غير معبد "yes": طريق historic: archaeological_site: موقع أثري @@ -619,6 +610,7 @@ ar: wayside_cross: صليب تذكاري wayside_shrine: مزار جانب طريق wreck: حطام + "yes": موقع تاريخي junction: "yes": تقاطع landuse: @@ -656,7 +648,6 @@ ar: leisure: beach_resort: شاطئ منتجع bird_hide: مخبئ طيور - club: نادي common: أرض مشاع dog_park: حديقة كلاب fishing: منطقة صيد سمك @@ -749,8 +740,6 @@ ar: "yes": مكتب place: allotments: المخصصات - block: حظر - airport: مطار city: مدينة country: دولة county: مقاطعة @@ -762,7 +751,6 @@ ar: islet: جزيرة صغيرة isolated_dwelling: سكن منعزل locality: محلة - moor: أرض جرداء municipality: البلدية neighbourhood: حي postcode: الرمز البريدي @@ -779,10 +767,8 @@ ar: abandoned: سكة حديد مهجورة construction: سكة حديدية تحت الإنشاء disused: سكة حديد مهجورة - disused_station: محطة سكة حديدية مهجورة funicular: سكة حديدية معلقة halt: موقف قطار - historic_station: محطة سكة حديد تاريخية junction: تقاطع سكك حديدية level_crossing: تقاطع سكك حديدية light_rail: قطار خفيف @@ -846,7 +832,6 @@ ar: hairdresser: مزين/مصفف شعر hardware: متجر عتاد hifi: متجر هاي فاي - insurance: بوليصات تأمين jewelry: متجر مجوهرات kiosk: كشك laundry: مصبغة @@ -862,10 +847,8 @@ ar: pet: متجر حيوانات أليفة pharmacy: صيدلية photo: متجر صور - salon: صالون second_hand: متجر أغراض مستعملة shoes: متجر أحذية - shopping_centre: مركز التسوق sports: متجر رياضة stationery: محل قرطاسية supermarket: سوبرماركت @@ -1057,6 +1040,7 @@ ar: beginners_guide: url: http://wiki.openstreetmap.org/wiki/Ar:Beginners%27_guide title: دليل المبتدئين + description: دليل من المجتمع للمبتدئين. help: url: https://help.openstreetmap.org/ title: help.openstreetmap.org @@ -1623,6 +1607,9 @@ ar: github: title: تسجيل الدخول بجيثب alt: تسجيل الدخول باستخدام حساب جيثب + wikipedia: + title: تسجيل الدخول عبر ويكيبيديا + alt: سجل الدخول باستخدام حساب ويكيبيديا yahoo: title: تسجيل الدخول بياهو alt: تسجيل الدخول ب Yahoo OpenID @@ -2130,9 +2117,6 @@ ar: mapquest_car: سيارة (MapQuest) mapquest_foot: قدم (MapQuest) osrm_car: سيارة (OSRM) - mapzen_bicycle: دراجة (Mapzen) - mapzen_car: سيارة (Mapzen) - mapzen_foot: قدم (Mapzen) directions: الاتجاهات distance: المسافات errors: diff --git a/config/locales/arz.yml b/config/locales/arz.yml index a32b4ecb8..3079aa99e 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -242,29 +242,22 @@ arz: crematorium: محرقه جثث dentist: طبيب أسنان doctors: أطباء - dormitory: عنبر نوم drinking_water: مياه عذبة driving_school: مدرسه تعليم قيادة embassy: سفارة - emergency_phone: هاتف طوارئ fast_food: وجبات سريعة ferry_terminal: مرسى عبّارة - fire_hydrant: مواد مكافحه حرائق fire_station: فوج إطفاء fountain: نافورة fuel: وقود grave_yard: مقبرة - gym: مركز للرشاقة/الرياضة - health_centre: مركز صحي hospital: مستشفى hunting_stand: مربط للصيد ice_cream: مثلجات kindergarten: حضانه أطفال library: مكتبة - market: سوق marketplace: سوق nightclub: نادى ليلي - nursery: رعايه تمريضية nursing_home: دار رعايه مسنين/معاقين office: مكتب parking: موقف سيارات @@ -277,7 +270,6 @@ arz: prison: سجن pub: حانة public_building: مبنى عام - reception_area: منطقه استقبال recycling: نقطه إعاده تصنيع restaurant: مطعم sauna: حمّام بخارى حار @@ -329,7 +321,6 @@ arz: trunk: طريق رئيسي trunk_link: طريق رئيسي unclassified: طريق غير مصنّف - unsurfaced: طريق غير معبد historic: archaeological_site: موقع أثري battlefield: ساحه معركة @@ -422,7 +413,6 @@ arz: wetland: أرض رطبة wood: حرج place: - airport: مطار city: مدينة country: دولة county: مقاطعة @@ -433,7 +423,6 @@ arz: island: جزيرة islet: جزيره صغيرة locality: محلة - moor: أرض جرداء municipality: بلدية postcode: الرمز البريدي region: منطقة @@ -447,9 +436,7 @@ arz: abandoned: سكه حديد مهجورة construction: سكه حديديه تحت الإنشاء disused: سكه حديد مهجورة - disused_station: محطه سكه حديد مهجورة halt: موقف قطار - historic_station: محطه سكه حديد تاريخية junction: تقاطع سكك حديدية level_crossing: تقاطع سكك حديدية monorail: قطار ذات سكه حديد واحدة @@ -495,7 +482,6 @@ arz: grocery: بقالة hairdresser: مزين/مصفف شعر hardware: متجر عتاد - insurance: بوليسات تأمين jewelry: متجر مجوهرات kiosk: كشك laundry: مصبغة @@ -510,9 +496,7 @@ arz: outdoor: متجر للنشاطات الخارجية pet: متجر حيوانات أليفة photo: متجر صور - salon: صالون shoes: متجر أحذية - shopping_centre: مركز التسوق sports: متجر رياضة stationery: محل قرطاسية supermarket: سوبرماركت diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 24e334d08..6b32747cd 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -2,6 +2,7 @@ # Exported from translatewiki.net # Export driver: phpyaml # Author: Enolp +# Author: Fitoschido # Author: Macofe # Author: Xuacu --- @@ -129,6 +130,8 @@ ast: title_comment: Conxuntu de cambeos %{id} - %{comment} join_discussion: Anicia sesión pa xunite al alderique discussion: Alderique + still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en + zarrando'l conxuntu de cambios. node: title: 'Nuedu: %{name}' history_title: 'Historial del nuedu: %{name}' @@ -337,7 +340,7 @@ ast: map_image: Imaxe del mapa (amuesa la capa estándar) embeddable_html: HTML pa embrivir licence: Llicencia - export_details: Los datos d'OpenStreetMap tan llicenciaos baxo la llicencia + export_details: Los datos d'OpenStreetMap tan llicenciaos baxo la llicencia Open Data Commons Open Database (ODbL). too_large: advice: 'Si falla la esportación anterior, considera utilizar una de les fontes @@ -378,14 +381,14 @@ ast: geocoder: search: title: - latlon: Resultaos internos + latlon: Resultaos internos uk_postcode: Resultaos de NPEMap / FreeThe Postcode - ca_postcode: Resultaos de Geocoder.CA - osm_nominatim: Resultaos de OpenStreetMap + ca_postcode: Resultaos de Geocoder.CA + osm_nominatim: Resultaos de OpenStreetMap Nominatim geonames: Resultaos de GeoNames - osm_nominatim_reverse: Resultaos de OpenStreetMap + osm_nominatim_reverse: Resultaos de OpenStreetMap Nominatim geonames_reverse: Resultaos de GeoNames search_osm_nominatim: @@ -395,12 +398,19 @@ ast: chair_lift: Telesilla drag_lift: Telesquí gondola: Telecabina + platter: Telesquí + pylon: Poste station: Estación de cable + t-bar: Remonte de barra en T aeroway: aerodrome: Aeródromu + airstrip: Campu d'aviación apron: Aparcaderu d'aviones gate: Puerta + hangar: Hangar helipad: Helipuertu + holding_position: Posición d'espera + parking_position: Posición d'aparcamientu runway: Pista taxiway: Cai de rodaxe terminal: Terminal @@ -435,37 +445,32 @@ ast: crematorium: Crematoriu dentist: Dentista doctors: Médicos - dormitory: Residencia drinking_water: Agua potable driving_school: Autoescuela embassy: Embaxada - emergency_phone: Teléfonu d'emerxencia fast_food: Comida rápida ferry_terminal: Terminal de ferry - fire_hydrant: Boca d'incendios fire_station: Bomberos food_court: Zona de restoranes fountain: Fonte fuel: Combustible gambling: Xuegos d'azar grave_yard: Cementeriu - gym: Ximnasiu - health_centre: Centru de salú + grit_bin: Caxa d'arenón con sal hospital: Hospital hunting_stand: Puestu de caza ice_cream: Xelaos kindergarten: Xardín d'infancia library: Biblioteca - market: Mercáu marketplace: Mercáu monastery: Monasteriu motorcycle_parking: Aparcamientu pa motocicletes nightclub: Sala de fiestes - nursery: Guardería nursing_home: Residencia asistida office: Oficina parking: Aparcamientu parking_entrance: Entrada d'aparcamientu + parking_space: Plaza d'aparcamientu pharmacy: Farmacia place_of_worship: Llugar de cultu police: Policía @@ -475,7 +480,6 @@ ast: prison: Cárcel pub: Pub public_building: Edificiu públicu - reception_area: Área de recepción recycling: Puntu llimpiu restaurant: Restorán retirement_home: Residencia de xubilaos @@ -500,6 +504,7 @@ ast: village_hall: Sala polivalente waste_basket: Papelera waste_disposal: Contenedor pa basories + water_point: Toma d'agua youth_centre: Centru de mocedá boundary: administrative: Llende alministrativa @@ -508,6 +513,7 @@ ast: protected_area: Área protexida bridge: aqueduct: Acueductu + boardwalk: Camín de tables suspension: Ponte colgante swing: Ponte xiratoria viaduct: Viaductu @@ -527,25 +533,31 @@ ast: "yes": Tienda d'artesanía emergency: ambulance_station: Base d'ambulancies + assembly_point: Puntu de xuntanza defibrillator: Desfibrilador landing_site: Llugar de aterrizaxe d'emerxencia phone: Teléfonu d'emerxencia + water_tank: Depósitu d'agua pa emerxencies + "yes": Emerxencia highway: abandoned: Estrada abandonada bridleway: Caleya bus_guideway: Carril bus con guía bus_stop: Parada d'autobús construction: Estrada en construcción + corridor: Pasiellu cycleway: Pista pa bicicletes elevator: Ascensor emergency_access_point: Accesu d'emerxencia footway: Senderu ford: Vau + give_way: Señal de dexar pasu living_street: Rúa residencial milestone: Moyón motorway: Autoestrada motorway_junction: Encruz d'autoestrada motorway_link: Enllaz d'autovía + passing_place: Apartaderu p'adelantamientu path: Camín pedestrian: Camín peonil platform: Andén @@ -562,6 +574,7 @@ ast: services: Área de serviciu speed_camera: Radar steps: Escaleres + stop: Señal de stop street_lamp: Farola tertiary: Estrada terciaria tertiary_link: Estrada terciaria @@ -570,8 +583,8 @@ ast: trail: Senderu trunk: Estrada nacional trunk_link: Estrada nacional + turning_loop: Carril pa dar vuelta unclassified: Estrada ensin clasificar - unsurfaced: Estrada ensin asfaltar "yes": Estrada historic: archaeological_site: Xacimientu arqueolóxicu @@ -590,6 +603,7 @@ ast: manor: Casona memorial: Memorial mine: Mina + mine_shaft: Pozu mineru monument: Monumentu roman_road: Via romana ruins: Ruines @@ -599,6 +613,7 @@ ast: wayside_cross: Cruceru wayside_shrine: Santuariu de camín wreck: Naufraxu + "yes": Sitiu históricu junction: "yes": Interseición landuse: @@ -636,9 +651,9 @@ ast: leisure: beach_resort: Complexu playeru bird_hide: Observatoriu d'aves - club: Club common: Terrén común dog_park: Parque pa perros + firepit: Pozu pa fogueres fishing: Área de pesca fitness_centre: Ximnasiu (fitness) fitness_station: Ximnasiu @@ -663,15 +678,46 @@ ast: water_park: Parque acuáticu "yes": Folganza man_made: + adit: Socavón + beacon: Baliza + beehive: Colmena + breakwater: Rompeoles + bridge: Ponte + bunker_silo: Búnquer + chimney: Chimenea + crane: Grúa + dolphin: Poste d'amarre + dyke: Dique + embankment: Terremplén + flagpole: Asta + gasometer: Gasómetru + groyne: Espigón + kiln: Kiln lighthouse: Faru + mast: Mástil + mine: Mina + mineshaft: Pozu mineru + monitoring_station: Estación de control + petroleum_well: Pozu petrolíferu + pier: Muelle pipeline: Tubería + silo: Silu + storage_tank: Depósitu + surveillance: Vixilancia tower: Torre + wastewater_plant: Planta depuradora + watermill: Molín d'agua + water_tower: Depósitu d'agua eleváu + water_well: Pozu + water_works: Captación d'agua potable + windmill: Molín de vientu works: Fábrica "yes": Artificial military: airfield: Aeródromu militar barracks: Cuartel bunker: Bunker + "yes": Militar mountain_pass: "yes": Puertu de montaña natural: @@ -717,11 +763,14 @@ ast: accountant: Contable administrative: Alministración architect: Arquitectu + association: Asociación company: Empresa + educational_institution: Institución educativa employment_agency: Oficina d'emplegu estate_agent: Axencia inmobiliaria government: Oficina gubernamental insurance: Axencia de seguros + it: Oficina de Teunoloxíes de la información lawyer: Abogáu ngo: Oficina d'ONG telecommunication: Oficina de telecomunicaciones @@ -729,9 +778,8 @@ ast: "yes": Oficina place: allotments: Güertos recreativos - block: Bloque - airport: Aeropuertu city: Ciudá + city_block: Mazana de cases country: País county: Condáu farm: Casería @@ -742,12 +790,12 @@ ast: islet: Castru de mar isolated_dwelling: Vivienda aisllada locality: Llocalidá - moor: Granda municipality: Conceyu neighbourhood: Barriu postcode: Códigu postal region: Rexón sea: Mar + square: Plaza state: Estáu o provincia subdivision: Subdivisión suburb: Suburbiu @@ -759,10 +807,8 @@ ast: abandoned: Ferrocarril abandonáu construction: Ferrocarril en construcción disused: Ferrocarril ensin usu - disused_station: Estación de ferrocarril ensin usu funicular: Tren funicular halt: Parada de tren - historic_station: Estación de ferrocarril históricu junction: Encruz ferroviariu level_crossing: Pasu a nivel light_rail: Ferrocarril llixeru @@ -788,6 +834,7 @@ ast: beauty: Cuidaos corporales beverages: Venta de bébores bicycle: Tienda de bicicletes + bookmaker: Casa d'apuestes books: Llibrería boutique: Boutique butcher: Carnicería @@ -826,12 +873,16 @@ ast: hairdresser: Peluquería hardware: Ferretería hifi: Hi-Fi - insurance: Seguros + houseware: Tienda de cacía + interior_decoration: Decoración d'interiores jewelry: Xoyería kiosk: Quioscu + kitchen: Venta de cocines laundry: Llavandería + lottery: Llotería mall: Centru comercial market: Mercáu + massage: Masaxe mobile_phone: Tienda de telefonía móvil motorcycle: Venta de motos music: Tienda de música @@ -839,21 +890,27 @@ ast: optician: Óptica organic: Comida ecolóxica outdoor: Deportes d'aire llibre + paint: Tienda de pinturea + pawnbroker: Casa d'empeños pet: Tienda d'animales pharmacy: Farmacia photo: Fotografía - salon: Cuidaos corporales + seafood: Mariscos second_hand: Tienda d'oxetos usaos shoes: Zapatería - shopping_centre: Centru comercial sports: Tienda de deportes stationery: Papelería supermarket: Supermercáu tailor: Sastrería + ticket: Venta d'entraes + tobacco: Estancu toys: Xuguetería travel_agency: Axencia de viaxes + tyres: Neumáticos + vacant: Tienda zarrada + variety_store: Tienda de too a 100 video: Videu club - wine: Venta de llicores + wine: Vinatería "yes": Tienda tourism: alpine_hut: Refuxu de monte @@ -877,6 +934,7 @@ ast: viewpoint: Mirador zoo: Zoo tunnel: + building_passage: Pasu per edificiu culvert: Cañu "yes": Túnel waterway: @@ -908,7 +966,7 @@ ast: level10: Frontera de barriu description: title: - osm_nominatim: Llugar según OpenStreetMap + osm_nominatim: Llugar según OpenStreetMap Nominatim geonames: Llugar según GeoNames types: @@ -984,21 +1042,21 @@ ast: title_html: Drechos d'autor y llicencia intro_1_html: |- OpenStreetMap® son datos abiertos, baxo llicencia Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) de la Fundación OpenStreetMap (OSMF). + href="https://osmfoundation.org/">Fundación OpenStreetMap (OSMF). intro_2_html: Puedes copiar, distribuir, tresmitir y adautar los nuesos datos de mou llibre, mentanto deas reconocimientu a OpenStreetMap y a los sos collaboradores. Si camudes o crees conteníu sobre los nuesos datos, namái podrás distribuir - el resultáu baxo la mesma llicencia. El códigu + 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). + tán llicenciaos baxo la llicencia Creative + Commons Reconocimientu-CompartirIgual 2.0 (CC BY-SA). credit_title_html: Cómo dar reconocimientu a OpenStreetMap credit_1_html: Riquimos qu'uses el créditu “© Collaboradores d'OpenStreetMap”. credit_2_html: |- - Tamién tienes de 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. + Tamién tienes de 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. Puedes facelo enllazando a esta páxina de drechos d'autor. Alternativamente, y como requisitu si distribues OSM en forma de datos, pues nomar y enllazar direutamente a les llicencies. En medios onde los enllaces nun seyan posibles (por exemplu, obres imprentaes), suxerímoste 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. @@ -1008,9 +1066,8 @@ ast: title: Exemplu de reconocimientu more_title_html: Pa saber más more_1_html: |- - Llei más tocante a cómo utilizar los nuesos datos, y cómo acreditanos, na páxina de la Llicencia OSMF y nes Entrugues y rempuestes llegales (n'inglés) de la comunidá. + Llei más tocante a cómo utilizar los nuesos datos, y cómo danos créditu, na páxina de Llicencia de la OSMF. more_2_html: |- Anque OpenStreetMap son datos abiertos, nun podemos ufrir una API de mapes de baldre pa desendolcadores d'aplicaciones pa terceros. Llei la nuesa Política d'usu de la API (n'inglés), @@ -1022,10 +1079,10 @@ ast: d''otres fontes, ente elles:' contributors_at_html: |- Austria: Contien datos de - Stadt Wien (baxo - CC BY), - Land Vorarlberg y - Land Tirol (baxo CC-BY AT con enmiendes). + Stadt Wien (baxo + CC BY), + Land Vorarlberg y + Land Tirol (baxo CC BY AT con enmiendes). contributors_ca_html: |- Canadá: Contien datos de GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural @@ -1033,12 +1090,12 @@ ast: Statistics Canada). contributors_fi_html: |- Finlandia: Contien datos de la base de datos topográfica de la National Land Survey de Finlandia - y otros conxuntos de datos, baxo la Llicencia NLSFI. + y otros conxuntos de datos, baxo la Llicencia NLSFI. contributors_fr_html: 'Francia: Contien datos sacaos de Direction Générale des Impôts.' contributors_nl_html: |- - Holanda: Contien datos © AND, 2007 - (www.and.com) + Paises Baxos: Contien datos © AND, 2007 + (www.and.com) contributors_nz_html: 'Nueva Zelanda: Contien datos sacaos de Land Information New Zealand. Crown Copyright reserved.' contributors_si_html: |- @@ -1055,7 +1112,7 @@ ast: contributors_footer_1_html: |- Pa más detalles d'estes, y otres fontes que s'usaron p'ayudar a ameyorar OpenStreetMap, por favor, llei la Páxina + href="https://wiki.openstreetmap.org/wiki/Contributors">Páxina de 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 @@ -1067,14 +1124,14 @@ ast: 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 + procedimientu de retirada de datos o pidilo direutamente nel nuesu formulariu en llinia. trademarks_title_html: Marques rexistraes - trademarks_1_html: OpenStreetMap ,el logotipu de la lente y Estáu del Mapa son - marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues tocante - al usu de les marques, mándales al grupu - de trabayu sobro llicencies. + trademarks_1_html: OpenStreetMap, el logotipu de la lente y «State of the Map» + son marques rexistraes de la Fundación OpenStreetMap. Si tienes entrugues + tocante al usu de les marques, consulta la nuesa política + de marques rexistraes. welcome_page: title: ¡Afáyate! introduction_html: |- @@ -1108,8 +1165,8 @@ ast: paragraph_1_html: OpenStreetMap tien poques regles formales, pero esperamos que tolos participantes collaboren y se comuniquen cola comunidá. Si tas considerando cualquier actividá distinta de la edición manual, llei y sigui les instrucciones - sobro importaciones - y ediciones + sobro importaciones + y ediciones automatizaes. questions: title: ¿Tien alguna entruga? @@ -1144,7 +1201,7 @@ ast: title: Otres preocupaciones explanation_html: |- Si tienes dalguna preocupación tocante a cómo tan usándose los nuesos datos o tocante al conteníu, consulta la - páxina de drechos d'autor pa más información llegal, o comunícate col grupu de trabayu de la OSMF afayadizu. + páxina de drechos d'autor pa más información llegal, o comunícate col grupu de trabayu de la OSMF afayadizu. help_page: title: Algamar ayuda introduction: OpenStreetMap tien dellos recursos p'aprender sobro'l proyeutu, @@ -1155,7 +1212,7 @@ ast: title: Bienveníos a OSM description: Principie con esta guía rápida que cubre lo básico d'OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Ast:Beginners%27_guide title: Guía del principiante description: Guía pa principiantes, mantenida pola comunidá. help: @@ -1180,7 +1237,7 @@ ast: description: Ayuda pa les empreses y organizaciones que cambien a mapes y otros servicios, basaos n'OpenStreetMap. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/wiki/Ast:Main_Page title: wiki.openstreetmap.org description: Mirar na wiki la documentación d'OSM más a fondu. about_page: @@ -1197,11 +1254,12 @@ ast: qu'OSM ye precisu y ta anováu. community_driven_title: Dirixíu pola comunidá community_driven_html: |- - La comunidá d'OpenStreetMap ye diversa, apasionada, y medra caldía. + La comunidá d'OpenStreetMap ye variada, apasionada, y medra caldía. Ente los 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. - Pa saber más tocante a la comunidá, ver los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. + Pa saber más tocante a la comunidá, ver el + Blog d'OpenStreetMap, los diarios d'usuarios, los blogs de la comunidá, y la páxina web de la Fundación OSM. open_data_title: Datos abiertos open_data_html: |- OpenStreetMap son datos abiertos: tienes la llibertá d'usalos pa cualquier @@ -1211,13 +1269,15 @@ ast: pa más detalles. legal_title: Llegal legal_html: "Esti sitiu y munchos otros servicios rellacionaos xestiónalos formalmente - la \nFundación OpenStreetMap (OSMF) - \nnel nome de la comunidá. L'usu de tolos servicios remanaos pola OSMF tán suxetos - a les nueses polítiques - d'usu aceptable y la nuesa política - de privacidá\n
\nComunícate - cola OSMF \nsi tienes entrugues o problemes relativos a les llicencies, - drechos d'autor u otru tema llegal." + la \nFundación OpenStreetMap (OSMF) + \nnel nome de la comunidá. L'usu de tolos servicios alministraos pola OSMF tán + suxetos a les nueses polítiques + d'usu aceptable y la nuesa política + de privacidá\n
\nComunícate + cola OSMF \nsi tienes entrugues relativos a les llicencies, drechos d'autor + u otru tema llegal.\n
\nOpenStreetMap, el logo de la lente y «Estáu del mapa» + son marques + rexistraes de la OSMF." partners_title: Asociaos notifier: diary_comment_notification: @@ -1419,13 +1479,13 @@ ast: user_page_link: páxina d'usuariu 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 + Flash d'OpenStreetMap. Puedes descargar + el reproductor Flash d'Adobe.com. Tamién hai disponibles otres opciones pa editar OpenStreetMap. potlatch_unsaved_changes: Tienes cambios ensin guardar. (Pa guardalos en Potlatch, tienes de deseleicionar la vía o puntu actual si tas editando en vivo, o calcar nel botón guardar si apaez esi botón). - potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 + potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 pa más información potlatch2_unsaved_changes: Tienes cambios ensin guardar. (Pa guardar en Potlatch 2, tienes de calcar en guardar). @@ -1441,7 +1501,7 @@ ast: get_directions_title: Alcuentra indicaciones ente dos puntos from: Dende to: A - where_am_i: ¿Ú toi? + where_am_i: ¿Ú esto? where_am_i_title: Describi el to allugamientu actual usando el motor de gueta submit_text: Dir key: @@ -1518,7 +1578,7 @@ ast: edit: Editar preview: Vista previa markdown_help: - title_html: Analizáu con Markdown + title_html: Analizáu con Markdown headings: Cabeceres heading: Cabecera subheading: Cabecera secundaria @@ -1627,7 +1687,7 @@ ast: description: Ver les xubes más nueves de traces GPS tagged_with: ' etiquetaes con %{tags}' 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 + traza o depriende más tocante a cómo trazar col GPS na páxina de la wiki. delete: scheduled_for_deletion: Traza marcada pa desaniciar @@ -1837,11 +1897,11 @@ ast:

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

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

- license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los términos + license_agreement: Cuando confirmes la to cuenta tendrás d'aceutar los términos de collaboración. email address: 'Direición de corréu electrónicu:' confirm email address: 'Confirmar direición de corréu:' - not displayed publicly: La to direición nun s'amuesa en público, ver la política de protección de datos pa más información display name: 'Nome a amosar:' @@ -1961,23 +2021,23 @@ ast: email never displayed publicly: (nunca s'amuesa en público) external auth: 'Autenticación esterna:' openid: - link: http://wiki.openstreetmap.org/wiki/OpenID + link: https://wiki.openstreetmap.org/wiki/OpenID link text: ¿qué ye esto? public editing: heading: 'Ediciones públiques:' enabled: Activaes. Nun yes anónimu y puedes editar los datos. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: ¿qué ye esto? disabled: Desactivaes y nun puedes editar los datos; toles ediciones anteriores son anónimes. disabled link text: ¿por qué nun puedo editar? public editing note: heading: Edición pública - text: Anguaño, les tos ediciones son anónimes y la xente nun te pue unviar + text: Anguaño, les tos ediciones son anónimes y la xente nun puede unviate mensaxes o ver la to llocalización. P'amosar lo qu'editasti y permitir que - la xente se ponga en contautu contigo pela páxina web, calca nel botón qu'apaez - abaxo. Dende'l cambiu al API 0.6, sólo los usuarios públicos pueden editar - los datos del mapa (por + la xente se ponga en contautu contigo pela páxina web, pulsia nel botón + qu'apaez abaxo. Dende'l cambiu al API 0.6, sólo los usuarios públicos + pueden editar los datos del mapa (por estes razones). @@ -2109,6 +2169,8 @@ ast: not_a_role: La cadena «%{role}» nun ye un rol válidu. already_has_role: L'usuariu yá tien el rol %{role}. doesnt_have_role: L'usuariu nun tien el rol %{role}. + not_revoke_admin_current_user: Nun pudo quitase'l rol d'alministrador al usuariu + actual. grant: title: Confirmar dar rol heading: Confirmar dar rol @@ -2329,8 +2391,10 @@ ast: new: intro: ¿Alcontrasti un error o falta daqué? Informa a otros mapeadores pa que podamos igualo. Mueve'l marcador a la posición correuta y escribi una - nota pa esplicar el problema. (Por favor, nun escribas información personal - o información de mapes con drechos d'autor o de llistes de teléfonos). + nota pa esplicar el problema. + advice: La nota ye pública y puede usase p'anovar el mapa, de mou que nun + escribas información personal, o información de mapes con drechos d'autor + o llistes de teléfonos). add: Amestar nota show: anonymous_warning: Esta nota incluye comentarios d'usuarios anónimos que tendríen @@ -2351,9 +2415,6 @@ ast: mapquest_car: Coche (MapQuest) mapquest_foot: A pie (MapQuest) osrm_car: En coche (OSRM) - mapzen_bicycle: En bicicleta (Mapzen) - mapzen_car: En coche (Mapzen) - mapzen_foot: A pie (Mapzen) descend: Descender directions: Indicaciones distance: Distancia diff --git a/config/locales/az.yml b/config/locales/az.yml index e819673e5..947e481a1 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -309,30 +309,23 @@ az: 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 - health_centre: Sağlamlıq mərkəzi hospital: Qospital hunting_stand: Ov stendi ice_cream: Dondurma kindergarten: Uşaq bağçası library: Kitabxana - market: Market marketplace: Bazar meydanı nightclub: Gecə klubu - nursery: Pansionat nursing_home: Qocalar evi office: Ofis parking: Dayanacaq @@ -345,7 +338,6 @@ az: prison: Həbsxana pub: Pivəxana public_building: Ä°ctimai Binalar - reception_area: Qəbul sahəsi recycling: Utilizasiya yeri restaurant: Restoran retirement_home: Qocalar Evi @@ -418,7 +410,6 @@ az: 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ı @@ -546,7 +537,6 @@ az: travel_agent: Səyahət Agentliyi "yes": Ofislər place: - airport: Aeroport city: Şəhər country: Ölkə county: Ölkə @@ -558,7 +548,6 @@ az: 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ə @@ -573,10 +562,8 @@ az: 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 @@ -636,7 +623,6 @@ az: 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 @@ -651,9 +637,7 @@ az: 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 diff --git a/config/locales/ba.yml b/config/locales/ba.yml new file mode 100644 index 000000000..f1bcdafb6 --- /dev/null +++ b/config/locales/ba.yml @@ -0,0 +1,679 @@ +# Messages for Bashkir (башҡортса) +# Exported from translatewiki.net +# Export driver: phpyaml +# Author: AiseluRB +# Author: Lizalizaufa +# Author: Roustammr +# Author: Sagan +# Author: Visem +# Author: Азат Хәлилов +# Author: Айсар +# Author: З. ӘЙЛЕ +# Author: Ләйсән +# Author: Рустам Нурыев +# Author: Янмурза Баки +--- +ba: + time: + formats: + friendly: '%e %B %Y cәғәт %H:%M' + activerecord: + 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: Һыҙат тегы + attributes: + diary_comment: + body: Текст + diary_entry: + user: Ҡулланыусы + title: Тема + latitude: Киңлек + longitude: Оҙонлоҡ + language: Тел + friend: + user: Ҡулланыусы + friend: Дуҫ + trace: + user: Ҡатнашыусы + visible: Күренеш + name: Атама + size: Күләм + latitude: Киңлек + longitude: Оҙонлоҡ + public: Дөйөм + description: Тасуирлау + message: + sender: Ебәреүсе + title: Тема + body: Текст + recipient: Алыусы + user: + email: Электрон почта адресы + active: Әүҙем + display_name: Сағылдырылған исем + description: Тасуирлау + languages: Телдәр + pass_crypt: Серһүҙ + editor: + default: Һайланмаған (ҡуйылған %{name}) + potlatch: + name: Potlatch 1 + description: Potlatch 1 (браузерҙағы мөхәррир) + id: + name: iD + description: iD (браузерҙағы мөхәррир) + potlatch2: + name: Potlatch 2 + description: Potlatch 2 (браузерҙағы мөхәррир) + remote: + name: Ситтән тороп идара итеү + description: Ситтән тороп идара итеү (JOSM йәки Merkaartor) + browse: + created: Булдырылған + closed: Ябыҡ + created_html: Булдырылған %{time} кирегә + closed_html: Ябылған %{time} кирегә + created_by_html: Төҙәтелгән %{time} кирегә ҡулланыусы + тарафынан %{user} + deleted_by_html: Ябылған %{time} кирегәҡулланыусы + тарафынан%{user} + edited_by_html: Төҙәтелгән %{time} кирегә ҡулланыусы + тарафынан %{user} + closed_by_html: Ябылған %{time} кирегәҡулланыусы + тарафынан%{user} + version: Версия + in_changeset: Төҙәтеүҙәр пакеты + anonymous: Аноним + no_comment: (комментарий юҡ) + part_of: Ҡатнаша + download_xml: ' XML-ды күсереү' + view_history: Тарихты ҡарау + view_details: Ентекләберәк + location: 'Географик урын:' + changeset: + title: 'Төҙәтеүҙәр пакеты: %{id}' + belongs_to: Автор + node: Нөктәләр (%{count}) + node_paginated: Нөктәләр (%{x}-%{y} из %{count}) + way: Һыҙыҡтар (%{count}) + way_paginated: Юлдар (%{x}-%{y} %{графа}һынан) + relation: Мөнәсәбәттәр (%{count}) + relation_paginated: Бәйләнештәр (%{x}-%{y} %{графа}нан) + comment: Комментарийҙар (%{count}) + hidden_commented_by: ' %{user} %{when}тан йәшерен + комментарий, кирегә' + commented_by: Ҡулланыусы комментарийы %{user} %{when} + кирегә + changesetxml: Төҙәтеүҙәр пакетының XML-ы + osmchangexml: osmChange XML + feed: + title: 'Төҙәтеүҙәр пакеты: %{id}' + title_comment: Төҙәтеүҙәр пакеты %{id} — %{comment} + join_discussion: Фекер алышыуға ҡушылыу өсөн системаға инегеҙ + discussion: Фекер алышыу + node: + title: 'Нөктә: %{name}' + history_title: 'Нөктә тарихы: %{name}' + way: + title: 'Һыҙат: %{name}' + history_title: 'Һыҙат тарихы: %{name}' + nodes: Нөктәләр + also_part_of: + one: һыҙатта бар %{related_ways} + other: һыҙаттарҙа бар %{related_ways} + relation: + title: 'Мөнәсәбәт: %{name}' + history_title: 'Мөнәсәбәт тарихы: %{name}' + members: Ҡатнашыусылар + relation_member: + entry_role: '%{type} %{name} ролендә %{role}' + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + containing_relation: + entry: Мөнәсәбәт %{relation_name} + entry_role: Мөнәсәбәт %{relation_name} (ролендә %{relation_role}) + not_found: + sorry: 'Үкенескә ҡаршы, %{type} #%{id} табылманы.' + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + changeset: Төҙәтеүҙәр пакеты + note: Иҫкәрмә + timeout: + sorry: Ғәфү итегеҙ, %{id}-тағы %{type} өсөн мәғлүмәттәр күсереү өсөн бик оҙон. + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + changeset: Төҙәтеүҙәр пакеты + note: Иҫкәрмә + redacted: + redaction: ' %{id} редакцияһы' + message_html: Был объекттың версияһы %{version} %{type}-нан алынған һәм күрһәтелә + алмай. Өҫтәмә мәғлүмәт өсөн %{redaction_link} ҡарағыҙ. + type: + node: Нөктә + way: Һыҙат + relation: Мөнәсәбәт + start_rjs: + feature_warning: Объекттарҙың %{num_features}-ын күсереп алыу мотлаҡ, был брауҙерығыҙҙы + яйлатыуы мөмкин. Ошо мәғлүмәттәрҙе ысынлап та ҡарарға теләйһегеҙме? + load_data: Мәғлүмәттәрҙе күсерергә + tag_details: + tags: Тегтар + wiki_link: + key: ' %{key} тегы битен һүрәтләүсе вики бите' + tag: ' %{key}=%{value} тегы битен һүрәтләүсе вики бите' + wikidata_link: Викимәғлүмәттәрҙәге %{page} элементы + wikipedia_link: ' Википедиялағы %{page} мәҡәләһе' + telephone_link: Шылтыратырға %{phone_number} + note: + title: ' %{id} искәрмәһе' + new_note: Яңы мәҡәлә + description: Тасуирлама + open_title: 'Эшкәртелмәгән мәҡәлә #%{note_name}' + closed_title: 'Эшкәртелгән мәҡәләа #%{note_name}' + hidden_title: 'Йәшерелгән яҙма #%{note_name}' + open_by: Ҡулланыусы тарафынан булдырылған %{user} %{when} + кирегә + open_by_anonymous: Аноним тарафынан булдырылған %{when} + кирегә + commented_by: Ҡулланыусы комментарийы %{user} %{when} + кирегә + commented_by_anonymous: Аноним комментарийы %{when} + кирегә + closed_by: Ҡулланыусы тарафынан эшкәртелгән %{user} %{when} + кирегә + closed_by_anonymous: Аноним тарафынан рөхсәт ителгән %{when} + кирегә + reopened_by: Ҡулланыусы тарафынан ҡабаттан асылған %{user} %{when} + кирегә + reopened_by_anonymous: Аноним тарафынан ҡабаттан асылған %{when} + кирегә + hidden_by: Йәшерелгән %{user} %{when} кирегә + query: + title: Объекттар тураһында мәғлүмәт + introduction: Яҡындағы объекттарҙы табыу өсөн картаға баҫығыҙ + nearby: Яҡындағы объекттар + enclosing: Урыны + changeset: + changeset_paging_nav: + showing_page: ' %{page} бите' + next: Киләһе » + previous: Алдағы + changeset: + anonymous: Аноним + no_edits: (төҙәтеүҙәр юҡ) + view_changeset_details: Төҙәтеүҙәр пакетының тәфсирен ҡарап сығырға + changesets: + id: ID + saved_at: Тамамланған + user: Ҡулланыусы + comment: Комментарий + area: Өлкә + list: + title: Төҙәтеүҙәр пакеты + title_user: ' %{user} ҡулланыусыһының төҙәтеүҙәр пакеты' + title_friend: Дуҫтарығыҙҙың төҙәтеүҙәре пакеты + title_nearby: Эргәләге ҡатнашыусыларҙың төҙәтеүҙәре пакеты + empty: Төҙәтеүҙәр пакеты табылманы + empty_area: Был өлкәлә төҙәтеүҙәр пакеты юҡ + empty_user: Был ҡулланыусының төҙәтеүҙәре пакеы юҡ + no_more: Башҡаса бер ниндәй ҙә төҙәтеүҙәр пакеты табылманы + no_more_area: Был өлкәлә башҡа төҙәтеүҙәр пакеты юҡ + no_more_user: Был ҡулланыусының башҡа төҙәтеүҙәре пакеы юҡ + load_more: Тағы ла күсерергә + timeout: + sorry: Үкенескә күрә, һеҙ һораған төҙәтеүҙәр пакеты исемлеге күсереү өсөн бик + оҙон + rss: + title_all: OpenStreetMap төҙәтеүҙәр пакеты буйынса фекерләшеү + title_particular: ' OpenStreetMap #%{changeset_id} төҙәтеүҙәр пакеты буйынса + фекерләшеү' + commented_at_html: Яңыртылған%{}элек + commented_at_by_html: Яңыртылған%{}элек %{ҡулланыусы}тарафынан + full: Бөтөн фекерләшеү + diary_entry: + new: + title: Яңы көндәлеккә инеү + publish_button: Баҫтырырға + list: + title: Көндәлектәр + title_friends: Дуҫтарың көндәлектәре + title_nearby: Йәнәш ҡатнашыусылар көндәлеге + user_title: '%{ҡулланыусы} көндәлеге' + in_language_title: Көндәлектәге яҙмалар %{телдә} + new_title: Көндәлегеңә яңы яҙма яҙ + no_entries: Көндәлектә яңы яҙма юҡ + recent_entries: Һуңғы яҙмалар + older_entries: Иҫкерәк яҙмалар + newer_entries: Яңыраҡ яҙмалар + edit: + title: Яҙманы мөхәррирләү + body: Нигеҙ текст + language: 'Тел:' + latitude: Географик киңлек + longitude: Географик оҙонлоҡ + use_map_link: картаны ҡуллан + save_button: Һаҡларға + marker_text: Көндәлек яҙыу урыны + view: + title: '%{ҡулланыусы}ның көндәлеге|%{титул}' + user_title: '%{ҡулланыусы}ның көндәлеге' + leave_a_comment: Фекер ҡалдыр + login_to_leave_a_comment: Фекер яҙыу өсөн %{login_link} + no_such_entry: + title: Бындай көндәлек яҙыуы юҡ + heading: '%{id} шәхси яҙыуына инеп булмай' + body: Ҡыҙғанысҡа ҡаршы, %{id}шәхси яҙыуы йәки фекере табылманы. Дөрөҫ яҙылышын + тикшер. Яңылыш ссылкаға күскәнһең, ахыры. + diary_entry: + posted_by: Ебәрҙем%{link_user}%{created}, тел:%{language_link} + comment_link: Фекереңде яҙ + reply_link: Инеүеңде раҫла + comment_count: + other: нуль=фекерҙәр юҡ + edit_link: Был яҙманы үҙгәрт + hide_link: Был яҙманы йәшер + diary_comment: + comment_from: '%{link_user}тарафынан%{comment_created_at}көндө ҡаралған' + hide_link: Был фекерҙе йәшереү + feed: + user: + title: '%{user}өсөн OpenStreetMap көндәлеге яҙмаһы' + description: '%{user}өсөн OpenStreetMap көндәлек яҙмаһының һуңғыһы' + language: + title: '%{language_name} OpenStreetMap көндәлек яҙмаһы' + description: OpenStreetMap ҡулланыусыларының %{language_name}тағы һуңғы яҙмалары + all: + title: OpenStreetMap көндәлек яҙмаһы + description: OpenStreetMap ҡулланысыларының һуңғы көндәлек яҙмалары + comments: + has_commented_on: '%{display_name} әле генә көндәлектең ошо яҙмаһына фекер + яҙҙы' + post: Йәшереү + when: ҡасан + ago: '%{ago}элек' + newer_comments: Яңыраҡ фекерҙәр + older_comments: Иҫкерәк фекерҙәр + export: + title: Сығарырға + start: + area_to_export: Сығарыу яланы + manually_select: Башҡа өлкәне ҡулдан һайларға + format_to_export: Сығарыу форматы + osm_xml_data: Биремдең OpenStreetMap XML форматы + map_image: Карта һүрәте (стандарт ҡатламды күрһәтә) + embeddable_html: Ҡуйылған HTML + licence: Лицензия + too_large: + planet: + title: OSM планетаһы + max: макс. + image_size: Һүрәт ҙурлығы + add_marker: Картаға билдә ҡуйыу + latitude: 'Киңлек:' + longitude: 'Оҙонлоҡ:' + paste_html: Сайтҡа индереп ҡуйыу өсөн HTML-код + geocoder: + search: + title: + latlon: |2- + + эсендәге һөҙөмтәләр + uk_postcode: NPEMap / FreeThe Postcodeһөҙөмтәләре + ca_postcode: NPEMap / FreeThe Postcodeалынған + һөҙөмтәләр + osm_nominatim: OpenStreetMap + Nominatimнан сыҡҡан һөҙөмтәләр + geonames: GeoNamesнан сыҡҡан һөҙөмтәләр + osm_nominatim_reverse: OpenStreetMap + Nominatimнан һөҙөмтәләр + geonames_reverse: GeoNamesнан сыҡҡан + һөҙөмтәләр + search_osm_nominatim: + prefix: + aerialway: + cable_car: Канат юлы + chair_lift: Креслолы канат күтәргесе + drag_lift: Якорлы (бугеллы) күтәргес + gondola: Канат юлы + station: Канат күтәргесе станцияһы + aeroway: + aerodrome: Аэродром + apron: Перрон + gate: Ҡапҡа (аэропорт) + helipad: Вертолет майҙансығы + runway: Осоу-ултырыу юлы + taxiway: Рулләү юлы + terminal: Терминал + amenity: + animal_shelter: Хайуандар приюты + arts_centre: Сәнғәт йорто + atm: Банкомат + bank: Банк + bar: Бар + bbq: Барбекю + bench: Эскәмйә + bicycle_parking: Велопарковка + bicycle_rental: Велосипед прокаты + biergarten: Асыҡ һауалағы һырахана + boat_rental: Прокатҡа кәмәләр + brothel: Фәхешхана + bureau_de_change: Валюта алмаштырыу + bus_station: Автобус станцияһы + cafe: Кафе + car_rental: Автомобиль арендалау + car_sharing: Автомобилдәрҙе аралаш ҡулланыу + car_wash: Авто-йыуыу + casino: Казино + charging_station: Автомобилдәрҙе зарядлау станцияһы + childcare: Бала ҡарау хеҙмәте + cinema: Кинотеатр + clinic: Поликлиника + clock: Сәғәт + college: Колледж + community_centre: Йәмәғәти үҙәк + courthouse: Суд бинаһы + crematorium: Крематорий + dentist: Стоматология + doctors: Табибтар + drinking_water: Эсәр һыу + driving_school: Автошкола + embassy: Илселек + fast_food: Фаст-фуд + ferry_terminal: Паром станцияһы + fire_station: Янғын һүндереү һағы + food_court: Ресторан ихатаһы + fountain: Фонтан + fuel: Заправка + gambling: Уйын йорто + grave_yard: Зыярат + hospital: Госпиталь + hunting_stand: Һунарсы вышкаһы + ice_cream: Туңдырма + kindergarten: Балалар баҡсаһы + marketplace: Баҙар + motorcycle_parking: Мотоцикл парковкаһы + nightclub: Төнгө клуб + nursing_home: Ҡарттар йорто + parking: Туҡталҡа + parking_entrance: Туҡталҡаға инеү + pharmacy: Дарыухана + place_of_worship: Ғибәҙәт ҡылыу урыны + police: Полиция + post_box: Почта йәшниге + post_office: Почта бүлексәһе + preschool: Мәктәпкәсә уҡытыу учреждениеһы + prison: Төрмә + pub: Һырахана + public_building: Йәмғиәти бина + recycling: Киренән эшкәртеү урыны + restaurant: Ресторан + retirement_home: Ҡарттар йорто + sauna: Сауна + school: Мәктәп + shelter: Йәшенеү урыны + shower: Душ + social_centre: Йәмғиәти үҙәк + social_club: Берләшмә + social_facility: Йәмәғәт ойошмаһы + studio: Студия + swimming_pool: Бассейн + taxi: Такси + telephone: Телефон + theatre: Театр + toilets: Бәҙрәф + townhall: Ҡала администрацияһы + university: Университет + vending_machine: Сауҙа автоматы + veterinary: Ветеринар клиника + village_hall: Утар + waste_basket: Сүп һауыты + waste_disposal: ҡалдыҡтарҙы юҡ итеү + youth_centre: Йәштәр үҙәге + boundary: + administrative: административ сик + census: иҫәп алыу участогының сиге + national_park: Милли парк + protected_area: Һаҡлы район + bridge: + aqueduct: Һыу каналы + suspension: Аҫылма күпер + swing: Айырсалы күпер + viaduct: Юл һуҙымы + "yes": Күпер + building: + "yes": Бина + craft: + brewery: Һыра заводы + carpenter: Балта оҫтаһы + electrician: Электрик + gardener: Баҡсасы + painter: Рәссам + plumber: Сантехник + shoemaker: Итексе + tailor: Тегенсе + "yes": Ҡул эштәре магазины + emergency: + ambulance_station: Тиҙ ярҙам станцияһы + defibrillator: Дефибриллятор + landing_site: Авария мәлендә ултырыу урыны + phone: Тиҙ бәйләнеш телефоны + highway: + abandoned: Ташландыҡ юл + bridleway: Атта йөрөү юлы + bus_guideway: Автобус рельс-юлы + bus_stop: Автобус туҡталышы + construction: Ремонт барған юл + cycleway: Велосипед юлы + elevator: Лифт + emergency_access_point: Ашығыс ярҙам пункты + footway: Тротуар + ford: Йөҙөп сығыу урыны + living_street: Кеше йәшәгән урам + milestone: Километр бағанаһы + 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: Урам фонары + tertiary: Ауыл араһы юлы + tertiary_link: Сиҙәм юлы + track: Ауыл юлы + traffic_signals: Светофор + trail: Һуҡмаҡ + trunk: Төп юл + trunk_link: Магистраль + unclassified: Урындағы юл + historic: + archaeological_site: Археологик ҡаҙыныуҙар + battlefield: Һуғыш яланы + boundary_stone: Сик буйы ташы + building: Тарихи бина + bunker: Бункер + castle: Ҡәлғә + church: Сиркәү + city_gate: Ҡала ҡапҡаһы + citywalls: Тарихи нығытма + fort: Ҡойма + heritage: Мәҙәни мираҫ + house: Йорт + icon: Тәре + manor: Поместье + memorial: Һәйкәл + mine: Карьер + monument: Монумент + roman_road: Рим юлы + ruins: Емереклектәр + stone: Таш + tomb: Ҡәбер + tower: Башня + wayside_cross: Юл яны тәреһе + wayside_shrine: Юл яны ғибәҙәтханаһы + wreck: Батҡан кәмә остоғо + junction: + "yes": Юл киҫелеше + landuse: + allotments: Баҡсалар + basin: Бассейн + brownfield: Төҙөлөш өсөн таҙартыу + cemetery: Ҡәберлек + commercial: Һатыу итеү яланы + conservation: Заповедник + construction: Төҙөлөш + farm: Ферма + farmland: Ауыл хужалығы ерҙәре + farmyard: Ауыл хужалығы ихаталары + forest: Урман хужалығы + garages: Гараждар + grass: Үлән + greenfield: Үҙләштерелмәгән урын + industrial: Промзона + landfill: Сүплек + meadow: Туғай + military: Хәрби биләмә + orchard: Емеш баҡсаһы + quarry: Карьер + railway: Тимер юл + recreation_ground: Ял итеү урыны + reservoir: Һыу һаҡлағыс + reservoir_watershed: Һыу һаҡлағыстың һыу айырсаһы + residential: Йәшәү районы + retail: Һатыу итеү биләмәһе + road: Юл селтәре зонаһы + village_green: Йәшел ауыл + vineyard: Йөҙөм баҡсаһы + "yes": Ерҙе ҡулланыу + leisure: + beach_resort: Үҫентеле пляж + bird_hide: Йәшерен ултырғыс (ҡоштарҙы күҙәтеү өсөн) + common: Альменда + dog_park: Эт өсөн майҙансыҡ + fishing: Балыҡ тотоу + fitness_centre: Фитнес-үҙәк + fitness_station: Фитнес-станция + garden: Баҡса + golf_course: Гольф яланы + horse_riding: Ат базаһы + ice_rink: Һырғалаҡ + marina: Яхталар пристане + miniature_golf: Минигольф + nature_reserve: Заповедник + park: Парк + pitch: Спорт майҙансығы + playground: Балаларҙың уйын майҙансығы + resort: Ҡотҡарыу ҡоралы + sauna: Сауна + slipway: Эллинг + sports_centre: Спорт үҙәге + stadium: Стадион + swimming_pool: Бассейн + track: Спорт юлы + water_park: Аквапарк + "yes": Буш ваҡыт + man_made: + lighthouse: Маяҡ + pipeline: Торба юлы + works: Фабрика + "yes": Кеше ҡулы менән яһалған + military: + airfield: Хәрби аэродром + barracks: Казармалар + mountain_pass: + "yes": Үткәүел + natural: + bay: Ҡултыҡ + beach: Пляж + cape: Морон + cave_entrance: Мәмерйәгә инеү + cliff: Ҡая упҡыны + crater: Кратер + dune: Дюна + fell: Ҡаҡ тау түбәһе + fjord: Ҡултыҡ + forest: Урман + geyser: Гейзер + glacier: Боҙлоҡ + grassland: Туғай + heath: Вереск үҫкән ялан + hill: Тау түбәһе + island: Утрау + land: Ер + marsh: Үләнле һаҙлыҡ + moor: Тау һаҙлығы + mud: Батҡаҡ + peak: Тау түбәһе + point: Морон + reef: Риф + ridge: Һырт + rock: Ҡая + saddle: Артылыш + sand: Ҡом + scree: Таш ҡойолоуы + scrub: Ҡыуаҡлыҡ + spring: Шишмә + strait: Боғаҙ + tree: Ағас + valley: Үҙән + volcano: Вулкан + water: Һыу + wetland: Һаҙлыҡлы урын + wood: Урман + office: + accountant: Бухгалтер + javascripts: + share: + only_standard_layer: Бары стандарт ҡатлам ғына һүрәт кеүек экспортлана ала + embed: + report_problem: Проблема хаҡында хәбәр итергә +... diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 2b2201668..2cc578fbe 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -260,7 +260,7 @@ be-Tarask: map_image: Выява мапы (паказвае стандартны слой) embeddable_html: HTML-код для ўстаўкі licence: Ліцэнзія - export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Open + export_details: Зьвесткі OpenStreetMap даступныя на ўмовах ліцэнзіі Open Data Commons Open Database License (ODbL). too_large: body: 'Гэты абшар занадта вялікі для экспарту ў фармаце XML OpenStreetMap. @@ -283,10 +283,10 @@ be-Tarask: geocoder: search: title: - latlon: Вынікі з Internal + latlon: Вынікі з Internal uk_postcode: Вынікі з NPEMap / FreeThe Postcode - ca_postcode: Вынікі з Geocoder.CA + ca_postcode: Вынікі з Geocoder.CA osm_nominatim: Вынікі з OpenStreetMap Nominatim geonames: Вынікі з GeoNames @@ -321,29 +321,22 @@ be-Tarask: crematorium: Крэматорый dentist: Стаматалёгія doctors: Дактары - dormitory: Інтэрнат drinking_water: Пітная вада driving_school: Аўташкола embassy: Амбасада - emergency_phone: Тэлефон для экстранных выклікаў fast_food: Забягайлаўка ferry_terminal: Паромная станцыя - fire_hydrant: Пажарны гідрант fire_station: Пажарны пастарунак fountain: Фантан fuel: Запраўка grave_yard: Могілкі - gym: Фітнэс цэнтар /Трэнажорны зал - health_centre: Цэнтар здароўя hospital: Шпіталь hunting_stand: Паляўнічая вежа ice_cream: Марозіва kindergarten: Дзіцячы садок library: Бібліятэка - market: Рынак marketplace: Рынкавая плошча nightclub: Начны клюб - nursery: Дзіцячы пакой nursing_home: Дом састарэлых office: Офіс parking: Стаянка @@ -356,7 +349,6 @@ be-Tarask: prison: Турма pub: Шынок public_building: Грамадзкі будынак - reception_area: Прыёмная recycling: Месца перапрацоўкі адыходаў restaurant: Рэстаран retirement_home: Дом састарэлых @@ -413,7 +405,6 @@ be-Tarask: trunk: Шаша trunk_link: Шаша unclassified: Дарога раённага значэньня - unsurfaced: Дарога без пакрыцьця historic: archaeological_site: Археалягічныя раскопкі battlefield: Поле гістарычнай бойкі @@ -529,7 +520,6 @@ be-Tarask: government: Дзяржаўная ўстанова insurance: Страхавое бюро place: - airport: Аэрапорт city: Горад country: Краіна county: Раён @@ -541,7 +531,6 @@ be-Tarask: islet: Выспачка isolated_dwelling: Ізаляванае жытло locality: Населены пункт - moor: Тарфянік municipality: Муніцыпалітэт postcode: Паштовы індэкс region: Рэгіён @@ -556,10 +545,8 @@ be-Tarask: abandoned: Пакінутая чыгуначная лінія construction: Будаўніцтва чыгункі disused: Пакінутая чыгунка - disused_station: Пакінутая чыгуначная станцыя funicular: Фунікулёр halt: Чыгуначны прыпынак - historic_station: Гістарычная чыгуначная станцыя junction: Чыгуначны вузел level_crossing: Чыгуначны пераезд light_rail: Лінія для лёгкага чыгуначнага транспарту @@ -619,7 +606,6 @@ be-Tarask: hairdresser: Цырульня hardware: Гаспадарчыя тавары hifi: Крама аўдыё/відэё тэхнікі - insurance: Страхаваньне jewelry: Ювэлірная крама kiosk: Шапік laundry: Пральня @@ -634,9 +620,7 @@ be-Tarask: outdoor: Выязны гандаль pet: Зоалягічная крама photo: Фотакрама - salon: Салён shoes: Крама абутку - shopping_centre: Гандлёвы цэнтар sports: Спартовая крама stationery: Канцтавары supermarket: Супэрмаркет diff --git a/config/locales/be.yml b/config/locales/be.yml index a60883a64..56a2cdb5f 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -443,33 +443,26 @@ be: crematorium: Крэматорый dentist: Стаматолагія doctors: Лекары - dormitory: Інтэрнат drinking_water: Пітная вада driving_school: Аўташкола embassy: Амбасада - emergency_phone: Тэлефон экстранай сувязі fast_food: Фаст-Фуд ferry_terminal: Паромны тэрмінал - fire_hydrant: Пажарны гідрант fire_station: Пажарная станцыя food_court: Фуд-Корт fountain: Фантан fuel: АЗС gambling: Азартныя гульні grave_yard: Могілкі - gym: Фітнес-цэнтр ці Трэнажорная зала - health_centre: Медыцынскі цэнтр hospital: Бальніца hunting_stand: Паляўнічая вежа ice_cream: Марозіва kindergarten: Дзіцячы сад library: Бібліятэка - market: Рынак marketplace: Рыначная плошча monastery: Кляштар motorcycle_parking: Паркоўка для матацыклаў nightclub: Начны клуб - nursery: Яслі nursing_home: Прыватная лякарня office: Офіс parking: Паркоўка @@ -483,7 +476,6 @@ be: prison: Турма pub: Паб public_building: Грамадскі будынак - reception_area: Зона прыёму recycling: Пункт перапрацоўкі restaurant: Рэстаран retirement_home: Дом састарэлых @@ -579,7 +571,6 @@ be: trunk: Шаша trunk_link: Магістраль unclassified: Некласіфікаваная дарога - unsurfaced: Дарога без пакрыцця "yes": Дарога historic: archaeological_site: Археалагічныя раскопы @@ -644,7 +635,6 @@ be: leisure: beach_resort: Пляжны курорт bird_hide: Засада - club: Клуб common: Агульная зямля dog_park: Пляцоўка для сабак fishing: Раён рыбалоўства @@ -737,8 +727,6 @@ be: "yes": Офіс place: allotments: Сады-агароды - block: Блок - airport: Аэрапорт city: Горад country: Краіна county: Акруга @@ -750,7 +738,6 @@ be: islet: Астравок isolated_dwelling: Ізаляванае жыллё locality: Мясцовасць - moor: Швартоўка municipality: Муніцыпалітэт neighbourhood: Наваколле postcode: Паштовы індэкс @@ -767,10 +754,8 @@ be: abandoned: Закінутая чыгунка construction: Будаўніцтва чыгункі disused: Закінутая чыгунка - disused_station: Закінуты чыгуначны вакзал funicular: Фунікулер halt: Чыгуначны прыпынак - historic_station: Гістарычны чыгуначны вакзал junction: Чыгуначны вузел level_crossing: Чыгуначны пераезд light_rail: Хуткасны трамвай @@ -834,7 +819,6 @@ be: hairdresser: Цырульнік hardware: Гаспадарчая крама hifi: Аўдыётэхніка - insurance: Страхаванне jewelry: Ювелірная крама kiosk: Кіёск laundry: Пральня @@ -850,10 +834,8 @@ be: pet: Заалагічная крама pharmacy: Аптэка photo: Фота майстэрня - salon: Салон second_hand: Крама патрыманых рэчаў shoes: Абутковая крама - shopping_centre: Гандлёвы цэнтр sports: Спартыўная крама stationery: Крама канцылярскіх тавараў supermarket: Супермаркет @@ -2363,9 +2345,6 @@ be: mapquest_car: Аўтамабіль (MapQuest) mapquest_foot: Пешшу (MapQuest) osrm_car: Аўтамабіль (OSRM) - mapzen_bicycle: Веласіпед (Mapzen) - mapzen_car: Аўтамабіль (Mapzen) - mapzen_foot: Пешшу (Mapzen) descend: Уніз directions: Маршрут distance: Адлегласць diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 56547d363..005236535 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -341,25 +341,20 @@ bg: crematorium: Крематориум dentist: Зъболекар doctors: Лекари - dormitory: Пансион drinking_water: Питейна вода driving_school: Автошкола embassy: Посолство - emergency_phone: Телефон за спешни повиквания fast_food: Заведения за бързо хранене ferry_terminal: Фериботен терминал - fire_hydrant: Пожарен кран fire_station: Пожарна станция fountain: Фонтан fuel: Гориво gambling: Хазартни игри grave_yard: Гробище - gym: Фитнес зала hospital: Болница ice_cream: Сладолед kindergarten: Детска градина library: Библиотека - market: Пазар marketplace: Пазар monastery: Манастир nightclub: Нощен клуб @@ -374,7 +369,6 @@ bg: prison: Затвор pub: Кръчма public_building: Обществена сграда - reception_area: Рецепция restaurant: Ресторант retirement_home: Старчески дом sauna: Сауна @@ -455,7 +449,6 @@ bg: traffic_signals: Светофар trunk: Междуградски път trunk_link: Междуградски път - unsurfaced: Път без настилка "yes": Път historic: archaeological_site: Разкопки @@ -510,7 +503,6 @@ bg: vineyard: Лозя leisure: beach_resort: Морски курорт - club: Клуб dog_park: Парк за кучета fishing: Място за риболов fitness_centre: Фитнес център @@ -582,7 +574,6 @@ bg: "yes": Офис place: allotments: Градини - airport: Летище city: Град country: Страна county: Област @@ -592,7 +583,6 @@ bg: houses: Къщи island: Остров islet: Островче - moor: Тресавище municipality: Община neighbourhood: Квартал postcode: Пощенски код @@ -607,9 +597,7 @@ bg: abandoned: Изоставена железопътна линия construction: Железопътна линия в строеж disused: Изоставена ж.п. линия - disused_station: изоставена гара halt: Железопътна спирка - historic_station: Гара с историческо значение junction: Железопътен възел level_crossing: Прелез light_rail: Лека железница @@ -650,7 +638,6 @@ bg: greengrocer: Плод и зеленчук grocery: Магазин за хранителни стоки hairdresser: Фризьорски салон - insurance: Застраховане jewelry: Бижутериен магазин laundry: Пералня mall: Търговски център @@ -662,7 +649,6 @@ bg: pharmacy: Аптека photo: Фотомагазин shoes: Магазин за обувки - shopping_centre: Търговски център sports: Спортен магазин stationery: Канцеларски материали supermarket: Супермаркет @@ -856,10 +842,10 @@ bg: unread_button: Отбелязване като непрочетено read_button: Отбелязване като прочетено reply_button: Отговор - delete_button: Изтрий + delete_button: Изтриване new: - title: Изпратете съобщение - send_message_to: Изпратете ново съобщение на %{name} + title: Изпращане на съобщение + send_message_to: Изпращане ново съобщение на %{name} subject: Тема body: Текст send_button: Изпращане @@ -904,7 +890,7 @@ bg: get_directions_title: Намерете маршрут между две точки from: От to: До - where_am_i: Къде съм аз? + where_am_i: Къде е това? submit_text: Напред key: table: @@ -934,19 +920,19 @@ bg: - терминал admin: Административна граница forest: Гора - wood: Лес + wood: Дървета golf: Игрище за голф park: Парк resident: Жилищна зона common: 1: ливада - retail: Зона за търговия на дребно + retail: Търговска зона industrial: Промишлена зона commercial: Търговска зона heathland: Пустош lake: - Езеро - farm: Земеделско стопанство + farm: Ферма brownfield: Място за строеж cemetery: Гробище allotments: Градини @@ -1294,9 +1280,6 @@ bg: mapquest_car: Кола (MapQuest) mapquest_foot: Пеша (MapQuest) osrm_car: Кола (OSRM) - mapzen_bicycle: Велосипед (Mapzen) - mapzen_car: Кола (Mapzen) - mapzen_foot: Пеша (Mapzen) directions: Насоки distance: Разстояние instructions: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 8d9eb017b..a02d8fc40 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -8,6 +8,7 @@ # Author: Elias Ahmmad # Author: Kayser Ahmad # Author: Nasir8891 +# Author: R4bb1 # Author: Rasal Lia # Author: Sayma Jahan # Author: Tauhid16 @@ -386,8 +387,8 @@ bn: osm_nominatim: ওপেনস্ট্রীটম্যাপ নমিনাতিম থেকে ফলাফল geonames: জিওনেমস থেকে ফলাফল - osm_nominatim_reverse: ওপেনস্ট্রীটম্যাপ - নমিনাতিম থেকে ফলাফল + osm_nominatim_reverse: ওপেনস্ট্রীটম্যাপ + Nominatim থেকে ফলাফল geonames_reverse: জিওনেমস থেকে ফলাফল search_osm_nominatim: prefix: @@ -433,33 +434,26 @@ bn: crematorium: শ্মশান dentist: দন্তচিকিৎসক doctors: ডাক্তার - dormitory: ছাত্রাবাস drinking_water: পানীয় জল driving_school: ড্রাইভিং স্কুল embassy: দূতাবাস - emergency_phone: জরুরি ফোন fast_food: ফাস্ট ফুড ferry_terminal: ফেরিঘাট - fire_hydrant: ফায়ার হাইড্র্যান্ট fire_station: অগ্নি নির্বাপন কেন্দ্র food_court: খাবার দোকান fountain: ঝরনা fuel: জ্বালানি gambling: জুয়াখেলার আড্ডা grave_yard: কবরস্থান - gym: ব্যায়াম কেন্দ্র / জিমখানা - health_centre: স্বাস্থকেন্দ্র hospital: হাসপাতাল hunting_stand: শিকারশালা ice_cream: আইসক্রিম kindergarten: শিশুবিদ্যালয় library: পাঠাগার - market: বাজার marketplace: নগরচত্বর monastery: আশ্রম motorcycle_parking: মোটরসাইকেল পার্কিং nightclub: নৈশক্লাব - nursery: শিশুশালা nursing_home: নার্সিংহোম office: দপ্তর parking: পার্কিং @@ -473,7 +467,6 @@ bn: prison: কারাগার pub: মদ্যশালা public_building: সরকারি ভবন - reception_area: অভ্যর্থন এলাকা restaurant: রেঁস্তোরা retirement_home: অবসর গৃহ sauna: বাষ্পস্নান @@ -520,6 +513,7 @@ bn: plumber: নল মিস্তিরি shoemaker: মুচি tailor: দর্জি + "yes": কারুকাজ দোকান emergency: ambulance_station: রুগ্নবাহিকা স্টেশন landing_site: জরুরি অবতরণ ক্ষেত্র @@ -553,11 +547,11 @@ bn: street_lamp: রাস্তার বাতি tertiary: প্রশাখা সড়ক tertiary_link: প্রশাখা সড়ক + track: নির্ধারিত পথ traffic_signals: ট্রাফিক সংকেত trunk: মূল সড়ক trunk_link: মূল সড়ক unclassified: অশ্রেণীকৃত সড়ক - unsurfaced: কাঁচা সড়ক "yes": সড়ক historic: archaeological_site: প্রত্নতাত্ত্বিক স্থান @@ -612,7 +606,6 @@ bn: "yes": ব্যবহার্য ভূমি leisure: beach_resort: সৈকতীয় রিসোর্ট - club: ক্লাব common: সাধারণ ভূমি dog_park: কুকুর উদ্যান fishing: মৎস শিকারের এলাকা @@ -690,8 +683,6 @@ bn: travel_agent: ভ্রমণ দালাল "yes": দপ্তর place: - block: ব্লক - airport: বিমানবন্দর city: নগর country: দেশ county: প্রদেশ @@ -703,7 +694,6 @@ bn: islet: ক্ষুদ্র দ্বীপ isolated_dwelling: বিচ্ছিন্ন বাসস্থান locality: বসতি - moor: প্রাস্তর municipality: পৌরসভা neighbourhood: শহরতলি postcode: ডাক সংখ্যা @@ -720,8 +710,6 @@ bn: abandoned: পরিত্যক্ত রেলপথ construction: নির্মীয়মাণ রেলপথ disused: অব্যবহৃত রেলপথ - disused_station: অব্যবহৃত রেল স্টেশন - historic_station: ঐতিহাসিক রেল স্টেশন junction: রেল জংশন monorail: মনোরেল narrow_gauge: সংকীর্ণ গেজ রেল @@ -742,6 +730,7 @@ bn: bicycle: বাইসাইকেল দোকান books: বইয়ের দোকান butcher: মাংসবিক্রেতা + car_parts: গাড়ির যন্ত্রাংশ carpet: কার্পেটের দোকান chemist: রাসায়নবিদ clothes: কাপড়ের দোকান @@ -772,7 +761,6 @@ bn: hairdresser: নাপিত hardware: যন্ত্রাংশের দোকান hifi: হাই-ফাই - insurance: বিমা jewelry: গহনার দোকান laundry: ধোপার দোকান mall: মল @@ -785,10 +773,8 @@ bn: organic: জৈব খাদ্যের দোকান pharmacy: ঔষধালয় photo: ছবির দোকান - salon: সালোন second_hand: পুরনো-সামগ্রীর দোকান shoes: জুতোর দোকান - shopping_centre: বিপনি কেন্দ্র sports: ক্রীড়াসামগ্রীর দোকান stationery: স্টেশনারি দোকান supermarket: অধিবিপণী @@ -942,7 +928,7 @@ bn: url: /স্বাগতম title: ওএসএম-এ স্বাগতম beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Bn:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: আরম্ভকারী সহায়িকা help: url: https://help.openstreetmap.org/ @@ -954,7 +940,7 @@ bn: irc: title: আইআরসি wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org about_page: next: পরবর্তী @@ -1290,6 +1276,8 @@ bn: account: current email address: 'বর্তমান ই-মেইল ঠিকানা:' new email address: 'নতুন ই-মেইল ঠিকানা:' + openid: + link: https://wiki.openstreetmap.org/wiki/OpenID public editing: enabled link text: এটি কী? contributor terms: diff --git a/config/locales/br.yml b/config/locales/br.yml index d1218b530..cf8b37b49 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -1,6 +1,7 @@ # Messages for Breton (brezhoneg) # Exported from translatewiki.net # Export driver: phpyaml +# Author: Dishual # Author: Fohanno # Author: Fulup # Author: Gwenn-Ael @@ -393,7 +394,7 @@ br: osm_nominatim: Disoc'hoù diwar OpenStreetMap Nominatim geonames: Disoc'hoù diwar GeoNames - osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap + osm_nominatim_reverse: Disoc'hoù diwar OpenStreetMap Nominatim geonames_reverse: Disoc'hoù diwar GeoNames search_osm_nominatim: @@ -443,33 +444,26 @@ br: crematorium: Krematoriom dentist: Dentour doctors: Mezeien - dormitory: Kouskva drinking_water: Dour mat da evañ driving_school: Skol bleinañ embassy: Kannati - emergency_phone: Pellgomzer evit an trummadoù fast_food: Fast Food ferry_terminal: Porzh karrlistri - fire_hydrant: Dour evit an tan fire_station: Kazarn pomperien food_court: ↓Predva fountain: Feunteun fuel: Trelosk gambling: C'hoari grave_yard: Bered - gym: Fitness/embregerezh-korf - health_centre: Kreizenn yec'hed hospital: Ospital hunting_stand: Stand tennañ ice_cream: Dienn skorn kindergarten: Liorzh ar vugale library: Levraoueg - market: Marc'had marketplace: Marc'hallac'h monastery: Manati motorcycle_parking: Parklec'h evit marc'hoù-tan nightclub: Klub-noz - nursery: Spluseg nursing_home: Ti yec'hed office: Burev parking: Parklec'h @@ -483,7 +477,6 @@ br: prison: Toull-bac'h pub: Tavarn public_building: Savadur foran - reception_area: Takad degemer recycling: Lec'h adaozañ restaurant: Preti retirement_home: Ti-retredidi @@ -579,7 +572,6 @@ br: trunk: Hent-tizh trunk_link: Hent-tizh unclassified: Hent dirumm - unsurfaced: Hent dizolo "yes": Hent historic: archaeological_site: Lec'hienn henoniel @@ -607,6 +599,7 @@ br: wayside_cross: Kroaz wayside_shrine: Ti-pediñ wreck: Peñse + "yes": Lec'h Istorel junction: "yes": Kej landuse: @@ -644,7 +637,6 @@ br: leisure: beach_resort: Kêr-gouronkañ bird_hide: Bod evned - club: Klub common: Tachennoù foran dog_park: Park chas fishing: Takad pesketa @@ -671,8 +663,13 @@ br: water_park: Kreizenn dour "yes": Diduamantoù man_made: + bridge: Pont + bunker_silo: Bunker lighthouse: Tour-tan + mine: Mengleuz pipeline: Eoulsan + silo: Silo + surveillance: Evezh tower: Tour works: Labouradeg "yes": Krouet gant Mab-den @@ -737,8 +734,6 @@ br: "yes": Burev place: allotments: Liorzhoù tiegezhel - block: Blog - airport: Aerborzh city: Meurgêr country: Bro county: Kontelezh @@ -750,12 +745,12 @@ br: islet: Enezennig isolated_dwelling: Ti distro locality: Kêr - moor: Lanneg municipality: Kumun neighbourhood: Ardremez postcode: Kod post region: Rannvro sea: Mor + square: Plasenn state: Stad subdivision: Isrann suburb: Karter @@ -767,10 +762,8 @@ br: abandoned: Hent-houarn dilezet construction: Hent-houarn war sevel disused: Hent-houarn dilezet - disused_station: Porzh-houarn dilezet funicular: Hent-houarn fundren halt: Arsav tren - historic_station: Arsav tren istorel junction: Kej hent-houarn level_crossing: Treuzenn hent-houarn light_rail: Hent-houarn bihan @@ -834,10 +827,10 @@ br: hairdresser: Perukenner hardware: Stal urzhiataerezh hifi: Stal Hi-Fi - insurance: Asurañs jewelry: Bravigerezh kiosk: Kiosk laundry: Kanndi + lottery: Lotiri mall: Palier kenwerzh market: Marc'had mobile_phone: Stal pellgomzerioù hezoug @@ -850,10 +843,8 @@ br: 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 @@ -1887,6 +1878,7 @@ br: 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ñ. + terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: Diferadennoù ar c'henlabourer heading: Diferadennoù ar c'henlabourer @@ -2385,9 +2377,6 @@ br: mapquest_car: Karr (MapQuest) mapquest_foot: Troad (MapQuest) osrm_car: Karr(OSRM) - mapzen_bicycle: Marc'h-houarn (Mapzen) - mapzen_car: Karr (Mapzen) - mapzen_foot: War droad (Mapzen) descend: Diskenn directions: Tuioù distance: Hed diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 2f2d03731..3ab825186 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -377,33 +377,26 @@ bs: 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 gambling: Kockanje grave_yard: Groblje - gym: Fitness centar - health_centre: Zdravstveni centar hospital: Bolnica hunting_stand: Lovačka čeka ice_cream: Sladoled kindergarten: Dječiji vrtić library: Biblioteka - market: Tržnica marketplace: Tržnica monastery: Manastir motorcycle_parking: Parking za motore nightclub: Noćni klub - nursery: Čuvanje djece nursing_home: Starački dom office: Kancelarija parking: Parking @@ -417,7 +410,6 @@ bs: prison: Zatvor pub: Pub public_building: Ustanova - reception_area: Recepcija recycling: Reciklažna stanica restaurant: Restoran retirement_home: Dom penzionera @@ -513,7 +505,6 @@ bs: trunk: Brza cesta trunk_link: Prilaz brzoj cesti unclassified: Neklasificirana cesta - unsurfaced: Neasfaltirana cesta "yes": Put historic: archaeological_site: ArheoloÅ¡ko nalaziÅ¡te @@ -574,7 +565,6 @@ bs: leisure: beach_resort: OdmaraliÅ¡te - plaža bird_hide: Posmatračnica ptica - club: Klub common: Općinsko zemljiÅ¡te dog_park: Park za pse fishing: Ribolovno područje @@ -653,7 +643,6 @@ bs: travel_agent: Putnička agencija "yes": Kancelarija place: - airport: Aerodrom city: Grad country: Država county: Kanton @@ -665,7 +654,6 @@ bs: islet: Ostrvce isolated_dwelling: Izolirano stanovanje locality: Lokalitet - moor: Močvarno tlo municipality: Općina postcode: PoÅ¡tanski broj region: Regija @@ -680,10 +668,8 @@ bs: 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 @@ -744,7 +730,6 @@ bs: hairdresser: Frizer hardware: Željezarija hifi: Hi-Fi - insurance: Osiguranje jewelry: Trgovina nakitom kiosk: Kiosk laundry: Praonica rublja @@ -760,9 +745,7 @@ bs: pet: Trgovina za kućne ljubimce pharmacy: Apoteka photo: Fotograf - salon: Salon shoes: Trgovina obućom - shopping_centre: Trgovački centar sports: Trgovina sportskom opremom stationery: Papirnica supermarket: Supermarket diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 106f2c060..d6e5cfc59 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -247,7 +247,7 @@ ca: changeset_paging_nav: showing_page: Pàgina %{page} next: Endavant » - previous: « Enrere + previous: ← Anterior changeset: anonymous: Anònim no_edits: (sense edicions) @@ -468,33 +468,26 @@ ca: crematorium: Crematori dentist: Dentista doctors: Metges - dormitory: Residència Universitària drinking_water: Aigua potable driving_school: Autoescola embassy: Ambaixada - emergency_phone: Telèfon d'emergència fast_food: Menjar ràpid ferry_terminal: Terminal de Ferry - fire_hydrant: Boca d'incendi fire_station: Parc de bombers food_court: Àrea de restauració fountain: Font fuel: Benzinera gambling: Jocs d'atzar grave_yard: Cementiri - gym: Gimnàs - health_centre: Centre de Salut hospital: Hospital hunting_stand: Club de caça ice_cream: Gelat kindergarten: Jardí d'infància library: Biblioteca - market: Mercat marketplace: Mercat monastery: Monestir motorcycle_parking: Aparcament per a motos nightclub: Club nocturn - nursery: Infantil nursing_home: Llar d'Avis office: Oficina parking: Pàrquing @@ -508,7 +501,6 @@ ca: prison: Presó pub: Pub public_building: Edifici públic - reception_area: Àrea de recepció recycling: Punt de reciclatge restaurant: Restaurant retirement_home: Casa de Retirament @@ -563,6 +555,7 @@ ca: defibrillator: Desfibril·lador landing_site: Lloc d'aterratges d'emergència phone: Telèfon per a emergències + "yes": Emergència highway: abandoned: Carretera abandonada bridleway: Ferradura @@ -604,7 +597,6 @@ ca: trunk: Autovia de trunk_link: Autovia de unclassified: Sense classificar Road - unsurfaced: Pista sense asfaltar "yes": Carretera historic: archaeological_site: Lloc arqueològic @@ -632,6 +624,7 @@ ca: wayside_cross: Camí de la creu wayside_shrine: Santuari de carreteres wreck: Wreck + "yes": Lloc històric junction: "yes": Intersecció landuse: @@ -669,7 +662,6 @@ ca: leisure: beach_resort: Beach Resort bird_hide: Aguait - club: Club common: Terra comú dog_park: Parc caní fishing: Àrea de pesca @@ -696,8 +688,11 @@ ca: water_park: Parc aquàtic "yes": Esbarjo man_made: + breakwater: Escullera + bridge: Pont lighthouse: Far pipeline: Canonada + silo: Sitja tower: Torre works: Fàbrica "yes": Fet per l'home @@ -750,7 +745,9 @@ ca: accountant: Comptable administrative: Administració architect: Arquitecte + association: Associació company: Empresa + educational_institution: Institució educativa employment_agency: Agència d'ocupació estate_agent: Immobiliària government: Oficina governamental @@ -762,9 +759,8 @@ ca: "yes": Oficina place: allotments: Horts - block: Bloc - airport: Aeroport city: Ciutat + city_block: Illa de cases country: País county: Comtat farm: Granja @@ -775,7 +771,6 @@ ca: islet: Illot isolated_dwelling: Habitatge aïllat locality: Localitat - moor: Amarrador municipality: Municipi neighbourhood: Barri postcode: Codi postal @@ -792,10 +787,8 @@ ca: abandoned: Ferrocarril fora de Servei construction: Ferrocarril en Construcció disused: Ferrocarril en desús - disused_station: Estació de tren tancada funicular: Funicular Railway halt: Parada de tren - historic_station: Estació de tren antiga junction: Cruïlla de tren level_crossing: Pas a nivell light_rail: Tren lleuger @@ -859,7 +852,6 @@ ca: hairdresser: Perruqueria o barberia hardware: Botiga de maquinari hifi: Hi-Fi - insurance: Homes For Sale jewelry: Joieria kiosk: Quiosc botiga laundry: Bugaderia @@ -875,10 +867,8 @@ ca: 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 @@ -958,7 +948,7 @@ ca: logo: alt_text: logotip de l'OpenStreetMap home: Vés a la ubicació d'inici - logout: Tancar sessió + logout: Finalitza la sessió log_in: Inicia sessió log_in_tooltip: Inicia una sessió amb un compte existent sign_up: Registre @@ -1118,10 +1108,10 @@ ca: per eliminar dades protegides pels drets d'autor o empleneu aquest formulari en línia.. trademarks_title_html: Marques registrades - trademarks_1_html: OpenStreetMap i el logotip de la lupa són marques registrades - de la Fundació OpenStreetMap. Si teniu preguntes sobre l'ús de les marques, - si us plau envieu les vostres al Grup - de Treball de Llicències. + trademarks_1_html: OpenStreetMap, el logotip de la lupa i «State of the Map» + són marques registrades de la Fundació OpenStreetMap. Si teniu preguntes sobre + l’ús de les marques, consulteu la política + de marques registrades. welcome_page: title: Benvingut! introduction_html: Us donem la benvinguda a l'OpenStreetMap, el mapa lliure i @@ -1277,6 +1267,7 @@ ca: footer_html: També podeu llegir el missatge a %{readurl} i podeu respondre'l a %{replyurl} friend_notification: + hi: Hola %{to_user}, subject: '[OpenStreetMap] %{user} us ha afegit a la llista d''amics' had_added_you: '%{user} us ha afegit com a amic a l''OpenStreetMap.' see_their_profile: Podeu veure el seu perfil a %{userurl}. @@ -1494,7 +1485,7 @@ ca: get_directions_title: Trobeu indicacions entre dos punts from: De to: A - where_am_i: On sóc? + where_am_i: On és això? where_am_i_title: Descriu la localització actual fent servir el motor de cerca submit_text: Vés-hi key: @@ -2382,9 +2373,10 @@ ca: new: intro: Heu trobat un error o bé hi falta res? Informeu-ne a d'altres col·laboradors per tal que puguin solucionar-ho. Moveu el marcador a la posició correcta - i escriviu-hi una anotació per tal de descriure el problema. (No introduïu - cap mena d'informació personal o informació d'altres mapes o llistats de - directoris que es trobin sota copyright.) + i escriviu-hi una anotació per tal de descriure el problema. + advice: La vostra nota és pública i pot utilitzar-se per actualitzar el mapa, + per tant, no hi introduïu cap informació personal, o informació de mapes + amb copyright o bé llistats de directori. add: Afegeix una nota show: anonymous_warning: Aquesta nota inclou comentaris d'usuaris anònims que haurien @@ -2404,9 +2396,6 @@ ca: mapquest_car: Cotxe (MapQuest) mapquest_foot: A peu (MapQuest) osrm_car: Cotxe (OSRM) - mapzen_bicycle: Bicicleta (Mapzen) - mapzen_car: Cotxe (Mapzen) - mapzen_foot: A peu (Mapzen) directions: Indicacions distance: Distància errors: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index f5da185a8..423324a8d 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -7,6 +7,7 @@ # Author: DemonioCZ # Author: Dvorapa # Author: H4nek +# Author: Ilimanaq29 # Author: JAn Dudík # Author: Jezevec # Author: Jkjk @@ -159,6 +160,8 @@ cs: title_comment: Sada změn %{id} - %{comment} join_discussion: Chcete-li diskutovat, přihlaste se discussion: Diskuse + still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude + sada změn uzavřena. node: title: 'Uzel: %{name}' history_title: 'Historie uzlu: %{name}' @@ -370,7 +373,7 @@ cs: map_image: Obrázek mapy (zobrazuje standardní vrstvu) embeddable_html: Vkládatelné HTML licence: Licence - export_details: Data OpenStreetMap jsou k dispozici pod licencí Open + export_details: Data OpenStreetMap jsou k dispozici pod licencí Open Data Commons Open Database License (ODbL). too_large: advice: 'Pokud se tento export nezdaří, zvažte použití jednoho z následujících @@ -409,14 +412,14 @@ cs: geocoder: search: title: - latlon: Výsledky z interní databáze + latlon: Výsledky z interní databáze uk_postcode: Výsledky z NPEMap / FreeThe Postcode - ca_postcode: Výsledky z Geocoder.CA - osm_nominatim: Výsledky z OpenStreetMap + ca_postcode: Výsledky z Geocoder.CA + osm_nominatim: Výsledky z OpenStreetMap Nominatim geonames: Výsledky z GeoNames - osm_nominatim_reverse: Výsledky z OpenStreetMap + osm_nominatim_reverse: Výsledky z OpenStreetMap Nominatim geonames_reverse: Výsledky z GeoNames search_osm_nominatim: @@ -426,11 +429,13 @@ cs: chair_lift: Sedačková lanovka drag_lift: Vlek gondola: Kabinková lanovka + pylon: Pylon station: Stanice lanovky aeroway: aerodrome: LetiÅ¡tě apron: Odbavovací plocha gate: LetiÅ¡tní brána + hangar: Hangár helipad: Heliport runway: Dráha taxiway: Pojezdová dráha @@ -466,37 +471,31 @@ cs: crematorium: Krematorium dentist: Zubař doctors: Lékař - dormitory: Kolej drinking_water: Pitná voda driving_school: AutoÅ¡kola embassy: Velvyslanectví - emergency_phone: Nouzový telefon fast_food: Rychlé občerstvení 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 gambling: Hazardní hry grave_yard: Hřbitov - gym: Fitness centrum / tělocvična - health_centre: Zdravotní středisko hospital: Nemocnice hunting_stand: Posed ice_cream: Zmrzlinárna kindergarten: Mateřská Å¡kola library: Knihovna - market: TržiÅ¡tě marketplace: Tržnice monastery: Klášter motorcycle_parking: ParkoviÅ¡tě pro motocykly nightclub: Noční klub - nursery: Jesle nursing_home: Pečovatelský dům office: Úřad parking: ParkoviÅ¡tě parking_entrance: Vjezd na parkoviÅ¡tě + parking_space: ParkoviÅ¡tě pharmacy: Lékárna place_of_worship: Náboženský objekt police: Policie @@ -506,7 +505,6 @@ cs: prison: Věznice pub: Hospoda public_building: Veřejná budova - reception_area: Recepce recycling: Tříděný odpad restaurant: Restaurace retirement_home: Domov důchodců @@ -561,12 +559,14 @@ cs: defibrillator: Defibrilátor landing_site: Přistávací plocha záchranky phone: Nouzový telefon + "yes": Nouze highway: abandoned: ZruÅ¡ená silnice bridleway: Koňská stezka bus_guideway: Autobusová dráha bus_stop: Autobusová zastávka construction: Silnice ve výstavbě + corridor: Koridor cycleway: Cyklostezka elevator: Výtah emergency_access_point: Nouzový lokalizační bod @@ -577,6 +577,7 @@ cs: motorway: Dálnice motorway_junction: Dálniční křižovatka motorway_link: Dálnice + passing_place: Přechod path: Stezka pedestrian: Pěší zóna platform: NástupiÅ¡tě @@ -593,6 +594,7 @@ cs: services: Dálniční odpočívadlo speed_camera: Radar steps: Schody + stop: Značka Stop street_lamp: Pouliční lampa tertiary: Silnice třetí třídy tertiary_link: Silnice třetí třídy @@ -602,7 +604,6 @@ cs: trunk: Významná silnice trunk_link: Významná silnice unclassified: Silnice - unsurfaced: Nezpevněná cesta "yes": Cesta historic: archaeological_site: Archeologické naleziÅ¡tě @@ -630,6 +631,7 @@ cs: wayside_cross: Boží muka wayside_shrine: Boží muka wreck: Vrak + "yes": Historická stránka junction: "yes": Křižovatka landuse: @@ -667,7 +669,6 @@ cs: leisure: beach_resort: Pobřežní letovisko bird_hide: Ptačí pozorovatelna - club: Klub common: Obecní půda dog_park: Park pro psy fishing: Rybářská oblast @@ -694,9 +695,23 @@ cs: water_park: Aquapark "yes": Volný čas man_made: + beehive: Včelí úl + bridge: Most + bunker_silo: Bunkr + chimney: Komín + dyke: Hráz + embankment: Nábřeží + groyne: Vlnolam + kiln: Pec lighthouse: Maják + mine: Mina + petroleum_well: Ropný důl pipeline: Potrubí tower: Věž + wastewater_plant: Rostlina na plýtvání vodou + watermill: Vodní mlýn + water_well: Studna + windmill: Větrný mlýn works: Továrna "yes": Lidský výtvor military: @@ -753,6 +768,7 @@ cs: estate_agent: Realitní kancelář government: Vládní úřad insurance: PojiÅ¡Å¥ovna + it: Počítačová kancelář lawyer: Právnická kancelář ngo: Úřad nevládní organizace telecommunication: Telekomunikační úřad @@ -760,8 +776,6 @@ cs: "yes": Kancelář place: allotments: Zahrádkářská kolonie - block: Blok - airport: LetiÅ¡tě city: Velkoměsto country: Stát county: Hrabství @@ -773,12 +787,13 @@ cs: islet: Ostrůvek isolated_dwelling: Samota locality: Oblast - moor: Bažina municipality: Obecní úřad neighbourhood: ČtvrÅ¥ postcode: PSČ + quarter: Čtvrt region: Region sea: Moře + square: Náměstí state: Stát subdivision: Parcely suburb: Městská část @@ -790,10 +805,8 @@ cs: abandoned: ZruÅ¡ená železniční traÅ¥ construction: Železnice ve výstavbě disused: Nepoužívaná železniční traÅ¥ - disused_station: ZruÅ¡ená železniční stanice funicular: Lanová dráha halt: Železniční zastávka - historic_station: Nádraží historické železnice junction: Kolejové rozvětvení level_crossing: Železniční přejezd light_rail: Rychlodráha @@ -819,6 +832,7 @@ cs: beauty: Salón krásy beverages: Prodej nápojů bicycle: Cykloobchod + bookmaker: Bookmaker books: Knihkupectví boutique: Butik butcher: Řeznictví @@ -857,12 +871,13 @@ cs: hairdresser: Kadeřnictví hardware: Železářství hifi: Prodej Hi-Fi elektroniky - insurance: PojiÅ¡Å¥ovna jewelry: Klenotnictví kiosk: Kiosek laundry: Prádelna + lottery: Loterie mall: Nákupní centrum market: Trh + massage: Masáž mobile_phone: Prodej mobilních telefonů motorcycle: Prodej motocyklů music: Prodej hudby @@ -870,19 +885,20 @@ cs: optician: Oční optika organic: Prodej biopotravin outdoor: Outdoorový obchod + pawnbroker: Zastavárník pet: Prodejna pro chovatele pharmacy: Lékárna photo: Prodejna foto - salon: Salón + seafood: Mořské plody 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ář + vacant: Volný obchod video: Videopůjčovna, prodej DVD wine: Vinárna "yes": Obchod @@ -939,7 +955,7 @@ cs: level10: Hranice městské části description: title: - osm_nominatim: Poloha podle OpenStreetMap + osm_nominatim: Poloha podle OpenStreetMap Nominatim geonames: Poloha podle GeoNames types: @@ -1013,21 +1029,21 @@ cs: legal_babble: title_html: Autorská práva a licence intro_1_html: OpenStreetMap® jsou svobodná - data, která za podmínek Open - Data Commons Open Database License (ODbL) nabízí nadace OpenStreetMap + data, která za podmínek Open + Data Commons Open Database License (ODbL) nabízí nadace OpenStreetMap Foundation (OSMF). 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í. + 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 + jsou k dispozici pod licencí Creative Commons Uveďte autora-Zachovejte licenci 2.0 (CC-BY-SA). credit_title_html: Jak uvádět OpenStreetMap 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. + 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. Nebo můžete (a pokud šíříte OSM jako data, tak musíte) uvést název licence a odkaz na ni přímo. Pokud používáte médium, které odkazy neumožňuje (např. v tiÅ¡těném díle), navrhujeme, abyste své čtenáře nasměrovali na openstreetmap.org (zřejmě rozšířením „OpenStreetMap“ do této plné adresy), na opendatacommons.org a, pokud se vás to týká, na creativecommons.org. credit_3_html: |- @@ -1038,7 +1054,7 @@ cs: title: Příklad uvedení autorství more_title_html: Další informace more_1_html: O používání naÅ¡ich dat a způsobu uvádění autorství se můžete dočíst - více na licenční stránce OSMF. + více na licenční stránce OSMF. more_2_html: |- Přestože OpenStreetMap tvoří svobodná data, nemůžeme zdarma poskytovat třetím stranám mapové API. Vizte naÅ¡e Pravidla použití API, Pravidla použití dlaždic a Pravidla použití Nominatimu. @@ -1046,10 +1062,10 @@ cs: 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_at_html: 'Rakousko: Obsahuje data od města - Vídně pod CC - BY), země - Vorarlbersko a země Tyrolsko (pod CC + 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 (© @@ -1057,12 +1073,12 @@ cs: 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í + dostupná pod licencí NLSFI.' contributors_fr_html: 'Francie: Obsahuje data pocházející z Direction Générale des Impôts.' contributors_nl_html: 'Nizozemsko: Obsahuje © AND data, - 2007 (www.and.com)' + 2007 (www.and.com)' contributors_nz_html: 'Nový Zéland: Obsahuje data pocházející z Land Information New Zealand. Crown Copyright reserved.' contributors_si_html: 'Slovinsko: Obsahuje data Zeměměřického @@ -1075,7 +1091,7 @@ cs: Survey © Crown copyright a právo k databázi 2010–12.' 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. + href="https://wiki.openstreetmap.org/wiki/Contributors">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. @@ -1085,13 +1101,13 @@ cs: 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 + podle naÅ¡eho postupu pro odstranění nebo přímo podejte výzvu pomocí on-line formuláře. trademarks_title_html: Ochranné známky trademarks_1_html: OpenStreetMap, logo s lupou a State of the Map jsou zapsané ochranné známky OpenStreetMap Foundation. Pokud máte dotazy ohledně vaÅ¡eho - používání těchto známek, zaÅ¡lete své dotazy pracovní + používání těchto známek, zaÅ¡lete své dotazy pracovní skupině pro licencování. welcome_page: title: Vítejte! @@ -1123,8 +1139,8 @@ cs: paragraph_1_html: OpenStreetMap má jen málo formálních pravidel, ale od vÅ¡ech účastníků očekáváme, že budou spolupracovat a komunikovat s komunitou. Pokud zvažujete jakoukoli jinou činnost než ruční editování, přečtěte si prosím - a dodržujte pokyny na stránkách Importy - a Automatizované + a dodržujte pokyny na stránkách Importy + a Automatizované editace. questions: title: Nějaké dotazy? @@ -1158,7 +1174,7 @@ cs: explanation_html: |- Pokud máte pochyby o používání naÅ¡ich dat nebo jejich obsahu, na naší stránce o autorských právech naleznete více právních informací, případně kontaktujte - přísluÅ¡nou pracovní skupinu OSMF. + přísluÅ¡nou pracovní skupinu OSMF. help_page: title: Nápověda introduction: OpenStreetMap nabízí několik zdrojů pro informace o projektu, otázky @@ -1168,7 +1184,7 @@ cs: title: Vítejte v OSM description: Začněte tímto rychlým průvodcem zahrnujícím základy OpenStreetMap. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Cs:Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Cs:Pr%C5%AFvodce_za%C4%8D%C3%A1te%C4%8Dn%C3%ADka title: Průvodce začátečníka description: Komunitou spravovaná příručka pro začátečníky. help: @@ -1192,7 +1208,7 @@ cs: description: Pomoc společnostem a organizacím s přechodem na mapy a další služby založené na OpenStreetMap. wiki: - url: http://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs + url: https://wiki.openstreetmap.org/wiki/Cs:Main_Page?uselang=cs title: wiki.openstreetmap.org description: Podrobnou dokumentaci OSM najdete na wiki. about_page: @@ -1210,7 +1226,7 @@ cs: community_driven_title: Řízeno komunitou 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ší. - Pokud 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. + Pokud se chcete o komunitě dozvědět více, prohlédněte si blog OpenStreetMap, uživatelské deníčky, komunitní blogy a webovou stránku nadace OSM Foundation. open_data_title: Otevřená data 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 @@ -1219,9 +1235,9 @@ cs: práva a licence.' legal_title: Právní informace legal_html: |- - Tento web a mnoho dalších souvisejících služeb za komunitu oficiálně provozuje OpenStreetMap Foundation (OSMF). Použití vÅ¡ech služeb provozovaných OSMF podléhá naÅ¡im Pravidlům přijatelného užití a naÅ¡im Pravidlům ochrany osobních údajů. + Tento web a mnoho dalších souvisejících služeb za komunitu oficiálně provozuje OpenStreetMap Foundation (OSMF). Použití vÅ¡ech služeb provozovaných OSMF podléhá naÅ¡im Pravidlům přijatelného užití a naÅ¡im Pravidlům ochrany osobních údajů.
- Pokud máte problémy či dotazy týkající se licencování, autorských práv či jiných právních záležitostí, kontaktujte prosím OSMF. + Pokud máte problémy či dotazy týkající se licencování, autorských práv či jiných právních záležitostí, kontaktujte prosím OSMF. partners_title: Partneři notifier: diary_comment_notification: @@ -1436,14 +1452,14 @@ cs: user_page_link: uživatelské stránce 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 + potřebujete přehrávač Flashe. Můžete si stáhnout + Flash Player z Adobe.com. Pro editaci OpenStreetMap existuje mnoho dalších možností. potlatch_unsaved_changes: Máte neuložené změny. (V Potlatchi odznačte aktuální cestu nebo bod, pokud editujete v živém režimu, nebo klikněte na tlačítko uložit, pokud tam je.) potlatch2_not_configured: Potlatch 2 není nakonfigurován – podrobnější informace - najdete na http://wiki.openstreetmap.org/wiki/The_Rails_Port + najdete na https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 potlatch2_unsaved_changes: Máte neuložené změny. (V Potlatch 2 se ukládá kliknutím na tlačítko.) id_not_configured: iD nebyl nakonfigurován @@ -1458,7 +1474,7 @@ cs: get_directions_title: Najít trasu mezi dvěma body from: Odkud to: Kam - where_am_i: Kde se nacházím? + where_am_i: Kde je toto? where_am_i_title: Popsat právě zobrazované místo pomocí vyhledávače submit_text: Hledat key: @@ -1535,7 +1551,7 @@ cs: edit: Upravit preview: Náhled markdown_help: - title_html: Zpracovává se Markdownem + title_html: Zpracovává se Markdownem headings: Nadpisy heading: Nadpis subheading: Podnadpis @@ -1651,7 +1667,7 @@ cs: description: Procházení nedávno nahraných GPS stop tagged_with: se štítky %{tags} empty_html: Nic tu ještě není. Nahrajte novou stopu - nebo si něco o GPS stopách přečtěte na wiki. + nebo si něco o GPS stopách přečtěte na wiki. delete: scheduled_for_deletion: Stopa označena ke smazání make_public: @@ -1857,12 +1873,12 @@ cs: 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.

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

- license_agreement: Při potvrzení účtu budete muset souhlasit s podmínkami + license_agreement: Při potvrzení účtu budete muset souhlasit s podmínkami pro přispěvatele. email address: 'E-mailová adresa:' confirm email address: 'Potvrdit e-mailovou adresu:' not displayed publicly: Vaše adresa se nezobrazuje veřejně, více informací získáte - v našich pravidlech ochrany osobních údajů display name: 'Zobrazované jméno:' @@ -1984,12 +2000,12 @@ cs: email never displayed publicly: (nikde se veřejně nezobrazuje) external auth: 'Externí autentizace:' openid: - link: http://wiki.openstreetmap.org/wiki/CS:OpenID + link: https://wiki.openstreetmap.org/wiki/Cs:OpenID link text: co to znamená? public editing: heading: 'Veřejné editace:' enabled: Aktivní. Není anonym, smí editovat data. - enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits + enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: co to znamená? disabled: Deaktivováno, nemůže editovat data, všechny předchozí editace jsou anonymní. @@ -2000,8 +2016,8 @@ cs: ani vidět vaši polohu. Pokud chcete ukázat, co jste editovali, a dovolit lidem vás kontaktovat prostřednictvím webu, klikněte na níže zobrazené tlačítko. Od přechodu na API 0.6 mohou mapová data editovat jen veřejní uživatelé. - (Přečtěte si - důvody.)