Localisation updates from https://translatewiki.net.

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 38ae01445f7088c178138dc2e81c217ac970bed3..977b42c0feba2018a2c3ebf8e68fc08958fecbae 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -990,12 +990,12 @@ da:
           telescope: Teleskop
           tower: Tårn
           utility_pole: Elmast
-          wastewater_plant: Affaldsfabrik
+          wastewater_plant: Vandrensningsanlæg
           watermill: Vandmølle
           water_tap: Vandaftapning
           water_tower: Vandtårn
           water_well: Brønd
-          water_works: Vandanlæg
+          water_works: Vandværk
           windmill: Vindmølle
           works: Fabrik
           "yes": Menneskeskabt

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8db19b5706c1c0ca1f94a6869fc9eab3c43328e3..86046a88cea91544ab866f370d9ae5d2bb8977d1 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1053,7 +1053,7 @@ es:
           telescope: Telescopio
           tower: Torre
           utility_pole: Poste de servicios públicos
-          wastewater_plant: Planta de tratamiento de aguas
+          wastewater_plant: Depuradora de aguas residuales
           watermill: Molino hidráulico
           water_tap: Llave de agua
           water_tower: Torre de agua

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 8845b5a2b9c325bbe931e9122d48a1d778c5e9a8..09642aa195675e3e6523de0546d81c9a702b47e6 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1085,7 +1085,7 @@ fa:
           quarter: چهارک
           region: منطقه
           sea: دریا
-          square: مربع
+          square: میدان
           state: استان
           subdivision: زیربخش
           suburb: منطقه شهری

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e1d29f99a9b5d06c0d6221b5af986ba2a8b7f2e1..56ed4331e59e3cfb01c23b2ad6ecb1ff0808be0b 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -853,6 +853,7 @@ fr:
           window_construction: Construction de fenêtre
           winery: Domaine viticole
           "yes": Boutique d’artisanat
+        crossing: Croisement
         emergency:
           access_point: Point d’accès
           ambulance_station: Dépôt d’ambulances
@@ -1108,6 +1109,7 @@ fr:
           hill: Colline
           hot_spring: Source thermale
           island: Île
+          isthmus: Isthme
           land: Terre
           marsh: Marécage
           moor: Brande
@@ -1122,10 +1124,13 @@ fr:
           sand: Sable
           scree: Éboulis
           scrub: Broussailles
+          shingle: Galet
           spring: Source
           stone: Pierre
           strait: Détroit
           tree: Arbre
+          tree_row: Ligne d’arbres
+          tundra: Toundra
           valley: Vallée
           volcano: Volcan
           water: Eau
@@ -1528,9 +1533,10 @@ fr:
     intro_text: OpenStreetMap est une carte du monde, créée par des gens comme vous
       et libre d’utilisation sous licence libre.
     intro_2_create_account: Créez un compte d’utilisateur
-    hosting_partners_html: L’hébergement est pris en charge par %{ucl}, %{bytemark},
-      et d’autres %{partners}.
+    hosting_partners_html: L’hébergement est pris en charge par %{ucl}, %{fastly},
+      %{bytemark}, et d’autres %{partners}.
     partners_ucl: l’University College de Londres
+    partners_fastly: Fastly
     partners_bytemark: l'Hébergeur Bytemark
     partners_partners: partenaires
     tou: Conditions d’utilisation
@@ -1581,9 +1587,9 @@ fr:
       subject: '[OpenStreetMap] %{user} vous a ajouté comme ami'
       had_added_you: '%{user} vous a ajouté comme ami dans OpenStreetMap.'
       see_their_profile: 'Vous pouvez voir son profil ici : %{userurl}.'
-      see_their_profile_html: Vous pouvez voir leur profil sur %{userurl}.
+      see_their_profile_html: Vous pouvez voir son profil sur %{userurl}.
       befriend_them: 'Vous pouvez également l’ajouter comme ami(e) ici : %{befriendurl}.'
-      befriend_them_html: Vous pouvez aussi les ajouter comme amis sur %{befriendurl}.
+      befriend_them_html: Vous pouvez aussi l’ajouter comme ami à l’adresse %{befriendurl}.
     gpx_description:
       description_with_tags_html: 'Il semblerait que votre fichier GPX %{trace_name}
         avec la description %{trace_description} et les balises suivantes : %{tags}'
@@ -2036,9 +2042,9 @@ fr:
           <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">région du Vorarlberg</a> et la
           région du Tyrol (sous licence <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT avec amendements</a>).
         contributors_au_html: |-
-          <strong>Australie</strong> : contient des données sourcées de
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a> publiées sous la licence
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> accordée par le Commonwealth d’Australie.
+          <strong>Australie</strong> : incorpore ou développé en utilissant Limites administratives &copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a> publiées sous la licence
+          <a href="https://creativecommons.org/licenses/by/4.0/">Creative licence internationale Commons Attribution 4.0 (CC BY 4.0)</a>.
         contributors_ca_html: '<strong>Canada</strong> : contient des données de <em>GeoBase</em>®,
           <em>GeoGratis</em> (© Département des Ressources naturelles du Canada),
           <em>CanVec</em> (© Département des Ressources naturelles du Canada) et <em>StatCan</em>

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 8557c820457e6270fd48c432a8cb0e48d84b7fea..a38d3c273326ba477c3fca6115ff22b704e8ffbf 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1435,8 +1435,8 @@ ia:
     intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere
       de usar sub un licentia aperte.
     intro_2_create_account: Crea un conto de usator
-    hosting_partners_html: Le allogiamento web es supportate per %{ucl}, %{bytemark}
-      e altere %{partners}.
+    hosting_partners_html: Le allogiamento web es supportate per %{ucl}, %{fastly},
+      %{bytemark} e altere %{partners}.
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partners

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 735a560c413c4e6be7ef93f8633c42b1597308ae..c14aa239bf504f59235c1584a0a42bb9df395cd1 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1488,8 +1488,8 @@ it:
     intro_text: OpenStreetMap è una mappa del mondo, creata da persone come te e libera
       da utilizzare secondo una licenza aperta.
     intro_2_create_account: Crea un account utente
-    hosting_partners_html: L'hosting è supportato da %{ucl}, %{bytemark}, e da altri
-      %{partners}.
+    hosting_partners_html: L'hosting è supportato da %{ucl}, %{fastly}, %{bytemark},
+      e da altri %{partners}.
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partner

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 1bce0654c89bdad8be9785b20a69c9b31379984b..5b43575541863b37e2c9c34ef4f8c347bca10025 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -182,6 +182,8 @@ ko:
         pass_crypt: 비밀번호
         pass_crypt_confirmation: 비밀번호 확인
     help:
+      doorkeeper/application:
+        redirect_uri: URI마다 1줄 사용
       trace:
         tagstring: 쉼표로 구분
       user_block:
@@ -495,6 +497,11 @@ ko:
       comment: 의견
       newer_comments: 새 의견
       older_comments: 이전 의견
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: 애플리케이션을 등록했습니다.
   friendships:
     make_friend:
       heading: '%{user} 님을 친구로 추가할까요?'
@@ -2098,6 +2105,7 @@ ko:
       uploaded: '올린 날짜:'
       points: '점:'
       start_coordinates: '시작 좌표:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: 지도
       edit: 편집
       owner: '소유자:'
@@ -2138,6 +2146,7 @@ ko:
         <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>위키 문서</a>에서
         GPS 궤적에 대해 더 알아보세요.
       upload_trace: 궤적 올리기
+      remove_tag_filter: 태그 필터 제거
     destroy:
       scheduled_for_deletion: 삭제 계획중인 궤적
     make_public:
@@ -2167,6 +2176,7 @@ ko:
       need_to_see_terms: API에 대한 접근을 일시적으로 중지했습니다. 기여자 약관을 보려면 웹 인터페이스에 로그인하세요. 기여자
         약관에 동의할 필요는 없습니다만 기여자 약관을 보아야 합니다.
     settings_menu:
+      account_settings: 계정 설정
       oauth1_settings: OAuth 1 설정
       oauth2_applications: OAuth 2 애플리케이션
       oauth2_authorizations: OAuth 2 인가
@@ -2198,6 +2208,9 @@ ko:
       missing: 이 애플리케이션이 이 기능을 사용할 수 있도록 승인하지 않았습니다
     scopes:
       write_prefs: 사용자 환경 설정 수정
+      write_api: 지도 수정
+      read_gpx: 비공개 GPS 궤적 읽기
+      write_gpx: GPS 궤적 업로드
   oauth_clients:
     new:
       title: 새 애플리케이션 등록
@@ -2241,10 +2254,13 @@ ko:
   oauth2_applications:
     index:
       title: 내 클라이언트 애플리케이션
+      new: 새 애플리케이션 등록
       name: 이름
       permissions: 권한
     application:
       edit: 편집
+      delete: 삭제
+      confirm_delete: 이 애플리케이션을 삭제하시겠습니까?
     new:
       title: 새 애플리케이션 등록
     edit:
@@ -2256,10 +2272,16 @@ ko:
       client_id: 클라이언트 ID
       permissions: 권한
   oauth2_authorizations:
+    new:
+      authorize: 인가
+      deny: 거부
     error:
       title: 오류가 발생했습니다
+    show:
+      title: 인증 코드
   oauth2_authorized_applications:
     index:
+      title: 내 인증한 애플리케이션
       application: 애플리케이션
       permissions: 권한
   users:
@@ -2306,6 +2328,7 @@ ko:
         italy: 이탈리아
         rest_of_world: 나머지 국가
     terms_declined_flash:
+      terms_declined_link: 이 위키 문서
       terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     no_such_user:
       title: 이러한 사용자는 없습니다
@@ -2344,6 +2367,7 @@ ko:
       spam score: '스팸 점수:'
       description: 설명
       user location: 사용자 위치
+      edit_your_profile: 내 프로파일 편집
       my friends: 내 친구
       no friends: 아직 어떠한 친구도 추가하지 않았습니다.
       km away: '%{count}km 거리'

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index a486f8863716735c06588d29ddd0db6f1dbd3df4..80800d7e10d2c8ea70085a903a44d530bbe8427b 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -72,6 +72,8 @@ lb:
       report: Rapport
       session: Sessioun
       trace: Spuer
+      tracepoint: Spuermarkéierung
+      tracetag: Spuer-Attribut
       user: Benotzer
       user_preference: Benotzerastellung
       user_token: Benotzer-Token
@@ -122,6 +124,7 @@ lb:
       message:
         sender: Sender
         title: Sujet
+        body: Text
         recipient: Empfänger
       redaction:
         title: Titel
@@ -140,7 +143,7 @@ lb:
         description: Beschreiwung vum Profil
         home_lat: Breedegrad
         home_lon: Längegrad
-        languages: Léifst Sproochen
+        languages: Liblingssproochen
         preferred_editor: Liblingseditor
         pass_crypt: Passwuert
         pass_crypt_confirmation: Passwuert confirméieren
@@ -362,7 +365,7 @@ lb:
       title: 'Notiz: %{id}'
       new_note: Nei Notiz
       description: Beschreiwung
-      open_title: 'Ungeléisten Hiweis #%{note_name}'
+      open_title: 'Ongeléisten Hiweis #%{note_name}'
       closed_title: 'Geléisten Hiweis #%{note_name}'
       hidden_title: Verstoppt Notiz N° %{note_name}
       opened_by_html: Ugeluecht vum %{user} <abbr title='%{exact_time}'>viru(n) %{when}</abbr>
@@ -827,12 +830,14 @@ lb:
           bunker: Bunker
           cannon: Historesch Kanoun
           castle: Schlass
+          charcoal_pile: Historesch Meilerplaz
           church: Kierch
           city_gate: Stadpaart
           citywalls: Stadmaueren
           heritage: Denkmal
           hollow_way: Huelwee
           house: Haus
+          manor: Guttshaus
           memorial: Monument
           milestone: Historesche Meilesteen
           mine: Minn
@@ -847,6 +852,7 @@ lb:
           tower: Tuerm
           wayside_chapel: Weekapell
           wayside_cross: Weekräiz
+          wayside_shrine: Bildstack
           wreck: Wrack
           "yes": Historesch Plaz
         junction:
@@ -873,32 +879,62 @@ lb:
           military: Militairegebitt
           mine: Minn
           orchard: Bongert
+          plant_nursery: Bamschoul
           quarry: Steekaul
           railway: Eisebunn
+          recreation_ground: Erhuelungsgebitt
+          religious: Terrain mat reliéiser Notzung
+          reservoir: Reservoir
+          reservoir_watershed: Waasseranzuchsgebitt
           residential: Wunngéigend
+          retail: Eenzelhandel
+          village_green: Duerfwiss
           vineyard: Wéngert
+          "yes": Buedemnotzung
         leisure:
+          adult_gaming_centre: Automatecasino
+          amusement_arcade: Spillhal
+          bandstand: Musekspavillon
+          bird_hide: Vullebeobachtungsplaz
+          bleachers: Sëtzreien
+          bowling_alley: Bowlingbunn
+          common: ëfffentlech Gréngfläch
           dance: Danzsall
+          dog_park: Hondspark
+          firepit: Feierplaz
+          fishing: Fëschereigronn
+          fitness_centre: Fitnessstudio
+          fitness_station: Fräiloft-Fitnessariichtung
           garden: Gaart
           golf_course: Golfterrain
+          horse_riding: Reitanlag
           ice_rink: Äispist
           marina: Yachthafen
           miniature_golf: Minigolf
           nature_reserve: Naturschutzgebitt
+          outdoor_seating: Baussebestullung
           park: Park
           picnic_table: Picknickdësch
           pitch: Sportsterrain
           playground: Spillplaz
+          recreation_ground: Erhuelungsgebitt
+          resort: Vakanzenuert
           sauna: Sauna
+          slipway: Slipanlag
+          sports_centre: Sportszenter
           stadium: Stadion
           swimming_pool: Schwämm
+          track: Lafbunn
           water_park: Waasserpark
           "yes": Fräizäit
         man_made:
+          adit: Stollen
+          advertising: Baussereklamm
           antenna: Antenn
           avalanche_protection: Lawineschutz
           beacon: Liichttuerm
           beehive: Beiestack
+          breakwater: Hafendamm
           bridge: Bréck
           bunker_silo: Bunker
           cairn: Steemännchen
@@ -908,8 +944,10 @@ lb:
           crane: Kran
           cross: Kräiz
           dyke: Däich
+          embankment: Rampli
           flagpole: Fändelsmast
           gasometer: Gasometer
+          groyne: Buhn
           kiln: Brennuewen
           lighthouse: Liichttuerm
           mast: Mast
@@ -956,6 +994,7 @@ lb:
           cape: Kap
           cave_entrance: Hielenagang
           cliff: Klipp
+          coastline: Küstelinn
           crater: Krater
           dune: Dün
           fell: Fjell
@@ -966,10 +1005,12 @@ lb:
           grassland: Wiss
           heath: Heed
           hill: Hiwwel
+          hot_spring: Gliddeg Quell
           island: Insel
           land: Land
           marsh: Mouer
           moor: Mouer
+          mud: Schléck
           peak: Sommet
           peninsula: Hallefinsel
           point: Punkt
@@ -979,6 +1020,7 @@ lb:
           saddle: Pass
           sand: Sand
           scree: Gestengs
+          scrub: Buschland
           spring: Quell
           stone: Steen
           strait: Mierengt
@@ -1071,6 +1113,7 @@ lb:
           yard: Rangéiergare
         shop:
           agrarian: Agrargeschäft
+          alcohol: Spirituosebuttek
           antiques: Antiquitéitegeschäft
           appliance: Haushaltsgerätebuttek
           art: Konschtbuttek
@@ -1198,6 +1241,7 @@ lb:
           caravan_site: Wunnmobil-Stellplaz
           chalet: Chalet
           gallery: Galerie
+          guest_house: Pensioun
           hostel: Jugendherberg
           hotel: Hotel
           information: Informatioun
@@ -1209,6 +1253,7 @@ lb:
           wilderness_hut: Schutzhütt
           zoo: Zoo
         tunnel:
+          building_passage: Gebaisduerchgang
           culvert: Duerchlooss
           "yes": Tunnel
         waterway:
@@ -1304,6 +1349,7 @@ lb:
       reopened: De Problemstatus gouf op „Oppe“ geännert
     comments:
       comment_from_html: Commentaire vun %{user_link} erstallt den %{comment_created_at}
+      reassign_param: Problem op en Neits zouweisen?
     reports:
       reported_by_html: Gemellt als %{category} vun %{user} den %{updated_at}
     helper:
@@ -1322,15 +1368,30 @@ lb:
           sécher, datt:'
         not_just_mistake: Du bass dir sécher, datt däi Problem net nëmmen e Feeler
           ass.
+        resolve_with_user: Du hues ewell versicht, de Problem mam zoustännege Benotzer
+          ze léisen.
       categories:
         diary_entry:
+          spam_label: Dëse Blogantrag ass/enthält Spam
+          offensive_label: Dëse Blogcommentaire ass obszön/ustéisseg
+          threat_label: Dëse Blogantrag enthält eng Menace
+          other_label: Anerer
+        diary_comment:
+          spam_label: Dëse Blogantrag ass/enthält Spam
+          offensive_label: Dëse Blogcommentaire ass obszön/ustéisseg
+          threat_label: Dëse Blogantrag enthält eng Menace
           other_label: Anerer
         user:
+          spam_label: Dëse Benotzerkont ass/enthält Spam
+          offensive_label: Dëse Benotzerkont ass obszön/ustéisseg
+          threat_label: Dëse Benotzerkont enthält eng Menace
           vandal_label: Dëse Benotzer ass e Vandal
           other_label: Anerer
         note:
           spam_label: Dës Notiz ass Spam
+          personal_label: Dësen Hiweis enthält perséinlech Donnéeën
           abusive_label: Dës Notiz ass abusiv
+          other_label: Anerer
     create:
       successful_report: Äre Rapport gouf enregistréiert
       provide_details: Gitt wgl. déi gefroten Detailer un
@@ -1338,8 +1399,9 @@ lb:
     logo:
       alt_text: OpenStreetMap Logo
     home: Op déi Plaz zréckgoen déi als Doheem definéiert ass
-    logout: Ausloggen
+    logout: Ofmellen
     log_in: Aloggen
+    log_in_tooltip: Mat engem existéierende Kont umellen
     sign_up: Mellt Iech un
     start_mapping: Mat dem Kaartéieren ufänken
     sign_up_tooltip: E Kont erstellen, fir 'Donnéeë beaarbechten ze kënnen
@@ -1438,6 +1500,11 @@ lb:
       greeting: Bonjour !
       created: Iergendeen (hoffentlech du) huet grad bei %{site_url} e Benotzerkont
         erstallt
+      confirm: Ier mir eppes ënnerhuelen, brauche mir eng Bestätegung, datt dës Ufro
+        vun dir staamt. Falls jo, klick wannechgelift op den ënne stoende Link, fir
+        däi Kont ze bestätegen.
+      welcome: No der Bestätegung vun dengem Benotzerkont gi mir dir zousätzlech Informatiounen,
+        fir unzefänken.
     email_confirm:
       subject: '[OpenStreetMap] Confirméiert Är E-Mailadress'
       greeting: Salut,
@@ -1497,7 +1564,14 @@ lb:
       commented:
         subject_own: '[OpenStreetMap] %{commenter} huet ee vun dengen Ännerungssätz
           kommentéiert.'
+        subject_other: '[OpenStreetMap] %{commenter} huet en Ännerungssaz kommentéiert,
+          un deems du interesséiert bass'
+        your_changeset: '%{commenter} huet e Commentaire um %{time} zu engem vun dengen
+          Ännerungssätz hannerlooss'
         partial_changeset_without_comment: ouni Kommentar
+      details: Méi Detailer iwwer den Ännerungssaz kënnen ënner %{url} fonnt ginn.
+      unsubscribe: Fir d'Aktualiséierungen un dësem Ännerungssaz ofzebestellen, besich
+        %{url} a klick op „Ofmellen“.
   confirmations:
     confirm:
       heading: Iwwerpréift Är E-Mail!
@@ -1512,6 +1586,7 @@ lb:
     confirm_email:
       heading: Eng Ännerung vun enger E-Mailadress confirméieren
       button: Confirméieren
+      success: D'Ännerung vun denger E-Mail-Adress gouf bestätegt!
       unknown_token: Dee Confirmatiouns-Code ass ofgelaf oder et gëtt en net.
   messages:
     inbox:
@@ -1519,7 +1594,7 @@ lb:
       new_messages:
         one: '%{count} neie mMssage'
         other: '%{count} nei Messagen'
-      from: Vum
+      from: Vu(n)
       subject: Sujet
       date: Datum
     message_summary:
@@ -1537,11 +1612,22 @@ lb:
       title: Kee sou ee Message
       heading: Kee sou ee Message
     outbox:
+      messages:
+        one: Du hues %{count} Noriicht gesent
+        other: Du hues %{count} Noriichte gesent
+      to: Un
       subject: Sujet
       date: Datum
+      no_sent_messages_html: Du hues nach keng Noriichte versent. Wëlls de mat %{people_mapping_nearby_link}
+        Kontakt ophuelen?
+      people_mapping_nearby: Mapperen an der Noperschaft
+    reply:
+      wrong_user: Du bass als '%{user}' ugemellt, awer d'Noriicht, déis du beäntwere
+        wollts, gouf un en anere Benotzer geschéckt. Mell dech fir d'Beäntwerte wannechgelift
+        mat dem richtege Benotzer un.
     show:
       title: Message liesen
-      from: Vum
+      from: Vu(n)
       subject: Sujet
       date: Datum
       reply_button: Äntwerten
@@ -1549,6 +1635,9 @@ lb:
       destroy_button: Läschen
       back: Zréck
       to: Fir
+      wrong_user: Du bass ugemellt als '%{user}', awer d'Noriicht, déis du liese wollts,
+        gouf un en anere Benotzer geschéckt. Wannechgelift mell dech fir ze liese
+        mat dem richtege Benotzer un.
     sent_message_summary:
       destroy_button: Läschen
     mark:
@@ -1562,22 +1651,57 @@ lb:
       heading: Passwuert vergiess?
       email address: 'E-Mail-Adress:'
       new password button: Passwuert zrécksetzen
+      help_text: Wannechgelift gëff deng E-Mail-Adress an, mat däers du dech ugemellt
+        has. Mir wäerten dir dann e Link schécken, mat dems du däi Passwuert zerécksetze
+        kanns.
+      notice email on way: Eng E-Mail mat Hiweiser fir d'Zerécksetze vum Passwuert
+        gouf un dech versent.
       notice email cannot find: Déi E-Mail-Adress konnt net fonnt ginn, pardon.
     reset_password:
       title: Passwuert zrécksetzen
       heading: Passwuert fir %{user} zrécksetzen
       reset: Passwuert zrécksetzen
       flash changed: Äert Passwuert gouf geännert.
+      flash token bad: Mir konnten dëst Kierzel leider net fannen. Du hues dech méiglecherweis
+        vertippt oder du hues en ongëltege Link opgemaach.
+  preferences:
+    show:
+      title: Meng Benotzerastellungen
+      preferred_editor: Liblingseditor
+      preferred_languages: Léifste Sproochen
+      edit_preferences: Benotzerastellungen änneren
+    edit:
+      title: Benotzerastellungen änneren
+      save: Benotzerastellungen aktualiséieren
+      cancel: Ofbriechen
+    update:
+      failure: D'Benotzerastellunge konnten net aktualiséiert ginn.
+    update_success_flash:
+      message: Astellungen aktualiséiert.
   profiles:
     edit:
+      title: Profil beaarbechten
+      save: Profil aktualiséieren
+      cancel: Ofbriechen
       image: Bild
       gravatar:
+        gravatar: Gravatar verwenden
+        link: https://wiki.openstreetmap.org/wiki/DE:Gravatar
+        what_is_gravatar: Wat ass Gravatar?
         disabled: Gravatar gouf desaktivéiert.
         enabled: D'Weise vun Ärem Gravatar gouf aktivéiert.
       new image: E Bild derbäisetzen
       keep image: Dat aktuellt Bild behalen
       delete image: Dat aktuellt Bild ewechhuelen
       replace image: Dat aktuellt Bild ersetzen
+      image size hint: (quadratesch Biller mat zumindest 100x100 Pixel funktionéieren
+        am beschten)
+      home location: Heemecht
+      no home location: Du hues nach keng Heemecht aginn.
+      update home location on click: Heemecht beim Klick op d'Kaart aktualiséieren
+    update:
+      success: Profil aktualiséiert.
+      failure: De Profil konnt net aktualiséiert ginn.
   sessions:
     new:
       title: Umellen
@@ -1590,6 +1714,8 @@ lb:
       login_button: Umellen
       register now: Elo aschreiwen
       new to osm: Nei bei OpenStreetMap?
+      to make changes: Fir Donnéesännerunge bei OpenStreetMap virhuelen ze kënnen,
+        muss Du e Benotzerkont hunn.
       create account minute: Maacht e Benotzerkont. Et dauert nëmmen eng Minutt.
       no account: Hutt Dir kee Benotzerkont?
       openid_logo_alt: Alogge mat enger OpenID
@@ -1642,6 +1768,11 @@ lb:
     about:
       next: Weider
       local_knowledge_title: Lokaalt Wëssen
+      community_driven_html: |-
+        D'OpenStreetMap-Communautéit ass villfälteg, leidenschaftlech a wiisst deeglech. Eis Matwierkend si begeeschtert Mapper, GIS-Profien, Ingenieuren, déi d'OSM-Servere bedreiwen a vill méi.
+        Fir méi iwwer d'Communautéit z'erfueren, lies eisen <a href='https://blog.openstreetmap.org'>OpenStreetMap-Blog</a>,
+        d'<a href='%{diary_path}'>Benotzertagebicher</a>,
+        <a href='https://blogs.openstreetmap.org/'>Community-Bloggen</a> an d'Websäit vun der <a href='https://www.osmfoundation.org/'>OSM-Fondatioun</a>.
       open_data_title: Open Data
       legal_title: Legal
       partners_title: Partner
@@ -1722,6 +1853,10 @@ lb:
       wiki:
         url: https://wiki.openstreetmap.org/
         title: OpenStreetMap Wiki
+    potlatch:
+      id_html: Alternativ kanns du däi Standardediteur op iD astellen, deen an dengem
+        Webbrowser wéi virdru Potlach ausgeféiert gëtt. <a href="%{settings_url}">Änner
+        hei deng Benotzerastellungen</a>.
     sidebar:
       search_results: Resultater vum Sichen
       close: Zoumaachen
@@ -1830,11 +1965,13 @@ lb:
     authorize:
       allow_read_prefs: Är Benotzerastellunge liesen.
       allow_write_prefs: Är Benotzerastellungen änneren.
+      allow_write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen
       allow_write_api: d'Kaart änneren.
       allow_write_notes: Notizen änneren.
     scopes:
       read_prefs: Benotzerastellunge liesen
       write_prefs: Benotzerastellungen änneren
+      write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen
       write_api: D'Kaart änneren
       write_gpx: GPS-Tracks eroplueden
       write_notes: Notizzen änneren
@@ -1892,6 +2029,8 @@ lb:
       email address: 'E-Mail-Adress:'
       confirm email address: 'E-Mail-Adress confirméieren:'
       display name: Numm weisen
+      display name description: Däin ëffentlech ugewisene Benotzernumm. E ka spéider
+        an den Astellunge geännert ginn.
       continue: Mellt Iech un
     terms:
       heading: Bedingungen
@@ -1909,6 +2048,7 @@ lb:
       deleted: geläscht
     show:
       my diary: Mäi Blog
+      new diary entry: Neie Blogantrag
       my edits: Meng Ännerungen
       my notes: Meng Notizen
       my messages: Meng Messagen
@@ -1951,6 +2091,8 @@ lb:
       unhide_user: Dëse Benotzer net méi verstoppen
       delete_user: Dëse Benotzer läschen
       confirm: Confirméieren
+      friends_changesets: Ännerungssätz vun dénge Frënn
+      nearby_changesets: Ännerungssätz vu Benotzer an der Noperschaft
       report: Dëse Benotzer mellen
     popup:
       friend: Frënn
@@ -2093,14 +2235,19 @@ lb:
       base:
         standard: Standard
         cycle_map: Vëloskaart
+        transport_map: Verkéierskaart
         hot: Humanitär
         opnvkarte: Bus-Zuch-Kaart
       layers:
+        notes: Hiweiser/Feelermeldungen
+        data: Kaartendonnéeën
         gps: Ëffentlech GPS Spueren
+        overlays: Overlayë fir d’Feelersich aktivéieren
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Maacht een Don</a>
     site:
       edit_tooltip: Kaart änneren
       edit_disabled_tooltip: Erazoomen fir d'Kaart z'änneren
+      queryfeature_tooltip: Objetsoffro
     changesets:
       show:
         comment: Bemierkung
@@ -2170,6 +2317,7 @@ lb:
       directions_to: Heihinn
       add_note: Eng Notiz hei derbäisetzen
       show_address: Adress weisen
+      query_features: Objetsoffro
       centre_map: Kaart hei zentréieren
   redactions:
     show:

diff --git a/config/locales/my.yml b/config/locales/my.yml
index b28f965b8a11d4c64498507fdab7233970459b5c..09cf68e6394510084b64c682e5e8ddd72340436d 100644 (file)
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -19,7 +19,7 @@ my:
         create: ပို့
       client_application:
         create: မှတ်ပုံတင်ရန်
-        update: á\80\95á\80¼á\80\84á\80ºá\80\86á\80\84á\80ºá\80\9bá\80\94á\80º
+        update: á\80\99á\80½á\80\99á\80ºá\80¸á\80\99á\80¶
       trace:
         create: တင်ရန်
         update: ပြောင်းလဲမှုများကို သိမ်းရန်
@@ -46,13 +46,13 @@ my:
       trace:
         user: အသုံးပြုသူ
         visible: မြင်
-        name: အမည်
+        name: á\80\96á\80­á\80¯á\80\84á\80ºá\80¡á\80\99á\80\8aá\80º
         size: အရွယ်အစား
         latitude: လတ္တီကျု
         longitude: လောင်ဂျီကျု
         public: အများကြည့်
         description: ဖော်ပြချက်
-        visibility: 'မြင်နိုင်မှု:'
+        visibility: မြင်နိုင်မှု
       message:
         sender: ပေးပို့သူ
         title: အကြောင်းအရာ
@@ -62,13 +62,13 @@ my:
         description: ဖော်ပြချက်
       user:
         email: အီးမေးလ်
-        new_email: 'အီးမေးလ်လိပ်စာ အသစ်:'
+        new_email: အီးမေးလ်လိပ်စာ အသစ်
         active: လက်ရှိအသုံးပြုနေသည်
         display_name: ဖော်ပြမည့်အမည်
-        description: ဖော်ပြချက်
-        home_lat: 'လတ္တီကျု:'
-        home_lon: 'လောင်ဂျီကျု:'
-        languages: ဘာသာစကားများ
+        description: á\80\95á\80\9bá\80­á\80¯á\80\96á\80­á\80¯á\80\84á\80º á\80\96á\80±á\80¬á\80ºá\80\95á\80¼á\80\81á\80»á\80\80á\80º
+        home_lat: လတ္တီကျု
+        home_lon: လောင်ဂျီကျု
+        languages: á\80\94á\80¾á\80\85á\80ºá\80\9eá\80\80á\80ºá\80\9eá\80±á\80¬ á\80\98á\80¬á\80\9eá\80¬á\80\85á\80\80á\80¬á\80¸á\80\99á\80»á\80¬á\80¸
         pass_crypt: စကားဝှက်
   datetime:
     distance_in_words_ago:
@@ -771,7 +771,7 @@ my:
       your location: သင်၏ တည်နေရာ
       friend: သူငယ်ချင်း
     account:
-      current email address: 'လက်ရှိ အီးမေးလ်လိပ်စာ:'
+      current email address: လက်ရှိ အီးမေးလ်လိပ်စာ
       save changes button: ပြောင်းလဲမှုများကို သိမ်းရန်
     index:
       title: အသုံးပြုသူများ

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 7613e311391ebc3a60bf70a392973017d1efb488..4c17e8d8767cd5eb75fe57eb5d77c5e6ed017f44 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -56,6 +56,7 @@
 # Author: Xiaomingyan
 # Author: Yfdyh000
 # Author: Zazzzz
+# Author: Zfshuo
 # Author: Zhang8569
 # Author: 乌拉跨氪
 # Author: 予弦
@@ -1483,7 +1484,7 @@ zh-CN:
     intro_header: 欢迎访问 OpenStreetMap！
     intro_text: OpenStreetMap 是一个世界地图，由像您一样的人们所构筑，可依据开放许可协议自由使用。
     intro_2_create_account: 创建用户账户
-    hosting_partners_html: 主机由%{ucl}、%{bytemark}，以及其他%{partners}所支持。
+    hosting_partners_html: 主机由%{ucl}、%{fastly}、%{bytemark}，以及其他%{partners}所支持。
     partners_ucl: 伦敦大学学院
     partners_bytemark: Bytemark主机
     partners_partners: 合作伙伴
@@ -1789,6 +1790,8 @@ zh-CN:
       logout_button: 退出
   shared:
     markdown_help:
+      title_html: 使用 <a href="https://daringfireball.net/projects/markdown/">kramdown</a>
+        解析
       headings: 标题
       heading: 标题
       subheading: 副标题
@@ -1880,8 +1883,8 @@ zh-CN:
           Vorarlberg</a>及 Land Tirol (修订的 <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
           AT</a>协议)的数据。
         contributors_au_html: |-
-          <strong>澳大利亚</strong>：包含来自
-          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA 澳大利亚有限公司是</a>的资料，依据<a href="https://creativecommons.org/licenses/by/4.0/deed.zh_TW">CC BY 4.0 国际</a>澳大利亚联邦条款授权。
+          <strong>澳大利亚</strong>：使用行政边界纳入或开发&copy;
+          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape澳大利亚</a>依据<a href="https://creativecommons.org/licenses/by/4.0/">知识共享署名4.0国际许可协议（CC BY 4.0）</a>由澳大利亚联邦条款授权。
         contributors_ca_html: <strong>加拿大</strong>：含有来自GeoBase&reg;，GeoGratis（&copy;
           加拿大自然资源部），CanVec（&copy; 加拿大自然资源部）和StatCan（加拿大统计局地理处）的数据。
         contributors_fi_html: <strong>芬兰</strong>：包含来自芬兰国家测绘局地形数据库和其他测绘机构的数据，依据 <a
@@ -2532,6 +2535,7 @@ zh-CN:
     suspended:
       title: 帐户已暂停
       heading: 帐户已暂停
+      support: 支持
       body_html: |-
         <p>
         对不起，您的帐户已因可疑
@@ -2693,6 +2697,7 @@ zh-CN:
       custom_dimensions: 设定自定义尺寸
       format: 格式：
       scale: 比例：
+      image_dimensions: 图像将显示标准层为%{width} x %{height}
       download: 下载
       short_url: 短URL
       include_marker: 包含标记