Merge pull request #28 from zerebubuth/routing-ui-tweaks-2
authorRichard Fairhurst <richard@systemeD.net>
Mon, 26 Jan 2015 17:26:46 +0000 (17:26 +0000)
committerRichard Fairhurst <richard@systemeD.net>
Mon, 26 Jan 2015 17:26:46 +0000 (17:26 +0000)
Routing UI tweaks, part deux

386 files changed:
Gemfile
Gemfile.lock
README.md
Rakefile
Vendorfile
app/assets/images/RSS.png
app/assets/images/about/osm.png
app/assets/images/about/sprite.png
app/assets/images/about/sprite@2x.png
app/assets/images/aol.png
app/assets/images/attribution_example.png
app/assets/images/browse/aerodrome.p.16.png
app/assets/images/browse/allotments.png
app/assets/images/browse/alpinehut.p.16.png
app/assets/images/browse/atm2.p.16.png
app/assets/images/browse/bank2.p.16.png
app/assets/images/browse/bar.p.16.png
app/assets/images/browse/bridge.20.png
app/assets/images/browse/bridleway.20.png
app/assets/images/browse/brownfield.png
app/assets/images/browse/building.png
app/assets/images/browse/bus_station.n.16.png
app/assets/images/browse/bus_stop.p.16.png
app/assets/images/browse/byway.20.png
app/assets/images/browse/cafe.p.16.png
app/assets/images/browse/camping.n.16.png
app/assets/images/browse/car_share.p.16.png
app/assets/images/browse/caravan_park.n.16.png
app/assets/images/browse/cemetery.png
app/assets/images/browse/centre.png
app/assets/images/browse/cinema.p.16.png
app/assets/images/browse/commercial.png
app/assets/images/browse/common.png
app/assets/images/browse/cycleway.20.png
app/assets/images/browse/drinkingtap.p.16.png
app/assets/images/browse/education_nursery.p.16.png
app/assets/images/browse/education_school.p.16.png
app/assets/images/browse/education_university.p.16.png
app/assets/images/browse/farm.png
app/assets/images/browse/fast_food.p.16.png
app/assets/images/browse/firestation.p.16.png
app/assets/images/browse/footway.20.png
app/assets/images/browse/forest.png
app/assets/images/browse/fuel.p.16.png
app/assets/images/browse/gate2.p.16.png
app/assets/images/browse/golf.png
app/assets/images/browse/halt.p.16.png
app/assets/images/browse/health_dentist.p.16.png
app/assets/images/browse/health_doctors.p.16.png
app/assets/images/browse/health_opticians.p.16.png
app/assets/images/browse/health_veterinary.p.16.png
app/assets/images/browse/heathland.png
app/assets/images/browse/hospital.p.16.png
app/assets/images/browse/hostel.p.16.png
app/assets/images/browse/hotel.p.16.png
app/assets/images/browse/industrial.png
app/assets/images/browse/lake.png
app/assets/images/browse/level_crossing.p.16.png
app/assets/images/browse/library.p.16.png
app/assets/images/browse/light_rail.20.png
app/assets/images/browse/lighthouse.p.16.png
app/assets/images/browse/military.png
app/assets/images/browse/mini_round.p.16.png
app/assets/images/browse/motorway.20.png
app/assets/images/browse/museum.p.16.png
app/assets/images/browse/park.png
app/assets/images/browse/parking.p.16.png
app/assets/images/browse/path.20.png
app/assets/images/browse/pharmacy.p.16.png
app/assets/images/browse/pitch.png
app/assets/images/browse/place_of_worship.png
app/assets/images/browse/place_of_worship_unknown3.p.16.png
app/assets/images/browse/police.p.16.png
app/assets/images/browse/post_box.p.16.png
app/assets/images/browse/post_office.p.16.png
app/assets/images/browse/primary.20.png
app/assets/images/browse/prison.p.16.png
app/assets/images/browse/pub.p.16.png
app/assets/images/browse/rail.20.png
app/assets/images/browse/recycling.p.16.png
app/assets/images/browse/reserve.png
app/assets/images/browse/residential.png
app/assets/images/browse/restaurant.p.16.png
app/assets/images/browse/retail.png
app/assets/images/browse/runway.20.png
app/assets/images/browse/school.png
app/assets/images/browse/secondary.20.png
app/assets/images/browse/service.20.png
app/assets/images/browse/shelter2.p.16.png
app/assets/images/browse/shop_bakery.p.16.png
app/assets/images/browse/shop_bicycle.p.16.png
app/assets/images/browse/shop_books.p.16.png
app/assets/images/browse/shop_butcher.p.16.png
app/assets/images/browse/shop_clothes.p.16.png
app/assets/images/browse/shop_convenience.p.16.png
app/assets/images/browse/shop_diy.p.16.png
app/assets/images/browse/shop_estateagent2.p.16.png
app/assets/images/browse/shop_fish.p.16.png
app/assets/images/browse/shop_garden_centre.p.16.png
app/assets/images/browse/shop_gift.p.16.png
app/assets/images/browse/shop_greengrocer.p.16.png
app/assets/images/browse/shop_hairdresser.p.16.png
app/assets/images/browse/shop_jewelry.p.16.png
app/assets/images/browse/shop_supermarket.p.16.png
app/assets/images/browse/station.p.16.png
app/assets/images/browse/subway.20.png
app/assets/images/browse/taxiway.20.png
app/assets/images/browse/telephone.p.16.png
app/assets/images/browse/tertiary.20.png
app/assets/images/browse/theatre.p.16.png
app/assets/images/browse/toilets.p.16.png
app/assets/images/browse/tourism.png
app/assets/images/browse/tourist_castle.p.16.png
app/assets/images/browse/tourist_memorial.p.16.png
app/assets/images/browse/tourist_monument.p.16.png
app/assets/images/browse/tourist_picnic.p.16.png
app/assets/images/browse/tourist_ruins.p.16.png
app/assets/images/browse/tourist_windmill.p.16.png
app/assets/images/browse/tourist_wreck.p.16.png
app/assets/images/browse/track.20.png
app/assets/images/browse/traffic_light.png
app/assets/images/browse/tram.20.png
app/assets/images/browse/transport_parking_bicycle.p.16.png
app/assets/images/browse/transport_rental_bicycle.p.16.png
app/assets/images/browse/transport_rental_car.p.16.png
app/assets/images/browse/tree.p.16.png
app/assets/images/browse/trunk.20.png
app/assets/images/browse/tunnel.20.png
app/assets/images/browse/turning_circle.p.16.png
app/assets/images/browse/unclassified.20.png
app/assets/images/browse/view_point.p.16.png
app/assets/images/browse/wall.20.png
app/assets/images/browse/wood.png
app/assets/images/cc_button.png
app/assets/images/closed_note_marker@2x.png
app/assets/images/confirm-illustration.png
app/assets/images/google.png
app/assets/images/key/mapnik/admin.png
app/assets/images/key/mapnik/allotments.png
app/assets/images/key/mapnik/apron.png
app/assets/images/key/mapnik/bridge.png
app/assets/images/key/mapnik/bridleway.png
app/assets/images/key/mapnik/brownfield.png
app/assets/images/key/mapnik/building.png
app/assets/images/key/mapnik/byway.png
app/assets/images/key/mapnik/cable.png
app/assets/images/key/mapnik/cemetery.png
app/assets/images/key/mapnik/centre.png
app/assets/images/key/mapnik/commercial.png
app/assets/images/key/mapnik/common.png
app/assets/images/key/mapnik/construction.png
app/assets/images/key/mapnik/cycleway.png
app/assets/images/key/mapnik/destination.png
app/assets/images/key/mapnik/farm.png
app/assets/images/key/mapnik/footway.png
app/assets/images/key/mapnik/forest.png
app/assets/images/key/mapnik/golf.png
app/assets/images/key/mapnik/heathland.png
app/assets/images/key/mapnik/industrial.png
app/assets/images/key/mapnik/lake.png
app/assets/images/key/mapnik/military.png
app/assets/images/key/mapnik/motorway.png
app/assets/images/key/mapnik/park.png
app/assets/images/key/mapnik/permissive.png
app/assets/images/key/mapnik/pitch.png
app/assets/images/key/mapnik/primary.png
app/assets/images/key/mapnik/primary12.png
app/assets/images/key/mapnik/private.png
app/assets/images/key/mapnik/rail.png
app/assets/images/key/mapnik/rail13.png
app/assets/images/key/mapnik/reserve.png
app/assets/images/key/mapnik/resident.png
app/assets/images/key/mapnik/retail.png
app/assets/images/key/mapnik/runway.png
app/assets/images/key/mapnik/school.png
app/assets/images/key/mapnik/secondary.png
app/assets/images/key/mapnik/secondary12.png
app/assets/images/key/mapnik/station.png
app/assets/images/key/mapnik/subway.png
app/assets/images/key/mapnik/summit.png
app/assets/images/key/mapnik/tourist.png
app/assets/images/key/mapnik/track.png
app/assets/images/key/mapnik/tram.png
app/assets/images/key/mapnik/trunk.png
app/assets/images/key/mapnik/trunk12.png
app/assets/images/key/mapnik/tunnel.png
app/assets/images/key/mapnik/unclassified.png
app/assets/images/key/mapnik/unclassified13.png
app/assets/images/key/mapnik/unsurfaced.png
app/assets/images/key/mapnik/wood.png
app/assets/images/mag_map-rss2.0.png
app/assets/images/map_sprite.png
app/assets/images/map_zoomin.png
app/assets/images/map_zoomout.png
app/assets/images/marker-blue.png
app/assets/images/marker-green.png
app/assets/images/marker-red.png
app/assets/images/marker-yellow.png
app/assets/images/menu-icon.png
app/assets/images/myopenid.png
app/assets/images/new.png
app/assets/images/new_note_marker@2x.png
app/assets/images/notice.png
app/assets/images/open_note_marker@2x.png
app/assets/images/openid.png
app/assets/images/openid_input.png
app/assets/images/openid_small.png
app/assets/images/osm_logo.png
app/assets/images/osm_logo_114.png
app/assets/images/osm_logo_144.png
app/assets/images/osm_logo_228.png
app/assets/images/osm_logo_72.png
app/assets/images/roles/administrator.png
app/assets/images/roles/blank_moderator.png
app/assets/images/sign-up-illustration-arm.png
app/assets/images/sign-up-illustration.png
app/assets/images/sotm-birmingham-ad.png
app/assets/images/sotm-us-ad.png
app/assets/images/sprite.png
app/assets/images/terms-illustration.png
app/assets/images/users/images/large.png
app/assets/images/users/images/small.png
app/assets/images/welcome-sprite.png
app/assets/images/wordpress.png
app/assets/images/yahoo.png
app/assets/javascripts/index.js
app/assets/javascripts/index/directions.js.erb
app/assets/javascripts/index/query.js
app/assets/javascripts/index/search.js
app/assets/javascripts/leaflet.note.js
app/assets/javascripts/piwik.js
app/assets/stylesheets/common.css.scss
app/assets/stylesheets/parameters.scss
app/controllers/application_controller.rb
app/controllers/browse_controller.rb
app/controllers/changeset_controller.rb
app/controllers/diary_entry_controller.rb
app/controllers/message_controller.rb
app/controllers/notes_controller.rb
app/controllers/redactions_controller.rb
app/controllers/user_controller.rb
app/models/diary_comment.rb
app/models/diary_entry.rb
app/models/message.rb
app/models/old_node.rb
app/models/old_relation.rb
app/models/old_way.rb
app/models/redaction.rb
app/models/user.rb
app/models/user_block.rb
app/views/browse/changeset.html.erb
app/views/layouts/_search.html.erb
config.ru
config/application.rb
config/boot.rb
config/environments/development.rb
config/environments/production.rb
config/environments/test.rb
config/initializers/assets.rb
config/initializers/cookies_serializer.rb
config/initializers/i18n.rb
config/initializers/mime_types.rb
config/initializers/postgresql_adapter.rb [deleted file]
config/initializers/sanitize.rb
config/locales/ast.yml
config/locales/be.yml
config/locales/br.yml
config/locales/bs.yml
config/locales/ca.yml
config/locales/cs.yml
config/locales/cy.yml [new file with mode: 0644]
config/locales/da.yml
config/locales/de.yml
config/locales/diq.yml
config/locales/el.yml
config/locales/es.yml
config/locales/et.yml
config/locales/eu.yml
config/locales/fa.yml
config/locales/fi.yml
config/locales/fr.yml
config/locales/fur.yml
config/locales/gl.yml
config/locales/he.yml
config/locales/hsb.yml
config/locales/hu.yml
config/locales/ia.yml
config/locales/id.yml
config/locales/it.yml
config/locales/ja.yml
config/locales/ka.yml
config/locales/ko.yml
config/locales/ksh.yml
config/locales/lb.yml
config/locales/lv.yml
config/locales/mk.yml
config/locales/mr.yml
config/locales/ms.yml
config/locales/nb.yml
config/locales/nl.yml
config/locales/pa.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/pt.yml
config/locales/ru.yml
config/locales/sl.yml
config/locales/sq.yml
config/locales/sv.yml
config/locales/ta.yml
config/locales/te.yml
config/locales/tl.yml
config/locales/tr.yml
config/locales/uk.yml
config/locales/vi.yml
config/locales/zh-CN.yml
config/locales/zh-TW.yml
db/migrate/001_create_osm_db.rb
db/migrate/002_cleanup_osm_db.rb
db/migrate/003_sql_session_store_setup.rb
db/migrate/004_user_enhancements.rb
db/migrate/005_tile_tracepoints.rb
db/migrate/006_tile_nodes.rb
db/migrate/007_add_relations.rb
db/migrate/008_remove_segments.rb
db/migrate/010_diary_comments.rb
db/migrate/018_create_acls.rb
db/migrate/020_populate_node_tags_and_remove.rb
db/migrate/021_move_to_innodb.rb
db/migrate/022_key_constraints.rb
db/migrate/023_add_changesets.rb
db/migrate/025_add_end_time_to_changesets.rb
db/migrate/028_add_more_changeset_indexes.rb
db/migrate/029_add_user_foreign_keys.rb
db/migrate/030_add_foreign_keys.rb
db/migrate/031_create_countries.rb
db/migrate/034_create_languages.rb
db/migrate/035_change_user_locale.rb
db/migrate/042_add_foreign_keys_to_oauth_tables.rb
db/migrate/044_create_user_roles.rb
db/migrate/045_create_user_blocks.rb
db/migrate/046_alter_user_roles_and_blocks.rb
db/migrate/054_refactor_map_bug_tables.rb
db/migrate/20110521142405_rename_bugs_to_notes.rb
db/migrate/20111212183945_add_lowercase_user_indexes.rb
db/migrate/20120318201948_create_redactions.rb
db/migrate/20120328090602_drop_session_table.rb
db/migrate/20120404205604_add_user_and_description_to_redaction.rb
db/migrate/20140115192822_add_text_index_to_note_comments.rb
db/migrate/20140507110937_create_changeset_comments.rb
db/migrate/20140519141742_add_join_table_between_users_and_changesets.rb
db/migrate/20150110152606_change_default_formats.rb [new file with mode: 0644]
db/migrate/20150111192335_subscribe_old_changesets.rb [new file with mode: 0644]
db/structure.sql
lib/diff_reader.rb
lib/migrate.rb
script/vagrant/setup/provision.sh
test/controllers/api_controller_test.rb
test/controllers/changeset_controller_test.rb
test/controllers/diary_entry_controller_test.rb
test/controllers/message_controller_test.rb
test/controllers/node_controller_test.rb
test/controllers/notes_controller_test.rb
test/controllers/old_node_controller_test.rb
test/controllers/old_relation_controller_test.rb
test/controllers/old_way_controller_test.rb
test/controllers/relation_controller_test.rb
test/controllers/user_controller_test.rb
test/controllers/way_controller_test.rb
test/fixtures/current_node_tags.yml
test/fixtures/node_tags.yml
test/helpers/application_helper_test.rb
test/helpers/browse_helper_test.rb
test/integration/user_creation_test.rb
test/integration/user_login_test.rb
test/lib/rich_text_test.rb
test/models/changeset_comment_test.rb
test/models/node_test.rb
test/performance/browsing_test.rb [deleted file]
vendor/assets/javascripts/html5shiv.js
vendor/assets/jquery/jquery.cookie.js
vendor/assets/jquery/jquery.simulate.js
vendor/assets/leaflet/leaflet.osm.js
vendor/assets/ohauth/ohauth.js
vendor/assets/potlatch2/potlatch2.swf
vendor/assets/potlatch2/potlatch2/assets.zip
vendor/assets/potlatch2/potlatch2/locales/zh_TW.swf

diff --git a/Gemfile b/Gemfile
index ac030d38d44be8e89318fef6fcd54f8ab427f299..e59705dad6df15aa0ee58da4d64194581fad5004 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Require rails
-gem 'rails', '4.1.7'
+gem 'rails', '4.2.0'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
@@ -16,19 +16,19 @@ gem 'json'
 gem 'pg'
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
+gem 'sass-rails', '~> 5.0'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.1.0'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-# gem 'jbuilder', '~> 1.2'
+# gem 'jbuilder', '~> 2.0'
 gem 'jsonify-rails'
 
 # Use R2 for RTL conversion
@@ -44,7 +44,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '~> 7.0.11'
+gem 'composite_primary_keys', '~> 8.0.0'
 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 4.0'
 gem 'deadlock_retry', '>= 1.2.0'
index 3f66851755c0c68dda3f30c8a892b84361de5804..fee72773e9fd7fec4fcdb179cb8dad5e1794cea4 100644 (file)
@@ -2,36 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    autoprefixer-rails (3.1.2.20141016)
+    arel (6.0.0)
+    autoprefixer-rails (4.0.2.2)
       execjs
     bigdecimal (1.1.0)
     builder (3.2.2)
@@ -44,42 +53,45 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.4)
+    cocaine (0.5.5)
       climate_control (>= 0.0.3, < 1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    colorize (0.7.3)
-    composite_primary_keys (7.0.12)
-      activerecord (~> 4.1.7)
-    crass (0.2.1)
+    colorize (0.7.5)
+    composite_primary_keys (8.0.0)
+      activerecord (~> 4.2.0)
+    crass (1.0.1)
     dalli (2.7.2)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.2.2)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    globalid (0.3.0)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    htmlentities (4.3.2)
+    htmlentities (4.3.3)
     http_accept_language (2.0.2)
-    httpclient (2.5.3.2)
-    i18n (0.6.11)
+    httpclient (2.6.0.1)
+    i18n (0.7.0)
     iconv (0.1)
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
+    jquery-rails (4.0.3)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     jsonify (0.3.1)
       multi_json (~> 1.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
-    jwt (1.0.0)
+    jwt (1.2.0)
     kgio (2.9.2)
     konacha (3.3.0)
       actionpack (>= 3.1, < 5)
@@ -87,18 +99,20 @@ GEM
       colorize
       railties (>= 3.1, < 5)
       sprockets
-    libxml-ruby (2.7.0)
+    libxml-ruby (2.8.0)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.4.2)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
-    nokogumbo (1.1.12)
+    nokogumbo (1.2.0)
       nokogiri
     oauth (0.4.7)
     oauth-plugin (0.5.1)
@@ -116,65 +130,75 @@ GEM
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
-    paperclip (4.2.0)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    pg (0.17.1)
+    pg (0.18.1)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    psych (2.0.6)
+    psych (2.0.9)
     r2 (0.2.5)
-    rack (1.5.2)
-    rack-cors (0.2.9)
+    rack (1.6.0)
+    rack-cors (0.3.1)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
     rails-i18n (4.0.3)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    redcarpet (3.2.0)
+    rake (10.4.2)
+    redcarpet (3.2.2)
     rinku (1.7.3)
     ruby-openid (2.6.0)
-    sanitize (3.0.3)
-      crass (~> 0.2.0)
+    sanitize (3.1.0)
+      crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
-      nokogumbo (= 1.1.12)
-    sass (3.2.19)
-    sass-rails (4.0.4)
+      nokogumbo (= 1.2.0)
+    sass (3.4.9)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     soap4r-ruby1.9 (2.0.5)
-    sprockets (2.11.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -184,13 +208,15 @@ GEM
     timecop (0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     validates_email_format_of (1.6.1)
       i18n
     vendorer (0.1.16)
-    websocket-driver (0.4.0)
+    websocket-driver (0.5.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -202,8 +228,8 @@ DEPENDENCIES
   actionpack-page_caching
   autoprefixer-rails
   bigdecimal (~> 1.1.0)
-  coffee-rails (~> 4.0.0)
-  composite_primary_keys (~> 7.0.11)
+  coffee-rails (~> 4.1.0)
+  composite_primary_keys (~> 8.0.0)
   dalli
   deadlock_retry (>= 1.2.0)
   dynamic_form
@@ -227,13 +253,13 @@ DEPENDENCIES
   psych
   r2
   rack-cors
-  rails (= 4.1.7)
+  rails (= 4.2.0)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   ruby-openid (>= 2.2.0)
   sanitize
-  sass-rails (~> 4.0.3)
+  sass-rails (~> 5.0)
   soap4r-ruby1.9
   timecop
   uglifier (>= 1.3.0)
index 90a9b93ef4af7e8fbeb141c4c3a32a382ec029d0..34e3325f06ee528c1a75b5a1ce7a435c9b9265f0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ This repository consists of:
 
 A fully-functional Rails Port installation depends on other services, including map tile
 servers and geocoding services, that are provided by other software. The default installation
-uses publically-available services to help with development and testing.
+uses publicly-available services to help with development and testing.
 
 # License
 
index 039e38f47aa6773d588e355ca59d27ce013605d7..28fdc4c576ce8a84a36b220ddd4dce1c322977e7 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,5 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 
 OpenStreetMap::Application.load_tasks
index c2267a6d8a41aac7133c256a3b85f4b20e45fcc5..6468d506745b675f06103faad2dbe0aa43a34516 100644 (file)
@@ -1,13 +1,13 @@
 folder 'vendor/assets' do
   folder 'jquery' do
-    file 'jquery.cookie.js', 'https://raw.github.com/carhartl/jquery-cookie/master/jquery.cookie.js'
-    file 'jquery.throttle-debounce.js', 'https://raw.github.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
-    file 'jquery.simulate.js', 'https://raw.github.com/jquery/jquery-ui/master/tests/jquery.simulate.js'
+    file 'jquery.cookie.js', 'https://raw.githubusercontent.com/carhartl/jquery-cookie/master/src/jquery.cookie.js'
+    file 'jquery.throttle-debounce.js', 'https://raw.githubusercontent.com/cowboy/jquery-throttle-debounce/v1.1/jquery.ba-throttle-debounce.js'
+    file 'jquery.simulate.js', 'https://raw.githubusercontent.com/jquery/jquery-simulate/1.0.0/jquery.simulate.js'
   end
 
   folder 'bootstrap' do
-    file 'bootstrap.tooltip.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js'
-    file 'bootstrap.dropdown.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.js'
+    file 'bootstrap.tooltip.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js'
+    file 'bootstrap.dropdown.js', 'https://raw.githubusercontent.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.js'
   end
 
   folder 'leaflet' do
@@ -53,6 +53,6 @@ folder 'vendor/assets' do
   end
 
   folder 'javascripts' do
-    file 'html5shiv.js', 'https://raw.github.com/aFarkas/html5shiv/master/src/html5shiv.js'
+    file 'html5shiv.js', 'https://raw.githubusercontent.com/aFarkas/html5shiv/master/src/html5shiv.js'
   end
 end
index 4838e5a702f84280c7bdb2ca95bfc9c87f720a35..89dda0c00c9b5c5efd6a97e62b84001a6a7949cd 100644 (file)
Binary files a/app/assets/images/RSS.png and b/app/assets/images/RSS.png differ
index d5479eea39b7f1ca6baf9d0dc9327b6dac5398fc..d97904e134bc532f5cfd5cb4842e4dfa8b0717d8 100644 (file)
Binary files a/app/assets/images/about/osm.png and b/app/assets/images/about/osm.png differ
index bc76ee09751dccb7c9a70dcbbe75b3697ff693f2..d3809059984f0e945dc7e458b0b45f7b4d4316a3 100644 (file)
Binary files a/app/assets/images/about/sprite.png and b/app/assets/images/about/sprite.png differ
index 65d09d73d6ee1edcde9b43c8052f7d2c8a90b12a..471b31d8fa18c2fbdefe08684e81b0978476243e 100644 (file)
Binary files a/app/assets/images/about/sprite@2x.png and b/app/assets/images/about/sprite@2x.png differ
index 917028b506aa5b4347950de39e34abc987dbda20..cf773f9072c430bd677194dc6f4c1aca512a5417 100644 (file)
Binary files a/app/assets/images/aol.png and b/app/assets/images/aol.png differ
index 463c80ed063f4a953fb53b80a43ec2423a58cdef..afcdc5d2580cb3b906a2c3f01d2aff0033f8fca7 100644 (file)
Binary files a/app/assets/images/attribution_example.png and b/app/assets/images/attribution_example.png differ
index 8f13cd76fe4397d87c335f5f9070c13fcb08743e..e8462b68bcb33c3f8150a844c873728ae70fce11 100644 (file)
Binary files a/app/assets/images/browse/aerodrome.p.16.png and b/app/assets/images/browse/aerodrome.p.16.png differ
index bc8d3fe96e4fa70bfadab0cc3ba01651d34206fd..9dcc925aa905962db92559e79c832f4f658dff60 100644 (file)
Binary files a/app/assets/images/browse/allotments.png and b/app/assets/images/browse/allotments.png differ
index 84b09771b2af1ad066b883539174dd67c9656ad9..0499c586ad5314922390176512a963de9a54c0ec 100644 (file)
Binary files a/app/assets/images/browse/alpinehut.p.16.png and b/app/assets/images/browse/alpinehut.p.16.png differ
index 62caf207ebc9772990813473e163fe89cba2099d..b3f843b3a451f182faf20720d090d6a4c9e98ebc 100644 (file)
Binary files a/app/assets/images/browse/atm2.p.16.png and b/app/assets/images/browse/atm2.p.16.png differ
index a7d30e86d506ced2fb7462f4c7b545c32712942d..e3f194635f83218e0a0e3aec892d739b6ff4f1dd 100644 (file)
Binary files a/app/assets/images/browse/bank2.p.16.png and b/app/assets/images/browse/bank2.p.16.png differ
index 201d66a0385295b032afff3cf991f18b16badc00..ad2c8ebd22073b569949df679705d5f5d283fb96 100644 (file)
Binary files a/app/assets/images/browse/bar.p.16.png and b/app/assets/images/browse/bar.p.16.png differ
index ed4808440ee28be14c7db4bfc87d62ec39598393..8146456fc5d33c88a6f5e2e2aaa415d442527004 100644 (file)
Binary files a/app/assets/images/browse/bridge.20.png and b/app/assets/images/browse/bridge.20.png differ
index bb46bcb8e4ca7e39c994938d65a138056ab7ce32..5e024ada6aad523dc9a947c5eb2739738606058b 100644 (file)
Binary files a/app/assets/images/browse/bridleway.20.png and b/app/assets/images/browse/bridleway.20.png differ
index 76d94cceeb0e35f49a9f1ac8cf18a6478d147046..1b1603399f7d8a3c2622d98f92623ce841ba7a89 100644 (file)
Binary files a/app/assets/images/browse/brownfield.png and b/app/assets/images/browse/brownfield.png differ
index 189bbe928e4c25eb7a4433324a48d930f5a1adc7..fd37114c97bf20ffd593aaaf28a6ef4acb1183a7 100644 (file)
Binary files a/app/assets/images/browse/building.png and b/app/assets/images/browse/building.png differ
index 5224dd119f9304c091b178558ed10d5c53a6941c..182d6eb45afa630dc3342d226dde859e26be9fdb 100644 (file)
Binary files a/app/assets/images/browse/bus_station.n.16.png and b/app/assets/images/browse/bus_station.n.16.png differ
index 7d9d5e8b6c998e55a29ca0b10dddd3ecab6480f4..d50858deb079783592cf33c86ab4d05cedc2d586 100644 (file)
Binary files a/app/assets/images/browse/bus_stop.p.16.png and b/app/assets/images/browse/bus_stop.p.16.png differ
index fb98d24e911564e0285cd778dc8bd8f871c85c53..ee682e3b6443eab3f193bd1311679591a1faa712 100644 (file)
Binary files a/app/assets/images/browse/byway.20.png and b/app/assets/images/browse/byway.20.png differ
index 836f8a540309d5726e38f3f0c225f13ee33b7ff8..75d272c23c4f24ec4494113faf4714930c8a6e6b 100644 (file)
Binary files a/app/assets/images/browse/cafe.p.16.png and b/app/assets/images/browse/cafe.p.16.png differ
index b76912566b3ef6003979030186c9f87d46392b88..bf35aaec46cb5bfb8fd989fc94b916fcd11e0441 100644 (file)
Binary files a/app/assets/images/browse/camping.n.16.png and b/app/assets/images/browse/camping.n.16.png differ
index 1dcc537f6b2387a6d7d12fa44c12e36040d3d0f2..e14c9d4eb0906e2dc63f1ee1fd9ad46656cc2c40 100644 (file)
Binary files a/app/assets/images/browse/car_share.p.16.png and b/app/assets/images/browse/car_share.p.16.png differ
index a4b35a43343d31b8ef31f336865563526f404c9b..b605f4059de8f3bdd8e0c6ced0b8109560eae936 100644 (file)
Binary files a/app/assets/images/browse/caravan_park.n.16.png and b/app/assets/images/browse/caravan_park.n.16.png differ
index 6d6d07222b980e3848cad468d7fe9f3a70c2d131..f89cf18e2beca208c76352bea43f0107e2f321bf 100644 (file)
Binary files a/app/assets/images/browse/cemetery.png and b/app/assets/images/browse/cemetery.png differ
index 10661ae4a70a1c8cf606eeeae5dfb60139fb0f38..92abe24270627578c5360e3e1212ffe65f52b954 100644 (file)
Binary files a/app/assets/images/browse/centre.png and b/app/assets/images/browse/centre.png differ
index 21f7dcb65f792c254058e7f1cf7daefb9e8313d7..14b3efc33633f752af4a952142366817b03674b2 100644 (file)
Binary files a/app/assets/images/browse/cinema.p.16.png and b/app/assets/images/browse/cinema.p.16.png differ
index 0d2d27c141152a500780a497831d2f634ac39dc9..3008f1809a613f8b184c02a69c63ec6bd48ced86 100644 (file)
Binary files a/app/assets/images/browse/commercial.png and b/app/assets/images/browse/commercial.png differ
index b2c4de8268d215e66151a020233a73cb46c44afa..4d0c1b4654d1b9794dec3062761fadafbd6b6624 100644 (file)
Binary files a/app/assets/images/browse/common.png and b/app/assets/images/browse/common.png differ
index a75255098dc7ae0ddee98ce12d0a9999766dac0b..882cf11ba275f380045bfc830b3d30082be040fd 100644 (file)
Binary files a/app/assets/images/browse/cycleway.20.png and b/app/assets/images/browse/cycleway.20.png differ
index b9baef7b790c12b7436045c14c773b5e21ffe451..4ce28753c8a2e64597c21a24b3d9a9e611e98c56 100644 (file)
Binary files a/app/assets/images/browse/drinkingtap.p.16.png and b/app/assets/images/browse/drinkingtap.p.16.png differ
index 63651ef8760aabcf700c71fea59cd909975eda55..5b3be736d510da0da4065fd2f9a18797a73b2333 100644 (file)
Binary files a/app/assets/images/browse/education_nursery.p.16.png and b/app/assets/images/browse/education_nursery.p.16.png differ
index 95744bf6c20ddd4a389e51053854e289ac81d25a..8373892afde03d22ceb80626c38eded1e065db64 100644 (file)
Binary files a/app/assets/images/browse/education_school.p.16.png and b/app/assets/images/browse/education_school.p.16.png differ
index 57c92c39e6de9fe8b7705a6f14f3b5bdaade1c42..1b0fc521432cf17e9e805f4b92ba7a349fd3a83d 100644 (file)
Binary files a/app/assets/images/browse/education_university.p.16.png and b/app/assets/images/browse/education_university.p.16.png differ
index 5b6f0bcfd5561fb6f68dd87734c7e35137553c3c..97890000c048d73e79fe571880b4119f8144352f 100644 (file)
Binary files a/app/assets/images/browse/farm.png and b/app/assets/images/browse/farm.png differ
index 28e78bfec5b6abc8dff91b59ae4f8ae8750b4dc4..713290101a026f7bc1fe0c7b0442710e8c36fa1b 100644 (file)
Binary files a/app/assets/images/browse/fast_food.p.16.png and b/app/assets/images/browse/fast_food.p.16.png differ
index cf245592261b646ec11962c663899f12de5f1d06..c8ec4c0e9ab1d029da9d27b76b2297abd341d637 100644 (file)
Binary files a/app/assets/images/browse/firestation.p.16.png and b/app/assets/images/browse/firestation.p.16.png differ
index 5f69d00f16d477cf95bf1481f0309c7dca079795..fb85d592507b92a36d9c627c582a00fec40186de 100644 (file)
Binary files a/app/assets/images/browse/footway.20.png and b/app/assets/images/browse/footway.20.png differ
index 7e37c5df64c2ad974d3bd4898905f5b476f66717..da748f81d25d6a3ec54f7f01f703faa29e95545a 100644 (file)
Binary files a/app/assets/images/browse/forest.png and b/app/assets/images/browse/forest.png differ
index 7bab32a4da74fb192eb99057dbab2b9ea963769b..ba0b37e7eb4ce1f5b47b6d589995b955e6e238f2 100644 (file)
Binary files a/app/assets/images/browse/fuel.p.16.png and b/app/assets/images/browse/fuel.p.16.png differ
index cee412c89bb7151b154b77dc0d168b8ad94ae87f..adba236c889741fa4744f414e7ec5215dac98524 100644 (file)
Binary files a/app/assets/images/browse/gate2.p.16.png and b/app/assets/images/browse/gate2.p.16.png differ
index f05ff255aaf99ebc7883ef6f4eb3edbbe733ae26..4f7afc4fa627be76753e70beaa8fb572d847fa77 100644 (file)
Binary files a/app/assets/images/browse/golf.png and b/app/assets/images/browse/golf.png differ
index fbea173c300a505aa7f39ac1980aa73fa51fe8ba..ed4e9605862514488e1c3558ebeceb462c501d13 100644 (file)
Binary files a/app/assets/images/browse/halt.p.16.png and b/app/assets/images/browse/halt.p.16.png differ
index e3219f7925e2881934a70bd66ee8c828881c06d9..cc05fe988a577698265431ac4c71c8cb7d9e799c 100644 (file)
Binary files a/app/assets/images/browse/health_dentist.p.16.png and b/app/assets/images/browse/health_dentist.p.16.png differ
index 9cdc46914bcd75840f1596933d0d16bc939cb8d6..8efa8a5b91cd7a7d215f6d6f9bb91a3a5c550231 100644 (file)
Binary files a/app/assets/images/browse/health_doctors.p.16.png and b/app/assets/images/browse/health_doctors.p.16.png differ
index d89ff568f66d522df6f286999c82c060dd3ee780..e27633daf2a86df63bd77b739a442e2aa09efcaa 100644 (file)
Binary files a/app/assets/images/browse/health_opticians.p.16.png and b/app/assets/images/browse/health_opticians.p.16.png differ
index dd8ee1699fba9b7497d6a600154c2094acb039a2..6dba64b10fde7e7bf444679cae20697cffc35f57 100644 (file)
Binary files a/app/assets/images/browse/health_veterinary.p.16.png and b/app/assets/images/browse/health_veterinary.p.16.png differ
index 9342b56da93d1fb000188e9a848c1f4d569f00c2..cb2fc225df09ffbe98cc7e0a97f7099717e4bf5c 100644 (file)
Binary files a/app/assets/images/browse/heathland.png and b/app/assets/images/browse/heathland.png differ
index dd4febf2bd3604768042a755497a7401b7dd1664..9cd448a74d94dfd810b881b35c66554390b31c26 100644 (file)
Binary files a/app/assets/images/browse/hospital.p.16.png and b/app/assets/images/browse/hospital.p.16.png differ
index ddab301d16f3d190c6f5a60929225a8a905d85d5..9362692726d5581eca118e2962baa805f14e8edc 100644 (file)
Binary files a/app/assets/images/browse/hostel.p.16.png and b/app/assets/images/browse/hostel.p.16.png differ
index cd2ba1620f096d41f95ad23b2348ffac5b75842c..3133a89b13e975306afb458fff21aeedfaad6dfb 100644 (file)
Binary files a/app/assets/images/browse/hotel.p.16.png and b/app/assets/images/browse/hotel.p.16.png differ
index e90e4633dff8536f75c416f954e0f0b9acbc6a58..4ad4e51934e53cdc4b76232f34cc1f5abe6a11ed 100644 (file)
Binary files a/app/assets/images/browse/industrial.png and b/app/assets/images/browse/industrial.png differ
index 78cdd020ccf328fb43ea0b26493b069b701ff0ba..c838303f6e3c7cccd3290d118883b9084ee52d0e 100644 (file)
Binary files a/app/assets/images/browse/lake.png and b/app/assets/images/browse/lake.png differ
index 27448359f71ad1826fba0935aa5b89e45fc72ff5..64097e3134d29199ec3ce8d9af10a4e2d8b25448 100644 (file)
Binary files a/app/assets/images/browse/level_crossing.p.16.png and b/app/assets/images/browse/level_crossing.p.16.png differ
index 4e42a73ce0d9485f876495bde21fecbf3ee2bb3a..c3e367d182f8c37ad509cc58baecc515048f63fc 100644 (file)
Binary files a/app/assets/images/browse/library.p.16.png and b/app/assets/images/browse/library.p.16.png differ
index 7f65a627177d6f293dc2cd71be330f2bb6487bdf..d5796712a07bf4c5cf6d063b6afb7d578a09eb95 100644 (file)
Binary files a/app/assets/images/browse/light_rail.20.png and b/app/assets/images/browse/light_rail.20.png differ
index 96ffd440c5f9e9ad884e93ed09d2a0f690872cbd..d5dc99f79a867b2544b74fff98de7d0491d8642c 100644 (file)
Binary files a/app/assets/images/browse/lighthouse.p.16.png and b/app/assets/images/browse/lighthouse.p.16.png differ
index 54741f3d225c1941f5b38be4dfc40fd48521e77f..93905b4d8a74f5ff87db49edaab9078b4a09c33d 100644 (file)
Binary files a/app/assets/images/browse/military.png and b/app/assets/images/browse/military.png differ
index 1448b3ee27dcf67e4825ed3138fa10959c026a61..7d89ec4e6cc98d359a48e10d7606601c96a7a96b 100644 (file)
Binary files a/app/assets/images/browse/mini_round.p.16.png and b/app/assets/images/browse/mini_round.p.16.png differ
index c89fa12a8ad63bab3b3ddbb0bb3ca2acd8c0ed6f..183c7941167501914e2335c029ef69480483ca01 100644 (file)
Binary files a/app/assets/images/browse/motorway.20.png and b/app/assets/images/browse/motorway.20.png differ
index c58d306834df72607b299e97a34acbac0893ed73..c587c04d36b71f46319f697a9b95ad52fb795165 100644 (file)
Binary files a/app/assets/images/browse/museum.p.16.png and b/app/assets/images/browse/museum.p.16.png differ
index fac6f1fb97d420ec7266b94a5e8364ef70af1b96..a60755dd068dae9d0c0aec4c5c7ff887adc69e54 100644 (file)
Binary files a/app/assets/images/browse/park.png and b/app/assets/images/browse/park.png differ
index 51660458a6dff36ccfaa68ff126ca7d4b923b92b..dfe1dee6804fa9ff8cacd543baf1fda6a5e60192 100644 (file)
Binary files a/app/assets/images/browse/parking.p.16.png and b/app/assets/images/browse/parking.p.16.png differ
index 13a090e8911ad30a473be5a6de92c55fcd383c88..d4ff508cc05392f1d16cfe794bff336a793506ae 100644 (file)
Binary files a/app/assets/images/browse/path.20.png and b/app/assets/images/browse/path.20.png differ
index fb1c56c8655a9d225c9c48c671dd2b2555f0b745..1541837a8f06aca892bc6b4ea0af83048d57de12 100644 (file)
Binary files a/app/assets/images/browse/pharmacy.p.16.png and b/app/assets/images/browse/pharmacy.p.16.png differ
index 68333b7a4fad035e45b2462856530e7672c26064..a49af3010c6c247c37ce4ffea26e1c05b4b61aa3 100644 (file)
Binary files a/app/assets/images/browse/pitch.png and b/app/assets/images/browse/pitch.png differ
index 95494f59c78ec01c0e5953662b3cb0e6517aa66e..a45cd9ca027ee43a5eeda6d841f7559c5ab42ac9 100644 (file)
Binary files a/app/assets/images/browse/place_of_worship.png and b/app/assets/images/browse/place_of_worship.png differ
index 08b8329632dc178d94ae9ef23efeed3dcfeb494a..f4db652ce5cc0a32d2600f5b36e2fecd76e4d3c7 100644 (file)
Binary files a/app/assets/images/browse/place_of_worship_unknown3.p.16.png and b/app/assets/images/browse/place_of_worship_unknown3.p.16.png differ
index 2dd87aaf2ef20c1dcd08fc640a2572de85f2908f..e9482854a788c11e88a5eff91308116eba70dd4d 100644 (file)
Binary files a/app/assets/images/browse/police.p.16.png and b/app/assets/images/browse/police.p.16.png differ
index 3119cc135629b89585f14ed279fffa92d5b2557b..7c1656d02e82e018e85a9c7e6afabbc191f44d15 100644 (file)
Binary files a/app/assets/images/browse/post_box.p.16.png and b/app/assets/images/browse/post_box.p.16.png differ
index 743255eb0f119d667ec0ddc67e568e0b39b4f21a..d1e2b4dd4f4195d246ce9df181f527cb476c711c 100644 (file)
Binary files a/app/assets/images/browse/post_office.p.16.png and b/app/assets/images/browse/post_office.p.16.png differ
index 668e25d71465161114ebc8145621ce3e50e66a93..7a6efb4c8ea66dceb637509a373b6ea31df6334e 100644 (file)
Binary files a/app/assets/images/browse/primary.20.png and b/app/assets/images/browse/primary.20.png differ
index 4b2fc4015c905b26e737ec3e1dfb11c5fd7a9a44..7971e1e0f787a3d061b7ea332d566d55e40ac7f3 100644 (file)
Binary files a/app/assets/images/browse/prison.p.16.png and b/app/assets/images/browse/prison.p.16.png differ
index b452a7eadc5971e8038982b672449b913a0b318d..6169f80010938cc848ad325c7d87685c24096e14 100644 (file)
Binary files a/app/assets/images/browse/pub.p.16.png and b/app/assets/images/browse/pub.p.16.png differ
index f93a6ef8a9a454e9cd374b088b3a4a3ab88f5bc5..127bde7243c4241400523db8ed2124fd8d27dd69 100644 (file)
Binary files a/app/assets/images/browse/rail.20.png and b/app/assets/images/browse/rail.20.png differ
index 59eb331aaa16521883dab2d046af93a384335d90..83fdd36f074cba5ec5a79c6456fc9cdd457d4c74 100644 (file)
Binary files a/app/assets/images/browse/recycling.p.16.png and b/app/assets/images/browse/recycling.p.16.png differ
index cf16376f6f04a2b43c09fc8e292fb4f32e6d3006..e1aa792fc4e92bdfd567ab1dab6e54b5d6ff1d74 100644 (file)
Binary files a/app/assets/images/browse/reserve.png and b/app/assets/images/browse/reserve.png differ
index 67c2e34e0c9db0229bc41a65fb4eb8cc977b0f25..e3b850e465fbf8fe881704fecb5cac1cc6ab57f9 100644 (file)
Binary files a/app/assets/images/browse/residential.png and b/app/assets/images/browse/residential.png differ
index 5c410087be8006b1fa242ad6184297ea1145110b..e9e360c0cdfeebc869a2491ce872762beec093de 100644 (file)
Binary files a/app/assets/images/browse/restaurant.p.16.png and b/app/assets/images/browse/restaurant.p.16.png differ
index cc9621111a3292f9d362acbdfd3aba77cb166888..23b097ba4e86c5dcca02b81bc353ffd8921a42f9 100644 (file)
Binary files a/app/assets/images/browse/retail.png and b/app/assets/images/browse/retail.png differ
index dac187ff10270041626caaa0f9b71b59621683ff..de044be1ace97e61cad015d73a9c557456e468f4 100644 (file)
Binary files a/app/assets/images/browse/runway.20.png and b/app/assets/images/browse/runway.20.png differ
index ea35d02aa1812160d70a03e3f5e9acac3473ff75..9361041fcc565c70f9bd30d1d72ab787cb9ad8dd 100644 (file)
Binary files a/app/assets/images/browse/school.png and b/app/assets/images/browse/school.png differ
index f6a758ed942c1df004641e906f1ba9a590597781..dfdfd1bfbee16226013df291ee95ec5294a1eb77 100644 (file)
Binary files a/app/assets/images/browse/secondary.20.png and b/app/assets/images/browse/secondary.20.png differ
index b28d744dde2e918db5ddf661808435745e32dad7..e88a602731d1889156a506fddd556df49418d9fd 100644 (file)
Binary files a/app/assets/images/browse/service.20.png and b/app/assets/images/browse/service.20.png differ
index 09ea5305463cfa13ab9847362544556ba26f180a..38ea444a6d1de41b1f37880172e10d93ca751111 100644 (file)
Binary files a/app/assets/images/browse/shelter2.p.16.png and b/app/assets/images/browse/shelter2.p.16.png differ
index 89de12eb5e58174c2abf4c41913ffae9dcc695f8..27ae96b14006c8a00f6d862515589698d2f45ed9 100644 (file)
Binary files a/app/assets/images/browse/shop_bakery.p.16.png and b/app/assets/images/browse/shop_bakery.p.16.png differ
index d0b3680f01a75efd5ca3d9f9c31b4436224193f2..5bb99b9c8949ca12bb7dfb8b1d02e5b1048299ae 100644 (file)
Binary files a/app/assets/images/browse/shop_bicycle.p.16.png and b/app/assets/images/browse/shop_bicycle.p.16.png differ
index dc241d2020b71db4e31f34393ec33f03e001e1e9..46e9b363d5303ace27c1d73a833c74a4e8346c45 100644 (file)
Binary files a/app/assets/images/browse/shop_books.p.16.png and b/app/assets/images/browse/shop_books.p.16.png differ
index 8ff574093f4a6af9940ecd358aee1ee8a61d8bde..0341f9c3b9d90a4cadd0f60dc2a4b02fa828e8f2 100644 (file)
Binary files a/app/assets/images/browse/shop_butcher.p.16.png and b/app/assets/images/browse/shop_butcher.p.16.png differ
index b028a1cdef7f4974fbc79252763dac2fd5208910..973b6178f266a4c44446a4925b5f1a911734fc62 100644 (file)
Binary files a/app/assets/images/browse/shop_clothes.p.16.png and b/app/assets/images/browse/shop_clothes.p.16.png differ
index 2fc7584d5ced273fda88dbfda7412aa26fbcd40c..21257fe4275dc7bfc46f99fbc260658374336ec3 100644 (file)
Binary files a/app/assets/images/browse/shop_convenience.p.16.png and b/app/assets/images/browse/shop_convenience.p.16.png differ
index b1954ab91dffe4c361692a34f73fd694bd55138e..7cd1af6f8ebfaa0242cf739ad1d4a92b194d2c5c 100644 (file)
Binary files a/app/assets/images/browse/shop_diy.p.16.png and b/app/assets/images/browse/shop_diy.p.16.png differ
index fc2cecff5d4deab91c6d1fda3bd14fae964c73ae..9e7835f24512d686be503d730812ae5f47562129 100644 (file)
Binary files a/app/assets/images/browse/shop_estateagent2.p.16.png and b/app/assets/images/browse/shop_estateagent2.p.16.png differ
index 7e0eabbbd0ec46a9802cc77d27d822f767fe5f6c..53e352286d120cda60bf93e72c68a5b4fc123c8d 100644 (file)
Binary files a/app/assets/images/browse/shop_fish.p.16.png and b/app/assets/images/browse/shop_fish.p.16.png differ
index ca07d4302b0a08bcecc9aa875d7065f645212600..897455532faaabe41dbe53c813bd05b8eccda499 100644 (file)
Binary files a/app/assets/images/browse/shop_garden_centre.p.16.png and b/app/assets/images/browse/shop_garden_centre.p.16.png differ
index ac084f5fa47c5b71c38b0fb12666c322f79b0644..35b38f5a82b05376a8e1067b917c9d10ea276474 100644 (file)
Binary files a/app/assets/images/browse/shop_gift.p.16.png and b/app/assets/images/browse/shop_gift.p.16.png differ
index abb2c5231e9e58242fc8f480fa0cd27eea0b8eca..b9fd7e13745d94f0201e187e34f6969e9877a695 100644 (file)
Binary files a/app/assets/images/browse/shop_greengrocer.p.16.png and b/app/assets/images/browse/shop_greengrocer.p.16.png differ
index aa783f260f632fa56773a3df01867445161f5dac..799c004b990483557bfa103395de794380c4ef81 100644 (file)
Binary files a/app/assets/images/browse/shop_hairdresser.p.16.png and b/app/assets/images/browse/shop_hairdresser.p.16.png differ
index bb9825596728dd72574568845fdc07dc4bce2c26..5b0405ec2e633256d4b0127c83140923b78d5146 100644 (file)
Binary files a/app/assets/images/browse/shop_jewelry.p.16.png and b/app/assets/images/browse/shop_jewelry.p.16.png differ
index 3b4338a96e7295b9dfa15728383590d72124b7ca..cfd5577e395acd6da52ae196bd908bc9db9d8d76 100644 (file)
Binary files a/app/assets/images/browse/shop_supermarket.p.16.png and b/app/assets/images/browse/shop_supermarket.p.16.png differ
index f10492d70ec1dca619a0e910f87e2373fbbed7fc..2ecb17ed869dcd46350e43c275c45c33d485f211 100644 (file)
Binary files a/app/assets/images/browse/station.p.16.png and b/app/assets/images/browse/station.p.16.png differ
index 56b89b03de49a1802880a2a282c96f58a7a402cf..d80cc8792cf02cf0e927dde0793281f44e1467fd 100644 (file)
Binary files a/app/assets/images/browse/subway.20.png and b/app/assets/images/browse/subway.20.png differ
index 3fb1dba7a689a303fc5bd31227936f495205fd79..78507b4ec20b5eacb59278531d9610059f50a6a9 100644 (file)
Binary files a/app/assets/images/browse/taxiway.20.png and b/app/assets/images/browse/taxiway.20.png differ
index 29378e44b97b329311faae2874863c633dcabf50..c2e9b1296576bd4265d1e9908eda0cfa3926d8fd 100644 (file)
Binary files a/app/assets/images/browse/telephone.p.16.png and b/app/assets/images/browse/telephone.p.16.png differ
index 3dd7528c18964028a687983607634a8d775b94d5..49a51f113e405755c9689dbe271dc49fe2a52141 100644 (file)
Binary files a/app/assets/images/browse/tertiary.20.png and b/app/assets/images/browse/tertiary.20.png differ
index 6e0feab5ce3bb148a38857c100195f5f69e2c9ec..a49cd447bcfad8f5b292f9653e7204dc0758f854 100644 (file)
Binary files a/app/assets/images/browse/theatre.p.16.png and b/app/assets/images/browse/theatre.p.16.png differ
index 353208cf7c49b297bfa81b25ba2e9c837d6b7b3f..25cdb3d047a88b416e36c8f73d3c06e6f13a5e75 100644 (file)
Binary files a/app/assets/images/browse/toilets.p.16.png and b/app/assets/images/browse/toilets.p.16.png differ
index c70be84d79333d7dbc295217baa1292f15388c8b..3ba099aa71e854a358b27cd1e519e75f70e3b6a4 100644 (file)
Binary files a/app/assets/images/browse/tourism.png and b/app/assets/images/browse/tourism.png differ
index 477166750e6ca973266e7e54a78652ee73d0a027..085783cd24ee2b2084590c120183c47708a1470e 100644 (file)
Binary files a/app/assets/images/browse/tourist_castle.p.16.png and b/app/assets/images/browse/tourist_castle.p.16.png differ
index 0db93d7291ca20ee454d5445e9ad5dfd45514e49..f9dfa1ab53237b5c1a0102b17fe620d8c15db231 100644 (file)
Binary files a/app/assets/images/browse/tourist_memorial.p.16.png and b/app/assets/images/browse/tourist_memorial.p.16.png differ
index 5c468aa1922063fa384b7662bec1c6589261398b..d41ea997c90fc370f3441ccf2428404fe2250e6b 100644 (file)
Binary files a/app/assets/images/browse/tourist_monument.p.16.png and b/app/assets/images/browse/tourist_monument.p.16.png differ
index 0eff097bfba8cb660bab7077741c6a78b59ab93b..d221bf01f4cba917cd72097603f8cf49ae9bbb49 100644 (file)
Binary files a/app/assets/images/browse/tourist_picnic.p.16.png and b/app/assets/images/browse/tourist_picnic.p.16.png differ
index 804672ec6955ad475aef697498bbfefd7c35b09d..ad7c3f1994bab6e0366c92e564d4eadbe9c6fb26 100644 (file)
Binary files a/app/assets/images/browse/tourist_ruins.p.16.png and b/app/assets/images/browse/tourist_ruins.p.16.png differ
index 9ec568cc60ae25e31c611bd8179a0bd6d5414870..ea000cfae911e974365029278e6bd5ffa70bea07 100644 (file)
Binary files a/app/assets/images/browse/tourist_windmill.p.16.png and b/app/assets/images/browse/tourist_windmill.p.16.png differ
index eb190e2071418b068ea543f6f1aeeed1d213e2b8..b01f19bac6870caa3e792893fe7a8e622c704670 100644 (file)
Binary files a/app/assets/images/browse/tourist_wreck.p.16.png and b/app/assets/images/browse/tourist_wreck.p.16.png differ
index 36e579e20a10a5f144627e9d6356a0f8425f343a..074485b3953ac2d3a93c9ad4cebe742c983a55d6 100644 (file)
Binary files a/app/assets/images/browse/track.20.png and b/app/assets/images/browse/track.20.png differ
index 1c2b3ca7b809175517a59d5f7e0d424c47223abe..bc279925fa7a84a62f54fefbf56bd7afaf149afd 100644 (file)
Binary files a/app/assets/images/browse/traffic_light.png and b/app/assets/images/browse/traffic_light.png differ
index 092ec65e5bdc4f002e7df9093fc2aea0c54a1711..9cbd104be079d50fff55d6ae5bd1bdba9786c328 100644 (file)
Binary files a/app/assets/images/browse/tram.20.png and b/app/assets/images/browse/tram.20.png differ
index ff988ba550af54110c0fb6d54a0b1ef46cfb6f9c..85b706f6579ca711bcdbf98d183aa4b17506dc5b 100644 (file)
Binary files a/app/assets/images/browse/transport_parking_bicycle.p.16.png and b/app/assets/images/browse/transport_parking_bicycle.p.16.png differ
index edf986c1e91012a52b80fef45f65a8fb514ed2b2..1a46fba70fcd59c226e204b9f5666b423e129025 100644 (file)
Binary files a/app/assets/images/browse/transport_rental_bicycle.p.16.png and b/app/assets/images/browse/transport_rental_bicycle.p.16.png differ
index b5fc399c881a599d1d943dfa58cf3cfb86cfe272..7874729a7d9707b5bf7a84c7a09fc0e96bab83f5 100644 (file)
Binary files a/app/assets/images/browse/transport_rental_car.p.16.png and b/app/assets/images/browse/transport_rental_car.p.16.png differ
index c8c3067af7d3279a89cc23c90b43d9fb9f970277..3c17f03a4b7eaed5faa54349ef4e9564c5d70eb0 100644 (file)
Binary files a/app/assets/images/browse/tree.p.16.png and b/app/assets/images/browse/tree.p.16.png differ
index 25b374f3618935851fec7bcf96e1275f5fd37eda..930de64e7724883bac5f4cc3c8a24cd93c35ee5c 100644 (file)
Binary files a/app/assets/images/browse/trunk.20.png and b/app/assets/images/browse/trunk.20.png differ
index 49cd98f19a22dc58f0ceff4ce88dc4fc87947281..bc5ee83a40978747aa8eba4b2441b71df336b442 100644 (file)
Binary files a/app/assets/images/browse/tunnel.20.png and b/app/assets/images/browse/tunnel.20.png differ
index d29def0ff0167460fe832868579de5bc7d2b0ac9..c31c6c80ce8ca0c3f396306e0cf4b1b20bf29cf2 100644 (file)
Binary files a/app/assets/images/browse/turning_circle.p.16.png and b/app/assets/images/browse/turning_circle.p.16.png differ
index 2f687c171dc198ddeb1f2736089933abc5c6ec26..1eebbd9b25631f636d7ac228449b8f04bedb72fc 100644 (file)
Binary files a/app/assets/images/browse/unclassified.20.png and b/app/assets/images/browse/unclassified.20.png differ
index b18660c86a7fb794a172e3bf1d2673487823034d..5f9d81ab7b6ae12c878e0c7c1e0ca82b1aee0ea9 100644 (file)
Binary files a/app/assets/images/browse/view_point.p.16.png and b/app/assets/images/browse/view_point.p.16.png differ
index 12dffce4e23b599d5a79ab10d83f6392de636cf1..a2ce43ae2192ef0c3542b8ae6ba3847d7a8be8ea 100644 (file)
Binary files a/app/assets/images/browse/wall.20.png and b/app/assets/images/browse/wall.20.png differ
index 1bebdfa47447dd4aa4f7eb46ae44f9521edfaf83..329bfa483b1d90e4c1e30a01fc6df1fb6b3bb0d7 100644 (file)
Binary files a/app/assets/images/browse/wood.png and b/app/assets/images/browse/wood.png differ
index f0a944e0b89642ae282047846e55393007b04686..5749f65b87fe31911a44d659727db630f735a9e4 100644 (file)
Binary files a/app/assets/images/cc_button.png and b/app/assets/images/cc_button.png differ
index ea434e90e5578f26d02ce90da7666dbb051ad97e..96a2592e1ec89ab75f5f0101959f9505433588bc 100644 (file)
Binary files a/app/assets/images/closed_note_marker@2x.png and b/app/assets/images/closed_note_marker@2x.png differ
index ad673d547ac6a67f50e9c03df6b2845fe48f793c..08a954a45790756c9bb992ae14b5dd0691eb4dea 100644 (file)
Binary files a/app/assets/images/confirm-illustration.png and b/app/assets/images/confirm-illustration.png differ
index 8d52074038784498732c1e6001a995e8c1cb6130..39f6bc2080a21f9264799f610dfcff5c45270c81 100644 (file)
Binary files a/app/assets/images/google.png and b/app/assets/images/google.png differ
index db9b50616a2ef51ec11366fa36ab688692cf6f6e..0cae05889c9a670e2354cb9aa59ba741a1d618bf 100644 (file)
Binary files a/app/assets/images/key/mapnik/admin.png and b/app/assets/images/key/mapnik/admin.png differ
index 9f8d1baceff2158748e07084b21694cb181b3286..e3977188507d3304e158f6b0a9e1f1eed48c9d41 100644 (file)
Binary files a/app/assets/images/key/mapnik/allotments.png and b/app/assets/images/key/mapnik/allotments.png differ
index ba7ac5427b1611ad0c4db3ad13a36cd36d54764c..bcea5e3fb517b7a02236e7776058aef252c0f8d3 100644 (file)
Binary files a/app/assets/images/key/mapnik/apron.png and b/app/assets/images/key/mapnik/apron.png differ
index c59e05a616bad62b383209679fa2820551a68afa..d388d7b811f2d748741ba6d0fc824bf8f3e95b32 100644 (file)
Binary files a/app/assets/images/key/mapnik/bridge.png and b/app/assets/images/key/mapnik/bridge.png differ
index 53fdd3469bdcd9902123a0400144a510b633d600..9aec1ad3338d7946a52ed75be51a6a00e08de637 100644 (file)
Binary files a/app/assets/images/key/mapnik/bridleway.png and b/app/assets/images/key/mapnik/bridleway.png differ
index 7567846d50583ba07ea2c014bcba35812743800d..c0a12794a4f008f5455d434f52dfb8548d76c3f0 100644 (file)
Binary files a/app/assets/images/key/mapnik/brownfield.png and b/app/assets/images/key/mapnik/brownfield.png differ
index cb24a48d91dfae129bc36f9390f890055469c0d2..bc074feeb8013640d4a5f3cd224462f49f3c909b 100644 (file)
Binary files a/app/assets/images/key/mapnik/building.png and b/app/assets/images/key/mapnik/building.png differ
index 4bb3bdb3ed26e5e5a9d2611b9238a5809ccf9443..3b696ef248f6a875654af41545a00902e44ed670 100644 (file)
Binary files a/app/assets/images/key/mapnik/byway.png and b/app/assets/images/key/mapnik/byway.png differ
index eb391f54135436a37b9b21078840cb332c4858f8..84ff6d8d2bcd4eeae137fb0decb4786187a197ee 100644 (file)
Binary files a/app/assets/images/key/mapnik/cable.png and b/app/assets/images/key/mapnik/cable.png differ
index b0b6670610fb19b14147f65d6dc52c3106c66210..f88f47de0396467d507a97261c8fb4ffafc652c6 100644 (file)
Binary files a/app/assets/images/key/mapnik/cemetery.png and b/app/assets/images/key/mapnik/cemetery.png differ
index 98d5ebe492b414a57fbef24064632e990b88bbf9..a1c4522b795ee7b7e0ba64cef052b7356a07dfd1 100644 (file)
Binary files a/app/assets/images/key/mapnik/centre.png and b/app/assets/images/key/mapnik/centre.png differ
index 2d52c6012a0495dfdc43baa9330819deabdd6bfc..7a2ca5e8d04e5b8308bc12faa2dfea8c462c7075 100644 (file)
Binary files a/app/assets/images/key/mapnik/commercial.png and b/app/assets/images/key/mapnik/commercial.png differ
index c785eb073784351016e8eef5aa6e04918634b265..c1422e7be23162dc9a76fd0a682e0ffed4399da3 100644 (file)
Binary files a/app/assets/images/key/mapnik/common.png and b/app/assets/images/key/mapnik/common.png differ
index 838c08667baef73cdc6f527bb21d2d7fdb31261f..bec836d7e4c367e42fa0baf3f21ebd0eca9998ce 100644 (file)
Binary files a/app/assets/images/key/mapnik/construction.png and b/app/assets/images/key/mapnik/construction.png differ
index 15e793344fefed17d9326068f6c3bf56e8893bfb..a1a16f1edc26b0db39ee436da2e63caf04e7872e 100644 (file)
Binary files a/app/assets/images/key/mapnik/cycleway.png and b/app/assets/images/key/mapnik/cycleway.png differ
index 7368fba21ae12f04e35c68d4956478a86078526b..1fe261dbe60da8734cda4af78491597e1b223715 100644 (file)
Binary files a/app/assets/images/key/mapnik/destination.png and b/app/assets/images/key/mapnik/destination.png differ
index 355352624e6c419defa869f3932ffe77ccf3ebf1..e63e571bbf6505ffa4045270a8f8f7d5f2ddb411 100644 (file)
Binary files a/app/assets/images/key/mapnik/farm.png and b/app/assets/images/key/mapnik/farm.png differ
index 33a35100254e920ac8ced00fe848702df85b869f..4486119baafec27a9cb8fca9ef8327b8b1cc2e09 100644 (file)
Binary files a/app/assets/images/key/mapnik/footway.png and b/app/assets/images/key/mapnik/footway.png differ
index 14c6b4275fe141395ec27305f306cd7cba1ce897..5b341c61dbe32c9bf785b2163770720190530d52 100644 (file)
Binary files a/app/assets/images/key/mapnik/forest.png and b/app/assets/images/key/mapnik/forest.png differ
index ae91f13291b6af78c036e5c74f807b3bed994382..11a623097db4356bfd384688ef73b2f0db14e34a 100644 (file)
Binary files a/app/assets/images/key/mapnik/golf.png and b/app/assets/images/key/mapnik/golf.png differ
index 4238d66b8349ba103ec86f2d7c1dc7e240bec555..d48f9690f3732f2fd7efa613d579292e3d934975 100644 (file)
Binary files a/app/assets/images/key/mapnik/heathland.png and b/app/assets/images/key/mapnik/heathland.png differ
index bc0243c7696165bcf01b87eea76f1d0b1b4e96eb..c5ac802ac5aaff46fd2d061bd22a92fe6d49e6aa 100644 (file)
Binary files a/app/assets/images/key/mapnik/industrial.png and b/app/assets/images/key/mapnik/industrial.png differ
index 28f3a9df9eb3785929b7b97d46c83b42e589dd46..3f16b54d123c8affa6b461ce8ab9a9c9919dfc5f 100644 (file)
Binary files a/app/assets/images/key/mapnik/lake.png and b/app/assets/images/key/mapnik/lake.png differ
index c6a11724aaccbd96adafba50e93ca2e7d6dc81ef..73c82d49eaa748bdbd9bb20eccf0044d068eaeec 100644 (file)
Binary files a/app/assets/images/key/mapnik/military.png and b/app/assets/images/key/mapnik/military.png differ
index 2c962c621650c34cd98737c20aa0e7a0a9a9cf5c..3940c83d2da2b40f304d136c3ecd5ac47bb99a3d 100644 (file)
Binary files a/app/assets/images/key/mapnik/motorway.png and b/app/assets/images/key/mapnik/motorway.png differ
index bce93547368276533e10a1a4244154e0b56149ee..149795a876861f7f0cfd882f441eb288ca5b0dfe 100644 (file)
Binary files a/app/assets/images/key/mapnik/park.png and b/app/assets/images/key/mapnik/park.png differ
index 627b8ad373268c709bb8bd12cbbbd2551401a4d7..d8239f1287e7d7c94f0bcaa72955ed0d33c17475 100644 (file)
Binary files a/app/assets/images/key/mapnik/permissive.png and b/app/assets/images/key/mapnik/permissive.png differ
index 78f5aa17ff5cf8f239d727f3030d07d3eecd004f..98177f60439f303070861fc7a5cd903db1cbb9f6 100644 (file)
Binary files a/app/assets/images/key/mapnik/pitch.png and b/app/assets/images/key/mapnik/pitch.png differ
index 12191ebc437f24044f196cb05e778c19f2570604..a51703c4f065bc956f3e0eba35957011f603ed0e 100644 (file)
Binary files a/app/assets/images/key/mapnik/primary.png and b/app/assets/images/key/mapnik/primary.png differ
index c9b9cd91432e8f5850147939451f9aefd1eef50f..741b13896b60762ccd4a8e157446d8f109b91c83 100644 (file)
Binary files a/app/assets/images/key/mapnik/primary12.png and b/app/assets/images/key/mapnik/primary12.png differ
index 22e7a3a90f24b71153093b56def5886a2376604d..7a5f90042ef480ca94562f101bd6bf7265b5f918 100644 (file)
Binary files a/app/assets/images/key/mapnik/private.png and b/app/assets/images/key/mapnik/private.png differ
index 861f93120fac89d4fcd0676705a34e0ad1e578af..0abf0c1df09c9440b3ce9cf62e0b6fec05b5b914 100644 (file)
Binary files a/app/assets/images/key/mapnik/rail.png and b/app/assets/images/key/mapnik/rail.png differ
index ec87192fb75b8ca2439393fe7a85515969f968c1..957f17c850486bf62e97a2c82465ba2b9f34857f 100644 (file)
Binary files a/app/assets/images/key/mapnik/rail13.png and b/app/assets/images/key/mapnik/rail13.png differ
index 483d43a3c23534516271e73ad2e4e909ff26491c..5e3a79f0d0acb07a8b80d33a76e01d86fcb1e9a9 100644 (file)
Binary files a/app/assets/images/key/mapnik/reserve.png and b/app/assets/images/key/mapnik/reserve.png differ
index 26116d0a105989dd8a12ad75878f28c2d277e991..6ee3c4d2b08b207b8bc19784c79e2e039f6753bc 100644 (file)
Binary files a/app/assets/images/key/mapnik/resident.png and b/app/assets/images/key/mapnik/resident.png differ
index 6469e15bf39886ab217a0e08e87a6fdbddbd61f9..21679921291562f26ac2402f69dd00db35edc7c6 100644 (file)
Binary files a/app/assets/images/key/mapnik/retail.png and b/app/assets/images/key/mapnik/retail.png differ
index 2a0b9d3b9dba9f786bce948dff7b377a65d3bf12..c65672806a6f3d2b50ab2a126f7cb260e5fa48d6 100644 (file)
Binary files a/app/assets/images/key/mapnik/runway.png and b/app/assets/images/key/mapnik/runway.png differ
index c1478c656a7e33db55674a25ebb41c1e40b35097..50f30a2f37b9e9cfeefe938210952d37053cb1b4 100644 (file)
Binary files a/app/assets/images/key/mapnik/school.png and b/app/assets/images/key/mapnik/school.png differ
index 16f2547962c618f496753ec3adab2f81667662d0..cbd457839c28fdc7a811557fa943e1e7a25abac7 100644 (file)
Binary files a/app/assets/images/key/mapnik/secondary.png and b/app/assets/images/key/mapnik/secondary.png differ
index 121670fcf88f8d79868911c461624336afde5e30..b95b18822b5c0d9c1f60c6c5c4552c769c60a3d6 100644 (file)
Binary files a/app/assets/images/key/mapnik/secondary12.png and b/app/assets/images/key/mapnik/secondary12.png differ
index 1a10b1c49b82aa257ed0fd88c18b60a725ff5461..6c36e3c6192ed0b3092aef6687e985231d127fa8 100644 (file)
Binary files a/app/assets/images/key/mapnik/station.png and b/app/assets/images/key/mapnik/station.png differ
index 76ea5e806c205cd17953d586c72c70b92ef5077a..cb42ee2dcf4fe97e5e8eac33c7bae81d6e7b1de0 100644 (file)
Binary files a/app/assets/images/key/mapnik/subway.png and b/app/assets/images/key/mapnik/subway.png differ
index 4a4ec24263102a7cf51f0e54a78e845461b33b87..9dbfcd3608bf26a0ec35878da73631856052dc63 100644 (file)
Binary files a/app/assets/images/key/mapnik/summit.png and b/app/assets/images/key/mapnik/summit.png differ
index df512bb8cfd4385b14568e11bbcdd8da3aa9d33c..bb3cf368609969a516ece6793250d76cc0b186e2 100644 (file)
Binary files a/app/assets/images/key/mapnik/tourist.png and b/app/assets/images/key/mapnik/tourist.png differ
index 60bbbe96c94d84198dfab4f4df1892f56bda80e1..f294edca0960d86ec1ebce40e1b3a78d3302b212 100644 (file)
Binary files a/app/assets/images/key/mapnik/track.png and b/app/assets/images/key/mapnik/track.png differ
index 46f3877ad6ae4b87c0f57b0f22479cd780c1d569..1c64b2877287f1a58218f5a631a3209363894673 100644 (file)
Binary files a/app/assets/images/key/mapnik/tram.png and b/app/assets/images/key/mapnik/tram.png differ
index 690396363286c3f19553bea1ad1cb952894ac598..93611efa3e2bc3621cb1c71daaaa68b79afe4812 100644 (file)
Binary files a/app/assets/images/key/mapnik/trunk.png and b/app/assets/images/key/mapnik/trunk.png differ
index 399e26bb2a85fc375ae3b07b23741447335ce1db..d8becf0208fbbac7117c767cd4995c91be5126cc 100644 (file)
Binary files a/app/assets/images/key/mapnik/trunk12.png and b/app/assets/images/key/mapnik/trunk12.png differ
index cc5b1c32f6ae3c484fa315728fce8c1dca7c69fb..4c52ff4fe5fb90ae3722eaf14724898ca46ad162 100644 (file)
Binary files a/app/assets/images/key/mapnik/tunnel.png and b/app/assets/images/key/mapnik/tunnel.png differ
index 5f3b8c5a59421e833caca8433cf3d853c0680b9b..3cdfb2dda0157645802c4645bb651bb64f6291d0 100644 (file)
Binary files a/app/assets/images/key/mapnik/unclassified.png and b/app/assets/images/key/mapnik/unclassified.png differ
index 5b63d91942f6f6f0f5fd2dfe2083174bb8ff90cf..1a87924622cfeb45b1ab602c9effe7049b0b0b45 100644 (file)
Binary files a/app/assets/images/key/mapnik/unclassified13.png and b/app/assets/images/key/mapnik/unclassified13.png differ
index 2dec21a0d7d185568ec4488fe8e3fa80a882977e..25c21504983fefaf3f04d9b3e4c9d232e6d360d8 100644 (file)
Binary files a/app/assets/images/key/mapnik/unsurfaced.png and b/app/assets/images/key/mapnik/unsurfaced.png differ
index 821781a1c780f03b512cee24730fa8f644c27f81..2413cda6cd2f35e3d07fc38bcee97608a3d6619c 100644 (file)
Binary files a/app/assets/images/key/mapnik/wood.png and b/app/assets/images/key/mapnik/wood.png differ
index c4f3cf3acc3814b04459095648f6f27883db5833..1356dfae5c3932f0e11bf93b127c05bc65ea6110 100644 (file)
Binary files a/app/assets/images/mag_map-rss2.0.png and b/app/assets/images/mag_map-rss2.0.png differ
index 99734b12f4f5bc39a893851ac5493906cbb6655f..f1e16c4852830b41f65c3bd5822996ac4bb06670 100644 (file)
Binary files a/app/assets/images/map_sprite.png and b/app/assets/images/map_sprite.png differ
index 1ac4864d4a0c95a022e19ef38b4544711de39f1e..160a15c08c41c817dfc8dd03dbfaf89f52ff5199 100644 (file)
Binary files a/app/assets/images/map_zoomin.png and b/app/assets/images/map_zoomin.png differ
index d67a87de533e307cb0e95ab2623259d98eb1adae..4fea1e6e493502059b5d4f6ebd4d0c2784f611be 100644 (file)
Binary files a/app/assets/images/map_zoomout.png and b/app/assets/images/map_zoomout.png differ
index 7614b7c7f6816e70965810833819a372ec50620f..98b6726162ba31b42c8a827fc73cf66a054176da 100644 (file)
Binary files a/app/assets/images/marker-blue.png and b/app/assets/images/marker-blue.png differ
index 56a0b1c47ef8524432b9e1f891e27a74b54957b3..f0e64e747fa04ea73fb837f4f141e255c35268a7 100644 (file)
Binary files a/app/assets/images/marker-green.png and b/app/assets/images/marker-green.png differ
index 46c70185a9cce81511db93eaa2a518d00b4fdef6..5ea2a6cc4174c43df080773d46cfa11f1ceee781 100644 (file)
Binary files a/app/assets/images/marker-red.png and b/app/assets/images/marker-red.png differ
index eb6d6ef74c35842986b2cc12641608b69a48efde..394aa5341045b396cace3662b317497d6b91a88d 100644 (file)
Binary files a/app/assets/images/marker-yellow.png and b/app/assets/images/marker-yellow.png differ
index da3f92c5d9b2bef49ae99c106ee68eb058664881..a67c73cf1c30ad943fd951bdfa9a1f3799a26567 100644 (file)
Binary files a/app/assets/images/menu-icon.png and b/app/assets/images/menu-icon.png differ
index 5e410bb8149502b8019644e62000eac51eb34dba..080018f9cb3f747e2781b0a67da5c2b5ea4a97ac 100644 (file)
Binary files a/app/assets/images/myopenid.png and b/app/assets/images/myopenid.png differ
index d6355e0217adb23f6ab401bfa6b9b81ef3004db6..4a9fa8b362368b55aaf0803e286ab10908659635 100644 (file)
Binary files a/app/assets/images/new.png and b/app/assets/images/new.png differ
index 6098079cd7cf1d7b55d281d5d82cc5838c7522fe..756ad6fe5ba510fa4eb3710bb990fd51eb041540 100644 (file)
Binary files a/app/assets/images/new_note_marker@2x.png and b/app/assets/images/new_note_marker@2x.png differ
index a2698d77bae2069880c9fa8ecb63ae107bc6b035..f9285e49b9a9679fc0a7e2cee41e0481e6826663 100644 (file)
Binary files a/app/assets/images/notice.png and b/app/assets/images/notice.png differ
index e465ca918a0748a27d89fd337d511fe4306a428d..84df3f725fba80e4efa08440f9f8209d890355c5 100644 (file)
Binary files a/app/assets/images/open_note_marker@2x.png and b/app/assets/images/open_note_marker@2x.png differ
index dd6f65e9dd1462e3661b862d189a47876882f17a..dc7e01fc094abff1986a76a3a48af2f7a9d00783 100644 (file)
Binary files a/app/assets/images/openid.png and b/app/assets/images/openid.png differ
index b5aa49dfaec71d4b4e6ec803bd2d73f39f94ce1c..954297520c3ee8b4fdb0cf14cab9110b868e724f 100644 (file)
Binary files a/app/assets/images/openid_input.png and b/app/assets/images/openid_input.png differ
index 83bb3028211cbffff861923db88e1dfff91f294f..41adc9fa6e3f26a959a8a96597611ecb7bccacf6 100644 (file)
Binary files a/app/assets/images/openid_small.png and b/app/assets/images/openid_small.png differ
index a2d3671f948fa4b2b130d6b449b73c7a4cccba58..22f116632d5dc879cbba68b3dfed8a853f9dd6c7 100644 (file)
Binary files a/app/assets/images/osm_logo.png and b/app/assets/images/osm_logo.png differ
index 63713fb9a2b90e6397af68d8d71e933465ae15dd..67c4b21cc5cfaae9e6690d9e797b3d609d1b2fcb 100644 (file)
Binary files a/app/assets/images/osm_logo_114.png and b/app/assets/images/osm_logo_114.png differ
index 35a9754505861bcd0cc2719b885cccf1feb5ede1..b24fb1c3acd70fc1125fc6bb4b6c395cd9fb0ac6 100644 (file)
Binary files a/app/assets/images/osm_logo_144.png and b/app/assets/images/osm_logo_144.png differ
index 752d6363b4d7df1cda4ff8843b6200b0e79b0f2a..d387ad25db818df6e6a72ad61e7b9828d2b8edcc 100644 (file)
Binary files a/app/assets/images/osm_logo_228.png and b/app/assets/images/osm_logo_228.png differ
index dc4e6d5aabae84cafba47897060584b3f460e213..2bb1f30e6ee4131b9ac922be764e9131b21473fe 100644 (file)
Binary files a/app/assets/images/osm_logo_72.png and b/app/assets/images/osm_logo_72.png differ
index ea363d25767894e4f65b0c30872590ee08ab5173..6bb919cf625928c3e691a75ea96191e6b6052892 100644 (file)
Binary files a/app/assets/images/roles/administrator.png and b/app/assets/images/roles/administrator.png differ
index 7dc30728432a846e55ac2c1c368845b96424b032..1608387c804ae933708172de8fdc4d6858a979da 100644 (file)
Binary files a/app/assets/images/roles/blank_moderator.png and b/app/assets/images/roles/blank_moderator.png differ
index 5f780299ed0166d561cdc9221c996d3750f972ab..5c837b00b91a95b6aa550ed3d2a5b2fce497aaaf 100644 (file)
Binary files a/app/assets/images/sign-up-illustration-arm.png and b/app/assets/images/sign-up-illustration-arm.png differ
index 0a92b9c5b1fca49e26d5a9fc662b68c3aa3ab9a3..e785ec602821bb9b5e6ac3a1854ac968a939e1bb 100644 (file)
Binary files a/app/assets/images/sign-up-illustration.png and b/app/assets/images/sign-up-illustration.png differ
index 05bb1466be7a228488f3abe70b79f99d51ea5f87..a6c5449fdbdab5e21b7193d42239844f61843de5 100644 (file)
Binary files a/app/assets/images/sotm-birmingham-ad.png and b/app/assets/images/sotm-birmingham-ad.png differ
index c1ab6f26145c7b4f6deadebe36b38d388d166049..c775396c0c2eacc78b99c0e7ab5e863b8b1d855b 100644 (file)
Binary files a/app/assets/images/sotm-us-ad.png and b/app/assets/images/sotm-us-ad.png differ
index e3ed0e7f81185d93ae6d75b8aab27d20d521242a..d5577d4b7121a50486799d697e50f189dcfc835f 100644 (file)
Binary files a/app/assets/images/sprite.png and b/app/assets/images/sprite.png differ
index 475da0e87e5ead68479c8c5037c67a3dca064485..7c32f4f30257d4bdf9deeeea30bc3f4d9ea230c2 100644 (file)
Binary files a/app/assets/images/terms-illustration.png and b/app/assets/images/terms-illustration.png differ
index ec0a7fde6e15d7b4b1974bc7c3684b91d38c70f8..c33266c56b867643e72bd933063e1961848cc1be 100644 (file)
Binary files a/app/assets/images/users/images/large.png and b/app/assets/images/users/images/large.png differ
index 19fd092ccd6dfbdf98a5c4c1040509387f9a1ac7..7e3f60130b06c184ba78651b33f5ef490dd37e0c 100644 (file)
Binary files a/app/assets/images/users/images/small.png and b/app/assets/images/users/images/small.png differ
index 969c53f964f2ca669eecf7892d20dc8891c06509..f904f00cddbb73d0b88c7990956414b70e093b60 100644 (file)
Binary files a/app/assets/images/welcome-sprite.png and b/app/assets/images/welcome-sprite.png differ
index 21e22ed41bb753462f7f3443e31adcaf9f8a06f4..6f63efc2c95ac736b2676badb256ac1a73081c86 100644 (file)
Binary files a/app/assets/images/wordpress.png and b/app/assets/images/wordpress.png differ
index 7bd439d4f72c003b361972f4088cb7b061f28c7e..2a9c4a4f3529e6a3996753aebd7221f1e7259eff 100644 (file)
Binary files a/app/assets/images/yahoo.png and b/app/assets/images/yahoo.png differ
index 66dfa5b6fac3975a2c00daa6b651d76034303ef0..afb6b3d6546b3de788bf0a834c0c6db72ac3b494 100644 (file)
@@ -236,6 +236,10 @@ $(document).ready(function () {
     };
 
     page.load = function() {
+      var params = querystring.parse(location.search.substring(1));
+      if (params.query) {
+        $("#sidebar .search_form input[name=query]").value(params.query);
+      }
       if (!("autofocus" in document.createElement("input"))) {
         $("#sidebar .search_form input[name=query]").focus();
       }
index 30b6349fde6ac0e7ea5c2add73a9f356350dfa79..a8f4feb786a9d44fa9a280f4d3968bfdf35a532b 100644 (file)
@@ -2,6 +2,16 @@
 //= require_tree ./directions_engines
 
 OSM.Directions = function (map) {
+  $(".directions_form a.directions_close").on("click", function(e) {
+    e.preventDefault();
+    var route_from = $(e.target).parent().parent().parent().find("input[name=route_from]").val();
+    if (route_from) {
+      OSM.router.route("/?query=" + encodeURIComponent(route_from) + OSM.formatHash(map));
+    } else {
+      OSM.router.route("/" + OSM.formatHash(map));
+    }
+  });
+
   var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
   var awaitingRoute;   // true if we've asked the engine for a route and are waiting to hear back
   var dragging;        // true if the user is dragging a start/end point
@@ -22,8 +32,8 @@ OSM.Directions = function (map) {
   });
 
   var endpoints = [
-    Endpoint($("input[name='route_from']"), <%= asset_path('marker-green.png').to_json %>),
-    Endpoint($("input[name='route_to']"),   <%= asset_path('marker-red.png').to_json %>)
+    Endpoint($("#content input[name='route_from']"), <%= asset_path('marker-green.png').to_json %>),
+    Endpoint($("#content input[name='route_to']"),   <%= asset_path('marker-red.png').to_json %>)
   ];
 
   function Endpoint(input, iconUrl) {
@@ -52,10 +62,23 @@ OSM.Directions = function (map) {
     });
 
     input.on("change", function (e) {
+      endpoint.getGeocode();
+    });
+
+    endpoint.getGeocode = function() {
+      var value = input.val();
+
+      // if no one has entered a value yet, then we can't geocode, so don't
+      // even try.
+      if (!value) {
+        return;
+      }
+
       endpoint.awaitingGeocode = true;
 
-      $.getJSON('<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(e.target.value) + '&format=json', function (json) {
+      $.getJSON('<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(value) + '&format=json', function (json) {
         endpoint.awaitingGeocode = false;
+        endpoint.hasGeocode = true;
 
         if (json.length == 0) {
           alert(I18n.t('javascripts.directions.errors.no_place'));
@@ -74,11 +97,12 @@ OSM.Directions = function (map) {
           getRoute();
         }
       });
-    });
+    }
 
     endpoint.setLatLng = function (ll) {
       var precision = OSM.zoomPrecision(map.getZoom());
       input.val(ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision));
+      endpoint.hasGeocode = true;
       endpoint.latlng = ll;
       endpoint.marker
         .setLatLng(ll)
@@ -115,6 +139,15 @@ OSM.Directions = function (map) {
   }
 
   function getRoute() {
+    // go fetch geocodes for any endpoints which have not already
+    // been geocoded.
+    for (var ep_i = 0; ep_i < 2; ++ep_i) {
+      var endpoint = endpoints[ep_i];
+      if (!endpoint.hasGeocode && !endpoint.awaitingGeocode) {
+        endpoint.getGeocode();
+        awaitingGeocode = true;
+      }
+    }
     if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) {
       awaitingGeocode = true;
       return;
@@ -133,14 +166,16 @@ OSM.Directions = function (map) {
              d.lat.toFixed(precision) + ',' + d.lng.toFixed(precision)
     }));
 
-    $(".directions_form .spinner").show();
+    // copy loading item to sidebar and display it. we copy it, rather than
+    // just using it in-place and replacing it in case it has to be used
+    // again.
+    $('#sidebar_content').html($('.directions_form .loader_copy').html());
     awaitingRoute = true;
+    map.setSidebarOverlaid(false);
 
     chosenEngine.getRoute([o, d], function (err, route) {
       awaitingRoute = false;
 
-      $(".directions_form .spinner").hide();
-
       if (err) {
         map.removeLayer(polyline);
 
@@ -155,8 +190,6 @@ OSM.Directions = function (map) {
         .setLatLngs(route.line)
         .addTo(map);
 
-      map.setSidebarOverlaid(false);
-
       if (!dragging) {
         map.fitBounds(polyline.getBounds().pad(0.05));
       }
@@ -220,6 +253,14 @@ OSM.Directions = function (map) {
       $('#sidebar_content').append('<p id="routing_credit">' +
         I18n.t('javascripts.directions.instructions.courtesy', {link: chosenEngine.creditline}) +
         '</p>');
+
+      $('#sidebar_content a.geolink').on('click', function(e) {
+        e.preventDefault();
+        map.removeLayer(polyline);
+        $('#sidebar_content').html('');
+        map.setSidebarOverlaid(true);
+        // TODO: collapse width of sidebar back to previous
+      });
     });
   }
 
@@ -290,6 +331,10 @@ OSM.Directions = function (map) {
       setEngine(params.engine);
     }
 
+    if (params.from) {
+      $(".directions_form input[name='route_from']").val(params.from);
+    }
+
     var o = route[0] && L.latLng(route[0].split(',')),
         d = route[1] && L.latLng(route[1].split(','));
 
index 1f45a687278a37a797576628107037830cb9751a..29916272e6285dfd51db9af120f3119e9944989d 100644 (file)
@@ -95,14 +95,20 @@ OSM.Query = function(map) {
         if (prefixes[key]) {
           if (prefixes[key][value]) {
             return prefixes[key][value];
-          } else {
-            var first = value.substr(0, 1).toUpperCase(),
-              rest = value.substr(1).replace(/_/g, " ");
-
-            return first + rest;
           }
         }
       }
+
+      for (var key in tags) {
+        var value = tags[key];
+
+        if (prefixes[key]) {
+          var first = value.substr(0, 1).toUpperCase(),
+            rest = value.substr(1).replace(/_/g, " ");
+
+          return first + rest;
+        }
+      }
     }
 
     if (!prefix) {
index 46f756f3bc017275fb0c1a51b112d54c65d0aea7..08d2dc96c92b178c7ee10e0d1640ff4b7347c083 100644 (file)
@@ -9,6 +9,16 @@ OSM.Search = function(map) {
     }
   });
 
+  $(".search_form a.button.switch_link").on("click", function(e) {
+    e.preventDefault();
+    var query = $(e.target).parent().parent().find("input[name=query]").val();
+    if (query) {
+      OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
+    } else {
+      OSM.router.route("/directions" + OSM.formatHash(map));
+    }
+  });
+
   $(".search_form").on("submit", function(e) {
     e.preventDefault();
     $("header").addClass("closed");
index c0f72af208eee184b3e0de58e0f2bcd3bb9216de..0df22eb57f479825aeec2a9515f032371934966e 100644 (file)
@@ -16,7 +16,7 @@ L.OSM.note = function (options) {
     update();
 
     function update() {
-      var disabled = map.getZoom() < 12;
+      var disabled = OSM.STATUS === "database_offline" || map.getZoom() < 12;
       link
         .toggleClass('disabled', disabled)
         .attr('data-original-title', I18n.t(disabled ?
index d327296f63621e97aacecd7e4b7bdbd043134540..19b5619a2558cef99ab7deec512841dd487d9eff 100644 (file)
@@ -11,7 +11,7 @@ if (OSM.PIWIK) {
         piwikTracker = Piwik.getTracker(base + "piwik.php", OSM.PIWIK.site);
       
         if (OSM.user) {
-          piwikTracker.setUserId(OSM.user);
+          piwikTracker.setUserId(OSM.user.toString());
         }
 
         piwikTracker.trackPageView();
index d6549e740debff83c5a316f3a717d1b3b4ee230c..7efe76cb116060cc10d5a76d372bd685b7c36003 100644 (file)
@@ -948,6 +948,15 @@ header .search_forms,
     border-radius: 0 2px 2px 0;
   }
 
+  select {
+    border-radius: $border-radius;
+        border: $border;
+        background-color: white;
+        /* this next line is to polyfill the vertical alignment of text within a select element,
+         * which is different between firefox and chrome. */
+        padding: 0.3em 0;
+  }
+
   .query_options {
     text-align: right;
     font-size: 10px;
@@ -2109,7 +2118,8 @@ a.button {
   input[type="submit"],
   input[type="button"],
   input[type="reset"],
-  .button {
+  .button,
+  .button_to {
     box-sizing: border-box;
     float: left;
     border-radius: 0;
@@ -2122,30 +2132,36 @@ a.button {
     overflow: hidden;
   }
   input:first-child,
-  .button:first-child {
+  .button:first-child,
+  .button_to:first-child {
     border-radius:2px 0 0 2px;
   }
   input:last-child,
-  .button:last-child {
+  .button:last-child,
+  .button_to:last-child {
     border-radius:0 2px 2px 0;
     border-right-width: 0;
   }
   input:only-child,
   .button:only-child,
+  .button_to:only-child,
   *[value="Hide"] + input:last-child,
-  *[value="Hide"] + .button:last-child {
+  *[value="Hide"] + .button:last-child,
+  *[value="Hide"] + .button_to:last-child {
     border-radius:2px;
     border-right-width: 0;
   }
     /* if a 3-button set has a hidden middle button */
   *[value="Hide"] + input:nth-child(3),
-  *[value="Hide"] + .button:nth-child(3) {
+  *[value="Hide"] + .button:nth-child(3),
+  *[value="Hide"] + .button_to:nth-child(3) {
     border-radius:0 2px 2px 0;
     border-right-width: 0;
   }
   /* if a 3-button set starts with a hidden button */
   *[value="Hide"] + input:nth-child(2):not(:last-child),
-  *[value="Hide"] + .button:nth-child(2):not(:last-child) {
+  *[value="Hide"] + .button:nth-child(2):not(:last-child),
+  *[value="Hide"] + .button_to:nth-child(2):not(:last-child) {
     border-radius:2px 0 0 2px;
     border-right-width: 1px;
   }
index 989444a62d77999c5f96dfa5b935122833623250..eb363459c22854b1ec15be3ba9a1400c3d5f46ab 100644 (file)
@@ -16,3 +16,4 @@ $sidebarWidth: 350px;
 $keyline: 1px solid $lightgrey;
 $border-radius: 3px;
 $list-highlight: #FFFFE6;
+$border: 1px solid $grey;
index 90a9672760755a6ee060e8540cb6fc71ea041d5d..bd4a629482b6be70a8639c35533aba09368c6508 100644 (file)
@@ -192,14 +192,22 @@ class ApplicationController < ActionController::Base
 
   def check_database_readable(need_api = false)
     if STATUS == :database_offline or (need_api and STATUS == :api_offline)
-      redirect_to :controller => 'site', :action => 'offline'
+      if request.xhr?
+        report_error "Database offline for maintenance", :service_unavailable
+      else
+        redirect_to :controller => 'site', :action => 'offline'
+      end
     end
   end
 
   def check_database_writable(need_api = false)
     if STATUS == :database_offline or STATUS == :database_readonly or
        (need_api and (STATUS == :api_offline or STATUS == :api_readonly))
-      redirect_to :controller => 'site', :action => 'offline'
+      if request.xhr?
+        report_error "Database offline for maintenance", :service_unavailable
+      else
+        redirect_to :controller => 'site', :action => 'offline'
+      end
     end
   end
 
index f0b92f4b47a33e7f8fbe7208348598f7b5b61cca..f60957ff7db3733ae1a7cb4c3b20f8457056e59c 100644 (file)
@@ -3,7 +3,7 @@ class BrowseController < ApplicationController
 
   before_filter :authorize_web  
   before_filter :set_locale 
-  before_filter { |c| c.check_database_readable(true) }
+  before_filter :except => [ :query ] { |c| c.check_database_readable(true) }
   before_filter :require_oauth
   around_filter :web_timeout
 
index adda8c20c0fe536a882ad7894ef0240973725368..eaa87df7bfa5ba3275daa2c12a92fcee68e65e25 100644 (file)
@@ -336,12 +336,12 @@ class ChangesetController < ApplicationController
     # Notify current subscribers of the new comment
     changeset.subscribers.each do |user|
       if @user != user
-        Notifier.changeset_comment_notification(comment, user).deliver
+        Notifier.changeset_comment_notification(comment, user).deliver_now
       end
     end
 
     # Add the commenter to the subscribers if necessary
-    changeset.subscribers << @user unless changeset.subscribers.exists?(@user)
+    changeset.subscribers << @user unless changeset.subscribers.exists?(@user.id)
 
     # Return a copy of the updated changeset
     render :text => changeset.to_xml.to_s, :content_type => "text/xml"
@@ -359,7 +359,7 @@ class ChangesetController < ApplicationController
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)
     raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
-    raise OSM::APIChangesetAlreadySubscribedError.new(changeset) if changeset.subscribers.exists?(@user)
+    raise OSM::APIChangesetAlreadySubscribedError.new(changeset) if changeset.subscribers.exists?(@user.id)
 
     # Add the subscriber
     changeset.subscribers << @user
@@ -380,7 +380,7 @@ class ChangesetController < ApplicationController
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)
     raise OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
-    raise OSM::APIChangesetNotSubscribedError.new(changeset) unless changeset.subscribers.exists?(@user)
+    raise OSM::APIChangesetNotSubscribedError.new(changeset) unless changeset.subscribers.exists?(@user.id)
 
     # Remove the subscriber
     changeset.subscribers.delete(@user)
index 091744e2226256e0d6aba9cd283a68ec37b896df..741ff15002d2d98e7e0f498e4971d74d772f15cd 100644 (file)
@@ -58,7 +58,7 @@ class DiaryEntryController < ApplicationController
     @diary_comment.user = @user
     if @diary_comment.save
       if @diary_comment.user != @entry.user
-        Notifier.diary_comment_notification(@diary_comment).deliver
+        Notifier.diary_comment_notification(@diary_comment).deliver_now
       end
 
       redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
index fd638e4e7758b26df7be6d2bd42c7a963e9716c0..c7acc90d8f2680438d07573a06e1d30ca774cebc 100644 (file)
@@ -24,14 +24,14 @@ class MessageController < ApplicationController
 
         if @message.save
           flash[:notice] = t 'message.new.message_sent'
-          Notifier.message_notification(@message).deliver
+          Notifier.message_notification(@message).deliver_now
           redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
         end
       end
-    else
-      @message = Message.new(:recipient => @this_user)
-      @title = t 'message.new.title'
     end
+
+    @message ||= Message.new(:recipient => @this_user)
+    @title = t 'message.new.title'
   end
 
   # Allow the user to reply to another message.
index acd88be04329d7f0760ee0e52b69976df581a4d3..7584daf62cfa75f8254154dcf5d3853215c8934d 100644 (file)
@@ -361,7 +361,7 @@ private
 
     note.comments.map { |c| c.author }.uniq.each do |user|
       if notify and user and user != @user
-        Notifier.note_comment_notification(comment, user).deliver
+        Notifier.note_comment_notification(comment, user).deliver_now
       end
     end
   end
index f8713608d70c148a23b7dd1e37c688caa42a409d..d0f90271744661ed8447d88a7a30cc871eeed649 100644 (file)
@@ -10,7 +10,7 @@ class RedactionsController < ApplicationController
   before_filter :check_database_writable, :only => [:create, :update, :destroy]
 
   def index
-    @redactions_pages, @redactions = paginate(:redactions, :order => :id, :per_page => 10)
+    @redactions = Redaction.order(:id)
   end
 
   def new
index dbfc44a37ad7af34cb558658408366a1c00e6391..a7bf53824821a4559672b9d1446eccb7dc74bee3 100644 (file)
@@ -105,7 +105,7 @@ class UserController < ApplicationController
             successful_login(@user)
           else
             session[:token] = @user.tokens.create.token
-            Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver
+            Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver_now
             redirect_to :action => 'confirm', :display_name => @user.display_name
           end
         else
@@ -165,7 +165,7 @@ class UserController < ApplicationController
 
       if user
         token = user.tokens.create
-        Notifier.lost_password(user, token).deliver
+        Notifier.lost_password(user, token).deliver_now
         flash[:notice] = t 'user.lost_password.notice email on way'
         redirect_to :action => 'login'
       else
@@ -353,7 +353,7 @@ class UserController < ApplicationController
 
   def confirm_resend
     if user = User.find_by_display_name(params[:display_name])
-      Notifier.signup_confirm(user, user.tokens.create).deliver
+      Notifier.signup_confirm(user, user.tokens.create).deliver_now
       flash[:notice] = t 'user.confirm_resend.success', :email => user.email
     else
       flash[:notice] = t 'user.confirm_resend.failure', :name => params[:display_name]
@@ -424,7 +424,7 @@ class UserController < ApplicationController
         unless @user.is_friends_with?(@new_friend)
           if friend.save
             flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name
-            Notifier.friend_notification(friend).deliver
+            Notifier.friend_notification(friend).deliver_now
           else
             friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name))
           end
@@ -733,7 +733,7 @@ private
           flash.now[:notice] = t 'user.account.flash update success confirm needed'
 
           begin
-            Notifier.email_confirm(user, user.tokens.create).deliver
+            Notifier.email_confirm(user, user.tokens.create).deliver_now
           rescue
             # Ignore errors sending email
           end
@@ -742,7 +742,7 @@ private
           @user.errors.set(:email, [])
         end
 
-        user.reset_email!
+        user.restore_email!
       end
     end
   end
index 9d29f52b78e9be2a00762df206a3e1824835e0af..5ace3d1580b4d2413613d79af3bcd993d0414573 100644 (file)
@@ -5,7 +5,6 @@ class DiaryComment < ActiveRecord::Base
   validates_presence_of :body
   validates_associated :diary_entry
 
-  after_initialize :set_defaults
   after_save :spam_check
 
   def body
@@ -23,10 +22,6 @@ class DiaryComment < ActiveRecord::Base
 
 private
 
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
-
   def spam_check
     user.spam_check
   end
index 58f8710f95d10d8168989e76d449714f57aab2fd..c0fbac546a9f47756c6239ee06fd9ee3cb1bb883 100644 (file)
@@ -16,7 +16,6 @@ class DiaryEntry < ActiveRecord::Base
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :language
 
-  after_initialize :set_defaults
   after_save :spam_check
 
   def body
@@ -25,10 +24,6 @@ class DiaryEntry < ActiveRecord::Base
 
 private
 
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
-
   def spam_check
     user.spam_check
   end
index b51c59f4359d950bd614be043ad2bf79e2174ddb..b05d005b04f95ea1eec343228744d744bc2a8935 100644 (file)
@@ -9,8 +9,6 @@ class Message < ActiveRecord::Base
   validates_inclusion_of :message_read, :in => [ true, false ]
   validates_as_utf8 :title
 
-  after_initialize :set_defaults
-
   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part
@@ -47,10 +45,4 @@ class Message < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
-
-private
-
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
 end
index 90304acae4c1f9dadbaceaecc37475703648cbdd..5ea3a778b38d58e5eefc62da019f7e628d5bd4b0 100644 (file)
@@ -63,11 +63,6 @@ class OldNode < ActiveRecord::Base
 
   def save_with_dependencies!
     save!
-    #not sure whats going on here
-    clear_aggregation_cache
-    clear_association_cache
-    #ok from here
-    @attributes.update(OldNode.where(:node_id => self.node_id, :timestamp => self.timestamp, :version => self.version).first.instance_variable_get('@attributes'))
    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
index dc89afa50294ba35710123aa382243676f04c282..5496f7115ad717491a8a292bade768522ed3fcb0 100644 (file)
@@ -31,14 +31,7 @@ class OldRelation < ActiveRecord::Base
   end
 
   def save_with_dependencies!
-
-    # see comment in old_way.rb ;-)
     save!
-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldRelation.where(:relation_id => self.relation_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on
 
     self.tags.each do |k,v|
       tag = OldRelationTag.new
index 1552bae0497a10f0b8c5d896ff11d83251bdbf7a..dbdcdd46d62dbaf2f0f591b29681c76d3af4f71a 100644 (file)
@@ -31,19 +31,7 @@ class OldWay < ActiveRecord::Base
   end
 
   def save_with_dependencies!
-
-    # dont touch this unless you really have figured out why it's called
-    # (Rails doesn't deal well with the old ways table (called 'ways') because
-    # it doesn't have a unique key. It knows how to insert and auto_increment
-    # id and get it back but we have that and we want to get the 'version' back
-    # we could add another column but thats a lot of data. No, set_primary_key
-    # doesn't work either.
     save!
-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldWay.where(:way_id => self.way_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on
 
     self.tags.each do |k,v|
       tag = OldWayTag.new
index 43f5b3c7bf70ffb67d8a47d8509c31a9e9fb0a8f..a9bdf5580dc68712d1ffef58c4f4743ca9d5db6d 100644 (file)
@@ -14,19 +14,9 @@ class Redaction < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
 
-  after_initialize :set_defaults
-
   # this method overrides the AR default to provide the rich 
   # text object for the description field.
   def description
     RichText.new(read_attribute(:description_format), read_attribute(:description))
   end
-
-  private
-
-  # set the default format to be markdown, in the absence of
-  # any other setting.
-  def set_defaults
-    self.description_format = "markdown" unless self.attribute_present?(:description_format)
-  end
 end
index ed0813bee43a9ff14b47b33be7313147ab395b57..7ace4bca47b76a8c6e9369b14cd55ddefc451551 100644 (file)
@@ -216,6 +216,7 @@ class User < ActiveRecord::Base
     diary_comment_score = self.diary_comments.inject(0) { |s,c| s += c.body.spam_score }
 
     score = self.description.spam_score / 4.0
+    score += self.diary_entries.where("created_at > ?", 1.day.ago).count * 10
     score += diary_entry_score / self.diary_entries.length if self.diary_entries.length > 0
     score += diary_comment_score / self.diary_comments.length if self.diary_comments.length > 0
     score -= changeset_score
@@ -242,7 +243,6 @@ private
 
   def set_defaults
     self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
-    self.description_format = "markdown" unless self.attribute_present?(:description_format)
   end
 
   def encrypt_password
index cb1a97dcabfafa8ab5c938dfc408a24174fc8a84..d8fa95cb2319f2aeb7d31a9995641ca1a8496231 100644 (file)
@@ -4,8 +4,6 @@ class UserBlock < ActiveRecord::Base
   belongs_to :user, :class_name => "User", :foreign_key => :user_id
   belongs_to :creator, :class_name => "User", :foreign_key => :creator_id
   belongs_to :revoker, :class_name => "User", :foreign_key => :revoker_id
-  
-  after_initialize :set_defaults
 
   PERIODS = USER_BLOCK_PERIODS
 
@@ -41,12 +39,6 @@ class UserBlock < ActiveRecord::Base
 
 private
 
-  ##
-  # set default values for new records.
-  def set_defaults
-    self.reason_format = "markdown" unless self.attribute_present?(:reason_format)
-  end
-
   ##
   # validate that only moderators are allowed to change the
   # block. this should be caught and dealt with in the controller,
index bbe22792101c283e39fd7084be5a0d930627aa85..efb7bb7f986945a79c47b9a1defb37bcfece763b 100644 (file)
@@ -15,7 +15,7 @@
   
   <div class="buttons clearfix subscribe-buttons">
     <form action="#" class="hide_unless_logged_in">
-      <% if @changeset.subscribers.exists?(@user) %>
+      <% if @user and @changeset.subscribers.exists?(@user.id) %>
         <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
       <% else %>
         <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
index fb4f79eb66e8a039fdd75fb5857f3f47b08f9ed6..441ea3212ab8249396c15c7f4d0a89049c25248f 100644 (file)
@@ -9,7 +9,7 @@
   </form>
 
   <form method="GET" action="<%= directions_path %>" class="directions_form">
-    <div width="100%" align="right" style="height:30px"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title') } %></div>
+    <div width="100%" align="right" style="height:30px"><%= link_to tag('span', { :class => "icon close"}), root_path, { :title => t('site.search.close_directions_title'), :class => "directions_close" } %></div>
 
     <div class="line">
       <%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>
@@ -21,6 +21,6 @@
     </div>
     <select class='routing_engines' name='routing_engines'></select>
     <div width="100%" align="right"><%= submit_tag t('site.search.submit_text') %></div>
-    <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
+    <div class="loader_copy" style="display:none;"><div class="loader"><%= image_tag "searching.gif", :style => "vertical-align: middle;" %></div></div>
   </form>
 </div>
index 5bc2a619e83ea182b17e2507c5e0f2f07f7cf18c..bd83b25412305f93fdb0a892aded30e5178899ba 100644 (file)
--- a/config.ru
+++ b/config.ru
@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application
index a40336c3303dbe53065420e0c8c53c3bd060ccd8..6a96b9dd6115b87c733f477285f0ee3185ef9242 100644 (file)
@@ -30,6 +30,9 @@ module OpenStreetMap
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)
 
index 5e5f0c1fac0bcde58936530ada4fd08abcaf5a64..6b750f00b1dff4d94937b97ae0dbf76784b02164 100644 (file)
@@ -1,4 +1,3 @@
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' # Set up gems listed in the Gemfile.
index a414d1490655db23aa4a00bb688b5a57664c2313..01466ae751953845c603f9806ce45251003f5d54 100644 (file)
@@ -20,13 +20,19 @@ OpenStreetMap::Application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
+  unless STATUS == :database_offline
+    config.active_record.migration_error = :page_load
+  end
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
 
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.
index 941070902d9f32c08a910a25c48d42c60e533dac..1dab3556396c7b5ae2e849c2dfbee5ef1ab465fb 100644 (file)
@@ -16,11 +16,13 @@ OpenStreetMap::Application.configure do
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -29,17 +31,21 @@ OpenStreetMap::Application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs.
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :debug to see everything in the log.
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
   config.log_level = :info
 
   # Prepend all log lines with the following tags.
@@ -62,24 +68,19 @@ OpenStreetMap::Application.configure do
   config.action_controller.page_cache_directory = Rails.public_path
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # `config.assets.precompile` has moved to config/initializers/assets.rb
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
index b0ff645a0195d9813dbc3139a0ae658f29fbfa94..3c8b55457a463302b10910280370ef9afe95d12a 100644 (file)
@@ -12,8 +12,8 @@ OpenStreetMap::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -31,6 +31,9 @@ OpenStreetMap::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
index c90054b0a3c3eb4c2df40a279ed10ba87c955072..ef7efcbb95fd8b254192a080cf0c332e5b3971ed 100644 (file)
@@ -3,6 +3,9 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 Rails.application.config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )
index 7a06a89f0f9df784b2087d18b248f8d8c770eb72..7f70458dee62b4a0f5233e4be7b8838b8400cbe8 100644 (file)
@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :json
\ No newline at end of file
+Rails.application.config.action_dispatch.cookies_serializer = :json
index 156eea4ecad2d8a1992f30d99970d1eb3166bee6..2562b67a0dd8c472bf80889add63ff9d7de74679 100644 (file)
@@ -44,6 +44,6 @@ I18n.fallbacks.map("no" => "nb")
 
 I18n.enforce_available_locales = false
 
-Rails.configuration.after_initialize do |app|
+Rails.configuration.after_initialize do
   I18n.available_locales
 end
index be247274f290811f0ccf61b7dee2b6a488343bc9..576da5285f51cbcd400145e7718dd0f10c3b0835 100644 (file)
@@ -2,6 +2,5 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
 Mime::Type.register "application/x-amf", :amf
 Mime::Type.register "application/gpx+xml", :gpx
diff --git a/config/initializers/postgresql_adapter.rb b/config/initializers/postgresql_adapter.rb
deleted file mode 100644 (file)
index 9dcc34f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
-  module ActiveRecord
-    module ConnectionAdapters
-      class PostgreSQLAdapter
-        def initialize_type_map_with_enums(type_map)
-          OID.alias_type "format_enum", "text"
-          OID.alias_type "gpx_visibility_enum", "text"
-          OID.alias_type "note_status_enum", "text"
-          OID.alias_type "note_event_enum", "text"
-          OID.alias_type "nwr_enum", "text"
-          OID.alias_type "user_role_enum", "text"
-          OID.alias_type "user_status_enum", "text"
-
-          initialize_type_map_without_enums(type_map)
-        end
-
-        alias_method_chain :initialize_type_map, :enums
-      end
-
-      class PostgreSQLColumn
-        def simplified_type_with_enum(field_type)
-          case field_type
-          when /_enum$/
-            :string
-          else
-            simplified_type_without_enum(field_type)
-          end
-        end
-
-        alias_method_chain :simplified_type, :enum
-      end
-    end
-  end
-end
index 0df38f0fa87339702ec4ad6425068fcf3998fa1d..eb3039a132f70db038e6bb7b08bd6e4fb8e7af56 100644 (file)
@@ -1,4 +1,5 @@
 Sanitize::Config::OSM = Sanitize::Config::RELAXED.dup
 
+Sanitize::Config::OSM[:elements] -= [ 'div', 'style' ]
 Sanitize::Config::OSM[:add_attributes] = { 'a' => { 'rel' => 'nofollow' } }
 Sanitize::Config::OSM[:remove_contents] = [ 'script', 'style' ]
index f9766db6b9e722aa368b87a3cddb014c10fec18a..608a48872dda13ac6f785e39dc3bac9af8213276 100644 (file)
@@ -933,10 +933,6 @@ ast:
       text: Fai un donativu
     learn_more: Más información
     more: Más
-    sotm_header: State of the Map 2014
-    sotm_line_1: 8ª Conferencia Añal
-    sotm_line_2: 7-9 de payares de 2014
-    sotm_line_3: Buenos Aires, Arxentina
   license_page:
     foreign:
       title: Tocante a esta traducción
index 893e259ee1395fd9530609abd7d14fcff1246955..a8694a422962942bee43414e57711ee0a130ae33 100644 (file)
@@ -1,6 +1,7 @@
 # Messages for Belarusian (беларуская)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Alex73
 # Author: Jim-by
 # Author: Unomano
 # Author: Дзяніс Тутэйшы
@@ -120,11 +121,17 @@ be:
       way_paginated: Лініі (%{x}-%{y} з %{count})
       relation: Сувязі (%{count})
       relation_paginated: Сувязі (%{x}-%{y} з %{count})
+      comment: Каментары (%{count})
+      hidden_commented_by: Схаваны каментар ад %{user} <abbr title='%{exact_time}'>%{when}
+        таму</abbr>
+      commented_by: Каментар ад %{user} <abbr title='%{exact_time}'>%{when} таму</abbr>
       changesetxml: Набор змен у XML
       osmchangexml: osmChange XML
       feed:
         title: Набор змен %{id}
         title_comment: Набор змен %{id} - %{comment}
+      join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання
+      discussion: Абмеркаванне
     node:
       title: 'Вузел: %{name}'
       history_title: 'Гісторыя вузла: %{name}'
@@ -181,6 +188,7 @@ be:
       wiki_link:
         key: Вікі-старонка апісання тэгу %{key}
         tag: Вікі-старонка апісання тэгу %{key}=%{value}
+      wikidata_link: Элемент %{page} у Вікідадзеных
       wikipedia_link: Артыкул %{page} на Вікіпедыі
       telephone_link: Патэлефанаваць %{phone_number}
     note:
@@ -204,6 +212,11 @@ be:
       reopened_by_anonymous: Пераадкрыта ананімным карыстальнікам <abbr title='%{exact_time}'>%{when}
         таму</abbr>
       hidden_by: Схавана %{user} <abbr title='%{exact_time}'>%{when} таму</abbr>
+    query:
+      title: Запыт аб’ектаў
+      introduction: Пстрыкніце на карце, каб атрымаць звесткі пра аб'екты паблізу.
+      nearby: Аб’екты паблізу
+      enclosing: Навакольныя аб'екты
   changeset:
     changeset_paging_nav:
       showing_page: Старонка %{page}
@@ -233,6 +246,13 @@ be:
       load_more: Загрузіць больш
     timeout:
       sorry: Прабачце, спіс набораў зменаў, які Вы запыталі, занадта вялікі для атрымання.
+    rss:
+      title_all: Абмеркаванне зменаў OpenStreetMap
+      title_particular: 'Абмеркаванне зменаў OpenStreetMap #%{changeset_id}'
+      comment: Новы каментар на набор зменаў %{changeset_id} ад %{author}
+      commented_at_html: Абноўлена %{when} таму
+      commented_at_by_html: Абноўлена %{when} таму %{user}
+      full: Поўнае абмеркаванне
   diary_entry:
     new:
       title: Новы запіс дзённіку
@@ -621,7 +641,7 @@ be:
           sauna: Сауна
           slipway: Стапель
           sports_centre: Спартыўны цэнтр
-          stadium: Стадыен
+          stadium: Стадыён
           swimming_pool: Плавальны басейн
           track: Бегавая дарожка
           water_park: Аквапарк
@@ -736,6 +756,8 @@ be:
           tram: Трамвай
           tram_stop: Трамвайны прыпынак
           yard: Сартавальная станцыя
+        route:
+          bus: Аўтобусны маршрут
         shop:
           alcohol: Алкагольная крама
           antiques: Антыкварыят
@@ -1247,6 +1269,20 @@ be:
         commented_note: '%{commenter} пераадчыніў заўвагу на карце, якую вы каментавалі.
           Заўвага каля %{place}.'
       details: Больш падрабязна пра ўвагу можна прачытаць на %{url}.
+    changeset_comment_notification:
+      greeting: Прывітанне,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} пракаментаваў адзін з вашых набораў
+          зменаў'
+        subject_other: '[OpenStreetMap] %{commenter} пракаментаваў цікавы вам набор
+          зменаў'
+        your_changeset: '%{commenter} пакінуў каментар на адзін з вашых набораў зменаў,
+          створаных %{time}'
+        commented_changeset: '%{commenter}% пакінуў каментар да набору зменаў, які
+          вы адсочваеце і што быў створаны %{changeset_author} %{time}'
+        partial_changeset_with_comment: з каментаром '%{changeset_comment}'
+        partial_changeset_without_comment: без каментароў
+      details: Дадатковыя звесткі аб наборы зьменаў можна знайсці ў %{url}.
   message:
     inbox:
       title: Уваходныя
@@ -2192,6 +2228,15 @@ be:
       createnote_disabled_tooltip: Наблізце, каб дадаць заўвагу на карту
       map_notes_zoom_in_tooltip: Наблізце, каб убачыць заўвагі на карце
       map_data_zoom_in_tooltip: Павялічце, каб убачыць картаграфічныя дадзеныя
+      queryfeature_tooltip: Атрыманне аб’ектаў
+      queryfeature_disabled_tooltip: Наблізіцеся для атрымання аб'ектаў
+    changesets:
+      show:
+        comment: Каментаваць
+        subscribe: Падпісацца
+        unsubscribe: Адпісацца
+        hide_comment: схаваць
+        unhide_comment: паказаць
     notes:
       new:
         intro: Заўважылі памылку або чагосьці не стае? Дайце іншым удзельнікам магчымасць
@@ -2209,6 +2254,13 @@ be:
         comment: Каментаваць
     edit_help: Перамясціце карту і наблізце месца, якое вы хочаце рэдагаваць, затым
       націсніце тут.
+    query:
+      node: Вузел
+      way: Крывая
+      relation: Сувязь
+      nothing_found: Аб’екты не знойдзены
+      error: 'Памылка сувязі %{server}: %{error}'
+      timeout: Тайм-аўт падключэння да %{server}
   redaction:
     edit:
       description: Апісанне
index 6d60f526d91a52dd850441641fb822fac36be91a..9d4e607373ebba0372548606c7659a76094bc2f7 100644 (file)
@@ -121,11 +121,17 @@ br:
       way_paginated: Hentoù (%{x}-%{y} diwar %{count})
       relation: Darempredoù (%{count})
       relation_paginated: Darempredoù (%{x}-%{y} diwar %{count})
+      comment: Addisplegoù(%{count})
+      hidden_commented_by: Addispleg kuzhet gant %{user} <abbr title='%{exact_time}'>%{when}
+        zo</abbr>
+      commented_by: Addispleg gant %{user} <abbr title='%{exact_time}'>%{when}zo</abbr>
       changesetxml: Strollad kemmoù XML
       osmchangexml: osmChange XML
       feed:
         title: Strollad kemmoù %{id}
         title_comment: Strollad kemmoù %{id} - %{comment}
+      join_discussion: Kevreañ evit kaozeal
+      discussion: Kaozeadenn
     node:
       title: 'Skoulm : %{name}'
       history_title: 'Istor ar skoulm : %{name}'
@@ -206,6 +212,11 @@ br:
       reopened_by_anonymous: Adweredekaet gant un den dianv <abbr title='%{exact_time}'>%{when}
         zo</abbr>
       hidden_by: Kuzhet gant %{user} <abbr title='%{exact_time}'>%{when} zo</abbr>
+    query:
+      title: Arc'hweladurioù enklask
+      introduction: Klikit war ar gartenn evit kavout arc'hweladurioù e-kichen.
+      nearby: Arc'hweladurioù e-kichen
+      enclosing: Arc'hweladurioù stag
   changeset:
     changeset_paging_nav:
       showing_page: Pajenn %{page}
@@ -235,6 +246,14 @@ br:
       load_more: Kargañ muioc'h
     timeout:
       sorry: Ho tigarez, re hir eo adtapout ar roll cheñchamantoù hoc'h eus goulennet.
+    rss:
+      title_all: Kaozeal diwar-benn an holl gemmoù degaset en OpenStreetMap
+      title_particular: 'Kaoz diwar-benn an holl gemmoù #%{changeset_id}degaset en
+        OpenStreetMap'
+      comment: 'Addispleg nevez eus ar strollad kemmoù #%{changeset_id} dre %{author}'
+      commented_at_html: Hizivaet %{when} zo
+      commented_at_by_html: Hizivaet %{when} zo gant %{user}
+      full: Kaoz klok
   diary_entry:
     new:
       title: Enmoned nevez en deizlevr
@@ -279,15 +298,15 @@ br:
       comment_link: Addisplegañ an enmoned-mañ
       reply_link: Respont d'an enmoned-mañ
       comment_count:
-        one: Un evezhiadenn
-        zero: Evezhiadenn ebet
-        other: '%{count} evezhiadenn'
+        one: Un addipleg
+        zero: Addispleg ebet
+        other: '%{count} addipleg'
       edit_link: Aozañ an enmoned-mañ
       hide_link: Kuzhat an elfenn-mañ
       confirm: Kadarnaat
     diary_comment:
       comment_from: Addispleg gant %{link_user}  d'an %{comment_created_at}
-      hide_link: Kuzhat an evezhiadenn-mañ
+      hide_link: Kuzhat an addispleg-mañ
       confirm: Kadarnaat
     location:
       location: 'Lec''hiadur :'
@@ -309,9 +328,9 @@ br:
         pennadoù deizlevr-mañ
       post: Postañ
       when: Peur
-      comment: Evezhiadenn
+      comment: Addipleg
       ago: '%{ago} zo'
-      newer_comments: Evezhiadennoù neves
+      newer_comments: Evezhiadennoù nevesoo'h
       older_comments: Evezhiadennoù koshañ
   export:
     title: Ezporzhiañ
@@ -328,8 +347,9 @@ br:
       too_large:
         advice: 'Ma c''hwit an ezporzhiadur amañ a-us, implijit unan eus an elfennoù
           amañ dindan :'
-        body: Re vras eo an takad-mañ evit bezañ ezporzhiet evel roadennoù XML OpenStreetMap.
-          Zoumit, mar plij, pe diuzit un takad bihanoc'h.
+        body: 'Re vras eo an takad-mañ evit bezañ ezporzhiet evel roadennoù XML OpenStreetMap.
+          Zoumit, mar plij, pe diuzit un takad bihanoc''h pe immplijit unan eus an
+          tarzhioù-mañ evit pellgargañ roadennoù a-yoc''h :'
         planet:
           title: Planedenn OSM
           description: Eilennoù hizivaet ingal eus diaz roadennoù klok OpenStreetMap
@@ -346,7 +366,7 @@ br:
           description: Eztennadennoù evit brasañ kêrioù ar bed hag o ardemezioù
         other:
           title: Tarzhioù all
-          description: Mamennoù all a gaver o roll er wiki OpenStreetMap
+          description: Mammennoù all a gaver o roll er wiki OpenStreetMap
       options: Dibarzhioù
       format: Furmad
       scale: Skeuliad
@@ -384,7 +404,7 @@ br:
           apron: ↓Parklec'h nijerezioù
           gate: Dor
           helipad: biñsporzh
-          runway: Pistenn
+          runway: Leurenn
           taxiway: Roudenn evit an taksioù
           terminal: Termenva
         amenity:
@@ -738,6 +758,8 @@ br:
           tram: Tramgarr
           tram_stop: Arsav tramgarr
           yard: Gar-dibab
+        route:
+          bus: Pennad-hent ar bus
         shop:
           alcohol: Gwezher alkool
           antiques: Hendraezoù
@@ -941,10 +963,6 @@ br:
       text: Ober un donezon
     learn_more: Gouzout hiroc'h
     more: Muioc'h
-    sotm_header: Stad kartenn 2014
-    sotm_line_1: 8vet Prezegenn vloaziek
-    sotm_line_2: 7-9 a viz Du 2014
-    sotm_line_3: Buenos Aires, Arc'hantina
   license_page:
     foreign:
       title: Diwar-benn an droidigezh-mañ
@@ -1257,6 +1275,13 @@ br:
         commented_note: '%{commenter} en deus adweredekaet un notenn war ur gartenn
           hoc''h eus addispleget. Emañ an notenn tost da %{place}.'
       details: Munudoù ouzhpenn diwar-benn an notenn a c'hall bezañ kavet e %{url}.
+    changeset_comment_notification:
+      greeting: Demat,
+      commented:
+        subject_other: '[OpenStreetMap] %{commenter} en deus addispleget unan eus
+          ho notennoù a sell ouzhoc''h'
+        partial_changeset_with_comment: gant an addispleg '%{changeset_comment}'
+        partial_changeset_without_comment: Hep evezhiadenn
   message:
     inbox:
       title: Boest resev
@@ -2208,6 +2233,15 @@ br:
       createnote_disabled_tooltip: Zoumañ da ouzhpennañ un notenn d'ar gartenn
       map_notes_zoom_in_tooltip: Zoumiñ evit gwelet notennoù ar gartenn
       map_data_zoom_in_tooltip: Zoumiñ evit gwelet roadennoù ar gartenn
+      queryfeature_tooltip: Arc'hweladurioù enklask
+      queryfeature_disabled_tooltip: Zoumañ evit an arc'hweladurioù enklask
+    changesets:
+      show:
+        comment: Evezhiadenn
+        subscribe: Koumanantiñ
+        unsubscribe: Digoumanantiñ
+        hide_comment: kuzhat
+        unhide_comment: diskouez
     notes:
       new:
         intro: Gwelet ho peus ur fazi pe un dra a vank ? Roit an dra-se da c'houzout
@@ -2226,6 +2260,11 @@ br:
         comment: Evezhiadenn
     edit_help: Dilec'hiit ar gartenn ha zoumit war ul lec'h a fell deoc'h aozañ, ha
       neuze klikit amañ.
+    query:
+      node: Skoulm
+      way: Hent
+      relation: Darempred
+      nothing_found: Arc'hweladur ebet kavet
   redaction:
     edit:
       description: Deskrivadur
index a3d2dcd749b310cab46a7798c471aa627e8333f4..1f45c23b8544bfd991fe77f5563fd6aa7c34addc 100644 (file)
@@ -163,7 +163,7 @@ bs:
       new_note: Nova bilješka
   changeset:
     changeset_paging_nav:
-      showing_page: Prikaz stranice %{page}
+      showing_page: Stranica %{page}
       next: Sljedeća »
       previous: « Prethodna
     changeset:
@@ -274,7 +274,8 @@ bs:
         Data Commons Open Database License dozvolom</a> (ODbL).
       too_large:
         body: Ovo područje je preveliko da bi se izvezlo kao OpenStreetMap XML podaci.
-          Molimo povećajte (zoom) ili odaberite manje područje.
+          Molimo povećajte (zoom) ili odaberite manje područje ili koristite jedan
+          od izvora navedenih ispod za masovno preuzimanje podataka.
         other:
           title: Drugi izvori
           description: Dodatni izvori ponuđeni na OpenStreetMap wiki
@@ -452,7 +453,7 @@ bs:
           primary_link: Državna cesta
           proposed: Predložena cesta
           raceway: Trkalište
-          residential: Ulica
+          residential: Stambena ulica
           rest_area: Područje za odmor
           road: Cesta
           secondary: Sekundarna cesta
@@ -811,7 +812,7 @@ bs:
   layouts:
     logo:
       alt_text: OpenStreetMap logotip
-    home: Početna
+    home: Idi na početnu lokaciju
     logout: Odjava
     log_in: Prijava
     log_in_tooltip: Prijavite se sa postojećim korisničkim računom
@@ -1007,7 +1008,7 @@ bs:
       confirm: 'Prije nego uradimo bilo šta drugo, moramo potvrditi da je ovaj zahtjev
         došao od Vas, ako je to istina, molimo Vas da kliknete poveznicu ispod da
         potvrdite Vaš račun:'
-      welcome: Želimo Vam dobrodošlicu i takođe želimo Vam dati neke dodatne informacije
+      welcome: Nakon što potvrdite svoj račun, mi ćemo vam dati neke dodatne informacije
         kako bi ste počeli.
     email_confirm:
       subject: '[OpenStreetMap] Potvrdite Vašu e-mail adresu'
@@ -1271,9 +1272,12 @@ bs:
       upload_trace: Poslati GPS trasu
       see_all_traces: Pogledati sve trase
       see_your_traces: Pogledati vlastite trase
-      traces_waiting: Imate %{count} trasu/e/a na čekanju za slanje. Uzmite ovo u
-        obzir, i pričekajte da se završe prije slanja novih trasa, da ne blokirate
-        ostale korisnike.
+      traces_waiting:
+        one: Imate %{count} trasu koja čeka za slanje. Uzmite ovo u obzir i pričekajte
+          da se završi prije nego pošaljete novu trasu, da ne biste blokirali druge
+          korisnike.
+        other: Imate %{count} trase/a na čekanju za slanje. Uzmite ovo u obzir i pričekajte
+          da se završe prije slanja novih trasa, da ne blokirate ostale korisnike.
     trace_optionals:
       tags: Oznake
     view:
@@ -1296,7 +1300,7 @@ bs:
       trace_not_found: Trasa nije pronađena!
       visibility: 'Vidljivost:'
     trace_paging_nav:
-      showing_page: Prikaz stranice %{page}
+      showing_page: Stranica %{page}
       older: Starije trase
       newer: Novije trase
     trace:
@@ -1372,8 +1376,7 @@ bs:
       url: 'URL za zahtjev značke:'
       access_url: 'URL pristupa znački:'
       authorize_url: 'URL ovlaštenja:'
-      support_notice: Podržavamo HMAC-SHA1 (preporučeno) kao i obični tekst u ssl
-        modu.
+      support_notice: Podržavamo HMAC-SHA1 (preporučeno) i potpise RSA-SHA1.
       edit: Urediti detalje
       delete: Izbrisati klijenta
       confirm: Da li ste sigurni?
@@ -1487,7 +1490,7 @@ bs:
       flash changed: Vaša lozinka je promjenjena.
       flash token bad: Niste pronašli tz značku, možda da provjerite URL?
     new:
-      title: Napravite račun
+      title: Otvorite račun
       no_auto_account_create: Nažalost nismo u mogućnosti automatski otvarati korisničke
         račune.
       contact_webmaster: Molimo da kontaktirate s <a href="mailto:webmaster@openstreetmap.org">webmasterom</a>
@@ -1517,7 +1520,7 @@ bs:
             Ukoliko već imate račun, možete se prijaviti na Vaš račun korištenjem Vašeg korisničkog imena i lozinke i onda uvezati račun sa Vašim OtvorenimID u Vašim korisničkim podešavanjima.
           </li>
         </ul>
-      continue: Nastaviti
+      continue: Otvorite račun
       terms accepted: Hvala za prihvatanje novih uslova za doprinosioce!
       terms declined: Žao nam je da ste odlučili ne prihvatiti nove Uslove za doprinosioce.
         Za više informacije, molimo pogledajte <a href="%{url}">ovu wiki stranicu</a>.
@@ -1561,7 +1564,7 @@ bs:
       edits: uređivanja
       traces: trase
       remove as friend: ukloniti kao prijatelja
-      add as friend: dodati kao prijatelja
+      add as friend: dodati prijatelja
       mapper since: 'Maper od:'
       ago: (%{time_in_words_ago} prije)
       ct status: 'Uslovi za doprinosioce:'
@@ -1575,8 +1578,8 @@ bs:
       spam score: 'Spam ocjena:'
       description: Opis
       user location: Lokacija boravišta korisnika
-      if set location: Ako namjestite Vašu lokaciju, zgodna karta i stvari će se pojaviti
-        ovdje. Možete namjestiti lokaciju Vašeg boravišta na %{settings_link} stranici.
+      if set location: Namjestite Vašu početnu lokaciju na %{settings_link} stranici,
+        kako biste vidjeli korisnike u okolini.
       settings_link_text: postavke
       your friends: Vaši prijatelji
       no friends: Niste dodali nijednog prijatelja.
@@ -1605,10 +1608,10 @@ bs:
       unhide_user: otkriti ovog korisnika
       delete_user: izbrisati ovog korisnika
       confirm: Potvrditi
-      friends_changesets: Pretražiti sve setove promjena prijatelja
-      friends_diaries: Pretražiti sve unose u dnevnik od prijatelja
-      nearby_changesets: Pretražiti sve setove promjena obližnjih korisnika
-      nearby_diaries: Pretražiti sve unnose u dnevnik od obližnjih korisnika
+      friends_changesets: promjena spiska prijatelja
+      friends_diaries: unosi u dnevnik prijatelja
+      nearby_changesets: promjene spiska obližnjih korisnika
+      nearby_diaries: unosi u dnevnik obližnjih korisnika
     popup:
       your location: Vaša lokacija
       nearby mapper: Obližnji maper
@@ -1672,11 +1675,11 @@ bs:
         Provjerite e-mail za porukom za potvrdu nove e-mail adrese.
       flash update success: Korisničke informacije su uspješno osvježene.
     confirm:
-      heading: Potvrditi korisnički  račun
+      heading: Provjerite vaš email!
       press confirm button: Pritisnuti potvrditi da bi aktivirali Vaš korisnički račun.
       button: Potvrditi
       already active: Ovaj račun je već potvrđen.
-      unknown token: Izgleda da ta značka ne postoji.
+      unknown token: Taj kod za potvrdu je istekao ili ne postoji.
     confirm_resend:
       success: Poslali smo novu potvrdu na e-mail %{email} a čim potvrdite svoj račun,
         moći ćete početi mapirati.<br /><br />Ako koristite antispam sistem koji šalje
@@ -1697,12 +1700,12 @@ bs:
     make_friend:
       heading: Dodati %{user} kao prijatelja?
       button: Dodati kao prijatelja
-      success: '%{name}  je sada Vaš prijatelj.'
+      success: '%{name} je sada Vaš prijatelj!'
       failed: Žao mi je, nije uspjelo dodavanje %{name} kao prijatelja.
       already_a_friend: Već ste prijatelj sa %{name}.
     remove_friend:
-      heading: Ukloniti %{user} kao prijatelja?
-      button: Ukloniti kao prijatelja
+      heading: Ukloniti %{user} iz prijatelja?
+      button: Ukloniti prijatelja
       success: '%{name} je uklonjen iz prijatelja.'
       not_a_friend: '%{name} nije jedan od Vaših prijatelja.'
     filter:
@@ -1711,8 +1714,8 @@ bs:
       title: Korisnici
       heading: Korisnici
       showing:
-        one: Prikaz stranice %{page} (%{first_item} od %{items})
-        other: Prikaz stranice %{page} (%{first_item}-%{last_item} od %{items})
+        one: Stranica %{page} (%{first_item} od %{items})
+        other: Stranice %{page} (%{first_item}-%{last_item} od %{items})
       summary: '%{name} napravljeno sa %{ip_address} dana %{date}'
       summary_no_ip: '%{name} napravljeno %{date}'
       confirm: Potvrditi odabrane korisnike
@@ -1818,7 +1821,7 @@ bs:
       status: Stanje
       revoker_name: Opozvano od strane
       not_revoked: (nije opozvano)
-      showing_page: Prikaz stranice %{page}
+      showing_page: Stranica %{page}
       next: Sljedeća »
       previous: « Prethodna
     helper:
index e925e908808312a3599c97445634401fb166f254..db93720fbc7081672682a07a5acf48d347dda6bc 100644 (file)
@@ -140,11 +140,17 @@ ca:
       way_paginated: Vies (%{x}-%{y} de %{count})
       relation: Relacions (%{count})
       relation_paginated: Relacions (%{x}-%{y} de %{count})
+      comment: (%{count}) comentaris
+      hidden_commented_by: Comentari ocult de l'usuari %{user} <abbr title='%{exact_time}'>%{when}
+        ago</abbr>
+      commented_by: Comentari de %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
       changesetxml: XML del conjunt de canvis
       osmchangexml: XML en format osmChange
       feed:
         title: Conjunt de canvis %{id}
         title_comment: Conjunt de canvis %{id} - %{comment}
+      join_discussion: Inicieu sessió per unir-vos a la discussió
+      discussion: Discussió
     node:
       title: 'Node: %{name}'
       history_title: 'Historial del node: %{name}'
@@ -221,6 +227,11 @@ ca:
       reopened_by: Reactivat per %{user}  fa <abbr title='%{exact_time}'>%{when}</abbr>
       reopened_by_anonymous: Reactivat per un anònim fa <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Ocultat per %{user} fa <abbr title='%{exact_time}'>%{when}</abbr>
+    query:
+      title: Consultar característiques
+      introduction: Cliqueu al mapa per trobar característques properes.
+      nearby: Característiques properes
+      enclosing: Característiques adjuntes
   changeset:
     changeset_paging_nav:
       showing_page: Pàgina %{page}
@@ -251,6 +262,13 @@ ca:
     timeout:
       sorry: La llista de conjunt de canvis que heu sol·licitat ha trigat massa a
         recuperar-se.
+    rss:
+      title_all: Discussió del conjunt de canvis d'OpenStreetMap
+      title_particular: 'Discussió del conjunt de canvis #%{changeset_id} d''OpenStreetMap'
+      comment: 'Nou comentari de %{author} al conjunt de canvis #%{changeset_id}'
+      commented_at_html: Actualitzat fa %{when}
+      commented_at_by_html: Actualitzat fa %{when} per %{user}
+      full: Discussió sencera
   diary_entry:
     new:
       title: Nova Entrada de Diari
@@ -546,7 +564,7 @@ ca:
           primary_link: Carretera principal
           proposed: Carretera proposada
           raceway: Vial Ràpid
-          residential: Residencial
+          residential: Carrer Residencial
           rest_area: Àrea de descans
           road: Carretera
           secondary: Carretera secundària
@@ -712,7 +730,7 @@ ca:
           country: País
           county: Comtat
           farm: Granja
-          hamlet: Aldea
+          hamlet: Llogaret
           house: Casa
           houses: Cases
           island: Illa
@@ -757,6 +775,8 @@ ca:
           tram: Tramvia
           tram_stop: Parada de tramvia
           yard: Pati de ferrocarril
+        route:
+          bus: Ruta d'autobús
         shop:
           alcohol: De llicència
           antiques: Antiquari
@@ -879,13 +899,13 @@ ca:
           water_point: Punt d'aigua
           weir: Weir
       admin_levels:
-        level2: Frontera
+        level2: Frontera internacional
         level4: Límit d'estat
         level5: Límit de regió
         level6: Frontera
         level8: Límit de municipi
-        level9: Límit de poble
-        level10: Límit de suburbi
+        level9: Límit de districte
+        level10: Límit de barri
     description:
       title:
         osm_nominatim: Localització des de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
@@ -964,9 +984,6 @@ ca:
       text: Feu una donació
     learn_more: Aprèn-ne més
     more: Més
-    sotm_line_1: 8a Conferència Annual
-    sotm_line_2: 7-9 de novembre de 2014
-    sotm_line_3: Buenos Aires, Argentina
   license_page:
     foreign:
       title: Quant a la traducció
@@ -1279,6 +1296,20 @@ ca:
         commented_note: '%{commenter} ha reactivat una nota de mapa en la qual hi
           heu comentat. La nota és a prop de %{place}.'
       details: Podeu trobar més detalls de la nota a %{url}.
+    changeset_comment_notification:
+      greeting: Hola,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} ha comentat en un dels vostres
+          conjunts de canvis'
+        subject_other: '[OpenStreetMap] %{commenter} ha comentat en un conjunt de
+          canvis el qual hi esteu interessat'
+        your_changeset: '%{commenter} ha fet un comentari en un dels vostres conjunts
+          de canvis creats a %{time}'
+        commented_changeset: '%{commenter} ha fet un comentari en un conjunt de canvis
+          de %{changeset_author} a %{time} i que esteu seguint'
+        partial_changeset_with_comment: amb comentari '%{changeset_comment}'
+        partial_changeset_without_comment: sense comentari
+      details: Més detalls del conjunt de canvis es poden trobar a %{url}
   message:
     inbox:
       title: Safata d'entrada
@@ -2213,8 +2244,8 @@ ca:
       tooltip_disabled: La llegenda només està disponible per a la capa estàndard
     map:
       zoom:
-        in: Apropar-se
-        out: Allunyar-se
+        in: Amplia
+        out: Allunya
       locate:
         title: Mostra la meva ubicació
         popup: Esteu a {distance} {unit} d'aquest punt
@@ -2239,6 +2270,15 @@ ca:
       createnote_disabled_tooltip: Fes zoom per afegir una nota al mapa
       map_notes_zoom_in_tooltip: Feu zoom per veure les notes del mapa
       map_data_zoom_in_tooltip: Feu zoom per veure les dades del mapa
+      queryfeature_tooltip: Consulta característiques
+      queryfeature_disabled_tooltip: Apropeu-vos per consultar característiques
+    changesets:
+      show:
+        comment: Comentari
+        subscribe: Subscriure's
+        unsubscribe: Donar-se de baixa
+        hide_comment: ocultar
+        unhide_comment: mostrar
     notes:
       new:
         intro: Heu trobat un error o bé hi falta res? Informeu-ne a d'altres col·laboradors
@@ -2257,6 +2297,13 @@ ca:
         comment: Comenta
     edit_help: Moveu el mapa i feu zoom sobre una ubicació que vulgueu editar, i a
       continuació, feu clic aquí.
+    query:
+      node: Node
+      way: Via
+      relation: Relació
+      nothing_found: No s'han trobat característiques
+      error: 'Error en contactar amb %{server}: %{error}'
+      timeout: Temps de contacte amb %{server} excedit
   redaction:
     edit:
       description: Descripció
index bdada882a1416d3600752005eb3bd8665fc4ad08..852516b67169641868ae835fac2bf736252c3d74 100644 (file)
@@ -13,6 +13,7 @@
 # Author: Masox
 # Author: Matěj Grabovský
 # Author: Michaelbrabec
+# Author: Mkyral
 # Author: Mormegil
 # Author: Mr. Richard Bolla
 # Author: Nemo bis
@@ -137,11 +138,17 @@ cs:
       way_paginated: Cesty (%{x}–%{y} z %{count})
       relation: Relace (%{count})
       relation_paginated: Relace (%{x}–%{y} z %{count})
+      comment: Komentáře (%{count})
+      hidden_commented_by: Skrytý komentář od %{user} <abbr title='%{exact_time}'>Před
+        %{when}</abbr>
+      commented_by: <abbr title='%{exact_time}'>Před %{when}</abbr> okomentoval %{user}
       changesetxml: Soubor změn XML
       osmchangexml: osmChange XML
       feed:
         title: Sada změn %{id}
         title_comment: 'Sada změn: %{id} - %{comment}'
+      join_discussion: Pokud chcete diskutovat, přihlaste se
+      discussion: Diskuse
     node:
       title: 'Uzel: %{name}'
       history_title: 'Historie uzlu: %{name}'
@@ -219,6 +226,11 @@ cs:
       reopened_by_anonymous: Reaktivoval <abbr title='%{exact_time}'>před %{when}</abbr>
         anonym
       hidden_by: Skryl <abbr title='%{exact_time}'>před %{when}</abbr> %{user}
+    query:
+      title: Průzkum prvků
+      introduction: Pro nalezení okolních prvků klikněte do mapy.
+      nearby: Okolní prvky
+      enclosing: Umístění prvku
   changeset:
     changeset_paging_nav:
       showing_page: Stránka %{page}
@@ -248,6 +260,13 @@ cs:
       load_more: Načíst další
     timeout:
       sorry: Omlouváme se, ale vámi požadovaný seznam sad změn se načítal příliš dlouho.
+    rss:
+      title_all: Diskuse k sadě změn na OpenStreetMap
+      title_particular: 'Diskuse k sadě změn #%{changeset_id} na OpenStreetMap'
+      comment: '%{author} napsal nový komentář k sadě změn #%{changeset_id}'
+      commented_at_html: Aktualizováno před %{when}
+      commented_at_by_html: Aktualizováno před %{when} uživatelem %{user}
+      full: Celá diskuse
   diary_entry:
     new:
       title: Nový záznam do deníčku
@@ -750,6 +769,8 @@ cs:
           tram: Tramvajová trať
           tram_stop: Tramvajová zastávka
           yard: Přednádraží
+        route:
+          bus: Autobusová linka
         shop:
           alcohol: Prodej alkoholu
           antiques: Starožitnosti
@@ -953,10 +974,6 @@ cs:
       text: Pošlete příspěvek
     learn_more: Více informací
     more: Další
-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. výroční konference
-    sotm_line_2: 7.–9. listopadu 2014
-    sotm_line_3: Buenos Aires, Argentina
   license_page:
     foreign:
       title: O tomto překladu
@@ -1242,6 +1259,20 @@ cs:
         commented_note: '%{commenter} reaktivoval poznámku k mapě, kterou jste komentovali.
           Poznámka je umístěna poblíž %{place}.'
       details: Podrobnosti k poznámce můžete najít na %{url}.
+    changeset_comment_notification:
+      greeting: Ahoj,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} okomentoval jednu z vašich sad
+          změn'
+        subject_other: '[OpenStreetMap] %{commenter} okomentoval jednu ze sad změn,
+          která vás zajímá'
+        your_changeset: '%{commenter} zanechal komentář na jedné z vašich sad změn,
+          vytvořené %{time}.'
+        commented_changeset: '%{commenter} zanechal komentář na sadě změn, kterou
+          %{time} vytvořil %{changeset_author} a kterou sledujete.'
+        partial_changeset_with_comment: s komentářem „%{changeset_comment}“
+        partial_changeset_without_comment: bez komentáře
+      details: Více informací o této sadě změn lze nalézt na %{url}.
   message:
     inbox:
       title: Doručená pošta
@@ -2196,6 +2227,15 @@ cs:
       createnote_disabled_tooltip: Pro přidání poznámky přejděte na větší měřítko
       map_notes_zoom_in_tooltip: Pro zobrazení poznámek k mapě přejděte na větší měřítko.
       map_data_zoom_in_tooltip: Pro zobrazení mapových dat přejděte na větší měřítko.
+      queryfeature_tooltip: Průzkum prvků
+      queryfeature_disabled_tooltip: Pro průzkum prvků přejděte na větší měřítko
+    changesets:
+      show:
+        comment: Okomentovat
+        subscribe: Odebírat
+        unsubscribe: Zrušit odebírání
+        hide_comment: skrýt
+        unhide_comment: odkrýt
     notes:
       new:
         intro: Zahlédli jste chybu nebo prázdné místo? Dejte vědět ostatním uživatelům,
@@ -2213,6 +2253,13 @@ cs:
         comment: Okomentovat
     edit_help: Posuňte si mapu a zvětšete si místo, které chcete editovat, a klikněte
       zde.
+    query:
+      node: Uzel
+      way: Cesta
+      relation: Relace
+      nothing_found: Žádné nalezené objekty
+      error: 'Chyba při připojování k %{server}: %{error}'
+      timeout: Vypršel čas při připojování k %{server}
   redaction:
     edit:
       description: Popis
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
new file mode 100644 (file)
index 0000000..495473c
--- /dev/null
@@ -0,0 +1,1431 @@
+# Messages for Welsh (Cymraeg)
+# Exported from translatewiki.net
+# Export driver: phpyaml
+# Author: Cymrodor
+# Author: Robin Owain
+---
+cy:
+  time:
+    formats:
+      friendly: '%e %B %Y am %H:%M'
+  activerecord:
+    models:
+      acl: Rhestr Rheoli Mynediad
+      country: Gwlad
+      diary_comment: Nodyn Dyddiadur
+      diary_entry: Cofnod Dyddiadur
+      friend: Ffrind
+      language: Iaith
+      message: Neges
+      notifier: Hysbysydd
+      old_relation: Hen Berthynas
+      old_relation_member: Aelod o Hen Berthynas
+      old_relation_tag: Tag Hen Berthynas
+      old_way: Hen Lwybr
+      relation: Perthynas
+      session: Sesiwn
+      trace: Dargopïo
+      tracepoint: Pwynt Dargopïo
+      tracetag: Tag Dargopïo
+      user: Defnyddiwr
+      user_preference: Dewis Defnyddiwr
+      user_token: Tocyn Defnyddiwr
+      way: Llwybr
+      way_node: Cwgn Llwybr
+      way_tag: Tag Llwybr
+    attributes:
+      diary_comment:
+        body: Corff
+      diary_entry:
+        user: Defnyddiwr
+        title: Pwnc
+        latitude: Lledred
+        longitude: Hydred
+        language: Iaith
+      friend:
+        user: Defnyddiwr
+        friend: Ffrind
+      trace:
+        user: Defnyddiwr
+        visible: Gweladwy
+        name: Enw
+        size: Maint
+        latitude: Lledred
+        longitude: Hydred
+        public: Cyhoeddus
+        description: Disgrifiad
+      message:
+        sender: Danfonwr
+        title: Pwnc
+        body: Corff
+        recipient: Derbyniwr
+      user:
+        email: Ebost
+        active: Gweithredol
+        display_name: Dangos Enw
+        description: Disgrifiad
+        languages: Ieithoedd
+        pass_crypt: Cyfrinair
+  editor:
+    default: (currently %{name}) diofyn
+    id:
+      name: iD
+      description: iD (golygydd y porwr)
+  browse:
+    created: Crewyd
+    closed: Wedi cau
+    created_html: Crewyd <abbr title='%{title}'>%{time} yn ôl</abbr>
+    closed_html: Wedi cau <abbr title='%{title}'>%{time} yn ôl</abbr>
+    created_by_html: Crewyd <abbr title='%{title}'>%{time} yn ôl</abbr> gan %{user}
+    deleted_by_html: Dilewyd <abbr title='%{title}'>%{time} yn ôl</abbr> gan %{user}
+    edited_by_html: Golygwyd <abbr title='%{title}'>%{time} yn ôl</abbr> gan %{user}
+    closed_by_html: Caewyd <abbr title='%{title}'>%{time} yn ôl</abbr> gan %{user}
+    version: Fersiwn
+    anonymous: dienw
+    no_comment: (dim sylw)
+    part_of: Rhan o
+    download_xml: Lawrlwytho XML
+    view_history: Gweld yr Hanes
+    view_details: Gweld Manylion
+    location: Lleoliadː
+    changeset:
+      title: '%{id}'
+      belongs_to: Awdur
+      node: Cygnau (%{count})
+      node_paginated: Cygnau (%{x}-%{y} o %{count})
+      way: Llwybrau %{count}
+      way_paginated: Llwybrau (%{x}-%{y} o %{count})
+      comment: Sylwadau (%{count})
+      hidden_commented_by: Sylw cudd gan %{user} <abbr title='%{exact_time}'>%{when}
+        yn ôl</abbr>
+      commented_by: Sylw gan %{user} <abbr title='%{exact_time}'>%{when} yn ôl</abbr>
+      join_discussion: Mewngofnodwch i ymuno yn y sgwrs
+      discussion: Sgwrs
+    way:
+      title: 'Llwybr: %{name}'
+      history_title: 'Hanes Llwybr: %{name}'
+    relation:
+      title: 'Perthynas: %{name}'
+      members: Aelodau
+    relation_member:
+      type:
+        way: Llwybr
+        relation: Perthynas
+    containing_relation:
+      entry: Perthynas %{relation_name}
+      entry_role: Perthynas %{relation_name} (fel %{relation_role})
+    not_found:
+      sorry: 'Ymddiheurwn, ni ellir canfod %{type} #%{id}.'
+      type:
+        way: llwybr
+    timeout:
+      type:
+        way: llwybr
+        relation: perthynas
+    redacted:
+      type:
+        way: llwybr
+        relation: perthynas
+    start_rjs:
+      load_data: Llwytho Data
+      loading: Yn llwytho...
+    tag_details:
+      tags: Tagiau
+      wiki_link:
+        key: Tudalen disgrifiad wici ar gyfer y tag %{key}
+        tag: Tudalen disgrifiad wici ar gyfer y tag %{key}=%{value}
+      wikidata_link: Eitem %{page} ar Wikidata
+      wikipedia_link: Erthygl %{page} ar Wicipedia
+      telephone_link: Galw %{phone_number}
+    note:
+      title: 'Nodyn: %{id}'
+      new_note: Nodyn Newydd
+      description: Disgrifiad
+      hidden_title: Nodyn cudd %{note_name}
+      open_by: Crëwyd gan %{user} <abbr title='%{exact_time}'>%{when} yn ôl</abbr>
+      open_by_anonymous: Crëwyd yn ddienw <abbr title='%{exact_time}'>%{when} yn ôl</abbr>
+      commented_by: Sylw gan %{user} <abbr title='%{exact_time}'>%{when} yn ôl</abbr>
+      commented_by_anonymous: Sylw yn ddienw <abbr title='%{exact_time}'>%{when} yn
+        ôl</abbr>
+      hidden_by: Cuddwyd gan %{user} <abbr title='%{exact_time}'>%{when} yn ôl</abbr>
+    query:
+      title: Nodweddion Ymholiad
+      introduction: Cliciwch ar y map i ddarganfod nodweddion gerllaw.
+      nearby: Nodweddion gerllaw
+      enclosing: Nodweddion amgáu
+  changeset:
+    changeset_paging_nav:
+      showing_page: Tudalen %{page}
+      next: Nesaf »
+      previous: « Blaenorol
+    changeset:
+      anonymous: Dienw
+      no_edits: (dim newid)
+    changesets:
+      id: ID
+      saved_at: Cadwyd
+      user: Defnyddiwr
+      comment: Sylw
+      area: Maes
+    list:
+      load_more: Llwytho mwy
+    rss:
+      commented_at_html: Diweddarwyd %{when} yn ôl
+      commented_at_by_html: Diweddarwyd %{when} yn ôl gan %{user}
+      full: Sgwrs llawn
+  diary_entry:
+    new:
+      title: Cofnod Dyddiadur Newydd
+    list:
+      title: Dyddiaduron defnyddwyr
+      title_friends: Dyddiaduron ffrindiau
+      title_nearby: Dyddiaduron defnyddwyr gerllaw
+      user_title: Dyddiadur %{user}
+      in_language_title: Cofnodion Dyddiadur yn %{language}
+      new: Cofnod Dyddiadur Newydd
+      new_title: Ysgrifennu cofnod newydd yn eich dyddiadur defnyddiwr
+      no_entries: Dim cofnodion dyddiadur
+      recent_entries: Cofnodion dyddiadur diweddar
+      older_entries: Cofnodion Hŷn
+      newer_entries: Confodion Mwy Diweddar
+    edit:
+      title: Golygu cofnod dyddiadur
+      subject: 'Pwnc:'
+      body: 'Corff:'
+      language: 'Iaith:'
+      location: 'Lleoliad:'
+      latitude: Hydred
+      longitude: Lledred
+      use_map_link: defnyddiwch y map
+      save_button: Arbed
+      marker_text: Lleoliad cofnod y dyddiadur
+    view:
+      title: yddiadur %{user} | %{title}
+      user_title: dyddiadur %{user}
+      leave_a_comment: Gadael sylw
+      login_to_leave_a_comment: '%{login_link} i adael sylw'
+      login: Mewngofnodi
+      save_button: Cadw
+    no_such_entry:
+      title: Dim cofnod o'r fath yn y dyddiadur
+      heading: 'Dim cofnod efo''r id: %{id}'
+      body: Ymddiheurwn, ond nid oes cofnod o sylw gyda'r id %{id}. Gwirwch eich sillafu,
+        neu a ydych wedi clicio dolen anghywir?
+    diary_entry:
+      posted_by: Postiwyd gan %{link_user} ar %{created} mewn %{language_link}
+      comment_link: Sylw ar y cofnod hwn
+      reply_link: Ymateb i'r cofnod hwn
+      comment_count:
+        zero: Dim sylwadau
+        one: '%{count} sylw'
+        other: '%{count} sylw'
+      edit_link: Golygu'r cofnod hwn
+      hide_link: Cuddio'r cofnod hwn
+      confirm: Cadarnhau
+    diary_comment:
+      comment_from: Sylwadau gan %{link_user} ar %{comment_created_at}
+      hide_link: Cuddio'r sylw hwn
+      confirm: Cadarnhau
+    location:
+      location: 'Lleoliad:'
+      view: Dangos
+      edit: Golygu
+    feed:
+      user:
+        title: Cofnodion OpenStreetMap ar gyfer %{user}
+        description: Cofnodion dyddiadur diweddar OpenStreetMap gan %{user}
+      language:
+        title: Cofnodion dyddiadur OpenStreetMap mewn %{language_name}
+        description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap in
+          %{language_name} mewn %{language_name}
+      all:
+        title: Cofnodion dyddiadur OpenStreetMap
+        description: Cofnodion dyddiadur diweddar gan ddefnyddwyr OpenStreetMap
+    comments:
+      has_commented_on: Mae %{display_name} wedi rhoi sylw ar y cofnodion dyddiadurol
+        canlynol
+      post: Post
+      when: Pa bryd
+      comment: Sylw
+      ago: '%{ago} yn ôl'
+      newer_comments: Sylwadau mwy diweddar
+      older_comments: Hen Sylwadau
+  export:
+    title: Allforio
+    start:
+      area_to_export: Ardal i'w Hallforio
+      manually_select: Dewisiwch ardal wahanol
+      format_to_export: Fformatiwch i'w Hallforio
+      osm_xml_data: Data XML OpenStreetMap
+      map_image: Delwedd y Map (dangoser yr haen safonol)
+      licence: Trwydded
+      export_details: Trwyddedir OpenStreetMap ar drwydded <a href="http://opendatacommons.org/licenses/odbl/1.0/">Comin
+        Data Agored (Open Data Commons Open Database License)</a> (ODbL).
+      too_large:
+        other:
+          title: Ffynonellau eraill
+          description: Ffynonellau ychwanegol a nodir ar wici OpenStreetMap
+      options: Dewisiadau
+      format: Fformat
+      scale: Graddfa
+      max: uchafswm
+      image_size: Maint y ddelwedd
+      zoom: Chwyddo
+      add_marker: Ychwanegwch bin ar y map
+      latitude: 'Lledred:'
+      longitude: 'Hydred:'
+      output: Allbwn
+      export_button: Allforio
+  geocoder:
+    search:
+      title:
+        latlon: Canlyniadau o <a href="http://openstreetmap.org/">Internal</a>
+        us_postcode: Canlyniadau o <a href="http://geocoder.us/">Geocoder.us</a>
+        uk_postcode: Canlyniadau o <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
+          Postcode</a>
+        ca_postcode: Canlyniadau o <a href="http://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>
+        geonames: Canlyniadau o <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim_reverse: Canlyniadau o <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>
+        geonames_reverse: Canlyniadau o <a href="http://www.geonames.org/">GeoNames</a>
+    search_osm_nominatim:
+      prefix:
+        aerialway:
+          chair_lift: Cadair godi
+          drag_lift: Cadair lusg
+        aeroway:
+          aerodrome: Maesawyr
+          apron: Ffedog
+          gate: Giat
+          helipad: Pad Hofrennydd
+        amenity:
+          airport: Maes Awyr
+          arts_centre: Canolfan Grefftau
+          atm: Peiriant Codi Arian
+          auditorium: Awditoriwm
+          bank: Banc
+          bar: Bar
+          bbq: Barbeciw
+          bench: Mainc
+          bicycle_parking: Man Cadw Beic
+          bicycle_rental: Man Llogi Beic
+          biergarten: Gardd Gwrw
+          brothel: Puteindy
+          bureau_de_change: Bureau de Change
+          bus_station: Gorsaf Fysiau
+          cafe: Caffi
+          car_rental: Man Llogi Cerbyd
+          car_sharing: Man Rhannu Cerbyd
+          car_wash: Golchwr Cerbyd
+          casino: Casino
+          charging_station: Gorsaf Gwefru
+          cinema: Sinema
+          clinic: Clinic
+          club: Clwb
+          college: Coleg
+          community_centre: Canolfan Cymunedol
+          courthouse: Llys
+          crematorium: Amlosgfa
+          dentist: Deintydd
+          doctors: Meddygfa
+          drinking_water: Dŵr Yfed
+          driving_school: Ysgol Yrru
+          embassy: Llysgenhadaeth
+          emergency_phone: Ffôn Argyfwng
+          fast_food: Bwyd Parod
+          fire_station: Gorsaf Dân
+          food_court: Cwrt Fwydydd
+          fountain: Ffynnon
+          fuel: Tanwydd
+          grave_yard: Mynwent
+          gym: Canolfan Ffitrwydd / Campfa
+          hall: Neuadd
+          health_centre: Canolfan Iechyd
+          hospital: Ysbyty
+          hotel: Gwesty
+          ice_cream: Hufen Iâ
+          kindergarten: Meithrinfa
+          library: Llyfrgell
+          market: Marchnad
+          marketplace: Marchnad
+          mountain_rescue: Achub bywyd mynydd
+          nightclub: Clwb Nôs
+          nursery: Meithrinfa
+          nursing_home: Cartref Nyrsio
+          office: Swyddfa
+          park: Parc
+          parking: Parcio
+          pharmacy: Fferyllfa
+          place_of_worship: Man addoli
+          police: Heddlu
+          post_box: Blwch Llythyrau
+          post_office: Swyddfa Bost
+          preschool: Meithrinfa
+          prison: Carchar
+          pub: Tafarn
+          public_building: Adeilad Cyhoeddus
+          public_market: Marchnad Cyhoeddus
+          reception_area: Derbyniad
+          recycling: Pwynt Ailgylchu
+          restaurant: Bwyty
+          retirement_home: Cartref Ymddeol
+          sauna: Sawna
+          school: Ysgol
+          shelter: Cysgod
+          shop: Siop
+          shopping: Siopa
+          shower: Cawod
+          social_centre: Canolfan Cymdeithasol
+          social_club: Clwb Cymdeithasol
+          social_facility: Cyfleuster cymedithasol
+          studio: Stiwdio
+          supermarket: Archfarchnad
+          swimming_pool: Pwll Nofio
+          taxi: Tacsi
+          telephone: Ffôn Cyhoeddus
+          theatre: Theatr
+          toilets: Tai bach
+          townhall: Neuadd Dref
+          university: Prifysgol
+          veterinary: Milfeddygfa
+          village_hall: Neuadd Bentref
+          waste_basket: Bin sbwriel
+          wifi: Mynediad WiFi
+          WLAN: Mynediad WiFi
+          youth_centre: Canolfan Ieuenctid
+        boundary:
+          census: Ffin Cyfrifiad
+          national_park: Parc Cenedlaethol
+          protected_area: Ardal Warchodol
+        bridge:
+          aqueduct: Dyfrbont
+          suspension: Pont Grog
+          viaduct: Pont Trenau
+          "yes": Pont
+        building:
+          "yes": Adeilad
+        emergency:
+          phone: Ffôn Argyfwng
+        highway:
+          bridleway: Llwybr Ceffyl
+          bus_stop: Stop Bysiau
+          construction: Priffordd yn cael ei Adeiladu
+          cycleway: Llwybr Beicio
+          emergency_access_point: Pwynt Mynediad Argyfwng
+          footway: Llwybr Cerdded
+          ford: Rhyd
+          milestone: Carreg Filltir
+          minor: Ffordd Gefn
+          motorway: Traffordd
+          motorway_junction: Cyffordd Traffordd
+          motorway_link: Ffordd Traffordd
+          path: Llwybr
+          pedestrian: Llwybr Cerddwyr
+          platform: Platfform
+          primary: Priffordd
+          primary_link: Priffordd
+          proposed: Ffordd Arfaethedig
+          rest_area: Man Gorffwys
+          road: Ffordd
+          secondary: Ffordd Eilaidd
+          secondary_link: Ffordd Eilaidd
+          services: Gwasanaethau Traffordd
+          speed_camera: Camera Cyflymder
+          steps: Grisiau
+          street_lamp: Golau Stryd
+          stile: Camfa
+          tertiary: Ffordd Trydyddol
+          tertiary_link: Ffordd Trydyddol
+          track: Trac
+          trail: Llwybr
+          trunk: Cefnffordd
+          trunk_link: Cefnffordd
+          unclassified: Ffordd Diddosbarth
+          unsurfaced: Ffordd Heb Wyneb
+        historic:
+          archaeological_site: Safle Archaeolegol
+          battlefield: Maes Brwydr
+          boundary_stone: Maen Terfyn
+          building: Adeilad
+          castle: Castell
+          church: Eglwys
+          citywalls: Waliau Ddinas
+          fort: Caer
+          house: Tŷ
+          icon: Eicon
+          manor: Maenor
+          memorial: Cofeb
+          mine: Mwynfa
+          monument: Cofadail
+          museum: Amgueddfa
+          ruins: Adfeilion
+          tomb: Beddrod
+          tower: Tŵr
+          wayside_cross: Croes Min Ffordd
+          wayside_shrine: Cysegrfa Min Ffordd
+          wreck: Llongddrylliad
+        landuse:
+          allotments: Rhandiroedd
+          basin: Basn
+          brownfield: Browndir
+          cemetery: Mynwent
+          commercial: Ardal Fasnachol
+          conservation: Cadwraeth
+          construction: Adeiladwaith
+          farm: Fferm
+          farmland: Tir Ffermio
+          farmyard: Buarth Fferm
+          forest: Coedwig
+          garages: Garejis
+          grass: Glaswellt
+          greenfield: Glastir
+          industrial: Ardal Ddiwydiannol
+          landfill: Safle Tirlenwi
+          meadow: Dôl
+          military: Ardal Milwrol
+          mine: Mwynglawdd
+          orchard: Berllan
+          nature_reserve: Gwarchodfa Natur
+          park: Parc
+          piste: Piste
+          quarry: Chwarel
+          railway: Rheilffordd
+          recreation_ground: Maes Chwarae
+          reservoir: Cronfa Ddŵr
+          retail: Adwerthu
+          village_green: Llain Pentref
+          vineyard: Gwinllan
+          wetland: Gwlypdir
+          wood: Coed
+        leisure:
+          beach_resort: Ardal Wyliau
+          common: Tir Comin
+          fishing: Man Pysgota
+          garden: Gardd
+          golf_course: Cwrs Golff
+          ice_rink: Llawr Sglefrio
+          marina: Marina
+          miniature_golf: Golff Pitw
+          nature_reserve: Gwarchodfa Natur
+          park: Parc
+          pitch: Maes Chwarae
+          playground: Lle Chwarae
+          recreation_ground: Maes Hamdden
+          sauna: Sawna
+          slipway: Llithrffordd
+          sports_centre: Canolfan Chwaraeon
+          stadium: Stadiwm
+          swimming_pool: Pwll Nofio
+          track: Trac Rhedeg
+          water_park: Parc Dŵr
+        military:
+          airfield: Maes Awyr Milwrol
+          barracks: Barics
+          bunker: Byncer
+        mountain_pass:
+          "yes": Bwlch Mynydd
+        natural:
+          bay: Bae
+          beach: Traeth
+          cape: Penrhyn
+          cave_entrance: Mynediad Ogof
+          channel: Culfor
+          cliff: Clogwyn
+          crater: Crater
+          dune: Twyn
+          feature: Nodwedd
+          fjord: Ffiord
+          forest: Coedwig
+          geyser: Geiser
+          glacier: Rhewlif
+          heath: Rhos
+          hill: Bryn
+          island: Ynys
+          land: Tir
+          marsh: Cors
+          moor: Gwaun
+          mud: Mwd
+          peak: Copa
+          point: Pwynt
+          reef: Riff
+          ridge: Cefn
+          river: Afon
+          rock: Craig
+          scree: Sgri
+          shoal: Haig
+          spring: Ffynnon
+          stone: Carreg
+          strait: Culfor
+          tree: Coeden
+          valley: Dyffryn
+          volcano: Llosgfynydd
+          water: Dŵr
+          wetland: Gwlypdir
+          wetlands: Gwlypdiroedd
+          wood: Coed
+        office:
+          accountant: Cyfrifydd
+          architect: Pensaer
+          company: Cwmni
+          employment_agency: Asiantaeth Cyflogi
+          estate_agent: Gwerthwr Tai
+          government: Swyddfa Llywodraeth
+          insurance: Swyddfa Yswiriant
+          lawyer: Cyfreithiwr
+          telecommunication: Swyddfa Telegyfathrebu
+          travel_agent: Asiantaeth Deithio
+          "yes": Swyddfa
+        place:
+          airport: Maes Awyr
+          city: Dinas
+          country: Gwlad
+          county: Sir
+          farm: Fferm
+          hamlet: Pentrefan
+          house: Tŷ
+          houses: Tai
+          island: Ynys
+          islet: Ynysig
+          isolated_dwelling: Annedd Unig
+          locality: Ardal
+          moor: Gwaun
+          municipality: Bwrdeistref
+          neighbourhood: Cymdogaeth
+          postcode: Cod Post
+          region: Rhanbarth
+          sea: Môr
+          state: Talaith
+          subdivision: Is-adran
+          suburb: Maestref
+          town: Tref
+          village: Pentref
+        railway:
+          abandoned: Hen Reilffordd
+          construction: Rheilffordd yn cael ei Osod
+          disused: Rheilffordd Segur
+          disused_station: Gorsaf Drenau Segur
+          funicular: Rheilffordd fynydd
+          halt: Stop Trenau
+          historic_station: Hen Orsaf Trenau
+          junction: Cyffordd Rheilffyrdd
+          level_crossing: Croesfan Wastad
+          miniature: Lein Fach
+          narrow_gauge: Lein Fach Gul
+          platform: Platfform Drenau
+          preserved: Rheilffordd ar Gadw
+          proposed: Rheilfford Arfaethedig
+          spur: Cainc Rheilffordd
+          station: Gorsaf Drenau
+          subway: Gorsaf Drenau Tanddaearol
+          subway_entrance: Mynedfa at Drenau Tanddaearol
+          tram: Tramffordd
+          tram_stop: Stop Tramiau
+          yard: Buarth Drenau
+        route:
+          bus: Taith Bws
+        shop:
+          alcohol: Siop Drwyddedig
+          antiques: Hynafolion
+          art: Siop Gelf
+          bakery: Becws
+          beauty: Siop Harddwch
+          beverages: Siop Ddiodau
+          bicycle: Siop Feiciau
+          books: Siop Lyfrau
+          boutique: Boutique
+          butcher: Cigydd
+          car: Siop Geir
+          car_parts: Rhannau Ceir
+          car_repair: Trwsio Ceir
+          carpet: Siop Garpedi
+          charity: Siop Elusen
+          chemist: Fferyllfa
+          clothes: Siop Ddillad
+          computer: Siop Gyfrifiaduron
+          confectionery: Siop Felysion
+          convenience: Siop Bob-peth
+          copyshop: Siop Argraffu
+          cosmetics: Siop Golur
+          deli: Deli
+          department_store: Siop Adrannol
+          discount: Siop Ddisgownt
+          doityourself: DIY
+          dry_cleaning: Sychlanhau
+          electronics: Siop Electroneg
+          estate_agent: Gwerthwr Tai
+          farm: Siop Fferm
+          fashion: Siop Ffasiwn
+          fish: Siop Bysgod
+          florist: Siop Flodau
+          food: Siop Fwyd
+          funeral_directors: Trefnwyr Angladdau
+          furniture: Dodrefn
+          gallery: Galeri
+          garden_centre: Canolfan Gardd
+          general: Siop Gyffredinol
+          gift: Siop Anrhegion
+          greengrocer: Siop Lysiau
+          grocery: Siop y Groser
+          hairdresser: Siop Drin Gwallt
+          hardware: Siop Nwyddau Metel
+          hifi: Sain
+          insurance: Yswiriant
+          jewelry: Siop Gemwaith
+          kiosk: Siop Fechan
+          laundry: Golchdy
+          mall: Canolfan Siopa
+          market: Marchnad
+          mobile_phone: Siop Ffonau Symudol
+          motorcycle: Siop Beiciau Modur
+          music: Siop Gerddoriaeth
+          newsagent: Siop Bapurau
+          optician: Optegydd
+          organic: Siop Fwyd Organig
+          outdoor: Siop Awyr Agored
+          pet: Siop Anifeiliaid Anwes
+          pharmacy: Fferyllfa
+          photo: Siop Luniau
+          salon: Salon Trin Gwallt
+          second_hand: Siol Ail-law
+          shoes: Siop Esgidiau
+          shopping_centre: Canolfan Siopa
+          sports: Siop Chwaraeon
+          stationery: Siop Offer Swyddfa
+          supermarket: Archfarchnad
+          tailor: Teiliwr
+          toys: Siop Degannau
+          travel_agency: Asiantaeth Deithio
+          video: Siop Fideos
+          wine: Siop Drwyddedig
+          "yes": Siop
+        tourism:
+          alpine_hut: Cwt Mynydd
+          artwork: Gwaith Celf
+          attraction: Atyniad
+          bed_and_breakfast: Gweldy a Brecwast
+          cabin: Caban
+          camp_site: Man Gwersylla
+          caravan_site: Parc Carafanau
+          chalet: Chalet
+          guest_house: Llety
+          hostel: Hostel
+          hotel: Gwesty
+          information: Gwybodaeth
+          motel: Motél
+          museum: Amgueddfa
+          picnic_site: Safle Picnic
+          theme_park: Parc Thema
+          valley: Dyffryn
+          viewpoint: Gwylfa
+          zoo: Sw
+        tunnel:
+          culvert: Twnel Ddŵr
+          "yes": Twnel
+        waterway:
+          canal: Camlas
+          dam: Argae
+          derelict_canal: Camlas Diffaith
+          ditch: Ffos
+          dock: Porthladd
+          drain: Draen
+          lock: Loc
+          lock_gate: Llifddor
+          mineral_spring: Ffynnon Dŵr Mwynol
+          mooring: Angori
+          rapids: Dŵr Tyrfol
+          river: Afon
+          riverbank: Glan Afon
+          stream: Nant
+          wadi: Sychnant
+          waterfall: Rheadr
+          water_point: Pwynt Dŵr
+          weir: Cored
+      admin_levels:
+        level2: Ffin Gwledydd
+        level4: Ffin Taleithiau
+        level5: Ffin Rhanbarth
+        level6: Ffin Sir
+        level8: Ffin Dinas
+        level9: Ffin Pentref
+        level10: Ffin Maesdref
+    description:
+      types:
+        cities: Dinasoedd
+        towns: Trefi
+        places: Lleoedd
+    results:
+      no_results: Dim canlyniadau
+      more_results: Mwy o ganlyniadau
+    direction:
+      south_west: de-orllewin
+      south: de
+      south_east: de-ddwyrain
+      east: dwyrain
+      north_east: gogledd-ddwyrain
+      north: gogledd
+      north_west: gogledd-orllewin
+      west: gorllewin
+  layouts:
+    logo:
+      alt_text: Logo OpenStreetMap
+    home: Ewch Adref
+    logout: Allgofnodi
+    log_in: Mewngofnodi
+    log_in_tooltip: Mewngofnodi gyda chyfrif sy'n bodoli
+    sign_up: Cofrestru
+    start_mapping: Dechrau Mapio
+    sign_up_tooltip: Creu cyfrif er mwyn golygu
+    edit: Golygu
+    history: Hanes
+    export: Allforio
+    data: Data
+    export_data: Allforio Data
+    gps_traces: Dargopiadau GPS
+    user_diaries: Dyddiaduron Defnyddwyr
+    user_diaries_tooltip: Gweld dyddiaduron defnyddwyr
+    edit_with: Golygu gyda %{editor}
+    tag_line: Y Map Wici Rhydd o'r Byd
+    intro_header: Croeso i OpenStreetMap!
+    intro_text: Mae OpenStreetMap yn fap o'r byd, wedi'i greu gan bobl fel chi ac
+      sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd.
+    intro_2_create_account: Creu cyfrif defnyddiwr
+    partners_ic: Imperial College London
+    partners_bytemark: Bytemark Hosting
+    partners_partners: Partneriaid
+    osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwaith
+      cynnal a chadw hanfodol.
+    osm_read_only: Nid yw'n bosib golygu cronfa ddata OpenStreetMap ar hyn o bryd
+      tra bod gwaith cynnal a chadw hanfodol yn digwydd.
+    donate: Cefnogwch OpenStreetMap gan %{link} i'r Gronfa Uwchraddio Caledwedd.
+    help: Cymorth
+    about: Ynghylch
+    copyright: Hawlfraint
+    community: Cymuned
+    community_blogs: Blogiau'r Gymuned
+    community_blogs_title: Blogiau gan aelodau cymuned OpenStreetMap
+    foundation: Sefydliad
+    foundation_title: Yr OpenStreetMap Foundation
+    make_a_donation:
+      title: Cefnogwch OpenStreetMap gyda rhodd ariannol
+      text: Gwneud Cyfraniad
+    learn_more: Dysgu Mwy
+    more: Mwy
+  license_page:
+    foreign:
+      title: Ynghylch y cyfieithiad hwn
+      text: Os oes gwrthgyferbyniad rhwng y cyfieithiad hwn a %{english_original_link},
+        bydd y dudalen Saesneg yn cael blaenoriaeth.
+      english_link: y Saesneg gwreiddiol
+    native:
+      title: Ynghylch y dudalen hon
+      mapping_link: dechrau mapio
+    legal_babble:
+      title_html: Hawlfraint a Thrwydded
+      intro_1_html: |-
+        Mae OpenStreetMap yn <i>data agored</i>, dan drwydded <a
+        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        Commons Open Database License</a> (ODbL).
+      credit_title_html: Sut i gydnabod OpenStreetMap
+      attribution_example:
+        title: Enghraifft o gydnabyddiaeth
+      more_title_html: Darganfod rhagor
+      contributors_title_html: Ein cyfrannwyr
+      contributors_gb_html: "<strong>Y Deyrnas Gyfunol</strong>: Cynhwysir data a
+        thestun gan yr Arolwg Ordnans; hawlfraint y Goron a hawl cronfa ddata \n2010-12."
+      infringement_title_html: Torrwyd yr hawlfraint
+  welcome_page:
+    title: Croeso!
+    whats_on_the_map:
+      title: Beth sydd ar y Map
+    basic_terms:
+      title: Termau syml mapio
+    questions:
+      title: Unrhyw gwestiwn?
+    start_mapping: Dechrau Mapio
+    add_a_note:
+      title: Dim amser i olygu? Ychwanegwch nodyn!
+  fixthemap:
+    how_to_help:
+      title: Sut i Helpu
+      join_the_community:
+        title: Ymunwch â'r gymuned
+    other_concerns:
+      title: Gofidion eraill
+  help_page:
+    title: Cael Cymorth
+    welcome:
+      url: /croeso
+      title: Croeso i OSM
+  about_page:
+    next: Nesaf
+    copyright_html: <span>&copy;</span>cyfrannwyr<br>OpenStreetMap
+    local_knowledge_title: Gwybodaeth Leol
+    open_data_title: Data Agored
+    partners_title: Partneriaid
+  notifier:
+    gpx_notification:
+      greeting: Pa hwyl?
+      with_description: gyda'r disgrifiad
+      and_the_tags: 'a''r tagiau canlynol:'
+      and_no_tags: a dim tagiau.
+      failure:
+        subject: Methwyd mewnforio GPX [OpenStreetMap]
+        failed_to_import: 'methwyd a mewnforio. Dyma''r gwall:'
+    signup_confirm:
+      greeting: Pa hwyl!
+      created: Mae rhywun (chi gobeithio!) newydd greu cyfrif yn %{site_url}.
+    email_confirm_plain:
+      greeting: Pa hwyl,
+    note_comment_notification:
+      anonymous: Defnyddiwr anhysbys
+      greeting: Pa hwyl?
+  message:
+    inbox:
+      title: Mewnflwch
+      my_inbox: Fy Mewnflwch
+      outbox: allflwch
+      messages: Mae gennych %{new_messages} a %{old_messages}
+      from: Gan
+      subject: Pwnc
+      date: Dyddiad
+      people_mapping_nearby: person yn mapio gerllaw
+    message_summary:
+      unread_button: Nodi fel heb ei ddarllen
+      read_button: Nodi fel wedi'i ddarllen
+      reply_button: Ateb
+      delete_button: Dileu
+    new:
+      title: Anfon neges
+      send_message_to: Anfon negese newydd at %{name}
+      subject: Pwnc
+      body: Corff
+      send_button: Anfon
+      back_to_inbox: Nôl i'r mewnflwch
+      message_sent: Anfonwyd y neges
+      limit_exceeded: Rydych wedi anfon nifer o negeseuon yn ddiweddar. Arhoswch ychydig
+        cyn ceisio anfon mwy.
+    no_such_message:
+      title: Dim neges o'r fath
+      heading: Dim neges o'r fath
+      body: Ymddiheuriad, nid oes neges gyda'r id yno.
+    outbox:
+      title: Allanflwch
+      my_inbox: Fy %{inbox_link}
+      inbox: mewnflwch
+      outbox: allanflwch
+      messages:
+        one: Mae gennych %{count} neges wedi ei anfon
+        other: Mae gennych %{count} neges wedi eu hanfon
+      to: I
+      subject: Pwnc
+      date: Dyddiad
+    read:
+      title: Darllen neges
+      from: Gan
+      subject: Pwnc
+      date: Dyddiad
+      reply_button: Ateb
+      unread_button: Nodi nad yw wedi ei ddarllen
+      back: Yn ôl
+      to: At
+    sent_message_summary:
+      delete_button: Dileu
+    mark:
+      as_read: Nodwyd fod y neges wedi ei ddarllen
+      as_unread: Nodwyd nad yw'r neges wedi ei ddarllen
+    delete:
+      deleted: Dileuwyd y neges
+  site:
+    index:
+      shortlink: Dolen Fyr
+      createnote: Ychwanegu nodyn
+      license:
+        copyright: Hawlfraint OpenStreetMap a chyfranwyr, dan drwydded agored
+    edit:
+      not_public: Nid ydych wedi gosod eich golygiadau i fod yn gyhoeddus.
+      user_page_link: tudalen defnyddiwr
+      anon_edits_link_text: Darganfyddwch achos hyn.
+    sidebar:
+      search_results: Canlyniadau Chwilio
+      close: Cau
+    search:
+      search: Chwilio
+      where_am_i: Ble ydw i?
+      where_am_i_title: Disgrifiwch eich lleoliad presennol gan ddefnyddio peiriant
+        chwilio.
+      submit_text: Mynd
+    key:
+      table:
+        entry:
+          motorway: Traffordd
+          trunk: Cefnffordd
+          primary: Priffordd
+          secondary: Ffordd eilaidd
+          unclassified: Ffordd annosbarthedig
+          unsurfaced: Ffordd heb arwyneb
+          track: Trac
+          footway: Ffordd droed
+          rail: Rheilffordd
+          subway: Trenau Tanddaearyddol
+          tram:
+            1: tram
+          cable:
+          - Car codi
+          forest: Coedwig
+          wood: Coed
+          golf: Cwrs golff
+          park: Parc
+          tourist: Atyniad twristiaid
+          common:
+          - Comin
+          - dôl
+          retail: Ardal adwerthu
+          industrial: Ardal diwydiannol
+          commercial: Ardal masnachol
+          heathland: Rhostir
+          lake:
+          - Llyn
+          - cronfa ddŵr
+          farm: Fferm
+          cemetery: Mynwent
+          allotments: Rhandiroedd
+          pitch: Maes chwarae
+          centre: Canolfan chwaraeon
+          reserve: Gwarchodfa natur
+          military: Ardal milwrol
+          school:
+          - Ysgol
+          - prifysgol
+          building: Adeilad sylweddol
+          station: Gorsaf drenau
+          summit:
+          - Copa
+          - Crib
+          private: Mynediad preifat
+          permissive: Mynediad gyda chaniatâd
+          destination: Mynediad cyrchfan
+    richtext_area:
+      edit: Golygu
+      preview: Rhagolwg
+    markdown_help:
+      headings: Penawdau
+      heading: Pennawd
+      subheading: Is-bennawd
+      unordered: Rhestr heb drefn
+      ordered: Rhestr mewn trefn
+      first: Eitem gyntaf
+      second: Ail eitem
+      link: Dolen
+      text: Testun
+      image: Delwedd
+      alt: Testun Amgen
+      url: URL
+  trace:
+    edit:
+      filename: 'Enw ffeil:'
+      download: lawrlwytho
+      uploaded_at: 'Uwchlwythwyd:'
+      points: 'Pwyntiau:'
+      start_coord: 'Cyfesuryn dechrau:'
+      map: map
+      edit: golygu
+      owner: 'Perchennog:'
+      description: 'Disgrifiad:'
+      tags: 'Tagiau:'
+      save_button: Cadw Newidiadau
+      visibility: 'Gwelededd:'
+      visibility_help: beth mae hyn yn golygu?
+    trace_form:
+      upload_gpx: 'Uwchlwytho Ffeil GPX:'
+      description: 'Disgrifiad:'
+      tags: 'Tagiau:'
+      visibility: 'Gwelededd:'
+      visibility_help: beth mae hyn yn golygu?
+      upload_button: Uwchlwytho
+      help: Cymorth
+    trace_optionals:
+      tags: Tagiau
+    view:
+      filename: 'Enw ffeil:'
+      download: lawrlwytho
+      uploaded: 'Uwchlwythwyd:'
+      points: 'Pwyntiau:'
+      start_coordinates: 'Cyfesuryn dechrau:'
+      map: map
+      edit: golygu
+      owner: 'Perchennog:'
+      description: 'Disgrifiad:'
+      tags: 'Tagiau:'
+      none: Dim
+      visibility: 'Gwelededd:'
+    trace_paging_nav:
+      showing_page: Tudalen %{page}
+    trace:
+      count_points: '%{count} pwynt'
+      ago: '%{time_in_words_ago} yn ôl'
+      more: mwy
+      view_map: Gweld Map
+      edit: golygu
+      edit_map: Golygu'r Map
+      public: CYHOEDDUS
+      identifiable: CANFYDDADWY
+      private: PREIFAT
+      trackable: OLRHAINADWY
+      by: gan
+      in: mewn
+      map: map
+    list:
+      tagged_with: tagiwyd gyda %{tags}
+  oauth:
+    oauthorize:
+      allow_to: 'Caniatáu''r rhaglen cleient i:'
+      allow_read_prefs: ddarllen eich gosodiadau defnyddiwr.
+      allow_write_prefs: addasu eich gosodiadau defnyddiwr.
+      allow_write_diary: creu cofnodion dyddiadur, sylwadau a gwneud ffrindiau.
+      allow_write_api: addasu'r map.
+      allow_read_gpx: ddarllen eich dargopiadau GPS.
+      allow_write_gpx: uwchlwytho dargopiadau GPS.
+      allow_write_notes: addasu nodiadau.
+    oauthorize_success:
+      title: Caniatawyd y cais awdurdodiad.
+      allowed: Rydych wedi caniatáu mynediad i'ch cyfrif gan y rhaglen %{app_name}.
+      verification: Y cod dilysiad yw %{code}
+    oauthorize_failure:
+      title: Methwyd y cais awdurdodiad.
+      denied: Rydych wedi gwrthod mynediad i'ch cyfrif gan y rhaglen %{app_name}.
+      invalid: Nid yw'r tocyn awdurdodiad yn ddilys.
+    revoke:
+      flash: Rydych wedi diddymu'r tocyn ar gyfer %{application}.
+  oauth_clients:
+    new:
+      title: Cofrestru rhaglen newydd
+      submit: Cofrestru
+    edit:
+      title: Golygu'ch rhaglen
+      submit: Golygu
+    show:
+      url: 'URL Cais Tocyn:'
+      access_url: URL Tocyn Mynediad
+      authorize_url: 'URL Awdurdodi:'
+      edit: Golygu Manylion
+      delete: Dileu Cleient
+      confirm: Ydych yn siŵr?
+      allow_read_prefs: darllen eu gosodiadau defnyddwyr.
+      allow_write_prefs: addasu eu gosodiadau defnyddwyr.
+      allow_write_diary: creu cofnodion dyddiadur, sylwadau a gwneud ffrindiau.
+      allow_write_api: addasu'r map.
+      allow_read_gpx: ddarllen eu dargopiadau GPS preifat.
+      allow_write_gpx: uwchlwytho dargopiadau GPS.
+      allow_write_notes: addasu nodiadau.
+    form:
+      name: Enw
+      required: Angenrheidiol
+      url: Prif URL y Rhaglen
+      allow_read_prefs: darllen eu gosodiadau defnyddwyr.
+      allow_write_prefs: addasu eu gosodiadau defnyddwyr.
+      allow_write_diary: creu cofnodion dyddiadur, sylwadau a gwneud ffrindiau.
+      allow_write_api: addasu'r map.
+      allow_read_gpx: ddarllen eu dargopiadau GPS preifat.
+      allow_write_gpx: uwchlwytho dargopiadau GPS.
+      allow_write_notes: addasu nodiadau.
+  user:
+    login:
+      title: Mewngofnodi
+      heading: Mewngofnodi
+      email or username: 'Cyfeiriad Ebost neu Enw Defnyddiwr:'
+      password: 'Cyfrinair:'
+      openid: '%{logo} OpenID:'
+      remember: Fy nghofio i
+      lost password link: Wedi anghofio'ch cyfrinair?
+      login_button: Mewngofnodi
+      register now: Cofrestru nawr
+      with username: Eisoes gyda chyfrif OpenStreetMap? Mewngofnodwch gyda'ch enw
+        defnyddiwr a'ch cyfrinair.
+      with openid: 'Neu, mewngofnodwch gydag OpenID:'
+      new to osm: Yn newydd i OpenStreetMap?
+      to make changes: I wneud newidiadau i ddata OpenStreetMap, mae'n rhaid cael
+        cyfrif.
+      create account minute: Crewch cyfrif. Dim ond munud mae'n cymryd.
+      no account: Dim cyfrif gennych?
+      openid_logo_alt: Mewngofnodi gydag OpenID
+      openid_providers:
+        openid:
+          title: Mewngofnodi gydag OpenID
+          alt: Mewngofodi gydag URL OpenID
+        google:
+          title: Mewngofnodi gyda Google
+          alt: Mewngofnodi gydag OpenID Google
+        yahoo:
+          title: Mewngofnodi gydag Yahoo
+          alt: Mewngofnodi gydag OpenID Yahoo
+        wordpress:
+          title: Mewngofnodig gyda WordPress
+          alt: Mewngofnodi gydag OpenID WordPress
+        aol:
+          title: Mewngofnodi gydag AOL
+          alt: Mewngofnodi gydag OpenID AOL
+    logout:
+      title: Allgofnodi
+      heading: Allgofnodi o OpenStreetMap
+      logout_button: Allgofnodi
+    lost_password:
+      title: Ailosod cyfrinair
+      heading: Wedi anghofio'ch cyfrinair?
+      email address: 'Cyfeiriad Ebost:'
+      new password button: Ailosod cyfrinair
+      notice email cannot find: Methwyd dod o hyd i'r cyfeiriad ebost yno.
+    reset_password:
+      title: Ailosod cyfrinair
+      heading: Ailosod Cyfinair ar gyfer %{user}
+      password: 'Cyfrinair:'
+      confirm password: 'Cadarnhau''r Cyfrinair:'
+      reset: Ailosod Cyfrinair
+      flash changed: Mae'ch cyfrinair wedi'i newid.
+    new:
+      title: Cofrestru
+      email address: 'Cyfeiriad Ebost:'
+      confirm email address: 'Cadarnhau''r Cyfeiriad Ebost:'
+      password: 'Cyfrinair:'
+      confirm password: 'Cadarnhau''r Cyfrinair:'
+      use openid: Neu, mewngofnodwch gydag %{logo} OpenID
+      continue: Cofrestru
+      terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
+    terms:
+      title: Telerau cyfranwyr
+      heading: Telerau cyfranwyr
+      consider_pd_why: beth yw hwn?
+      agree: Cytuno
+      decline: Gwrthod
+      legale_names:
+        france: Ffrainc
+        italy: Yr Eidal
+        rest_of_world: Gweddill y byd
+    no_such_user:
+      title: Dim defnyddiwr o'r fath
+      heading: Nid yw'r defnyddiwr %{user} yn bodoli.
+    view:
+      my diary: Fy Nyddiadur
+      new diary entry: cofnod dyddiadur newydd
+      my edits: Fy Ngolygiadau
+      my traces: Fy Nargopiadau
+      my notes: Fy Nodiadau
+      my messages: Fy Negeseuon
+      my profile: Fy Mhroffil
+      my settings: Fy Ngosodiadau
+      my comments: Fy Sylwadau
+      oauth settings: gosodiadau oauth
+      blocks on me: Rhwystrau arnaf i
+      blocks by me: Rhwystrau gennyf i
+      send message: Anfon Neges
+      diary: Dyddiadur
+      edits: Golygiadau
+      traces: Dargopiadau
+      notes: Nodiadau Map
+      remove as friend: Peidio bod yn ffrind
+      add as friend: Ychwanegu Cyfaill
+      mapper since: 'Yn fapiwr ers:'
+      ago: (%{time_in_words_ago} yn ôl)
+      ct status: 'Telerau cyfrannwr:'
+      ct undecided: Heb Benderfynu
+      ct declined: Wedi Gwrthod
+      ct accepted: Derbynwyd %{ago} yn ôl%
+      email address: 'Cyfeiriad ebost:'
+      created from: 'Creuwyd o:'
+      status: 'Statws:'
+      description: Disgrifiad
+      user location: Lleoliad defnyddiwr
+      settings_link_text: gosodiadau
+      your friends: Eich cyfeillion
+      no friends: Nid ydych wedi ychwanegu cyfaill eto.
+      km away: '%{count}km i ffwrdd'
+      m away: '%{count}m i ffwrdd'
+      nearby users: Defnyddwyr eraill gerllaw
+      no nearby users: Nid oes defnyddwyr gerllaw sy'n datgelu eu bod yn mapio eto.
+      role:
+        administrator: Mae'r defnyddiwr hwn yn weinyddwr.
+        moderator: Mae'r defnyddiwr hwn yn gymedrolwr.
+      comments: Sylwadau
+      create_block: rhwystro'r defnyddiwr hwn
+      activate_user: actifadu'r defnyddiwr hwn
+      confirm_user: cadarnhau'r defnyddiwr
+      hide_user: cuddio'r defnyddiwr
+      unhide_user: datguddio'r defnyddiwr
+      delete_user: dileu'r defnyddiwr
+      confirm: Cadarnhau
+      friends_diaries: cofnodion dyddiaduron cyfeillion
+      nearby_diaries: cofnodion dyddiaduron defnyddwyr gerllaw
+    popup:
+      your location: Eich lleoliad
+      nearby mapper: Mapiwr gerllaw
+      friend: Cyfaill
+    account:
+      title: Golygu'r cyfrif
+      my settings: Fy ngosodiadau
+      current email address: 'Cyfeiriad Ebost Presenol:'
+      new email address: 'Cyfeiriad Ebost Newydd:'
+      email never displayed publicly: (byth ei ddangos yn gyhoeddus)
+      openid:
+        openid: 'OpenID:'
+        link text: beth yw hwn?
+      public editing:
+        heading: 'Golygu cyhoeddus:'
+        enabled: Galluogwyd. Ddim yn anhysbys ac yn gallu golygu data.
+        enabled link text: beth yw hwn?
+        disabled link text: pam na allaf olygu?
+      public editing note:
+        heading: Golygu cyhoeddus
+      contributor terms:
+        heading: 'Telerau Cyfranwyr:'
+        agreed: Rydych wedi derbyn y telerau cyfranwyr newydd.
+        not yet agreed: Nid ydych eto wedi cytuno i'r telerau cyfranwyr newydd.
+        review link text: Dilynwch y ddolen hon i adolygu a derbyn y telerau cyfranwyr
+          newydd.
+        link text: beth yw hwn?
+      profile description: 'Disgrifad Proffil:'
+      preferred languages: 'Ieithoedd Dewisedig:'
+      preferred editor: 'Golygydd Dewisedig:'
+      image: 'Delwedd:'
+      gravatar:
+        link text: beth yw hwn?
+      new image: Ychwanegu delwedd
+      keep image: Cadw'r ddelwedd bresennol
+      delete image: Tynnu'r ddelwedd bresennol
+      replace image: Newid y ddelwedd bresennol
+      image size hint: (delweddau sgwâr o leiaf 100x100 yw'r gorau)
+      home location: 'Lleoliad Cartref:'
+      no home location: Nid ydych wedi gosod eich lleoliad cartref.
+      latitude: 'Lledred:'
+      longitude: 'Hydred:'
+      save changes button: Cadw'r Newidiadau
+      make edits public button: Gwneud fy holl olygiadau yn gyhoeddus
+      return to profile: Dychwelyd i'r proffil
+    confirm_email:
+      button: Cadarnhau
+      success: Wedi cadarnhau eich cyfeiriad ebost! Diolch am gofrestru.
+      failure: Mae cyfeiriad ebost eisoes wedi ei gadarnhau gyda'r tocyn hwn.
+    set_home:
+      flash success: Wedi cadw'r lleoliad cartref
+    go_public:
+      flash success: Mae eich holl olygiadau nawr yn gyhoeddus a gallech nawr parhau
+        i olygu.
+    make_friend:
+      heading: Ychwanegu %{user} fel cyfaill?
+      button: Ychwanegu fel cyfaill
+      success: Mae %{name} nawr yn gyfaill i chi!
+      failed: Ymddiheuriadau, methwyd ychwanegu %{name} fel cyfaill.
+      already_a_friend: Rydych eisoes yn gyfaill i %{name}
+    remove_friend:
+      heading: Peidio bod yn gyfaill i %{user}?
+      button: Peidio bod yn gyfaill
+      success: Tynnwyd %{name} o'ch cyfeillion.
+      not_a_friend: Nid yw %{name} yn un o'ch cyfeillion.
+    list:
+      title: Defnyddwyr
+      heading: Defnyddwyr
+  user_role:
+    grant:
+      confirm: Cadarnhau
+    revoke:
+      confirm: Cadarnhau
+  user_block:
+    partial:
+      show: Dangos
+      edit: Golygu
+      confirm: Ydych yn sicr?
+      status: Statws
+      showing_page: Tudalen %{page}
+      next: Nesaf »
+      previous: « Blaenorol
+    helper:
+      time_future: Yn dod i ben mewn %{time}.
+      time_past: Wedi dod i ben %{time} yn ôl.
+    show:
+      status: Statws
+      show: Dangos
+      edit: Golygu
+      confirm: Ydych yn sicr?
+  note:
+    description:
+      commented_at_html: Diweddarwyd %{when} yn ôl
+      commented_at_by_html: Diweddarwyd %{when} yn ôl gan %{user}
+    rss:
+      title: Nodiadau OpenStreetMap
+    entry:
+      comment: Sylw
+      full: Nodyn llawn
+    mine:
+      id: Id
+  javascripts:
+    close: Cau
+    share:
+      title: Rhannu
+      cancel: Diddymu
+      image: Delwedd
+      link: Dolen neu HTML
+      long_link: Dolen
+      short_link: Dolen Fer
+      embed: HTML
+      format: 'Fformat:'
+      scale: 'Graddfa:'
+      download: Lawrlwytho
+      short_url: URL Byr
+    key:
+      title: Allwedd Map
+      tooltip: Allwedd Map
+    map:
+      zoom:
+        in: Chwyddo Mewn
+        out: Chwyddo Allan
+      locate:
+        title: Dangos Fy Lleoliad
+        popup: Rydych o fewn {distance} {unit} o'r pwynt hwn.
+      base:
+        standard: Safonol
+        cycle_map: Map Beicio
+        transport_map: Map Trafnidiaeth
+        hot: Dyngarol
+      layers:
+        header: Haenau Mapiau
+        notes: Nodiadau Map
+        data: Data Map
+        title: Haenau
+      copyright: © <a href='%{copyright_url}'>cyfranwyr OpenStreetMap</a>
+      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Rhoi Cyfraniad</a>
+    site:
+      edit_tooltip: Golygu'r map
+      edit_disabled_tooltip: Chwyddwch mewn i olygu'r map
+      createnote_tooltip: Ychwanegu nodyn i'r map
+      createnote_disabled_tooltip: Chwyddwch mewn i ychwanegu nodyn i'r map
+      map_notes_zoom_in_tooltip: Chwyddwch mewn i weld nodiadau'r map
+      map_data_zoom_in_tooltip: Chwyddwch mewn i weld data'r map
+    changesets:
+      show:
+        comment: Sylw
+        subscribe: Tanysgrifio
+        unsubscribe: Dad-danysgrifio
+        hide_comment: cuddio
+        unhide_comment: datguddio
+    notes:
+      new:
+        add: Ychwanegu Nodyn
+      show:
+        hide: Cuddio
+        resolve: Datrys
+        reactivate: Ail roi ar waith
+        comment_and_resolve: Sylw a Datrys
+        comment: Sylw
+    query:
+      way: Llwybr
+      nothing_found: Ni ddarganfuwyd nodweddion
+      error: 'Gwall cysyltlu gyda %{server}: %{error}'
+  redaction:
+    edit:
+      description: Disgrifiad
+    new:
+      description: Disgrifiad
+    show:
+      description: 'Disgrifiad:'
+      confirm: Ydych yn sicr?
+...
index 85a678adbcd8f0ece747875bbbb86b06e052b190..55cda5d4fc74455d5cc9c10c619a3cb7bd8588cf 100644 (file)
@@ -131,11 +131,18 @@ da:
       way_paginated: Veje (%{x}-%{y} af %{count})
       relation: Relationer (%{count})
       relation_paginated: Relationer (%{x}-%{y} af %{count})
+      comment: Kommentarer (%{count})
+      hidden_commented_by: Skjult kommentar fra %{user} <abbr title='%{exact_time}'>%{when}
+        siden</abbr>
+      commented_by: Kommentar fra %{user} for <abbr title='%{exact_time}'>%{when}
+        siden</abbr>
       changesetxml: XML for ændringssæt
       osmchangexml: XML for osmChange
       feed:
         title: Ændringssæt %{id}
         title_comment: Ændringssæt %{id} - %{comment}
+      join_discussion: Log på for at deltage i diskussionen
+      discussion: Diskussion
     node:
       title: 'Punkt: %{name}'
       history_title: 'Punkthistorik: %{name}'
@@ -217,6 +224,10 @@ da:
       reopened_by_anonymous: Genaktiveret af en anonym for <abbr title='%{exact_time}'>%{when}
         siden</abbr>
       hidden_by: Skjult af %{user} for <abbr title='%{exact_time}'>%{when} siden</abbr>
+    query:
+      title: Forespørgselsfunktioner
+      introduction: Klik på kortet for at finde funktioner i nærheden.
+      nearby: Funktioner i nærheden
   changeset:
     changeset_paging_nav:
       showing_page: Side %{page}
@@ -247,6 +258,13 @@ da:
     timeout:
       sorry: Desværre tog det for lang tid for at hente den liste af ændringssæt du
         har bedt om.
+    rss:
+      title_all: OpenStreetMap diskussion om ændringssæt
+      title_particular: OpenStreetMap diskussion om ændringssæt nummer %{changeset_id}
+      comment: Ny kommentar om ændringssæt nummer %{changeset_id} af %{author}
+      commented_at_html: Opdateret for %{when} siden
+      commented_at_by_html: Opdateret for %{when} siden af %{user}
+      full: Fuldstændig diskussion
   diary_entry:
     new:
       title: Nyt blogindlæg
@@ -749,6 +767,8 @@ da:
           tram: Sporvej
           tram_stop: Sporvognsstoppested
           yard: Jernbaneterræn
+        route:
+          bus: Busrute
         shop:
           alcohol: Spiritusforretning
           antiques: Antikviteter
@@ -951,10 +971,6 @@ da:
       text: Donér
     learn_more: Lær mere
     more: Mere
-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. årlige konference
-    sotm_line_2: 7. til 9. november 2014
-    sotm_line_3: Buenos Aires, Argentina
   license_page:
     foreign:
       title: Om denne oversættelse
@@ -1272,6 +1288,19 @@ da:
         commented_note: '%{commenter} har genaktiveret en kortbemærkning du har kommenteret.
           Bemærkningen er i nærheden af %{place}.'
       details: Flere oplysninger om bemærkningen kan findes på %{url}.
+    changeset_comment_notification:
+      greeting: Hej,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} har kommenteret på et af dine ændringssæt'
+        subject_other: '[OpenStreetMap] %{commenter} har kommenteret på et ændringssæt,
+          du er interesseret i'
+        your_changeset: '%{commenter} har efterladt en kommentar på et af dine ændringssæt,
+          oprettet %{time}'
+        commented_changeset: '%{commenter} har efterladt en kommenter på et kort ændringssæt
+          som du overvåger, oprettet %{time} af %{changeset_author}'
+        partial_changeset_with_comment: med kommentaren '%{changeset_comment}'
+        partial_changeset_without_comment: uden kommentar
+      details: Flere oplysninger om ændringssættet kan findes på %{url}.
   message:
     inbox:
       title: Indbakke
@@ -2217,6 +2246,15 @@ da:
       createnote_disabled_tooltip: Zoom ind for at tilføje en bemærkning til kortet
       map_notes_zoom_in_tooltip: Zoom ind for at se kort kommentarer
       map_data_zoom_in_tooltip: Zoom ind for at se kortdata
+      queryfeature_tooltip: Forespørgselsfunktioner
+      queryfeature_disabled_tooltip: Zoom ind for at få forespørgselsfunktioner
+    changesets:
+      show:
+        comment: Kommentar
+        subscribe: Abonnér
+        unsubscribe: Afmeld
+        hide_comment: skjul
+        unhide_comment: fjern skjul
     notes:
       new:
         intro: Opdaget en fejl eller noget der mangler? Lad andre kortlæggere vide
@@ -2233,6 +2271,13 @@ da:
         comment_and_resolve: Kommentere på og løse
         comment: Kommenter
     edit_help: Flyt kortet og zoom ind på et sted, du vil redigere, og klik så her.
+    query:
+      node: Punkt
+      way: Vej
+      relation: Relation
+      nothing_found: Ingen funktioner fundet
+      error: 'Fejl med at kontakte %{server}: %{error}'
+      timeout: Timeout for kontakt til %{server}
   redaction:
     edit:
       description: Beskrivelse
index 8486fabec2f5adb391788092e9b32e168238e19e..1ca436b5494c3ca7e23b715e063e5257cf93bd58 100644 (file)
@@ -38,6 +38,7 @@
 # Author: The Evil IP address
 # Author: Thomas Bohn
 # Author: Umherirrender
+# Author: Woodpeck
 ---
 de:
   time:
@@ -154,11 +155,17 @@ de:
       way_paginated: Wege (%{x}–%{y} von %{count})
       relation: Relationen (%{count})
       relation_paginated: Relationen (%{x}–%{y} von %{count})
+      comment: Kommentare (%{count})
+      hidden_commented_by: Versteckter Kommentar von %{user} <abbr title='%{exact_time}'>vor
+        %{when}</abbr>
+      commented_by: Kommentar von %{user} <abbr title='%{exact_time}'>vor %{when}</abbr>
       changesetxml: Änderungssatz-XML
       osmchangexml: osmChange XML
       feed:
         title: 'Änderungssatz: %{id}'
         title_comment: Änderungssatz %{id} - %{comment}
+      join_discussion: Melde dich an, um der Diskussion beizutreten
+      discussion: Diskussion
     node:
       title: 'Knoten: %{name}'
       history_title: 'Knotenchronik: %{name}'
@@ -236,6 +243,11 @@ de:
       reopened_by_anonymous: Reaktiviert von anonym <abbr title='%{exact_time}'>vor
         %{when}</abbr>
       hidden_by: Versteckt von %{user} <abbr title='%{exact_time}'>vor %{when}</abbr>
+    query:
+      title: Objektabfrage
+      introduction: Klicke auf die Karte, um benachbarte Objekte zu finden.
+      nearby: Objekte in der Nähe
+      enclosing: Einschließende Objekte
   changeset:
     changeset_paging_nav:
       showing_page: Seite %{page}
@@ -266,6 +278,13 @@ de:
     timeout:
       sorry: Es hat leider zu lange gedauert, die von dir angeforderten Änderungssätze
         abzurufen.
+    rss:
+      title_all: Diskussion zum OpenStreetMap-Änderungssatz
+      title_particular: Diskussion zum OpenStreetMap-Änderungssatz Nr. %{changeset_id}
+      comment: Neuer Kommentar zum Änderungssatz Nr. %{changeset_id} von %{author}
+      commented_at_html: vor %{when} aktualisiert
+      commented_at_by_html: vor %{when} durch %{user} aktualisiert
+      full: Vollständige Diskussion
   diary_entry:
     new:
       title: Selbst Bloggen
@@ -558,7 +577,7 @@ de:
           primary_link: Bundesstraße-Auffahrt
           proposed: Geplante Straße
           raceway: Rennstrecke
-          residential: Straße
+          residential: Wohnstraße
           rest_area: Rastplatz
           road: Straße
           secondary: Landesstraße
@@ -769,6 +788,8 @@ de:
           tram: Straßenbahn
           tram_stop: Haltestelle
           yard: Rangierbahnhof
+        route:
+          bus: Buslinie
         shop:
           alcohol: Spirituosenladen
           antiques: Antiquitätengeschäft
@@ -977,10 +998,6 @@ de:
       text: Spenden
     learn_more: Mehr erfahren
     more: Mehr
-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. Jahreskonferenz
-    sotm_line_2: 7. bis 9. November 2014
-    sotm_line_3: Buenos Aires, Argentinien
   license_page:
     foreign:
       title: Über diese Übersetzung
@@ -1298,6 +1315,21 @@ de:
         commented_note: '%{commenter} hat einen Hinweis in der Nähe von %{place},
           den du kommentiert hattest, reaktivert.'
       details: Weitere Details über den Hinweis findest du unter %{url}.
+    changeset_comment_notification:
+      greeting: Hallo,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} hat zu einem deiner Änderungssätze
+          kommentiert'
+        subject_other: '[OpenStreetMap] %{commenter} hat zu einem Änderungssatz kommentiert,
+          an dem du interessiert bist'
+        your_changeset: '%{commenter} hinterließ einen Kommentar zu einem deiner Änderungssätze,
+          erstellt am %{time}'
+        commented_changeset: '%{commenter} hinterließ einen Kommentar zu einem Kartenänderungssatz,
+          den du beobachtest, erstellt von %{changeset_author} am %{time}'
+        partial_changeset_with_comment: mit dem Kommentar „%{changeset_comment}“
+        partial_changeset_without_comment: ohne Kommentar
+      details: Weitere Einzelheiten über den Änderungssatz können gefunden werden
+        unter %{url}.
   message:
     inbox:
       title: Posteingang
@@ -2275,6 +2307,15 @@ de:
         gewählt werden
       map_notes_zoom_in_tooltip: Vergrößere die Karte, um die Fehler zu sehen.
       map_data_zoom_in_tooltip: Vergrößere die Karte, um die Daten zu sehen.
+      queryfeature_tooltip: Objektabfrage
+      queryfeature_disabled_tooltip: Für Objektabfrage vergrößern
+    changesets:
+      show:
+        comment: Kommentar
+        subscribe: Abonnieren
+        unsubscribe: Abbestellen
+        hide_comment: verstecken
+        unhide_comment: einblenden
     notes:
       new:
         intro: Fehlt etwas oder hast du einen Fehler gefunden? Bitte verschiebe den
@@ -2327,6 +2368,13 @@ de:
         end_oneway: "Ende der Einbahnstrasse "
         unnamed: "(unbekannt)"
         courtesy: "Fahranweisungen stammen von %{link}"
+    query:
+      node: Knoten
+      way: Weg
+      relation: Relation
+      nothing_found: Keine Funktionen gefunden
+      error: 'Fehler beim Kontaktieren von %{server}: %{error}'
+      timeout: Zeitüberschreitung beim Kontaktieren von %{server}
   redaction:
     edit:
       description: Beschreibung
index 9b5f077e706ceb41d78a1a9bb94263f8d5841cb2..a1aec97f721729c0a62347c5ad216d3b1c56fd76 100644 (file)
@@ -135,7 +135,7 @@ diq:
       id: ID
       saved_at: Deme qeydi
       user: Karber
-      comment: Vatış
+      comment: Mışewre
       area: Erz
     list:
       title: Seta vurnayışan
@@ -164,9 +164,9 @@ diq:
     comments:
       post: Bırışe
       when: Key
-      comment: Vatış
+      comment: Mışewre
       ago: Verdê %{ago}
-      newer_comments: Vatışê Tewr Newey
+      newer_comments: Mışewreyê Tewr Neweyi
       older_comments: Vatışo Tewr Kehan
   export:
     start:
@@ -553,7 +553,7 @@ diq:
       second: Çiyo Bahdoyên
       link: Gıre
       text: Metın
-      image: Resim
+      image: Resım
       url: GRE
   trace:
     edit:
@@ -629,7 +629,7 @@ diq:
     login:
       title: Cıkewtış
       heading: Cıkewtış
-      email or username: 'Adresê e-posta yana namey karberi:'
+      email or username: 'Adresa e-posteyi ya zi nameyê karberi:'
       password: 'Parola:'
       openid: '%{logo} OpenID:'
       remember: Mı biya xo viri
@@ -694,7 +694,7 @@ diq:
       my edits: pêştenê mı
       my traces: GPS rêçê mı
       my settings: Eyarê Mı
-      my comments: vatışê mı
+      my comments: Mışewreyê mı
       oauth settings: sazê OAuthi
       blocks on me: bloqeyê mı
       blocks by me: Bloqe kerdışê mı
@@ -767,7 +767,7 @@ diq:
         link text: no çıko?
       preferred languages: 'Zıwanê ke tercih kerê:'
       preferred editor: 'Editorê ke tercih kerê:'
-      image: 'Resim:'
+      image: 'Resım:'
       new image: Yew resım cı ke
       home location: 'Herun:'
       latitude: 'Verıniye:'
index aaf2c0cd0c04ded09125b5a1102fb3d8d5898a9a..8cdd2550611df180eb5246f585c1da43f751c0b9 100644 (file)
@@ -137,11 +137,14 @@ el:
       way_paginated: Διαδρομές (%{x}-%{y} από %{count})
       relation: Σχέσεις (%{count})
       relation_paginated: Σχέσεις (%{x}-%{y} από %{count})
+      comment: Σχόλια (%{count})
       changesetxml: Ομάδας αλλαγών XML
       osmchangexml: osmChange XML
       feed:
         title: Ομάδα αλλαγών %{id}
         title_comment: Ομάδα αλλαγών %{id} - %{comment}
+      join_discussion: Συνδεθείτε για να μπείτε στη συζήτηση
+      discussion: Συζήτηση
     node:
       title: 'Κόμβος: %{name}'
       history_title: 'Ιστορικό Κόμβου: %{name}'
@@ -202,6 +205,7 @@ el:
         tag: Η σελίδα περιγραφής για το χαρακτηριστικό %{key}=%{value}
       wikidata_link: Το αντικείμενο %{page} στο Wikidata
       wikipedia_link: Το άρθρο %{page} στη Βικιπαίδεια
+      telephone_link: Καλέστε %{phone_number}
     note:
       title: 'Σημείωση: %{id}'
       new_note: Νέα Σημείωση
@@ -255,6 +259,8 @@ el:
     timeout:
       sorry: Λυπάμαι, ο κατάλογος των ομάδων αλλαγών που ζήτησες χρειάστηκε πολύ χρόνο
         για να ανακτηθεί.
+    rss:
+      full: Πλήρης συζήτηση
   diary_entry:
     new:
       title: Νέα Καταχώρηση Ημερολογίου
@@ -548,7 +554,7 @@ el:
           primary_link: Κύρια Οδός
           proposed: Προτεινόμενος Δρόμος
           raceway: Αυτοκινητοδρόμιο
-          residential: Î\9fικιÏ\83Ï\84ική Î\9fδÏ\8cÏ\82
+          residential: Î\94Ï\81Ï\8cμοÏ\82 Ï\83ε ÎºÎ±Ï\84οικημένη Ï\80εÏ\81ιοÏ\87ή
           rest_area: Περιοχή Ανάπαυσης
           road: Δρόμος
           secondary: Δευτερεύουσα Οδός
@@ -1016,6 +1022,10 @@ el:
         <a href="http://data.wien.gv.at/">Stadt Wien</a> (υπό  <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
         <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> και
         Land Tirol (υπό <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT με τροποποιήσεις</a>).
+      contributors_fi_html: "<strong>Φινλανδία</strong>: Περιέχει δεδομένα από το
+        National Land Survey of Finland's Topographic Database\nκαι άλλα datasets,
+        υπό την \n<a href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI
+        Άδεια</a>."
       contributors_fr_html: '<strong>Γαλλία</strong>: Περιέχει δεδομένα που προέρχονται
         από το Direction Générale des Impôts.'
       contributors_nl_html: '<strong>Ολλανδία</strong>: Περιέχει δεδομένα που προέρχονται
@@ -1240,6 +1250,10 @@ el:
           Η σημείωση είναι κοντά σε %{place}.
       details: Περισσότερες λεπτομέρειες σχετικά με τη σημείωση μπορούν να βρεθούν
         στο %{url}.
+    changeset_comment_notification:
+      greeting: Γεια,
+      commented:
+        partial_changeset_without_comment: χωρίς σχόλιο
   message:
     inbox:
       title: Εισερχόμενα
@@ -2098,6 +2112,13 @@ el:
       map_notes_zoom_in_tooltip: Μεγεθύνετε τον χάρτη για να δείτε σημειώσεις
       map_data_zoom_in_tooltip: Μεγεθύνετε τον χάρτη για να δείτε τα δεδομένα του
         χάρτη
+    changesets:
+      show:
+        comment: Σχόλιο
+        subscribe: Εγγραφείτε ως συνδρομητής
+        unsubscribe: Κατάργηση εγγραφής
+        hide_comment: απόκρυψη
+        unhide_comment: επανεμφάνιση
     notes:
       new:
         intro: Εντοπίσατε λάθος ή κάτι που λείπει; Πείτε το στους άλλους χαρτογράφους
@@ -2116,6 +2137,11 @@ el:
         comment: Σχολιάστε
     edit_help: Μετακινήστε το χάρτη και να κάνετε ζουμ σε μια τοποθεσία που θέλετε
       να επεξεργαστείτε, στη συνέχεια, κάντε κλικ εδώ.
+    query:
+      node: Κόμβος
+      way: Διαδρομή
+      relation: Σχέση
+      nothing_found: Δεν βρέθηκαν χαρακτηριστικά
   redaction:
     edit:
       description: Περιγραφή
index 36218f4120463a1e334602bd22dfb4b021fbfa35..c2dfed7d6b35580928efe7b8b9647ccf9c0faa33 100644 (file)
@@ -146,11 +146,17 @@ es:
       way_paginated: Vías (%{x}-%{y} de %{count})
       relation: Relaciones (%{count})
       relation_paginated: Relaciones (%{x}-%{y} de %{count})
+      comment: Comentarios (%{count})
+      hidden_commented_by: Comentario oculto de %{user} <abbr title='%{exact_time}'>hace
+        %{when}</abbr>
+      commented_by: Comentario de %{user} <abbr title='%{exact_time}'>hace %{when}</abbr>
       changesetxml: XML del conjunto de cambios
       osmchangexml: XML en formato osmChange
       feed:
         title: Conjunto de cambios %{id}
         title_comment: Conjunto de cambios %{id} - %{comment}
+      join_discussion: Inicie sesión para unirse a la discusión
+      discussion: Discusión
     node:
       title: 'Nodo: %{name}'
       history_title: 'Historial de nodo: %{name}'
@@ -229,6 +235,11 @@ es:
       reopened_by_anonymous: Reactivado por anónimo <abbr title='%{exact_time}'>hace
         %{when}</abbr>
       hidden_by: Oculto por %{user} <abbr title='%{exact_time}'>hace %{when}</abbr>
+    query:
+      title: Características de la consulta
+      introduction: Haga clic en el mapa para encontrar características cercanas.
+      nearby: Características cercanas
+      enclosing: Características envolventes
   changeset:
     changeset_paging_nav:
       showing_page: Página %{page}
@@ -259,6 +270,14 @@ es:
     timeout:
       sorry: Lo sentimos, la lista de conjuntos de cambios que has solicitado ha tardado
         mucho tiempo en obtenerse.
+    rss:
+      title_all: Discusión del conjunto de cambios de OpenStreetMap
+      title_particular: 'Discusión del conjunto de cambios #%{changeset_id} de OpenStreetMap'
+      comment: 'Comentario nuevo sobre el conjunto de cambios #%{changeset_id} de
+        %{author}'
+      commented_at_html: Actualizado hace %{when}
+      commented_at_by_html: Actualizado hace %{when} por %{user}
+      full: Discusión completa
   diary_entry:
     new:
       title: Nueva entrada en el diario
@@ -463,7 +482,7 @@ es:
           hotel: Hotel
           hunting_stand: Apostadero de caza
           ice_cream: Heladería
-          kindergarten: Jardín de niños
+          kindergarten: Escuela infantil/guardería
           library: Biblioteca
           market: Mercado
           marketplace: Mercado
@@ -575,12 +594,12 @@ es:
           archaeological_site: Yacimiento arqueológico
           battlefield: Campo de batalla
           boundary_stone: Mojón
-          building: Edificio
+          building: Edificio histórico
           castle: Castillo
           church: Iglesia
           citywalls: Murallas de la ciudad
           fort: Fuerte
-          house: Casa
+          house: Casa histórica
           icon: Icono
           manor: Casa señorial
           memorial: Memorial
@@ -763,9 +782,11 @@ es:
           tram: Ruta de tranvía
           tram_stop: Parada de tranvía
           yard: Estación de clasificación
+        route:
+          bus: Ruta de autobús
         shop:
           alcohol: Licorería
-          antiques: Antigüedades
+          antiques: Anticuario
           art: Tienda de artículos de arte
           bakery: Panadería
           beauty: Tienda de productos de belleza
@@ -775,18 +796,18 @@ es:
           boutique: Boutique
           butcher: Carnicería
           car: Concesionario
-          car_parts: Repuestos automotrices
+          car_parts: Repuestos de automóvil
           car_repair: Taller mecánico
           carpet: Tienda de alfombras
           charity: Tienda benéfica
           chemist: Droguería
           clothes: Tienda de ropa
           computer: Tienda de informática
-          confectionery: Dulcería
+          confectionery: Confitería
           convenience: Pequeño supermercado
           copyshop: Copistería
           cosmetics: Tienda de cosmética
-          deli: Deli
+          deli: Delicatessen
           department_store: Grandes almacenes
           discount: Tienda de descuento
           doityourself: Tienda de bricolaje
@@ -795,11 +816,11 @@ es:
           estate_agent: Inmobiliaria
           farm: Tienda de productos agrícolas
           fashion: Tienda de moda
-          fish: Tienda de artículos de pesca
+          fish: Pescadería
           florist: Floristería
           food: Tienda de alimentación
           funeral_directors: Funeraria
-          furniture: Mueblería
+          furniture: Tienda de muebles
           gallery: Galería
           garden_centre: Vivero
           general: Tienda de artículos generales
@@ -818,39 +839,39 @@ es:
           mobile_phone: Tienda de telefonía
           motorcycle: Tienda de motocicletas
           music: Tienda de música
-          newsagent: Quiosco de periódicos
+          newsagent: Quiosco de prensa
           optician: Óptica
           organic: Tienda de alimentos orgánicos
           outdoor: Tienda de deportes de aventura
           pet: Tienda de mascotas
           pharmacy: Farmacia
-          photo: Tienda fotográfica
+          photo: Tienda de fotografía
           salon: Salón de belleza
           second_hand: Tienda de segunda mano
           shoes: Zapatería
           shopping_centre: Centro comercial
-          sports: Tienda de artículos deportivos
+          sports: Tienda de deportes
           stationery: Papelería
           supermarket: Supermercado
           tailor: Sastre
           toys: Juguetería
           travel_agency: Agencia de viajes
-          video: Videotienda
-          wine: Licorería
+          video: Videoclub
+          wine: Vinoteca
           "yes": Tienda
         tourism:
           alpine_hut: Cabaña alpina
           artwork: Obra de arte
-          attraction: Atracción
-          bed_and_breakfast: Cama y desayuno (B&B)
+          attraction: Atracción turística
+          bed_and_breakfast: Alojamiento y desayuno (B&B)
           cabin: Cabaña
-          camp_site: Campamento
+          camp_site: Campamento/camping
           caravan_site: Camping para caravanas
           chalet: Chalet
-          guest_house: Albergue
+          guest_house: Pensión
           hostel: Hostal
           hotel: Hotel
-          information: Información
+          information: Información turística
           lean_to: Refugio
           motel: Motel
           museum: Museo
@@ -967,10 +988,6 @@ es:
       text: Hacer una donación
     learn_more: Más información
     more: Más
-    sotm_header: Estado del mapa 2014
-    sotm_line_1: 8.ª Conferencia Anual
-    sotm_line_2: 7-9 de noviembre de 2014
-    sotm_line_3: Buenos Aires, Argentina
   license_page:
     foreign:
       title: Acerca de esta traducción
@@ -1144,7 +1161,7 @@ es:
     wiki:
       url: http://wiki.openstreetmap.org/wiki/ES:Main_Page
       title: wiki.openstreetmap.org
-      description: Buscar la wiki para la documentación de OSM en profundidad.
+      description: Consulta la wiki para la documentación de OSM en profundidad.
   about_page:
     next: Siguiente
     copyright_html: <span>&copy;</span>Colaboradores de<br>OpenStreetMap
@@ -1163,8 +1180,8 @@ es:
       Para aprender más acerca de la comunidad, consulte los <a href='%{diary_path}'>diarios de los usuarios</a>, <a href='http://blogs.openstreetmap.org/'>blogs de la comunidad</a> y el sitio web de la <a href='http://www.osmfoundation.org/'>Fundación OSM</a>.
     open_data_title: Datos abiertos
     open_data_html: 'OpenStreetMap es <i>datos abiertos</i>: puedes usarlo libremente
-      para cualquier propósito, siempre y cuando dé crédito a OpenStreetMap y a sus
-      colaboradores. Si altera o construye los datos en casos determinados debers
+      para cualquier propósito, siempre y cuando des crédito a OpenStreetMap y a sus
+      colaboradores. Si alteras o te basas en los datos en casos determinados, deberás
       distribuir el resultado únicamente bajo la misma licencia. Consulta la <a href=''%{copyright_path}''>
       página sobre Derechos de autor y Licencia</a> para obtener más detalles.'
     partners_title: Socios
@@ -1267,6 +1284,21 @@ es:
         commented_note: '%{commenter} ha reactivado un nota del mapa en la que usted
           ha comentado. La nota está cerca de %{place}.'
       details: Más detalles acerca de la nota pueden encontrarse en %{url}.
+    changeset_comment_notification:
+      greeting: Hola,
+      commented:
+        subject_own: '[OpenStreetMap] %{commenter} ha comentado en uno de tus conjuntos
+          de cambios'
+        subject_other: '[OpenStreetMap] %{commenter} ha comentado en un conjunto de
+          cambios en el que usted está interesado'
+        your_changeset: '%{commenter} ha dejado un comentario en uno de sus conjuntos
+          de cambios creado el %{time}'
+        commented_changeset: '%{commenter} ha dejado un comentario en un conjunto
+          de cambios de mapa que está siguiendo, creado por %{changeset_author} el
+          %{time}'
+        partial_changeset_with_comment: con el comentario '%{changeset_comment}'
+        partial_changeset_without_comment: sin comentarios
+      details: Más detalles acerca del conjunto de cambios pueden encontrarse en %{url}.
   message:
     inbox:
       title: Buzón de entrada
@@ -1378,7 +1410,7 @@ es:
     search:
       search: Buscar
       where_am_i: ¿Dónde estoy?
-      where_am_i_title: Describe la ubicación actual por medio del motor de búsqueda
+      where_am_i_title: Define la ubicación actual por medio del motor de búsqueda
       submit_text: Ir
     key:
       table:
@@ -1775,7 +1807,7 @@ es:
       openid: '%{logo} OpenID:'
       password: 'Contraseña:'
       confirm password: 'Confirmar contraseña:'
-      use openid: Como alternativa, use %{logo} OpenID para iniciar sesión
+      use openid: Como alternativa, utiliza %{logo} OpenID para iniciar sesión
       openid no password: Con OpenID no se requiere una contraseña, pero algunas herramientas
         extras o servidor pueden seguir necesitándola.
       openid association: |-
@@ -2230,6 +2262,15 @@ es:
       createnote_disabled_tooltip: Acercar para añadir una nota al mapa
       map_notes_zoom_in_tooltip: Acercar para ver notas del mapa
       map_data_zoom_in_tooltip: Acercar para ver datos del mapa
+      queryfeature_tooltip: Consultar características
+      queryfeature_disabled_tooltip: Acercar para consultar características
+    changesets:
+      show:
+        comment: Comentar
+        subscribe: Suscribirse
+        unsubscribe: Desuscribir
+        hide_comment: ocultar
+        unhide_comment: mostrar
     notes:
       new:
         intro: ¿Has detectado un error o falta algo? Hazlo saber a otros cartógrafos
@@ -2247,6 +2288,13 @@ es:
         comment: Comentar
     edit_help: Mueva el mapa el mapa y acerca a una ubicación que desees editar, luego
       haga clic aquí.
+    query:
+      node: Nodo
+      way: Vía
+      relation: Relación
+      nothing_found: No se encontraron características
+      error: 'Error al contactar a %{server}: %{error}'
+      timeout: Tiempo de espera agotado al contactar a %{server}
   redaction:
     edit:
       description: Descripción
index e489b0a9650c207c8e64cb5fcabef04c454907af..86e342c2577f77724877988352702a9b4e55c1e8 100644 (file)
@@ -120,11 +120,18 @@ et:
       way_paginated: Jooned (%{x}-%{y}/%{count})
       relation: Relatsioonid (%{count})
       relation_paginated: Relatsioonid (%{x}-%{y}/%{count})
+      comment: Kommentaare (%{count})
+      hidden_commented_by: Peidetud kommentaar kasutajalt %{user} <abbr title='%{exact_time}'>%{when}
+        tagasi</abbr>
+      commented_by: Kommentaar kasutajalt %{user} <abbr title='%{exact_time}'>%{when}
+        tagasi</abbr>
       changesetxml: Muutuskogumi XML
       osmchangexml: osmChange XML
       feed:
         title: Muutuskogum %{id}
         title_comment: Muutuskogum %{id} - %{comment}
+      join_discussion: Logi sisse, kui soovid arutelus osaleda
+      discussion: Arutelu
     node:
       title: 'Sõlm: %{name}'
       history_title: 'Sõlme ajalugu: %{name}'
@@ -182,7 +189,9 @@ et:
       wiki_link:
         key: Sildi %{key} kirjelduse leht vikis
         tag: Sildi %{key}=%{value} kirjelduse leht vikis
+      wikidata_link: '%{page} Wikidatas'
       wikipedia_link: Artikkel %{page} Vikipeedias
+      telephone_link: Helista %{phone_number}
     note:
       title: 'Märkus: %{id}'
       new_note: Uus märkus
@@ -236,6 +245,13 @@ et:
       load_more: Laadi veel
     timeout:
       sorry: Kahjuks võttis taotletud muutuskogumite laadimine liiga kaua aega.
+    rss:
+      title_all: OpenStreetMap muutuskogumi arutelu
+      title_particular: 'OpenStreetMap muutuskogumi #%{changeset_id} arutelu'
+      comment: 'Uus kommentaar muutuskogumis #%{changeset_id} kasutajalt %{author}'
+      commented_at_html: Uuendatud %{when} tagasi
+      commented_at_by_html: Uuendatud %{when} tagasi kasutaja %{user} poolt
+      full: Kogu arutelu
   diary_entry:
     new:
       title: Uus päeviku sissekanne
@@ -441,6 +457,8 @@ et:
           preschool: Lasteaed
           prison: Vangla
           pub: Pubi
+          public_building: Ühiskondlik hoone
+          public_market: Turg
           reception_area: Vastuvõtt
           recycling: Jäätmekäitluspunkt
           restaurant: Restoran
@@ -641,6 +659,7 @@ et:
           tram_stop: Trammipeatus
         shop:
           antiques: Antikvariaat
+          bakery: Pagariäri
           bicycle: Rattapood
           books: Raamatupood
           boutique: Butiik
@@ -682,6 +701,7 @@ et:
           optician: Prillipood
           pet: Lemmikloomapood
           pharmacy: Apteek
+          photo: Fotopood
           salon: Ilusalong
           shoes: Kingapood
           shopping_centre: Kaubanduskeskus
@@ -691,6 +711,7 @@ et:
           tailor: Rätsep
           toys: Mänguasjapood
           travel_agency: Reisiagentuur
+          wine: Alkoholipood
           "yes": Pood
         tourism:
           alpine_hut: Alpimaja
@@ -712,6 +733,7 @@ et:
         tunnel:
           "yes": Tunnel
         waterway:
+          boatyard: Verf
           canal: Kanal
           dam: Tamm
           ditch: Kraav
@@ -720,7 +742,9 @@ et:
           river: Jõgi
           riverbank: Jõekallas
           stream: Oja
+          wadi: Vadi
           waterfall: Kosk
+          water_point: Veevõtukoht
           weir: Pais
       admin_levels:
         level2: Riigipiir
@@ -1654,6 +1678,7 @@ et:
       ct accepted: Vastu võetud %{ago}  tagasi
       latest edit: 'Viimane muudatus %{ago}:'
       email address: 'E-posti aadress:'
+      created from: 'Loodud:'
       status: 'Staatus:'
       spam score: 'Rämpsposti tulemus:'
       description: Kirjeldus
@@ -2028,12 +2053,20 @@ et:
       createnote_disabled_tooltip: Suurenda, et lisada kaardile märkus
       map_notes_zoom_in_tooltip: Suumi sisse, et näha kaardil märkuseid
       map_data_zoom_in_tooltip: Suumi sisse, et näha kaardi andmeid
+    changesets:
+      show:
+        comment: Kommentaar
+        subscribe: Telli
+        unsubscribe: Lõpeta tellimus
+        hide_comment: peida
+        unhide_comment: nähtavale
     notes:
       new:
         intro: Märkasid viga või või midagi, mis vajab täiendamist? Anna sellest teada
           teistele kaardistajatele, et me võiksime seda parandada. Lohista marker
           õigele kohale ja kirjuta märkus, et probleemi selgitada. (Palun ära kirjuta
-          siia isiklikku informatsiooni.)
+          siia isiklikku informatsiooni või infot autoriõigustega kaitstud kaartidelt
+          või kataloogide nimekirjast.)
         add: Lisa märkus
       show:
         anonymous_warning: Käesolev märkus sisaldab kommentaare anonüümsetelt kasutajatelt,
@@ -2045,6 +2078,12 @@ et:
         comment: Kommenteeri
     edit_help: Nihuta kaarti ja suumi sisse asukohta mida soovid redigeerida ja seejärel
       kliki siia.
+    query:
+      node: Sõlm
+      way: Joon
+      relation: Relatsioon
+      error: 'Viga ühendumisel serveriga %{server}: %{error}'
+      timeout: Ühendumine aegus serveriga %{server}
   redaction:
     edit:
       description: Kirjeldus
index c700982a6b4de3e08de9500f01c145b3816a935d..cab092b771d5057e571f733762d9c0f6f485d025 100644 (file)
@@ -100,15 +100,23 @@ eu:
       title: 'Oharra: %{id}'
   changeset:
     changeset_paging_nav:
+      showing_page: '%{page}. orrialdea'
       next: Hurrengoa »
       previous: « Aurrekoa
     changeset:
       anonymous: Anonimoa
+      no_edits: (aldaketarik gabe)
     changesets:
       id: ID
       saved_at: Noiz gordeta
       user: Erabiltzailea
+      comment: Iruzkina
+    list:
+      load_more: Gehiago kargatu
   diary_entry:
+    list:
+      older_entries: Sarrera zaharragoak
+      newer_entries: Sarrera berriagoak
     edit:
       subject: 'Gaia:'
       body: 'Testua:'
@@ -135,6 +143,9 @@ eu:
       location: 'Kokapena:'
       view: Ikusi
       edit: Aldatu
+    comments:
+      newer_comments: Iruzkin berriagoak
+      older_comments: Iruzkin zaharragoak
   export:
     start:
       format_to_export: Esportatzeko formatua
@@ -164,6 +175,7 @@ eu:
         amenity:
           airport: Aireportu
           arts_centre: Arte Zentroa
+          artwork: Artelana
           atm: Kutxazain automatikoa
           auditorium: Entzunareto
           bank: Banku
@@ -228,8 +240,10 @@ eu:
           retirement_home: Nagusien etxea
           sauna: Sauna
           school: Ikastetxe
+          shelter: Aterpea
           shop: Denda
           shopping: Erosketak
+          shower: Dutxa
           studio: Estudio
           supermarket: Supermerkatu
           swimming_pool: Igerilekua
@@ -269,6 +283,7 @@ eu:
           primary: Lehen mailako errepide
           primary_link: Errepide nagusi
           residential: Bizileku
+          rest_area: Atsedenlekua
           road: Errepide
           secondary: Bigarren mailako errepide
           secondary_link: Bigarren mailako errepide
@@ -357,6 +372,7 @@ eu:
           insurance: Aseguruetako bulegoa
           lawyer: Abokatua
           ngo: GKE bulegoa
+          travel_agent: Bidaia-agentzia
           "yes": Bulegoa
         place:
           airport: Aireportu
@@ -395,8 +411,11 @@ eu:
         shop:
           art: Arte-denda
           bakery: Okindegi
+          bicycle: Bizikleta-denda
           books: Liburudenda
+          boutique: Boutique
           butcher: Harategi
+          car: Auto-denda
           chemist: Farmazia
           clothes: Arropa denda
           computer: Ordenagailu-denda
@@ -432,8 +451,10 @@ eu:
           supermarket: Supermerkatu
           toys: Jostailu Denda
           travel_agency: Bidaia-agentzia
+          "yes": Denda
         tourism:
           alpine_hut: Aterpe alpinoa
+          artwork: Artelana
           attraction: Atrakzio
           bed_and_breakfast: Ohe eta gosari (B&B)
           cabin: Kabina
@@ -450,6 +471,8 @@ eu:
           valley: Haran
           viewpoint: Behatoki
           zoo: Zoologiko
+        tunnel:
+          "yes": Tunela
         waterway:
           canal: Kanal
           dam: Urtegia
@@ -481,14 +504,21 @@ eu:
     logo:
       alt_text: OpenStreetMap logoa
     home: hasiera
-    logout: saioa itxi
+    logout: Saioa itxi
     log_in: Saioa hasi
     sign_up: izena eman
     edit: Aldatu
     history: Historia
     export: Esportatu
+    data: Datuak
+    export_data: Esportatu datuak
     help: Laguntza
     about: Honi buruz
+    community: Komunitatea
+    community_blogs: Komunitateko blogak
+    community_blogs_title: OpenStreetMap komunitateko kideen blogak
+    foundation: Fundazioa
+    foundation_title: OpenStreetMap Fundazioa
     make_a_donation:
       text: Dohaintza egin
     learn_more: Gehiago ikasi
@@ -499,8 +529,31 @@ eu:
     native:
       title: Orrialde honi buruz
       native_link: Euskara version
+    legal_babble:
+      title_html: Egile-eskubideak eta lizentzia
+      contributors_at_html: |-
+        <strong>Austria</strong>: Honako iturrietatik ateratako datuak ditu:
+        <a href="http://data.wien.gv.at/">Stadt Wien</a> (<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> lizentziapean),
+        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> eta
+        Land Tirol (<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT zuzenketekin</a> lizentziapean).
+      contributors_fr_html: '<strong>Frantzia</strong>: Direction Générale des Impôts-etik
+        ateratako datuak ditu.'
   welcome_page:
     title: Ongi etorri!
+    questions:
+      title: Galderarik?
+  fixthemap:
+    how_to_help:
+      title: Nola lagundu
+  help_page:
+    welcome:
+      url: /welcome
+      title: Ongi etorri OSM-ra
+    help:
+      url: https://help.openstreetmap.org/
+      title: help.openstreetmap.org
+  about_page:
+    next: Hurrengoa
   notifier:
     diary_comment_notification:
       hi: Kaixo %{to_user},
@@ -519,6 +572,7 @@ eu:
     lost_password_html:
       greeting: Kaixo,
     note_comment_notification:
+      anonymous: Erabiltzale anonimoa
       greeting: Kaixo,
   message:
     inbox:
@@ -671,6 +725,8 @@ eu:
       lost password link: Pasahitza ahaztu duzu?
       login_button: Saioa hasi
       register now: Erregistratu orain
+      create account minute: Sortu kontu bat. Minutu bat besterik ez duzu behar.
+      no account: Ez al duzu konturik?
     logout:
       title: Saio-itxiera
       heading: OpenStreetMap-etik saioa itxi
@@ -694,7 +750,7 @@ eu:
       display name: 'Erakusteko izena:'
       password: 'Pasahitza:'
       confirm password: 'Pasahitza berretsi:'
-      continue: Jarraitu
+      continue: Eman izena
     terms:
       consider_pd_why: zer da hau?
       agree: Ados
@@ -706,6 +762,9 @@ eu:
     view:
       my diary: nire egunerokoa
       my edits: nire aldaketak
+      my notes: Nire oharrak
+      my messages: Nire mezuak
+      my profile: Nire profila
       my settings: Nire Hobespenak
       my comments: Nire Iruzkinak
       send message: Mezua bidali
@@ -755,6 +814,8 @@ eu:
       preferred languages: 'Hobetsitako hizkuntzak:'
       preferred editor: 'Lehenetsitako Editorea:'
       image: 'Irudia:'
+      gravatar:
+        link text: zer da hau?
       new image: Irudi bat gehitu
       latitude: 'Latitude:'
       longitude: 'Longitude:'
@@ -786,6 +847,7 @@ eu:
     partial:
       show: Erakutsi
       edit: Aldatu
+      confirm: Ziur zaude?
       creator_name: Egilea
       status: Egoera
       next: Hurrengoa »
@@ -799,8 +861,25 @@ eu:
     mine:
       creator: Sortzailea
       description: Deskribapena
+  javascripts:
+    close: Itxi
+    share:
+      title: Partekatu
+      cancel: Utzi
+    changesets:
+      show:
+        subscribe: Harpidetu
+        unsubscribe: Harpidetza kendu
+        hide_comment: ezkutatu
+        unhide_comment: erakutsi
+    notes:
+      new:
+        add: Gehitu oharra
+      show:
+        hide: Ezkutatu
   redaction:
     show:
       description: 'Deskribapena:'
       user: 'Sortzailea:'
+      confirm: Ziur zaude?
 ...
index 7157e75d625d52f19d832deb5ed1d5f8262c1460..2dd16829c75b7ef95ea6dcb7ac42a45e6c0ab40a 100644 (file)
@@ -136,11 +136,13 @@ fa:
       way_paginated: راه ها (%{x}-%{y} از %{count})
       relation: روابط (%{count})
       relation_paginated: روابط (%{x}-%{y} از %{count})
+      comment: نظرها (%{count})
       changesetxml: تغییرات انجام شده XML
       osmchangexml: osmChange XML
       feed:
         title: تغییرات انجام شده %{id}
         title_comment: تغییرات انجام شده %{id} - %{comment}
+      discussion: بحث
     node:
       title: 'گره: %{name}'
       history_title: 'تاریخچه گره: %{name}'
@@ -220,6 +222,10 @@ fa:
       reopened_by_anonymous: دوباره فعال شده توسط ناشناس <abbr title='%{exact_time}'>%{when}
         قبل</abbr>
       hidden_by: مخفی شد توسط %{user} <abbr title='%{exact_time}'>%{when} قبل</abbr>
+    query:
+      title: کوئری ویژگی‌ها
+      nearby: ویژگی‌های نزدیک
+      enclosing: ویژگی‌های نزدیک
   changeset:
     changeset_paging_nav:
       showing_page: صفحهٔ %{page}
@@ -301,7 +307,7 @@ fa:
       confirm: تأیید
     diary_comment:
       comment_from: نظر از %{link_user} در %{comment_created_at}
-      hide_link: پنهانکردن این نظر
+      hide_link: پنهان کردن این نظر
       confirm: تأیید
     location:
       location: 'مکان:'
@@ -538,7 +544,7 @@ fa:
           primary_link: جادهٔ اصلی
           proposed: راه پیشنهادی
           raceway: مسیر مسابقه
-          residential: مسکونی
+          residential: راه مسکونی
           rest_area: استراحتگاه
           road: جاده
           secondary: جاده دوم
@@ -749,6 +755,8 @@ fa:
           tram: واگن برقی
           tram_stop: ایستگاه واگن برقی
           yard: محوطه راه آهن
+        route:
+          bus: مسیر اتوبوس
         shop:
           alcohol: مجوز غیر فعال
           antiques: عتیقه جات
@@ -952,10 +960,6 @@ fa:
       text: کمک مالی
     learn_more: اطلاعات بیشتر
     more: بیشتر
-    sotm_header: وضعیت نقشهٔ ۲۰۱۴
-    sotm_line_1: هشتمین کنفرانس سالانه
-    sotm_line_2: ۷ تا ۹ نوامبر ۲۰۱۴
-    sotm_line_3: بوینس‌آیرس، آرژانتین
   license_page:
     foreign:
       title: درباره این ترجمه‌ها
@@ -1258,6 +1262,10 @@ fa:
         commented_note: '%{commenter} یکی از یادداشت های نقشه که شما در آن نظر گذاشته
           اید را دوباره فعال کرد. یادداشت نزدیک %{place} است.'
       details: اطلاعات بیشتر درباره ی یادداشت در %{url} یافت می‌شود.
+    changeset_comment_notification:
+      greeting: سلام ،
+      commented:
+        partial_changeset_without_comment: بدون نظر
   message:
     inbox:
       title: صندوق دریافت
@@ -1982,7 +1990,7 @@ fa:
       summary: '%{name} ایجاد شده از %{ip_address} در %{date}'
       summary_no_ip: '  %{name}در  %{date} ایجاد شد'
       confirm: تأیید کاربران انتخاب‌شده
-      hide: پنهانکردن کاربران انتخاب شده
+      hide: پنهان کردن کاربران انتخاب شده
       empty: هیچ کاربر مشابهی یافت نشد
     suspended:
       title: حساب کاربری معلق شده
@@ -2203,6 +2211,15 @@ fa:
       createnote_disabled_tooltip: بزرگنمایی برای افزودن یک یادداشت به نقشه
       map_notes_zoom_in_tooltip: بزرگنمایی برای دیدن یادداشت های نقشه
       map_data_zoom_in_tooltip: بزرگنمایی برای دیدن داده های نقشه
+      queryfeature_tooltip: کوئری ویژگی‌ها
+      queryfeature_disabled_tooltip: بزرگنمایی کوئری ویژگی‌ها
+    changesets:
+      show:
+        comment: نظر
+        subscribe: اشتراک
+        unsubscribe: لغو اشتراک
+        hide_comment: نهفتن
+        unhide_comment: نمایش
     notes:
       new:
         intro: چیزی مشکل دارد؟ به نقشه‌کش‌های دیگر اصلاع دهید تا آن را اصلاح کنند.
@@ -2219,6 +2236,13 @@ fa:
         comment: نظر
     edit_help: نقشه را جابجا کنید و روی مکانی که میخواهید ویرایش کنید بزرگنمایی کنید،
       سپس اینجا کلیک کنید.
+    query:
+      node: گره
+      way: راه
+      relation: ارتباط
+      nothing_found: ویژگی‌ای یافت نشد
+      error: 'خطار در ارتباط %{server}: %{error}'
+      timeout: اتمام زمان %{server}
   redaction:
     edit:
       description: شرح
index c129174820e98b73ff5a3b60a489eea1d3b7474c..24d94dcd18bb3882b5fce3a4fea8b152f2a331c8 100644 (file)
@@ -134,17 +134,24 @@ fi:
     changeset:
       title: 'Muutoskokoelma: %{id}'
       belongs_to: Lähettäjä
-      node: Pisteet(%{count})
-      node_paginated: Pisteet(%{x}-%{y} / %{count})
+      node: Pisteet (%{count})
+      node_paginated: Pisteet (%{x}-%{y} / %{count})
       way: Reitit (%{count})
       way_paginated: Reitit (%{x}-%{y} of %{count})
       relation: Relaatiot (%{count})
       relation_paginated: Relaatiot (%{x}-%{y} / %{count})
+      comment: Kommentit (%{count})
+      hidden_commented_by: Käyttäjän %{user} piilotettu kommentti <abbr title='%{exact_time}'>%{when}
+        sitten</abbr>
+      commented_by: Kommentti käyttäjältä %{user} <abbr title='%{exact_time}'>%{when}
+        sitten</abbr>
       changesetxml: Muutoskokoelman XML
       osmchangexml: osmChange XML
       feed:
         title: Muutoskokoelma %{id}
         title_comment: Muutoskokoelma %{id} - %{comment}
+      join_discussion: Kirjaudu sisään, jos haluat osallistua keskusteluun
+      discussion: Keskustelu
     node:
       title: 'Piste: %{name}'
       history_title: Pisteen %{name} historia
@@ -169,7 +176,7 @@ fi:
       entry: Relaatio %{relation_name}
       entry_role: Relaatio %{relation_name} (rooli %{relation_role})
     not_found:
-      sorry: '%{type} %{id} ei ole olemassa.'
+      sorry: 'Pahoittelemme, %{type} #%{id} ei ole olemassa.'
       type:
         node: Pistettä
         way: Polkua
@@ -226,6 +233,11 @@ fi:
         sitten</abbr>
       hidden_by: Piilottanut käyttäjä %{user} <abbr title='%{exact_time}'>%{when}
         sitten</abbr>
+    query:
+      title: Ominaisuuskysely
+      introduction: Näytä luettelo lähistön karttakohteista napsauttamalla karttaa.
+      nearby: Lähistön karttakohteet
+      enclosing: Ympäröivät karttakohteet
   changeset:
     changeset_paging_nav:
       showing_page: Sivu %{page}
@@ -256,6 +268,10 @@ fi:
     timeout:
       sorry: Valitettavasti pyytämäsi muutoskokoelmien listan hakeminen kesti liian
         kauan.
+    rss:
+      commented_at_html: Päivitetty %{when} sitten
+      commented_at_by_html: '%{user} päivittänyt %{when} sitten'
+      full: Koko keskustelu
   diary_entry:
     new:
       title: Uusi päiväkirjamerkintä
@@ -754,6 +770,8 @@ fi:
           tram: Raitiotie
           tram_stop: Raitiovaunupysäkki
           yard: Ratapiha
+        route:
+          bus: Bussireitti
         shop:
           alcohol: Alkoholikauppa
           antiques: Antiikkia
@@ -956,10 +974,6 @@ fi:
       text: Lahjoita
     learn_more: Lisätietoja
     more: Lisää
-    sotm_header: State of the Map 2014
-    sotm_line_1: 8. vuosikokous
-    sotm_line_2: 7.-9.11.2014
-    sotm_line_3: Buenos Aires, Argentiina
   license_page:
     foreign:
       title: Tietoja tästä käännöksestä
@@ -1254,6 +1268,10 @@ fi:
           viesti lähetetään siksi, että olet kommentoinut tätä karttailmoitusta, joka
           on lähellä paikkaa %{place}.'
       details: Lisää tietoja merkinnästä löytyy osoitteesta %{url}.
+    changeset_comment_notification:
+      greeting: Hei,
+      commented:
+        partial_changeset_without_comment: ei kommenttia
   message:
     inbox:
       title: Saapuneet
@@ -1813,6 +1831,7 @@ fi:
       email address: 'Sähköpostiosoite:'
       created from: 'Tekijä:'
       status: 'Tila:'
+      spam score: 'Spam-pisteet:'
       description: Kuvaus
       user location: Käyttäjän sijainti
       if set location: Määrittelet sijaintisi sivulla %{settings_link} nähdäksesi
@@ -2180,11 +2199,21 @@ fi:
       createnote_disabled_tooltip: Lähennä karttaa ennen karttavirheestä ilmoittamista.
       map_notes_zoom_in_tooltip: Näytä karttailmoitukset lähentämällä karttaa
       map_data_zoom_in_tooltip: Näytä kartta-aineisto lähentämällä karttaa
+      queryfeature_tooltip: Karttakohdeluettelo
+      queryfeature_disabled_tooltip: Näytä ominaisuusluettelo suurentamalla karttaa
+    changesets:
+      show:
+        comment: Kommentti
+        subscribe: Tilaa
+        unsubscribe: Lopeta tilaus
+        hide_comment: piilota
+        unhide_comment: näytä
     notes:
       new:
-        intro: Auta parantamaan karttatietokantaa ilmoittamalla virheistä. Muut kartoittajat
-          näkevät tämän ilmoituksen ja voivat korjata ongelman, joten valitse sijainti
-          ja kirjoita virheen kuvaus mahdollisimman huolellisesti.
+        intro: Huomasitko virheen tai puuttuvan kohteen? Ilmoita siitä muille kartoittajille,
+          jolloin voimme korjata asian. Siirrä merkkipiste oikeaan kohtaan ja kirjoita
+          selite ongelmasta. (Älä kirjoita yksityistietojasi tai tietoa tekijänoikeudella
+          suojatuista kartoista tai kansiolistoista.)
         add: Lähetä ilmoitus
       show:
         anonymous_warning: Tässä karttailmoituksessa on kommentteja tunnistautumattomilta
@@ -2195,6 +2224,13 @@ fi:
         comment_and_resolve: Kommentoi + ratkaise
         comment: Kommentoi
     edit_help: Siirrä ja lähennä kartta muokattavaan paikkaan ja napsauta sitten tästä.
+    query:
+      node: Piste
+      way: Viiva
+      relation: Relaatio
+      nothing_found: Karttakohteita ei löytynyt
+      error: 'Yhteysvirhe palvelimeen %{server}: %{error}'
+      timeout: Yhteyden aikakatkaisu palvelimeen %{server}
   redaction:
     edit:
       description: Kuvaus
index f4d900d15bbc88697b4df466b50234f0ef5431e9..df8e6fd144fd3ea15a496e76fe330823c55d4bc9 100644 (file)
@@ -1,6 +1,7 @@
 # Messages for French (français)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: 0x010C
 # Author: Alno
 # Author: Boniface
 # Author: Cquoi
@@ -74,7 +75,7 @@ fr:
       tracepoint: Point de la trace
       tracetag: Attribut de la trace
       user: Utilisateur
-      user_preference: Préférence de l’utilisateur
+      user_preference: Préférences de l’utilisateur
       user_token: Jeton de l’utilisateur
       way: Chemin
       way_node: Nœud du chemin
@@ -131,19 +132,19 @@ fr:
   browse:
     created: Créé
     closed: Fermé
-    created_html: Créé <abbr title='%{title}'>il y a %{time}</abbr>
-    closed_html: Fermé <abbr title='%{title}'>il y a %{time}</abbr>
+    created_html: Créé il y a <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Fermé il y a <abbr title='%{title}'>%{time}</abbr>
     created_by_html: Créé <abbr title='%{title}'>il y a %{time}</abbr> par %{user}
-    deleted_by_html: Supprimé <abbr title='%{title}'>il y a %{time}</abbr> par %{user}
-    edited_by_html: Modifié <abbr title='%{title}'>il y a %{time}</abbr> par %{user}
-    closed_by_html: Fermé <abbr title='%{title}'>il y a %{time}</abbr> par %{user}
+    deleted_by_html: Supprimé il y a <abbr title='%{title}'>%{time}</abbr> par %{user}
+    edited_by_html: Modifié il y a <abbr title='%{title}'>%{time}</abbr> par %{user}
+    closed_by_html: Fermé il y a <abbr title='%{title}'>%{time}</abbr> par %{user}
     version: Version
     in_changeset: Groupe de modifications
     anonymous: anonyme
     no_comment: (aucun commentaire)
     part_of: Partie de
     download_xml: Télécharger le XML
-    view_history: Voir l’historique
+    view_history: Afficher l’historique
     view_details: Afficher les détails
     location: 'Emplacement :'
     changeset:
@@ -155,11 +156,17 @@ fr:
       way_paginated: Chemins (%{x} à %{y} sur %{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x} à %{y} sur %{count})
+      comment: Commentaires (%{count})
+      hidden_commented_by: Commentaire masqué de %{user} <abbr title='%{exact_time}'>il
+        y a %{when}</abbr>
+      commented_b