Localisation updates from https://translatewiki.net.

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 72d9394ef353e37974aa0f6ffc070438b96b117a..247024956a6a6dcc7ec3ae3c74e93ec90ed91237 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -60,7 +60,7 @@ ca:
         create: Envia
       client_application:
         create: Registreu-vos
-        update: Edita
+        update: Actualitza
       redaction:
         create: Crea un informe
         update: Desa un informe
@@ -630,15 +630,15 @@ ca:
           viaduct: Viaducte
           "yes": Pont
         building:
-          apartments: Bloc d'apartaments
+          apartments: Apartaments
           chapel: Capella
-          church: Església
+          church: Edifici de l'església
           commercial: Edifici comercial
           dormitory: Residència Universitària
-          farm: Instal·lacions agrícoles
+          farm: Casa de pagès
           garage: Garatge
           hospital: Edifici hospitalari
-          hotel: Hotel
+          hotel: Edifici hoteler
           house: Casa
           industrial: Edifici industrial
           office: Edifici d'oficines
@@ -646,8 +646,8 @@ ca:
           residential: Edifici residencial
           retail: Edifici de Venda al detall
           school: Edifici escolar
-          terrace: Terrassa
-          train_station: Estació de tren
+          terrace: Edifici de terrasses
+          train_station: Edifici d'estació de trens
           university: Edifici universitari
           "yes": Edifici
         craft:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0239799e511c8d3522911ff74c3dc10bbbe21602..55cc79b1719f6f75e61806682afb637a4a61e928 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -970,6 +970,7 @@ fr:
           tower: Tour
           wastewater_plant: Station de traitement des eaux usées
           watermill: Moulin à eau
+          water_tap: Robinet d'eau
           water_tower: Château d’eau
           water_well: Puits
           water_works: Système hydraulique
@@ -1119,6 +1120,7 @@ fr:
           convenience: Épicerie
           copyshop: Boutique de photocopies
           cosmetics: Boutique de cosmétiques
+          curtain: Magasin de rideaux
           deli: Traiteur
           department_store: Grand magasin
           discount: Magasin discount
@@ -1134,6 +1136,7 @@ fr:
           funeral_directors: Pompes funèbres
           furniture: Magasin de meubles
           garden_centre: Jardinerie
+          gas: Marchand de gaz
           general: Magasin généraliste
           gift: Boutique de cadeaux
           greengrocer: Marchand de fruits et légumes
@@ -1151,6 +1154,7 @@ fr:
           lottery: Loterie
           mall: Centre commercial
           massage: Massage
+          medical_supply: Magasin d'appareils médicaux
           mobile_phone: Boutique de téléphones mobiles
           money_lender: Prêts d'argent
           motorcycle: Magasin de motos
@@ -1163,6 +1167,7 @@ fr:
           paint: Magasin de peinture
           pastry: Pâtisserie
           pawnbroker: Prêteur sur gages
+          perfumery: Parfumerie
           pet: Animalerie
           photo: Boutique de photographie
           seafood: Fruits de mer
@@ -1172,6 +1177,7 @@ fr:
           stationery: Papeterie
           supermarket: Supermarché
           tailor: Tailleur
+          tattoo: Tatoueur
           ticket: Billetterie
           tobacco: Bureau de tabac
           toys: Magasin de jouets

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 8d72ab94f4f10cf55f8ec127c21e2429c95b9973..e7986276452b62844e25d46a043e356e89da2f7c 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -37,7 +37,7 @@ hr:
         create: Pošalji
       client_application:
         create: Registriraj
-        update: Uredi
+        update: Ažuriraj
       trace:
         create: Pošalji
         update: 'Snimi promjene:'
@@ -81,8 +81,10 @@ hr:
       way_tag: Oznaka puta
     attributes:
       client_application:
+        name: Naziv (obvezno)
         callback_url: Callback URL
         support_url: Podrška URL
+        allow_write_notes: izmijeni bilješke
       diary_comment:
         body: Tijelo
       diary_entry:
@@ -428,6 +430,7 @@ hr:
           taxiway: Rulnica
           terminal: Terminal
         amenity:
+          animal_boarding: Hotel za kućne ljubimce
           animal_shelter: Sklonište za životinje
           arts_centre: Umjetnički centar
           atm: Bankomat
@@ -477,6 +480,7 @@ hr:
           marketplace: Tržnica
           monastery: Samostan
           motorcycle_parking: Parking za motocikle
+          music_school: Muzička škola
           nightclub: Noćni klub
           nursing_home: Starački dom
           parking: Parking
@@ -525,6 +529,7 @@ hr:
           chapel: Kapelica
           church: Crkva
           commercial: Poslovna zgrada
+          construction: Zgrada u izgradnji
           dormitory: Studentski dom
           farm: Farma (zgrada)
           garage: Garaža
@@ -532,6 +537,7 @@ hr:
           hotel: Hotel
           house: Kuća
           industrial: Industrijska zgrada
+          manufacture: Tvornička zgrada
           office: Uredska zgrada
           public: Javna zgrada
           residential: Stambena zgrada
@@ -614,6 +620,7 @@ hr:
           memorial: Spomenik
           mine: Rudnik
           monument: Spomenik
+          railway: Povijesna željeznica
           roman_road: Rimska cesta
           ruins: Ruševine
           stone: Kamen
@@ -808,7 +815,9 @@ hr:
           doityourself: Uradi sam
           dry_cleaning: Kemijska čistionica
           electronics: Trgovina elektronikom
+          erotic: Erotska trgovina
           estate_agent: Agencija za nekretnine
+          fabric: Trgovina tkaninama
           farm: Poljo-apoteka
           fashion: Modna trgovina
           florist: Cvjećarnica
@@ -841,6 +850,7 @@ hr:
           stationery: Papirnica
           supermarket: Supermarket
           tailor: Krojač
+          tea: Trgovina čajem
           toys: Trgovina igračkama
           travel_agency: Putnička agencija
           video: Videoteka

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 8f4cf8208f1f5d56e93db18db181725c1d206c9b..b6f99ac683aa1f0b24d18ab241253d8bb84f4473 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -30,7 +30,7 @@ mk:
         create: Испрати
       client_application:
         create: Пријави
-        update: УÑ\80еди
+        update: Ð\9fоднови
       redaction:
         create: Создај исправка
         update: Зачувај исправка
@@ -83,8 +83,17 @@ mk:
       way_tag: Ознака на пат
     attributes:
       client_application:
+        name: Име (задолжително)
+        url: URL на главниот прилог (задолжително)
         callback_url: URL за одѕив
-        support_url: URL поддршка
+        support_url: URL за поддршка
+        allow_read_prefs: им ги чита корисничките нагодувања
+        allow_write_prefs: им ги менува корисничките нагодувања
+        allow_write_diary: создава ставки во дневникот, пишува коментари и да се спријателува
+        allow_write_api: ја менува картата
+        allow_read_gpx: им ги чита личните ГПС-траги
+        allow_write_gpx: подига ГПС-траги
+        allow_write_notes: менува белешки
       diary_comment:
         body: Содржина
       diary_entry:
@@ -114,6 +123,7 @@ mk:
         body: Содржина
         recipient: Примател
       report:
+        category: Изберете причина за пријавата
         details: Наведете повеќе подробности за проблемот (задолжително).
       user:
         email: Е-пошта
@@ -231,6 +241,8 @@ mk:
     view_history: Погл. историја
     view_details: Погл. подробности
     location: 'Местоположба:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Измена: %{id}'
       belongs_to: Автор
@@ -332,6 +344,7 @@ mk:
       reopened_by_anonymous: Преактивирано од анонимен <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Скриено од %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Пријави го јазолов
+      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Пребарување на елементи
       introduction: Стиснете на картата за да ги најдете елементите во близина.
@@ -440,6 +453,7 @@ mk:
       location: 'Местоположба:'
       view: Преглед
       edit: Уреди
+      coordinates: '%{latitude}; %{longitude}'
     feed:
       user:
         title: Дневнички ставки на %{user}
@@ -2098,6 +2112,7 @@ mk:
       uploaded: 'Подигнато во:'
       points: 'Точки:'
       start_coordinates: 'Почетна координата:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: карта
       edit: уреди
       owner: 'Сопственик:'

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 942c0f6147a06bb7ae32cdac05ef6e06b9e2b9ec..15b9a2cbaf9ae9a0fac7f7032a38867a00da183f 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -70,7 +70,7 @@ pt-BR:
         create: Enviar
       client_application:
         create: Registrar
-        update: Editar
+        update: Atualizar
       redaction:
         create: Criar redação
         update: Salvar redação
@@ -123,8 +123,17 @@ pt-BR:
       way_tag: Etiqueta de linha
     attributes:
       client_application:
+        name: Nome (necessário)
+        url: URL do aplicativo principal (necessário)
         callback_url: URL de callback
         support_url: URL de suporte
+        allow_read_prefs: ler preferências do usuário
+        allow_write_prefs: modificar preferências do usuário
+        allow_write_diary: criar publicações no diário, comentários e adicionar amigos
+        allow_write_api: modificar o mapa
+        allow_read_gpx: ler as rotas GPS privadas do usuário
+        allow_write_gpx: enviar rotas GPS
+        allow_write_notes: modificar notas
       diary_comment:
         body: Corpo
       diary_entry:
@@ -154,6 +163,7 @@ pt-BR:
         body: Corpo
         recipient: Destinatário
       report:
+        category: Seleciona um motivo para o seu relatóri
         details: Por favor, forneça mais alguns detalhes sobre o problema (obrigatório).
       user:
         email: E-mail
@@ -271,6 +281,8 @@ pt-BR:
     view_history: Ver histórico
     view_details: Ver detalhes
     location: 'Localização:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Conjunto de alterações: %{id}'
       belongs_to: Autor
@@ -372,6 +384,7 @@ pt-BR:
       reopened_by_anonymous: Reaberto por um usuário anônimo <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Ocultado por %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Denunciar esta nota
+      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Consultar elementos
       introduction: Clique no mapa para achar elementos próximos
@@ -480,6 +493,7 @@ pt-BR:
       location: 'Local:'
       view: Exibir
       edit: Editar
+      coordinates: '%{latitude}; %{longitude}'
     feed:
       user:
         title: Publicações do diário do OpenStreetMap de %{user}
@@ -608,6 +622,7 @@ pt-BR:
           loading_dock: Doca de carregamento
           love_hotel: Motel
           marketplace: Mercado/Feira
+          mobile_money_agent: Agente de dinheiro eletrônico
           monastery: Monastério
           money_transfer: Transferência de dinheiro
           motorcycle_parking: Estacionamento de motocicletas
@@ -754,10 +769,12 @@ pt-BR:
           assembly_point: Centro de agrupamento
           defibrillator: Desfibrilador
           fire_xtinguisher: Extintor de incêndio
+          fire_water_pond: Lagoa de água de fogo
           landing_site: Local de Pouso de Emergência
           life_ring: Boia salva-vidas
           phone: Telefone de Emergência
           siren: Sirene de Emergência
+          suction_point: Ponto de sucção de emergência
           water_tank: Tanque de água de emergência
           "yes": Emergência
         highway:
@@ -1153,6 +1170,7 @@ pt-BR:
           funeral_directors: Agência Funerária
           furniture: Loja de Móveis
           garden_centre: Centro de Jardinagem
+          gas: Loja de gás
           general: Loja de Artigos Gerais
           gift: Loja de Presentes
           greengrocer: Verdureira
@@ -2141,6 +2159,7 @@ pt-BR:
       uploaded: 'Enviado em:'
       points: 'Pontos:'
       start_coordinates: 'Coordenada inicial:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: mapa
       edit: editar
       owner: 'Dono:'

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 248a6323c167b0e7146370452f2e8a3b1fe4a1f8..1558de7ff16a8841e1dcc27cc7a7f5491deab29f 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -44,7 +44,7 @@ sr:
         create: Пошаљи
       client_application:
         create: Отвори налог
-        update: УÑ\80еди
+        update: Ð\90жÑ\83Ñ\80иÑ\80аÑ\98
       redaction:
         create: Направи редакцију
         update: Сачувај редакцију
@@ -95,6 +95,7 @@ sr:
       way_tag: Ознака линије
     attributes:
       client_application:
+        name: Име (обавезно)
         callback_url: Повратна адреса
         support_url: Адреса подршке
       diary_comment:
@@ -201,6 +202,8 @@ sr:
     view_history: Погледај историју
     view_details: Детаљније
     location: 'Локација:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Скуп промена: %{id}'
       belongs_to: Аутор
@@ -402,6 +405,7 @@ sr:
       location: 'Локација:'
       view: Приказ
       edit: Уреди
+      coordinates: '%{latitude}; %{longitude}'
     feed:
       user:
         title: Уноси у дневнику OpenStreetMap-а корисника %{user}
@@ -1793,6 +1797,7 @@ sr:
       uploaded: 'Отпремљено:'
       points: 'Тачака:'
       start_coordinates: 'Почетна координата:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: мапа
       edit: уреди
       owner: 'Власник:'

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 0319844f35c1b9ec3a6289b64255daad84f5cf7c..11e3b20285f553d1e7157a08186e9a46d8958da1 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -48,9 +48,12 @@
 # Author: Zvenzzon
 ---
 sv:
+  html:
+    dir: ltr
   time:
     formats:
       friendly: '%e %B %Y kl. %H:%M'
+      blog: '%e %B %Y'
   helpers:
     file:
       prompt: Välj fil
@@ -66,7 +69,7 @@ sv:
         create: Skicka
       client_application:
         create: Registrera
-        update: Redigera
+        update: Uppdatera
       redaction:
         create: Skapa redaktering
         update: Spara redaktering
@@ -119,8 +122,16 @@ sv:
       way_tag: Sträcketikett
     attributes:
       client_application:
+        name: Namn (krävs)
         callback_url: Återkopplingsadress
         support_url: Support-adress
+        allow_read_prefs: läs deras användarinställningar
+        allow_write_prefs: ändra deras användarinställningar
+        allow_write_diary: skapa dagboksinlägg, kommentarer och hitta vänner
+        allow_write_api: ändra kartan
+        allow_read_gpx: läs deras privata GPS-spår
+        allow_write_gpx: ladda upp GPS-spår
+        allow_write_notes: ändra anteckningar
       diary_comment:
         body: Brödtext
       diary_entry:
@@ -150,6 +161,7 @@ sv:
         body: Brödtext
         recipient: Mottagare
       report:
+        category: Välj en anledning för din rapport
         details: Ange fler detaljer om problemet (nödvändigt).
       user:
         email: E-post
@@ -201,6 +213,7 @@ sv:
         one: 1 år sedan
         other: '%{count} år sedan'
   printable_name:
+    with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
   editor:
     default: Standard (för närvarande %{name})
@@ -266,6 +279,8 @@ sv:
     view_history: Visa historik
     view_details: Visa detaljer
     location: 'Plats:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Ändringsset: %{id}'
       belongs_to: Författare
@@ -302,6 +317,7 @@ sv:
       history_title_html: 'Förbindelsehistorik: %{name}'
       members: Medlemmar
     relation_member:
+      entry_html: '%{type} %{name}'
       entry_role_html: '%{type} %{name} som %{role}'
       type:
         node: Nod
@@ -368,6 +384,7 @@ sv:
       reopened_by_anonymous: Återaktiverades av en anonym användare för <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Doldes av %{user} <abbr title='%{exact_time}'>för %{when}</abbr>
       report: Rapportera denna anteckning
+      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Undersök kartobjekt
       introduction: Klicka på kartan för att hitta funktioner i närheten.
@@ -476,6 +493,7 @@ sv:
       location: 'Plats:'
       view: Visa
       edit: Redigera
+      coordinates: '%{latitude}; %{longitude}'
     feed:
       user:
         title: OpenStreetMap-dagboksinlägg för %{user}
@@ -517,6 +535,7 @@ sv:
           Nominatim</a>
         geonames_reverse_html: Resultat från <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
+      prefix_format: '%{name}'
       prefix:
         aerialway:
           cable_car: Linbana
@@ -537,8 +556,10 @@ sv:
           holding_position: Väntplats
           parking_position: Parkeringsplats
           runway: Landningsbana
+          taxilane: Taxifil
           taxiway: Taxibana
           terminal: Terminal
+          windsock: Vindstrut
         amenity:
           animal_shelter: Djurhemmet
           arts_centre: Konstcenter
@@ -549,7 +570,9 @@ sv:
           bench: Bänk
           bicycle_parking: Cykelparkering
           bicycle_rental: Cykeluthyrning
+          bicycle_repair_station: Cykelreparationsstation
           biergarten: Uteservering
+          blood_bank: Blodbank
           boat_rental: Båtuthyrning
           brothel: Bordell
           bureau_de_change: Växlingskontor
@@ -566,6 +589,7 @@ sv:
           clock: Klocka
           college: College
           community_centre: Allaktivitetshus
+          conference_centre: Konferenscenter
           courthouse: Tingshus
           crematorium: Krematorium
           dentist: Tandläkare
@@ -573,6 +597,7 @@ sv:
           drinking_water: Dricksvatten
           driving_school: Körskola
           embassy: Ambassad
+          events_venue: Samlingslokal
           fast_food: Snabbmat
           ferry_terminal: Färjeterminal
           fire_station: Brandstation
@@ -585,11 +610,16 @@ sv:
           hospital: Sjukhus
           hunting_stand: Jakttorn
           ice_cream: Glass
+          internet_cafe: Internetcafé
           kindergarten: Dagis
+          language_school: Språkskola
           library: Bibliotek
+          loading_dock: Lastkaj
+          love_hotel: Kärlekshotell
           marketplace: Marknad
           monastery: Kloster
           motorcycle_parking: Motorcykelparkering
+          music_school: Musikskola
           nightclub: Nattklubb
           nursing_home: Vårdhem
           parking: Parkeringsplats
@@ -602,6 +632,7 @@ sv:
           post_office: Postkontor
           prison: Fängelse
           pub: Pub
+          public_bath: Badhus
           public_building: Offentlig byggnad
           recycling: Återvinningsstation
           restaurant: Restaurang
@@ -624,6 +655,7 @@ sv:
           waste_basket: Papperskorg
           waste_disposal: Avfallshantering
           water_point: Vattenpunkt
+          weighbridge: Fordonsvåg
         boundary:
           administrative: Administrativ gräns
           census: Folkräkningsgräns
@@ -637,44 +669,71 @@ sv:
           viaduct: Viadukt
           "yes": Bro
         building:
+          apartment: Lägenhet
           apartments: Lägenheter
+          barn: Lada
+          bungalow: Bungalow
+          cabin: Stuga
           chapel: Kapell
           church: Kyrkbyggnad
           commercial: Kommersiell byggnad
           dormitory: Studenthem
           farm: Ekonomibyggnad
           garage: Garage
+          garages: Garage
+          greenhouse: Växthus
+          hangar: Hangar
           hospital: Sjukhusbyggnad
-          hotel: Hotell
+          hotel: Hotellbyggnad
           house: Hus
+          houseboat: Husbåt
+          hut: Hydda
           industrial: Industribyggnad
           office: Kontorsbyggnad
           public: Offentlig byggnad
           residential: Bostadsbyggnad
           retail: Affärsbyggnad
+          roof: Tak
+          ruins: Byggnadsruin
           school: Skolbyggnad
-          terrace: Terass
+          shed: Skjul
+          stable: Stall
+          static_caravan: Husvagn
+          temple: Tempelbyggnad
+          terrace: Terrassbyggnad
           train_station: Järnvägsstation
           university: Universitetsbyggnad
+          warehouse: Varuhus
           "yes": Byggnad
         club:
           sport: Sportklubb
+          "yes": Klubb
         craft:
+          beekeper: Biodlare
+          blacksmith: Smed
           brewery: Bryggeri
           carpenter: Snickare
+          dressmaker: Sömmerska
           electrician: Elektriker
           gardener: Trädgårdsmästare
+          handicraft: Konsthantverk
           painter: Målare
           photographer: Fotograf
           plumber: Rörmokare
+          roofer: Takläggare
+          sawmill: Sågverk
           shoemaker: Skomakare
+          stonemason: Stenhuggare
           tailor: Skräddare
+          winery: Vingård
           "yes": Hantverksbutik
         emergency:
           ambulance_station: Ambulansstation
           assembly_point: Samlingsplats
           defibrillator: Defibrillator
+          fire_xtinguisher: Brandsläckare
           landing_site: Nödlandningsplats
+          life_ring: Livboj
           phone: Nödtelefon
           water_tank: Nödvattentank
           "yes": Nödsituation
@@ -788,6 +847,7 @@ sv:
           beach_resort: Badort
           bird_hide: Fågeltorn
           common: Allmänning
+          dance: Danslokal
           dog_park: Hundpark
           firepit: Eldgrop
           fishing: Fiskevatten
@@ -801,6 +861,7 @@ sv:
           miniature_golf: Minigolf
           nature_reserve: Naturreservat
           park: Park
+          picnic_table: Picknickbord
           pitch: Idrottsplan
           playground: Lekplats
           recreation_ground: Rekreationsområde
@@ -815,6 +876,7 @@ sv:
           "yes": Fritid
         man_made:
           adit: Gruvöppning
+          antenna: Antenn
           beacon: Fyr
           beehive: Bikupa
           breakwater: Vågbrytare
@@ -830,6 +892,7 @@ sv:
           groyne: Vågbrytare
           kiln: Kalkugn
           lighthouse: Fyr
+          manhole: Gatubrunn
           mast: Mast
           mine: Gruva
           mineshaft: Gruvschakt
@@ -837,9 +900,13 @@ sv:
           petroleum_well: Oljebrunn
           pier: Pir
           pipeline: Pipeline
+          pumping_station: Pumpstation
           silo: Silo
+          snow_cannon: Snökanon
+          snow_fence: Snöstaket
           storage_tank: Lagringstank
           surveillance: Övervakning
+          telescope: Teleskop
           tower: Torn
           wastewater_plant: Avfallsfabrik
           watermill: Vattenkvarn
@@ -1014,6 +1081,7 @@ sv:
           kiosk: Kiosk
           kitchen: Köksbutik
           laundry: Tvättservice
+          locksmith: Låssmed
           lottery: Lotteri
           mall: Köpcentrum
           massage: Massage
@@ -1026,6 +1094,7 @@ sv:
           outdoor: Friluftsbutik
           paint: Färgbutik
           pawnbroker: Pantlånare
+          perfumery: Parfymaffär
           pet: Djuraffär
           photo: Fotoaffär
           seafood: Skaldjur
@@ -1035,6 +1104,8 @@ sv:
           stationery: Pappershandel
           supermarket: Snabbköp
           tailor: Skräddare
+          tattoo: Tatueringstudio
+          tea: Teaffär
           ticket: Biljettbutik
           tobacco: Tobaksaffär
           toys: Leksaksaffär
@@ -1271,6 +1342,7 @@ sv:
       footer: Du kan också läsa kommentaren på %{readurl} och du kan kommentera på
         %{commenturl} eller skicka ett meddelande till författaren på %{replyurl}
     message_notification:
+      subject_header: '[OpenStreetMap] %{subject}'
       hi: Hej %{to_user},
       header: '%{from_user} har skickat ett meddelande via OpenStreetMap med ämnet
         %{subject}:'
@@ -1293,6 +1365,7 @@ sv:
         failed_to_import: 'misslyckats med att importera. Här är felet:'
         more_info_1: Mer information om importfel av GPX och hur man undviker dem
         more_info_2: 'de kan hittas på:'
+        import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       success:
         subject: '[OpenStreetMap] Lyckades importera GPX'
         loaded_successfully:
@@ -1646,6 +1719,7 @@ sv:
       not_public_description_html: Du kan inte längre redigera kartan om du inte gör
         det. Du kan göra dina redigeringar offentliga från din %{user_page}.
       user_page_link: användarsida
+      anon_edits_html: (%{link})
       anon_edits_link_text: Ta reda på varför det är så.
       flash_player_required_html: Du måste ha Flash Player för att kunna använda Potlatch,
         OpenStreetMaps flasheditor. Du kan <a href="https://get.adobe.com/flashplayer">ladda
@@ -1948,6 +2022,7 @@ sv:
       title: Redigerar spår %{name}
       heading: Redigerar spår %{name}
       visibility_help: vad betyder detta?
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     update:
       updated: Spår uppdaterades
     trace_optionals:
@@ -1961,6 +2036,7 @@ sv:
       uploaded: 'Uppladdad:'
       points: 'Punkter:'
       start_coordinates: 'Startkoordinat:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: karta
       edit: redigera
       owner: 'Ägare:'

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 8d97d1c87de82acc275ac8ef33332000b53f5540..c87a0d73b0bee04aeba9ba56480f28335aec82e2 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -65,7 +65,7 @@ tr:
         create: Gönder
       client_application:
         create: Kaydol
-        update: Düzenle
+        update: Güncelle
       redaction:
         create: Redaksiyon oluştur
         update: Redaksiyonu kaydet

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ff3792c13d681f8adc273e23d1543c67d8a59d8c..7122c194651181281f1871c378077766ab4d49a6 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -74,7 +74,7 @@ zh-CN:
         create: 发送
       client_application:
         create: 注册
-        update: 编辑
+        update: 更新
       redaction:
         create: 创建修订
         update: 保存修订
@@ -127,8 +127,12 @@ zh-CN:
       way_tag: 路径标签
     attributes:
       client_application:
+        name: 名称（必填）
         callback_url: 回调 URL
         support_url: 支持 URL
+        allow_read_prefs: 读取其用户设置
+        allow_write_api: 修改地图
+        allow_write_gpx: 上传GPS轨迹
       diary_comment:
         body: 正文
       diary_entry:
@@ -143,15 +147,15 @@ zh-CN:
       trace:
         user: 用户
         visible: 可见
-        name: 名称
+        name: 文件名
         size: 大小
         latitude: 纬度
         longitude: 经度
         public: 公开
         description: 描述
-        gpx_file: 上传 GPX 文件：
-        visibility: 可见性：
-        tagstring: 标签：
+        gpx_file: 上传 GPX 文件
+        visibility: 可见性
+        tagstring: 标签
       message:
         sender: 发件人
         title: 主题
@@ -275,6 +279,8 @@ zh-CN:
     view_history: 查看历史
     view_details: 查看详情
     location: 位置：
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 变更集：%{id}
       belongs_to: 作者
@@ -478,6 +484,7 @@ zh-CN:
       location: 位置：
       view: 查看
       edit: 编辑
+      coordinates: '%{latitude}; %{longitude}'
     feed:
       user:
         title: '%{user} 的 OpenStreetMap 日记文章'
@@ -641,15 +648,15 @@ zh-CN:
           viaduct: 高架桥
           "yes": 桥
         building:
-          apartments: 公寓楼
+          apartments: 公寓
           chapel: 教堂
-          church: 教堂
+          church: 教堂建筑
           commercial: 商业建筑物
           dormitory: 宿舍
-          farm: å\86\9cå\9cºå»ºç­\91ç\89©
+          farm: å\86\9cå\9cºå±\8b
           garage: 车库
           hospital: 医院建筑物
-          hotel: 酒店
+          hotel: 酒店建筑
           house: 房屋
           industrial: 工业建筑物
           office: 办公楼
@@ -657,8 +664,8 @@ zh-CN:
           residential: 住宅建筑物
           retail: 零售建筑物
           school: 学校建筑物
-          terrace: 阳台
-          train_station: 火车站
+          terrace: 阳台建筑
+          train_station: 火车站建筑
           university: 大学建筑物
           "yes": 建筑物
         craft:
@@ -1801,6 +1808,7 @@ zh-CN:
       uploaded: 上传于：
       points: 点：
       start_coordinates: 起始坐标：
+      coordinates_html: '%{latitude}; %{longitude}'
       map: 地图
       edit: 编辑
       owner: 所有者：