Localisation updates from https://translatewiki.net.

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 8ff2e96003461f0d6895d5844125bfa304aab64d..3c189ffb76b558f0c08527425ccf8b5b88da8f5f 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -30,7 +30,7 @@ br:
         create: Kas
       client_application:
         create: Marilhañ
-        update: Aozañ
+        update: Hizivaat
       redaction:
         create: Krouiñ ar skridaozadenn
         update: Enrollañ ar skridaozadenn
@@ -2093,7 +2093,7 @@ br:
       register now: En em enskrivañ bremañ
       with username: 'Ur gont OpenStreetMap hoc''h eus dija ? Digorit un dalc''h en
         ur verkañ hoc''h anv implijer hag ho ker-tremen :'
-      with external: 'Peotramant, implijit un tredeour evit kevreañ :'
+      with external: 'Mod all, implijit un tredeour evit kevreañ :'
       new to osm: Nevez war OpenStreetMap ?
       to make changes: Evit kemmañ roadennoù OpenStreetMap e rankit kaout ur gont.
       create account minute: Krouiñ ur gont. Ne bad nemet ur vunutenn.
@@ -2178,7 +2178,7 @@ br:
       external auth: 'Dilesadur trede :'
       password: 'Ger-tremen :'
       confirm password: 'Kadarnaat ar ger-tremen :'
-      use external auth: 'Peotramant, implijit un tredeour evit kevreañ :'
+      use external auth: 'Mod all, implijit un tredeour evit kevreañ :'
       auth no password: Gant dilesadur un tredeour n'eus ket ezhomm d'ober gant ur
         ger-tremen, met evit binvioù ouzhpenn pe evit ur servijer e c'haller bepred
         goulenn unan diganeco'h.

diff --git a/config/locales/ce.yml b/config/locales/ce.yml
index ec6507ba0218e70089527872ffa75b2b773cdd92..e0e98fcee8769d11e72fa1b46f98911760a1213c 100644 (file)
--- a/config/locales/ce.yml
+++ b/config/locales/ce.yml
@@ -220,7 +220,7 @@ ce:
         title: 'Нисдарш: %{id}'
         title_comment: Нисдарш %{id} — %{comment}
       join_discussion: Дийцарехь дакъалаца системин чугӀо
-      discussion: Дийцаре
+      discussion: Дийцар
     node:
       title_html: 'ТӀадам: %{name}'
       history_title_html: 'ТӀадаман истори: %{name}'

diff --git a/config/locales/da.yml b/config/locales/da.yml
index c6dfb5ddf93b3e74b7ac95f580ea4fb264dfd531..5ef360f56e003209d5eb682cda52a34640bb6b91 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -319,6 +319,7 @@ da:
       entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (som %{relation_role})
     not_found:
+      title: Ikke fundet
       sorry: Beklager, %{type} med id %{id} blev ikke fundet.
       type:
         node: punkt

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 42e95857e392c5c28fdc267af25452713a47e6f0..691870397ad18e8a8c962ba0eba5ca9201814496 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -150,9 +150,15 @@ de:
     attributes:
       client_application:
         name: Name (Erforderlich)
+        url: Hauptanwendungs-URL (erforderlich)
         callback_url: Callback-URL
         support_url: Support-URL
+        allow_read_prefs: Ihre Benutzereinstellungen auslesen.
+        allow_write_prefs: Ihre Benutzereinstellungen verändern.
+        allow_write_diary: Blogeinträge und Kommentare schreiben und Freunde finden
         allow_write_api: Karte bearbeiten
+        allow_read_gpx: Zugriff auf ihre privaten GPS-Tracks.
+        allow_write_gpx: GPS-Track hochladen
         allow_write_notes: Notizen bearbeiten
       diary_comment:
         body: Text
@@ -336,6 +342,9 @@ de:
       title_html: 'Weg: %{name}'
       history_title_html: 'Wegverlauf: %{name}'
       nodes: Knoten
+      nodes_count:
+        one: ein Knoten
+        other: '%{count} Knoten'
       also_part_of_html:
         one: Teil des Wegs %{related_ways}
         other: Teile der Wege %{related_ways}
@@ -356,6 +365,7 @@ de:
       entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (als %{relation_role})
     not_found:
+      title: Nicht gefunden
       sorry: '%{type} mit der Nummer %{id} konnte leider nicht gefunden werden.'
       type:
         node: Knoten
@@ -364,6 +374,7 @@ de:
         changeset: Der Änderungssatz
         note: Hinweis
     timeout:
+      title: Zeitüberschreitungsfehler
       sorry: Es dauerte leider zu lange, die Daten für %{type} mit der ID %{id} abzurufen.
       type:
         node: Knoten
@@ -999,6 +1010,7 @@ de:
           surveillance: Überwachung
           telescope: Teleskop
           tower: Turm
+          utility_pole: Strommast
           wastewater_plant: Kläranlage
           watermill: Wassermühle
           water_tap: Wasserhahn
@@ -1071,6 +1083,7 @@ de:
           employment_agency: Arbeitsamt
           energy_supplier: Büro eines Energieversorgers
           estate_agent: Immobilienhändler
+          financial: Finanzamt
           government: Amt
           insurance: Versicherungsbüro
           it: IT-Büro
@@ -1079,6 +1092,7 @@ de:
           newspaper: Büro eines Zeitungsverlags
           ngo: NGO
           notary: Notar
+          religion: Religiöses Amt
           research: Forschungs- und Entwicklungsbüro
           tax_advisor: Steuerberater
           telecommunication: Telekommunikationsbüro
@@ -1139,6 +1153,7 @@ de:
           agrarian: Agrargeschäft
           alcohol: Spirituosenladen
           antiques: Antiquitätengeschäft
+          appliance: Haushaltsgeräteladen
           art: Kunstladen
           baby_goods: Babywaren
           bag: Taschengeschäft
@@ -1481,6 +1496,7 @@ de:
       footer: Hier gehts zum Kommentar %{readurl}, du kannst ihn kommentieren %{commenturl}
         oder dem Autor unter %{replyurl} antworten.
     message_notification:
+      subject_header: '[OpenStreetMap] %{subject}'
       hi: Hallo %{to_user},
       header: '%{from_user} hat dir eine Nachricht über OpenStreetMap mit dem Betreff
         %{subject} gesendet:'
@@ -1504,6 +1520,7 @@ de:
         more_info_1: Mehr Informationen über GPX-Import Fehler und wie diese vermieden
           werden können
         more_info_2: 'finden sich hier:'
+        import_failures_url: https://wiki.openstreetmap.org/wiki/DE:GPX
       success:
         subject: '[OpenStreetMap] GPX-Import erfolgreich'
         loaded_successfully:
@@ -2185,6 +2202,7 @@ de:
       uploaded: 'Hochgeladen:'
       points: 'Punkte:'
       start_coordinates: 'Startkoordinate:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: Karte
       edit: bearbeiten
       owner: 'Besitzer:'

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 61c7e5b165f2c91fff6346a4eff87ee386a88d1b..cca9ff9adf009d03ef28ad5412974e0b93d913e6 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -26,6 +26,7 @@
 # Author: Yona b
 # Author: Ypnypn
 # Author: יאיר מן
+# Author: ישראל קלר
 # Author: נדב ס
 # Author: תומר ט
 ---
@@ -335,6 +336,7 @@ he:
       entry_html: יחס %{relation_name}
       entry_role_html: יחס %{relation_name} (בתור %{relation_role})
     not_found:
+      title: לא נמצא
       sorry: אנו מתנצלים, אך הסוג %{type} בעל המזהה %{id} לא נמצא.
       type:
         node: נקודה
@@ -343,6 +345,7 @@ he:
         changeset: ערכת שינויים
         note: הערה
     timeout:
+      title: שגיאת זמן מוקצב
       sorry: אנו מתנצלים, אך טעינת התוכן עבור ה%{type} עם המזהה %{id}, ארכה זמן רב
         מדי.
       type:
@@ -1455,6 +1458,7 @@ he:
       footer: אפשר גם לקרוא את התגובה בכתובת %{readurl} ולהגיב בכתובת %{commenturl}
         או לשלוח הודעה ליוצר בכתובת %{replyurl}
     message_notification:
+      subject_header: '[OpenStreetMap] %{subject}'
       hi: שלום %{to_user},
       header: 'לתיבתך ב־OpenStreetMap הגיעה הודעה מאת %{from_user} עם הנושא %{subject}:'
       footer_html: ניתן גם לקרוא את ההודעה בכתובת %{readurl} ולשלוח הודעה ליוצר דרך

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 28b30babe1674390ecdeef53fae8df48cedf0a9e..286769a4054bafdefea1069fca792a22080947f8 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -27,6 +27,7 @@
 # Author: Karika
 # Author: Lollo
 # Author: Lorelai87
+# Author: Luca.favorido
 # Author: LucioGE
 # Author: Macofe
 # Author: Margherita.mignanelli
@@ -349,6 +350,7 @@ it:
         changeset: gruppo di modifiche
         note: nota
     timeout:
+      title: Errore di timeout
       sorry: Ci rincresce, il reperimento di dati per %{type} con id %{id} ha richiesto
         troppo tempo.
       type:
@@ -614,6 +616,7 @@ it:
           drinking_water: Acqua potabile
           driving_school: Scuola guida
           embassy: Ambasciata
+          events_venue: Spazio per eventi
           fast_food: Fast Food
           ferry_terminal: Terminal traghetti
           fire_station: Vigili del fuoco
@@ -633,7 +636,9 @@ it:
           loading_dock: Portone scarico merci
           love_hotel: Love hotel
           marketplace: Mercato
+          mobile_money_agent: Agente di moneta elettronica
           monastery: Monastero
+          money_transfer: Agenzia di trasferimento di denaro
           motorcycle_parking: Parcheggio per Moto
           music_school: Scuola di musica
           nightclub: Night Club
@@ -655,6 +660,7 @@ it:
           ranger_station: Stazione dei ranger
           recycling: Punto riciclaggio rifiuti
           restaurant: Ristorante
+          sanitary_dump_station: Stazione di scarico delle acque reflue
           school: Scuola
           shelter: Pensilina
           shower: Doccia
@@ -706,7 +712,9 @@ it:
           college: Edificio di un'accademia
           commercial: Uffici
           construction: Edificio in costruzione
+          detached: Casa unifamiliare
           dormitory: Dormitorio
+          duplex: Casa doppia
           farm: Fattoria
           garage: Autorimessa
           garages: Serie di Garage
@@ -715,8 +723,11 @@ it:
           hospital: Ospedale
           hotel: Albergo
           house: Casa
+          houseboat: Casa galleggiante
+          hut: Baracca
           industrial: Edificio industriale
           kindergarten: Edificio di un asilo
+          manufacture: Edificio produttivo
           office: Uffici
           public: Edificio pubblico
           residential: Edificio residenziale
@@ -724,17 +735,26 @@ it:
           roof: Tettoia
           ruins: Edificio in rovina
           school: Edificio scolastico
+          semidetached_house: Casa bifamiliare
+          shed: Capannone
           stable: Stalle
+          static_caravan: Caravan
           temple: Edificio di un tempio
           terrace: Terrazza
           train_station: Stazione ferroviaria
           university: Sede universitaria
+          warehouse: Magazzino
           "yes": Edificio
+        club:
+          scout: Sede scout
+          sport: Circolo sportivo
+          "yes": Circolo
         craft:
           beekeper: Apicoltore
           blacksmith: Fabbro
           brewery: Birrificio
           carpenter: Carpentiere
+          caterer: Catering
           confectionery: Confetteria
           dressmaker: Sarto per donne
           electrician: Elettricista
@@ -756,11 +776,14 @@ it:
           winery: Cantina vinicola
           "yes": Negozio di Artigianato
         emergency:
+          access_point: Punto d'accesso
           ambulance_station: Stazione delle ambulanze
           assembly_point: Punto di ritrovo
           defibrillator: Defibrillatore
           fire_xtinguisher: Estintore
+          fire_water_pond: Serbatoio d'acqua anti-incendio
           landing_site: Luogo per l'atterraggio di emergenza
+          life_ring: Salvagente
           phone: Telefono di emergenza
           siren: Sirena di emergenza
           water_tank: Serbatoio d'acqua di emergenza
@@ -885,6 +908,8 @@ it:
           vineyard: Vigneto
           "yes": Uso del terreno
         leisure:
+          adult_gaming_centre: Sala giochi per adulti
+          amusement_arcade: Sala giochi
           bandstand: Chiosco della musica
           beach_resort: Stabilimento balneare
           bird_hide: Osservatorio Camuffato
@@ -904,6 +929,7 @@ it:
           marina: Porto turistico
           miniature_golf: Minigolf
           nature_reserve: Riserva naturale
+          outdoor_seating: Posti a sedere all'aperto
           park: Parco
           picnic_table: Tavolo da picnic
           pitch: Campo sportivo
@@ -922,12 +948,15 @@ it:
           adit: Galleria mineraria
           advertising: Pubblicità
           antenna: Antenna
+          avalanche_protection: Protezione antivalanga
           beacon: Fanale
           beehive: Alveare
           breakwater: Frangiflutti
           bridge: Ponte
           bunker_silo: Bunker
+          cairn: Tumulo
           chimney: Ciminiera
+          clearcut: Foresta disboscata
           communications_tower: Torre per telecomunicazioni
           crane: Gru
           cross: Croce
@@ -948,12 +977,16 @@ it:
           pier: Molo
           pipeline: Tubazione
           pumping_station: Stazione di pompaggio
+          reservoir_covered: Serbatoio coperto
           silo: Silo
+          snow_cannon: Cannone sparaneve
+          snow_fence: Recinzione da neve
           storage_tank: Cisterna di stoccaggio
           street_cabinet: Armadio stradale
           surveillance: Sorveglianza
           telescope: Telescopio
           tower: Torre
+          utility_pole: Palo di supporto
           wastewater_plant: Impianto di depurazione delle acque
           watermill: Mulino ad acqua
           water_tap: Rubinetto dell'acqua
@@ -967,10 +1000,13 @@ it:
           airfield: Aeroporto militare
           barracks: Caserma
           bunker: Bunker
+          checkpoint: Posto di blocco
+          trench: Trincea
           "yes": Militare
         mountain_pass:
           "yes": Passo di montagna
         natural:
+          bare_rock: Roccia nuda
           bay: Baia
           beach: Spiaggia
           cape: Capo
@@ -1021,13 +1057,20 @@ it:
           diplomatic: Ufficio diplomatico
           educational_institution: Istituto d'istruzione
           employment_agency: Agenzia di lavoro
+          energy_supplier: Ufficio di fornitura elettrica
           estate_agent: Agente immobiliare
+          financial: Ufficio finanziario
           government: Ufficio governativo
           insurance: Agenzia di assicurazione
           it: Ufficio IT
           lawyer: Avvocato
+          logistics: Ufficio logistico
+          newspaper: Ufficio stampa
           ngo: Ufficio di una ONG (Organizzazione Non Governativa)
           notary: Notaio
+          religion: Ufficio religioso
+          research: Ufficio di ricerca
+          tax_advisor: Consulente fiscale
           telecommunication: Ufficio di telecomunicazioni
           travel_agent: Agenzia di viaggi
           "yes": Ufficio
@@ -1047,6 +1090,7 @@ it:
           locality: Località non popolata
           municipality: Comune
           neighbourhood: Quartiere
+          plot: Terreno
           postcode: CAP
           quarter: Quartiere
           region: Provincia
@@ -1086,11 +1130,14 @@ it:
           agrarian: Negozio di agraria
           alcohol: Alcolici
           antiques: Antiquario
+          appliance: Negozio di elettrodomestici
           art: Negozio d'arte
+          baby_goods: Articoli per neonati
           bag: Negozio di borse
           bakery: Panetteria
           bathroom_furnishing: Arredamento bagno
           beauty: Prodotti cosmetici
+          bed: Prodotti per il letto
           beverages: Negozio bevande
           bicycle: Negozio biciclette
           bookmaker: Centro scommesse
@@ -1104,6 +1151,7 @@ it:
           charity: Negozio solidale
           cheese: Negozio di formaggi
           chemist: Farmacia
+          chocolate: Cioccolato
           clothes: Negozio di abbigliamento
           coffee: Negozio di caffè
           computer: Negozio di computer
@@ -1111,6 +1159,7 @@ it:
           convenience: Minimarket
           copyshop: Copisteria
           cosmetics: Negozio cosmetici
+          craft: Negozio di fornitura di artigianato
           curtain: Negozio di tende
           dairy: Latteria
           deli: Specialità gastronomiche
@@ -1132,12 +1181,14 @@ it:
           funeral_directors: Agenzia funebre
           furniture: Arredamenti
           garden_centre: Centro giardinaggio
+          gas: Negozio di combustibile
           general: Emporio
           gift: Articoli da regalo
           greengrocer: Fruttivendolo
           grocery: Fruttivendolo
           hairdresser: Parrucchiere
           hardware: Ferramenta
+          health_food: Negozio di alimenti salutistici
           hearing_aids: Negozio di apparecchi acustici
           herbalist: Erboristeria
           hifi: Hi-Fi
@@ -1148,11 +1199,13 @@ it:
           kiosk: Edicola
           kitchen: Negozio di cucina
           laundry: Lavanderia
+          locksmith: Fabbro
           lottery: Lotteria
           mall: Centro commerciale
           massage: Massaggio
           medical_supply: Negozio di articoli sanitari
           mobile_phone: Centro telefonia mobile
+          money_lender: Agenzia di prestiti
           motorcycle: Concessionario di motociclette
           motorcycle_repair: Riparatore di moto
           music: Articoli musicali
@@ -1414,6 +1467,7 @@ it:
       footer: Puoi anche leggere il commento su %{readurl} e puoi commentare su %{commenturl}
         oppure inviare un messaggio all'autore su %{replyurl}
     message_notification:
+      subject_header: '[OpenStreetMap] %{subject}'
       hi: Ciao %{to_user},
       header: '%{from_user} ti ha inviato un messaggio tramite OpenStreetMap con l''oggetto
         %{subject}:'
@@ -1437,6 +1491,7 @@ it:
         more_info_1: Ulteriori informazioni sulle importazioni GPX fallite e come
           evitarle
         more_info_2: 'possono essere trovate su:'
+        import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       success:
         subject: '[OpenStreetMap] Importazione GPX completata con successo'
         loaded_successfully:

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index bf4c5c389d96fcd1d83fd9de2c7f07a768b7d9da..3133b20ff50d9eb06bef236fe6203860bf62c7e3 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -290,6 +290,7 @@ ko:
       entry_html: 관계 %{relation_name}
       entry_role_html: (%{relation_role}로서) 관계 %{relation_name}
     not_found:
+      title: 찾을 수 없음
       sorry: '죄송하지만, %{type} #%{id}을(를) 찾지 못했습니다.'
       type:
         node: 교점
@@ -298,6 +299,7 @@ ko:
         changeset: 바뀜집합
         note: 참고
     timeout:
+      title: 시간 초과 오류
       sorry: 죄송합니다, %{id} id인 %{type}에 대한 데이터를 얻는데 너무 오래 걸립니다.
       type:
         node: 교점

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9e0f49075b9b8beab6226327fdb197471375df94..7854775ed1b5fbd9df710bcf0dcf2df84562630b 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -4,6 +4,7 @@
 # Author: A67-A67
 # Author: Abijeet Patro
 # Author: Alphensebezorger
+# Author: Aranka
 # Author: Arent
 # Author: Bouman4
 # Author: CGID
@@ -319,6 +320,7 @@ nl:
       entry_html: Relatie %{relation_name}
       entry_role_html: Relatie %{relation_name} (als %{relation_role})
     not_found:
+      title: Kon niet gevonden worden
       sorry: 'De %{type} #%{id} kan helaas niet worden gevonden.'
       type:
         node: node

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 562deac74cfbdd3b1142a806a97722b9f6457e7a..644dd08c59faadbeada635d5e465e57e18808eac 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -434,6 +434,7 @@ nqo:
           hotel: ߖߌ߬ߦߊ߬ߓߏ߲
           house: ߟߎ
           public: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          school: ߞߊ߬ߙߊ߲߬ߕߊ
           university: ߖߊ߯ߓߘߊ ߓߏ߲
         craft:
           electrician: ߢߎߡߍߦߟߊ
@@ -646,6 +647,38 @@ nqo:
       hi: ߌ ߣߌ߫ ߗߋ߫ %{to_user}.
       header: '%{from_user} ߓߘߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߘߏ߫ ߡߓߊߟߌߡߊ߫ ߝߐߡߊ
         %{subject} ߘߌ߫'
+    signup_confirm:
+      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߌ ߣߌ߫ ߛߣߍ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬'
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߫ ߦߋ߲߬߹
+      created: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߛߌ߰ߣߍ߲߫ ߦߴߌ ߘߐ߫) ߖߊ߬ߕߋ߬ߘߊ ߘߏ߫ ߛߌ߲ߘߌ߫ %{site_url} ߞߊ߲߬.
+      confirm: 'ߦߋ߬ߣߴߊ߲ ߞߍ߫ ߕߐ߫ ߞߏ߫ ߜߘߍ ߛߎ߯-ߎ-ߛߎ߯ ߞߍ߫ ߟߊ߫߸ ߒ߬ ߧߴߊ߬ ߝߍ߬ ߌ ߦߴߊ߬ ߟߊߛߙߋߦߊ߫
+        ߞߏ߫ ߡߊ߬ߢߌ߬ߣߌ߲߬ߠߌ߲ ߣߌ߲߬ ߝߘߊߣߍ߲߫ ߦߴߌߟߋ ߟߋ߬ ߟߊ߫߸ ߏ߬ ߘߐ߫ ߣߴߏ߬ ߞߍ߫ ߘߊ߫ ߘߎ߰ߟߊ߬ߘߐ߫
+        ߛߘߌߜߋ߲ ߣߌ߲߬ ߛߐ߲߬ߞߌ߲߫ ߞߵߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߙߋߦߊ߫:'
+      welcome: ߣߴߌ ߓߊ߲߫ ߘߴߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߟߊߛߙߋߦߊ߫ ߟߊ߫߸ ߊ߲ ߘߴߌ ߡߊߛߐ߫ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߡߊ߬ߞߊ߬ߝߏ߬ߟߌ߫
+        ߜߘߍ߫ ߟߊ߫ ߛߴߌ ߘߴߊ߬ ߘߐߝߘߊ߫.
+    email_confirm:
+      subject: '[[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ]] ߌ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊߛߙߋߦߊ߫'
+    email_confirm_plain:
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
+      hopefully_you: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߟߊߣߴߌ ߘߐ߫) ߊ߬ߟߎ߬ ߦߴߊ߬ ߝߍ߬ ߞߵߊ߬ߟߎ߬ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮
+        ߟߊߛߙߋߦߊ߫ %{server_url} ߘߐ߫ %{new_address} ߟߊ߫.
+      click_the_link: ߣߴߏ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߡߝߊ߬ߟߋ߲߬ߠߌ߲
+        ߟߊߛߙߋߦߊ߫.
+    email_confirm_html:
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
+      hopefully_you: ߡߐ߱ ߘߏ߫ (ߖߌ߱ ߟߊߣߴߌ ߘߐ߫) ߊ߬ߟߎ߬ ߦߴߊ߬ ߝߍ߬ ߞߵߊ߬ߟߎ߬ ߟߊ߫ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮
+        ߡߊߝߊ߬ߟߋ߲߬ %{server_url} ߘߐ߫ %{new_address} ߟߊ߫.
+      click_the_link: ߣߴߏ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߡߝߊ߬ߟߋ߲߬ߠߌ߲
+        ߟߊߛߙߋߦߊ߫.
+    lost_password:
+      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊߢߌ߬ߣߌ߲߬ߞߊ'
+    lost_password_plain:
+      greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
+      hopefully_you: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫
+        ߕߊ߬ߡߌ߲߬ߞߊ߲߬ ߡߊߦߟߍߡߊ߲ ߡߊ߬ ߢ:ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߟߊ߫ openstreetmap.org ߖߊ߬ߕߋ߬ߘߊ
+        ߣߌ߲߬ ߞߊ߲߬.
+      click_the_link: ߣߴߊ߬ ߞߍ߫ ߘߴߌߟߋ ߘߌ߫߸ ߘߎ߰ߟߊ߬ߘߐ߫ ߛߘߌߜߋ߲ ߣߌ߲߬ ߛߐ߲߬ߞߌ߲߫ ߖߊ߰ߣߌ߲߫ ߞߵߌ
+        ߟߊ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߡߊߝߊ߬ߟߋ߲߬.
     lost_password_html:
       greeting: ߌ ߣߌ߫ ߕߎ߬ߡߊ߬߸
       hopefully_you: ߡߐ߱ ߘߏ߫ (ߊ߬ ߘߌ߫ ߛߋ߫ ߞߍ߫ ߟߴߌ ߖߍ߬ߘߍ ߘߌ߫) ߓߘߊ߫ ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߞߍ߫
@@ -720,4 +753,7 @@ nqo:
       copyright_html: <span>&copy;</span>ߏߔߌ߲߫ ߛߑߕߙߌߕ ߡߊߔ<br>ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬
       used_by_html: '%{name} ߓߘߊ߫ ߡߊߔ ߘߕߊ ߡߊߛߐ߫ ߓߟߐߟߐ߫ ߞߍߦߙߐ ߥߊ߯ ߦߙߌߞߊ ߟߊ߫. ߜߋߟߋ߲ߜߋߟߋ߲
         ߟߥߊ߬ߟߌ߬ߟߊ߲ ߣߌ߫ ߞߍߟߊ߲߫ ߛߎ߲ߝߘߍߡߊ ߟߎ߬'
+    copyright:
+      foreign:
+        title: ߞߊ߬ ߓߍ߲߬ ߘߟߊߡߌߘߊߟߌ ߣߌ߲߬ ߡߊ߬
 ...

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 733d4b7040d2a19256ad188c231536d07dc3390d..55f6ce0919fb08b6aebef36500b967d8613725df 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -382,6 +382,7 @@ pl:
       entry_html: Relacja %{relation_name}
       entry_role_html: Relacja %{relation_name} (jako %{relation_role})
     not_found:
+      title: Nie znaleziono
       sorry: 'Niestety, nie odnaleziono %{type} #%{id}.'
       type:
         node: węzeł
@@ -390,6 +391,7 @@ pl:
         changeset: zestaw zmian
         note: uwaga
     timeout:
+      title: Przekroczono limit czasu
       sorry: Niestety, pobranie danych dla %{type} o identyfikatorze %{id} trwało
         zbyt długo.
       type:

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 2037ab402db0bb0994d2d22710b8beba9db958e8..645c7859cb445a7ba5c5c6646df2dbbdb045ec89 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -343,6 +343,7 @@ pt-BR:
       entry_html: Relação %{relation_name}
       entry_role_html: Relação %{relation_name} (como %{relation_role})
     not_found:
+      title: Não encontrado
       sorry: Não foi possível encontrar %{type} com id %{id}.
       type:
         node: ponto
@@ -351,6 +352,7 @@ pt-BR:
         changeset: conjunto de alterações
         note: Nota
     timeout:
+      title: Erro de tempo limite
       sorry: Desculpe, os dados para %{type} com id %{id} demoraram demais para chegar.
       type:
         node: ponto

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 89b23f892524f5307592157d37895501871b6103..e7aec38931e96a67d056b7dfa499c199d8e2d9d2 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -50,6 +50,7 @@
 # Author: MaxSem
 # Author: Mechano
 # Author: Meerrahtar
+# Author: Megakott
 # Author: Mike like0708
 # Author: Mixaill
 # Author: Movses
@@ -368,6 +369,7 @@ ru:
       entry_html: Отношение %{relation_name}
       entry_role_html: Отношение %{relation_name} (в роли %{relation_role})
     not_found:
+      title: Не найдено
       sorry: 'К сожалению, %{type} #%{id} не найден.'
       type:
         node: точка

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 1497f06dcad47391a53c59ea161ea96090f90e86..bbe971cd7a18c4a8ab8c941e84d9b27a183fea67 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -519,7 +519,7 @@ tr:
     feed:
       user:
         title: '%{user} için OpenStreetMap günlük girdileri'
-        description: '%{user} kullanıcısından en yeni OpenStreetMap günlük girdileri'
+        description: '%{user} adlı kullanıcının en yeni OpenStreetMap günlük girdileri'
       language:
         title: '%{language_name} dillindeki OpenStreetMap günlük girdileri'
         description: OpenStreetMap kullanıcılarının %{language_name} dillindeki en
@@ -1094,7 +1094,7 @@ tr:
           city_block: Ada
           country: Ülke
           county: İlçe
-          farm: Tarla
+          farm: Çiftlik
           hamlet: Mezra
           house: Ev
           houses: Evler
@@ -2691,11 +2691,11 @@ tr:
     revoke:
       title: Görev iptalini onayla
       heading: Görev iptalini onayla
-      are_you_sure: '%{name} kullanıcısından %{role} görevini almak istediğinizden
+      are_you_sure: '%{name} adlı kullanıcıyı %{role} görevinden almak istediğinizden
         emin misiniz?'
       confirm: Onayla
-      fail: '%{name} kullanıcısından %{role} görevi alma işlemi başarısız oldu. Lütfen,
-        hem kullanıcının hem görevin geçerli olduğunu kontrol edin.'
+      fail: '`%{name}'' adlı kullanıcı `%{role}'' görevinden alınamadı. Lütfen kullanıcı
+        ve görevin geçerli olup olmadığını kontrol edin.'
   user_blocks:
     model:
       non_moderator_update: Engelleme yapmak ya da engellemeyi güncellemek için bir