Merge branch 'master' into routing

diff --git a/app/assets/stylesheets/browse.css.scss b/app/assets/stylesheets/browse.scss
similarity index 100%
rename from app/assets/stylesheets/browse.css.scss
rename to app/assets/stylesheets/browse.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.scss
similarity index 99%
rename from app/assets/stylesheets/common.css.scss
rename to app/assets/stylesheets/common.scss
index 8d40bbe39dfc2e460d288d5474d48a25b345eb9a..ff16ad66b3a78371d922f3ecabb44871cd5b813a 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1954,6 +1954,10 @@ tr.turn:hover {
   display: block;
 }
 
+select {
+  padding: 2px;
+}
+
 input[type="checkbox"],
 input[type="radio"] {
     margin-right: 5px;
@@ -1964,6 +1968,7 @@ input[type="email"],
 input[type="url"],
 input[type="password"],
 textarea {
+  background-color: #fff;
   border: 1px solid #ccc;
   padding: 2px 5px;
   margin: 0;

diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.scss
similarity index 100%
rename from app/assets/stylesheets/embed.css.scss
rename to app/assets/stylesheets/embed.scss

diff --git a/app/assets/stylesheets/leaflet-all.css.scss b/app/assets/stylesheets/leaflet-all.scss
similarity index 100%
rename from app/assets/stylesheets/leaflet-all.css.scss
rename to app/assets/stylesheets/leaflet-all.scss

diff --git a/app/assets/stylesheets/ltr/common.css.scss b/app/assets/stylesheets/ltr/common.css.scss
deleted file mode 120000 (symlink)
index b8c3282..0000000
--- a/app/assets/stylesheets/ltr/common.css.scss
+++ /dev/null
@@ -1 +0,0 @@
-../common.css.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/ltr/common.scss b/app/assets/stylesheets/ltr/common.scss
new file mode 120000 (symlink)
index 0000000..85037a3
--- /dev/null
+++ b/app/assets/stylesheets/ltr/common.scss
@@ -0,0 +1 @@
+../common.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/ltr/small.css.scss b/app/assets/stylesheets/ltr/small.css.scss
deleted file mode 120000 (symlink)
index f08fdd5..0000000
--- a/app/assets/stylesheets/ltr/small.css.scss
+++ /dev/null
@@ -1 +0,0 @@
-../small.css.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/ltr/small.scss b/app/assets/stylesheets/ltr/small.scss
new file mode 120000 (symlink)
index 0000000..f3fd1a0
--- /dev/null
+++ b/app/assets/stylesheets/ltr/small.scss
@@ -0,0 +1 @@
+../small.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/rtl/common.css.r2.scss b/app/assets/stylesheets/rtl/common.css.r2.scss
deleted file mode 120000 (symlink)
index b8c3282..0000000
--- a/app/assets/stylesheets/rtl/common.css.r2.scss
+++ /dev/null
@@ -1 +0,0 @@
-../common.css.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/rtl/common.r2.scss b/app/assets/stylesheets/rtl/common.r2.scss
new file mode 120000 (symlink)
index 0000000..85037a3
--- /dev/null
+++ b/app/assets/stylesheets/rtl/common.r2.scss
@@ -0,0 +1 @@
+../common.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/rtl/small.css.r2.scss b/app/assets/stylesheets/rtl/small.css.r2.scss
deleted file mode 120000 (symlink)
index f08fdd5..0000000
--- a/app/assets/stylesheets/rtl/small.css.r2.scss
+++ /dev/null
@@ -1 +0,0 @@
-../small.css.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/rtl/small.r2.scss b/app/assets/stylesheets/rtl/small.r2.scss
new file mode 120000 (symlink)
index 0000000..f3fd1a0
--- /dev/null
+++ b/app/assets/stylesheets/rtl/small.r2.scss
@@ -0,0 +1 @@
+../small.scss
\ No newline at end of file

diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.scss
similarity index 100%
rename from app/assets/stylesheets/small.css.scss
rename to app/assets/stylesheets/small.scss

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a7bf53824821a4559672b9d1446eccb7dc74bee3..ea50113e5d2478a2652f35a1517541cba5947c20 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -276,12 +276,13 @@ class UserController < ApplicationController
 
   def login
     if params[:username] or using_open_id?
-      session[:remember_me] ||= params[:remember_me]
       session[:referer] ||= params[:referer]
 
       if using_open_id?
+        session[:remember_me] ||= params[:remember_me_openid]
         openid_authentication(params[:openid_url])
       else
+        session[:remember_me] ||= params[:remember_me]
         password_authentication(params[:username], params[:password])
       end
     end

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
index 051d270a4201164a09c8767790c64aae1e5bf320..a78916dcc54267e54c138b77518110aebecb6442 100644 (file)
--- a/app/views/user/login.html.erb
+++ b/app/views/user/login.html.erb
@@ -54,7 +54,7 @@
             <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
           </div>
 
-          <div id="remember_me_openid" class='form-row'>
+          <div class='form-row'>
             <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
             <label class="standard-label" for="remember_me_openid"><%= t 'user.login.remember' %></label>
           </div>

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 9d4e607373ebba0372548606c7659a76094bc2f7..072eee83f9e3be1ac2533d225d121affc92a717f 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -547,7 +547,7 @@ br:
           primary_link: Pennhent
           proposed: Hent kinniget
           raceway: Redva
-          residential: Takad annezet
+          residential: Straed annezet
           rest_area: Leur diskuizh
           road: Hent
           secondary: Hent eil renk
@@ -1278,8 +1278,12 @@ br:
     changeset_comment_notification:
       greeting: Demat,
       commented:
+        subject_own: '[OpenStreetMap] %{commenter} en deus addispleget unan eus ho
+          kemmoù'
         subject_other: '[OpenStreetMap] %{commenter} en deus addispleget unan eus
           ho notennoù a sell ouzhoc''h'
+        your_changeset: '[OpenStreetMap] %{commenter} en deus addispleget unan eus
+          ho holladoù kemmoù krouet d''an %{time}'
         partial_changeset_with_comment: gant an addispleg '%{changeset_comment}'
         partial_changeset_without_comment: Hep evezhiadenn
   message:
@@ -2265,6 +2269,7 @@ br:
       way: Hent
       relation: Darempred
       nothing_found: Arc'hweladur ebet kavet
+      error: Fazi o vont e daremmpred gant %{server}:%{error}
   redaction:
     edit:
       description: Deskrivadur

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d2797511bec70a6de1a59c17394111d514aefc62..88d42282cdc4244735a25b87b1c2689f7b86c57c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -375,8 +375,10 @@ en:
       prefix_format: "%{name}"
       prefix:
         aerialway:
+          cable_car: "Cable Car"
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
+          gondola: "Gondola Lift"
           station: "Aerialway Station"
         aeroway:
           aerodrome: "Aerodrome"
@@ -387,11 +389,9 @@ en:
           taxiway: "Taxiway"
           terminal: "Terminal"
         amenity:
-          airport: "Airport"
+          animal_shelter: "Animal Shelter"
           arts_centre: "Arts Centre"
-          artwork: "Artwork"
           atm: "ATM"
-          auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"
           bbq: "BBQ"
@@ -399,6 +399,7 @@ en:
           bicycle_parking: "Cycle Parking"
           bicycle_rental: "Cycle Rental"
           biergarten: "Beer Garden"
+          boat_rental: "Boat Rental"
           brothel: "Brothel"
           bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"
@@ -408,9 +409,10 @@ en:
           car_wash: "Car Wash"
           casino: "Casino"
           charging_station: "Charging Station"
+          childcare: "Childcare"
           cinema: "Cinema"
           clinic: "Clinic"
-          club: "Club"
+          clock: "Clock"
           college: "College"
           community_centre: "Community Centre"
           courthouse: "Courthouse"
@@ -429,25 +431,25 @@ en:
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
+          gambling: "Gambling"
           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"
-          hall: "Hall"
           health_centre: "Health Centre"
           hospital: "Hospital"
-          hotel: "Hotel"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"
           market: "Market"
           marketplace: "Marketplace"
-          mountain_rescue: "Mountain Rescue"
+          monastery: "Monastery"
+          motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"
           nursery: "Nursery"
           nursing_home: "Nursing Home"
           office: "Office"
-          park: "Park"
           parking: "Parking"
+          parking_entrance: "Parking Entrance"
           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"
@@ -457,7 +459,6 @@ en:
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
-          public_market: "Public Market"
           reception_area: "Reception Area"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
@@ -466,13 +467,11 @@ en:
           school: "School"
           shelter: "Shelter"
           shop: "Shop"
-          shopping: "Shopping"
           shower: "Shower"
           social_centre: "Social Centre"
           social_club: "Social Club"
           social_facility: "Social Facility"
           studio: "Studio"
-          supermarket: "Supermarket"
           swimming_pool: "Swimming Pool"
           taxi: "Taxi"
           telephone: "Public Telephone"
@@ -484,8 +483,7 @@ en:
           veterinary: "Veterinary Surgery"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
-          wifi: "WiFi Access"
-          WLAN: "WiFi Access"
+          waste_disposal: "Waste Disposal"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
@@ -500,22 +498,35 @@ en:
           "yes": "Bridge"
         building:
           "yes": "Building"
+        craft:
+          brewery: "Brewery"
+          carpenter: "Carpenter"
+          electrician: "Electrician"
+          gardener: "Gardener"
+          painter: "Painter"
+          photographer: "Photographer"
+          plumber: "Plumber"
+          shoemaker: "Shoemaker"
+          tailor: "Tailor"
+          "yes": "Craft Shop"
         emergency:
-          fire_hydrant: "Fire Hydrant"
+          ambulance_station: "Ambulance Station"
+          defibrillator: "Defibrillator"
+          landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"
         highway:
+          abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
-          byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"
+          elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
           living_street: "Living Street"
           milestone: "Milestone"
-          minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"
@@ -536,37 +547,44 @@ en:
           speed_camera: "Speed Camera"
           steps: "Steps"
           street_lamp: "Street Lamp"
-          stile: "Stile"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
           track: "Track"
+          traffic_signals: "Traffic Signals"
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
           unclassified: "Unclassified Road"
           unsurfaced: "Unsurfaced Road"
+          "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"
           battlefield: "Battlefield"
           boundary_stone: "Boundary Stone"
-          building: "Building"
+          building: "Historic Building"
+          bunker: "Bunker"
           castle: "Castle"
           church: "Church"
+          city_gate: "City Gate"
           citywalls: "City Walls"
           fort: "Fort"
+          heritage: "Heritage Site"
           house: "House"
           icon: "Icon"
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
           monument: "Monument"
-          museum: "Museum"
+          roman_road: "Roman Road"
           ruins: "Ruins"
+          stone: "Stone"
           tomb: "Tomb"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
+        junction:
+          "yes": "Junction"
         landuse:
           allotments: "Allotments"
           basin: "Basin"
@@ -588,9 +606,6 @@ en:
           military: "Military Area"
           mine: "Mine"
           orchard: "Orchard"
-          nature_reserve: "Nature Reserve"
-          park: "Park"
-          piste: "Piste"
           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
@@ -601,16 +616,19 @@ en:
           road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
-          wetland: "Wetland"
-          wood: "Wood"
+          "yes": "Landuse"
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"
+          club: "Club"
           common: "Common Land"
+          dog_park: "Dog Park"
           fishing: "Fishing Area"
+          fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"
+          horse_riding: "Horse Riding"
           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"
@@ -619,6 +637,7 @@ en:
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"
+          resort: "Resort"
           sauna: "Sauna"
           slipway: "Slipway"
           sports_centre: "Sports Centre"
@@ -626,6 +645,13 @@ en:
           swimming_pool: "Swimming Pool"
           track: "Running Track"
           water_park: "Water Park"
+          "yes": "Leisure"
+        man_made:
+          lighthouse: "Lighthouse"
+          pipeline: "Pipeline"
+          tower: "Tower"
+          works: "Factory"
+          "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
@@ -637,16 +663,15 @@ en:
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
-          channel: "Channel"
           cliff: "Cliff"
           crater: "Crater"
           dune: "Dune"
-          feature: "Feature"
           fell: "Fell"
           fjord: "Fjord"
           forest: "Forest"
           geyser: "Geyser"
           glacier: "Glacier"
+          grassland: "Grassland"
           heath: "Heath"
           hill: "Hill"
           island: "Island"
@@ -658,11 +683,11 @@ en:
           point: "Point"
           reef: "Reef"
           ridge: "Ridge"
-          river: "River"
           rock: "Rock"
+          saddle: "Saddle"
+          sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"
-          shoal: "Shoal"
           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
@@ -671,10 +696,10 @@ en:
           volcano: "Volcano"
           water: "Water"
           wetland: "Wetland"
-          wetlands: "Wetlands"
           wood: "Wood"
         office:
           accountant: "Accountant"
+          administrative: "Admininstration"
           architect: "Architect"
           company: "Company"
           employment_agency: "Employment Agency"
@@ -687,6 +712,8 @@ en:
           travel_agent: "Travel Agency"
           "yes": "Office"
         place:
+          allotments: "Allotments"
+          block: "Block"
           airport: "Airport"
           city: "City"
           country: "Country"
@@ -711,6 +738,7 @@ en:
           town: "Town"
           unincorporated_area: "Unincorporated Area"
           village: "Village"
+          "yes": "Place"
         railway:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
@@ -736,9 +764,6 @@ en:
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"
-          yard: "Railway Yard"
-        route:
-          bus: "Bus Route"
         shop:
           alcohol: "Off License"
           antiques: "Antiques"
@@ -817,6 +842,7 @@ en:
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
+          apartment: "Apartment"
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
@@ -824,16 +850,15 @@ en:
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           chalet: "Chalet"
+          gallery: "Gallery"
           guest_house: "Guest House"
           hostel: "Hostel"
           hotel: "Hotel"
           information: "Information"
-          lean_to: "Lean To"
           motel: "Motel"
           museum: "Museum"
           picnic_site: "Picnic Site"
           theme_park: "Theme Park"
-          valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
@@ -843,7 +868,6 @@ en:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"
           canal: "Canal"
-          connector: "Waterway Connector"
           dam: "Dam"
           derelict_canal: "Derelict Canal"
           ditch: "Ditch"
@@ -851,16 +875,14 @@ en:
           drain: "Drain"
           lock: "Lock"
           lock_gate: "Lock Gate"
-          mineral_spring: "Mineral Spring"
           mooring: "Mooring"
           rapids: "Rapids"
           river: "River"
-          riverbank: "Riverbank"
           stream: "Stream"
           wadi: "Wadi"
           waterfall: "Waterfall"
-          water_point: "Water Point"
           weir: "Weir"
+          "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"
         level4: "State Boundary"

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index cab092b771d5057e571f733762d9c0f6f485d025..ed687a388214fd8b67190e3e6fd86b6cf26d4dda 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -96,8 +96,12 @@ eu:
       loading: Kargatzen...
     tag_details:
       tags: Etiketak
+      wikidata_link: '%{page} elementua Wikidatan'
+      wikipedia_link: '%{page} artikulua Wikipedian'
     note:
       title: 'Oharra: %{id}'
+      new_note: Ohar berria
+      description: Deskribapena
   changeset:
     changeset_paging_nav:
       showing_page: '%{page}. orrialdea'
@@ -144,6 +148,7 @@ eu:
       view: Ikusi
       edit: Aldatu
     comments:
+      ago: Duela %{ago}
       newer_comments: Iruzkin berriagoak
       older_comments: Iruzkin zaharragoak
   export:
@@ -153,6 +158,9 @@ eu:
       licence: Lizentzia
       export_details: OpenStreetMap-eko datuak <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Datu-base Irekiko Lizentzia</a> baimen baten mende daude.
+      too_large:
+        planet:
+          title: OSM Planeta
       options: Aukerak
       format: Formatua
       scale: Eskala
@@ -293,6 +301,7 @@ eu:
           steps: Eskailera-mailak
           tertiary: Hirugarren mailako errepide
           track: Pista
+          unclassified: Sailkatu gabeko errepidea
         historic:
           archaeological_site: Aztarnategi arkeologiko
           building: Eraikina
@@ -344,6 +353,7 @@ eu:
           cave_entrance: Kobazulo Sarrera
           channel: Kanal
           crater: Crater
+          dune: Duna
           fjord: Fiordo
           forest: Basoa
           geyser: Geiser
@@ -487,6 +497,8 @@ eu:
         cities: Hiriak
         towns: Herriak
         places: Lekuak
+    results:
+      more_results: Emaitza gehiago
     distance:
       one: km bat inguru
       zero: km bat baino gutxiago
@@ -512,6 +524,7 @@ eu:
     export: Esportatu
     data: Datuak
     export_data: Esportatu datuak
+    intro_header: Ongi etorri OpenStreetMapera!
     help: Laguntza
     about: Honi buruz
     community: Komunitatea
@@ -531,6 +544,7 @@ eu:
       native_link: Euskara version
     legal_babble:
       title_html: Egile-eskubideak eta lizentzia
+      more_title_html: Jakin ezazu gehiago
       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),
@@ -538,13 +552,22 @@ eu:
         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.'
+      infringement_title_html: Egile-eskubideen urraketa
   welcome_page:
     title: Ongi etorri!
+    introduction_html: Ongi etorri OpenStreetMapera, edonork alda dezakeen munduko
+      mapa askera. Orain izena eman duzula, mapak editatzen has zaitezke. Hona hemen
+      gida laburra jakin behar dituzun gauzarik garrantzitsuenak dituena.
+    whats_on_the_map:
+      title: Mapan dagoena
     questions:
       title: Galderarik?
   fixthemap:
+    title: Arazo baten berri eman / Mapa zuzendu
     how_to_help:
       title: Nola lagundu
+    other_concerns:
+      title: Bestelako kezkak
   help_page:
     welcome:
       url: /welcome
@@ -552,6 +575,9 @@ eu:
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
+    wiki:
+      url: http://wiki.openstreetmap.org/wiki/Eu:Main_Page
+      title: wiki.openstreetmap.org
   about_page:
     next: Hurrengoa
   notifier:
@@ -561,6 +587,8 @@ eu:
       hi: Kaixo %{to_user},
     gpx_notification:
       greeting: Kaixo,
+    signup_confirm:
+      subject: '[OpenStreetMap] Ongi etorri OpenStreetMapera'
     email_confirm:
       subject: '[OpenStreetMap] Baieztatu zure eposta helbidea'
     email_confirm_plain:
@@ -626,6 +654,7 @@ eu:
           motorway: Autobidea
           primary: Lehen mailako errepidea
           secondary: Bigarren mailako errepidea
+          unclassified: Sailkatu gabeko errepidea
           rail: Trenbidea
           subway: Metroa
           tram:

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 24d94dcd18bb3882b5fce3a4fea8b152f2a331c8..c1125476e1fab5a5c2d3c6ae1b37c105ebae8032 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2211,9 +2211,9 @@ fi:
     notes:
       new:
         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.)
+          jolloin virhe voidaan korjata. Siirrä merkkipiste oikeaan kohtaan ja kirjoita
+          selite ongelmasta. (Älä kirjoita henkilötietojasi tai tietoa tekijänoikeudella
+          suojatuista kartoista tai muista lähteistä.)
         add: Lähetä ilmoitus
       show:
         anonymous_warning: Tässä karttailmoituksessa on kommentteja tunnistautumattomilta

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7f4c599e42a263091192017a667f731312c9de89..0bec4d6e794ac0c3890f99090189155afb6a6d6c 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -2146,6 +2146,7 @@ ko:
         subscribe: 구독
         unsubscribe: 구독 해지
         hide_comment: 숨기기
+        unhide_comment: 숨기기 취소
     notes:
       new:
         intro: 실수했거나 없는 무언가를 발견했나요? 다른 매퍼에게 알려주어 고칠 수 있게 해주세요. 마커를 올바른 위치로 옮기고, 참고를
@@ -2163,6 +2164,7 @@ ko:
       node: 노드
       way: 길
       relation: 관계
+      nothing_found: 기능을 찾을 수 없습니다
   redaction:
     edit:
       description: 설명

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 160e55fe09031b9b0a0279e26fd7ba9fc520c75b..e0702b94576d5eb1a9f512608d7ef5c0705da626 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -54,7 +54,7 @@ lt:
         body: Tekstas
       diary_entry:
         user: Naudotojas
-        title: Pavadinimas
+        title: Antraštė
         latitude: Platuma
         longitude: Ilguma
         language: Kalba
@@ -97,13 +97,62 @@ lt:
       name: nuotoliniu valdymu
       description: nuotolinį valdymą (JOSM arba Merkaartor)
   browse:
+    created: Sukurtas
+    closed: Uždarytas
+    created_html: Sukurtas <abbr title='%{title}'>prieš %{time}</abbr>
+    closed_html: Uždarytas <abbr title='%{title}'>prieš %{time}</abbr>
+    created_by_html: Sukurtas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
+      %{user}
+    deleted_by_html: Ištrintas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
+      %{user}
+    edited_by_html: Keistas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
+      %{user}
+    closed_by_html: Uždarytas <abbr title='%{title}'>prieš %{time}</abbr> naudotojo
+      %{user}
+    version: Versija
+    in_changeset: Pakeitimas
+    anonymous: anonimas
+    no_comment: (nėra komentaro)
+    part_of: Dalis
+    download_xml: Atsisiųsti XML
+    view_history: Žiūrėti istoriją
+    view_details: Žiūrėti detales
+    location: 'Vieta:'
     changeset:
-      title: Pakeitimas
+      title: 'Pakeitimas: %{id}'
+      belongs_to: Autorius
+      node: Taškų (%{count})
+      node_paginated: Taškų (%{x}-%{y} iš %{count})
+      way: Keliai (%{count})
+      way_paginated: Keliai (%{x}-%{y} iš %{count})
+      relation: Ryšiai (%{count})
+      relation_paginated: Ryšiai (%{x}-%{y} iš %{count})
+      comment: Komentarai (%{count})
+      hidden_commented_by: Paslėptas naudotojo %{user} komentaras <abbr title='%{exact_time}'>prieš
+        %{when}</abbr>
+      commented_by: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>prieš
+        %{when}</abbr>
       changesetxml: Pakeitimo XML
       osmchangexml: osmChange XML
       feed:
         title: Pakeitimas %{id}
         title_comment: Pakeitimas %{id} - %{comment}
+      join_discussion: Prisijunkite norėdami dalyvauti aptarime
+      discussion: Diskusija
+    node:
+      title: 'Taškas: %{name}'
+      history_title: 'Taško istorija: %{name}'
+    way:
+      title: 'Kelias: %{name}'
+      history_title: 'Kelio istorija: %{name}'
+      nodes: Taškai
+      also_part_of:
+        one: dalis kelio %{related_ways}
+        other: dalis kelių %{related_ways}
+    relation:
+      title: 'Ryšys: %{name}'
+      history_title: 'Ryšio istorija: %{name}'
+      members: Nariai
     relation_member:
       entry_role: '%{type} %{name} kaip %{role}'
       type:
@@ -137,6 +186,8 @@ lt:
         way: kelias
         relation: ryšys
     start_rjs:
+      feature_warning: Įkeliami %{num_features} geoobjektai, todėl jūsų naršyklė gali
+        sulėtėti ir nesugebėti klausyti komandų. Ar tikrai norite rodyti šiuos duomenis?
       load_data: Kraunami duomenys
       loading: Kraunama...
     tag_details:
@@ -145,11 +196,32 @@ lt:
         key: Žymos %{key} wiki aprašymo puslapis
         tag: Žymos %{key}=%{value} wiki aprašymo puslapis
       wikipedia_link: '%{page} straipsnis Vikipedijoje'
+      telephone_link: Skambinti %{phone_number}
     note:
-      title: Pastaba
+      title: 'Pastaba: %{id}'
+      new_note: Nauja pastaba
       description: Aprašymas
       open_title: 'Neišspręsta pastaba: %{note_name}'
       closed_title: 'Išspręsta pastaba: %{note_name}'
+      hidden_title: 'Paslėpta pastaba #%{note_name}'
+      open_by: Sukurta naudotojo %{user} <abbr title='%{exact_time}'>prieš %{when}</abbr>
+      open_by_anonymous: Sukurta anonimo <abbr title='%{exact_time}'>prieš %{when}</abbr>
+      commented_by: Naudotojo %{user} komentaras <abbr title='%{exact_time}'>prieš
+        %{when}</abbr>
+      commented_by_anonymous: Anonimo komentaras <abbr title='%{exact_time}'>prieš
+        %{when}</abbr>
+      closed_by: Išsprendė naudotojas %{user} <abbr title='%{exact_time}'>prieš %{when}</abbr>
+      closed_by_anonymous: Išsprendė anonimas <abbr title='%{exact_time}'>prieš %{when}</abbr>
+      reopened_by: Iš naujo aktyvavo naudotojas %{user} <abbr title='%{exact_time}'>prieš
+        %{when}</abbr>
+      reopened_by_anonymous: Iš naujo aktyvavo anonimas <abbr title='%{exact_time}'>prieš
+        %{when}</abbr>
+      hidden_by: Paslėpė naudotojas %{user} <abbr title='%{exact_time}'>prieš %{when}</abbr>
+    query:
+      title: Ieškoti geoobjektų
+      introduction: Spauskite ant žemėlapio, norėdami rasti gretimus objektus
+      nearby: Artimi objektai
+      enclosing: Gaubiantys objektai
   changeset:
     changeset_paging_nav:
       showing_page: Puslapis %{page}
@@ -170,8 +242,22 @@ lt:
       title_user: Naudotojo %{user} pakeitimai
       title_friend: Jūsų draugų pakeitimai
       title_nearby: Netoliese esančių naudotojų pakeitimai
+      empty: Nerasta pakeitimų.
+      empty_area: Nėra šios vietos pakeitimų.
+      empty_user: Nėra šio naudotojo pakeitimų.
+      no_more: Daugiau pakeitimų nerasta.
+      no_more_area: Daugiau pakeitimų šioje vietoje nėra.
+      no_more_user: Daugiau šio naudotojo pakeitimų nėra.
+      load_more: Įkelti daugiau
     timeout:
       sorry: Atsiprašome, bet jūsų prašytų pakeitimų ištraukimas užtruko per ilgai.
+    rss:
+      title_all: OpenStreetMap pakeitimo aptarimas
+      title_particular: 'OpenStreetMap pakeitimo #%{changeset_id} aptarimas'
+      comment: 'Naujas pakeitimo #%{changeset_id} komentaras, parašytas %{author}'
+      commented_at_html: Pakeista prieš %{when}
+      commented_at_by_html: '%{user} pakeitė prieš %{when}'
+      full: Pilnas aptarimas
   diary_entry:
     new:
       title: Naujas dienoraščio įrašas
@@ -248,6 +334,7 @@ lt:
       newer_comments: Naujesni komentarai
       older_comments: Senesni komentarai
   export:
+    title: Eksportuoti
     start:
       area_to_export: Eksportuotinas plotas
       manually_select: Rankiniu būdu parinkti kitą sritį
@@ -259,8 +346,29 @@ lt:
       export_details: OpenStreetMap duomenų licencija - <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database License</a> (ODbL).
       too_large:
+        advice: 'Jei aukščiau pateiktas eksportas nepavyko, pabandykite vieną iš žemiau
+          išvardintų šaltinių:'
         body: Ši sritis per didelė, kad būtų galima eksportuoti OpenStreetMap XML
-          duomenis. Parinkite mažesnę sritį.
+          duomenis. Padidinkite, parinkite mažesnę sritį arba naudokite vieną iš didelio
+          duomenų kiekio atsiuntimo šaltinių.
+        planet:
+          title: OSM planeta
+          description: Periodiškai atnaujinamos pilnos OpenStreetMap duomenų bazės
+            kopijos
+        overpass:
+          title: Overpass API
+          description: Atsisiųsti šią apimtį iš OpenStreetMap duombazės kopijos
+        geofabrik:
+          title: Geofabrik atsisiuntimai
+          description: Periodiškai atnaujinami kontinentų, šalių ir kai kurių miestų
+            duomenys.
+        metro:
+          title: Metro iškarpos
+          description: Pagrindinių pasaulio miestų ir aplinkinių teritorijų duomenų
+            iškarpos
+        other:
+          title: Kiti šaltiniai
+          description: Papildomi šaltiniai išvardinti OpenStreetMap wiki
       options: Parinktys
       format: Formatas
       scale: Mastelis
@@ -284,6 +392,9 @@ lt:
         osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a> rezultatai
         geonames: <a href="http://www.geonames.org/">GeoNames</a> rezultatai
+        osm_nominatim_reverse: Rezultatai iš <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a>
+        geonames_reverse: Rezultatai iš <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aeroway:
@@ -378,6 +489,7 @@ lt:
           shower: Dušas
           social_centre: Socialinių reikalų centras
           social_club: Socialinių reikalų klubas
+          social_facility: Socialinė įstaiga
           studio: Studija
           supermarket: Prekybos centras
           swimming_pool: Plaukiojimo baseinas

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d5451830c003401729b83e08af49ad2f5daaffbd..1f44345cb3a8c1f076a91bb920919f9870a005c8 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1738,14 +1738,14 @@ nl:
       lost password link: Wachtwoord vergeten?
       login_button: Aanmelden
       register now: Nu inschrijven
-      with username: 'Hebt u al een gebruiker bij OpenStreetMap? Meld aan met uw gebruikersnaam
+      with username: 'Hebt u al een account bij OpenStreetMap? Meld aan met uw gebruikersnaam
         en wachtwoord:'
       with openid: 'U kunt ook aanmelden met uw OpenID:'
       new to osm: Is OpenStreetMap nieuw voor u?
       to make changes: Om wijzigingen in OpenStreetMap te maken, moet u een gebruiker
         hebben.
       create account minute: Maak een gebruiker aan. Dat is snel gebeurd.
-      no account: Hebt u geen gebruiker?
+      no account: Hebt u geen account?
       account not active: Uw gebruiker is helaas nog niet actief.<br />Klik op de
         koppeling in de bevestiging om deze te activeren of <a href="%{reconfirm}">vraag
         een nieuwe bevestiging per e-mail aan</a>.

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 531120687336982cda1ce6881ffb4caf6fd295e3..906a606baba364bb2287b57a9efaa1a5d3e76c92 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -618,7 +618,7 @@ pt-BR:
           construction: Construção em progresso
           farm: Fazenda
           farmland: Área cultivada
-          farmyard: Curral
+          farmyard: Pátio de Fazenda
           forest: Floresta
           garages: Garagens
           grass: Gramado

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 59c68021617b124815150155c03f28758b8d19b7..1c8ed0a97419f0b6c28ea34d1943d89f25ac08a6 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -2037,7 +2037,7 @@ zh-TW:
       layers:
         header: 地圖圖層
         notes: 地圖筆記
-        data: 地圖圖資
+        data: 地圖資料
         overlays: 啟用覆蓋層，以為地圖解決問題
         title: 圖層
       copyright: © <a href='%{copyright_url}'>OpenStreetMap貢獻者</a>

diff --git a/db/structure.sql b/db/structure.sql
index 5d52a87be3ab72c9693b7687f96ed196aa6b0c20..8e76de5160622df47f7b70b748b2839da509dfa9 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -45,7 +45,8 @@ SET search_path = public, pg_catalog;
 
 CREATE TYPE format_enum AS ENUM (
     'html',
-    'markdown'
+    'markdown',
+    'text'
 );
 
 
@@ -119,33 +120,6 @@ CREATE TYPE user_status_enum AS ENUM (
 );
 
 
---
--- Name: maptile_for_point(bigint, bigint, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION maptile_for_point(bigint, bigint, integer) RETURNS integer
-    LANGUAGE c STRICT
-    AS '/srv/www/next.osm.compton.nu/db/functions/libpgosm.so', 'maptile_for_point';
-
-
---
--- Name: tile_for_point(integer, integer); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION tile_for_point(integer, integer) RETURNS bigint
-    LANGUAGE c STRICT
-    AS '/srv/www/next.osm.compton.nu/db/functions/libpgosm.so', 'tile_for_point';
-
-
---
--- Name: xid_to_int4(xid); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION xid_to_int4(xid) RETURNS integer
-    LANGUAGE c IMMUTABLE STRICT
-    AS '/srv/www/next.osm.compton.nu/db/functions/libpgosm.so', 'xid_to_int4';
-
-
 SET default_tablespace = '';
 
 SET default_with_oids = false;
@@ -157,9 +131,9 @@ SET default_with_oids = false;
 CREATE TABLE acls (
     id integer NOT NULL,
     address inet,
-    k character varying(255) NOT NULL,
-    v character varying(255),
-    domain character varying(255)
+    k character varying NOT NULL,
+    v character varying,
+    domain character varying
 );
 
 
@@ -221,8 +195,8 @@ ALTER SEQUENCE changeset_comments_id_seq OWNED BY changeset_comments.id;
 
 CREATE TABLE changeset_tags (
     changeset_id bigint NOT NULL,
-    k character varying(255) DEFAULT ''::character varying NOT NULL,
-    v character varying(255) DEFAULT ''::character varying NOT NULL
+    k character varying DEFAULT ''::character varying NOT NULL,
+    v character varying DEFAULT ''::character varying NOT NULL
 );
 
 
@@ -278,10 +252,10 @@ CREATE TABLE changesets_subscribers (
 
 CREATE TABLE client_applications (
     id integer NOT NULL,
-    name character varying(255),
-    url character varying(255),
-    support_url character varying(255),
-    callback_url character varying(255),
+    name character varying,
+    url character varying,
+    support_url character varying,
+    callback_url character varying,
     key character varying(50),
     secret character varying(50),
     user_id integer,
@@ -322,8 +296,8 @@ ALTER SEQUENCE client_applications_id_seq OWNED BY client_applications.id;
 
 CREATE TABLE current_node_tags (
     node_id bigint NOT NULL,
-    k character varying(255) DEFAULT ''::character varying NOT NULL,
-    v character varying(255) DEFAULT ''::character varying NOT NULL
+    k character varying DEFAULT ''::character varying NOT NULL,
+    v character varying DEFAULT ''::character varying NOT NULL
 );
 
 
@@ -370,7 +344,7 @@ CREATE TABLE current_relation_members (
     relation_id bigint NOT NULL,
     member_type nwr_enum NOT NULL,
     member_id bigint NOT NULL,
-    member_role character varying(255) NOT NULL,
+    member_role character varying NOT NULL,
     sequence_id integer DEFAULT 0 NOT NULL
 );
 
@@ -381,8 +355,8 @@ CREATE TABLE current_relation_members (
 
 CREATE TABLE current_relation_tags (
     relation_id bigint NOT NULL,
-    k character varying(255) DEFAULT ''::character varying NOT NULL,
-    v character varying(255) DEFAULT ''::character varying NOT NULL
+    k character varying DEFAULT ''::character varying NOT NULL,
+    v character varying DEFAULT ''::character varying NOT NULL
 );
 
 
@@ -435,8 +409,8 @@ CREATE TABLE current_way_nodes (
 
 CREATE TABLE current_way_tags (
     way_id bigint NOT NULL,
-    k character varying(255) DEFAULT ''::character varying NOT NULL,
-    v character varying(255) DEFAULT ''::character varying NOT NULL
+    k character varying DEFAULT ''::character varying NOT NULL,
+    v character varying DEFAULT ''::character varying NOT NULL
 );
 
 
@@ -514,13 +488,13 @@ ALTER SEQUENCE diary_comments_id_seq OWNED BY diary_comments.id;
 CREATE TABLE diary_entries (
     id bigint NOT NULL,
     user_id bigint NOT NULL,
-    title character varying(255) NOT NULL,
+    title character varying NOT NULL,
     body text NOT NULL,
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
     latitude double precision,
     longitude double precision,
-    language_code character varying(255) DEFAULT 'en'::character varying NOT NULL,
+    language_code character varying DEFAULT 'en'::character varying NOT NULL,
     visible boolean DEFAULT true NOT NULL,
     body_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
 );
@@ -596,7 +570,7 @@ CREATE TABLE gps_points (
 
 CREATE TABLE gpx_file_tags (
     gpx_id bigint DEFAULT 0 NOT NULL,
-    tag character varying(255) NOT NULL,
+    tag character varying NOT NULL,
     id bigint NOT NULL
 );
 
@@ -628,12 +602,12 @@ CREATE TABLE gpx_files (
     id bigint NOT NULL,
     user_id bigint NOT NULL,
     visible boolean DEFAULT true NOT NULL,
-    name character varying(255) DEFAULT ''::character varying NOT NULL,
+    name character varying DEFAULT ''::character varying NOT NULL,
     size bigint,
     latitude double precision,
     longitude double precision,
     "timestamp" timestamp without time zone NOT NULL,
-    description character varying(255) DEFAULT ''::character varying NOT NULL,
+    description character varying DEFAULT ''::character varying NOT NULL,
     inserted boolean NOT NULL,
     visibility gpx_visibility_enum DEFAULT 'public'::gpx_visibility_enum NOT NULL
 );
@@ -663,9 +637,9 @@ ALTER SEQUENCE gpx_files_id_seq OWNED BY gpx_files.id;
 --
 
 CREATE TABLE languages (
-    code character varying(255) NOT NULL,
-    english_name character varying(255) NOT NULL,
-    native_name character varying(255)
+    code character varying NOT NULL,
+    english_name character varying NOT NULL,
+    native_name character varying
 );
 
 
@@ -676,7 +650,7 @@ CREATE TABLE languages (
 CREATE TABLE messages (
     id bigint NOT NULL,
     from_user_id bigint NOT NULL,
-    title character varying(255) NOT NULL,
+    title character varying NOT NULL,
     body text NOT NULL,
     sent_on timestamp without time zone NOT NULL,
     message_read boolean DEFAULT false NOT NULL,
@@ -713,8 +687,8 @@ ALTER SEQUENCE messages_id_seq OWNED BY messages.id;
 CREATE TABLE node_tags (
     node_id bigint NOT NULL,
     version bigint NOT NULL,
-    k character varying(255) DEFAULT ''::character varying NOT NULL,
-    v character varying(255) DEFAULT ''::character varying NOT NULL
+    k character varying DEFAULT ''::character varying NOT NULL,
+    v character varying DEFAULT ''::character varying NOT NULL
 );
 
 
@@ -740,7 +714,7 @@ CREATE TABLE nodes (
 --
 
 CREATE TABLE note_comments (
-    id integer NOT NULL,
+    id bigint NOT NULL,
     note_id bigint NOT NULL,
     visible boolean NOT NULL,
     created_at timestamp without time zone NOT NULL,
@@ -775,7 +749,7 @@ ALTER SEQUENCE note_comments_id_seq OWNED BY note_comments.id;
 --
 
 CREATE TABLE notes (
-    id integer NOT NULL,
+    id bigint NOT NULL,
     latitude integer NOT NULL,
     longitude integer NOT NULL,
     tile bigint NOT NULL,
@@ -811,7 +785,7 @@ ALTER SEQUENCE notes_id_seq OWNED BY notes.id;
 
 CREATE TABLE oauth_nonces (
     id integer NOT NULL,
-    nonce character varying(255),
+    nonce character varying,
     "timestamp" integer,
     created_at timestamp without time zone,
     updated_at timestamp without time zone
@@ -858,9 +832,9 @@ CREATE TABLE oauth_tokens (
     allow_write_api boolean DEFAULT false NOT NULL,
     allow_read_gpx boolean DEFAULT false NOT NULL,
     allow_write_gpx boolean DEFAULT false NOT NULL,
-    callback_url character varying(255),
+    callback_url character varying,
     verifier character varying(20),
-    scope character varying(255),
+    scope character varying,
     valid_to timestamp without time zone,
     allow_write_notes boolean DEFAULT false NOT NULL
 );
@@ -891,10 +865,10 @@ ALTER SEQUENCE oauth_tokens_id_seq OWNED BY oauth_tokens.id;
 
 CREATE TABLE redactions (
     id integer NOT NULL,
-    title character varying(255),
+    title character varying,
     description text,
-    created_at timestamp without time zone NOT NULL,
-    updated_at timestamp without time zone NOT NULL,
+    created_at timestamp without time zone,
+    updated_at timestamp without time zone,
     user_id bigint NOT NULL,
     description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL
 );
@@ -927,7 +901,7 @@ CREATE TABLE relation_members (
     relation_id bigint DEFAULT 0 NOT NULL,
     member_type nwr_enum NOT NULL,
     member_id bigint NOT NULL,
-    member_role character varying(255) NOT NULL,
+    member_role character varying NOT NULL,
     version bigint DEFAULT 0 NOT NULL,
     sequence_id integer DEFAULT 0 NOT NULL
 );
@@ -939,8 +913,8 @@ CREATE TABLE relation_members (
 
 CREATE TABLE relation_tags (
     relation_id bigint DEFAULT 0 NOT NULL,
-    k character varying(255) DEFAULT ''::character varying NOT NULL,
-    v character varying(255) DEFAULT ''::character varying NOT NULL,
+    k character varying DEFAULT ''::character varying NOT NULL,
+    v character varying DEFAULT ''::character varying NOT NULL,
     version bigint NOT NULL
 );
 
@@ -964,7 +938,7 @@ CREATE TABLE relations (
 --
 
 CREATE TABLE schema_migrations (
-    version character varying(255) NOT NULL
+    version character varying NOT NULL
 );
 
 
@@ -1011,8 +985,8 @@ ALTER SEQUENCE user_blocks_id_seq OWNED BY user_blocks.id;
 
 CREATE TABLE user_preferences (
     user_id bigint NOT NULL,
-    k character varying(255) NOT NULL,
-    v character varying(255) NOT NULL
+    k character varying NOT NULL,
+    v character varying NOT NULL
 );
 
 
@@ -1023,9 +997,9 @@ CREATE TABLE user_preferences (
 CREATE TABLE user_roles (
     id integer NOT NULL,
     user_id bigint NOT NULL,
+    role user_role_enum NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    role user_role_enum NOT NULL,
     granter_id bigint NOT NULL
 );
 
@@ -1056,7 +1030,7 @@ ALTER SEQUENCE user_roles_id_seq OWNED BY user_roles.id;
 CREATE TABLE user_tokens (
     id bigint NOT NULL,
     user_id bigint NOT NULL,
-    token character varying(255) NOT NULL,
+    token character varying NOT NULL,
     expiry timestamp without time zone NOT NULL,
     referer text
 );
@@ -1086,36 +1060,36 @@ ALTER SEQUENCE user_tokens_id_seq OWNED BY user_tokens.id;
 --
 
 CREATE TABLE users (
-    email character varying(255) NOT NULL,
+    email character varying NOT NULL,
     id bigint NOT NULL,
-    pass_crypt character varying(255) NOT NULL,
+    pass_crypt character varying NOT NULL,
     creation_time timestamp without time zone NOT NULL,
-    display_name character varying(255) DEFAULT ''::character varying NOT NULL,
+    display_name character varying DEFAULT ''::character varying NOT NULL,
     data_public boolean DEFAULT false NOT NULL,
     description text DEFAULT ''::text NOT NULL,
     home_lat double precision,
     home_lon double precision,
     home_zoom smallint DEFAULT 3,
     nearby integer DEFAULT 50,
-    pass_salt character varying(255),
+    pass_salt character varying,
     image_file_name text,
     email_valid boolean DEFAULT false NOT NULL,
-    new_email character varying(255),
-    creation_ip character varying(255),
-    languages character varying(255),
+    new_email character varying,
+    creation_ip character varying,
+    languages character varying,
     status user_status_enum DEFAULT 'pending'::user_status_enum NOT NULL,
     terms_agreed timestamp without time zone,
     consider_pd boolean DEFAULT false NOT NULL,
-    openid_url character varying(255),
-    preferred_editor character varying(255),
+    openid_url character varying,
+    preferred_editor character varying,
     terms_seen boolean DEFAULT false NOT NULL,
-    image_fingerprint character varying(255),
     description_format format_enum DEFAULT 'markdown'::format_enum NOT NULL,
+    image_fingerprint character varying,
     changesets_count integer DEFAULT 0 NOT NULL,
     traces_count integer DEFAULT 0 NOT NULL,
     diary_entries_count integer DEFAULT 0 NOT NULL,
     image_use_gravatar boolean DEFAULT true NOT NULL,
-    image_content_type character varying(255)
+    image_content_type character varying
 );
 
 
@@ -1156,8 +1130,8 @@ CREATE TABLE way_nodes (
 
 CREATE TABLE way_tags (
     way_id bigint DEFAULT 0 NOT NULL,
-    k character varying(255) NOT NULL,
-    v character varying(255) NOT NULL,
+    k character varying NOT NULL,
+    v character varying NOT NULL,
     version bigint NOT NULL
 );