Localisation updates from translatewiki.net (2010-02-11)

diff --git a/config/locales/af.yml b/config/locales/af.yml
index c955f91a4b77340c3bd4e98a9c14660e56c2f85f..e7bbe8d2f27628148c4f9b614098f5bee479e173 100644 (file)
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -276,7 +276,7 @@ af:
       login: Teken in
       login_to_leave_a_comment: U moet eers {{login_link}} alvorens u kommentaar kan lewer
       save_button: Stoor
-      title: Gebruikersdagboeke | {{user}}
+      title: "{{user}} se dagboek | {{title}}"
       user_title: Dagboek van {{user}}
   export: 
     start: 
@@ -748,7 +748,7 @@ af:
       zero: U inboks bevat geen ongelees boodskappe nie
     intro_1: OpenStreetMap is 'n vry bewerkbare kaart van die hele wêreld. Dit word deur mense soos u geskep.
     intro_2: Met OpenStreetMap kan u geografiese data van die hele aarde sien, wysig en gebruik.
-    intro_3: OpenStreetMap se webwerf word deur {{ucl}} en {{bytemark}} ondersteun.
+    intro_3: OpenStreetMap se webwerf word ondersteun deur {{ucl}} en {{bytemark}}. Ander ondersteuners word by {{partners}} gelys.
     log_in: Teken in
     log_in_tooltip: Teken aan met 'n bestaande rekening
     logo: 

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 8a798796106c51a47db2b43071d63c0c1e031a8c..20457e0d008ef7267cdc97df826163044740506b 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -257,6 +257,7 @@ ca:
       export_button: Exporta
       export_details: Les dades l'OpenStreetMap són publicades sota el termes de la <a href="http://creativecommons.org/licenses/by-sa/2.0/">llicència Creative Commons Attribution-ShareAlike 2.0</a>.
       format: Format
+      image_size: Mida de la imatge
       latitude: "Lat:"
       licence: Llicència
       longitude: "Lon:"
@@ -283,6 +284,14 @@ ca:
       south_east: sud-est
       south_west: sud-oest
       west: oest
+    search: 
+      title: 
+        ca_postcode: Resultats de <a href="http://geocoder.ca/">Geocoder.CA</a>
+        latlon: Resultats <a href="http://openstreetmap.org/">propis</a>
+        osm_namefinder: Resultats de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>
+        osm_nominatim: Resultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap nominatim</a>
+        uk_postcode: Resultats de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
+        us_postcode: Resultats de <a href="http://geocoder.us/">Geocoder.us</a>
     search_osm_namefinder: 
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} de {{parentname}})"
       suffix_place: ", {{distance}} {{direction}} de {{placename}}"
@@ -576,6 +585,7 @@ ca:
       email never displayed publicly: (no es mostrarà mai en públic)
       latitude: "Latitud:"
       longitude: "Longitud:"
+      my settings: La meva configuració
       preferred languages: "Llengües preferents:"
       public editing: 
         enabled link text: què és això?
@@ -600,6 +610,7 @@ ca:
     lost_password: 
       email address: "Adreça de correu electrònic:"
       heading: Heu oblidat la contrasenya?
+      new password button: Restablir contrasenya
     make_friend: 
       success: "{{name}} ara és el vostre amic."
     new: 
@@ -611,8 +622,10 @@ ca:
     reset_password: 
       confirm password: "Confirmeu la contrasenya:"
       flash changed: S'ha canviat la contrasenya.
+      heading: Restablir la contrasenya per {{user}}
       password: "Contrasenya:"
-      title: Reinicialitza la contrasenya
+      reset: Restablir contrasenya
+      title: Restablir la contrasenya
     view: 
       add image: Afegeix una imatge
       confirm: Confirmeu

diff --git a/config/locales/es.yml b/config/locales/es.yml
index af81b71eb2a95a7270a697716f4d7f77dfac187d..56c36f6e134c13bfd05219af04997447a2ae3fb6 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -333,7 +333,7 @@ es:
       login: Identifíquese
       login_to_leave_a_comment: "{{login_link}} para dejar un comentario"
       save_button: Guardar
-      title: Diarios de usuarios | {{user}}
+      title: Diario de {{user}} | {{title}}
       user_title: Diario de {{user}}
   export: 
     start: 
@@ -1313,6 +1313,7 @@ es:
       trackable: Trazable (solo compartido como anonimo, puntos ordenados con marcas de tiempo)
   user: 
     account: 
+      current email address: "Dirección de correo electrónico actual:"
       email never displayed publicly: (nunca es mostrado públicamente)
       flash update success: La información del usuario se ha actualizado correctamente.
       flash update success confirm needed: La información del usuario se ha actualizado correctamente. Compruebe su correo electrónico para ver una nota sobre cómo confirmar su nueva dirección de correo electrónico.
@@ -1321,6 +1322,7 @@ es:
       longitude: "Longitud:"
       make edits public button: Hacer que todas mis ediciones sean públicas
       my settings: Mis preferencias
+      new email address: "Nueva dirección de correo electrónico:"
       no home location: No has introducido tu lugar de origen.
       preferred languages: "Idiomas preferidos:"
       profile description: "Descripción del perfil:"

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b76ab4bc877b9a310f2b6805abc6ffc0e38f8dec..910f45fd7ae7dcc494f4533153a87cfe36f11097 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -337,7 +337,7 @@ fr:
       login: Connectez-vous
       login_to_leave_a_comment: "{{login_link}} pour ajouter un commentaire"
       save_button: Enregistrer
-      title: Journaux des utilisateurs | {{user}}
+      title: Journal de {{user}} | {{title}}
       user_title: Journal de {{user}}
   export: 
     start: 
@@ -876,7 +876,8 @@ fr:
       zero: Votre boîte aux lettres ne contient pas de messages non lus
     intro_1: OpenStreetMap est une carte du monde entier librement modifiable, faite par des gens comme vous.
     intro_2: OpenStreetMap vous permet de voir, modifier et utiliser des données géographiques de n'importe quel endroit dans le monde.
-    intro_3: OpenStreetMap est gracieusement hébergé par {{ucl}} et {{bytemark}}.
+    intro_3: OpenStreetMap est gracieusement hébergé par {{ucl}} et {{bytemark}}. D'autres sponsors du projet sont listés sur le {{partners}}.
+    intro_3_partners: wiki
     license: 
       title: Les données OpenStreetMap sont sous licence générale Creative Commons paternité partage à l’identique 2.0
     log_in: Connexion

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index e7725b4b8309ff8ec5a1bfe30d1dea4136d30158..aeff9210d947bf020d47b05c1fb2b8cd6b08f9ba 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -250,7 +250,7 @@ fur:
       login: Jentre
       login_to_leave_a_comment: "{{login_link}} par lassâ un coment"
       save_button: Salve
-      title: Diaris dai utents | {{user}}
+      title: Diari di {{user}} | {{title}}
       user_title: Diari di {{user}}
   export: 
     start: 
@@ -320,26 +320,42 @@ fur:
     search_osm_nominatim: 
       prefix: 
         amenity: 
+          airport: Aeropuart
+          atm: Bancomat
           bank: Bancje
           bus_station: Stazion des corieris
+          car_wash: Lavaç machinis
           cinema: Cine
           dentist: Dentist
+          doctors: Dotôrs
+          drinking_water: Aghe potabil
           driving_school: Scuele guide
           embassy: Ambassade
           emergency_phone: Telefon di emergjence
+          fuel: Stazion di riforniment
+          hospital: Ospedâl
+          library: Biblioteche
           market: Marcjât
           park: Parc
+          pharmacy: Farmacie
           post_office: Pueste
           restaurant: Ristorant
+          sauna: Saune
           school: Scuele
+          telephone: Telefon public
           theatre: Teatri
           townhall: Municipi
           university: Universitât
           youth_centre: Centri zovanîl
+        boundary: 
+          administrative: Confin aministratîf
         building: 
           chapel: Capele
           church: Glesie
+          train_station: Stazion de ferade
         highway: 
+          bus_stop: Fermade autobus
+          emergency_access_point: Pont di acès di emergjence
           raceway: Circuit
           steps: Scjalis
         historic: 
@@ -349,14 +365,29 @@ fur:
           tower: Tor
         landuse: 
           cemetery: Simiteri
+          industrial: Aree industriâl
+          nature_reserve: Riserve naturâl
           park: Parc
+          residential: Aree residenziâl
         leisure: 
           garden: Zardin
+          golf_course: Troi di golf
+          miniature_golf: Minigolf
           park: Parc
+          sports_centre: Centri sportîf
+          swimming_pool: Pissine
         natural: 
+          bay: Rade
+          channel: Canâl
+          crater: Cratêr
+          glacier: Glaçâr
           island: Isule
+          point: Pont
+          tree: Arbul
+          valley: Val
           volcano: Vulcan
         place: 
+          airport: Aeropuart
           city: Citât
           country: Paîs
           county: Contee
@@ -367,17 +398,23 @@ fur:
           locality: Localitât
           postcode: Codis postâl
           region: Regjon
+          sea: Mâr
           state: Stât
           town: Citadine
           village: Vilaç
         shop: 
           bakery: Pancôr
           butcher: Becjarie
+          supermarket: Supermarcjât
+          toys: Negozi di zugatui
         tourism: 
           museum: Museu
           valley: Val
+          viewpoint: Pont panoramic
+          zoo: Zoo
         waterway: 
           canal: Canâl
+          river: Flum
   javascripts: 
     map: 
       base: 
@@ -408,7 +445,8 @@ fur:
       zero: Nol è nissun messaç di lei te pueste in jentrade
     intro_1: OpenStreetMap al è une mape libare e modificabile dal marimont. Al è fat di int come te.
     intro_2: OpenStreetMap al permet a ogni persone su la Tiere di viodi, cambiâ e doprâ i dâts gjeografics intune forme colaborative.
-    intro_3: L'hosting di OpenStreetMap al è sostignût cun gjenerositât di {{ucl}} e {{bytemark}}.
+    intro_3: "L'hosting di OpenStreetMap al è sostignût cun gjenerositât di {{ucl}} e {{bytemark}}.\nAltris sostegnidôrs a son elencâts te {{partners}}."
+    intro_3_partners: vichi
     license: 
       title: I dâts di OpenStreetMap a son dâts fûr sot de Creative Commons Attribution-Share Alike 2.0 Generic License
     log_in: jentre
@@ -695,6 +733,8 @@ fur:
       add image: Zonte figure
       ago: ({{time_in_words_ago}} fa)
       block_history: viôt i blocs ricevûts
+      blocks by me: blocs aplicâts di me
+      blocks on me: blocs su di me
       change your settings: cambie lis tôs impostazions
       confirm: Conferme
       create_block: bloche chest utent
@@ -708,6 +748,7 @@ fur:
       km away: a {{count}}km di distance
       m away: "{{count}}m di distance"
       mapper since: "Al mape dai:"
+      moderator_history: viôt i blocs ricevûts
       my diary: il gno diari
       my edits: miei cambiaments
       my settings: mês impostazions

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 9d2c2be773fb69d9a8d6f8cdfc58a66f4514486d..e95db28761c0b233f000473941ae5b7f92b8b9a0 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -212,6 +212,13 @@ ia:
       zoom_or_select: Face zoom avante o selige un area del carta a visualisar
     tag_details: 
       tags: "Etiquettas:"
+    timeout: 
+      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
+        relation: relation
+        way: via
     way: 
       download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
       download_xml: Discargar XML
@@ -443,17 +450,24 @@ ia:
         natural: 
           cape: Capo
           cave_entrance: Entrata de caverna
+          crater: Crater
           feature: Attraction
           fell: Montania
+          glacier: Glaciero
+          heath: Landa
           hill: Collina
           island: Insula
           moor: Landa
           mud: Fango
+          reef: Scolio
           river: Fluvio/Riviera
           rock: Rocca
           scree: Talus
+          shoal: Banco de sablo
           spring: Fontana
           tree: Arbore
+          valley: Vallea
+          wetlands: Terreno paludose
         place: 
           airport: Aeroporto
           city: Citate
@@ -909,6 +923,7 @@ ia:
       count_points: "{{count}} punctos"
       edit: modificar
       edit_map: Modificar carta
+      identifiable: IDENTIFICABILE
       in: in
       map: carta
       more: plus
@@ -916,6 +931,7 @@ ia:
       private: PRIVATE
       public: PUBLIC
       trace_details: Vider detalios del tracia
+      trackable: TRACIABILE
       view_map: Vider carta
     trace_form: 
       description: Description
@@ -933,6 +949,10 @@ ia:
       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.
     trace_optionals: 
       tags: Etiquettas
+    trace_paging_nav: 
+      next: Sequente »
+      previous: "« Precedente"
+      showing_page: Pagina {{page}} monstrate
     view: 
       delete_track: Deler iste tracia
       description: "Description:"
@@ -959,6 +979,7 @@ ia:
       trackable: Traciabile (solmente condividite como anonymo, punctos ordinate con datas e horas)
   user: 
     account: 
+      current email address: "Adresse de e-mail 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.
@@ -967,6 +988,7 @@ ia:
       longitude: "Longitude:"
       make edits public button: Render tote mi modificationes public
       my settings: Mi configurationes
+      new email address: "Adresse de e-mail nove:"
       no home location: Tu non ha entrate tu position de origine.
       preferred languages: "Linguas preferite:"
       profile description: "Description del profilo:"

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 80099bd862e070d3d680d6cac44e43c2c46ffa5e..e57075e0dee605c1bcc0a13873ea16cf282e77eb 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -331,7 +331,7 @@ mk:
       login: Најавување
       login_to_leave_a_comment: "{{login_link}} за да оставите коментар"
       save_button: Зачувај
-      title: Ð\9aоÑ\80иÑ\81ниÑ\87ки дневниÑ\86и | {{user}}
+      title: Ð\94невникоÑ\82 на {{user}} | {{title}}
       user_title: дневник на {{user}}
   export: 
     start: 

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 346ccb75402476d90d8649897c6ce47b7a80366f..359cce28b44a2a52ecbd65293605476fbb4a506b 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -334,7 +334,7 @@ nl:
       login: aanmelden
       login_to_leave_a_comment: U moet moet zich {{login_link}} om te kunnen reageren
       save_button: Opslaan
-      title: Gebruikersdagboeken | {{user}}
+      title: Gebruikersdagboek van {{user}} | {{title}}
       user_title: Dagboek van {{user}}
   export: 
     start: 
@@ -1312,6 +1312,7 @@ nl:
       trackable: Traceerbaar (alleen gedeeld als anoniem; geordende punten met tijdstempels)
   user: 
     account: 
+      current email address: "Huidige e-mailadres:"
       email never displayed publicly: (nooit openbaar gemaakt)
       flash update success: De gebruikersinformatie is bijgewerkt.
       flash update success confirm needed: De gebruikersinformatie is bijgewerkt. Controleer uw e-mail om uw nieuwe e-mailadres te bevestigen.
@@ -1320,6 +1321,7 @@ nl:
       longitude: "Lengtegraad:"
       make edits public button: Al mijn wijzigingen  openbaar maken
       my settings: Mijn instellingen
+      new email address: "Nieuw e-mailadres:"
       no home location: Er is geen thuislocatie ingevoerd.
       preferred languages: "Voorkeurstalen:"
       profile description: "Profielbeschrijving:"

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b3ace69d69c37ce6a492f0597c09239ea80e8ee9..f44c3a116e0ffa8fceb3d910dd02feee9723aeef 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: syck
 # Author: BdgwksxD
+# Author: Soeb
 # Author: Sp5uhe
 # Author: Wpedzich
 # Author: Yarl
@@ -1059,6 +1060,13 @@ pl:
   oauth_clients: 
     edit: 
       submit: Edytuj
+    form: 
+      required: Wymagane
+    index: 
+      application: Nazwa aplikacji
+      revoke: Odwołaj!
+    show: 
+      edit: Edytuj szczegóły
   site: 
     edit: 
       anon_edits_link_text: Tu dowiesz się dlaczego.
@@ -1443,6 +1451,9 @@ pl:
     model: 
       non_moderator_revoke: Musisz być moderatorem, żeby odwoływać blokady.
       non_moderator_update: Musisz być moderatorem, żeby ustalać i edytować blokady.
+    new: 
+      back: Zobacz wszystkie blokady
+      submit: Utwórz blokadę
     not_found: 
       back: Powrót do spisu
       sorry: Niestety, nie udało się odnaleźć blokady użytkownika o identyfikatorze {{id}}.
@@ -1482,6 +1493,8 @@ pl:
       time_future: Blokada wygasa {{time}}
       time_past: Zakończona {{time}} temu
       title: "{{block_on}} zablokowany przez użytkownika {{block_by}}"
+    update: 
+      success: Blokada zaktualizowana.
   user_role: 
     filter: 
       already_has_role: Użytkownik ma już rolę {{role}}.

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index d32b7fa32184ce1763e5334b7edf3115323abd67..b5d6b6ce1272fc1afaacf0b91b9c69ead50d7618 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -337,7 +337,7 @@ pt-BR:
       login: Entrar
       login_to_leave_a_comment: "{{login_link}} para deixar um comentário"
       save_button: Salvar
-      title: Diários dos usuários | {{user}}
+      title: Diário de {{user}} | {{title}}
       user_title: Diário de {{user}}
   export: 
     start: 
@@ -454,6 +454,7 @@ pt-BR:
           fuel: Combustível
           grave_yard: Cemitério
           gym: Ginásio
+          hall: Salão
           health_centre: Centro de saúde
           hospital: Hospital
           hotel: Hotel
@@ -535,11 +536,14 @@ pt-BR:
           cycleway: Ciclovia
           distance_marker: Marcador de quilometragem
           emergency_access_point: Acesso de emergência
+          footway: Caminho
           gate: Portão
           living_street: Rua residencial
           motorway: Rodovia expressa
+          motorway_junction: Trevo de Acesso
           path: Caminho
           pedestrian: Rua de pedestres
+          platform: Plataforma
           primary: Via Primária
           primary_link: Via Primária
           raceway: Pista de corrida
@@ -578,6 +582,7 @@ pt-BR:
           grass: Gramado
           industrial: Área industrial
           landfill: Aterro sanitário
+          meadow: Gramado
           military: Área militar
           mine: Mina
           mountain: Montanha
@@ -591,6 +596,7 @@ pt-BR:
           vineyard: Vinhedo
           wetland: Pântano / Mangue
         leisure: 
+          beach_resort: Balneário
           fishing: Área de pesca
           garden: Jardim
           golf_course: Campo de Golf
@@ -599,9 +605,12 @@ pt-BR:
           miniature_golf: Mini Golfe
           nature_reserve: Reserva Ambiental
           park: Parque
+          pitch: Campo esportivo
+          playground: Playground
           sports_centre: Centro Esportivo
           stadium: Estádio
           swimming_pool: Piscina
+          track: Pista de corrida
           water_park: Parque aquático
         natural: 
           bay: Baía
@@ -612,6 +621,8 @@ pt-BR:
           cliff: Penhasco
           coastline: Litoral
           crater: Cratera
+          feature: Recurso natural
+          fell: Colina
           fjord: Fiorde
           geyser: Gêiser
           glacier: Geleira
@@ -619,24 +630,30 @@ pt-BR:
           hill: Colina/Morro
           island: Ilha
           marsh: Pântano
+          moor: Brejo
           mud: Lama
           peak: Pico
+          point: Ponto
           reef: Recife
           ridge: Cordilheira
           river: Rio
           rock: Rocha
+          scree: Cascalho
           shoal: Barra
+          spring: Nascente
           strait: Estreito
           tree: Árvore
           valley: Vale
           volcano: Vulcão
           water: Água
           wetland: Pântano / Mangue
+          wetlands: Pântano
           wood: Madeira
         place: 
           airport: Aeroporto
           city: Cidade
           country: País
+          county: Município
           farm: Fazenda
           hamlet: Aldeia
           house: Casa
@@ -644,6 +661,7 @@ pt-BR:
           island: Ilha
           islet: Ilhota
           locality: Localidade
+          moor: Pântano
           municipality: Municipalidade
           postcode: CEP
           region: Região
@@ -651,10 +669,13 @@ pt-BR:
           state: Estado
           subdivision: Subdivisão
           suburb: Subúrbio
+          town: Cidade
+          unincorporated_area: Área não incorporada
           village: Vila
         railway: 
           abandoned: Trilhos abandonados
           disused: Ferrovia em desuso
+          halt: Parada de trem
           historic_station: Estação de trem histórica
           level_crossing: Passagem em nível
           monorail: Monotrilho
@@ -688,11 +709,14 @@ pt-BR:
           drugstore: Drogaria
           dry_cleaning: Lavagem a seco
           electronics: Loja de Eletrônicos
+          estate_agent: Imobiliária
+          fashion: Loja de roupas
           fish: Peixaria
           florist: Florista
           food: Loja de alimentação
           furniture: Móveis
           gallery: Galeria
+          garden_centre: Viveiro
           general: Loja de artigos gerais
           gift: Loja de presentes
           greengrocer: Sacolão/Hortifrutti
@@ -721,15 +745,19 @@ pt-BR:
           travel_agency: Agência de viagens
           wine: Loja de vinhos
         tourism: 
+          alpine_hut: Cabana alpina
           artwork: Ilustração
           attraction: Atração
           bed_and_breakfast: Cama e café da manhã
+          cabin: Cabana
           camp_site: Acampamento
+          caravan_site: Acampamento de Caravanas
           chalet: Chalé
           guest_house: Albergue
           hostel: Abrigo
           hotel: Hotel
           information: Informações
+          lean_to: Inclinado Para
           motel: Motel
           museum: Museu
           picnic_site: Área de Piquenique
@@ -742,6 +770,8 @@ pt-BR:
           dam: Represa
           dock: Doca
           mineral_spring: Fonte mineral
+          mooring: Ancoradouro
+          rapids: Corredeiras
           river: Rio
           riverbank: Margem de rio
           stream: Córrego
@@ -780,9 +810,9 @@ pt-BR:
       one: 1 Nova mensagem na sua caixa de entrada
       other: Sua caixa de entrada tem {{count}} mensagens não lidas
       zero: Sem novas mensagens na sua caixa de entrada
-    intro_1: OpenStreetMap é um mapa livre e editável do mundo. Ele é feito por pessoas como você.
-    intro_2: OpenStreetMap permite visualizar, editar e usar dados geográficos de maneira colaborativa de qualquer lugar do mundo.
-    intro_3: A hospedagem dos dados do OpenStreetMap é cedida gentilmente por {{ucl}} e {{bytemark}}.
+    intro_1: O OpenStreetMap é um mapa livre e editável do mundo todo. Ele é feito por pessoas como você.
+    intro_2: O OpenStreetMap permite visualizar, editar e usar dados geográficos de maneira colaborativa de qualquer lugar do mundo.
+    intro_3: A hospedagem do OpenStreetMap é cedida gentilmente por {{ucl}} e {{bytemark}}. Outros apoiadores do projeto estão listados em {{partners}}.
     license: 
       alt: CC by-sa 2.0
       title: Os dados do OpenStreetMaps estão licenciados na Licença Creative Commons Atribuição-Compartilhamento pela Mesma Licença 2.0 Genérica

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ca1d3644a01e1039a628ec04673e0d0a84b3ba46..0d2302db6182c6acf98deb26876f0a9d2453cad6 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -337,7 +337,7 @@ ru:
       login: Представиться
       login_to_leave_a_comment: "{{login_link}}, чтобы оставить комментарий"
       save_button: Сохранить
-      title: Дневники пользователя | {{user}}
+      title: Дневник пользователя {{user}} | {{title}}
       user_title: Дневник пользователя {{user}}
   export: 
     start: 
@@ -1326,6 +1326,7 @@ ru:
       trackable: Отслеживаемый (доступно только анонимно, упорядоченные точки с отметками времени)
   user: 
     account: 
+      current email address: "Текущий адрес эл. почты:"
       email never displayed publicly: (не будет показан)
       flash update success: Информация о пользователе успешно обновлена.
       flash update success confirm needed: Информация о пользователе успешно обновлена. Проверьте свою электронную почту, чтобы подтвердить ваш новый адрес.
@@ -1334,6 +1335,7 @@ ru:
       longitude: "Долгота:"
       make edits public button: Сделать все мои правки доступными
       my settings: Мои настройки
+      new email address: "Новый адрес эл. почты:"
       no home location: Вы не обозначили свое основное местоположение.
       preferred languages: "Предпочитаемые языки:"
       profile description: "Описание профиля:"

diff --git a/config/locales/sr-EC.yml b/config/locales/sr-EC.yml
index d03e68a0dddda951cee6936a54bff2d834a147c2..4255bd438e0708e65b23a202d45494900cd8b35b 100644 (file)
--- a/config/locales/sr-EC.yml
+++ b/config/locales/sr-EC.yml
@@ -338,7 +338,9 @@ sr-EC:
           airport: Аеродром
           atm: Банкомат
           bank: Банка
+          bench: Клупа
           brothel: Бордел
+          bureau_de_change: Мењачница
           cafe: Кафе
           car_wash: Ауто-перионица
           casino: Казино
@@ -356,6 +358,7 @@ sr-EC:
           grave_yard: Гробље
           gym: Фитнес центар / Теретана
           health_centre: Дом здравља
+          hotel: Хотел
           kindergarten: Обданиште
           library: Библиотека
           nightclub: Ноћни клуб
@@ -363,15 +366,21 @@ sr-EC:
           parking: Паркинг
           pharmacy: Апотека
           police: Полиција
+          post_box: Поштанско сандуче
           prison: Затвор
+          pub: Паб
+          restaurant: Ресторан
           sauna: Сауна
           school: Школа
-          studio: Сттудио
+          shop: Продавница
+          studio: Студио
           supermarket: Супермаркет
           taxi: Такси
           telephone: Јавна говорница
           theatre: Позориште
+          toilets: Тоалети
           university: Универзитет
+          youth_centre: Дом омладине
         building: 
           bunker: Бункер
           chapel: Капела
@@ -379,6 +388,7 @@ sr-EC:
           garage: Гаража
           hospital: Болница
           hotel: Хотел
+          house: Кућа
           school: Школа
           shop: Продавница
           stadium: Стадион
@@ -412,11 +422,17 @@ sr-EC:
           cemetery: Гробље
           construction: Градилиште
           farm: Фарма
+          forest: Шума
           industrial: Индустријска зона
+          military: Војна област
           mine: Рудник
+          mountain: Планина
           park: Парк
+          quarry: Каменолом
           reservoir: Резервоар
           residential: Стамбена област
+          vineyard: Виноград
+          wood: Гај
         leisure: 
           garden: Башта
           golf_course: Голф терен
@@ -440,6 +456,7 @@ sr-EC:
           glacier: Глечер
           hill: Брдо
           island: Острво
+          marsh: Мочвара
           mud: Блато
           reef: Гребен
           river: Река
@@ -507,6 +524,7 @@ sr-EC:
         waterway: 
           canal: Канал
           dam: Брана
+          ditch: Јарак
           mineral_spring: Минерални извор
           river: Река
           waterfall: Водопад
@@ -604,6 +622,8 @@ sr-EC:
       greeting: Поздрав,
     message_notification: 
       hi: Поздрав {{to_user}},
+    signup_confirm_html: 
+      greeting: Поздрав!
   oauth: 
     oauthorize: 
       allow_read_gpx: учитајте ваше GPS путање.
@@ -630,7 +650,7 @@ sr-EC:
           centre: Спортски центар
           commercial: Пословна област
           common: 
-            1: ливада
+            1: Ð\9bивада
           construction: Путеви у изградњи
           cycleway: Бициклистичка стаза
           farm: Фарма

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index c8ba81cc24e79ab37d407e8512e483337ff511c5..57ea9624ab04ec322738b1676508cdfd2e7164c4 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -337,7 +337,7 @@ uk:
       login: Ввійдіть
       login_to_leave_a_comment: "{{login_link}}, щоб залишити коментар"
       save_button: Зберегти
-      title: Щоденник користувача | {{user}}
+      title: Щоденник користувача {{user}} | {{title}}
       user_title: Щоденник користувача {{user}}
   export: 
     start: