Merge branch 'master' into openstreetbugs

[rails.git] / config / locales / ia.yml

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index e95db28761c0b233f000473941ae5b7f92b8b9a0..9e82b21847debf888f71e1739d6e923a5606d4b7 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -103,14 +103,6 @@ ia:
         other: "Ha le sequente {{count}} vias:"
       no_bounding_box: Nulle quadro de delimitation ha essite memorisate pro iste gruppo de modificationes.
       show_area_box: Monstrar quadro del area
         other: "Ha le sequente {{count}} vias:"
       no_bounding_box: Nulle quadro de delimitation ha essite memorisate pro iste gruppo de modificationes.
       show_area_box: Monstrar quadro del area

-    changeset_navigation: 
-      all: 
-        next_tooltip: Gruppo de modificationes sequente
-        prev_tooltip: Gruppo de modificationes precedente
-      user: 
-        name_tooltip: Vider modifications per {{user}}
-        next_tooltip: Modification sequente per {{user}}
-        prev_tooltip: Modification precedente per {{user}}

     common_details: 
       changeset_comment: "Commento:"
       edited_at: "Modificate le:"
     common_details: 
       changeset_comment: "Commento:"
       edited_at: "Modificate le:"


@@ -128,6 +120,20 @@ ia:
         relation: Vider le relation in un carta plus grande
         way: Vider le via in un carta plus grande
       loading: Cargamento...
         relation: Vider le relation in un carta plus grande
         way: Vider le via in un carta plus grande
       loading: Cargamento...

+    navigation: 
+      all: 
+        next_changeset_tooltip: Gruppo de modificationes sequente
+        next_node_tooltip: Nodo sequente
+        next_relation_tooltip: Relation sequente
+        next_way_tooltip: Via sequente
+        prev_changeset_tooltip: Gruppo de modificationes precedente
+        prev_node_tooltip: Nodo precedente
+        prev_relation_tooltip: Relation precedente
+        prev_way_tooltip: Via precedente
+      user: 
+        name_changeset_tooltip: Vider modifications per {{user}}
+        next_changeset_tooltip: Modification sequente per {{user}}
+        prev_changeset_tooltip: Modification precedente per {{user}}

     node: 
       download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
       download_xml: Discargar XML
     node: 
       download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
       download_xml: Discargar XML


@@ -212,8 +218,12 @@ ia:
       zoom_or_select: Face zoom avante o selige un area del carta a visualisar
     tag_details: 
       tags: "Etiquettas:"
       zoom_or_select: Face zoom avante o selige un area del carta a visualisar
     tag_details: 
       tags: "Etiquettas:"

+      wiki_link: 
+        key: Le pagina wiki que describe le etiquetta {{key}}
+        tag: Le pagina wiki que describe le etiquetta {{key}}={{value}}
+      wikipedia_link: Le articulo {{page}} in Wikipedia

     timeout: 
     timeout: 

-      sorry: Pardono, le datos pro le {{type}} con le ID {{id} ha prendite troppo de tempore pro esser recuperate.
+      sorry: Pardono, le datos pro le {{type}} con le ID {{id}} ha prendite troppo de tempore pro esser recuperate.

       type: 
         changeset: gruppo de modificationes
         node: nodo
       type: 
         changeset: gruppo de modificationes
         node: nodo


@@ -331,7 +341,7 @@ ia:
       login: Aperir session
       login_to_leave_a_comment: "{{login_link}} pro lassar un commento"
       save_button: Salveguardar
       login: Aperir session
       login_to_leave_a_comment: "{{login_link}} pro lassar un commento"
       save_button: Salveguardar

-      title: Diarios de usatores | {{user}}
+      title: Diario de {{user}} | {{title}}

       user_title: Diario de {{user}}
   export: 
     start: 
       user_title: Diario de {{user}}
   export: 
     start: 


@@ -355,6 +365,9 @@ ia:
       output: Resultato
       paste_html: Colla HTML pro incorporar in sito web
       scale: Scala
       output: Resultato
       paste_html: Colla HTML pro incorporar in sito web
       scale: Scala

+      too_large: 
+        body: Iste area es troppo grande pro esser exportate como datos XML de OpenStreetMap. Per favor face zoom avante o selige un area minor.
+        heading: Area troppo grande

       zoom: Zoom
     start_rjs: 
       add_marker: Adder un marcator al carta
       zoom: Zoom
     start_rjs: 
       add_marker: Adder un marcator al carta


@@ -406,26 +419,165 @@ ia:
     search_osm_nominatim: 
       prefix: 
         amenity: 
     search_osm_nominatim: 
       prefix: 
         amenity: 

+          airport: Aeroporto
+          arts_centre: Centro artistic
+          atm: Cassa automatic
+          auditorium: Auditorio
+          bank: Banca
+          bar: Bar
+          bench: Banco
+          bicycle_parking: Stationamento pro bicyclettas
+          bicycle_rental: Location de bicyclettas
+          brothel: Bordello
+          bureau_de_change: Officio de cambio
+          bus_station: Station de autobus
+          cafe: Café
+          car_rental: Location de automobiles
+          car_sharing: Repartition de autos
+          car_wash: Carwash
+          casino: Casino
+          cinema: Cinema
+          clinic: Clinica
+          club: Club
+          college: Schola superior
+          community_centre: Centro communitari
+          courthouse: Tribunal
+          crematorium: Crematorio
+          dentist: Dentista
+          doctors: Medicos
+          dormitory: Dormitorio
+          drinking_water: Aqua potabile
+          driving_school: Autoschola
+          embassy: Ambassada
+          emergency_phone: Telephono de emergentia
+          fast_food: Fast food
+          ferry_terminal: Terminal de ferry
+          fire_hydrant: Hydrante de incendio
+          fire_station: Caserna de pumperos
+          fountain: Fontana

           fuel: Carburante
           fuel: Carburante

+          grave_yard: Cemeterio
+          gym: Centro de fitness / Gymnasio
+          hall: Hall
+          health_centre: Centro de sanitate
+          hospital: Hospital
+          hotel: Hotel
+          hunting_stand: Posto de cacia
+          ice_cream: Gelato
+          kindergarten: Schola pro juvene infantes
+          library: Bibliotheca
+          market: Mercato
+          marketplace: Mercato
+          mountain_rescue: Succurso de montania
+          nightclub: Club nocturne
+          nursery: Sala recreative pro parve infantes
+          nursing_home: Casa de convalescentia
+          office: Officio
+          park: Parco

           parking: Parking
           parking: Parking

+          pharmacy: Pharmacia
+          place_of_worship: Loco de adoration
+          police: Policia
+          post_box: Cassa postal
+          post_office: Officio postal
+          preschool: Pre-schola
+          prison: Prision
+          pub: Taverna
+          public_building: Edificio public
+          public_market: Mercato public
+          reception_area: Area de reception
+          recycling: Puncto de recyclage
+          restaurant: Restaurante
+          retirement_home: Residentia pro vetere personas
+          sauna: Sauna
+          school: Schola
+          shelter: Refugio
+          shop: Boteca
+          shopping: Compras
+          social_club: Club social
+          studio: Appartamento de un camera
+          supermarket: Supermercato
+          taxi: Taxi
+          telephone: Telephono public
+          theatre: Theatro
+          toilets: Toilettes
+          townhall: Casa municipal
+          university: Universitate
+          vending_machine: Distributor automatic
+          veterinary: Clinica veterinari
+          village_hall: Casa communal
+          waste_basket: Corbe a papiro
+          wifi: Accesso WiFi
+          youth_centre: Centro pro le juventute
+        boundary: 
+          administrative: Limite administrative
+        building: 
+          apartments: Bloco de appartamentos
+          chapel: Cappella
+          church: Ecclesia
+          city_hall: Casa municipal
+          commercial: Edificio commercial
+          entrance: Entrata de edificio
+          faculty: Edificio de facultate
+          farm: Edificio agricole
+          flats: Appartamentos
+          garage: Garage
+          hospital: Edificio hospitalari
+          hotel: Hotel
+          house: Casa
+          industrial: Edificio industrial
+          public: Edificio public
+          retail: Magazin
+          school: Edificio de schola
+          stadium: Stadio
+          store: Magazin
+          terrace: Terrassa
+          tower: Turre
+          train_station: Station ferroviari
+          university: Edificio de universitate
+          "yes": Edificio

         highway: 
         highway: 

+          bridleway: Sentiero pro cavallos
+          bus_guideway: Via guidate de autobus
+          bus_stop: Halto de autobus
+          byway: Via minor
+          construction: Strata in construction
+          cycleway: Pista cyclabile
+          distance_marker: Marcator de distantia
+          emergency_access_point: Puncto de accesso de emergentia
+          footway: Sentiero pro pedones
+          ford: Vado
+          gate: Porta a cancello
+          living_street: Strata residential

           minor: Via minor
           motorway: Autostrata
           motorway_junction: Junction de autostrata
           motorway_link: Via de communication a autostrata
           minor: Via minor
           motorway: Autostrata
           motorway_junction: Junction de autostrata
           motorway_link: Via de communication a autostrata

+          path: Sentiero
+          pedestrian: Via pro pedones
+          platform: Platteforma

           primary: Via principal
           primary_link: Via principal
           primary: Via principal
           primary_link: Via principal

+          raceway: Circuito
+          residential: Residential

           road: Via
           secondary: Via secundari
           secondary_link: Via secundari
           service: Via de servicio
           services: Servicios de autostrata
           road: Via
           secondary: Via secundari
           secondary_link: Via secundari
           service: Via de servicio
           services: Servicios de autostrata

+          steps: Scalones
+          stile: Scalon o apertura de passage

           tertiary: Via tertiari
           tertiary: Via tertiari

+          track: Pista
+          trail: Pista

           trunk: Via national
           trunk_link: Via national
           unclassified: Via non classificate
           unsurfaced: Cammino de terra
         landuse: 
           trunk: Via national
           trunk_link: Via national
           unclassified: Via non classificate
           unsurfaced: Cammino de terra
         landuse: 

+          commercial: Area commercial
+          farm: Ferma
+          military: Area militar

           nature_reserve: Reserva natural
         leisure: 
           beach_resort: Loco de vacantias al plagia
           nature_reserve: Reserva natural
         leisure: 
           beach_resort: Loco de vacantias al plagia


@@ -448,26 +600,44 @@ ia:
           track: Pista de athletismo
           water_park: Parco aquatic
         natural: 
           track: Pista de athletismo
           water_park: Parco aquatic
         natural: 

+          bay: Baia
+          beach: Plagia

           cape: Capo
           cave_entrance: Entrata de caverna
           cape: Capo
           cave_entrance: Entrata de caverna

+          channel: Canal
+          cliff: Precipitio
+          coastline: Linea de costa

           crater: Crater
           feature: Attraction
           fell: Montania
           crater: Crater
           feature: Attraction
           fell: Montania

+          fjord: Fiord
+          geyser: Geyser

           glacier: Glaciero
           heath: Landa
           hill: Collina
           island: Insula
           glacier: Glaciero
           heath: Landa
           hill: Collina
           island: Insula

+          land: Terra
+          marsh: Palude

           moor: Landa
           mud: Fango
           moor: Landa
           mud: Fango

+          peak: Picco
+          point: Puncto

           reef: Scolio
           reef: Scolio

+          ridge: Cresta

           river: Fluvio/Riviera
           rock: Rocca
           scree: Talus
           river: Fluvio/Riviera
           rock: Rocca
           scree: Talus

+          scrub: Arbusto

           shoal: Banco de sablo
           spring: Fontana
           shoal: Banco de sablo
           spring: Fontana

+          strait: Stricto

           tree: Arbore
           valley: Vallea
           tree: Arbore
           valley: Vallea

+          volcano: Vulcano
+          water: Aqua
+          wetland: Terra humide

           wetlands: Terreno paludose
           wetlands: Terreno paludose

+          wood: Bosco

         place: 
           airport: Aeroporto
           city: Citate
         place: 
           airport: Aeroporto
           city: Citate


@@ -491,6 +661,77 @@ ia:
           town: Urbe
           unincorporated_area: Area sin municipalitate
           village: Village
           town: Urbe
           unincorporated_area: Area sin municipalitate
           village: Village

+        shop: 
+          alcohol: Magazin de bibitas alcoholic
+          apparel: Boteca de vestimentos
+          art: Magazin de arte
+          bakery: Paneteria
+          beauty: Salon de beltate
+          beverages: Boteca de bibitas
+          bicycle: Magazin de bicyclettas
+          books: Libreria
+          butcher: Macelleria
+          car: Magazin de automobiles
+          car_dealer: Venditor de automobiles
+          car_parts: Partes de automobiles
+          car_repair: Reparation de automobiles
+          carpet: Magazin de tapetes
+          charity: Magazin de beneficentia
+          chemist: Pharmacia
+          clothes: Magazin de vestimentos
+          computer: Magazin de computatores
+          confectionery: Confecteria
+          convenience: Magazin de quartiero
+          copyshop: Centro de photocopias
+          cosmetics: Boteca de cosmetica
+          department_store: Grande magazin
+          discount: Boteca de disconto
+          doityourself: Magazin de bricolage
+          drugstore: Drogeria
+          dry_cleaning: Lavanderia a sic
+          electronics: Boteca de electronica
+          estate_agent: Agentia immobiliari
+          farm: Magazin agricole
+          fashion: Boteca de moda
+          fish: Pischeria
+          florist: Florista
+          food: Magazin de alimentation
+          funeral_directors: Directores de pompas funebre
+          furniture: Magazin de mobiles
+          gallery: Galeria
+          garden_centre: Jardineria
+          general: Magazin general
+          gift: Boteca de donos
+          greengrocer: Verdurero
+          grocery: Specieria
+          hairdresser: Perruccheria
+          hardware: Quincalieria
+          hifi: Hi-fi
+          insurance: Assecurantia
+          jewelry: Joieleria
+          kiosk: Kiosque
+          laundry: Lavanderia
+          mall: Galeria mercante
+          market: Mercato
+          mobile_phone: Boteca de telephonos mobile
+          motorcycle: Magazin de motocyclos
+          music: Magazin de musica
+          newsagent: Venditor de jornales
+          optician: Optico
+          organic: Boteca de alimentos organic
+          outdoor: Magazin de sport al aere libere
+          pet: Boteca de animales
+          photo: Magazin de photographia
+          salon: Salon
+          shoes: Scarperia
+          shopping_centre: Centro commercial
+          sports: Magazin de sport
+          stationery: Papireria
+          supermarket: Supermercato
+          toys: Magazin de joculos
+          travel_agency: Agentia de viages
+          video: Magazin de video
+          wine: Magazin de vinos

         tourism: 
           alpine_hut: Cabana alpin
           artwork: Obra de arte
         tourism: 
           alpine_hut: Cabana alpin
           artwork: Obra de arte


@@ -512,6 +753,27 @@ ia:
           valley: Valle
           viewpoint: Puncto de vista
           zoo: Zoo
           valley: Valle
           viewpoint: Puncto de vista
           zoo: Zoo

+        waterway: 
+          boatyard: Cantier naval
+          canal: Canal
+          connector: Connexion aquatic
+          dam: Dica
+          derelict_canal: Canal abandonate
+          ditch: Fossato
+          dock: Dock
+          drain: Aquiero
+          lock: Esclusa
+          lock_gate: Porta de esclusa
+          mineral_spring: Fonte de aqua mineral
+          mooring: Ammarrage
+          rapids: Rapidos
+          river: Fluvio/Riviera
+          riverbank: Ripa de fluvio/riviera
+          stream: Rivo
+          wadi: Wadi
+          water_point: Puncto de aqua
+          waterfall: Cascada
+          weir: Barrage

   javascripts: 
     map: 
       base: 
   javascripts: 
     map: 
       base: 


@@ -524,15 +786,13 @@ ia:
     donate: Supporta OpenStreetMap per {{link}} al Fundo de Actualisation de Hardware.
     donate_link_text: donation
     edit: Modificar
     donate: Supporta OpenStreetMap per {{link}} al Fundo de Actualisation de Hardware.
     donate_link_text: donation
     edit: Modificar

-    edit_tooltip: Modificar cartas

     export: Exportar
     export_tooltip: Exportar datos cartographic
     gps_traces: Tracias GPS
     export: Exportar
     export_tooltip: Exportar datos cartographic
     gps_traces: Tracias GPS

-    gps_traces_tooltip: Gerer tracias
+    gps_traces_tooltip: Gerer tracias GPS

     help_wiki: Adjuta & Wiki
     help_wiki_tooltip: Adjuta & sito Wiki pro le projecto
     history: Historia
     help_wiki: Adjuta & Wiki
     help_wiki_tooltip: Adjuta & sito Wiki pro le projecto
     history: Historia

-    history_tooltip: Historia del gruppo de modificationes

     home: initio
     home_tooltip: Ir al position de origine
     inbox: cassa de entrata ({{count}})
     home: initio
     home_tooltip: Ir al position de origine
     inbox: cassa de entrata ({{count}})


@@ -542,7 +802,9 @@ ia:
       zero: Tu cassa de entrata non contine messages non legite
     intro_1: OpenStreetMap es un carta libere e modificabile del mundo integre. Illo es facite per gente como te.
     intro_2: OpenStreetMap permitte vider, modificar e usar datos geographic de modo collaborative desde ubique in le mundo.
       zero: Tu cassa de entrata non contine messages non legite
     intro_1: OpenStreetMap es un carta libere e modificabile del mundo integre. Illo es facite per gente como te.
     intro_2: OpenStreetMap permitte vider, modificar e usar datos geographic de modo collaborative desde ubique in le mundo.

-    intro_3: Le albergamento de OpenStreetMap es gratiosemente supportate per le {{ucl}} e {{bytemark}}.
+    intro_3: Le albergamento de OpenStreetMap es gratiosemente supportate per le {{ucl}} e per {{bytemark}}. Altere sponsores del projecto es listate in le {{partners}}.
+    intro_3_bytemark: Bytemark
+    intro_3_ucl: Centro VR del UCL

     license: 
       title: Le datos de OpenStreetMap es disponibile sub le licentia Attribution-Share Alike 2.0 Generic de Creative Commons
     log_in: aperir session
     license: 
       title: Le datos de OpenStreetMap es disponibile sub le licentia Attribution-Share Alike 2.0 Generic de Creative Commons
     log_in: aperir session


@@ -567,13 +829,20 @@ ia:
     user_diaries: Diarios de usatores
     user_diaries_tooltip: Leger diarios de usatores
     view: Vider
     user_diaries: Diarios de usatores
     user_diaries_tooltip: Leger diarios de usatores
     view: Vider

-    view_tooltip: Vider cartas
+    view_tooltip: Vider le carta

     welcome_user: Benvenite, {{user_link}}
     welcome_user_link_tooltip: Tu pagina de usator
     welcome_user: Benvenite, {{user_link}}
     welcome_user_link_tooltip: Tu pagina de usator

-  map: 
-    coordinates: "Coordinatas:"
-    edit: Modificar
-    view: Vider
+  license_page: 
+    foreign: 
+      english_link: le original in anglese
+      text: In caso de un conflicto inter iste pagina traducite e {{english_original_link}}, le pagina in anglese prevalera.
+      title: A proposito de iste traduction
+    legal_babble: "<h2>Copyright e Licentia</h2>\n<p>\n   OpenStreetMap es <i>datos aperte</i>, disponibile sub le licentia\n   <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\n   Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).\n</p>\n<p>\n  Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n  e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n  contributores. Si vos altera o extende nostre cartas e datos, vos\n  pote distribuer le resultato solmente sub le mesme licentia. Le\n  complete <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/legalcode\">codice\n  legal</a> explica vostre derectos e responsabilitates.\n</p>\n\n<h3>Como dar recognoscentia a OpenStreetMap</h3>\n<p>\n  Si vos usa imagines del cartas de OpenStreetMap, nos requesta que\n  vostre recognoscentia indica al minus &ldquo;&copy; Contributores de\n  OpenStreetMap, CC-BY-SA&rdquo;. Si vos usa solmente datos cartographic,\n  nos requesta &ldquo;Datos cartographic &copy; Contributores de OpenStreetMap,\n  CC-BY-SA&rdquo;.\n</p>\n<p>\n  Si possibile, le parola OpenStreetMap debe esser un hyperligamine a <a\n  href=\"http://www.openstreetmap.org/\">http://www.openstreetmap.org/</a>\n  e le termino CC-BY-SA debe ligar a <a\n  href=\"http://creativecommons.org/licenses/by-sa/2.0/\">http://creativecommons.org/licenses/by-sa/2.0/</a>. Si\n  vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un\n  obra imprimite), nos suggere que vos dirige vostre lectores a\n  www.openstreetmap.org (possibilemente per expander\n  &lsquo;OpenStreetMap&rsquo; a iste adresse complete) e a\n  www.creativecommons.org.\n</p>\n\n<h3>Pro saper plus</h3>\n<p>\n  Lege plus super le uso de nostre datos al <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n  Legal</a>.\n</p>\n<p>\n  Le contributores de OSM es recordate de nunquam adder datos de alcun\n  fonte subjecte al derecto de autor (p.ex. Google Maps o cartas imprimite)\n  sin explicite permission del titulares del derecto de autor.\n</p>\n<p>\n  Ben que OpenStreetMap es datos aperte, nos non pote fornir un\n  API cartographic gratuite pro altere disveloppatores.\n\n  Vide nostre <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politica pro le uso del API</a>,\n  <a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politica pro le uso de tegulas</a>\n  e <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politica pro le uso de Nominatim</a>.\n</p>\n\n<h3>Nostre contributores</h3>\n<p>\n  Nostre licentia CC-BY-SA require que vos &ldquo;da al Autor\n  Original recognoscentia rationabile pro le medio que Vos\n  utilisa&rdquo;. Le cartographos individual de OSM non requesta un\n  recognoscentia excedente illo del &ldquo;Contributores de\n  OpenStreetMap&rdquo;, sed ubi datos de un agentia cartographic\n  national o altere fonte major ha essite includite in\n  OpenStreetMap, il pote esser rationabile dar les recognoscentia per\n  directemente reproducer lor recognoscentia o per ligar a illo in iste pagina.\n</p>\n\n<!--\nInformation pro redactores de iste pagina\n\nIn le sequente lista figura solmente le organisationes que require attribution\ncomo condition pro le uso de lor datos in OpenStreetMap. Isto non es un\ncatalogo general de datos importate, e non debe esser usate salvo si\nattribution es requirite pro conformitate con le licentia del datos\nimportate.\n\nOmne additiones hic debe esser discutite primo con le administratores de OSM.\n-->\n\n<ul id=\"contributors\">\n   <li><strong>Australia</strong>: Contine datos de suburbios a base\n   de datos del Australian Bureau of Statistics.</li>\n   <li><strong>Canada</strong>: Contine datos ab\n   GeoBase&reg;, GeoGratis (&copy; Department of Natural\n   Resources Canada), CanVec (&copy; Department of Natural\n   Resources Canada), e (Geography Division,\n   Statistics Canada).</li>\n   <li><strong>Nove Zelandia</strong>: Contine datos obtenite ex\n   Land Information New Zealand. Crown Copyright reservate.</li>\n   <li><strong>Regno Unite</strong>: Contine datos de Ordnance\n   Survey &copy; Crown copyright e derecto de base de datos\n   2010.</li>\n</ul>\n\n<p>\n  Le inclusion de datos in OpenStreetMap non implica que le fornitor\n  original del datos indorsa OpenStreetMap, forni alcun garantia, o\n  accepta alcun responsabilitate.\n</p>"
+    native: 
+      mapping_link: comenciar le cartographia
+      native_link: version in interlingua
+      text: Tu vide nunc le version in anglese del pagina de copyright. Tu pote retornar al {{native_link}} de iste pagina o tu pote cessar de leger super copyright e {{mapping_link}}.
+      title: A proposito de iste pagina

   message: 
     delete: 
       deleted: Message delite
   message: 
     delete: 
       deleted: Message delite


@@ -605,9 +874,9 @@ ia:
       subject: Subjecto
       title: Inviar message
     no_such_user: 
       subject: Subjecto
       title: Inviar message
     no_such_user: 

-      body: Pardono, il non ha un usator o message con iste nomine o ID.
-      heading: Nulle tal usator o message
-      title: Nulle tal usator o message
+      body: Regrettabilemente, il non ha un usator o message con iste nomine.
+      heading: Iste usator non existe
+      title: Iste usator non existe

     outbox: 
       date: Data
       inbox: cassa de entrata
     outbox: 
       date: Data
       inbox: cassa de entrata


@@ -651,8 +920,9 @@ ia:
       hopefully_you_1: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail a
       hopefully_you_2: "{{server_url}} a {{new_address}}."
     friend_notification: 
       hopefully_you_1: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail a
       hopefully_you_2: "{{server_url}} a {{new_address}}."
     friend_notification: 

+      befriend_them: Tu pote equalmente adder le/la como amico a {{befriendurl}}.

       had_added_you: "{{user}} te ha addite como amico in OpenStreetMap."
       had_added_you: "{{user}} te ha addite como amico in OpenStreetMap."

-      see_their_profile: Tu pote vider su profilo a {{userurl}} e adder le/la tamben como amico si tu lo vole.
+      see_their_profile: Tu pote vider su profilo a {{userurl}}.

       subject: "[OpenStreetMap] {{user}} te ha addite como amico"
     gpx_notification: 
       and_no_tags: e sin etiquettas.
       subject: "[OpenStreetMap] {{user}} te ha addite como amico"
     gpx_notification: 
       and_no_tags: e sin etiquettas.


@@ -721,7 +991,7 @@ ia:
       allow_to: "Permitter al application cliente:"
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
       allow_to: "Permitter al application cliente:"
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.

-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.

       allow_write_prefs: modificar tu preferentias de usator.
       request_access: Le application {{app_name}} requesta accesso a tu conto. Per favor verifica si tu vole que le application ha le sequente capabilitates. Tu pote seliger tantes o si poches como tu vole.
     revoke: 
       allow_write_prefs: modificar tu preferentias de usator.
       request_access: Le application {{app_name}} requesta accesso a tu conto. Per favor verifica si tu vole que le application ha le sequente capabilitates. Tu pote seliger tantes o si poches como tu vole.
     revoke: 


@@ -739,7 +1009,7 @@ ia:
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.

-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.

       allow_write_prefs: modificar su preferentias de usator.
       callback_url: URL de reappello
       name: Nomine
       allow_write_prefs: modificar su preferentias de usator.
       callback_url: URL de reappello
       name: Nomine


@@ -769,7 +1039,7 @@ ia:
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.

-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.

       allow_write_prefs: modificar su preferentias de usator.
       authorize_url: "URL de autorisation:"
       edit: Modificar detalios
       allow_write_prefs: modificar su preferentias de usator.
       authorize_url: "URL de autorisation:"
       edit: Modificar detalios


@@ -878,10 +1148,13 @@ ia:
     sidebar: 
       close: Clauder
       search_results: Resultatos del recerca
     sidebar: 
       close: Clauder
       search_results: Resultatos del recerca

+  time: 
+    formats: 
+      friendly: "%e %B %Y a %H:%M"

   trace: 
     create: 
   trace: 
     create: 

-      trace_uploaded: Tu file GPX ha essite cargate e attende insertion in le base de datos. Isto prende generalmente minus de un medie hora, e un e-mail te essera inviate al completion.
-      upload_trace: Cargar tracia GPS
+      trace_uploaded: Tu file GPX ha essite incargate e attende insertion in le base de datos. Isto prende generalmente minus de un medie hora, e un e-mail te essera inviate al completion.
+      upload_trace: Incargar tracia GPS

     delete: 
       scheduled_for_deletion: Tracia programmate pro deletion
     edit: 
     delete: 
       scheduled_for_deletion: Tracia programmate pro deletion
     edit: 


@@ -893,12 +1166,12 @@ ia:
       map: carta
       owner: "Proprietario:"
       points: "Punctos:"
       map: carta
       owner: "Proprietario:"
       points: "Punctos:"

-      save_button: Immagazinar modificationes
+      save_button: Salveguardar modificationes

       start_coord: "Coordinata initial:"
       tags: "Etiquettas:"
       tags_help: separate per commas
       title: Modification del tracia {{name}}
       start_coord: "Coordinata initial:"
       tags: "Etiquettas:"
       tags_help: separate per commas
       title: Modification del tracia {{name}}

-      uploaded_at: "Cargate le:"
+      uploaded_at: "Incargate le:"

       visibility: "Visibilitate:"
       visibility_help: que significa isto?
     list: 
       visibility: "Visibilitate:"
       visibility_help: que significa isto?
     list: 


@@ -914,9 +1187,9 @@ ia:
       title: Nulle tal usator
     offline: 
       heading: Immagazinage GPX foras de linea
       title: Nulle tal usator
     offline: 
       heading: Immagazinage GPX foras de linea

-      message: Le systema pro immagazinar e cargar files GPX es actualmente indisponibile.
+      message: Le systema pro immagazinar e incargar files GPX es actualmente indisponibile.

     offline_warning: 
     offline_warning: 

-      message: Le systema pro cargar files GPX es actualmente indisponibile
+      message: Le systema pro incargar files GPX es actualmente indisponibile

     trace: 
       ago: "{{time_in_words_ago}} retro"
       by: per
     trace: 
       ago: "{{time_in_words_ago}} retro"
       by: per


@@ -938,15 +1211,15 @@ ia:
       help: Adjuta
       tags: Etiquettas
       tags_help: separate per commas
       help: Adjuta
       tags: Etiquettas
       tags_help: separate per commas

-      upload_button: Cargar
-      upload_gpx: Cargar file GPX
+      upload_button: Incargar
+      upload_gpx: Incargar file GPX

       visibility: Visibilitate
       visibility_help: que significa isto?
     trace_header: 
       see_all_traces: Vider tote le tracias
       visibility: Visibilitate
       visibility_help: que significa isto?
     trace_header: 
       see_all_traces: Vider tote le tracias

-      see_just_your_traces: Vider solo tu tracias, o cargar un tracia
+      see_just_your_traces: Vider solo tu tracias, o incargar un tracia

       see_your_traces: Vider tote tu tracias
       see_your_traces: Vider tote tu tracias

-      traces_waiting: Tu ha {{count}} tracias attendente cargamento. Per favor considera attender le completion de istes ante de cargar alteres, pro non blocar le cauda pro altere usatores.
+      traces_waiting: Tu ha {{count}} tracias attendente incargamento. Per favor considera attender le completion de istes ante de incargar alteres, pro non blocar le cauda pro altere usatores.

     trace_optionals: 
       tags: Etiquettas
     trace_paging_nav: 
     trace_optionals: 
       tags: Etiquettas
     trace_paging_nav: 


@@ -970,7 +1243,7 @@ ia:
       tags: "Etiquettas:"
       title: Visualisation del tracia {{name}}
       trace_not_found: Tracia non trovate!
       tags: "Etiquettas:"
       title: Visualisation del tracia {{name}}
       trace_not_found: Tracia non trovate!

-      uploaded: "Cargate le:"
+      uploaded: "Incargate le:"

       visibility: "Visibilitate:"
     visibility: 
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile, punctos ordinate con datas e horas)
       visibility: "Visibilitate:"
     visibility: 
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile, punctos ordinate con datas e horas)


@@ -980,15 +1253,20 @@ ia:
   user: 
     account: 
       current email address: "Adresse de e-mail actual:"
   user: 
     account: 
       current email address: "Adresse de e-mail actual:"

+      delete image: Remover le imagine actual

       email never displayed publicly: (nunquam monstrate publicamente)
       flash update success: Informationes del usator actualisate con successo.
       flash update success confirm needed: Informationes del usator actualisate con successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
       home location: "Position de origine:"
       email never displayed publicly: (nunquam monstrate publicamente)
       flash update success: Informationes del usator actualisate con successo.
       flash update success confirm needed: Informationes del usator actualisate con successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
       home location: "Position de origine:"

+      image: "Imagine:"
+      image size hint: (imagines quadrate de al minus 100×100 functiona melio)
+      keep image: Retener le imagine actual

       latitude: "Latitude:"
       longitude: "Longitude:"
       make edits public button: Render tote mi modificationes public
       my settings: Mi configurationes
       new email address: "Adresse de e-mail nove:"
       latitude: "Latitude:"
       longitude: "Longitude:"
       make edits public button: Render tote mi modificationes public
       my settings: Mi configurationes
       new email address: "Adresse de e-mail nove:"

+      new image: Adder un imagine

       no home location: Tu non ha entrate tu position de origine.
       preferred languages: "Linguas preferite:"
       profile description: "Description del profilo:"
       no home location: Tu non ha entrate tu position de origine.
       preferred languages: "Linguas preferite:"
       profile description: "Description del profilo:"


@@ -1002,8 +1280,9 @@ ia:
       public editing note: 
         heading: Modification public
         text: A iste momento tu modificationes es anonyme, e le gente non pote inviar te messages ni vider tu position. Pro poter monstrar tu contributiones e pro permitter al gente de contactar te per le sito web, clicca le button ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar datos cartographic</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">lege proque</a>).<ul><li>Tu adresse de e-mail non essera revelate si tu deveni public.</li><li>Iste action non pote esser revertite e tote le nove usatores es ora public per predefinition.</li></ul>
       public editing note: 
         heading: Modification public
         text: A iste momento tu modificationes es anonyme, e le gente non pote inviar te messages ni vider tu position. Pro poter monstrar tu contributiones e pro permitter al gente de contactar te per le sito web, clicca le button ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar datos cartographic</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">lege proque</a>).<ul><li>Tu adresse de e-mail non essera revelate si tu deveni public.</li><li>Iste action non pote esser revertite e tote le nove usatores es ora public per predefinition.</li></ul>

+      replace image: Reimplaciar le imagine actual

       return to profile: Retornar al profilo
       return to profile: Retornar al profilo

-      save changes button: Immagazinar modificationes
+      save changes button: Salveguardar modificationes

       title: Modificar conto
       update home location on click: Actualisar le position de origine quando io clicca super le carta?
     confirm: 
       title: Modificar conto
       update home location on click: Actualisar le position de origine quando io clicca super le carta?
     confirm: 


@@ -1020,9 +1299,6 @@ ia:
       success: Tu adresse de e-mail ha essite confirmate, gratias pro inscriber te!
     filter: 
       not_an_administrator: Tu debe esser administrator pro executar iste action.
       success: Tu adresse de e-mail ha essite confirmate, gratias pro inscriber te!
     filter: 
       not_an_administrator: Tu debe esser administrator pro executar iste action.

-    friend_map: 
-      nearby mapper: "Cartographo vicin: [[nearby_user]]"
-      your location: Tu position

     go_public: 
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission de modificar.
     login: 
     go_public: 
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission de modificar.
     login: 


@@ -1035,7 +1311,12 @@ ia:
       lost password link: Tu perdeva le contrasigno?
       password: "Contrasigno:"
       please login: Per favor aperi un session o {{create_user_link}}.
       lost password link: Tu perdeva le contrasigno?
       password: "Contrasigno:"
       please login: Per favor aperi un session o {{create_user_link}}.

+      remember: "Memorar me:"

       title: Aperir session
       title: Aperir session

+    logout: 
+      heading: Clauder le session de OpenStreetMap
+      logout_button: Clauder session
+      title: Clauder session

     lost_password: 
       email address: "Adresse de e-mail:"
       heading: Contrasigno oblidate?
     lost_password: 
       email address: "Adresse de e-mail:"
       heading: Contrasigno oblidate?


@@ -1068,6 +1349,10 @@ ia:
       body: Non existe un usator con le nomine {{user}}. Per favor verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
       heading: Le usator {{user}} non existe
       title: Nulle tal usator
       body: Non existe un usator con le nomine {{user}}. Per favor verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
       heading: Le usator {{user}} non existe
       title: Nulle tal usator

+    popup: 
+      friend: Amico
+      nearby mapper: Cartographo vicin
+      your location: Tu position

     remove_friend: 
       not_a_friend: "{{name}} non es un de tu amicos."
       success: "{{name}} ha essite removite de tu amicos."
     remove_friend: 
       not_a_friend: "{{name}} non es un de tu amicos."
       success: "{{name}} ha essite removite de tu amicos."


@@ -1084,17 +1369,14 @@ ia:
     view: 
       activate_user: activar iste usator
       add as friend: adder como amico
     view: 
       activate_user: activar iste usator
       add as friend: adder como amico

-      add image: Adder imagine

       ago: ({{time_in_words_ago}} retro)
       block_history: vider blocadas recipite
       blocks by me: blocadas per me
       blocks on me: blocadas super me
       ago: ({{time_in_words_ago}} retro)
       block_history: vider blocadas recipite
       blocks by me: blocadas per me
       blocks on me: blocadas super me

-      change your settings: cambiar tu configurationes

       confirm: Confirmar
       create_block: blocar iste usator
       created from: "Create ex:"
       deactivate_user: disactivar iste usator
       confirm: Confirmar
       create_block: blocar iste usator
       created from: "Create ex:"
       deactivate_user: disactivar iste usator

-      delete image: Deler imagine

       delete_user: deler iste usator
       description: Description
       diary: diario
       delete_user: deler iste usator
       description: Description
       diary: diario


@@ -1110,12 +1392,11 @@ ia:
       my edits: mi modificationes
       my settings: mi configurationes
       my traces: mi tracias
       my edits: mi modificationes
       my settings: mi configurationes
       my traces: mi tracias

-      my_oauth_details: Vider mi detalios OAuth
-      nearby users: "Usatores vicin:"
+      nearby users: Altere usatores vicin

       new diary entry: nove entrata de diario
       no friends: Tu non ha ancora addite alcun amico.
       new diary entry: nove entrata de diario
       no friends: Tu non ha ancora addite alcun amico.

-      no home location: Nulle position de origine ha essite definite.
-      no nearby users: Il non ha ancora cartographos in le vicinitate.
+      no nearby users: Il non ha ancora altere cartographos in le vicinitate.
+      oauth settings: configuration oauth

       remove as friend: remover como amico
       role: 
         administrator: Iste usator es un administrator
       remove as friend: remover como amico
       role: 
         administrator: Iste usator es un administrator


@@ -1130,8 +1411,6 @@ ia:
       settings_link_text: configurationes
       traces: tracias
       unhide_user: revelar iste usator
       settings_link_text: configurationes
       traces: tracias
       unhide_user: revelar iste usator

-      upload an image: Cargar un imagine
-      user image heading: Imagine del usator

       user location: Position del usator
       your friends: Tu amicos
   user_block: 
       user location: Position del usator
       your friends: Tu amicos
   user_block: