From: translatewiki.net Date: Thu, 17 Sep 2020 14:47:48 +0000 (+0200) Subject: Localisation updates from https://translatewiki.net. X-Git-Tag: live~2628 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/da193a91d47450ddeefd697f9b731f226f3f295f Localisation updates from https://translatewiki.net. --- diff --git a/config/locales/af.yml b/config/locales/af.yml index 22d613020..83387de3e 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -1606,8 +1606,6 @@ af: reset_password: title: Herstel wagwoord heading: Herstel wagwoord vir %{user} - password: 'Wagwoord:' - confirm password: 'Bevestig wagwoord:' reset: Herstel wagwoord flash changed: U wagwoord is verander. new: diff --git a/config/locales/aln.yml b/config/locales/aln.yml index 866b86fd9..5c2cdb730 100644 --- a/config/locales/aln.yml +++ b/config/locales/aln.yml @@ -1131,8 +1131,6 @@ aln: reset_password: title: Ricakto fjalëkalimin heading: Ricakto fjalëkalimin për %{user} - password: 'Fjalëkalimi:' - confirm password: 'Konfirmo Fjalëkalimin:' reset: Ricakto Fjalëkalimin flash changed: Fjalëkalimi juaj u ndryshua. flash token bad: Sun e gjetëm qat token, kontrolloje URL? diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 97472a085..9ad85193f 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -2140,8 +2140,6 @@ ar: reset_password: title: إعادة ضبط كلمة السر heading: إعادة تعيين كلمة السر %{user} - password: 'كلمة السر:' - confirm password: 'تأكيد كلمة السر:' reset: أعد ضبط كلمة السر flash changed: كلمة مرورك قد تغيرت. flash token bad: لم نجد هذا النموذج، تحقق من المسار ربما؟ diff --git a/config/locales/arz.yml b/config/locales/arz.yml index cb17b7061..85d023e47 100644 --- a/config/locales/arz.yml +++ b/config/locales/arz.yml @@ -944,8 +944,6 @@ arz: reset_password: title: إعاده ضبط كلمه المرور heading: إعاده تعيين كلمه المرور %{user} - password: 'كلمه المرور:' - confirm password: 'أكّد كلمه المرور:' reset: إعاده ضبط كلمه المرور flash changed: كلمه المرور الخاصه بك قد تغيرت. flash token bad: لم تجد تلك المعلومات، تحقق من الرابط ربما؟ diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 93a4d93bb..165fed1cb 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -2117,8 +2117,6 @@ ast: reset_password: title: Reestablecer contraseña heading: Reestablecer la contraseña de %{user} - password: 'Contraseña:' - confirm password: 'Confirma la contraseña:' reset: Reaniciar contraseña flash changed: Cambióse la contraseña flash token bad: Nun s'alcontró esi token, ¿tendríes de comprobar la URL, seique? diff --git a/config/locales/az.yml b/config/locales/az.yml index 7ffeedbf6..e9bc4e6f8 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -1064,8 +1064,6 @@ az: reset_password: title: Parolu yenilə heading: '%{user} üçün parolu yenilə' - password: 'Parol:' - confirm password: 'Parolu təkrarla:' reset: Parolu Yenilə flash changed: Parolun indi dəyişildi. new: diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 662ba8e0b..f8df760b0 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -1345,8 +1345,6 @@ be-Tarask: reset_password: title: Ачысьціць пароль heading: Скінуць пароль для %{user} - password: 'Пароль:' - confirm password: 'Пацьверджаньне паролю:' reset: Ачысьціць пароль flash changed: Ваш пароль быў зьменены. flash token bad: Немагчыма знайсьці такі ключ, можа праверце URL-адрас? diff --git a/config/locales/be.yml b/config/locales/be.yml index 457507c03..f6629ca5e 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -2138,8 +2138,6 @@ be: reset_password: title: скінуць пароль heading: Скінуць пароль для %{user} - password: 'Пароль:' - confirm password: 'Пацвердзіце пароль:' reset: 'Скінуць пароль:' flash changed: Ваш пароль быў зменены. flash token bad: Не знайшоў такі токен, можа, праверце URL? diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 6358fc717..14209de94 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -131,6 +131,7 @@ bg: description: Описание languages: Езици pass_crypt: Парола + pass_crypt_confirmation: Потвърди парола help: trace: tagstring: разделени със запетая @@ -367,6 +368,8 @@ bg: no_more_area: Няма повече списъци с промени в този район. no_more_user: Няма повече списъци с промени от потребителя. load_more: Зареждане на още + timeout: + sorry: Съжаляваме, но списъка с промени който заявихте се зарежда твърде дълго. changeset_comments: comment: comment: Нов коментар към списък с промени № %{changeset_id} на %{author} @@ -375,6 +378,9 @@ bg: comment: Нов коментар към списък с промени № %{changeset_id} на %{author} index: title_all: Дискусия за промяна на OpenStreetMap + timeout: + sorry: Съжаляваме, но списъка с коментарит по промените който заявихте се зарежда + твърде дълго. diary_entries: new: title: Нова публикация в дневника @@ -466,7 +472,10 @@ bg: aerialway: cable_car: Кабинков лифт chair_lift: Седалков лифт + drag_lift: Влек + gondola: Лифт с Гондола pylon: Пилон + t-bar: Седалков лифт aeroway: aerodrome: Летище apron: Перон @@ -474,6 +483,7 @@ bg: hangar: Хангар helipad: Вертолетна площадка runway: Писта + taxilane: Таксилента taxiway: Път за рулиране terminal: Терминал amenity: @@ -487,6 +497,7 @@ bg: bicycle_parking: Паркинг за велосипеди bicycle_rental: Велосипеди под наем biergarten: Бирария на открито + blood_bank: Кръвна банка boat_rental: Наем на лодки brothel: Бордел bureau_de_change: Обменно бюро @@ -517,6 +528,7 @@ bg: gambling: Хазартни игри grave_yard: Гробище hospital: Болница + hunting_stand: Ловна стоянка ice_cream: Сладолед internet_cafe: Интернет Кафе kindergarten: Детска градина @@ -564,6 +576,7 @@ bg: administrative: Административна граница national_park: Национален парк protected_area: Защитена зона + "yes": Граница bridge: aqueduct: Акведукт suspension: Висящ мост @@ -593,8 +606,10 @@ bg: hut: Хижа industrial: Индустриална сграда kindergarten: Детска градина + manufacture: Производствена сграда office: Офис Сграда public: Обществена сграда + residential: Жилищна сграда roof: Покрив school: Училище static_caravan: Каравана @@ -610,15 +625,19 @@ bg: brewery: Пивоварна carpenter: Дърводелец electrician: Електротехник + electronics_repair: Ремонт Електроника gardener: Градинар + handicraft: Ръчна изработка painter: Художник photographer: Фотограф plumber: Водопроводчик shoemaker: Обущар tailor: Шивач + window_construction: Изработка на прозорци winery: Винарна "yes": Работилница emergency: + access_point: Тчока за достъп ambulance_station: Станция за линейки defibrillator: Дефибрилатор landing_site: Място за аварийно приземяване @@ -753,6 +772,7 @@ bg: bunker_silo: Бункер chimney: Комин crane: Кран + cross: Кръст flagpole: Пилон kiln: Пещ lighthouse: Фар @@ -760,10 +780,18 @@ bg: mast: Мачта mine: Рудник mineshaft: Шахта на мина + monitoring_station: Наблюдателна станция + petroleum_well: Петролен кладенец pier: Пирс pipeline: Тръбопровод + pumping_station: Помпена станция silo: Силоз + snow_cannon: Снежно оръдие + storage_tank: Резервоар + surveillance: Наблюдение + telescope: Телескоп tower: Кула + wastewater_plant: Пречиствателна станция watermill: Воденица water_tower: Водна кула water_well: Кладенец @@ -773,6 +801,7 @@ bg: airfield: Военно летище barracks: Казарма bunker: Бункер + checkpoint: Контролна точка "yes": Военен mountain_pass: "yes": Планински проход @@ -791,8 +820,10 @@ bg: grassland: Ливада heath: Здраве hill: Хълм + hot_spring: Топъл извор island: Остров land: Земя + marsh: Блато mud: Кал peak: Връх point: Точка @@ -806,10 +837,13 @@ bg: valley: Долина volcano: Вулкан water: Вода + wetland: Мочурище wood: Гора "yes": Природен елемент office: accountant: Счетоводител + administrative: Администрация + advertising_agency: Рекламна агенция architect: Архитект association: Асоциация company: Фирма @@ -820,6 +854,7 @@ bg: financial: Финансова служба government: Правителствена служба insurance: Застрахователно бюро + it: IT офис lawyer: Адвокат ngo: Офис на НПО notary: Нотариус @@ -839,10 +874,12 @@ bg: municipality: Община neighbourhood: Квартал postcode: Пощенски код + quarter: Квартал region: Регион sea: Море square: Площад state: Държава + subdivision: Подразделение suburb: Предградие town: Град village: Село @@ -855,6 +892,7 @@ bg: junction: Железопътен възел level_crossing: Прелез light_rail: Лека железница + miniature: Теснолинейка monorail: Монорелсов път narrow_gauge: Теснолинейка platform: Железопътна платформа @@ -880,6 +918,8 @@ bg: car_repair: Автосервиз carpet: Магазин за килими clothes: Магазин за дрехи + coffee: Магазин за кафе + computer: Магазин за компютри deli: Деликатесен магазин department_store: Универсален магазин doityourself: Направи сам @@ -978,6 +1018,7 @@ bg: level10: Граница на предградията description: types: + cities: Градове towns: Градове places: Места results: @@ -985,24 +1026,49 @@ bg: more_results: Повече резултати issues: index: + title: Проблеми + select_status: Избери статус + select_type: Избери тип + select_last_updated_by: Избери последно променен от search: Търсене + search_guidance: 'Търсете за проблеми:' + user_not_found: Потребителят не съществува + issues_not_found: Не е открит такъв проблем + status: Състояние reports: Доклади + last_updated: Последна промяна last_updated_time_html: %{time} + last_updated_time_user_html: %{time} by %{user} link_to_reports: Преглед на докладите reports_count: one: 1 доклад other: '%{count} доклада' states: + ignored: Пренебрегнат + open: Отворен resolved: Решени + update: + new_report: Вашия сигнал е регистриран успешно + successful_update: Вашия сигнал е обновен успешно + provide_details: Моля допълнете с необходимите подробности show: + title: '%{status} Проблем #%{issue_id}' reports: zero: Няма доклади one: 1 доклад other: '%{count} доклада' last_resolved_at: Последно решена на %{datetime} resolve: Решаване + ignore: Пропусни + reopen: Отново отвори + reports_of_this_issue: Сигнали за този Проблем + comments_on_this_issue: Коментари за проблема resolve: resolved: Състоянието на проблема е променен на „Решен“ + ignore: + ignored: Проблема е променен на „Пропуснат“ + reopen: + reopened: Проблема е променен на "Отворен" helper: reportable_title: note: Бележка № %{note_id} @@ -1015,16 +1081,24 @@ bg: missing_params: Не може да бъде създаден нов доклад categories: diary_entry: + spam_label: Този запис от дневник е/съдържа спам + threat_label: Този запис от дневник съдържа заплаха other_label: Друго diary_comment: + spam_label: Този коментар от дневник е/съдържа спам + threat_label: Този коментар от дневник е заплаха other_label: Друго user: + vandal_label: Този потребител е вандал other_label: Друго note: spam_label: Бележката е спам personal_label: Бележката съдържа лични данни abusive_label: Бележката е обидна other_label: Друго + create: + successful_report: Вашия сигнал е регистриран успешно + provide_details: Моля допълнете с необходимите подробности layouts: logo: alt_text: Лого на OpenStreetMap @@ -1134,6 +1208,7 @@ bg: ви' your_note: '%{commenter} повторно е отворил една от бележките ви към картата в близост до %{place}.' + details: Повече детайли за бележката можете да намерите на %{url}. changeset_comment_notification: hi: Здравейте %{to_user}, greeting: Здравейте, @@ -1168,6 +1243,7 @@ bg: send_message_to_html: Изпращане ново съобщение на %{name} subject: Тема body: Текст + back_to_inbox: Обратно в пощата create: message_sent: Съобщението е изпратено no_such_message: @@ -1275,6 +1351,8 @@ bg: title: Как да помогна join_the_community: title: Присъединете са към общността + other_concerns: + title: Други съображения help: title: Получаване на помощ welcome: @@ -1557,8 +1635,6 @@ bg: notice email cannot find: Съжаляваме, но този електронен адрес не е намерен. reset_password: title: Възстановяване на парола - password: 'Парола:' - confirm password: 'Потвърждаване на паролата:' reset: Нулиране на парола flash changed: Паролата е променена успешно. new: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index df81155c9..b35bbeaaa 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -1480,8 +1480,6 @@ bn: আমরা একটি লিঙ্ক পাঠাবো যার মাধ্যমে আপনি পাসওয়ার্ড পরিবর্তন করতে পারবেন। reset_password: title: পাসওয়ার্ড পুনঃনির্ধারণ - password: 'পাসওয়ার্ড:' - confirm password: 'পাসওয়ার্ড নিশ্চিত করুন:' reset: পাসওয়ার্ড পুনঃনির্ধারণ flash changed: আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছে। new: diff --git a/config/locales/br.yml b/config/locales/br.yml index c93acf57f..d9c3e8758 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -2154,8 +2154,6 @@ br: reset_password: title: Adderaouekaat ar ger-tremen heading: Adderaouekaat ar ger-tremen evit %{user} - password: 'Ger-tremen :' - confirm password: 'Kadarnaat ar ger-tremen :' reset: Adderaouekaat ar ger-tremen flash changed: Cheñchet eo bet ho ker-tremen. flash token bad: N'eo ket bet kavet ar jedouer-se, gwiriañ an URL marteze ? diff --git a/config/locales/bs.yml b/config/locales/bs.yml index e662c27c2..b95335859 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -1471,8 +1471,6 @@ bs: reset_password: title: Ponovno postavljanje lozinke heading: Ponovno postavljanje lozinke za %{user} - password: 'Lozinka:' - confirm password: 'Potvrditi lozinku:' reset: Ponovno postavljanje lozinke flash changed: Vaša lozinka je promjenjena. flash token bad: Niste pronašli tz značku, možda da provjerite URL? diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d05040675..19c06dc78 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -2166,8 +2166,6 @@ ca: reset_password: title: Restableix la contrasenya heading: Restableix la contrasenya per a %{user} - password: 'Contrasenya:' - confirm password: 'Confirmeu la contrasenya:' reset: Restableix la contrasenya flash changed: S'ha canviat la contrasenya. flash token bad: No s'ha trobat el testimoni. Comproveu la URL. diff --git a/config/locales/ce.yml b/config/locales/ce.yml index d6c955466..97b99fb6f 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -920,8 +920,6 @@ ce: reset_password: title: Юху а язъе пароль heading: Юху а язъе пароль %{user} - password: 'Пароль:' - confirm password: 'Бакъе пароль:' reset: ХӀоттае пароль flash changed: Хьан пароль хийцина. new: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index cdbb0fb4a..e4d763168 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -164,6 +164,7 @@ cs: description: Popis languages: Jazyky pass_crypt: Heslo + pass_crypt_confirmation: Potvrdit heslo help: trace: tagstring: oddělené čárkou @@ -2331,8 +2332,6 @@ cs: reset_password: title: Obnovit heslo heading: Resetovat heslo pro %{user} - password: 'Heslo:' - confirm password: 'Potvrdit heslo:' reset: Resetovat heslo flash changed: Vaše heslo bylo změněno. flash token bad: Odpovídající kód nebyl nalezen, možná zkontrolujte URL? diff --git a/config/locales/cy.yml b/config/locales/cy.yml index e57b73320..96900eec2 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -1420,8 +1420,6 @@ cy: reset_password: title: Ailosod cyfrinair heading: Ailosod Cyfinair ar gyfer %{user} - password: 'Cyfrinair:' - confirm password: 'Cadarnhau''r Cyfrinair:' reset: Ailosod Cyfrinair flash changed: Mae'ch cyfrinair wedi'i newid. new: diff --git a/config/locales/da.yml b/config/locales/da.yml index 085e2b7d5..454f502a3 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -2338,8 +2338,6 @@ da: reset_password: title: Nulstil adgangskode heading: Nulstil adgangskode for %{user} - password: 'Adgangskode:' - confirm password: 'Bekræft adgangskode:' reset: Nulstil adgangskode flash changed: Din adgangskode er ændret. flash token bad: Kunne ikke finde denne nøgle, prøv at kontrollere URL'en? diff --git a/config/locales/de.yml b/config/locales/de.yml index aef484997..c5bbef183 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -2394,8 +2394,6 @@ de: reset_password: title: Passwort zurücksetzen heading: Passwort für %{user} zurücksetzen - password: 'Passwort:' - confirm password: 'Passwort bestätigen:' reset: Passwort zurücksetzen flash changed: Dein Passwort wurde geändert. flash token bad: Wir konnten dieses Kürzel leider nicht finden. Du hast dich diff --git a/config/locales/diq.yml b/config/locales/diq.yml index ff9be91c9..c9bd6e242 100644 --- a/config/locales/diq.yml +++ b/config/locales/diq.yml @@ -930,8 +930,6 @@ diq: reset_password: title: Parola reset ke heading: Parolay %{user} reset ke - password: 'Parola:' - confirm password: 'Parola tesdiq ke:' reset: Parola reset ke new: email address: 'Adresa e-postey:' diff --git a/config/locales/dsb.yml b/config/locales/dsb.yml index d5e4ebf92..06840f5ff 100644 --- a/config/locales/dsb.yml +++ b/config/locales/dsb.yml @@ -1642,8 +1642,6 @@ dsb: reset_password: title: Gronidło slědk stajiś heading: Gronidło za %{user} slědk stajiś - password: 'Gronidło:' - confirm password: 'Gronidło wobkšuśiś:' reset: Gronidło slědk stajiś flash changed: Twójo gronidło jo se změniło. flash token bad: Njejo móžno było ten token namakaś, pšosym pśekontrolěruj URL. diff --git a/config/locales/el.yml b/config/locales/el.yml index 6c0069512..7c8502ff1 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -2190,8 +2190,6 @@ el: reset_password: title: Επαναφορά συνθηματικού heading: Επαναφορά συνθηματικού για τον χρήστη %{user} - password: 'Συνθηματικό:' - confirm password: 'Επιβεβαίωση συνθηματικού:' reset: Επαναφορά συνθηματικού flash changed: Το συνθηματικό σας άλλαξε! flash token bad: Δεν βρήκατε αυτό το κομμάτι, μήπως πρέπει να ελέγξετε το URL; diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e9bcdb560..6feab9c34 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -205,6 +205,14 @@ en-GB: remote: name: Remote Control description: Remote Control (JOSM or Merkaartor) + auth: + providers: + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -246,6 +254,8 @@ en-GB: view_history: View History view_details: View Details location: 'Location:' + common_details: + coordinates_html: '%{latitude}, %{longitude}' changeset: title: 'Changeset: %{id}' belongs_to: Author @@ -347,6 +357,7 @@ en-GB: reopened_by_anonymous: Reactivated by anonymous %{when} hidden_by: Hidden by %{user} %{when} report: Report this note + coordinates_html: '%{latitude}, %{longitude}' query: title: Query Features introduction: Click on the map to find nearby features. @@ -619,17 +630,17 @@ en-GB: viaduct: Viaduct "yes": Bridge building: - apartment: Апартамент - apartments: Апартаменти - cabin: Кабина - college: Сграда Колеж + apartment: Apartment + apartments: Apartments + cabin: Cabin + college: College Building commercial: Търговска Сграда - construction: Сграда в строеж - garage: Гараж + construction: Building under Construction + garage: Garage garages: Гаражи - house: Къща + house: House industrial: Индустриална сграда - roof: Покрив + roof: Roof "yes": Building craft: brewery: Brewery @@ -2001,8 +2012,6 @@ en-GB: reset_password: title: Reset password heading: Reset Password for %{user} - password: 'Password:' - confirm password: 'Confirm Password:' reset: Reset Password flash changed: Your password has been changed. flash token bad: Did not find that token, check the URL maybe? @@ -2534,15 +2543,15 @@ en-GB: unnamed: unnamed road courtesy: Directions courtesy of %{link} exit_counts: - first: 1ви - second: 2ри - third: 3ти - fourth: 4ти - fifth: 5ти - sixth: 6ти - seventh: 7ми - eighth: 8ми - ninth: 9ти + first: 1st + second: 2nd + third: 3rd + fourth: 4th + fifth: 5th + sixth: 6th + seventh: 7th + eighth: 8th + ninth: 9th tenth: 10ти time: Time query: diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 46992fd60..bf02aa55d 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -509,10 +509,12 @@ eo: chair_lift: Telfero seĝa drag_lift: Skitelfero gondola: Telfero plur-vagoneta + magic_carpet: Ŝtuparlifto skiada platter: Skitelfero unupersona pylon: Fosto station: Kablovoja stacio t-bar: Skitelfero dupersona + "yes": Kablotransporto aeroway: aerodrome: Aerodromo airstrip: Provizora aerodromo @@ -521,11 +523,15 @@ eo: hangar: Hangaro helipad: Surteriĝejo helikoptera holding_position: Haltejo antaŭ aŭtokur-strato + navigationaid: Aviada navigad-helpilo parking_position: Aviadil-parkumejo (pozicio) runway: Avia dromo + taxilane: Aŭtokur-strateto taxiway: Aŭtokur-strato terminal: Flugstacio + windsock: Ventmontrilo (maniko) amenity: + animal_boarding: Hotelo por hejmbestoj animal_shelter: Azilo por bestoj arts_centre: Belart-centro atm: Bankaŭtomato @@ -535,7 +541,9 @@ eo: bench: Benko bicycle_parking: Parkumejo bicikla bicycle_rental: Biciklopruntejo + bicycle_repair_station: Bicikla memriparejo biergarten: Bierĝardeno + blood_bank: Sangobanko boat_rental: Boat-pruntejo brothel: Putinejo bureau_de_change: Monŝanĝejo @@ -552,6 +560,7 @@ eo: clock: Horloĝo college: Postmezgrada lernejo community_centre: Komunuma centro + conference_centre: Konferenca centro courthouse: Juĝejo crematorium: Kadavro-bruligejo dentist: Dentistejo @@ -559,6 +568,7 @@ eo: drinking_water: Trinkakvejo driving_school: Stirlernejo embassy: Ambasadejo + events_venue: Domo de ceremonioj fast_food: Rapidmanĝejo ferry_terminal: Pramstacio fire_station: Fajrobrigadejo @@ -571,16 +581,24 @@ eo: hospital: Malsanulejo hunting_stand: Altembusko ĉasada ice_cream: Glaciaĵejo + internet_cafe: Retkafejo kindergarten: Infanĝardeno + language_school: Lingva lernejo library: Biblioteko + loading_dock: Ŝarĝ-kajo + love_hotel: Amor-hotelo marketplace: Bazaro + mobile_money_agent: Agentejo de poŝtelefonaj mon-transigoj monastery: Monaĥejo + money_transfer: Centro de mon-transigo motorcycle_parking: Parkumejo motorcikla + music_school: Muzika lernejo nightclub: Noktoklubejo nursing_home: Domo de permanenta zorgado parking: Parkumejo parking_entrance: Enveturejo al parkumejo parking_space: Parkumeja loko + payment_terminal: Pag-terminalo pharmacy: Apoteko place_of_worship: Preĝejo police: Policejo @@ -588,9 +606,13 @@ eo: post_office: Poŝtoficejo prison: Malliberejo pub: Taverno + public_bath: Banejo (distro) + public_bookcase: Publika libroŝranko public_building: Konstruaĵo publika + ranger_station: Naturrezerveja oficejo recycling: Recikligejo restaurant: Restoracio + sanitary_dump_station: Stacio de forigo de fekaĵoj school: Lernejo shelter: Ŝirmejo shower: Duŝejo @@ -603,18 +625,27 @@ eo: theatre: Teatro toilets: Necesejo townhall: Urbodomo + training: Ekzercejo university: Universitato + vehicle_inspection: Aŭtomobil-kontrolejo vending_machine: Vendilo veterinary: Bestokuracistejo village_hall: Komunuma centro (vilaĝo) waste_basket: Rubujo waste_disposal: Rubujego + waste_dump_site: Rubodeponejo neformala + watering_place: Akvotrinkejo por bestoj water_point: Trinkejo + weighbridge: Pesilo por aŭtomobiloj + "yes": Servejo boundary: + aboriginal_lands: Rezervejo de indiĝena popolo administrative: Administra limo census: Popolnombrada limo national_park: Nacia parko + political: Limo de balot-distrikto protected_area: Naturprotektejo + "yes": Limo bridge: aqueduct: Akvedukto boardwalk: Ligna trotuaro @@ -623,6 +654,9 @@ eo: viaduct: Viadukto "yes": Ponto building: + apartment: Apartamentaro + apartments: Apartamentaro + barn: Garbejo "yes": Konstruaĵo craft: brewery: Bierfarejo @@ -2108,8 +2142,6 @@ eo: reset_password: title: Nuligi pasvorton heading: Nuligi Pasvorton por %{user} - password: 'Pasvorto:' - confirm password: 'Konfirmi pasvorton:' reset: Nuligi pasvorton flash changed: Via pasvorto estis ŝanĝita. flash token bad: Netrovebla ĵetono, bonvolu kontroli la URLon. diff --git a/config/locales/es.yml b/config/locales/es.yml index 3c6721425..d1e93f64c 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2194,8 +2194,6 @@ es: reset_password: title: Restablecer contraseña heading: Restablecer contraseña para %{user} - password: 'Contraseña:' - confirm password: 'Confirmar contraseña:' reset: Restablecer contraseña flash changed: Tu contraseña ha sido cambiada. flash token bad: No se ha encontrado este elemento, ¿Quizá debería comprobar diff --git a/config/locales/et.yml b/config/locales/et.yml index 8eeb5f929..56adfb004 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -27,7 +27,7 @@ et: create: Saada client_application: create: Registreeri - update: Redigeeri + update: Uuenda redaction: create: Loo redaktsioon update: Salvesta redaktsioon @@ -89,15 +89,15 @@ et: trace: user: Kasutaja visible: Nähtav - name: Nimi + name: Failinimi size: Suurus latitude: Laius longitude: Pikkus public: Avalik description: Kirjeldus - gpx_file: 'Laadi üles GPX-fail:' - visibility: 'Nähtavus:' - tagstring: 'Sildid:' + gpx_file: Laadi üles GPX-fail + visibility: Nähtavus + tagstring: Sildid message: sender: Saatja title: Teema @@ -390,7 +390,7 @@ et: diary_entry: posted_by_html: Postitas %{link_user} kuupäeval %{created} – %{language_link} comment_link: Kommenteeri seda sissekannet - reply_link: Vasta sellele sissekandele + reply_link: Saada autorile sõnum comment_count: one: '%{count} kommentaar' zero: Kommentaarid puuduvad @@ -946,13 +946,13 @@ et: hi: Tere, %{to_user}! header: '%{from_user} kommenteeris hiljutist OpenStreetMapi päevikusissekannet pealkirjaga %{subject}:' - footer: Loe kommentaari lehel %{readurl}. Võid lisada oma kommentaari lehel - %{commenturl} või vastata kommentaarile lehel %{replyurl}. + footer: Saad lugeda kommentaari aadressil %{readurl}. Samuti saad lisada kommentaari + aadressil %{commenturl} või saata autorile sõnumi aadressil %{replyurl}. message_notification: hi: Tere, %{to_user} header: '%{from_user} on saatnud sulle OpenStreetMapi kaudu sõnumi teemaga %{subject}:' - footer_html: Sõnumit saad lugeda ka aadressil %{readurl} ning vastata saad aadressil - %{replyurl}. + footer_html: Saad lugeda sõnumit ka aadressil %{readurl} ja saata autorile sõnumi + aadressil %{replyurl}. friendship_notification: hi: Tere, %{to_user} subject: '[OpenStreetMap] %{user} lisas sind oma sõbraks' @@ -972,8 +972,10 @@ et: more_info_2: 'neid vältida leiab:' success: subject: '[OpenStreetMap] GPX Importimine õnnestus' - loaded_successfully: laaditi üles edukalt %{trace_points} punkti võimalikust - %{possible_points} punktist. + loaded_successfully: + one: laaditi üles edukalt %{trace_points} punkt võimalikust ühest punktist. + other: laaditi üles edukalt %{trace_points} punkti võimalikust %{possible_points} + punktist. signup_confirm: subject: '[OpenStreetMap] Tere tulemast OpenStreetMapi' greeting: Tere! @@ -1044,10 +1046,10 @@ et: subject_own: '[OpenStreetMap] %{commenter} on kommenteerinud üht sinu muudatuskogumit' subject_other: '[OpenStreetMap] %{commenter} on kommenteerinud muudatuskogumit, millest sa oled huvitunud' - your_changeset: '%{commenter} on jätnud kommentaari ühele sinu muudatuskogumile, - mis on loodud kuupäeval %{time}' - commented_changeset: '%{commenter} on jätnud kommentaari kaardi muudatuskogumile, - mida sa jälgid ja mille on loonud %{changeset_author} kuupäeval %{time}' + your_changeset: '%{commenter} jättis kommentaari ühele sinu muudatuskogumile + (%{time})' + commented_changeset: '%{commenter} jättis kommentaari muudatuskogumile (%{time}), + mida jälgid ja mille on loonud %{changeset_author}' partial_changeset_with_comment: kommentaariga '%{changeset_comment}'. partial_changeset_without_comment: ilma kommentaarita. details: Üksikasjad muudatuskogumi kohta leiad aadressilt %{url}. @@ -1163,12 +1165,12 @@ et: \nOpenStreetMap Foundation (OSMF) \nkogukonna nimel. Kõigis OSMF-i hallatavates teenustes kehtivad meie kasutustingimused, võrgueeskiri - ja andmekaitsereeglid.\n
\nPalun - võta ühendust OSMF-iga,\nkui - sul on küsimusi litsentseerimise, autoriõiguste või muude õiguslike probleemide - kohta.\n
\nOpenStreetMap, suurendusklaasi logo ja State of the Map on OSMF-i registreeritud - kaubamärgid." + ja andmekaitsereeglid." + legal_2_html: |- + Palun võta ühendust OSMF-iga, + kui sul on küsimusi litsentsimise, autoriõiguse või muude õiguslike teemade kohta. +
+ OpenStreetMap, suurendusklaasi logo ja State of the Map on OSMF-i registreeritud kaubamärgid. partners_title: Partnerid copyright: foreign: @@ -1195,8 +1197,8 @@ et: tulemust levitada ainult sama litsentsi tingimustel. Sinu õigusi ja kohustusi selgitab litsentsi täistekst. intro_3_1_html: |- - Kaardipaanide kujutised ja dokumentatsioon kuuluvad Creative Commonsi - litsentsi "Autorile viitamine + jagamine samadel tingimustel 2.0" (CC BY-SA) alla. + Meie dokumentatsioon kuulub Creative Commonsi + litsentsi "Autorile viitamine + jagamine samadel tingimustel 2.0" (CC BY-SA 2.0) alla. credit_title_html: OpenStreetMapile viitamine credit_1_html: |- Nõuame, et kasutad omistamiseks teksti “© OpenStreetMapi @@ -1212,6 +1214,11 @@ et: aadressidele openstreetmap.org (võimalik, et laiendades teksti "OpenStreetMap" täisaadressiks), opendatacommons.org ja kui vaja, siis ka aadressile creativecommons.org. + credit_3_1_html: "Standardse kujundusega kaardipaanid asukohas www.openstreetmap.org + on\nlitsentsi Open Database License alla kuuluvatest andmetest loodud teos,\nmille + autor on OpenStreetMap Foundation. Kui kasutad neid kaardipaane,\nsiis palun + omista need autorile järgmiselt: \n“Aluskaart ja andmed OpenStreetMapist + ja OpenStreetMap Foundationilt”." credit_4_html: |- Sirvitaval elektroonilisel kaardil peaks viide olema näha kaardi nurgas. Näiteks: @@ -1404,7 +1411,7 @@ et: arupidamiseks ja dokumenteerimiseks. welcome: url: /welcome - title: Tere tulemast OSMi + title: Tere tulemast OpenStreetMapi description: Alusta selle kiirjuhendiga, mis hõlmab OpenStreetMapi põhitõdesid. beginners_guide: url: https://wiki.openstreetmap.org/wiki/Et:Beginners%27_guide @@ -1412,8 +1419,9 @@ et: description: Kogukonna hallatav juhend algajatele. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Esita küsimus või otsi vastuseid OSMi küsimuste ja vastuste veebilehel. + title: Abifoorum + description: Esita küsimus või otsi vastuseid OpenStreetMapi küsimuste ja + vastuste veebilehel. mailing_lists: title: Postiloendid description: Esita küsimusi või arutle huvipakkuvatel teemadel paljudes temaatilistes @@ -1431,8 +1439,8 @@ et: võtta OpenStreetMapil põhinevad kaardid ja muud teenused. wiki: url: https://wiki.openstreetmap.org/wiki/Et:Main_Page - title: wiki.openstreetmap.org - description: Sirvi vikis OSMi põhjalikumat dokumentatsiooni. + title: OpenStreetMapi viki + description: Sirvi vikis OpenStreetMapi põhjalikumat dokumentatsiooni. sidebar: search_results: Otsingu tulemused close: Sulge @@ -1621,7 +1629,9 @@ et: newer: Uuemad rajad trace: pending: OOTEL - count_points: '%{count} punkti' + count_points: + one: 1 punkt + other: '%{count} punkti' more: rohkem trace_details: Vaata raja üksikasju view_map: Vaata kaarti @@ -1789,8 +1799,6 @@ et: reset_password: title: Lähtesta parool heading: Kasutaja %{user} parooli lähtestamine - password: 'Parool:' - confirm password: 'Kinnita parool:' reset: Lähtesta parool flash changed: Sinu parool on muudetud. flash token bad: Ei leitud sellist kinnituskoodi. Kontrolli URL-i. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index b687c13e8..a255666f5 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -2056,8 +2056,6 @@ eu: reset_password: title: Pasahitza berrezarri heading: '%{user}-ren pasahitza berrezarri' - password: 'Pasahitza:' - confirm password: 'Pasahitza berretsi:' reset: Pasahitza berrezarri flash changed: Zure pasahitza aldatu da. flash token bad: Token hori ez da aurkitu, URL egiaztatu beharbada? diff --git a/config/locales/fa.yml b/config/locales/fa.yml index fa6e73c39..e7550db87 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -44,6 +44,8 @@ fa: formats: friendly: '%e %B %Y ساعت %H:%M' helpers: + file: + prompt: انتخاب فایل submit: diary_comment: create: ذخیره @@ -112,6 +114,13 @@ fa: name: نام (اجباری) callback_url: Callback URL support_url: URL پشتیبانی + allow_read_prefs: ترجیحات کاربری آن‌ها را بخواند + allow_write_prefs: ترجیحات کاربری آن‌ها را تغییر دهد + allow_write_diary: روزنوشت ایجاد کند، نظر ثبت کند و دوست اضافه کند + allow_write_api: نقشه را تغییر دهد + allow_read_gpx: ردهای GPS خصوصی آن‌ها را بخواند + allow_write_gpx: ردهای GPS بارگذاری کند + allow_write_notes: یادداشت‌ها را تغییر دهد diary_comment: body: متن diary_entry: @@ -141,6 +150,7 @@ fa: body: متن recipient: گیرنده report: + category: دلیل گزارش خود را انتخاب کنید details: لطفاً جزئیات بیشتری از مشکل ارائه دهید (ضروری است). user: email: ایمیل @@ -149,6 +159,7 @@ fa: description: توضیحات languages: زبان‌ها pass_crypt: گذرواژه + pass_crypt_confirmation: تأیید گذرواژه help: trace: tagstring: جداشده با کاما (,) @@ -249,6 +260,12 @@ fa: anonymous: گمنام no_comment: (بدون توضیح) part_of: بخشی از + part_of_relations: + one: 1 رابطه + other: '%{count} رابطه' + part_of_ways: + one: 1 راه + other: '%{count} راه' download_xml: بارگیری XML view_history: نمایش تاریخچه view_details: نمایش جزئیات @@ -281,6 +298,8 @@ fa: title_html: 'راه: %{name}' history_title_html: 'تاریخچهٔ راه: %{name}' nodes: گره‌ها + nodes_count: + other: '%{count} گره' also_part_of_html: one: بخشی از راه %{related_ways} other: ' بخشی از راه‌های %{related_ways}' @@ -288,6 +307,9 @@ fa: title_html: 'رابطه: %{name}' history_title_html: 'تاریخچهٔ رابطه: %{name}' members: اعضا + members_count: + one: 1 عضو + other: '%{count} عضو' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} با نقش %{role}' @@ -575,11 +597,14 @@ fa: hospital: بیمارستان hunting_stand: شکارگاه ice_cream: بستنی فروشی + internet_cafe: کافی‌نت kindergarten: کودکستان + language_school: آموزشگاه زبان library: کتابخانه marketplace: بازار monastery: صومعه motorcycle_parking: پارکینگ موتور سیکلت + music_school: آموزشگاه موسیقی nightclub: باشگاه شبانه nursing_home: خانه سالمندان parking: پارکینگ @@ -592,6 +617,7 @@ fa: post_office: ادارهٔ پست prison: زندان pub: میخانه + public_bath: حمام عمومی public_building: ساختمان عمومی recycling: نقطه بازیافت restaurant: رستوران @@ -608,6 +634,7 @@ fa: toilets: سرویس های بهداشتی townhall: شهرداری university: دانشگاه + vehicle_inspection: معاینه فنی vending_machine: دستگاه فروش veterinary: جراح دامپزشک village_hall: دهیاری @@ -619,6 +646,7 @@ fa: census: مرز آماری national_park: پارک ملی protected_area: منطقه حفاظت‌شده + "yes": مرز bridge: aqueduct: قنات boardwalk: Boardwalk @@ -627,27 +655,37 @@ fa: viaduct: پل راه آهن روی دره "yes": پل building: - apartments: بلوک آپارتمان + apartment: آپارتمان + apartments: آپارتمان‌ها chapel: کلیسا - church: کلیسا + church: ساختمان کلیسا commercial: ساختمان تجاری + construction: ساختمان در دست ساخت dormitory: خوابگاه دانشجویی - farm: ساختمان در مزرعه + farm: خانهٔ مزرعه garage: گاراژ + greenhouse: گلخانه hospital: ساختمان بیمارستان - hotel: هتل + hotel: ساختمان هتل house: خانه industrial: ساختمان صنعتی + kindergarten: ساختمان مهدکودک office: ساختمان اداری public: ساختمان عمومی residential: ساختمان مسکونی retail: معاملات املاک + roof: سقف + ruins: ساختمان ویران school: ساختمان مدرسه - terrace: تراس - train_station: ایستگاه راه‌آهن + terrace: ردیف ساختمان‌ها + train_station: ساختمان پایانهٔ قطار university: ساختمان دانشگاه + warehouse: انبار "yes": ساختمان + club: + "yes": باشگاه craft: + blacksmith: آهنگر brewery: ابجوسازی carpenter: نجار electrician: متخصص برق @@ -803,6 +841,8 @@ fa: "yes": فراغت man_made: adit: مدخل + advertising: تبلیغات + antenna: آنتن beacon: نشانهٔ دریایی beehive: کندو عسل breakwater: موج‌شکن @@ -818,6 +858,7 @@ fa: groyne: آبشکن kiln: کوره lighthouse: فانوس دریایی + manhole: دریچه بازدید mast: دکل mine: معدن mineshaft: رگه اصلی معدن @@ -995,25 +1036,32 @@ fa: grocery: فروشگاه خواروبار hairdresser: سلمانی hardware: فروشگاه سخت افزار + herbalist: عطاری hifi: Hi-Fi houseware: فروشگاه لوازم خانگی + ice_cream: بستنی‌فروشی interior_decoration: دکوراسیون داخلی jewelry: فروشگاه طلا و جواهر kiosk: فروشگاه کیوسک kitchen: فروشگاه آشپزخانه laundry: خشکشویی + locksmith: قفل‌سازی lottery: بخت آزمایی mall: بازار massage: ماساژ + medical_supply: فروشگاه تجهیزات پزشکی mobile_phone: فروشگاه تلفن همراه motorcycle: فروشگاه موتورسیکلت + motorcycle_repair: تعمیرات موتورسیکلت music: فروشگاه موسیقی + musical_instrument: ادوات موسیقی newsagent: دکه روزنامه optician: عینک سازی organic: فروشگاه مواد غذایی آلی outdoor: فروشگاه رو باز paint: رنگ‌فروشی pawnbroker: كارگشا + perfumery: عطرفروشی pet: فروشگاه حیوانات خانگی photo: فروشگاه عکس seafood: غذای دریایی @@ -1203,6 +1251,7 @@ fa: layouts: project_name: title: OpenStreetMap + h1: اوپن‌استریت‌مپ logo: alt_text: لوگوی OpenStreetMap home: رفتن به محل خانه @@ -2164,8 +2213,6 @@ fa: reset_password: title: بازنشانی گذرواژه heading: بازنشانی گذرواژه برای %{user} - password: 'گذرواژه:' - confirm password: 'تأیید گذرواژه:' reset: بازنشانی گذرواژه flash changed: گذرواژهٔ شما عوض شد. flash token bad: توکن را نیافتید؟ نشانی را بررسی کنید شاید بیابید. diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 3004fe70a..d220f4d6d 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -2154,8 +2154,6 @@ fi: reset_password: title: Salasanan vaihto heading: Vaihda käyttäjän %{user} salasana - password: 'Salasana:' - confirm password: 'Vahvista salasana:' reset: Vaihda salasana flash changed: Salasanasi on vaihdettu. flash token bad: Tuntematon tunniste. Tarkista että URL on sama kuin postissasi. diff --git a/config/locales/fit.yml b/config/locales/fit.yml index b70a3a042..e690977aa 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -973,9 +973,6 @@ fit: heading: Unohditko salasanasi? email address: 'E-postiatressi:' new password button: Lähätä salasanan palautusohjeet - reset_password: - password: 'Salasana:' - confirm password: 'Vahvista salasana:' new: title: Luo konttu about: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ba4ad984a..8fcd77f5b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -195,6 +195,7 @@ fr: description: Description languages: Langues pass_crypt: Mot de passe + pass_crypt_confirmation: Confirmer le mot de passe help: trace: tagstring: données séparées par des virgules @@ -299,6 +300,12 @@ fr: anonymous: anonyme no_comment: (aucun commentaire) part_of: Appartient à + part_of_relations: + one: 1 relation + other: '%{count} relations' + part_of_ways: + one: 1 chemin + other: '%{count} chemins' download_xml: Télécharger en XML view_history: Voir l’historique view_details: Afficher les détails @@ -333,6 +340,9 @@ fr: title_html: 'Chemin : %{name}' history_title_html: 'Historique du chemin : %{name}' nodes: Nœuds + nodes_count: + one: 1 nœud + other: '%{count} nœuds' also_part_of_html: one: partie du chemin %{related_ways} other: partie des chemins %{related_ways} @@ -340,6 +350,9 @@ fr: title_html: 'Relation : %{name}' history_title_html: 'Historique de la relation : %{name}' members: Membres + members_count: + one: 1 membre + other: '%{count} membres' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} avec le rôle %{role}' @@ -2420,8 +2433,6 @@ fr: reset_password: title: Réinitialiser le mot de passe heading: Réinitialiser le mot de passe de %{user} - password: 'Mot de passe :' - confirm password: 'Confirmez le mot de passe :' reset: Réinitialiser le mot de passe flash changed: Votre mot de passe a été modifié. flash token bad: Ce jeton est introuvable, veuillez vérifier l’URL. diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 911031b52..c49c99e74 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -1121,8 +1121,6 @@ fur: reset_password: title: Azere la password heading: Azere la password par %{user} - password: 'Password:' - confirm password: 'Conferme la password:' reset: Azere la password flash changed: La tô password e je stade cambiade. new: diff --git a/config/locales/ga.yml b/config/locales/ga.yml index 751b62dbe..8d74d5e05 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -1868,8 +1868,6 @@ ga: reset_password: title: Focal faire a athshocrú heading: Focal Faire le haghaidh %{user} a Athshocrú - password: 'Focal Faire:' - confirm password: 'Deimhnigh an Focal Faire:' reset: Athshocraigh an Focal Faire flash changed: Athraíodh d'fhocal faire. flash token bad: Níor aimsíodh an ceadchomhartha sin, seiceáil an bhfuil an diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 1b22a3802..ceb8e04ed 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1845,8 +1845,6 @@ gd: reset_password: title: Ath-shuidhich am facal-faire heading: Ath-shuidhich am facal-faire aig %{user} - password: 'Facal-faire:' - confirm password: 'Dearbhaich am facal-faire:' reset: Ath-shuidhich am facal-faire flash changed: Chaidh am facal-faire agad atharrachadh. flash token bad: Cha do rinn sinn lorg air an tòcan ud, an toir thu sùil air diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 257c4be14..e5f308cb2 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -2354,8 +2354,6 @@ gl: reset_password: title: Restabelecer o contrasinal heading: Restabelecer o contrasinal de %{user} - password: 'Contrasinal:' - confirm password: 'Confirmar o contrasinal:' reset: Restabelecer o contrasinal flash changed: Mudouse o teu contrasinal. flash token bad: Non se atopou o pase. Quizabes tería que comprobar o enderezo diff --git a/config/locales/he.yml b/config/locales/he.yml index eaa168511..6a07ae633 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -2109,8 +2109,6 @@ he: reset_password: title: איפוס סיסמה heading: איפוס הססמה עבור %{user} - password: 'סיסמה:' - confirm password: 'אימות הסיסמה:' reset: איפוס הססמה flash changed: סיסמתך שונתה. flash token bad: לא מצאנו את האסימון ההוא, אולי בדיקת הכתובת תעזור? diff --git a/config/locales/hr.yml b/config/locales/hr.yml index e79862764..87a3c37f3 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1605,8 +1605,6 @@ hr: reset_password: title: Reset lozinke heading: Reset lozinke za %{user} - password: 'Lozinka:' - confirm password: 'Potvrdi zaporku:' reset: Reset lozinke flash changed: VaÅ¡a lozinka je promjenjena. flash token bad: Nije pronađen takav token, provjeri URL? diff --git a/config/locales/hsb.yml b/config/locales/hsb.yml index 03e00a13e..ac3270d4c 100644 --- a/config/locales/hsb.yml +++ b/config/locales/hsb.yml @@ -2030,8 +2030,6 @@ hsb: reset_password: title: Hesło wróćo stajić heading: Hesło za wužiwarja %{user} wróćo stajić - password: 'Hesło:' - confirm password: 'Hesło wobkrućić:' reset: Hesło wróćo stajić flash changed: Twoje hesło je so změniło. flash token bad: Njemóžachmy tutón kod namakać, proÅ¡u přepruwuj URL. diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 5c521a954..07c12a3ef 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -36,6 +36,8 @@ hu: formats: friendly: '%Y. %B %e., %H.%M' helpers: + file: + prompt: Válassz egy fájlt submit: diary_comment: create: Mentés @@ -48,7 +50,7 @@ hu: create: Küldés client_application: create: Regisztrálás - update: Szerkesztés + update: Frissítés redaction: create: Módosítás létrehozása update: Módosítás mentése @@ -115,15 +117,15 @@ hu: trace: user: Felhasználó visible: Látható - name: Név + name: Fájlnév size: Méret latitude: Földrajzi szélesség longitude: Földrajzi hosszúság public: Nyilvános description: Leírás - gpx_file: 'GPX fájl feltöltése:' - visibility: 'Láthatóság:' - tagstring: 'Címkék:' + gpx_file: GPX fájl feltöltése + visibility: Láthatóság + tagstring: Címkék message: sender: Küldő title: Tárgy @@ -194,6 +196,9 @@ hu: remote: name: Távirányító description: Távirányító (JOSM vagy Merkaartor) + auth: + providers: + wikipedia: Wikipédia api: notes: comment: @@ -231,6 +236,12 @@ hu: anonymous: névtelen no_comment: (nincs hozzászólás) part_of: Része ennek + part_of_relations: + one: 1 kapcsolat + other: '%{count} kapcsolat' + part_of_ways: + one: 1 vonal + other: '%{count} vonal' download_xml: XML letöltése view_history: Előzmények megjelenítése view_details: Részletek megtekintése @@ -263,6 +274,8 @@ hu: title_html: 'Vonal: %{name}' history_title_html: 'Vonal történet: %{name}' nodes: Pontok + nodes_count: + other: '%{count} pont' also_part_of_html: one: '%{related_ways} vonal része' other: '%{related_ways} vonalak része' @@ -270,6 +283,9 @@ hu: title_html: Kapcsolat:%{name} history_title_html: 'Kapcsolat történet: %{name}' members: Tagok + members_count: + one: 1 tag + other: '%{count} tag' relation_member: entry_role_html: '%{type} %{name} mint %{role}' type: @@ -402,6 +418,7 @@ hu: in_language_title: Naplóbejegyzések %{language} nyelven new: Új naplóbejegyzés new_title: Új bejegyzés írása a felhasználói naplómba + my_diary: Naplóm no_entries: Nincsenek naplóbejegyzések recent_entries: Legutóbbi naplóbejegyzések older_entries: Régebbi bejegyzések @@ -424,7 +441,7 @@ hu: diary_entry: posted_by_html: '%{link_user} küldte ekkor: %{created} %{language_link} nyelven' comment_link: Hozzászólás ehhez a bejegyzéshez - reply_link: Válasz a bejegyzésre + reply_link: Üzenet küldése a szerzőnek comment_count: zero: Nincs hozzászólás one: '%{count} hozzászólás' @@ -2117,8 +2134,6 @@ hu: reset_password: title: Jelszó alaphelyzetbe állítása heading: '%{user} jelszavának alaphelyzetbe állítása' - password: 'Jelszó:' - confirm password: 'Jelszó megerősítése:' reset: Jelszó alaphelyzetbe állítása flash changed: Jelszavad megváltozott. flash token bad: Nem található ez az utalvány, ellenőrizd az URL-t. diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 87224f6ab..70f3d556d 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -2122,8 +2122,6 @@ ia: reset_password: title: Reinitialisar contrasigno heading: Reinitialisar le contrasigno de %{user} - password: 'Contrasigno:' - confirm password: 'Confirma contrasigno:' reset: Reinitialisar contrasigno flash changed: Tu contrasigno ha essite cambiate. flash token bad: Token non trovate. Verifica le URL. diff --git a/config/locales/id.yml b/config/locales/id.yml index 6070fe01e..25f4fd393 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -2109,8 +2109,6 @@ id: reset_password: title: Setel ulang kata sandi heading: Setel ulang kata sandi untuk %{user} - password: 'Kata Sandi:' - confirm password: 'Konfirmasi Kata Sandi:' reset: Setel Ulang Kata Sandi flash changed: Kata sandi Anda telah diubah. flash token bad: Tidak dapat menemukan token tersebut, cek URL nya mungkin? diff --git a/config/locales/is.yml b/config/locales/is.yml index db4b43dbb..784375153 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -2165,8 +2165,6 @@ is: reset_password: title: Lykilorð endurstillt heading: Endurstillti lykilorð fyrir notandann %{user} - password: 'Lykilorð:' - confirm password: 'Staðfestu lykilorð:' reset: Endurstilla lykilorð flash changed: Lykilorðinu þínu hefur verið breytt flash token bad: Þessi leynistrengur fannst ekki, kannski er slóðin röng? diff --git a/config/locales/it.yml b/config/locales/it.yml index 827b1af71..c78af8a85 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -174,6 +174,7 @@ it: description: Descrizione languages: Lingue pass_crypt: Password + pass_crypt_confirmation: Conferma password help: trace: tagstring: delimitato da virgola @@ -276,6 +277,12 @@ it: anonymous: anonimo no_comment: (nessun commento) part_of: Parte di + part_of_relations: + one: 1 relazione + other: '%{count} relazioni' + part_of_ways: + one: 1 percorso + other: '%{count} percorsi' download_xml: Scarica XML view_history: Visualizza cronologia view_details: Vedi dettagli @@ -310,6 +317,9 @@ it: title_html: 'Percorso: %{name}' history_title_html: 'Cronologia percorso: %{name}' nodes: Nodi + nodes_count: + one: 1 nodo + other: '%{count} nodi' also_part_of_html: one: parte del percorso %{related_ways} other: parte dei percorsi %{related_ways} @@ -317,6 +327,9 @@ it: title_html: 'Relazione: %{name}' history_title_html: 'Cronologia relazione: %{name}' members: Membri + members_count: + one: 1 membro + other: '%{count} membri' relation_member: entry_role_html: '%{type} %{name} come %{role}' type: @@ -2320,8 +2333,6 @@ it: reset_password: title: Reimposta password heading: Reimposta password per %{user} - password: 'Password:' - confirm password: 'Conferma password:' reset: Reimposta password flash changed: La propria password è stata modificata. flash token bad: Non è stato possibile trovare il codice. Controllare l'indirizzo diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 16a8ebdb1..f994f10d5 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -2009,8 +2009,6 @@ ja: reset_password: title: パスワードの再設定 heading: '%{user} のパスワードのリセット' - password: 'パスワード:' - confirm password: 'パスワードの確認:' reset: パスワードを初期化 flash changed: あなたのパスワードは変更されました。 flash token bad: キーワードが見つかりません。URL を確認してください。 diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 70d884ea8..ca78ea724 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -1044,8 +1044,6 @@ ka: heading: დაგავიწყდათ პაროლი? email address: 'ელ. ფოსტის მისამართი:' reset_password: - password: 'პაროლი:' - confirm password: 'პაროლის დადასტურება:' flash changed: თქვენი პაროლი შეიცვალა. new: title: რეგისტრაცია diff --git a/config/locales/kab.yml b/config/locales/kab.yml index a2cfa6c9f..cb209ecc5 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -1266,8 +1266,6 @@ kab: reset_password: title: Ales awennez n wawal uffir heading: Ales awennez n wawal uffir i %{user} - password: 'Awal uffir:' - confirm password: Sentem awal uffir reset: Ales awennez n wawal uffir flash changed: Awal-ik uffir ibeddel. flash token bad: Ajiá¹­un-agi ulac-it, ahat tuccḍa di tansa URL? diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 721c18fb5..969824159 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -2059,8 +2059,6 @@ ko: reset_password: title: 비밀번호 재설정 heading: '%{user}의 비밀번호 재설정' - password: '비밀번호:' - confirm password: 비밀번호 확인 reset: 비밀번호 재설정 flash changed: 비밀번호가 바뀌었습니다. flash token bad: 토큰을 찾지 못했습니다. URL을 확인했습니까? diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 731230758..a2f395bde 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -2151,8 +2151,6 @@ ku-Latn: reset_password: title: Şîfreyê nû bike heading: Şîfreyê nû bike ji bo %{user} - password: 'Şîfre:' - confirm password: 'Şîfreyê bipejirîne:' reset: Şîfreyê nû bike flash changed: Şîfreya te hate guhertin. flash token bad: Eger te vê sembolê nedîtibe, belkî jî divê tu URLyê kontrol diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 741795ffe..3e14aa25f 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -1131,8 +1131,6 @@ lb: reset_password: title: Passwuert zrécksetzen heading: Passwuert fir %{user} zrécksetzen - password: 'Passwuert:' - confirm password: 'Passwuert confirméieren:' reset: Passwuert zrécksetzen flash changed: Äert Passwuert gouf geännert. new: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index fc7eb7863..4b3deb3e9 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -2099,8 +2099,6 @@ lt: reset_password: title: IÅ¡ naujo nustatyti slaptažodį heading: IÅ¡ naujo nustatyti naudotojo %{user} slaptažodį - password: 'Slaptažodis:' - confirm password: 'Patvirtinti slaptažodį:' reset: IÅ¡ naujo nustatyti slaptažodį flash changed: JÅ«sų slaptažodis sėkmingai pakeistas. flash token bad: Ženklas nerastas, galbÅ«t bloga nuoroda? diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 5c92c9a2e..3af01a946 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -74,6 +74,7 @@ lv: relation: Relācija relation_member: Relācijas loceklis relation_tag: Relācijas birka + report: Ziņot session: Sesija trace: Trase tracepoint: Trases punkts @@ -102,15 +103,15 @@ lv: trace: user: Lietotājs visible: Redzams - name: Nosaukums + name: Faila nosaukums size: Izmērs latitude: Platums longitude: Garums public: Publisks description: Apraksts gpx_file: 'AugÅ¡upielādēt GPX failu:' - visibility: 'RedzamÄ«ba:' - tagstring: 'IezÄ«mes:' + visibility: RedzamÄ«ba + tagstring: IezÄ«mes message: sender: SÅ«tÄ«tājs title: Temats @@ -350,6 +351,7 @@ lv: in_language_title: Dienasgrāmatas ieraksti valodā %{language} new: Jauns dienasgrāmatas ieraksts new_title: Izveidot jaunu ierakstu jÅ«su dienasgrāmatā + my_diary: Mana dienasgrāmata no_entries: Dienasgrāmatā nav ierakstu recent_entries: Pēdējie dienasgrāmatas ieraksti older_entries: Vecāki ieraksti @@ -498,6 +500,7 @@ lv: marketplace: Tirgus monastery: Klosteris motorcycle_parking: Motociklu stāvvieta + music_school: MÅ«zikas skola nightclub: Naktsklubs nursing_home: Pansionāts parking: Autostāvvieta @@ -509,6 +512,7 @@ lv: post_office: Pasts prison: Cietums pub: Krogs + public_bath: Publiskā pirts public_building: Sabiedriskā ēka recycling: Pārstrādes punkts restaurant: Restorāns @@ -548,6 +552,8 @@ lv: dormitory: KopmÄ«tnes farm: SaimniecÄ«bas ēka garage: Garāža + garages: Garāžas + hangar: Angārs hospital: SlimnÄ«cas ēka hotel: ViesnÄ«ca house: Māja @@ -556,11 +562,16 @@ lv: public: Sabiedriskā ēka residential: DzÄ«vojamā ēka retail: MazumtirdzniecÄ«bas ēka + roof: Jumts school: Skolas ēka terrace: Terase train_station: Dzelzceļa stacija university: Universitātes ēka + warehouse: Noliktava "yes": Ēka + club: + sport: Sporta klubs + "yes": Klubs craft: brewery: Alus darÄ«tava carpenter: Galdnieks @@ -569,6 +580,8 @@ lv: painter: Krāsotājs photographer: Fotogrāfs plumber: SantehniÄ·is + roofer: JumiÄ·is + sawmill: Kokzāģētava shoemaker: Kurpnieks tailor: Drēbnieks "yes": Amatnieks @@ -615,6 +628,7 @@ lv: tertiary: PaÅ¡valdÄ«bu autoceļi tertiary_link: PaÅ¡valdÄ«bu autoceļš track: Zemesceļš + traffic_mirror: Satiksmes spogulis traffic_signals: Satiksmes regulators trunk: MaÄ£istrālais ceļš trunk_link: MaÄ£istrālais ceļš @@ -694,6 +708,7 @@ lv: miniature_golf: Minigolfs nature_reserve: Dabas rezervāts park: Parks + picnic_table: Piknika galds pitch: Sporta laukums playground: Spēļu laukums recreation_ground: AtpÅ«tas Zona @@ -715,6 +730,7 @@ lv: lighthouse: Bāka mine: Raktuves pipeline: Cauruļvads + snow_cannon: Sniega lielgabals surveillance: NovēroÅ¡ana tower: Tornis watermill: Ūdens dzirnavas @@ -847,6 +863,7 @@ lv: car_repair: Auto remonts carpet: Paklāju veikals charity: LabdarÄ«bas veikals + cheese: Siera veikals chemist: ĶīmiÄ·is clothes: Apģērbu veikals computer: Datorveikals @@ -1892,8 +1909,6 @@ lv: reset_password: title: AtiestatÄ«t paroli heading: Atcelt %{user} paroli - password: 'Parole:' - confirm password: 'Atkārtot paroli:' reset: Atcelt paroli flash changed: JÅ«su parole ir nomainÄ«ta. flash token bad: Neatradu to pilnvaru, varbÅ«t pārbaudi URL? @@ -2354,7 +2369,7 @@ lv: hide: Slēpt resolve: Atrisināt reactivate: Atkal aktivizēt - comment_and_resolve: Komentēt un Atrisināt + comment_and_resolve: Komentēt un atrisināt comment: Komentēt edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied Å¡eit. directions: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index b6f99ac68..62173e114 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -132,6 +132,7 @@ mk: description: Опис languages: Јазици pass_crypt: Лозинка + pass_crypt_confirmation: Потврдете ја лозинката help: trace: tagstring: одделено со запирка @@ -237,6 +238,12 @@ mk: anonymous: анонимен no_comment: (нема коментари) part_of: Дел од + part_of_relations: + one: 1 однос + other: '%{count} односи' + part_of_ways: + one: 1 пат + other: '%{count} патишта' download_xml: Преземи XML view_history: Погл. историја view_details: Погл. подробности @@ -271,6 +278,9 @@ mk: title_html: 'Пат: %{name}' history_title_html: 'Историја на патот: %{name}' nodes: Јазли + nodes_count: + one: 1 јазол + other: '%{count} јазли' also_part_of_html: one: дел од патот %{related_ways} other: дел од патиштата %{related_ways} @@ -278,6 +288,9 @@ mk: title_html: 'Однос: %{name}' history_title_html: 'Историја на односот: %{name}' members: Членови + members_count: + one: 1 член + other: '%{count} члена' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} како %{role}' @@ -2328,8 +2341,6 @@ mk: reset_password: title: Смени лозинка heading: Смени лозинка за %{user} - password: 'Лозинка:' - confirm password: 'Потврдете ја лозинката:' reset: Смени лозинка flash changed: Лозинката ви е сменета. flash token bad: Не ја пронајдов таа шифра. Проверете ја URL-адресата. diff --git a/config/locales/mr.yml b/config/locales/mr.yml index 4511af1aa..1a5c0c1ce 100644 --- a/config/locales/mr.yml +++ b/config/locales/mr.yml @@ -1227,8 +1227,6 @@ mr: reset_password: title: परवलीचा शब्द पुनर्स्थापित करा heading: '%{user}साठी परवलीचा शब्द पुनर्स्थापित करा' - password: 'परवलीचा शब्द:' - confirm password: 'परवलीचा शब्द पुन्हा लिहा:' reset: परवलीचा शब्द पुनर्स्थापित करा flash changed: आपला परवलीचा शब्द बदलण्यात आला आहे. new: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 1fa61cf93..d7f769608 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1895,8 +1895,6 @@ ms: reset_password: title: Set semula kata laluan heading: Set Semula Kata Laluan untuk %{user} - password: 'Kata laluan:' - confirm password: 'Sahkan Kata Laluan:' reset: Set Semula Kata Laluan flash changed: Kata laluan anda telah ditukar. flash token bad: Token itu tidak dijumpai; sila semak URL-nya. diff --git a/config/locales/my.yml b/config/locales/my.yml index 755764f9e..bae16c56e 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -744,8 +744,6 @@ my: reset_password: title: စကားဝှက်ကို ပြန်ချိန်ရန် heading: '%{user} အတွက် စကားဝှက်ကို ပြန်ချိန်ရန်' - password: 'စကားဝှက်:' - confirm password: 'စကားဝှက်ကို အတည်ပြုပါ:' reset: စကားဝှက်ကို ပြန်ချိန်ရန် flash changed: သင့်စကားဝှက်ကို ပြောင်းလဲပြီးပါပြီ new: diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 4373ee4b1..35b12acaa 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -2130,8 +2130,6 @@ nb: reset_password: title: Nullstill passord heading: Nullstill passord for %{user} - password: 'Passord:' - confirm password: 'Bekreft passord:' reset: Nullstill passord flash changed: Ditt passord er endret. flash token bad: Kunne ikke finne den nøkkelen. Sjekke URLen kanskje? diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 8177d2a28..b01a4e5fd 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -1127,8 +1127,6 @@ ne: reset_password: title: प्रवेस शब्द परिवर्तन गर्ने heading: '%{user}को लागि प्रवेस शब्द परिवर्तन गर्ने' - password: 'पासवर्ड:' - confirm password: 'प्रवेशशव्द निश्चित गर्ने:' reset: नयाँ प्रवेशशव्द flash changed: तपाईंको प्रवेश शब्द परिवर्तन गरिएको छ। new: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 49b360dfa..1f711e302 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -2197,8 +2197,6 @@ nl: reset_password: title: Wachtwoord opnieuw instellen heading: Wachtwoord voor %{user} opnieuw instellen - password: 'Wachtwoord:' - confirm password: 'Wachtwoord bevestigen:' reset: Wachtwoord opnieuw instellen flash changed: Uw wachtwoord is gewijzigd. flash token bad: Het token kon niet gevonden worden. Controleer de URL. diff --git a/config/locales/nn.yml b/config/locales/nn.yml index 9bd8bd343..88e6eb80b 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1676,8 +1676,6 @@ nn: reset_password: title: Nullstill passord heading: Nullstill passord for %{user} - password: 'Passord:' - confirm password: 'Stadfest passord:' reset: Nullstill passord flash changed: Passordet ditt er endra. flash token bad: Kunne ikkje finne den nøkkelen. Sjekke URLen kanskje? diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 4dbf5815e..1bde1ae51 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -2007,8 +2007,6 @@ oc: reset_password: title: Reïnicializar lo senhal heading: Reïnicializar lo senhal de %{user} - password: 'Senhal :' - confirm password: 'Confirmatz lo senhal :' reset: Reïnicializar lo senhal flash changed: Vòstre senhal es estat modificat. flash token bad: Avètz pas trobat aqueste geton, avètz verificat l'URL ? diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 3e1763fcc..6601ae66f 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -1039,8 +1039,6 @@ pa: new password button: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ reset_password: title: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ - password: 'ਪਛਾਣ-ਸ਼ਬਦ:' - confirm password: 'ਪਛਾਣ ਸ਼ਬਦ ਤਸਦੀਕ ਕਰੋ:' reset: ਪਛਾਣ ਸ਼ਬਦ ਮੁੜ-ਸੈੱਟ ਕਰੋ flash changed: ਤੁਹਾਡਾ ਪਛਾਣ ਸ਼ਬਦ ਬਦਲਿਆ ਜਾ ਚੁੱਕਾ ਹੈ। new: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 661db067d..59b1209d8 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -182,6 +182,7 @@ pl: description: Opis languages: Języki pass_crypt: Hasło + pass_crypt_confirmation: Potwierdź hasło help: trace: tagstring: rozdzielone przecinkami @@ -309,6 +310,16 @@ pl: anonymous: Anonimowy użytkownik no_comment: (bez komentarza) part_of: Wchodzi w skład + part_of_relations: + one: 1 relacja + few: '%{count} relacje' + many: '%{count} relacji' + other: '%{count} relacji' + part_of_ways: + one: 1 linia + few: '%{count} linie' + many: '%{count} linii' + other: '%{count} linii' download_xml: Pobierz XML view_history: Wyświetl historię view_details: Wyświetl szczegóły @@ -343,6 +354,11 @@ pl: title_html: 'Linia: %{name}' history_title_html: 'Historia linii: %{name}' nodes: Węzły + nodes_count: + one: 1 węzeł + few: '%{count} węzły' + many: '%{count} węzłów' + other: '%{count} węzła' also_part_of_html: one: część linii %{related_ways} other: część linii %{related_ways} @@ -350,6 +366,11 @@ pl: title_html: 'Relacja: %{name}' history_title_html: 'Historia relacji: %{name}' members: Człony relacji + members_count: + one: 1 człon + few: '%{count} człony' + many: '%{count} członów' + other: '%{count} członu' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} jako %{role}' @@ -2400,8 +2421,6 @@ pl: reset_password: title: Wyczyść hasło heading: Czyszczenie hasła użytkownika %{user} - password: Hasło - confirm password: Potwierdź hasło reset: Wyczyść hasło flash changed: Hasło zostało zmienione. flash token bad: Nie znaleziono tokenu, sprawdź URL diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index b03f10465..79680fd16 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -172,6 +172,7 @@ pt-BR: description: Descrição languages: Idiomas pass_crypt: Senha + pass_crypt_confirmation: Confirmar Senha help: trace: tagstring: separados por vírgulas @@ -2379,8 +2380,6 @@ pt-BR: reset_password: title: Redefinir senha heading: Redefinir Senha de %{user} - password: 'Senha:' - confirm password: 'Confirmar senha:' reset: Redefinir Senha flash changed: Sua senha foi alterada. flash token bad: O código não confere, verifique a URL. diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 4ebec7644..1ec830006 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -2360,8 +2360,6 @@ pt-PT: reset_password: title: Repor palavra-passe heading: Repor palavra-passe para %{user} - password: 'Palavra-passe:' - confirm password: 'Confirmar palavra-passe:' reset: Repor palavra-passe flash changed: A tua palavra-passe foi alterada. flash token bad: Não encontrámos esse token. Confere o URL, por favor. diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 918094e43..6d213ad95 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -2261,8 +2261,6 @@ ro: reset_password: title: Resetare parolă heading: Resetați parola pentru %{user} - password: 'Parola:' - confirm password: 'Confirmați parola:' reset: Resetează parola flash changed: Parola dumneavoastră a fost schimbată. flash token bad: Nu ați găsit acel simbol, verificați adresa URL? diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 359c5d29a..959658fe7 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -2238,8 +2238,6 @@ ru: reset_password: title: Повторная установка пароля heading: Повторная установка пароля для %{user} - password: 'Пароль:' - confirm password: 'Подтверждение пароля:' reset: Установить пароль flash changed: Ваш пароль был изменён. flash token bad: Невозможно найти такой код подтверждения, проверьте ссылку. diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 3799e2ff7..115a7e3ed 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -1803,8 +1803,6 @@ scn: reset_password: title: Azzera la palora d'òrdini heading: Azziramentu dâ palora d'òrdini di %{user} - password: 'Palora d''òrdini:' - confirm password: 'Cunferma la palora d''òrdini:' reset: Azzera la palora d'òrdini flash changed: La tò palora d'òrdini fu canciata. flash token bad: Stu còdici nun s'attrova, pirchì nun cuntrolli l'URL? diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 49e1b93af..0cd3dee23 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1767,8 +1767,6 @@ sk: reset_password: title: Resetnúť heslo heading: Resetnúť heslo pre %{user} - password: 'Heslo:' - confirm password: 'PotvrdiÅ¥ heslo:' reset: VynulovaÅ¥ heslo flash changed: VaÅ¡e heslo bolo zmenené. flash token bad: Zodpovedajúci kód nebol nájdený, skontrolujte prípadne URL. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index acfb597c6..97db76c11 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1803,8 +1803,6 @@ sl: reset_password: title: Ponastavitev gesla heading: Ponastavi geslo za %{user} - password: 'Geslo:' - confirm password: 'Potrdite geslo:' reset: Ponastavitev gesla flash changed: VaÅ¡e geslo je bilo spremenjeno. flash token bad: Tega žetona ni bilo mogoče najti. Predlagamo, da preverite diff --git a/config/locales/sq.yml b/config/locales/sq.yml index f54a4258c..6334330bc 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1377,8 +1377,6 @@ sq: reset_password: title: Rivendos fjalëkalimin heading: Rivendos fjalëkalimin për %{user} - password: 'Fjalëkalimi:' - confirm password: 'Konfirmo fjalëkalimin:' reset: Rivendos fjalëkalimin flash changed: Fjalëkalimi yt është ndryshuar. flash token bad: Nuk e gjet atë shenjë, kontrollo URL-në? diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index d6a86881f..1cf62d02f 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1305,8 +1305,6 @@ sr-Latn: reset_password: title: PoniÅ¡ti lozinku heading: PoniÅ¡tavanje lozinke za %{user} - password: 'Lozinka:' - confirm password: 'Potvrdite lozinku:' reset: PoniÅ¡ti lozinku flash changed: VaÅ¡a lozinka je promenjena. flash token bad: Takav novčić nije pronađen. Proverite adresu. diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 66251fc02..0f44adebc 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -2005,8 +2005,6 @@ sr: reset_password: title: Поништи лозинку heading: Поништавање лозинке за %{user} - password: 'Лозинка:' - confirm password: 'Потврдите лозинку:' reset: Поништи лозинку flash changed: Ваша лозинка је промењена. flash token bad: Такав новчић није пронађен. Проверите адресу. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 931fe6dc2..712cdb114 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -2268,8 +2268,6 @@ sv: reset_password: title: Återställ lösenord heading: Återställ lösenord för %{user} - password: 'Lösenord:' - confirm password: 'Bekräfta lösenord:' reset: Återställ lösenord flash changed: Ditt lösenord har ändrats. flash token bad: Hittade inte den nyckeln, kontrollera webbadressen. diff --git a/config/locales/ta.yml b/config/locales/ta.yml index 4c80d13c9..570691e7a 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -703,8 +703,6 @@ ta: reset_password: title: கடவுச்சொல்லை மீட்டமை heading: ' %{user}க்கு கடவுச்சொல் மீட்டமை' - password: 'கடவுச்சொல்:' - confirm password: 'கடவுச்சொல்லை உறுதிசெய்:' reset: கடவுச்சொல்லை மீட்டமை flash changed: உங்கள் கடவுச்சொல் மாற்றப்பட்டது. new: diff --git a/config/locales/te.yml b/config/locales/te.yml index 520cadb4e..0f2b142f6 100644 --- a/config/locales/te.yml +++ b/config/locales/te.yml @@ -693,8 +693,6 @@ te: email address: 'ఈమెయిల్ చిరునామా:' notice email cannot find: క్షమించండి, ఆ ఈమెయిలు చిరునామా దొరకలేదు. reset_password: - password: 'సంకేతపదం:' - confirm password: 'సంకేతపదాన్ని నిర్ధారించండి:' flash changed: మీ సంకేతపదాన్ని మార్చాం. new: title: నమోదవ్వండి diff --git a/config/locales/th.yml b/config/locales/th.yml index a95e16cf0..5965e2149 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1773,8 +1773,6 @@ th: reset_password: title: ตั้งรหัสผ่านใหม่ heading: 'ตั้วรหัสผ่านใหม่สำหรับ: %{user}' - password: 'รหัสผ่าน:' - confirm password: 'ยืนยันรหัสผ่าน:' reset: ตั้งรหัสผ่านใหม่ flash changed: เปลี่ยนรหัสผ่านของคุณแล้วเรียบร้อย new: diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 0be3f7d96..316e7e5be 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -1575,8 +1575,6 @@ tl: reset_password: title: Muling itakda ang hudyat heading: Muling itakda ang Hudyat para kay %{user} - password: 'Password:' - confirm password: 'Tiyakin ang Hudyat:' reset: Muling Itakda ang Hudyat flash changed: Napalitan na ang hudyat mo. flash token bad: Hindi natagpuan ang ganyang kahalip, suriin kaya ang URL? diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 05dbc897a..ae99038f0 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -2250,8 +2250,6 @@ tr: reset_password: title: Parolayı sıfırla heading: '%{user} İçin Parolayı Sıfırlayın' - password: 'Parola:' - confirm password: 'Sifre Onayla:' reset: Parolayı Sıfırla flash changed: Parolanız değiştirildi. flash token bad: Bu simgeyi bulamadıysanız belki de bağlantıyı kontrol etmelisiniz? diff --git a/config/locales/tt.yml b/config/locales/tt.yml index bbdc347fd..4066a240d 100644 --- a/config/locales/tt.yml +++ b/config/locales/tt.yml @@ -704,9 +704,6 @@ tt: logout_button: Чыгу lost_password: email address: 'Электрон почта адресы:' - reset_password: - password: 'Серсүз:' - confirm password: 'Серсүзне раслау:' new: email address: 'Электрон почта адресы:' password: 'Серсүз:' diff --git a/config/locales/uk.yml b/config/locales/uk.yml index f4a0933cb..082f7899e 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -2188,8 +2188,6 @@ uk: reset_password: title: Перевстановлення пароля heading: Перевстановлення паролю для %{user} - password: 'Пароль:' - confirm password: 'Підтвердження пароля:' reset: Перевстановити пароль flash changed: Ваш пароль було змінено. flash token bad: Неможливо знайти такий код підтвердження, перевірте посилання. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index c9b3b1c8b..5c89f5b28 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -2127,8 +2127,6 @@ vi: reset_password: title: Đặt lại mật khẩu heading: Đặt lại Mật khẩu của %{user} - password: 'Mật khẩu:' - confirm password: 'Xác nhận Mật khẩu:' reset: Đặt lại Mật khẩu flash changed: Mật khẩu của bạn đã được thay đổi. flash token bad: Không tìm thấy dấu hiệu đó. Có lẽ kiểm tra URL? diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index c8b1b3bf8..06f12b72d 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -18,6 +18,7 @@ # Author: Hydra # Author: Hzy980512 # Author: Impersonator 1 +# Author: Irati # Author: Jienus # Author: Jiwei # Author: Josephine W. @@ -136,7 +137,7 @@ zh-CN: support_url: 支持 URL allow_read_prefs: 读取其用户设置 allow_write_prefs: 修改他们的用户首选项 - allow_write_diary: 创建日记文章、评论与结交朋友。 + allow_write_diary: 创建日记文章、评论并结交朋友。 allow_write_api: 修改地图 allow_read_gpx: 读取他们的私人GPS轨迹 allow_write_gpx: 上传GPS轨迹 @@ -179,6 +180,7 @@ zh-CN: description: 描述 languages: 语言 pass_crypt: 密码 + pass_crypt_confirmation: 确认密码 help: trace: tagstring: 用逗号分隔 @@ -284,6 +286,12 @@ zh-CN: anonymous: 匿名用户 no_comment: (无注释) part_of: 属于 + part_of_relations: + one: 1 relation + other: '%{count} 个关系' + part_of_ways: + one: 1 way + other: '%{count} 条路径' download_xml: 下载 XML view_history: 查看历史 view_details: 查看详情 @@ -317,6 +325,8 @@ zh-CN: title_html: 路径：%{name} history_title_html: 路径历史：%{name} nodes: 节点 + nodes_count: + other: '%{count} 个节点' also_part_of_html: one: 属于路径 %{related_ways} other: 属于路径 %{related_ways} @@ -324,6 +334,9 @@ zh-CN: title_html: 关系：%{name} history_title_html: 关系历史：%{name} members: 成员 + members_count: + one: 1 member + other: '%{count} 位成员' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} 作为%{role}' @@ -662,7 +675,7 @@ zh-CN: administrative: 行政区边界 census: 人口普查边界 national_park: 国家公园 - political: 选举边界 + political: 选区边界 protected_area: 保护区 "yes": 边界 bridge: @@ -2066,8 +2079,6 @@ zh-CN: reset_password: title: 重置密码 heading: 重置%{user}的密码 - password: 密码： - confirm password: 确认密码： reset: 重置密码 flash changed: 您的密码已经更改。 flash token bad: 未找到标记，建议检查 URL? diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 73e8debe6..089f563b6 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -117,8 +117,13 @@ zh-TW: way_tag: 路徑標籤 attributes: client_application: + name: 名稱（必需） + url: 主程式 URL（必需） callback_url: 回呼 (Callback) URL support_url: 支援 URL + allow_read_prefs: 讀取他們的使用者偏好設定 + allow_write_prefs: 修改他們的使用者偏好設定 + allow_write_diary: 建立日記、評論和加入好友 allow_write_api: 修改地圖 allow_read_gpx: 讀取他們的私人 GPS 軌跡 allow_write_gpx: 上傳 GPS 軌跡 @@ -161,6 +166,7 @@ zh-TW: description: 說明 languages: 語言 pass_crypt: 密碼 + pass_crypt_confirmation: 確認密碼 help: trace: tagstring: 以逗點分隔 @@ -265,6 +271,12 @@ zh-TW: anonymous: 匿名 no_comment: (沒有評論) part_of: 屬於： + part_of_relations: + one: 1 個關聯 + other: '%{count} 個關聯' + part_of_ways: + one: 1 條路 + other: '%{count} 條路' download_xml: 下載 XML view_history: 檢視歷史 view_details: 檢視詳細資料 @@ -298,6 +310,8 @@ zh-TW: title_html: 路徑：%{name} history_title_html: 路徑歷史：%{name} nodes: 節點 + nodes_count: + other: '%{count} 個節點' also_part_of_html: one: 路徑 %{related_ways} 的部份 other: 路徑 %{related_ways} 的部份 @@ -305,6 +319,9 @@ zh-TW: title_html: 關聯：%{name} history_title_html: 關聯歷史：%{name} members: 成員 + members_count: + one: 1 個成員 + other: '%{count} 個成員' relation_member: entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} 作為 %{role}' @@ -541,6 +558,7 @@ zh-TW: runway: 跑道 taxiway: 滑行道 terminal: 航廈 + windsock: 布製風標 amenity: animal_shelter: 動物收容所 arts_centre: 藝術中心 @@ -551,7 +569,9 @@ zh-TW: bench: 長椅 bicycle_parking: 自行車停車場 bicycle_rental: 自行車出租 + bicycle_repair_station: 自行車維修站 biergarten: 啤酒庭園 + blood_bank: 血液銀行 boat_rental: 船艇出租 brothel: 妓院 bureau_de_change: 外匯兌換店 @@ -568,6 +588,7 @@ zh-TW: clock: 時鐘 college: 學院 community_centre: 社區中心 + conference_centre: 會議中心 courthouse: 法院 crematorium: 火葬場 dentist: 牙醫 @@ -595,6 +616,7 @@ zh-TW: love_hotel: 愛情賓館 marketplace: 市場 monastery: 修道院 + money_transfer: 匯款 motorcycle_parking: 機車停車場 music_school: 音樂學校 nightclub: 夜總會 @@ -610,6 +632,7 @@ zh-TW: prison: 監獄 pub: 酒館 public_building: 公共建築 + ranger_station: 護林員站 recycling: 回收點 restaurant: 餐廳 school: 學校 @@ -630,9 +653,12 @@ zh-TW: village_hall: 村政廳 waste_basket: 垃圾桶 waste_disposal: 垃圾子車 + waste_dump_site: 垃圾掩埋場 water_point: 取水點 + weighbridge: 地磅 "yes": 便利設施 boundary: + aboriginal_lands: 原住民土地 administrative: 行政區邊界 census: 人口普查邊界 national_park: 國家公園 @@ -645,28 +671,51 @@ zh-TW: viaduct: 高架橋 "yes": 橋 building: + apartment: 公寓 + apartments: 公寓 barn: 穀倉 bungalow: 平房 cabin: 小木屋 chapel: 禮拜堂 church: 教堂建築 + college: 學院建物 + commercial: 商業建物 + dormitory: 宿舍 + duplex: 複式住宅 + farm: 農舍 + garage: 車庫 + garages: 車庫 greenhouse: 溫室 + hangar: 機棚 + hospital: 醫院建築 hotel: 旅館建築 house: 房屋 + houseboat: 船屋 + industrial: 工業建築 + kindergarten: 幼稚園建築 + office: 辦公建築 + public: 公共建築 roof: 屋頂 "yes": 建築物 club: sport: 體育會 "yes": 俱樂部 craft: + beekeper: 養蜂人家 + blacksmith: 鐵匠 brewery: 釀酒廠 carpenter: 木匠 + confectionery: 糖果店 electrician: 電工 + electronics_repair: 電子維修 gardener: 園丁 + glaziery: 玻璃工 + handicraft: 手工藝 painter: 畫家 photographer: 攝影師 plumber: 管道工 shoemaker: 鞋匠 + stonemason: 石工 tailor: 裁縫師 winery: 酒廠 "yes": 工藝品店 @@ -674,6 +723,7 @@ zh-TW: ambulance_station: 急救站 assembly_point: 集合處 defibrillator: 除顫器 + fire_xtinguisher: 滅火器 landing_site: 緊急降落點 phone: 緊急電話 water_tank: 緊急水箱 @@ -725,11 +775,14 @@ zh-TW: unclassified: 無編制道路 "yes": 道路 historic: + aircraft: 歷史飛行機 archaeological_site: 考古遺址 + bomb_crater: 彈坑遺跡 battlefield: 古戰場 boundary_stone: 界石 building: 歷史建築 bunker: 掩體 + cannon: 古砲 castle: 城堡 church: 教堂 city_gate: 城門 @@ -739,9 +792,11 @@ zh-TW: house: 房屋 manor: 莊園 memorial: 紀念館 + milestone: 歷史里程碑 mine: 礦場 mine_shaft: 礦井 monument: 古蹟 + railway: 歷史鐵路 roman_road: 羅馬道路 ruins: 廢墟 stone: 石造史蹟 @@ -785,9 +840,12 @@ zh-TW: vineyard: 葡萄園 "yes": 土地利用 leisure: + adult_gaming_centre: 成人遊戲中心 + amusement_arcade: 電子遊樂場 beach_resort: 海灘遊樂區 bird_hide: 賞鳥亭 common: 公共用地 + dance: 舞廳 dog_park: 遛狗公園 firepit: 火坑 fishing: 垂釣區 @@ -800,7 +858,9 @@ zh-TW: marina: 小船塢 miniature_golf: 小型高爾夫球場 nature_reserve: 自然保護區 + outdoor_seating: 戶外座椅 park: 公園 + picnic_table: 野餐桌 pitch: 運動場 playground: 遊樂區 recreation_ground: 遊樂場 @@ -839,12 +899,14 @@ zh-TW: petroleum_well: 油井 pier: 碼頭 pipeline: 管線 + pumping_station: 泵站 silo: 筒倉 snow_cannon: 雪砲 storage_tank: 儲油罐 surveillance: 監視攝影機 telescope: 望遠鏡 tower: 塔 + utility_pole: 電線桿 wastewater_plant: 污水處理處 watermill: 水車 water_tower: 水塔 @@ -917,7 +979,10 @@ zh-TW: insurance: 保險公司辦公室 it: IT 辦公室 lawyer: 律師 + logistics: 物流辦公處 + newspaper: 報社 ngo: 非政府組織辦公室 + research: 研究室 telecommunication: 電信業辦事處 travel_agent: 旅行社 "yes": 辦公室 @@ -976,8 +1041,10 @@ zh-TW: alcohol: 酒館 antiques: 古董店 art: 藝品店 + baby_goods: 嬰兒用品 bag: 包包店 bakery: 麵包店 + bathroom_furnishing: 浴室裝潢 beauty: 美容店 beverages: 飲料店 bicycle: 自行車店 @@ -1001,6 +1068,7 @@ zh-TW: copyshop: 複印店 cosmetics: 化妝品店 curtain: 窗簾店 + dairy: 乳品店 deli: 高級食品店 department_store: 百貨商店 discount: 特價商品店 @@ -1010,8 +1078,10 @@ zh-TW: electronics: 電子材料行 erotic: 情趣用品店 estate_agent: 房地產仲介 + fabric: 布料行 farm: 農場商店 fashion: 時裝店 + fishing: 釣魚用品店 florist: 花店 food: 食品店 frame: 相框店 @@ -1024,6 +1094,8 @@ zh-TW: grocery: 雜貨店 hairdresser: 理髮店 hardware: 五金行 + health_food: 保健食品店 + hearing_aids: 助聽器 herbalist: 藥草供應商 hifi: 音響店 houseware: 生活用品店 @@ -1037,6 +1109,7 @@ zh-TW: lottery: 樂透 mall: 購物商場 massage: 按摩店 + medical_supply: 醫療用品店 mobile_phone: 行動通訊行 motorcycle: 機車行 motorcycle_repair: 機車維修行 @@ -1267,7 +1340,7 @@ zh-TW: intro_header: 歡迎來到 OpenStreetMap！ intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。 intro_2_create_account: 建立使用者帳號 - hosting_partners_html: 主機由 %{ucl}、%{bytemark}，和其他 %{partners} 所支援。 + hosting_partners_html: 主機由%{ucl}、%{bytemark}，和其他%{partners}所支援。 partners_ucl: 倫敦大學學院 partners_bytemark: Bytemark 主機代管 partners_partners: 合作夥伴 @@ -1455,7 +1528,7 @@ zh-TW: about: next: 下一頁 copyright_html: ©OpenStreetMap
貢獻者 - used_by_html: '%{name} 為數以千計的網站、行動應用程式和硬件提供地圖資料' + used_by_html: '%{name} 為數以千計的網站、行動應用程式和硬體提供地圖資料' lede_text: OpenStreetMap 是由製圖者社群所建立，他們提供及不斷更新包括有關世界各地的道路、路徑、咖啡館、火車站等等的資料。 local_knowledge_title: 地方知識 local_knowledge_html: |- @@ -1465,7 +1538,7 @@ zh-TW: community_driven_title: 社群推動 community_driven_html: |- OpenStreetMap 的社群多元化、懷有熱情，而且日益壯大。我們的貢獻者包括地圖製作愛好者，地理訊息系統的專業人員，提供 OSM 伺服器的工程師，為受災害影響區域製圖的人道主義志願人士，以及其他各界人士。 - 想進一步了解這個社群，請參閱 OpenStreetMap 部落格、使用者日記, + 想進一步了解這個社群，請參閱 OpenStreetMap 部落格、使用者日記、 社群部落格，以及 OSM 基金會 網站。 open_data_title: 開放資料 open_data_html: OpenStreetMap 是開放資料的：您可以自由地使用作任何用途，前提是您須標明作者為 OpenStreetMap @@ -1473,8 +1546,8 @@ zh-TW: legal_title: 法律資訊 legal_1_html: 本站以及許多相關的服務正式由 OpenStreetMap 基金會（OSMF）代表社群所營運。所有使用的 OSMF 運行服務皆符合我們的使用條款、可接受使用方針< - /a>、和隱私政策。 + href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">可接受使用方針、和隱私政策。 legal_2_html: |- 若您有任何授權、版權或其他法律諮詢，請聯絡 OSMF 。
@@ -1732,7 +1805,7 @@ zh-TW: subway: 地下鐵 tram: - 輕軌 - - 輕軌 + - 電車軌道 cable: - 大型纜車 - 升降吊椅 @@ -2067,8 +2140,6 @@ zh-TW: reset_password: title: 重設密碼 heading: 重設 %{user} 的密碼 - password: 密碼： - confirm password: 確認密碼： reset: 重設密碼 flash changed: 您的密碼已經變更。 flash token bad: 找不到該密鑰，可能要檢查一下 URL？