From e4c34ee709225c5cace97ba3e3fd1cec5f919328 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 29 Sep 2025 14:21:43 +0200 Subject: [PATCH 01/16] Localisation updates from https://translatewiki.net. --- config/locales/ar.yml | 31 +- config/locales/bn.yml | 71 ++--- config/locales/cs.yml | 108 +++++++ config/locales/cy.yml | 69 ++--- config/locales/da.yml | 69 ++--- config/locales/de.yml | 71 ++--- config/locales/el.yml | 71 ++--- config/locales/eo.yml | 71 ++--- config/locales/eu.yml | 9 +- config/locales/fr.yml | 78 ++--- config/locales/frp.yml | 69 ++--- config/locales/gl.yml | 71 ++--- config/locales/he.yml | 63 ++-- config/locales/hr.yml | 585 ++++++++++++++++++++++++++---------- config/locales/ia.yml | 69 ++--- config/locales/it.yml | 71 ++--- config/locales/ko.yml | 73 ++--- config/locales/lb.yml | 63 ++-- config/locales/mk.yml | 75 ++--- config/locales/nl.yml | 75 ++--- config/locales/pl.yml | 75 ++--- config/locales/pt-PT.yml | 69 ++--- config/locales/pt.yml | 69 ++--- config/locales/ru.yml | 24 ++ config/locales/shn.yml | 69 ++--- config/locales/sk.yml | 4 + config/locales/skr-arab.yml | 69 ++--- config/locales/sl.yml | 203 ++++++++----- config/locales/sr.yml | 66 ++-- config/locales/sv.yml | 2 +- config/locales/tr.yml | 71 ++--- config/locales/uk.yml | 71 ++--- config/locales/vi.yml | 69 ++--- config/locales/xmf.yml | 54 +++- config/locales/zh-CN.yml | 11 +- config/locales/zh-TW.yml | 111 +++---- 36 files changed, 1716 insertions(+), 1183 deletions(-) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index a5ffc0f53..4cbc9be6d 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1552,6 +1552,22 @@ ar: create: successful_report: لقد تم تسجيل بلاغك بنجاح provide_details: يُرجَى تقديم التفاصيل المطلوبة + languages_panes: + select_language_list: + languages: + gsw: الألمانية + dsb: الصربية السفلى + es: إسباني + ga: الأيرلندية + ia: إنترلينغوا + fit: تورنيدالين الفنلندية + nds: الألمانية المنخفضة + sc: السردينية + sr: الصربية (السيريلية) + he: العبرية + hi: الهندية + ka: جورجي + ko: كوري layouts: project_name: title: خريطة الشارع المفتوحة @@ -1581,21 +1597,6 @@ ar: communities: مجتمعات learn_more: التعرف على المزيد more: المزيد - select_language_list: - languages: - gsw: الألمانية - dsb: الصربية السفلى - es: إسباني - ga: الأيرلندية - ia: إنترلينغوا - fit: تورنيدالين الفنلندية - nds: الألمانية المنخفضة - sc: السردينية - sr: الصربية (السيريلية) - he: العبرية - hi: الهندية - ka: جورجي - ko: كوري user_mailer: diary_comment_notification: subject: '[خريطة الشارع المفتوحة] %{user} علق على مدخلتك في اليومية' diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 176241f64..1ce9b8222 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -1479,41 +1479,7 @@ bn: create: successful_report: আপনার অভিযোগ সফলভাবে নিবন্ধন হয়েছে provide_details: দয়া করে প্রয়োজনীয় তথ্য সন্নিবেশিত করুন - layouts: - project_name: - title: ওপেনস্ট্রিটম্যাপ - h1: ওপেনস্ট্রিটম্যাপ - logo: - alt_text: ওপেনস্ট্রিটম্যাপ লোগো - home: নিড় অবস্থানে যান - logout: প্রস্থান - log_in: প্রবেশ - sign_up: যোগ দিন - start_mapping: মানচিত্রায়ন শুরু করুন - edit: সম্পাদনা - history: ইতিহাস - export: রপ্তানি - issues: সমস্যা - gps_traces: জিপিএস ট্রেস - user_diaries: ব্যবহারকারীর দিনলিপি - edit_with: '%{editor} দিয়ে সম্পাদনা করুন' - intro_header: ওপেনস্ট্রিটম্যাপে স্বাগতম! - intro_text: ওপেনস্ট্রিটম্যাপ বিশ্বের একটি মানচিত্র; যা আপনার মতো মানুষের দ্বারা - নির্মিত এবং এটি মুক্ত লাইসেন্সের অধীনে বিনামূল্যে ব্যবহারযোগ্য। - hosting_partners_2024_html: হোস্টিংয়ে সাহায্য করেছেন %{fastly}, %{corpmembers}, - ও অন্যান্য %{partners}। - partners_partners: সহযোগীগণ - tou: ব্যবহারের শর্তাবলী - help: সাহায্য - about: পরিচিতি - copyright: মেধাস্বত্ব - communities: সম্প্রদায় - learn_more: আরও পড়ুন - more: আরও - header: - select_language: ভাষা নির্বাচন করুন - select_language_button: - title: ভাষা নির্বাচন করুন + languages_panes: select_language_list: languages: af: আফ্রিকান্স @@ -1616,6 +1582,41 @@ bn: zh-HK: চীনা (হংকং) ja: জাপানি ko: কোরীয় + layouts: + project_name: + title: ওপেনস্ট্রিটম্যাপ + h1: ওপেনস্ট্রিটম্যাপ + logo: + alt_text: ওপেনস্ট্রিটম্যাপ লোগো + home: নিড় অবস্থানে যান + logout: প্রস্থান + log_in: প্রবেশ + sign_up: যোগ দিন + start_mapping: মানচিত্রায়ন শুরু করুন + edit: সম্পাদনা + history: ইতিহাস + export: রপ্তানি + issues: সমস্যা + gps_traces: জিপিএস ট্রেস + user_diaries: ব্যবহারকারীর দিনলিপি + edit_with: '%{editor} দিয়ে সম্পাদনা করুন' + intro_header: ওপেনস্ট্রিটম্যাপে স্বাগতম! + intro_text: ওপেনস্ট্রিটম্যাপ বিশ্বের একটি মানচিত্র; যা আপনার মতো মানুষের দ্বারা + নির্মিত এবং এটি মুক্ত লাইসেন্সের অধীনে বিনামূল্যে ব্যবহারযোগ্য। + hosting_partners_2024_html: হোস্টিংয়ে সাহায্য করেছেন %{fastly}, %{corpmembers}, + ও অন্যান্য %{partners}। + partners_partners: সহযোগীগণ + tou: ব্যবহারের শর্তাবলী + help: সাহায্য + about: পরিচিতি + copyright: মেধাস্বত্ব + communities: সম্প্রদায় + learn_more: আরও পড়ুন + more: আরও + header: + select_language: ভাষা নির্বাচন করুন + select_language_button: + title: ভাষা নির্বাচন করুন user_mailer: diary_comment_notification: subject: '[OpenStreetMap] %{user} একটি দিনলিপির ভুক্তিতে মন্তব্য করেছেন' diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 7559da5cd..f15b9f1d8 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1695,12 +1695,19 @@ cs: border_types: arrondissement: Hranice arrondissementu city: Hranice města + county: Hranice okresu + município: Městská hranice nation: Mezinárodní hranice national: Mezinárodní hranice + neighbourhood: Hranice sousedství + parish: Hranice farnosti + province: Hranice provincie searches: show: title: latlon: Interní + nominatim: Nominatim + nominatim_reverse: Nominatim queries: create: no_results: Nenalezeny žádné výsledky @@ -1826,6 +1833,106 @@ cs: create: successful_report: VaÅ¡e hlášení bylo úspěšně zaevidováno provide_details: Prosím poskytněte potřebné bližší informace + languages_panes: + select_language_list: + languages: + af: afrikánÅ¡tina + ast: asturÅ¡tina + az: ÁzerbájdžánÅ¡tina + id: indonéština + ms: MalajÅ¡tina + bs: BosenÅ¡tina + br: BretonÅ¡tina + ca: KatalánÅ¡tina + cs: čeÅ¡tina + cy: velÅ¡tina + da: dánÅ¡tina + de: němčina + dsb: DolnosrbÅ¡tina + et: estonÅ¡tina + en: angličtina + en-GB: Angličtina (UK) + es: Å¡panělÅ¡tina + eo: esperanto + eu: baskičtina + fr: francouzÅ¡tina + fy: Západofríština + fur: friulÅ¡tina + ga: irÅ¡tina + gd: Skotská gaelÅ¡tina + gl: galicijÅ¡tina + hsb: Horní lužickosrbÅ¡tina + hr: ChorvatÅ¡tina + ia: Interlingua + is: islandÅ¡tina + it: italÅ¡tina + gcf: Guadeloupská kreolÅ¡tina + ku-Latn: KurdÅ¡tina (latinka) + lv: LotyÅ¡Å¡tina + lb: LucemburÅ¡tina + lt: LitevÅ¡tina + hu: maďarÅ¡tina + nl: holandÅ¡tina + nb: NorÅ¡tina (bokmÃ¥l) + nn: NorÅ¡tina nynorsk + oc: OkcitánÅ¡tina + pl: polÅ¡tina + pt-PT: portugalÅ¡tina + pt: portugalÅ¡tina (Brazílie) + ro: rumunÅ¡tina + sc: SardínÅ¡tina + sco: skotÅ¡tina + sq: albánÅ¡tina + scn: sicilÅ¡tina + sk: slovenÅ¡tina + sl: slovinÅ¡tina + sr-Latn: srbÅ¡tina (latinka) + sh: srbochorvatÅ¡tina (latinka) + fi: finÅ¡tina + sv: Å¡védÅ¡tina + tl: Tagalog + kab: Kabyle + vi: vietnamÅ¡tina + tr: turečtina + yo: jorubÅ¡tina + el: řečtina + ba: baÅ¡kirÅ¡tina + be: běloruÅ¡tina + be-Tarask: běloruÅ¡tina (taraÅ¡k.) + bg: bulharÅ¡tina + mk: makedonÅ¡tina + mo: moldavÅ¡tina + ce: čečenÅ¡tina + ru: ruÅ¡tina + sr: srbÅ¡tina (cyrilice) + tt: tatarÅ¡tina (cyrilice) + uk: ukrajinÅ¡tina + kk-cyrl: kazaÅ¡tina (cyrilice) + yi: jidiÅ¡ + he: hebrejÅ¡tina + ar: arabÅ¡tina + fa: perÅ¡tina + arz: Egyptská arabÅ¡tina + pnb: Západní pandžábÅ¡tina + ps: paÅ¡tÅ¡tina + ne: nepálÅ¡tina + mr: maráthÅ¡tina + hi: hindÅ¡tina + bn: bengálÅ¡tina + pa: pandžábÅ¡tina + gu: gudžarátÅ¡tina + ta: tamilÅ¡tina + te: telugÅ¡tina + kn: kannadÅ¡tina + th: thajÅ¡tina + my: barmÅ¡tina + ka: gruzínÅ¡tina + km: khmerÅ¡tina + zh-CN: čínÅ¡tina (zjednoduÅ¡ená) + zh-TW: čínÅ¡tina (tradiční) + zh-HK: čínÅ¡tina (Hongkong) + ja: japonÅ¡tina + ko: korejÅ¡tina layouts: logo: alt_text: Logo OpenStreetMap @@ -1858,6 +1965,7 @@ cs: more: Další header: select_language: Zvolte si jazyk + loading: Načítání... select_language_button: title: Zvolte si jazyk offline_flash: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 56783d8a8..db5ec65d9 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -1836,40 +1836,7 @@ cy: create: successful_report: Anfonwyd eich adroddiad yn llwyddiannus provide_details: Rhowch y manylion gofynnol - layouts: - logo: - alt_text: Logo OpenStreetMap - home: Mynd i Leoliad Cartref - logout: Allgofnodi - log_in: Mewngofnodi - sign_up: Cofrestru - start_mapping: Dechrau Mapio - edit: Golygu - history: Hanes - export: Allforio - issues: Problemau - gps_traces: Olion GPS - user_diaries: Dyddiaduron - edit_with: Golygu gydag %{editor} - intro_header: Croeso i OpenStreetMap! - intro_text: Mae OpenStreetMap yn fap o'r byd, wedi'i greu gan bobl fel chi ac - sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd. - hosting_partners_2024_html: Cefnogir y gynhaliaeth gan %{fastly}, %{corpmembers}, - a %{partners} eraill. - partners_corpmembers: Aelodau corfforaethol OSMF - partners_partners: phartneriaid - tou: Telerau Defnydd - nothing_to_preview: Dim rhagolwg. - help: Cymorth - about: Ynghylch - copyright: Hawlfraint - communities: Cymunedau - learn_more: Dysgu Rhagor - more: Rhagor - header: - select_language: Dewis iaith - select_language_button: - title: Dewis iaith + languages_panes: select_language_list: languages: af: Affricaneg @@ -1981,6 +1948,40 @@ cy: zh-HK: Tsieinëeg (Hong Kong) ja: Japaneg ko: Coreeg + layouts: + logo: + alt_text: Logo OpenStreetMap + home: Mynd i Leoliad Cartref + logout: Allgofnodi + log_in: Mewngofnodi + sign_up: Cofrestru + start_mapping: Dechrau Mapio + edit: Golygu + history: Hanes + export: Allforio + issues: Problemau + gps_traces: Olion GPS + user_diaries: Dyddiaduron + edit_with: Golygu gydag %{editor} + intro_header: Croeso i OpenStreetMap! + intro_text: Mae OpenStreetMap yn fap o'r byd, wedi'i greu gan bobl fel chi ac + sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd. + hosting_partners_2024_html: Cefnogir y gynhaliaeth gan %{fastly}, %{corpmembers}, + a %{partners} eraill. + partners_corpmembers: Aelodau corfforaethol OSMF + partners_partners: phartneriaid + tou: Telerau Defnydd + nothing_to_preview: Dim rhagolwg. + help: Cymorth + about: Ynghylch + copyright: Hawlfraint + communities: Cymunedau + learn_more: Dysgu Rhagor + more: Rhagor + header: + select_language: Dewis iaith + select_language_button: + title: Dewis iaith offline_flash: osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwneud gwaith cynnal a chadw hanfodol. diff --git a/config/locales/da.yml b/config/locales/da.yml index 676b7a977..830c617af 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1800,40 +1800,7 @@ da: create: successful_report: Din rapport blev registreret provide_details: Udfyld venligst de pÃ¥krævede detaljer - layouts: - logo: - alt_text: OpenStreetMap-logo - home: GÃ¥ til hjemmeposition - logout: Log af - log_in: Log pÃ¥ - sign_up: Opret konto - start_mapping: Begynd kortlægningen - edit: Redigér - history: Historik - export: Eksportér - issues: Sager - gps_traces: GPS-spor - user_diaries: Brugerblogs - edit_with: Redigér med %{editor} - intro_header: Velkommen til OpenStreetMap! - intro_text: OpenStreetMap er et kort over verden, skabt af folk som dig og gratis - at bruge under en Ã¥ben licens. - hosting_partners_2024_html: Hosting støttes af %{fastly}, %{corpmembers}, og andre - %{partners}. - partners_corpmembers: OSMF virksomhedsmedlemmer - partners_partners: partnere - tou: VilkÃ¥r for anvendelse - nothing_to_preview: Intet at forhÃ¥ndsvise - help: Hjælp - about: Om - copyright: Ophavsret - communities: Fællesskaber - learn_more: Lær mere - more: Mere - header: - select_language: Vælg sprog - select_language_button: - title: Vælg sprog + languages_panes: select_language_list: languages: af: Afrikaans @@ -1876,6 +1843,40 @@ da: pt: Portugisisk (Brasilien) ja: Japansk ko: Koreansk + layouts: + logo: + alt_text: OpenStreetMap-logo + home: GÃ¥ til hjemmeposition + logout: Log af + log_in: Log pÃ¥ + sign_up: Opret konto + start_mapping: Begynd kortlægningen + edit: Redigér + history: Historik + export: Eksportér + issues: Sager + gps_traces: GPS-spor + user_diaries: Brugerblogs + edit_with: Redigér med %{editor} + intro_header: Velkommen til OpenStreetMap! + intro_text: OpenStreetMap er et kort over verden, skabt af folk som dig og gratis + at bruge under en Ã¥ben licens. + hosting_partners_2024_html: Hosting støttes af %{fastly}, %{corpmembers}, og andre + %{partners}. + partners_corpmembers: OSMF virksomhedsmedlemmer + partners_partners: partnere + tou: VilkÃ¥r for anvendelse + nothing_to_preview: Intet at forhÃ¥ndsvise + help: Hjælp + about: Om + copyright: Ophavsret + communities: Fællesskaber + learn_more: Lær mere + more: Mere + header: + select_language: Vælg sprog + select_language_button: + title: Vælg sprog offline_flash: osm_offline: OpenStreetMap-databasen er i øjeblikket offline, mens nødvendigt vedligeholdelsesarbejde udføres. diff --git a/config/locales/de.yml b/config/locales/de.yml index 13af86dd2..846be1235 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1908,41 +1908,9 @@ de: create: successful_report: Deine Meldung wurde erfolgreich registriert provide_details: Bitte die erforderlichen Einzelheiten angeben - layouts: - logo: - alt_text: OpenStreetMap Logo - home: Gehe zum Heimatstandort - logout: Abmelden - log_in: Anmelden - sign_up: Registrieren - start_mapping: Mit dem Kartieren anfangen - edit: Bearbeiten - history: Chronik - export: Export - issues: Probleme - gps_traces: GPS-Tracks - user_diaries: Benutzer-Blogs - edit_with: Bearbeiten mit %{editor} - intro_header: Willkommen bei OpenStreetMap! - intro_text: OpenStreetMap ist eine Karte der Welt, erstellt von Menschen wie dir - und frei verwendbar unter einer offenen Lizenz. - hosting_partners_2024_html: Das Hosting wird von %{fastly}, %{corpmembers} und - anderen %{partners} unterstützt. - partners_corpmembers: OSMF-Unternehmensmitgliedern - partners_partners: Partnern - tou: Nutzungsbedingungen - nothing_to_preview: Es existiert keine Vorschau. - help: Hilfe - about: Über - copyright: Urheberrecht - communities: Gemeinschaften - learn_more: Mehr erfahren - more: Mehr - header: - select_language: Sprache auswählen - select_language_button: - title: Sprache auswählen + languages_panes: select_language_list: + search_language: Suchen... languages: af: Afrikaans gsw: Alemannisch @@ -2053,6 +2021,41 @@ de: zh-HK: Chinesisch (Hongkong) ja: Japanisch ko: Koreanisch + layouts: + logo: + alt_text: OpenStreetMap Logo + home: Gehe zum Heimatstandort + logout: Abmelden + log_in: Anmelden + sign_up: Registrieren + start_mapping: Mit dem Kartieren anfangen + edit: Bearbeiten + history: Chronik + export: Export + issues: Probleme + gps_traces: GPS-Tracks + user_diaries: Benutzer-Blogs + edit_with: Bearbeiten mit %{editor} + intro_header: Willkommen bei OpenStreetMap! + intro_text: OpenStreetMap ist eine Karte der Welt, erstellt von Menschen wie dir + und frei verwendbar unter einer offenen Lizenz. + hosting_partners_2024_html: Das Hosting wird von %{fastly}, %{corpmembers} und + anderen %{partners} unterstützt. + partners_corpmembers: OSMF-Unternehmensmitgliedern + partners_partners: Partnern + tou: Nutzungsbedingungen + nothing_to_preview: Es existiert keine Vorschau. + help: Hilfe + about: Über + copyright: Urheberrecht + communities: Gemeinschaften + learn_more: Mehr erfahren + more: Mehr + header: + select_language: Sprache auswählen + loading: Laden... + select_language_button: + title: Sprache auswählen offline_flash: osm_offline: Die OpenStreetMap-Datenbank ist derzeit offline, da wichtige Wartungsarbeiten durchgeführt werden. diff --git a/config/locales/el.yml b/config/locales/el.yml index 771a0a5cc..e20f07297 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1836,41 +1836,9 @@ el: create: successful_report: Η αναφορά σας έχει καταγραφεί επιτυχώς provide_details: Παρακαλούμε δώστε τις απαιτούμενες λεπτομέρειες - layouts: - logo: - alt_text: Λογότυπο OpenStreetMap - home: Μετάβαση στη τοποθεσία σπιτιού - logout: Αποσύνδεση - log_in: Σύνδεση - sign_up: Εγγραφή - start_mapping: Ξεκινήστε την χαρτογράφηση - edit: Επεξεργασία - history: Ιστορικό - export: Εξαγωγή - issues: Ζητήματα - gps_traces: Ίχνη GPS - user_diaries: Ημερολόγια χρηστών - edit_with: Επεξεργασία με %{editor} - intro_header: Καλώς ήρθατε στο OpenStreetMap! - intro_text: Το OpenStreetMap είναι ένας χάρτης του κόσμου, που δημιουργήθηκε από - ανθρώπους σαν κι εσάς και είναι δωρεάν για χρήση υπό άδεια ελεύθερης χρήσης. - hosting_partners_2024_html: Η φιλοξενία υποστηρίζεται από το %{fastly}, τα %{corpmembers} - και άλλους %{partners}. - partners_corpmembers: εταιρικά μέλη του OSMF - partners_partners: συνεργάτες - tou: Όροι χρήσης - nothing_to_preview: Τίποτα για προεπισκόπηση. - help: Βοήθεια - about: Σχετικά - copyright: Πνευματικά δικαιώματα - communities: Κοινότητες - learn_more: Μάθετε περισσότερα - more: Περισσότερα - header: - select_language: Επιλογή γλώσσας - select_language_button: - title: Επιλογή γλώσσας + languages_panes: select_language_list: + search_language: Αναζήτησε... languages: af: Αφρικάανς gsw: Αλαμαννικά @@ -1981,6 +1949,41 @@ el: zh-HK: Κινέζικα (Χονγκ Κονγκ) ja: Ιαπωνικά ko: Κορεάτικα + layouts: + logo: + alt_text: Λογότυπο OpenStreetMap + home: Μετάβαση στη τοποθεσία σπιτιού + logout: Αποσύνδεση + log_in: Σύνδεση + sign_up: Εγγραφή + start_mapping: Ξεκινήστε την χαρτογράφηση + edit: Επεξεργασία + history: Ιστορικό + export: Εξαγωγή + issues: Ζητήματα + gps_traces: Ίχνη GPS + user_diaries: Ημερολόγια χρηστών + edit_with: Επεξεργασία με %{editor} + intro_header: Καλώς ήρθατε στο OpenStreetMap! + intro_text: Το OpenStreetMap είναι ένας χάρτης του κόσμου, που δημιουργήθηκε από + ανθρώπους σαν κι εσάς και είναι δωρεάν για χρήση υπό άδεια ελεύθερης χρήσης. + hosting_partners_2024_html: Η φιλοξενία υποστηρίζεται από το %{fastly}, τα %{corpmembers} + και άλλους %{partners}. + partners_corpmembers: εταιρικά μέλη του OSMF + partners_partners: συνεργάτες + tou: Όροι χρήσης + nothing_to_preview: Τίποτα για προεπισκόπηση. + help: Βοήθεια + about: Σχετικά + copyright: Πνευματικά δικαιώματα + communities: Κοινότητες + learn_more: Μάθετε περισσότερα + more: Περισσότερα + header: + select_language: Επιλογή γλώσσας + loading: Φόρτωση... + select_language_button: + title: Επιλογή γλώσσας offline_flash: osm_offline: Η βάση δεδομένων του OpenStreetMap είναι προσωρινά εκτός λειτουργίας λόγω απαραίτητων εργασιών συντήρησης. diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 5ecd77cb1..c9f9b1fca 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1793,41 +1793,9 @@ eo: create: successful_report: Vi sukcese registris problemon provide_details: Bonvolu enmeti necesajn detalojn - layouts: - logo: - alt_text: Emblemo de OpenStreetMap - home: Iri al la hejmloko - logout: Elsaluti - log_in: Ensaluti - sign_up: Registriĝi - start_mapping: Ekigi mapigadon - edit: Redakti - history: Historio - export: Elporti - issues: Problemoj - gps_traces: GPS-spuroj - user_diaries: Taglibroj de uzantoj - edit_with: Redakti per %{editor} - intro_header: Bonvenon al OpenStreetMap! - intro_text: OpenStreetMap estas mapo de la mondo, kreata de homoj kiel vi, kaj - libere uzebla laÅ­ malferma permesilo. - hosting_partners_2024_html: Retgastigo estas provizata de %{fastly}, %{corpmembers} - kaj aliaj %{partners}. - partners_corpmembers: firmaaj anoj de OSMF - partners_partners: kunlaborantoj - tou: Uzkondiĉoj - nothing_to_preview: Nenio por antaÅ­vidi. - help: Helpo - about: Pri - copyright: AÅ­torrajto - communities: Komunumoj - learn_more: Ekscii pli - more: Pli - header: - select_language: Elekti lingvon - select_language_button: - title: Elekti lingvon + languages_panes: select_language_list: + search_language: Serĉi… languages: af: afrikansa gsw: alemana @@ -1938,6 +1906,41 @@ eo: zh-HK: ĉina (Honkongo) ja: japana ko: korea + layouts: + logo: + alt_text: Emblemo de OpenStreetMap + home: Iri al la hejmloko + logout: Elsaluti + log_in: Ensaluti + sign_up: Registriĝi + start_mapping: Ekigi mapigadon + edit: Redakti + history: Historio + export: Elporti + issues: Problemoj + gps_traces: GPS-spuroj + user_diaries: Taglibroj de uzantoj + edit_with: Redakti per %{editor} + intro_header: Bonvenon al OpenStreetMap! + intro_text: OpenStreetMap estas mapo de la mondo, kreata de homoj kiel vi, kaj + libere uzebla laÅ­ malferma permesilo. + hosting_partners_2024_html: Retgastigo estas provizata de %{fastly}, %{corpmembers} + kaj aliaj %{partners}. + partners_corpmembers: firmaaj anoj de OSMF + partners_partners: kunlaborantoj + tou: Uzkondiĉoj + nothing_to_preview: Nenio por antaÅ­vidi. + help: Helpo + about: Pri + copyright: AÅ­torrajto + communities: Komunumoj + learn_more: Ekscii pli + more: Pli + header: + select_language: Elekti lingvon + loading: Enlegado… + select_language_button: + title: Elekti lingvon offline_flash: osm_offline: La OpenStreetMap-datumbazo estas nuntempe eksterreta pro necesaj laboroj de prizorgado. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index a8b0d3225..057bfee11 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1549,6 +1549,11 @@ eu: create: successful_report: Zure reportea arrakastaz erregistratu da provide_details: Mesedez, eman beharrezko xehetasunak + languages_panes: + select_language_list: + languages: + de: Alemana + ja: Japoniera layouts: logo: alt_text: OpenStreetMap logoa @@ -1575,10 +1580,6 @@ eu: communities: Komunitateak learn_more: Ikasi gehiago more: Gehiago - select_language_list: - languages: - de: Alemana - ja: Japoniera user_mailer: diary_comment_notification: subject: '[OpenStreetMap] %{user} eguneroko sarrera batean iruzkina utzi du' diff --git a/config/locales/fr.yml b/config/locales/fr.yml index bc93070db..23e8a6d98 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -67,6 +67,7 @@ # Author: Macofe # Author: Mahabarata # Author: Manaviko +# Author: Marphy 123 # Author: Marwin H.H. # Author: Mathieu # Author: McDutchie @@ -1927,44 +1928,9 @@ fr: create: successful_report: Votre rapport a bien été enregistré provide_details: Veuillez fournir les détails requis - layouts: - project_name: - title: OpenStreetMap - h1: OpenStreetMap - logo: - alt_text: Logo d’OpenStreetMap - home: Aller à l’emplacement de votre domicile - logout: Se déconnecter - log_in: Se connecter - sign_up: S’inscrire - start_mapping: Commencer à cartographier - edit: Modifier - history: Historique - export: Exporter - issues: Problèmes - gps_traces: Traces GPS - user_diaries: Journaux des utilisateurs - edit_with: Modifier avec %{editor} - intro_header: Bienvenue dans OpenStreetMap ! - intro_text: OpenStreetMap est une carte du monde, créée par des gens comme vous - et libre d’utilisation sous licence libre. - hosting_partners_2024_html: L’hébergement est pris en charge par %{fastly}, %{corpmembers}, - et d’autres %{partners}. - partners_corpmembers: des membres de l’entreprise OSMF - partners_partners: partenaires - tou: Conditions d’utilisation - nothing_to_preview: La prévisualisation est vide. - help: Aide - about: À propos - copyright: Droits d’auteur - communities: Communautés - learn_more: En savoir plus - more: Plus - header: - select_language: Sélectionnez la langue - select_language_button: - title: Sélectionner la langue + languages_panes: select_language_list: + search_language: Recherche... languages: af: Afrikaans gsw: Alémanique @@ -2075,6 +2041,44 @@ fr: zh-HK: Chinois Hongkongais ja: Japonais ko: Coréen + layouts: + project_name: + title: OpenStreetMap + h1: OpenStreetMap + logo: + alt_text: Logo d’OpenStreetMap + home: Aller à l’emplacement de votre domicile + logout: Se déconnecter + log_in: Se connecter + sign_up: S’inscrire + start_mapping: Commencer à cartographier + edit: Modifier + history: Historique + export: Exporter + issues: Problèmes + gps_traces: Traces GPS + user_diaries: Journaux des utilisateurs + edit_with: Modifier avec %{editor} + intro_header: Bienvenue dans OpenStreetMap ! + intro_text: OpenStreetMap est une carte du monde, créée par des gens comme vous + et libre d’utilisation sous licence libre. + hosting_partners_2024_html: L’hébergement est pris en charge par %{fastly}, %{corpmembers}, + et d’autres %{partners}. + partners_corpmembers: des membres de l’entreprise OSMF + partners_partners: partenaires + tou: Conditions d’utilisation + nothing_to_preview: La prévisualisation est vide. + help: Aide + about: À propos + copyright: Droits d’auteur + communities: Communautés + learn_more: En savoir plus + more: Plus + header: + select_language: Sélectionnez la langue + loading: Chargement... + select_language_button: + title: Sélectionner la langue offline_flash: osm_offline: La base de données OpenStreetMap est actuellement hors ligne du fait de travaux de maintenance essentiels en cours. diff --git a/config/locales/frp.yml b/config/locales/frp.yml index 80df7485f..a9d9ec36d 100644 --- a/config/locales/frp.yml +++ b/config/locales/frp.yml @@ -1789,40 +1789,7 @@ frp: create: successful_report: Voutron rapôrt at ben étâ encartâ provide_details: Mèrci de fornir los dètalys ègzigiês - layouts: - logo: - alt_text: Simbolo d'OpenStreetMap - home: Alar u luè de voutron domicilo - logout: Sè dèbranchiér - log_in: Sè branchiér - sign_up: S'encartar - start_mapping: Comenciér a mapar - edit: Changiér - history: Historico - export: Èxportar - issues: Problèmos - gps_traces: Traces GPS - user_diaries: Jornâls de l'usanciér(e) - edit_with: Changiér avouéc %{editor} - intro_header: Benvenua dens OpenStreetMap ! - intro_text: OpenStreetMap est una mapa du mondo, fâte per des gens come vos, et - libra d'usâjo sot licence libra. - hosting_partners_2024_html: L'hèbèrgement est prês en charge per %{fastly}, %{corpmembers}, - et d'ôtros %{partners}. - partners_corpmembers: de membros de l'entreprêsa OSMF - partners_partners: partenèros - tou: Condicions d’usâjo - nothing_to_preview: É y at ren a prè-vêre. - help: Éde - about: A propôs - copyright: Drêts d'ôtor - communities: Comunôtâts - learn_more: Nen savêr més - more: Més - header: - select_language: Chouèsir la lengoua - select_language_button: - title: Chouèsir la lengoua + languages_panes: select_language_list: languages: af: Afrikâns @@ -1933,6 +1900,40 @@ frp: zh-HK: Chinouès de Hong Kong ja: Japonês ko: Corèen + layouts: + logo: + alt_text: Simbolo d'OpenStreetMap + home: Alar u luè de voutron domicilo + logout: Sè dèbranchiér + log_in: Sè branchiér + sign_up: S'encartar + start_mapping: Comenciér a mapar + edit: Changiér + history: Historico + export: Èxportar + issues: Problèmos + gps_traces: Traces GPS + user_diaries: Jornâls de l'usanciér(e) + edit_with: Changiér avouéc %{editor} + intro_header: Benvenua dens OpenStreetMap ! + intro_text: OpenStreetMap est una mapa du mondo, fâte per des gens come vos, et + libra d'usâjo sot licence libra. + hosting_partners_2024_html: L'hèbèrgement est prês en charge per %{fastly}, %{corpmembers}, + et d'ôtros %{partners}. + partners_corpmembers: de membros de l'entreprêsa OSMF + partners_partners: partenèros + tou: Condicions d’usâjo + nothing_to_preview: É y at ren a prè-vêre. + help: Éde + about: A propôs + copyright: Drêts d'ôtor + communities: Comunôtâts + learn_more: Nen savêr més + more: Més + header: + select_language: Chouèsir la lengoua + select_language_button: + title: Chouèsir la lengoua offline_flash: osm_offline: 'La bâsa de balyês OpenStreetMap est fôr de legne ora : de travâlys de maneyance èssencièls sont en cors.' diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 808d1009e..6e5c04fc2 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1798,41 +1798,9 @@ gl: create: successful_report: A túa denuncia rexistrouse con éxito provide_details: Por favor, achega os detalles que se che solicitan. - layouts: - logo: - alt_text: Logotipo do OpenStreetMap - home: Ir á localización da túa casa - logout: Pechar a sesión - log_in: Iniciar a sesión - sign_up: Rexistrarse - start_mapping: Comezar a cartografar - edit: Editar - history: Historial - export: Exportar - issues: Problemas - gps_traces: Pistas GPS - user_diaries: Diarios de usuario - edit_with: Editar co %{editor} - intro_header: Dámosche a benvida ó OpenStreetMap! - intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma ti e de - libre uso baixo unha licenza aberta. - hosting_partners_2024_html: O aloxamento está fornecido por %{fastly}, %{corpmembers} - e outros %{partners}. - partners_corpmembers: membros corporativos da OSMF - partners_partners: socios - tou: termos de uso - nothing_to_preview: Non hai nada que previsualizar. - help: Axuda - about: Acerca de - copyright: Dereitos de autoría - communities: Comunidades - learn_more: Máis información - more: Máis - header: - select_language: Seleccionar unha lingua - select_language_button: - title: Seleccionar a lingua + languages_panes: select_language_list: + search_language: Buscar... languages: af: afrikaans gsw: alemánico @@ -1943,6 +1911,41 @@ gl: zh-HK: chinés (Hong Kong) ja: xaponés ko: coreano + layouts: + logo: + alt_text: Logotipo do OpenStreetMap + home: Ir á localización da túa casa + logout: Pechar a sesión + log_in: Iniciar a sesión + sign_up: Rexistrarse + start_mapping: Comezar a cartografar + edit: Editar + history: Historial + export: Exportar + issues: Problemas + gps_traces: Pistas GPS + user_diaries: Diarios de usuario + edit_with: Editar co %{editor} + intro_header: Dámosche a benvida ó OpenStreetMap! + intro_text: O OpenStreetMap é un mapa do mundo, creado por xente coma ti e de + libre uso baixo unha licenza aberta. + hosting_partners_2024_html: O aloxamento está fornecido por %{fastly}, %{corpmembers} + e outros %{partners}. + partners_corpmembers: membros corporativos da OSMF + partners_partners: socios + tou: termos de uso + nothing_to_preview: Non hai nada que previsualizar. + help: Axuda + about: Acerca de + copyright: Dereitos de autoría + communities: Comunidades + learn_more: Máis información + more: Máis + header: + select_language: Seleccionar unha lingua + loading: Cargando... + select_language_button: + title: Seleccionar a lingua offline_flash: osm_offline: A base de datos do OpenStreetMap atópase desconectada mentres realizamos traballos de mantemento nela. diff --git a/config/locales/he.yml b/config/locales/he.yml index 175bc89c7..56ba2be90 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1766,37 +1766,7 @@ he: create: successful_report: הדוח שלך נרשם בהצלחה provide_details: נא לספק את הפרטים הנדרשים - layouts: - logo: - alt_text: הלוגו של OpenStreetMap - home: מעבר למיקום הבית - logout: יציאה מהחשבון - log_in: כניסה לחשבון - sign_up: הרשמה - start_mapping: להתחיל למפות - edit: עריכה - history: היסטוריה - export: יצוא - issues: תקלות - gps_traces: מסלולי GPS - user_diaries: יומני משתמשים - edit_with: לעריכה עם %{editor} - intro_header: ברוכים הבאים ל־OpenStreetMap! - intro_text: OpenStreetMap היא מפה של העולם, שנוצרת על־ידי אנשים כמוך, וחופשית - לשימוש תחת רישיון פתוח. - hosting_partners_2024_html: האירוח נתמך על־ידי %{fastly}, %{corpmembers} ועוד - %{partners} - partners_fastly: פאסטלי - partners_corpmembers: חברים תאגידיים אחרים ב־OSMF - partners_partners: שותפים - tou: תנאי השימוש - nothing_to_preview: אין מה להראות בתצוגה מקדימה. - help: עזרה - about: אודות - copyright: זכויות יוצרים - communities: קהילות - learn_more: מידע נוסף - more: עוד + languages_panes: select_language_list: languages: af: אפריקאנס @@ -1908,6 +1878,37 @@ he: zh-HK: סינית (הונג קונג) ja: יפנית ko: קוריאנית + layouts: + logo: + alt_text: הלוגו של OpenStreetMap + home: מעבר למיקום הבית + logout: יציאה מהחשבון + log_in: כניסה לחשבון + sign_up: הרשמה + start_mapping: להתחיל למפות + edit: עריכה + history: היסטוריה + export: יצוא + issues: תקלות + gps_traces: מסלולי GPS + user_diaries: יומני משתמשים + edit_with: לעריכה עם %{editor} + intro_header: ברוכים הבאים ל־OpenStreetMap! + intro_text: OpenStreetMap היא מפה של העולם, שנוצרת על־ידי אנשים כמוך, וחופשית + לשימוש תחת רישיון פתוח. + hosting_partners_2024_html: האירוח נתמך על־ידי %{fastly}, %{corpmembers} ועוד + %{partners} + partners_fastly: פאסטלי + partners_corpmembers: חברים תאגידיים אחרים ב־OSMF + partners_partners: שותפים + tou: תנאי השימוש + nothing_to_preview: אין מה להראות בתצוגה מקדימה. + help: עזרה + about: אודות + copyright: זכויות יוצרים + communities: קהילות + learn_more: מידע נוסף + more: עוד offline_flash: osm_offline: מסד הנתונים של אתר OpenStreetMap אינו מקוון כעת בשל ביצוע עבודות תחזוקה. diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 4bdee4809..f059667d9 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -73,36 +73,36 @@ hr: changeset: Skup promjena changeset_tag: Oznaka skupa promjena country: Zemlja - diary_comment: Komentar u dnevnika + diary_comment: Dnevnički komentar diary_entry: Dnevnički zapis friend: Prijatelj issue: Predmet language: Jezik message: Poruka - node: Točka - node_tag: Oznaka točke + node: Čvor + node_tag: Oznaka čvora note: BiljeÅ¡ka - old_node: Stara točka - old_node_tag: Oznaka stare točke + old_node: Stari čvor + old_node_tag: Oznaka starog čvora old_relation: Stara relacija old_relation_member: Stari član relacije old_relation_tag: Oznaka stare relacije old_way: Stari put - old_way_node: Točka starog puta + old_way_node: Čvor starog puta old_way_tag: Oznaka starog puta relation: Relacija relation_member: Član relacije relation_tag: Oznaka relacije - report: Prijavi + report: Prijavite session: Sesija trace: Trag tracepoint: Točka traga tracetag: Oznaka traga user: Korisnik user_preference: Korisničke postavke - user_token: korisnički token + user_token: Korisnički token way: Put - way_node: Točka puta + way_node: Čvor puta way_tag: Oznaka puta attributes: client_application: @@ -111,25 +111,25 @@ hr: callback_url: Callback URL support_url: PodrÅ¡ka URL allow_read_prefs: čitajte njihove korisničke postavke - allow_write_prefs: izmijenite njihove korisničke postavke + allow_write_prefs: promijenite njihove korisničke postavke allow_write_diary: kreiraj dnevničke zapise i komentare - allow_write_api: uredi kartu - allow_write_changeset_comments: komentiraj skupove promjena + allow_write_api: uredite kartu + allow_write_changeset_comments: komentirajte skupove promjena allow_read_gpx: čitatajte njihove privatne GNSS tragove allow_write_gpx: poÅ¡aljite GNSS tragove - allow_write_notes: izmijeni biljeÅ¡ke + allow_write_notes: izmijenite biljeÅ¡ke diary_comment: - body: Tijelo + body: Sadržaj diary_entry: user: Korisnik title: Naslov body: Sadržaj - latitude: Geografska Å¡irina (Latitude) - longitude: Geografska dužina (Longitude) + latitude: Zemljopisna Å¡irina (Latitude) + longitude: Zemoljopisna dužina (Longitude) language_code: Jezik doorkeeper/application: name: Naziv - redirect_uri: Preusmjeravanje URI-jeva + redirect_uri: Preusmjerite URI-jeva confidential: Povjerljiva aplikacija? scopes: DopuÅ¡tenje friend: @@ -140,45 +140,45 @@ hr: visible: Vidljivo name: Ime datoteke size: Veličina - latitude: Geografska Å¡irina (Latitude) - longitude: Geografska dužina (Longitude) + latitude: Zemljopisna Å¡irina (Latitude) + longitude: Zemljopisna dužina (Longitude) public: Javno description: Opis - gpx_file: Izberi datoteku za GNSS praćenje + gpx_file: Izberite datoteku za GNSS praćenje visibility: Vidljivost tagstring: Oznake message: sender: PoÅ¡iljatelj title: Naslov - body: Tijelo + body: Sadržaj recipient: Primatelj redaction: title: Naslov description: Opis report: - category: Izaberi razlog za tvoju prijavu + category: Izaberite razlog vaÅ¡e prijave details: Molimo vas navedite joÅ¡ neke detalje o problemu (obavezno). user: auth_provider: Pružatelj autentifikacije auth_uid: UID za provjeru autentičnosti email: Email - new_email: 'Nova adresa e-poÅ¡te:' + new_email: Nova e-mail adresa active: Aktivan - display_name: Prikaži ime - description: 'Opis profila:' + display_name: Prikažite ime + description: Opis profila company: Tvrtka - home_lat: 'Geografska Å¡irina (latitude):' - home_lon: 'Geografska dužina (longitude):' + home_lat: 'Zemljopisna Å¡irina (latitude):' + home_lon: 'Zemljopisna dužina (longitude):' home_location_name: Naziv početne lokacije - languages: 'Željeni jezici:' - preferred_editor: 'Preferencijalni uređivač:' + languages: Preferirani jezici + preferred_editor: Preferirani urednik pass_crypt: Zaporka pass_crypt_confirmation: Potvrdite zaporku help: doorkeeper/application: - confidential: Aplikacija će se koristiti kada je povjerljivost klijenta pouzdana + confidential: Aplikacija se koristi kada je povjerljivost klijenta pouzdana (nativne mobilne aplikacije i jednostranične aplikacije nisu povjerljive) - redirect_uri: Koristi jedan red po URI-ju + redirect_uri: Koristite jedan red po URI-ju trace: tagstring: odvojeno zarezom user_block: @@ -246,7 +246,7 @@ hr: name: iD description: iD (uređivač u pregledniku) remote: - name: Remote Control + name: Daljinska kontrola description: Remote Control (JOSM, Potlatch ili Merkaartor) auth: providers: @@ -272,7 +272,7 @@ hr: description_all: Popis prijavljenih, komentiranih ili zatvorenih biljeÅ¡ki description_area: Lista biljeÅ¡ki, prijavljenih, komentiranih ili zatvorenih u tvojem području [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] - description_item: RSS-tok biljeÅ¡ke %{id} + description_item: RSS izvor ta biljeÅ¡ku %{id} opened: nova biljeÅ¡ka (blizu %{place}) commented: novi komentar (blizu %{place}) closed: zatvorena biljeÅ¡ka (blizu %{place}) @@ -282,28 +282,27 @@ hr: full: Cijela biljeÅ¡ka accounts: show: - title: Uredi korisnički račun + title: Uredite korisnički račun my_account: Moj korisnički račun - current email address: Trenutna adresa e-poÅ¡te + current email address: Trenutna e-mail adresa external auth: Vanjska provjera autentičnosti contributor_terms: heading: Uvjeti za suradnika - agreed: Prihvatili ste Uvjete suradnje dana %{date}. + agreed: Prihvatili ste Uvjete suradnje %{date}. not_agreed: JoÅ¡ niste prihvatili Uvjete suradnje. - agreed_with_pd: Također ste sve svoje izmjene proglasili javnim vlasniÅ¡tvom. - not_agreed_with_pd: Niste izjavili da vaÅ¡a uređivanja smatrate područjem javnog - vlasniÅ¡tva. + agreed_with_pd: Također ste izjavili da svoja uređivanja smatrate javnim vlasniÅ¡tvom. + not_agreed_with_pd: Niste izjavili da svoja uređivanja smatrate javnim vlasniÅ¡tvom. review: Pregledajte Uvjete review_and_accept: Pregledajte i prihvatite Uvjete - consider_pd: Razmotrite javnu domenu + consider_pd: Razmotrite javno vlasniÅ¡tvo terms_of_use: - heading: Uvjeti koriÅ¡tenja - agreed: Pristali ste na Uvjete koriÅ¡tenja dana %{date}. - not_agreed: JoÅ¡ niste prihvatili Uvjete koriÅ¡tenja. + heading: Uvjeti uporabe + agreed: Pristali ste na Uvjete uporabe %{date}. + not_agreed: JoÅ¡ niste prihvatili Uvjete uporabe. review: Pregledajte Uvjete review_and_accept: Pregledajte i prihvatite Uvjete - save changes button: Snimi promjene - delete_account: ObriÅ¡i Korisnički račun + save changes button: Spremite promjene + delete_account: ObriÅ¡ite Korisnički račun go_public: heading: Javno uređivanje currently_not_public: Trenutno su vaÅ¡a uređivanja anonimna i ljudi vam ne mogu @@ -312,14 +311,14 @@ hr: ispod. only_public_can_edit: Od prelaska na verziju 0.6 API-ja, samo javni korisnici mogu uređivati podatke karte. - find_out_why: saznaj zaÅ¡to - email_not_revealed: VaÅ¡a adresa e-poÅ¡te neće biti javno prikazana. + find_out_why: saznajte zaÅ¡to + email_not_revealed: VaÅ¡a e-mail adresa neće biti javno prikazana. not_reversible: Ovu radnju nije moguće poniÅ¡titi i svi novi korisnici su sada javni prema zadanim postavkama. - make_edits_public_button: Napravi sve moje promjene javnim + make_edits_public_button: Napravite sva moja uređivanja javnim update: - success_confirm_needed: Korisničke informacije su uspjeÅ¡no ažurirane. Provjeri - e-mail za poruku potvrde nove e-mail adrese. + success_confirm_needed: Korisničke informacije su uspjeÅ¡no ažurirane. Provjerite + vaÅ¡ e-mail za poruku potvrde nove e-mail adrese. success: Korisničke informacije su uspjeÅ¡no ažurirane. destroy: success: Korisnički račun obrisan. @@ -327,7 +326,7 @@ hr: show: title: ObriÅ¡i moj račun warning: Upozorenje! Postupak brisanja računa je konačan i ne može se poniÅ¡titi. - delete_account: ObriÅ¡i Korisnički račun + delete_account: ObriÅ¡ite Korisnički račun delete_introduction: 'VaÅ¡ OpenStreetMap račun možete izbrisati pomoću donje tipke. Imajte na umu sljedeće detalje:' delete_profile: Podaci vaÅ¡eg profila, uključujući vaÅ¡ avatar, opis i početnu @@ -344,27 +343,27 @@ hr: ali skriveni od pogleda. retain_changeset_discussions: VaÅ¡e rasprave o skupovima promjenama, ako ih ima, bit će sačuvane. - retain_email: VaÅ¡a adresa e-poÅ¡te bit će sačuvana. + retain_email: VaÅ¡a e-mail adresa će biti sačuvana. recent_editing_html: Budući da ste nedavno uređivali, vaÅ¡ se račun trenutno ne može izbrisati. Brisanje će biti moguće za %{time}. confirm_delete: Jeste li sigurni? - cancel: Otkaži + cancel: Otkažite terms: show: title: Uvjeti heading: Uvjeti heading_ct: Uvjeti suradnika - read and accept with tou: Molimo pročitajte ugovor za suradnike i uvjete koriÅ¡tenja, + read and accept with tou: Molimo pročitajte ugovor za suradnike i uvjete uporabe, kada zavrÅ¡ite označite oba kvadratića a zatim pritisnite tipku za nastavak. contributor_terms_explain: Ovaj ugovor uređuje uvjete za vaÅ¡e postojeće i buduće doprinose. read_ct: Pročitao/la sam i slažem se s gore navedenim uvjetima za suradnike tou_explain: - html: Ovi %{tou_link} uvjeti uređuju koriÅ¡tenje web stranice i ostale infrastrukture + html: Ovi %{tou_link} uvjeti uređuju uporabu web stranice i ostale infrastrukture koju pruža OSMF. Molimo kliknite na poveznicu, pročitajte i prihvatite tekst. - tou: Uvjeti upotrebe - read_tou: Pročitao/la sam i slažem se s Uvjetima koriÅ¡tenja + tou: Uvjeti uporabe + read_tou: Pročitao/la sam i slažem se s Uvjetima uporabe guidance_info_html: 'Informacije koje će vam pomoći razumijeti ove pojmove: %{readable_summary_link} i neÅ¡to %{informal_translations_link}' readable_summary: sažetak čitljiv ljudima @@ -386,15 +385,15 @@ hr: terms_declined_link: ova wiki stranica pd_declarations: show: - title: Smatrajte moje doprinose javnom domenom. - consider_pd: Smatram da su moji doprinosi javna domena. - consider_pd_why: ZaÅ¡to bih želio da moji doprinosi budu javno dostupni? - confirm: Potvrdi + title: Smatrajte moje doprinose javnim vlasniÅ¡tvom + consider_pd: Smatram da su moji doprinosi javnim vlasniÅ¡tvom + consider_pd_why: ZaÅ¡to bih želio da moji doprinosi budu javno vlasniÅ¡tvo? + confirm: Potvrdite create: successfully_declared: UspjeÅ¡no ste izjavili da vaÅ¡a uređivanja smatrate područjem - javne domene. - already_declared: Već ste izjavili da vaÅ¡a uređivanja smatrate javnom domenom. - did_not_confirm: Niste potvrdili da vaÅ¡a uređivanja smatrate javnom domenom. + javnog vlasniÅ¡tva. + already_declared: Već ste izjavili da vaÅ¡a uređivanja smatrate javnim vlasniÅ¡tvom. + did_not_confirm: Niste potvrdili da vaÅ¡a uređivanja smatrate javnim vlasniÅ¡tvom. browse: deleted_ago_by_html: Izbrisao %{time_ago} korisnik %{user} edited_ago_by_html: Uredio %{time_ago} korisnik %{user} @@ -412,21 +411,22 @@ hr: one: '%{count} put' few: '%{count} puta' other: '%{count} puta' - download_xml: Preuzmi XML - view_unredacted_history: Prikaži neredigiranu povijest + download_xml: Preuzmite XML + view_unredacted_history: Prikažite neredigiranu povijest location: 'Lokacija:' node: - title_html: 'Točka: %{name}' + title_html: 'Čvor: %{name}' way: title_html: 'Put: %{name}' - nodes: Točke + nodes: Čvorovi nodes_count: - one: '%{count} točka' - few: '%{count} točke' - other: '%{count} točaka' + one: '%{count} čvor' + few: '%{count} čvora' + other: '%{count} čvorova' also_part_of_html: - one: dio puta %{related_ways} - other: dio putova %{related_ways} + one: 'dio puta %{related_ways} ' + few: dijela puta %{related_ways} + other: dijelova puta %{related_ways} relation: title_html: 'Relacija: %{name}' members: Članovi @@ -437,7 +437,7 @@ hr: relation_member: entry_role_html: '%{type} %{name} kao %{role}' type: - node: Točka + node: Čvor way: Put relation: Relacija containing_relation: @@ -446,9 +446,9 @@ hr: title: Nije nađeno timeout: title: GreÅ¡ka vremenskog ograničenja - sorry: Žao mi je, predugo traje učitavanje podataka za %{type} sa id %{id} + sorry: Žao nam je, predugo traje učitavanje podataka za %{type} sa id %{id} type: - node: točka + node: čvor way: put relation: relacija changeset: skup promjena @@ -458,7 +458,7 @@ hr: message_html: Verzija %{version} ove %{type} ne može se prikazati jer je uređena. Molim pogledaj %{redaction_link} za dodatne informacije. type: - node: točka + node: čvor way: put relation: relacija start_rjs: @@ -466,25 +466,25 @@ hr: nereagiranje vaÅ¡eg internet preglednika. Jeste li sigurani da želite prikazati ove podatke? feature_error: 'Nije moguće učitati značajke: %{message}' - load_data: Učitaj podatke + load_data: Učitajte podatke loading: Učitavanje... tag_details: tags: Oznake wiki_link: key: Opis wiki stranica za oznaku %{key} (tag) tag: Opis wiki stranica za oznaku %{key}=%{value} (tag) - wikidata_link: '%{page} Predmet na Wikidata' + wikidata_link: '%{page} predmet na Wikidata' wikidata_preview: one: pregled Wikidata stavke few: pregled Wikidata stakve other: Pregled Wikidata stavki - wikipedia_link: Članak o %{page} na Wikipediji - wikimedia_commons_link: '%{page} element na Wikimedia Commons' - telephone_link: Nazovi %{phone_number} + wikipedia_link: Članak %{page} na Wikipediji + wikimedia_commons_link: '%{page} stavka na Wikimedia Commons' + telephone_link: Nazovite %{phone_number} colour_preview: Pregled boje %{colour_value} email_link: E-mail %{email} versions_navigation: - node: Točka + node: Čvor way: Put relation: Relacija history: Povijest @@ -499,7 +499,7 @@ hr: old_elements: index: node: - title_html: 'Povijest točke: %{name}' + title_html: 'Povijest čvora: %{name}' way: title_html: 'Povijest puta: %{name}' relation: @@ -508,12 +508,12 @@ hr: newer_versions: Novije verzije actions: view_redacted_data: Prikaz redigiranih podataka - view_redaction_message: Prikaži poruku o redakciji + view_redaction_message: Prikažite poruku o redakciji nodes: not_found_message: - sorry: 'Nažalost, točka #%{id} se ne može naći.' + sorry: 'Nažalost, čvor #%{id} se ne može naći.' timeout: - sorry: Nažalost, dohvaćanje podataka za čvora ID %{id} traje predugo. + sorry: Nažalost, dohvaćanje podataka za čvor ID %{id} traje predugo. old_nodes: not_found_message: sorry: 'Nažalost, čvor #%{id} verzija %{version} nije pronađena.' @@ -552,8 +552,8 @@ hr: changeset_comments: feeds: comment: - comment: 'Novi komentar na skupu promjena #%{changeset_id} od %{author}' - commented_at_by_html: Osvježio korisnik %{user} %{when} + comment: 'Novi komentar na skupu promjena #%{changeset_id} %{author}' + commented_at_by_html: Ažurirao korisnik %{user} %{when} show: title_all: Rasprava o OpenStreetMap skupu promjena title_particular: 'Rasprava o OpenStreetMap skupu promjena #%{changeset_id}' @@ -567,19 +567,19 @@ hr: other: '%{count} komentara' changes: one: '%{count} promjena' - few: '%{count} promjena' + few: '%{count} promjene' other: '%{count} promjena' n_elements_created: - one: '%{count} element stvoren' - few: '%{count} elemenata stvoreno' - other: '%{count} elemenata stvoreno' + one: '%{count} element kreiran' + few: '%{count} elemenata kreirana' + other: '%{count} elemenata kreirano' n_elements_modified: one: '%{count} element promijenjen' - few: '%{count} elementa promijenjeno' + few: '%{count} elementa promijenjena' other: '%{count} elemenata promijenjeno' n_elements_deleted: one: '%{count} element obrisan' - few: '%{count} elemenata obrisano' + few: '%{count} elemenata obrisana' other: '%{count} elemenata obrisano' index: title: Skupovi promjena @@ -610,23 +610,23 @@ hr: created_ago_by_html: Uredio %{time_ago} korisnik %{user} closed_ago_by_html: Zatvorio %{time_ago} korisnik %{user} discussion: Razgovor - join_discussion: Prijavi se za uključivanje u raspravu + join_discussion: Prijavite se za uključivanje u raspravu still_open: Skup promjena je joÅ¡ uvijek otvoren - rasprava će se otvoriti nakon Å¡to se skup promjena zatvori. subscribe: Pretplatite se - unsubscribe: Otkaži pretplatu + unsubscribe: Otkažite pretplatu comment_by_html: Komentar %{user} %{time_ago} hidden_comment_by_html: Skriveni komentar %{user} %{time_ago} - hide_comment: sakrij - unhide_comment: vrati sakriveno - comment: Komentiraj + hide_comment: sakrijte + unhide_comment: vratite sakriveno + comment: Komentirajte changesetxml: XLM skup promjena osmchangexml: osmChange XML paging_nav: nodes_title: Čvorovi - nodes_paginated: Točke (%{x}-%{y} od %{count}) + nodes_paginated: Čvorovi (%{x}-%{y} od %{count}) ways_title: Putevi - ways_paginated: Putovi(%{x}-%{y} od %{count}) + ways_paginated: Putevi(%{x}-%{y} od %{count}) relations_title: Relacije relations_paginated: Relacije(%{x}-%{y} od %{count}) range: '%{x}-%{y} od %{count}' @@ -652,7 +652,7 @@ hr: dashboards: contact: km away: udaljen %{count}km - m away: '%{count}m daleko' + m away: udaljen %{count}m latest_edit_html: 'Najnovija izmjena (%{ago}):' no_edits: (nema promjena) view_changeset_details: Prikažite detalje skupa promjena @@ -678,12 +678,12 @@ hr: title: Novi dnevnički zapis form: location: Lokacija - use_map_link: Koristi kartu + use_map_link: Koristite kartu index: title: Dnevnici korisnika title_followed: Dnevnici praćenih korisnika - title_nearby: Dnevnici obližnjih članova - user_title: '%{user}ov dnevnik' + title_nearby: Dnevnici obližnjih korisnika + user_title: '%{user} dnevnik' in_language_title: 'Zapisi u dnevniku na jeziku: %{language}' no_entries: Nema zapisa u dnevniku page: @@ -697,42 +697,42 @@ hr: discussion: Rasprava subscribe: Pretplatite se unsubscribe: Otkažite pretplatu - leave_a_comment: NapiÅ¡i komentar + leave_a_comment: NapiÅ¡ite komentar login_to_leave_a_comment_html: '%{login_link} da bi ostavili komentar' - login: Prijava + login: Prijavite se no_such_entry: title: Nema takvog dnevničkog zapisa heading: 'Nema zapisa sa id: %{id}' body: Žao mi je, ne postoji dnevnički zapis ili komentar sa id %{id}. Molimo vas, provjerite ispravnost upisa, ili je poveznica na koji ste kliknuli neispravna. diary_entry: - posted_by_html: Poslao %{link_user} u %{created} na jeziku %{language_link} + posted_by_html: Poslao %{link_user} %{created} na %{language_link} jeziku. updated_at_html: Zadnji put ažurirano %{updated}. full_entry: Pogledajte cijeli unos - comment_link: Komentiraj ovaj zapis - reply_link: PoÅ¡alji poruku autoru + comment_link: Komentirajte ovaj zapis + reply_link: PoÅ¡aljite poruku autoru comment_count: one: '%{count} komentar' few: '%{count} komentara' other: '%{count} komentara' no_comments: Bez komentara - edit_link: Uredi ovaj zapis - hide_link: Sakrij ovaj unos + edit_link: Uredite ovaj zapis + hide_link: Sakrijte ovaj unos unhide_link: Otkrijte ovaj unos - confirm: Potvrdi + confirm: Potvrdite report: Prijavite ovaj unos diary_comment: comment_from_html: Komentar od %{link_user} u %{comment_created_at} - hide_link: Sakrij ovaj komentar + hide_link: Sakrijte ovaj komentar unhide_link: Otkrijte ovaj komentar - confirm: Potvrdi + confirm: Potvrdite report: Prijavite ovaj komentar location: location: 'Lokacija:' feed: user: - title: Zapisi OpenStreetMap dnevnika od korisnika %{user} - description: Nedavni zapisi OpenStreetMap dnevnika od %{user} + title: Zapisi OpenStreetMap dnevnika za %{user} + description: Nedavni zapisi OpenStreetMap dnevnika %{user} language: title: 'Zapisi u OpenStreetMap dnevniku na jeziku: %{language_name}' description: 'Nedavni zapisi u dnevniku OpenStreetMap korisnika na jeziku: @@ -750,7 +750,7 @@ hr: in_language: Dnevnički zapisi na %{language} my_diary: Moj dnevnik new: Novi dnevnički zapis - new_title: Sročite novi zapis u vaÅ¡ dnevnik + new_title: Sastavite novi zapis u vaÅ¡em korisničkom dnevniku profile_diaries: latest_diaries: Najnovije rasprave comments: @@ -876,7 +876,7 @@ hr: bbq: RoÅ¡tilj bench: Klupa bicycle_parking: Biciklistički parking - bicycle_rental: Rent a bicikl + bicycle_rental: Najam bicikala bicycle_repair_station: Stanica za popravak bicikala biergarten: Vrtna pivnica blood_bank: Banka krvi @@ -886,7 +886,7 @@ hr: bus_station: Autobusni kolodvor cafe: Caffe bar car_rental: Rent-a-car - car_sharing: Carsharing + car_sharing: Usluga dijeljenja automobila car_wash: Autopraonica casino: Casino charging_station: Postaja za punjenje električnih automobila @@ -1805,41 +1805,9 @@ hr: create: successful_report: VaÅ¡a prijava je uspjeÅ¡no registrirana provide_details: Molimo navedite potrebne podatke - layouts: - logo: - alt_text: OpenStreetMap logotip - home: Pokaži moj dom - logout: Odjavi se - log_in: Prijavi se - sign_up: Otvori račun - start_mapping: Počnite kartirati - edit: Uredi - history: Povijest - export: Izvoz - issues: Problemi - gps_traces: GNSS tragovi - user_diaries: Dnevnik - edit_with: Uredi s %{editor} - intro_header: DobrodoÅ¡ao/la na OpenStreetMap! - intro_text: OpenStreetMap je karta svijeta, koju su stvorili ljudi kao vi i može - se slobodno koristiti pod licencom otvorenog koda (ODbL). - hosting_partners_2024_html: Hosting podržavaju %{fastly}, %{corpmembers} i drugi - %{partners}. - partners_corpmembers: Korporativni članovi OSMF-a - partners_partners: partneri - tou: Uvjeti uporabe - nothing_to_preview: NiÅ¡ta za pregled. - help: Pomoć - about: O projektu - copyright: Autorska prava - communities: Zajednice - learn_more: Saznaj viÅ¡e - more: ViÅ¡e - header: - select_language: Izaberite jezik - select_language_button: - title: Izaberite jezik + languages_panes: select_language_list: + search_language: Tražite... languages: af: Afrikaans gsw: Alemanski @@ -1950,6 +1918,41 @@ hr: zh-HK: Kineski (Hong Kong) ja: Japanski ko: Korejski + layouts: + logo: + alt_text: OpenStreetMap logotip + home: Pokaži moj dom + logout: Odjavi se + log_in: Prijavite se + sign_up: Registrirajte se + start_mapping: Počnite kartirati + edit: Uredite + history: Povijest + export: Izvoz + issues: Problemi + gps_traces: GNSS tragovi + user_diaries: Korisnički dnevnici + edit_with: Uredite pomoću %{editor} + intro_header: DobrodoÅ¡ao/la na OpenStreetMap! + intro_text: OpenStreetMap je karta svijeta, koju su stvorili ljudi kao vi i može + se slobodno koristiti pod licencom otvorenog koda (ODbL). + hosting_partners_2024_html: Hosting podržavaju %{fastly}, %{corpmembers} i drugi + %{partners}. + partners_corpmembers: Korporativni članovi OSMF-a + partners_partners: partneri + tou: Uvjeti uporabe + nothing_to_preview: NiÅ¡ta za pregled. + help: Pomoć + about: O projektu + copyright: Autorska prava + communities: Zajednice + learn_more: Saznaj viÅ¡e + more: ViÅ¡e + header: + select_language: Izaberite jezik + loading: Učitavanje... + select_language_button: + title: Izaberite jezik offline_flash: osm_offline: OpenStreetMap baza podataka trenutno je nedostupna jer se izvode nužni radovi održavanja. @@ -2227,8 +2230,8 @@ hr: heading: Zaboravljena zaporka? email address: E-mail adresa new password button: Ponovno postavljanje zaporke - help_text: Unesite e-mail adresu koju ste koristili za otvaranje računa i poslati - ćemo vam poveznicu pomoću koje možete ponovno postaviti zaporku. + help_text: Unesite e-mail adresu koju ste koristili prilikom registracije i + poslati ćemo vam poveznicu pomoću koje možete ponovno postaviti zaporku. create: send_paranoid_instructions: Ako vaÅ¡a e-mail adresa postoji u naÅ¡oj bazi podataka, za nekoliko minuta primit ćete poveznicu za oporavak zaporke na vaÅ¡u e-mail @@ -2555,7 +2558,7 @@ hr: trademarks_1_1_trademark_policy: Politika zaÅ¡titnog znaka services_title_html: Dodatne usluge services_1_html: Iako su OpenStreetMap otvoreni podaci, ne možemo pružiti - besplatni API za karte ili pločice karte trećim stranama. Pogledajte naÅ¡e + besplatni API za karte ili podloge karte trećim stranama. Pogledajte naÅ¡e %{api_usage_policy_link}, %{tile_usage_policy_link} i % %{nominatim_usage_policy_link}. services_1_api_usage_policy: Politika uporabe API-a services_1_tile_usage_policy: Politika uporabe podloge @@ -3188,8 +3191,8 @@ hr: confirm_revoke: Želite li opozvati pristup za ovu aplikaciju? users: new: - title: Otvori račun - tab_title: Registrirajte račun + title: Registrirajte se + tab_title: Registrirajte se signup_to_authorize_html: Registrirajte se na OpenStreetMap za pristup %{client_app_name}. no_auto_account_create: Nažalost nismo u mogućnosti automatski otvarati korisničke račune. @@ -3201,7 +3204,7 @@ hr: paragraph_1: Za razliku od drugih karata, OpenStreetMap su u potpunosti izradili ljudi poput vas, a svatko ga može besplatno popravljati, ažurirati, preuzimati i koristiti. - paragraph_2: Prijavite se kako biste počeli doprinositi. + paragraph_2: Registrirajte se kako biste počeli doprinositi. welcome: DobrodoÅ¡li na OpenStreetMap duplicate_social_email: Ako već imate OpenStreetMap račun i želite koristiti usluge treće strane za identifikaciju, molimo prijavite se pomoću svoje zaporke @@ -3216,7 +3219,7 @@ hr: privacy_policy_title: OSMF pravila o privatnosti, uključujući odjeljak o e-mail adresama contributor_terms: uvjeti doprinositelja - continue: Otvori račun + continue: Registrirajte se email_help: privacy_policy: Pravila o zaÅ¡titi privatnosti privacy_policy_title: OSMF pravila o privatnosti, uključujući odjeljak o e-mail @@ -3284,6 +3287,10 @@ hr: change_image: Promijenite sliku edit_company: Uredite tvrtku edit_location: Uredite lokaciju + contributions: + one: '%{count} doprinos u proÅ¡loj godini ' + few: '%{count} doprinosa u proÅ¡loj godini' + other: '%{count} doprinosa u proÅ¡loj godini' sidebar_section: home_location: VaÅ¡a lokacija company: Tvrtka @@ -3301,6 +3308,14 @@ hr: heading_html: Lista blokada na %{name} empty: '%{name} nije joÅ¡ bio blokiran.' edit: + title: Opoziv svih blokova na %{block_on} + heading_html: Opoziv svih blokova na %{block_on} + empty: '%{name} nema aktivnih blokova.' + confirm: Jeste li sigurni da želite opozvati %{active_blocks}? + active_blocks: + one: '%{count} aktivni blok' + few: '%{count} aktivna bloka' + other: '%{count} aktivnih blokova' revoke: Opozovite! destroy: flash: Sve aktivne blokade su opozvane. @@ -3313,6 +3328,7 @@ hr: pending: Na čekanju active: Aktivan confirmed: Potvrđeno + suspended: Suspendirana deleted: Obrisano name_or_email: Ime ili e-mail ip_address: IP adresa @@ -3321,6 +3337,10 @@ hr: no_edits: Nema uređivanja search: Pretražite page: + found_users: + one: '%{count} pronađen korisnik' + few: '%{count} pronađena korisnika ' + other: '%{count} pronađenih korisnika' confirm: Potvrdi odabrane korisnike hide: Sakrij odabrane korisnike empty: Nema pronađenih odgovarajućih korisnika @@ -3329,6 +3349,7 @@ hr: summary_no_ip_html: '%{name} napravljeno %{date}' comments: index: + heading_html: Komentari %{user} changesets: Skupovi promjena diary_entries: Dnevnički zapisi no_comments: Bez komentara @@ -3352,24 +3373,37 @@ hr: support: podrÅ¡ka automatically_suspended: Žao nam je, vaÅ¡ je račun automatski obustavljen zbog sumnjive aktivnosti. + contact_support_html: Ovu odluku će uskoro pregledati administrator ili možete + kontaktirati %{support_link} ako želite o tome razgovarati. auth_failure: + connection_failed: Povezivanje s pružateljem usluge autentifikacije nije uspjelo + invalid_credentials: Nevažeći vjerodajnice za autentifikaciju + no_authorization_code: Nema autorizacijskog koda + unknown_signature_algorithm: Nepoznati algoritam potpisa + invalid_scope: Nevažeći opseg unknown_error: Autentifikacija neuspjela auth_association: heading: VaÅ¡ ID joÅ¡ nije povezan s OpenStreetMap računom. option_1: Ako ste novi korisnik OpenStreetMapa, molimo vas jkreirate novi račun upotrebom novog obrasca. + option_2: Ako već imate račun, možete se prijaviti na svoj račun koristeći svoje + korisničko ime i zaporku, a zatim povezati račun sa svojim ID-om u svojim + postavkama korisnika. role_icons: title: administrator: Ovaj korisnik je administrator moderator: Ovaj korisnik je moderator + importer: Ovaj korisnik je uvoznik grant: administrator: Dodjeli pristup administratoru moderator: Dodjeli pristup moderatoru + importer: Odobrite pristup uvozniku are_you_sure: Jeste li sigurni da želite dodjeliti ulogu '%{role}' korisniku '%{name}'? revoke: administrator: Opozovi pristup administatora moderator: Opozovi pristup moderatora + importer: Opozovite pristup uvozniku are_you_sure: Jeste li sigurni da želite opozvati ulogu '%{role}' od korisnika '%{name}'? user_role: @@ -3377,6 +3411,8 @@ hr: not_a_role: Niz '%{role}' nije valjana uloga. already_has_role: Korisnik već ima ulogu %{role}. doesnt_have_role: Korisnik nema ulogu %{role}. + not_revoke_admin_current_user: Nije moguće opozvati administratorsku ulogu trenutnom + korisniku. user_blocks: model: non_moderator_update: Morate biti moderator da stvorite ili ažurirate blokadu. @@ -3392,12 +3428,19 @@ hr: title: Uređivanje blokade na %{name} heading_html: Uređivanje blokade na %{name} period: Koliko će dugo, odsada, korisnik biti blokiran od API. + revoke: Opozovite blok filter: block_period: Period blokade mora biti jedna od vrijednosti iz padajuće liste. create: flash: Napravi blokadu na korisnika %{name}. update: only_creator_can_edit: Samo moderator koji je napravio blokadu je može urediti. + only_creator_can_edit_without_revoking: Samo moderator koji je kreirao ovaj + blok može ga uređivati bez opoziva. + only_creator_or_revoker_can_edit: Samo moderatori koji su kreirali ili opozvali + ovaj blok mogu ga uređivati. + inactive_block_cannot_be_reactivated: Ovaj blok je neaktivan i ne može se ponovno + aktivirati. success: Blokada ažurirana index: title: Korisničke blokade @@ -3406,6 +3449,8 @@ hr: helper: time_future_html: ZavrÅ¡ava u %{time}. until_login: Aktivno dok se korisnik ne prijavi. + time_future_and_until_login_html: ZavrÅ¡ava u %{time} i nakon Å¡to se korisnik + prijavi. time_past_html: ZavrÅ¡eno %{time}. block_duration: hours: @@ -3428,10 +3473,19 @@ hr: one: '%{count} godina' few: '%{count} godine' other: '%{count} godina' + short: + ended: zavrÅ¡io + revoked_html: opozvao %{name} + active: aktivan + active_until_read: aktivan do čitanja + read_html: pročitano u %{time} + time_in_future_title: '%{time_absolute}; u %{time_relative}' + time_in_past_title: '%{time_absolute}; %{time_relative}' show: title: '%{block_by} blokirao %{block_on}' heading_html: '%{block_by} blokirao %{block_on}' created: Stvoreno + duration: 'Trajanje:' status: Status edit: Uredi reason: 'Razlog za blokadu:' @@ -3443,7 +3497,42 @@ hr: display_name: Blokirani korisnik creator_name: Tvorac reason: Razlog za blokadu + start: Start + end: Kraj status: Status + navigation: + all_blocks: Svi blokovi + blocks_on_me: Blokovi na meni + blocks_on_user_html: Blokovi na %{user} + blocks_by_me: Moji blokovi + blocks_by_user_html: Blokovi %{user} + block: 'Blok #%{id}' + new_block: Novi blok + user_mutes: + index: + title: UtiÅ¡ani korisnici + my_muted_users: Moji isključeni korisnici + you_have_muted_n_users: + one: 'utiÅ¡ali ste %{count} korisnika ' + few: utiÅ¡ali ste %{count} korisnika + other: UtiÅ¡ali ste %{count} korisnika + user_mute_explainer: Poruke korisnika s isključenim zvukom premjeÅ¡taju se u + posebnu pristiglu poÅ¡tu i nećete primati obavijesti o primitku novog e-maila. + user_mute_admins_and_moderators: Možete isključiti administratore i moderatore, + ali njihove poruke neće biti isključene. + table: + thead: + muted_user: UtiÅ¡ani korisnik + actions: Radnje + tbody: + unmute: Uključite zvuk + send_message: PoÅ¡aljite poruku + create: + notice: UtiÅ¡ali ste %{name}. + error: '%{name} se ne može utiÅ¡ati. %{full_message}.' + destroy: + notice: Uključili ste %{name}. + error: Korisnik nije mogao biti isključen. PokuÅ¡ajte ponovno. notes: index: title: BiljeÅ¡ke stvorio ili komentirao %{user} @@ -3491,23 +3580,55 @@ hr: reactivate: Ponovno aktivirajte comment_and_resolve: Komentirajte i razrijeÅ¡ite comment: Komentirajte + log_in_to_comment: Prijavite se kako biste komentirali ovu biljeÅ¡ku + report_link_html: Ako ova biljeÅ¡ka sadrži osjetljive podatke koje je potrebno + ukloniti, možete %{link}. + other_problems_resolve: Za sve ostale probleme s biljeÅ¡kom, molimo vas rijeÅ¡ite + ih sami komentarom. + other_problems_resolved: Za sve ostale probleme, rjeÅ¡avanje je dovoljno. + disappear_date_html: Ova rijeÅ¡ena biljeÅ¡ka nestat će s karte za %{disappear_in}. new: title: Nova biljeÅ¡ka intro: Primjetili ste greÅ¡ku ili nedostatak nečega? Javite ostalim kartografima kako bismo to ispravili. Stavite oznaku na pravo mjesto i dodajte biljeÅ¡ku s opisom problema. (Molimo ne unosite osobne podatke ili podatke s karata koje su zaÅ¡tićene autorskim pravima) + anonymous_warning_html: Niste prijavljeni. Molimo vas %{log_in} ili %{sign_up} + kako biste primali ažuriranja za svoju biljeÅ¡ku i pomogli kartografima u rjeÅ¡avanju. + anonymous_warning_log_in: registrirajte se + anonymous_warning_sign_up: registrirajte se + counter_warning_html: Već ste objavili najmanje %{x_anonymous_notes}, to je + sjajno za zajednicu, hvala vam! Sada vas potičemo %{contribute_by_yourself}, + nije tako komplicirano, i %{community_can_help}. + x_anonymous_notes: + one: '%{count} anonimna biljeÅ¡ka' + few: '%{count} anonimne biljeÅ¡ke ' + other: '%{count} anonimnih biljeÅ¡ki ' + counter_warning_guide_link: + text: doprinesite sami + counter_warning_forum_link: + text: zajednica vam može pomoći advice: VaÅ¡a biljeÅ¡ka je javna i može se koristiti za ažuriranje karte, zato ne upisujte osobne podatke, ili podatke sa karata ili tablica podataka zaÅ¡tićenih autorskim pravima. add: Dodaj biljeÅ¡ku + new_readonly: + title: Nova biljeÅ¡ka + warning: Nove biljeÅ¡ke nije moguće stvoriti jer je OpenStreetMap API trenutno + u načinu rada samo za čitanje. notes_paging_nav: showing_page: Stranica %{page} + next: Sljedeće + previous: Prethodno + not_found_message: + sorry: 'Žao nam je, biljeÅ¡ka #%{id} nije pronađena.' javascripts: close: Zatvori share: title: Podijeli view_larger_map: Prikaži veću kartu + export_failed_title: Izvoz karte nije uspio + filename: karta embed: report_problem: Prijavi problem legend: @@ -3520,11 +3641,22 @@ hr: out: Udalji locate: title: Pokaži moju lokaciju + metersPopup: + one: Nalazite se unutar %{count} metara od ove točke + few: 'nalazite se unutar %{count} metra od odve ' + other: ' Nalazite se unutar %{count} metara od ove točke' + feetPopup: + one: Nalazite se unutar %{count} stopa od ove točke + few: 'nalazite se unutar %{count} stope od ove točke ' + other: Nalazite se unutar %{count} stopa od ove točke base: standard: Standardni cycle_map: Biciklistička karta transport_map: Transportna karta + tracestracktop_topo: Tracestrack Topo hot: Humanitarna + shortbread: Shortbread + openmaptiles_osm: MapTiler OMT layers: header: Slojevi karte notes: BiljeÅ¡ke na karti @@ -3532,7 +3664,18 @@ hr: gps: Javni GNSS tragovi overlays: Uključi dodatne slojeve za otklanjanje greÅ¡aka na karti title: Slojevi + openstreetmap_contributors: Suradnici OpenStreetMapa + make_a_donation: Donirajte + website_and_api_terms: Uvjeti web-stranice i API-ja cyclosm_credit: Stil podloge %{cyclosm_link}, domaćin %{osm_france_link} + osm_france: OpenStreetMap Francuska + thunderforest_credit: Podloge omogućio %{thunderforest_link} + andy_allan: Andy Allan + tracestrack_credit: Podloge omogućio %{tracestrack_link} + hotosm_credit: Stil podloga %{hotosm_link}, s uslugom hostiranja %{osm_france_link} + hotosm_name: Humanitarni OpenStreetMap tim + openmaptiles_credit: Vektorske podloge %{openmaptiles_link} pružatelja usluga + hostiranja %{maptiler_link} site: edit_tooltip: Uredi kartu edit_disabled_tooltip: Približi za uređivanje karte @@ -3540,18 +3683,86 @@ hr: createnote_disabled_tooltip: Približi za dodavanje biljeÅ¡ke na kartu queryfeature_tooltip: Provjeri elemente karte queryfeature_disabled_tooltip: Približi za provjeru elemenata + profile: + social_link_n: Poveznica na profil na druÅ¡tvenoj mreži %{n} + remove_social_link_n: Uklonite poveznicu na profil na druÅ¡tvenoj mreži %{n} edit_help: Pomakni kartu i približi dio koji želiÅ¡ urediti, zatim klikni ovdje. directions: + distance_in_units: + m: '%{distance}m' + km: '%{distance}km' + ft: '%{distance}ft' + yd: '%{distance}yd' + mi: '%{distance}mi' errors: no_route: Nismo mogli naći put između ta dva mjesta. + no_place: + title: Pretraživanje nije uspjelo + body: Nije moguće locirati '%{place}'. instructions: continue_without_exit: Nastavi na %{name} slight_right_without_exit: Lagano desno na %{name} offramp_right: Uđite na autocestu desno offramp_right_with_exit: Skrenite na izlaz %{exit} desno + offramp_right_with_exit_name: Izađite na izlazu %{exit} desno na %{name} + offramp_right_with_exit_directions: Izađite na izlazu %{exit} desno prema + %{directions} + offramp_right_with_exit_name_directions: Izađite na izlazu %{exit} desno na + %{name}, prema %{directions} offramp_right_with_name: Siđi sa autoceste desno na %{name} + offramp_right_with_directions: Skrenite desno na izlaz prema %{directions} + offramp_right_with_name_directions: Skrenite desno na izlaz %{name}, prema + %{directions} onramp_right_without_exit: Skreni desno na autocestu %{name} + onramp_right_with_directions: Skrenite desno na izlaz prema %{directions} + onramp_right_with_name_directions: Skrenite desno na izlazu na %{name}, prema + %{directions} + onramp_right_without_directions: Skrenite desno na rampu + onramp_right: Skrenite desno na rampu endofroad_right_without_exit: Na kraju ceste skreni desno na %{name} + merge_right_without_exit: Uključite se desno na %{name} + fork_right_without_exit: Na račvanju skrenite desno na %{name} + turn_right_without_exit: Skrenite desno na %{name} + sharp_right_without_exit: OÅ¡tro desno na %{name} + uturn_without_exit: Polukružno okretanje uz %{name} + sharp_left_without_exit: OÅ¡tro lijevo na %{name} + turn_left_without_exit: Skrenite lijevo na %{name} + offramp_left: Skrenite lijevo na izlaz + offramp_left_with_exit: Izađite na izlazu %{exit} s lijeve strane + offramp_left_with_exit_name: Izađite na izlazu %{exit} lijevo na %{name} + offramp_left_with_exit_directions: Izađite na izlazu %{exit} lijevo prema + %{directions} + offramp_left_with_exit_name_directions: Izađite na izlazu %{exit} lijevo na + %{name}, prema %{directions} + offramp_left_with_name: Skrenite lijevo na izlaz na %{name} + offramp_left_with_directions: Skrenite lijevo na izlaz prema %{directions} + offramp_left_with_name_directions: Skrenite lijevo izlaz na %{name}, prema + %{directions} + onramp_left_without_exit: Skrenite lijevo na izlaz na %{name} + onramp_left_with_directions: Skrenite lijevo na izlaz prema %{directions} + onramp_left_with_name_directions: Skrenite lijevo na izlazu na %{name}, prema + %{directions} + onramp_left_without_directions: Skrenite lijevo na rampu + onramp_left: Skrenite lijevo na rampu + endofroad_left_without_exit: Na kraju ceste skrenite lijevo na %{name} + merge_left_without_exit: Uključite se lijevo na %{name} + fork_left_without_exit: Na račvanju skrenite lijevo na %{name} + slight_left_without_exit: Lagano lijevo na %{name} + via_point_without_exit: (preko točke) + follow_without_exit: Pratite %{name} + roundabout_without_exit: Na kružnom toku izađite na izlaz %{name} + leave_roundabout_without_exit: Napustite kružni tok - %{name} + stay_roundabout_without_exit: Ostanite na kružnom toku - %{name} + start_without_exit: Krenite od %{name} + destination_without_exit: Dolazak do odrediÅ¡ta + against_oneway_without_exit: Idite jednosmjernom cestom do %{name} + end_oneway_without_exit: Kraj jednosmjerne ceste na %{name} + roundabout_with_exit: Na kružnom toku izađite na izlazu %{exit} na %{name} + roundabout_with_exit_ordinal: Na kružnom toku izađite na izlazu %{exit} na + %{name} + exit_roundabout: Izađite s kružnog toka na %{name} + ferry_without_exit: Ukrcajte se na trajekt %{name} + unnamed: neimenovana cesta exit_counts: first: "1." second: "2." @@ -3564,9 +3775,14 @@ hr: ninth: "9." tenth: "10." query: - node: Točka + node: Čvor way: Put relation: Relacija + nothing_found: Nisu pronađene značajke + error: 'GreÅ¡ka pri kontaktiranju %{server}: %{error}' + timeout: Vremensko ograničenje za kontakt %{server} + element: + wikipedia: Wikipedia context: directions_from: Upute odavde directions_to: Upute do ovog mjesta @@ -3575,14 +3791,57 @@ hr: query_features: Provjeri elemente karte centre_map: Centriraj kartu ovdje scroll_to_changeset: Pretražite do skupa promjena + home: + marker_title: Moja početna stranica + not_set: Početna stranica nije postavljena za vaÅ¡ račun + heatmap: + tooltip: + no_contributions: Bez doprinosa %{date} + contributions: + one: '%{count} doprinos %{date}' + few: 'doprinosa %{date} ' + other: '%{count} doprinosa %{date}' + remote_edit: + failed: + title: Uređivanje nije uspjelo + body: Provjerite je li JOSM ili Merkaartor učitan i je li omogućena opcija + daljinskog upravljanja. edit: id_not_configured: title: iD nije konfiguriran + body: Za viÅ¡e informacija molim pogledajte CONFIGURE.md redactions: + edit: + heading: Uredite redakciju + title: Uredite redakciju + index: + empty: Nema redakcija za prikaz. + heading: Popis redakcija + title: Popis redakcija + new: Nova redakcija + new: + heading: Unesite podatke za novu redakciju + title: Izradite novu redakciju show: description: 'Opis:' + heading: Prikazuje se redakcija "%{title}" + title: Prikaz redakcije user: 'Tvorac:' + edit: Uredite ovu redakciju + destroy: Uklonite ovu redakciju confirm: Jeste li sigurni? + create: + flash: Redakcija je kreirana. update: flash: Promjene su spremljene. + destroy: + not_empty: Redakcija nije prazna. Molimo vas poniÅ¡tite redakciju svih verzija + koje pripadaju ovoj redakciji prije nego Å¡to je uniÅ¡tite. + flash: Redakcija je uniÅ¡tena. + error: DoÅ¡lo je do pogreÅ¡ke prilikom uklanjanja ove redakcije. + validations: + leading_whitespace: ima vodeći razmak + trailing_whitespace: ima prateći razmak + invalid_characters: sadrži nevažeće znakove + url_characters: sadrži posebne URL znakove (%{characters}) ... diff --git a/config/locales/ia.yml b/config/locales/ia.yml index e5cafca03..14b641ef5 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1786,40 +1786,7 @@ ia: create: successful_report: Tu reporto ha essite registrate provide_details: Per favor, forni le detalios necessari - layouts: - logo: - alt_text: Logo de OpenStreetMap - home: Vader al loco de residentia - logout: Clauder session - log_in: Aperir session - sign_up: Crear conto - start_mapping: Comenciar a cartographiar - edit: Modificar - history: Historia - export: Exportar - issues: Problemas - gps_traces: Tracias GPS - user_diaries: Diarios de usatores - edit_with: Modificar con %{editor} - intro_header: Benvenite a OpenStreetMap! - intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere - de usar sub un licentia aperte. - hosting_partners_2024_html: Le allogiamento web es supportate per %{fastly}, %{corpmembers} - e altere %{partners}. - partners_corpmembers: Membros corporative de OSMF - partners_partners: partners - tou: Conditiones de uso - nothing_to_preview: Nihil a previsualisar. - help: Adjuta - about: A proposito - copyright: Derectos de autor - communities: Communitates - learn_more: Leger plus - more: Plus - header: - select_language: Selige lingua - select_language_button: - title: Selige lingua + languages_panes: select_language_list: languages: af: Afrikaans @@ -1931,6 +1898,40 @@ ia: zh-HK: Chinese (Hong Kong) ja: Japonese ko: Coreano + layouts: + logo: + alt_text: Logo de OpenStreetMap + home: Vader al loco de residentia + logout: Clauder session + log_in: Aperir session + sign_up: Crear conto + start_mapping: Comenciar a cartographiar + edit: Modificar + history: Historia + export: Exportar + issues: Problemas + gps_traces: Tracias GPS + user_diaries: Diarios de usatores + edit_with: Modificar con %{editor} + intro_header: Benvenite a OpenStreetMap! + intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere + de usar sub un licentia aperte. + hosting_partners_2024_html: Le allogiamento web es supportate per %{fastly}, %{corpmembers} + e altere %{partners}. + partners_corpmembers: Membros corporative de OSMF + partners_partners: partners + tou: Conditiones de uso + nothing_to_preview: Nihil a previsualisar. + help: Adjuta + about: A proposito + copyright: Derectos de autor + communities: Communitates + learn_more: Leger plus + more: Plus + header: + select_language: Selige lingua + select_language_button: + title: Selige lingua offline_flash: osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite a operationes de mantenentia essential. diff --git a/config/locales/it.yml b/config/locales/it.yml index 548b548cc..9d603a2b5 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1232,7 +1232,7 @@ it: basin: Bacino brownfield: Area con edifici in demolizione cemetery: Cimitero - commercial: Zona di uffici + commercial: Area per uffici o servizi conservation: Area di conservazione construction: Area di costruzione farmland: Terreno agricolo @@ -1850,40 +1850,7 @@ it: create: successful_report: La tua segnalazione è stata registrata con successo provide_details: Fornire i dettagli richiesti - layouts: - logo: - alt_text: Logo OpenStreetMap - home: Vai alla posizione di casa - logout: Esci - log_in: Accedi - sign_up: Registrati - start_mapping: Inizia a mappare - edit: Modifica - history: Cronologia - export: Esporta - issues: Problemi - gps_traces: Tracciati GPS - user_diaries: Diari degli utenti - edit_with: Modifica con %{editor} - intro_header: Benvenuti in OpenStreetMap! - intro_text: OpenStreetMap è una mappa del mondo, creata da persone come te e libera - da utilizzare secondo una licenza aperta. - hosting_partners_2024_html: L'hosting è supportato da %{fastly}, %{corpmembers} - e da altri %{partners}. - partners_corpmembers: Membri aziendali dell'OSMF - partners_partners: partner - tou: Condizioni d'uso - nothing_to_preview: Niente da visualizzare in anteprima. - help: Aiuto - about: Informazioni - copyright: Copyright - communities: Comunità - learn_more: Ulteriori informazioni - more: Altro - header: - select_language: Seleziona lingua - select_language_button: - title: Seleziona lingua + languages_panes: select_language_list: languages: af: Afrikaans @@ -1991,6 +1958,40 @@ it: zh-HK: Cinese (Hong Kong) ja: Giapponese ko: Coreano + layouts: + logo: + alt_text: Logo OpenStreetMap + home: Vai alla posizione di casa + logout: Esci + log_in: Accedi + sign_up: Registrati + start_mapping: Inizia a mappare + edit: Modifica + history: Cronologia + export: Esporta + issues: Problemi + gps_traces: Tracciati GPS + user_diaries: Diari degli utenti + edit_with: Modifica con %{editor} + intro_header: Benvenuti in OpenStreetMap! + intro_text: OpenStreetMap è una mappa del mondo, creata da persone come te e libera + da utilizzare secondo una licenza aperta. + hosting_partners_2024_html: L'hosting è supportato da %{fastly}, %{corpmembers} + e da altri %{partners}. + partners_corpmembers: Membri aziendali dell'OSMF + partners_partners: partner + tou: Condizioni d'uso + nothing_to_preview: Niente da visualizzare in anteprima. + help: Aiuto + about: Informazioni + copyright: Copyright + communities: Comunità + learn_more: Ulteriori informazioni + more: Altro + header: + select_language: Seleziona lingua + select_language_button: + title: Seleziona lingua offline_flash: osm_offline: Per permettere lo svolgimento di essenziali lavori di manutenzione, il database di OpenStreetMap è attualmente offline. diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 4bf972294..61c9b3b40 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1663,42 +1663,7 @@ ko: create: successful_report: 보고서가 성공적으로 등록되었습니다 provide_details: 필수 상세 정보를 지정해 주십시오 - layouts: - project_name: - title: OpenStreetMap - h1: OpenStreetMap - logo: - alt_text: OpenStreetMap 로고 - home: 현재 위치로 가기 - logout: 로그아웃 - log_in: 로그인 - sign_up: 가입하기 - start_mapping: 매핑 시작 - edit: 편집 - history: 역사 - export: 내보내기 - issues: 이슈 - gps_traces: GPS 궤적 - user_diaries: 사용자 일기 - edit_with: '%{editor} 계정으로 편집' - intro_header: 오픈스트리트맵에 오신 것을 환영합니다! - intro_text: 오픈스트리트맵(OpenStreetMap)은 여러분과 같은 사람들이 만들어, 개방형 라이선스에 따라 자유롭게 사용할 수 - 있는 세계 지도입니다. - hosting_partners_2024_html: 호스팅은 %{fastly}, %{corpmembers}, 기타 %{partners}에서 지원합니다. - partners_corpmembers: OSMF 기업 회원 - partners_partners: 협력단체 - tou: 이용 약관 - nothing_to_preview: 미리 ë³¼ 항목이 없습니다. - help: 도움말 - about: 소개 - copyright: 저작권 - communities: 커뮤니티 - learn_more: 더 알아보기 - more: 더 보기 - header: - select_language: 언어 선택 - select_language_button: - title: 언어 선택 + languages_panes: select_language_list: languages: af: 아프리칸스어 @@ -1809,6 +1774,42 @@ ko: zh-HK: 중국어(홍콩) ja: 일본어 ko: 한국어 + layouts: + project_name: + title: OpenStreetMap + h1: OpenStreetMap + logo: + alt_text: OpenStreetMap 로고 + home: 현재 위치로 가기 + logout: 로그아웃 + log_in: 로그인 + sign_up: 가입하기 + start_mapping: 매핑 시작 + edit: 편집 + history: 역사 + export: 내보내기 + issues: 이슈 + gps_traces: GPS 궤적 + user_diaries: 사용자 일기 + edit_with: '%{editor} 계정으로 편집' + intro_header: 오픈스트리트맵에 오신 것을 환영합니다! + intro_text: 오픈스트리트맵(OpenStreetMap)은 여러분과 같은 사람들이 만들어, 개방형 라이선스에 따라 자유롭게 사용할 수 + 있는 세계 지도입니다. + hosting_partners_2024_html: 호스팅은 %{fastly}, %{corpmembers}, 기타 %{partners}에서 지원합니다. + partners_corpmembers: OSMF 기업 회원 + partners_partners: 협력단체 + tou: 이용 약관 + nothing_to_preview: 미리 ë³¼ 항목이 없습니다. + help: 도움말 + about: 소개 + copyright: 저작권 + communities: 커뮤니티 + learn_more: 더 알아보기 + more: 더 보기 + header: + select_language: 언어 선택 + select_language_button: + title: 언어 선택 user_mailer: diary_comment_notification: description: 'OpenStreetMap 일기 항목 #%{id}' diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 2ea0dab30..bf71ad734 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -1593,37 +1593,9 @@ lb: create: successful_report: Äre Rapport gouf enregistréiert provide_details: Gitt wgl. déi gefroten Detailer un - layouts: - logo: - alt_text: OpenStreetMap-Logo - home: Op déi Plaz zréckgoen déi als Doheem definéiert ass - logout: Ofmellen - log_in: Aloggen - sign_up: Mellt Iech un - start_mapping: Mam Kaartéieren ufänken - edit: Änneren - history: Versiounen - export: Exportéieren - issues: Problemer - gps_traces: GPS-Spueren - user_diaries: Benotzer-Bloggen - edit_with: Ännere mat %{editor} - intro_header: Wëllkomm bei OpenStreetMap! - intro_text: OpenStreetMap ass eng Kaart vun der Welt, déi vu Leit wéi Iech gemaach - gouf an déi fräi ënner enger oppener Lizenz benotzt ka ginn. - partners_partners: Partneren - tou: Benotzungs-Bedéngungen - help: Hëllef - about: Iwwer - copyright: Copyright - communities: Communautéiten - learn_more: Méi gewuer ginn - more: Méi - header: - select_language: Sprooch eraussichen - select_language_button: - title: Sprooch eraussichen + languages_panes: select_language_list: + search_language: Sichen... languages: af: Afrikaans gsw: Alemannesch @@ -1708,6 +1680,37 @@ lb: zh-HK: Chineesesch (Hong Kong) ja: Japanesch ko: Koreanesch + layouts: + logo: + alt_text: OpenStreetMap-Logo + home: Op déi Plaz zréckgoen déi als Doheem definéiert ass + logout: Ofmellen + log_in: Aloggen + sign_up: Mellt Iech un + start_mapping: Mam Kaartéieren ufänken + edit: Änneren + history: Versiounen + export: Exportéieren + issues: Problemer + gps_traces: GPS-Spueren + user_diaries: Benotzer-Bloggen + edit_with: Ännere mat %{editor} + intro_header: Wëllkomm bei OpenStreetMap! + intro_text: OpenStreetMap ass eng Kaart vun der Welt, déi vu Leit wéi Iech gemaach + gouf an déi fräi ënner enger oppener Lizenz benotzt ka ginn. + partners_partners: Partneren + tou: Benotzungs-Bedéngungen + help: Hëllef + about: Iwwer + copyright: Copyright + communities: Communautéiten + learn_more: Méi gewuer ginn + more: Méi + header: + select_language: Sprooch eraussichen + loading: Lueden... + select_language_button: + title: Sprooch eraussichen user_mailer: diary_comment_notification: subject: '[OpenStreetMap] %{user} huet e Blogantrag kommentéiert' diff --git a/config/locales/mk.yml b/config/locales/mk.yml index ae86a9bf9..e5e0b5aed 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -1771,41 +1771,9 @@ mk: create: successful_report: Вашата пријава е успешно заведена provide_details: Наведете ги потребните поединости - layouts: - logo: - alt_text: Лого на OpenStreetMap - home: Оди на матичната местоположба - logout: Одјава - log_in: Најава - sign_up: Зачленување - start_mapping: Почнете да ги работите картите - edit: Уреди - history: Историја - export: Извези - issues: Проблеми - gps_traces: ГПС-траги - user_diaries: Кориснички дневници - edit_with: Уреди со %{editor} - intro_header: Добре дојдовте на OpenStreetMap! - intro_text: OpenStreetMap е карта на светот создадена од луѓе како вас и се нуди - за слободна употреба под отворена лиценца. - hosting_partners_2024_html: Вдомувањето е поддржано од %{fastly}, %{corpmembers}, - и други %{partners}. - partners_corpmembers: Корпоративни членови на OSMF - partners_partners: партнери - tou: Услови на употреба - nothing_to_preview: Нема што да се прегледа. - help: Помош - about: За нас - copyright: Авторски права - communities: Заедници - learn_more: Дознајте повеќе - more: Повеќе - header: - select_language: Изберете јазик - select_language_button: - title: Изберете јазик + languages_panes: select_language_list: + search_language: Пребарување... languages: af: африканс gsw: алемански @@ -1889,9 +1857,9 @@ mk: yi: јидиш he: хебрејски ar: арапски - skr-arab: дирајки (арабица) + skr-arab: сирајки fa: персиски - arz: арапски (Египет) + arz: египетски арапски pnb: западнопенџапски ps: паштунски nqo: нко @@ -1916,6 +1884,41 @@ mk: zh-HK: кинески (Хонгконг) ja: јапонски ko: корејски + layouts: + logo: + alt_text: Лого на OpenStreetMap + home: Оди на матичната местоположба + logout: Одјава + log_in: Најава + sign_up: Зачленување + start_mapping: Почнете да ги работите картите + edit: Уреди + history: Историја + export: Извези + issues: Проблеми + gps_traces: ГПС-траги + user_diaries: Кориснички дневници + edit_with: Уреди со %{editor} + intro_header: Добре дојдовте на OpenStreetMap! + intro_text: OpenStreetMap е карта на светот создадена од луѓе како вас и се нуди + за слободна употреба под отворена лиценца. + hosting_partners_2024_html: Вдомувањето е поддржано од %{fastly}, %{corpmembers}, + и други %{partners}. + partners_corpmembers: Корпоративни членови на OSMF + partners_partners: партнери + tou: Услови на употреба + nothing_to_preview: Нема што да се прегледа. + help: Помош + about: За нас + copyright: Авторски права + communities: Заедници + learn_more: Дознајте повеќе + more: Повеќе + header: + select_language: Изберете јазик + loading: Вчитувам... + select_language_button: + title: Изберете јазик offline_flash: osm_offline: Базата на податоци на OpenStreetMap моментално е исклучена додека работиме на неопходни одржувања. diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 7c7f3172b..15c95656e 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1844,41 +1844,9 @@ nl: create: successful_report: Uw rapport is succesvol geregistreerd provide_details: Verschaf a.u.b. de vereiste details - layouts: - logo: - alt_text: Logo OpenStreetMap - home: Naar thuislocatie gaan - logout: Afmelden - log_in: Aanmelden - sign_up: Registreren - start_mapping: Begin met mappen - edit: Bewerken - history: Geschiedenis - export: Exporteren - issues: Problemen - gps_traces: Gps-trajecten - user_diaries: Gebruikersdagboeken - edit_with: Bewerken met %{editor} - intro_header: Welkom bij OpenStreetMap! - intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals - u en vrij te gebruiken onder een open licentie. - hosting_partners_2024_html: Hosting wordt ondersteund door %{fastly}, %{corpmembers} - en andere %{partners}. - partners_corpmembers: OSMF-bedrijfsleden - partners_partners: partners - tou: Gebruiksvoorwaarden - nothing_to_preview: Er is geen voorvertoning. - help: Hulp - about: Over - copyright: Auteursrechten - communities: Gemeenschappen - learn_more: Meer lezen - more: Meer - header: - select_language: Taal selecteren - select_language_button: - title: Taal selecteren + languages_panes: select_language_list: + search_language: Zoeken… languages: af: Afrikaans gsw: Alemannisch @@ -1962,9 +1930,9 @@ nl: yi: Jiddisch he: Hebreeuws ar: Arabisch - skr-arab: Saraiki (Arabisch schrift) + skr-arab: Saraiki fa: Perzisch - arz: Arabisch (Egypte) + arz: Egyptisch Arabisch pnb: Westelijk Punjabi ps: Pasjtoe nqo: N'Ko @@ -1989,6 +1957,41 @@ nl: zh-HK: Chinees (Hongkong) ja: Japans ko: Koreaans + layouts: + logo: + alt_text: Logo OpenStreetMap + home: Naar thuislocatie gaan + logout: Afmelden + log_in: Aanmelden + sign_up: Registreren + start_mapping: Begin met mappen + edit: Bewerken + history: Geschiedenis + export: Exporteren + issues: Problemen + gps_traces: Gps-trajecten + user_diaries: Gebruikersdagboeken + edit_with: Bewerken met %{editor} + intro_header: Welkom bij OpenStreetMap! + intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals + u en vrij te gebruiken onder een open licentie. + hosting_partners_2024_html: Hosting wordt ondersteund door %{fastly}, %{corpmembers} + en andere %{partners}. + partners_corpmembers: OSMF-bedrijfsleden + partners_partners: partners + tou: Gebruiksvoorwaarden + nothing_to_preview: Er is geen voorvertoning. + help: Hulp + about: Over + copyright: Auteursrechten + communities: Gemeenschappen + learn_more: Meer lezen + more: Meer + header: + select_language: Taal selecteren + loading: Aan het laden… + select_language_button: + title: Taal selecteren offline_flash: osm_offline: De OpenStreetMap-database is momenteel niet beschikbaar wegens het uitvoeren van onderhoudswerkzaamheden. diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 0089985ad..dfb2df405 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1898,43 +1898,7 @@ pl: create: successful_report: Twoje zgłoszenie zostało pomyślnie zarejestrowane provide_details: Podaj wymagane sczegóły - layouts: - project_name: - title: OpenStreetMap - h1: OpenStreetMap - logo: - alt_text: Logo OpenStreetMap - home: Przejdź do położenia domu - logout: Wyloguj się - log_in: Zaloguj się - sign_up: Zarejestruj się - start_mapping: Rozpocznij tworzenie mapy - edit: Edycja - history: Zmiany - export: Eksport - issues: Sprawy - gps_traces: Ślady GPS - user_diaries: Dzienniki - edit_with: Edytuj w %{editor} - intro_header: Witamy w OpenStreetMap! - intro_text: OpenStreetMap to mapa świata stworzona przez ludzi takich jak ty i - z możliwością użycia pod otwartą licencją. - hosting_partners_2024_html: Hosting jest wspierany przez %{fastly}, %{corpmembers} - i innych %{partners}. - partners_corpmembers: członków korporacyjnych OSMF - partners_partners: partnerów - tou: Warunki Użytkowania - nothing_to_preview: Nie ma nic do podglądu. - help: Pomoc - about: Informacje - copyright: Prawa autorskie - communities: Społeczności - learn_more: Dowiedz się więcej - more: Więcej - header: - select_language: Wybierz język - select_language_button: - title: Wybierz język + languages_panes: select_language_list: languages: af: afrikaans @@ -2046,6 +2010,43 @@ pl: zh-HK: chiński (Hongkong) ja: japoński ko: koreański + layouts: + project_name: + title: OpenStreetMap + h1: OpenStreetMap + logo: + alt_text: Logo OpenStreetMap + home: Przejdź do położenia domu + logout: Wyloguj się + log_in: Zaloguj się + sign_up: Zarejestruj się + start_mapping: Rozpocznij tworzenie mapy + edit: Edycja + history: Zmiany + export: Eksport + issues: Sprawy + gps_traces: Ślady GPS + user_diaries: Dzienniki + edit_with: Edytuj w %{editor} + intro_header: Witamy w OpenStreetMap! + intro_text: OpenStreetMap to mapa świata stworzona przez ludzi takich jak ty i + z możliwością użycia pod otwartą licencją. + hosting_partners_2024_html: Hosting jest wspierany przez %{fastly}, %{corpmembers} + i innych %{partners}. + partners_corpmembers: członków korporacyjnych OSMF + partners_partners: partnerów + tou: Warunki Użytkowania + nothing_to_preview: Nie ma nic do podglądu. + help: Pomoc + about: Informacje + copyright: Prawa autorskie + communities: Społeczności + learn_more: Dowiedz się więcej + more: Więcej + header: + select_language: Wybierz język + select_language_button: + title: Wybierz język offline_flash: osm_offline: Baza danych OpenStreetMap jest w trybie offline na czas ważnych zadań administracyjnych, które są w tym momencie wykonywane. diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index a0816fa39..b7e13d455 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -1832,40 +1832,7 @@ pt-PT: create: successful_report: A tua denúncia foi registada com sucesso provide_details: Por favor, fornece os detalhes necessários - layouts: - logo: - alt_text: Logótipo do OpenStreetMap - home: Localização base - logout: Terminar sessão - log_in: Iniciar sessão - sign_up: Criar conta - start_mapping: Começar a mapear - edit: Editar - history: Histórico - export: Exportar - issues: Problemas - gps_traces: Rotas GPS - user_diaries: Diários dos Utilizadores - edit_with: Editar com %{editor} - intro_header: Bem-vind@ ao OpenStreetMap! - intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como tu e de - uso livre sob uma licença aberta. - hosting_partners_2024_html: O alojamento é suportado por %{fastly}, %{corpmembers} - e outros %{partners}. - partners_corpmembers: membros corporativos OSMF - partners_partners: parceiros - tou: Condições de utilização - nothing_to_preview: Nada para pré-visualizar. - help: Ajuda - about: Sobre - copyright: Direitos de Autor - communities: Comunidades - learn_more: Mais informações - more: Mais - header: - select_language: Selecionar Idioma - select_language_button: - title: Selecionar Idioma + languages_panes: select_language_list: languages: af: Africânder @@ -1977,6 +1944,40 @@ pt-PT: zh-HK: Chinês (Hong Kong) ja: Japonês ko: Coreano + layouts: + logo: + alt_text: Logótipo do OpenStreetMap + home: Localização base + logout: Terminar sessão + log_in: Iniciar sessão + sign_up: Criar conta + start_mapping: Começar a mapear + edit: Editar + history: Histórico + export: Exportar + issues: Problemas + gps_traces: Rotas GPS + user_diaries: Diários dos Utilizadores + edit_with: Editar com %{editor} + intro_header: Bem-vind@ ao OpenStreetMap! + intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como tu e de + uso livre sob uma licença aberta. + hosting_partners_2024_html: O alojamento é suportado por %{fastly}, %{corpmembers} + e outros %{partners}. + partners_corpmembers: membros corporativos OSMF + partners_partners: parceiros + tou: Condições de utilização + nothing_to_preview: Nada para pré-visualizar. + help: Ajuda + about: Sobre + copyright: Direitos de Autor + communities: Comunidades + learn_more: Mais informações + more: Mais + header: + select_language: Selecionar Idioma + select_language_button: + title: Selecionar Idioma offline_flash: osm_offline: A base de dados do OpenStreetMap encontra-se indisponível devido a trabalhos de manutenção essenciais. diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b7cf3700d..94075b821 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1852,40 +1852,7 @@ pt: create: successful_report: A sua denúncia foi registrada com sucesso provide_details: Por favor, forneça os detalhes necessários - layouts: - logo: - alt_text: Logotipo do OpenStreetMap - home: Ir para o seu local principal - logout: Sair - log_in: Entrar - sign_up: Criar conta - start_mapping: Começar a Mapear - edit: Editar - history: Histórico - export: Exportar - issues: Problemas - gps_traces: Trilhas GPS - user_diaries: Diários de usuário - edit_with: Edite com %{editor} - intro_header: Bem-vindo(a) ao OpenStreetMap! - intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como você e - de uso livre sob uma licença aberta. - hosting_partners_2024_html: A hospedagem é suportada por %{fastly}, %{corpmembers} - e outros %{partners}. - partners_corpmembers: Membros corporativos OSMF - partners_partners: parceiros - tou: Termo de uso - nothing_to_preview: Nada para pré-visualizar. - help: Ajuda - about: Sobre - copyright: Direitos autorais - communities: Comunidades - learn_more: Saiba Mais - more: Mais - header: - select_language: Selecionar idioma - select_language_button: - title: Selecionar idioma + languages_panes: select_language_list: languages: af: Africâner @@ -1996,6 +1963,40 @@ pt: zh-HK: Chinês (Hong Kong) ja: Japonês ko: Coreano + layouts: + logo: + alt_text: Logotipo do OpenStreetMap + home: Ir para o seu local principal + logout: Sair + log_in: Entrar + sign_up: Criar conta + start_mapping: Começar a Mapear + edit: Editar + history: Histórico + export: Exportar + issues: Problemas + gps_traces: Trilhas GPS + user_diaries: Diários de usuário + edit_with: Edite com %{editor} + intro_header: Bem-vindo(a) ao OpenStreetMap! + intro_text: O OpenStreetMap é um mapa do mundo, criado por pessoas como você e + de uso livre sob uma licença aberta. + hosting_partners_2024_html: A hospedagem é suportada por %{fastly}, %{corpmembers} + e outros %{partners}. + partners_corpmembers: Membros corporativos OSMF + partners_partners: parceiros + tou: Termo de uso + nothing_to_preview: Nada para pré-visualizar. + help: Ajuda + about: Sobre + copyright: Direitos autorais + communities: Comunidades + learn_more: Saiba Mais + more: Mais + header: + select_language: Selecionar idioma + select_language_button: + title: Selecionar idioma offline_flash: osm_offline: A base de dados do OpenStreetMap, no momento, está fora do ar para manutenção. diff --git a/config/locales/ru.yml b/config/locales/ru.yml index bbcfd10da..a56c04922 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -116,6 +116,7 @@ # Author: Wileyfoxyx # Author: WindEwriX # Author: Wirbel78 +# Author: Wodsfort # Author: XAN # Author: XnL # Author: Yuri Nazarov @@ -960,6 +961,12 @@ ru: title: Файл не найден description: Не удалось найти файл/каталог/операцию API с таким именем на сервере OpenStreetMap (HTTP 404) + follows: + show: + follow: + button: Подписаться на пользователя + create: + success: Вы сейчас подписаны на %{name}! geocoder: search_osm_nominatim: prefix: @@ -1770,6 +1777,7 @@ ru: time: Время ascend: Подъём descend: Спуск + kilometers: километров download: Скачать маршрут в формате GeoJSON filename: маршрут directions_courtesy_html: Маршрут предоставлен %{link} @@ -1802,6 +1810,7 @@ ru: states: ignored: Проигнорировано open: Открыть + resolved: Решено show: title: open: 'Открытая проблема #%{issue_id}' @@ -1882,6 +1891,21 @@ ru: create: successful_report: Ваше сообщение было успешно зарегистрировано provide_details: Пожалуйста, сообщите дополнительные детали + languages_panes: + select_language_list: + languages: + af: Африкаанс + cs: Чешский + cy: Уэльсский + da: Датский + de: Немецкий + en: Английский + eo: Эсперанто + fr: Французский + sq: Албанский + vi: Вьетнамский + tr: Турецкий + uk: Украинский layouts: logo: alt_text: Логотип OpenStreetMap diff --git a/config/locales/shn.yml b/config/locales/shn.yml index ecf79afb9..184ecb8c3 100644 --- a/config/locales/shn.yml +++ b/config/locales/shn.yml @@ -1786,40 +1786,7 @@ shn: create: successful_report: ၽိုၼ်လၢႆးငၢၼ်းၸဝ်ႈၵဝ်ႇ လႆႈမၢႆတွင်းဝႆႉလီငၢမ်းယဝ်ႉ provide_details: ၶႅၼ်းတေႃႈ ပၼ်ၶေႃႈမုၼ်း ဢၼ်လူဝ်ႇၼၼ်ႉ - layouts: - logo: - alt_text: မိၵ်ႈမၢႆ OpenStreetMap - home: ၵႂႃႇၸူး ဢွင်ႈတီႈ ႁူဝ်ႁႅၵ်ႈ - logout: လွၵ်ႉဢွၵ်ႉ - log_in: လွၵ်ႉၶဝ်ႈ - sign_up: လူင်းသဵၼ်ႈမၢႆ - start_mapping: တႄႇႁဵတ်းၽႅၼ်ႇလိၼ် - edit: မႄးထတ်း - history: ပိုၼ်း - export: သူင်ႇဢွၵ်ႇ - issues: ပၼ်ႁႃ - gps_traces: ႁွႆးတၢင်း GPS - user_diaries: တၢႆႇယႃႇရီႇ ၽူႈၸႂ်ႉတိုဝ်း - edit_with: မႄးထတ်း တင်း %{editor} - intro_header: ႁူမ်ၸူမ်းႁပ်ႉတွၼ်ႈထိုင် OpenStreetMap ယူႇ - intro_text: OpenStreetMap ၼႆႉ ပဵၼ်ၽႅၼ်ႇလိၼ် လုမ်ႈၾႃႉ ဢၼ်ၵူၼ်းမိူၼ်ၸဝ်ႈၵဝ်ႇ ႁဵတ်းဢွၵ်ႇမႃးသေ - ၸႂ်ႉတိုဝ်းလႆႈ လူၺ်ႈ ဝႂ်ၶႂၢင်ႉ ဢၼ်လွတ်ႈလႅဝ်းထၢင်ႇႁၢင်ႈၼၼ်ႉ လူၺ်ႈဢမ်ႇလႆႈသဵင်ႈငိုၼ်းသင်။ - hosting_partners_2024_html: လွင်ႈႁပ်ႉႁွင်းၼႆႉ %{fastly}, %{corpmembers}, လႄႈ %{partners} - တၢင်ႇၸိူဝ်း ၵမ်ႉထႅမ်ပၼ်။ - partners_corpmembers: ၽူႈၶဝ်ႈၸုမ်း OSMF - partners_partners: ၽူႈႁူမ်ႈၼႃႈၵၢၼ် - tou: ၶေႃႈမၵ်းမၼ်ႈလွင်ႈၸႂ်ႉတိုဝ်း - nothing_to_preview: ဢမ်ႇမီးသင်တႃႇတေတူၺ်းဢွၼ်တၢင်း။ - help: ၸွႆႈထႅမ် - about: ၵဵဝ်ႇၵပ်း - copyright: သုၼ်ႇၶွင်တူဝ် - communities: တူင်ႇဝူင်း - learn_more: လဵပ်ႈႁဵၼ်းထႅင်ႈ - more: ထႅင်ႈ - header: - select_language: လိူၵ်ႈၽႃႇသႃႇ - select_language_button: - title: လိူၵ်ႈၽႃႇသႃႇ + languages_panes: select_language_list: languages: af: ဢႃႇၾရိၵၢၼ်ႇ @@ -1931,6 +1898,40 @@ shn: zh-HK: ၶႄႇ (ႁွင်းၵွင်း) ja: ၵျႃႇပၢၼ်ႇ ko: ၵၢဝ်းလီ + layouts: + logo: + alt_text: မိၵ်ႈမၢႆ OpenStreetMap + home: ၵႂႃႇၸူး ဢွင်ႈတီႈ ႁူဝ်ႁႅၵ်ႈ + logout: လွၵ်ႉဢွၵ်ႉ + log_in: လွၵ်ႉၶဝ်ႈ + sign_up: လူင်းသဵၼ်ႈမၢႆ + start_mapping: တႄႇႁဵတ်းၽႅၼ်ႇလိၼ် + edit: မႄးထတ်း + history: ပိုၼ်း + export: သူင်ႇဢွၵ်ႇ + issues: ပၼ်ႁႃ + gps_traces: ႁွႆးတၢင်း GPS + user_diaries: တၢႆႇယႃႇရီႇ ၽူႈၸႂ်ႉတိုဝ်း + edit_with: မႄးထတ်း တင်း %{editor} + intro_header: ႁူမ်ၸူမ်းႁပ်ႉတွၼ်ႈထိုင် OpenStreetMap ယူႇ + intro_text: OpenStreetMap ၼႆႉ ပဵၼ်ၽႅၼ်ႇလိၼ် လုမ်ႈၾႃႉ ဢၼ်ၵူၼ်းမိူၼ်ၸဝ်ႈၵဝ်ႇ ႁဵတ်းဢွၵ်ႇမႃးသေ + ၸႂ်ႉတိုဝ်းလႆႈ လူၺ်ႈ ဝႂ်ၶႂၢင်ႉ ဢၼ်လွတ်ႈလႅဝ်းထၢင်ႇႁၢင်ႈၼၼ်ႉ လူၺ်ႈဢမ်ႇလႆႈသဵင်ႈငိုၼ်းသင်။ + hosting_partners_2024_html: လွင်ႈႁပ်ႉႁွင်းၼႆႉ %{fastly}, %{corpmembers}, လႄႈ %{partners} + တၢင်ႇၸိူဝ်း ၵမ်ႉထႅမ်ပၼ်။ + partners_corpmembers: ၽူႈၶဝ်ႈၸုမ်း OSMF + partners_partners: ၽူႈႁူမ်ႈၼႃႈၵၢၼ် + tou: ၶေႃႈမၵ်းမၼ်ႈလွင်ႈၸႂ်ႉတိုဝ်း + nothing_to_preview: ဢမ်ႇမီးသင်တႃႇတေတူၺ်းဢွၼ်တၢင်း။ + help: ၸွႆႈထႅမ် + about: ၵဵဝ်ႇၵပ်း + copyright: သုၼ်ႇၶွင်တူဝ် + communities: တူင်ႇဝူင်း + learn_more: လဵပ်ႈႁဵၼ်းထႅင်ႈ + more: ထႅင်ႈ + header: + select_language: လိူၵ်ႈၽႃႇသႃႇ + select_language_button: + title: လိူၵ်ႈၽႃႇသႃႇ offline_flash: osm_offline: ယၢမ်းလဵဝ် ၶေႃႈမုၼ်း OpenStreetMap ၼႆႉ ဢမ်ႇလႆႈႁဵတ်းၵၢၼ်၊ ပဵၼ်ၽွင်းမိူဝ်ႈ တိုၵ်ႉႁဵတ်းၵၢၼ်မႄးၵုမ်းလုမ်းလႃး ဢၼ်လမ်ႇလွင်ႈၼၼ်ႉယူႇ။ diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 4fb48b6a3..a948e81eb 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1824,6 +1824,9 @@ sk: create: successful_report: VaÅ¡e hlásenie bolo prijaté provide_details: Uveďte, prosím, potrebné detaily + languages_panes: + select_language_list: + search_language: HľadaÅ¥... layouts: logo: alt_text: Logo OpenStreetMap @@ -1856,6 +1859,7 @@ sk: more: ĎalÅ¡ie header: select_language: Zvoľte jazyk + loading: Načítava sa... select_language_button: title: Zvoľte jazyk offline_flash: diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml index f3df625af..d68b8acbf 100644 --- a/config/locales/skr-arab.yml +++ b/config/locales/skr-arab.yml @@ -1768,40 +1768,7 @@ skr-arab: create: successful_report: تہاݙی اطلاع کامیابی نال رجسٹرڈ تھی ڳئی ہے provide_details: مہربانی کر کے مطلوبہ تفصیلات ݙیوو - layouts: - logo: - alt_text: اوپن سٹریٹ میپ لوگو - home: ہوم تے ونڄو - logout: لاگ آؤٹ - log_in: لاگ ان تھیوو - sign_up: کھاتہ بناؤ - start_mapping: نقشہ بݨاوݨا شروع کرو - edit: تبدیلی کرو - history: تاریخچہ - export: ٻاہر بھیڄو - issues: مسئلے - gps_traces: جی پی ایس دے نشان - user_diaries: صارف ڈائریاں - edit_with: '%{editor} نال تبدیلی کرو' - intro_header: اوپن سٹریٹ میپ وچ ست بسم اللہ! - intro_text: اوپن سٹریٹ میپ دنیا دا ہک نقشہ ہے، جیںکوں تہاݙے جاہیں لوکاں بݨایا - ہے اَتے ہک کھلے لائسنس دے تحت استعمال کرݨ کیتے مفت ہے. - hosting_partners_2024_html: ہوسٹنگ کوں %{fastly}, %{corpmembers}, اَتے ٻیاں %{partners} - طرفوں سپورٹ کیتی ویندی ہے. - partners_corpmembers: او ایس ایم ایف دے کاروباری رُکن - partners_partners: بھائیوال - tou: ورتݨ شرطاں - nothing_to_preview: کوئی ݙیکھݨ نئیں - help: مدد - about: تعارف - copyright: نقل حقوق - communities: برادریاں - learn_more: ٻیا سِکھو - more: ٻئے - header: - select_language: زبان چݨو - select_language_button: - title: زبان چݨو + languages_panes: select_language_list: languages: gsw: المانی @@ -1859,6 +1826,40 @@ skr-arab: ka: جارجینی sat: سنتالی ja: جاپانی + layouts: + logo: + alt_text: اوپن سٹریٹ میپ لوگو + home: ہوم تے ونڄو + logout: لاگ آؤٹ + log_in: لاگ ان تھیوو + sign_up: کھاتہ بناؤ + start_mapping: نقشہ بݨاوݨا شروع کرو + edit: تبدیلی کرو + history: تاریخچہ + export: ٻاہر بھیڄو + issues: مسئلے + gps_traces: جی پی ایس دے نشان + user_diaries: صارف ڈائریاں + edit_with: '%{editor} نال تبدیلی کرو' + intro_header: اوپن سٹریٹ میپ وچ ست بسم اللہ! + intro_text: اوپن سٹریٹ میپ دنیا دا ہک نقشہ ہے، جیںکوں تہاݙے جاہیں لوکاں بݨایا + ہے اَتے ہک کھلے لائسنس دے تحت استعمال کرݨ کیتے مفت ہے. + hosting_partners_2024_html: ہوسٹنگ کوں %{fastly}, %{corpmembers}, اَتے ٻیاں %{partners} + طرفوں سپورٹ کیتی ویندی ہے. + partners_corpmembers: او ایس ایم ایف دے کاروباری رُکن + partners_partners: بھائیوال + tou: ورتݨ شرطاں + nothing_to_preview: کوئی ݙیکھݨ نئیں + help: مدد + about: تعارف + copyright: نقل حقوق + communities: برادریاں + learn_more: ٻیا سِکھو + more: ٻئے + header: + select_language: زبان چݨو + select_language_button: + title: زبان چݨو offline_flash: osm_offline: اوپن سٹریٹ میپ دا ڈیٹا بیس فی الحال آف لائن ہے جَݙاں جو ضروری ݙیکھ بھال دا کَم کیتا ویندا پیا ہے. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index f871da819..f6ef422d7 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -50,7 +50,7 @@ sl: create: Ustvarite redakcijo update: Shrani redakcijo trace: - create: PoÅ¡lji + create: Naloži update: Shrani spremembe user_block: create: Blokiraj @@ -83,15 +83,15 @@ sl: note: Opomba old_node: Staro vozlišče old_node_tag: Oznaka starega vozlišča - old_relation: Stara relacija - old_relation_member: Član stare povezave - old_relation_tag: Oznaka stare relacije + old_relation: Stara zveza + old_relation_member: Član stare zveze + old_relation_tag: Oznaka stare zveze old_way: Stara pot old_way_node: Vozlišče stare poti old_way_tag: Oznaka stare poti - relation: Relacija - relation_member: Član povezave - relation_tag: Oznaka relacije + relation: Zveza + relation_member: Član zveze + relation_tag: Oznaka zveze report: Poročilo session: Seja trace: Sled @@ -129,21 +129,21 @@ sl: doorkeeper/application: name: Ime redirect_uri: Preusmerjanje URI-jev - confidential: Zaupna aplikacija? + confidential: Zaupanja vredna aplikacija? scopes: Dovoljenja friend: user: Uporabnik friend: Prijatelj trace: user: Uporabnik - visible: Vidnost sledi + visible: Vidno name: Ime datoteke size: Velikost latitude: Zemljepisna Å¡irina longitude: Zemljepisna dolžina - public: Javnost sledi + public: Javno description: Opis - gpx_file: Izberi datoteko GPS Trace + gpx_file: Izberi datoteko sledi GPS visibility: Vidnost tagstring: Oznake message: @@ -156,36 +156,37 @@ sl: description: Opis report: category: Izberite razlog za poročilo - details: Prosimo, opiÅ¡ite Å¡e več podrobnosti o težavi (polje je obvezno). + details: Prosimo, podajte nekaj več podrobnosti o težavi (obvezno). user: - auth_provider: Ponudnik avtentikacije - auth_uid: UID avtentikacije + auth_provider: Ponudnik overovljenja + auth_uid: UID overovljenja email: E-poÅ¡tni naslov new_email: Novi e-poÅ¡tni naslov - active: Aktiven - display_name: Prikazano ime + active: Dejaven + display_name: Prikazno ime description: Opis profila company: Podjetje home_lat: Zemljepisna Å¡irina home_lon: Zemljepisna dolžina - home_location_name: Ime domače lokacije + home_location_name: Ime domačega kraja languages: Prednostni jeziki preferred_editor: Prednostni urejevalnik pass_crypt: Geslo pass_crypt_confirmation: Potrditev gesla help: doorkeeper/application: - confidential: Aplikacija bo uporabljena, kadar skrivnost odjemalca lahko ostane - zaupna (avtohtone mobilne aplikacije in enostranske aplikacije niso zaupne) + confidential: Aplikacija se bo uporabljala, kadar je mogoče skrivnost odjemalca + ohraniti zaupanja vredno (izvorne mobilne aplikacije in enostranske aplikacije + niso zaupanja vredne). redirect_uri: Uporabite eno vrstico na URI trace: - tagstring: uporabite vejice + tagstring: ločeno z vejicami user_block: reason: Razlog, zakaj je uporabnik blokiran. Prosimo, bodite čim bolj umirjeni in razumni ter navedite čim več podrobnosti o situaciji in ne pozabite, da bo sporočilo javno vidno. UpoÅ¡tevajte, da vsi uporabniki ne razumejo žargona skupnosti, zato poskusite uporabljati laične izraze. - needs_view: Ali se mora uporabnik za pretek blokiranja prijaviti? + needs_view: Ali se mora uporabnik za odstranitev blokade prijaviti? user: new_email: (nikoli ni javno prikazan) datetime: @@ -252,13 +253,13 @@ sl: few: pred %{count} leti other: pred %{count} leti editor: - default: Privzeti (trenutno %{name}) + default: Privzeto (trenutno %{name}) id: name: iD description: iD (urejevalnik v brskalniku) remote: - name: Zunanji urejevalnik - description: Daljinsko upravljanje (JOSM, Potlatch, Merkaartor) + name: Oddaljeni nadzor + description: Oddaljeni nadzor (JOSM, Potlatch, Merkaartor) auth: providers: none: Brez @@ -280,11 +281,11 @@ sl: reopened_at_html: Znova aktivirano %{when} reopened_at_by_html: Znova aktiviral_a %{user} %{when} rss: - title: OpenStreetMap opombe + title: Opombe na OpenStreetMap description_all: Seznam sporočenih, komentiranih ali zaprtih opomb description_area: Seznam opomb, prijavljenih, komentiranih ali zaprtih na vaÅ¡em območju [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] - description_item: RSS vir za opombo %{id} + description_item: Vir RSS za opombo %{id} opened: Nova opomba (v bližini %{place}) commented: Nov komentar (v bližini %{place}) closed: Zaprta opomba (v bližini %{place}) @@ -294,31 +295,32 @@ sl: full: Celotna opomba accounts: show: - title: Urejanje uporabniÅ¡kega računa + title: Uredi račun my_account: Moj račun current email address: Trenutni e-poÅ¡tni naslov - external auth: Zunanja avtentikacija + external auth: Zunanja overitev contributor_terms: heading: Pogoji sodelovanja agreed: Pogoje sodelovanja ste sprejeli dne %{date}. not_agreed: Niste Å¡e sprejeli pogojev sodelovanja. - agreed_with_pd: Prav tako ste izjavili, da so vaÅ¡a urejanja v javni domeni. - not_agreed_with_pd: Niste izjavili, da so vaÅ¡a urejanja v javni domeni. - review: Preglejte pogoje - review_and_accept: Preglejte in sprejmite pogoje + agreed_with_pd: Prav tako ste izjavili, da Å¡tejete svoja urejanja v javno + domeno. + not_agreed_with_pd: Niste izjavili, da Å¡tejeta svoja urejanja v javno domeno. + review: Preglejte Pogoje + review_and_accept: Preglejte in sprejmite Pogoje consider_pd: Razmislite o javni domeni terms_of_use: heading: Pogoji uporabe agreed: S Pogoji uporabe ste soglaÅ¡ali dne %{date}. not_agreed: Niste Å¡e soglaÅ¡ali s Pogoji uporabe - review: Preglejte pogoje - review_and_accept: Preglejte in sprejmite pogoje + review: Preglejte Pogoje + review_and_accept: Preglejte in sprejmite Pogoje save changes button: Shrani spremembe delete_account: IzbriÅ¡i račun ... go_public: heading: Javno urejanje - currently_not_public: Trenutno so vaÅ¡a urejanja anonimna in vam drugi ne morejo - poÅ¡iljati sporočil ali videti vaÅ¡e lokacije. Če želite pokazati, kaj ste uredili, + currently_not_public: Trenutno so vaÅ¡a urejanja brezimna in vam drugi ne morejo + poÅ¡iljati sporočil ali videti vaÅ¡ega kraja. Če želite pokazati, kaj ste uredili, in omogočiti ljudem, da stopijo v stik z vami prek spletnega mesta, kliknite spodnji gumb. only_public_can_edit: Od prehoda na API 0.6 lahko urejajo podatke zemljevida @@ -1829,41 +1831,9 @@ sl: create: successful_report: VaÅ¡e sporočilo je uspeÅ¡no zabeleženo. provide_details: Navedite zahtevane podrobnosti - layouts: - logo: - alt_text: OpenStreetMap logotip - home: Domov - logout: Odjava - log_in: Prijava - sign_up: Ustvari račun - start_mapping: Začnite kartirati - edit: Uredi - history: Zgodovina - export: Izvozi - issues: Težave - gps_traces: Sledi GPS - user_diaries: Dnevnik - edit_with: Za urejanje uporabi %{editor} - intro_header: Pozdravljeni v OpenStreetMap! - intro_text: OpenStreetMap je zemljevid sveta, ki ga ustvarjajo ljudje, kot ste - vi, in brezplačen za uporabo pod odprto licenco. - hosting_partners_2024_html: Gostovanje podpirajo %{fastly}, %{corpmembers} in - drugi %{partners}. - partners_corpmembers: Korporativni člani OSMF - partners_partners: partnerji - tou: Pogoji uporabe - nothing_to_preview: Ničesar ni za predogled. - help: Pomoč - about: O projektu - copyright: Avtorske pravice - communities: Skupnosti - learn_more: Več o tem - more: Več - header: - select_language: Izberite jezik - select_language_button: - title: Izberite jezik + languages_panes: select_language_list: + search_language: Iskanje ... languages: af: afrikanščina gsw: alemanščina @@ -1974,6 +1944,41 @@ sl: zh-HK: kitajščina (hongkongÅ¡ka) ja: japonščina ko: korejščina + layouts: + logo: + alt_text: OpenStreetMap logotip + home: Domov + logout: Odjava + log_in: Prijava + sign_up: Ustvari račun + start_mapping: Začnite kartirati + edit: Uredi + history: Zgodovina + export: Izvozi + issues: Težave + gps_traces: Sledi GPS + user_diaries: Dnevnik + edit_with: Za urejanje uporabi %{editor} + intro_header: Pozdravljeni v OpenStreetMap! + intro_text: OpenStreetMap je zemljevid sveta, ki ga ustvarjajo ljudje, kot ste + vi, in brezplačen za uporabo pod odprto licenco. + hosting_partners_2024_html: Gostovanje podpirajo %{fastly}, %{corpmembers} in + drugi %{partners}. + partners_corpmembers: Korporativni člani OSMF + partners_partners: partnerji + tou: Pogoji uporabe + nothing_to_preview: Ničesar ni za predogled. + help: Pomoč + about: O projektu + copyright: Avtorske pravice + communities: Skupnosti + learn_more: Več o tem + more: Več + header: + select_language: Izberite jezik + loading: Nalaganje ... + select_language_button: + title: Izberite jezik offline_flash: osm_offline: Baza OpenStreetMap zaradi izvajanja nujnih vzdrževalnih del trenutno ni dostopna. @@ -3647,19 +3652,44 @@ sl: intro: Ste opazili napako ali pomanjkljivost? Obvestite druge kartografe o tem, da lahko to popravimo. Premaknite označevalec na pravo mesto in vpiÅ¡ite opombo, v kateri pojasnite težavo. + anonymous_warning_html: Niste prijavljeni. Prosimo, %{log_in} ali %{sign_up}, + da boste prejemali posodobitve za svojo opombo in pomagali kartografom pri + njeni reÅ¡itvi. anonymous_warning_log_in: Prijavite se anonymous_warning_sign_up: Registrirajte se + counter_warning_html: Objavili ste že vsaj %{x_anonymous_notes}, kar je odlično + za skupnost, hvala! Zdaj pa vas vabimo, da %{contribute_by_yourself}, kar + ni tako zapleteno, in %{community_can_help}. + x_anonymous_notes: + one: '%{count} anonimno opombo' + two: '%{count} anonimni opombi' + few: '%{count} anonimne opombe' + other: '%{count} anonimnih opomb' + counter_warning_guide_link: + text: prispevate sami + counter_warning_forum_link: + text: skupnost vam lahko pomaga advice: VaÅ¡a opomba je javna in se lahko uporabi za posodobitev zemljevida. Ne vnaÅ¡ajte osebnih podatkov ali podatkov iz avtorsko varovanih zemljevidov ali imenikov. add: Dodaj opombo + new_readonly: + title: Nova opomba + warning: Novih opomb ni mogoče ustvarjati, ker je API OpenStreetMap trenutno + v načinu samo za branje. notes_paging_nav: showing_page: Stran %{page} + next: Naslednja + previous: PrejÅ¡nja + not_found_message: + sorry: 'Žal opombe #%{id} ni bilo mogoče najti.' javascripts: close: Zapri share: title: Deli view_larger_map: Prikaži večji zemljevid + export_failed_title: Izvoz zemljevida ni uspel + filename: zemljevid embed: report_problem: Prijavi težavo legend: @@ -3688,6 +3718,8 @@ sl: transport_map: Prometna karta tracestracktop_topo: Tracestrack Topo hot: Humanitarno + shortbread: Shortbread + openmaptiles_osm: OMT MapTiler layers: header: Sloji zemljevida notes: Opombe na zemljevidu @@ -3705,6 +3737,8 @@ sl: tracestrack_credit: Ploščice z dovoljenjem %{tracestrack_link} hotosm_credit: Slog ploščic %{hotosm_link}, gosti jih %{osm_france_link} hotosm_name: Humanitarna ekipa OpenStreetMap + openmaptiles_credit: Vektorske ploščice iz %{openmaptiles_link}, ki jih gosti + %{maptiler_link} site: edit_tooltip: Urejanje zemljevida edit_disabled_tooltip: Približaj za urejanje zemljevida @@ -3712,14 +3746,23 @@ sl: createnote_disabled_tooltip: Približajte za dodajanje opomb na zemljevid queryfeature_tooltip: Preveri značilnosti queryfeature_disabled_tooltip: Približaj za preverjanje značilnosti + profile: + social_link_n: Povezava do družbenega profila %{n} + remove_social_link_n: Odstranitev povezave do družbenega profila %{n} edit_help: Premaknite zemljevid in približajte lokacijo, ki jo želite urediti, nato pa kliknite tukaj. directions: distance_in_units: m: '%{distance} m' km: '%{distance} km' + ft: '%{distance} ft' + yd: '%{distance} yd' + mi: '%{distance} mi' errors: no_route: Ni mogoče najti poti med tema dvema položajema. + no_place: + title: Iskanje ni uspelo + body: Ni bilo mogoče najti »%{place}«. instructions: continue_without_exit: Nadaljujte po %{name} slight_right_without_exit: Rahlo desno na %{name} @@ -3784,6 +3827,7 @@ sl: roundabout_with_exit_ordinal: V krožišču uporabite %{exit} izhod, da zapeljete na %{name} exit_roundabout: Izstopite iz krožišča na izhodu za %{name} + ferry_without_exit: Vzemite trajekt %{name} unnamed: neimenovano exit_counts: first: "1." @@ -3812,9 +3856,27 @@ sl: show_address: Prikaži naslov query_features: Preveri značilnosti centre_map: Osredini zemljevid tukaj + scroll_to_changeset: Pomaknite se do nabora sprememb + home: + marker_title: Moja domača lokacija + not_set: Domača lokacija za vaÅ¡ račun ni nastavljena + heatmap: + tooltip: + no_contributions: Brez prispevkov dne %{date} + contributions: + one: '%{count} prispeveke %{date}' + two: '%{count} prispevka dne %{date}' + few: '%{count} prispevki dne %{date}' + other: '%{count} prispevkov dne %{date}' + remote_edit: + failed: + title: Urejanje ni uspelo + body: Zagotovite, da je JOSM ali Merkaartor naložen in da je omogočena možnost + oddaljenega upravljanja. edit: id_not_configured: title: iD Å¡e ni konfiguriran + body: Za več informacij glejte CONFIGURE.md redactions: edit: heading: Uredi redakcijo @@ -3823,6 +3885,7 @@ sl: empty: Ni redakcije za pokazati. heading: Seznam redakcij title: Seznam redakcij + new: Nova redakcija new: heading: Vnesite informacije za novo redakcijo title: Ustvarite novo redakcijo diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 7aa856b74..3c6fbaa95 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1366,38 +1366,9 @@ sr: other_label: Друго create: provide_details: Молимо наведите потребне детаље - layouts: - logo: - alt_text: Логотип OpenStreetMap-а - home: Кућа - logout: Одјава - log_in: Пријава - sign_up: Регистрација - start_mapping: Почни са мапирањем - edit: Уреди - history: Историја - export: Извези - issues: Проблеми - gps_traces: ГПС трагови - user_diaries: Дневници корисника - edit_with: Уреди помоћу %{editor} - intro_header: Добро дошли на OpenStreetMap! - intro_text: OpenStreetMap је мапа света коју су направили људи попут вас. Слободна - је за коришћење под отвореном лиценцом. - hosting_partners_2024_html: Хостинг пружају %{fastly}, %{corpmembers}, и други - %{partners}. - partners_partners: партнери - tou: Услови коришћења - nothing_to_preview: Ништа за преглед. - help: Помоћ - about: О нама - copyright: Ауторска права - communities: Заједнице - learn_more: Детаљније - more: Више - select_language_button: - title: Изаберите језик + languages_panes: select_language_list: + search_language: Претрага... languages: gsw: алемански ast: астуријски @@ -1470,6 +1441,39 @@ sr: zh-HK: кинески (Хонгконг) ja: јапански ko: корејски + layouts: + logo: + alt_text: Логотип OpenStreetMap-а + home: Кућа + logout: Одјава + log_in: Пријава + sign_up: Регистрација + start_mapping: Почни са мапирањем + edit: Уреди + history: Историја + export: Извези + issues: Проблеми + gps_traces: ГПС трагови + user_diaries: Дневници корисника + edit_with: Уреди помоћу %{editor} + intro_header: Добро дошли на OpenStreetMap! + intro_text: OpenStreetMap је мапа света коју су направили људи попут вас. Слободна + је за коришћење под отвореном лиценцом. + hosting_partners_2024_html: Хостинг пружају %{fastly}, %{corpmembers}, и други + %{partners}. + partners_partners: партнери + tou: Услови коришћења + nothing_to_preview: Ништа за преглед. + help: Помоћ + about: О нама + copyright: Ауторска права + communities: Заједнице + learn_more: Детаљније + more: Више + header: + loading: Учитавање... + select_language_button: + title: Изаберите језик user_mailer: diary_comment_notification: subject: '%{user} је прокоментарисао дневнички запис' diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 8cd9af0a3..ce62e222f 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -307,7 +307,7 @@ sv: external auth: Extern autentisering contributor_terms: heading: Bidragsgivarvillkor - agreed: Du har godkänt de nya bidragsgivarvillkoren. + agreed: Du godkände bidragsgivarvillkoren den %{date}. agreed_with_pd: Du har ocksÃ¥ förklarat att du anser att dina redigeringar är inom Public Domain. not_agreed_with_pd: Du har inte förklarat att du anser att dina redigeringar diff --git a/config/locales/tr.yml b/config/locales/tr.yml index f5a514a3a..88d64559a 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1822,41 +1822,9 @@ tr: create: successful_report: Raporunuz başarıyla kaydedildi provide_details: Lütfen gerekli bilgileri sağlayın - layouts: - logo: - alt_text: OpenStreetMap logosu - home: Kendi Konumuna Git - logout: Oturumu Kapat - log_in: Oturum Aç - sign_up: Kaydol - start_mapping: Haritacılığa Başla - edit: Düzenle - history: Geçmiş - export: Dışa Aktar - issues: Sorunlar - gps_traces: GPS Ä°zleri - user_diaries: Kullanıcı Günlükleri - edit_with: '%{editor} kullanarak düzenle' - intro_header: OpenStreetMap'e hoş geldiniz! - intro_text: OpenStreetMap, gönüllülerin katkılarıyla hazırlanmış küresel bir dünya - haritasıdır. Açık lisans kapsamında özgürce erişilebilir ve kullanılabilir. - hosting_partners_2024_html: Barındırma hizmetini %{fastly}, %{corpmembers} ve - diğer %{partners} sağlamaktadır. - partners_corpmembers: OSMF kurumsal üyeleri - partners_partners: iş birlikçiler - tou: Kullanım Şartları - nothing_to_preview: Önizlenecek bir şey yok. - help: Yardım - about: Hakkında - copyright: Telif Hakkı - communities: Topluluklar - learn_more: Daha Fazla Bilgi - more: Daha fazla - header: - select_language: Dil seçin - select_language_button: - title: Dil Seçimi + languages_panes: select_language_list: + search_language: Ara... languages: af: Afrikaans gsw: Alemannik @@ -1967,6 +1935,41 @@ tr: zh-HK: Çince (Hong Kong) ja: Japonca ko: Korece + layouts: + logo: + alt_text: OpenStreetMap logosu + home: Kendi Konumuna Git + logout: Oturumu Kapat + log_in: Oturum Aç + sign_up: Kaydol + start_mapping: Haritacılığa Başla + edit: Düzenle + history: Geçmiş + export: Dışa Aktar + issues: Sorunlar + gps_traces: GPS Ä°zleri + user_diaries: Kullanıcı Günlükleri + edit_with: '%{editor} kullanarak düzenle' + intro_header: OpenStreetMap'e hoş geldiniz! + intro_text: OpenStreetMap, gönüllülerin katkılarıyla hazırlanmış küresel bir dünya + haritasıdır. Açık lisans kapsamında özgürce erişilebilir ve kullanılabilir. + hosting_partners_2024_html: Barındırma hizmetini %{fastly}, %{corpmembers} ve + diğer %{partners} sağlamaktadır. + partners_corpmembers: OSMF kurumsal üyeleri + partners_partners: iş birlikçiler + tou: Kullanım Şartları + nothing_to_preview: Önizlenecek bir şey yok. + help: Yardım + about: Hakkında + copyright: Telif Hakkı + communities: Topluluklar + learn_more: Daha Fazla Bilgi + more: Daha fazla + header: + select_language: Dil seçin + loading: Yükleniyor... + select_language_button: + title: Dil Seçimi offline_flash: osm_offline: OpenStreetMap veritabanı şu anda temel bakım çalışmaları yürütüldüğü için çevrimdışıdır. diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 9776448cc..37700a45b 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1884,41 +1884,9 @@ uk: create: successful_report: Вашу скаргу було отримано provide_details: Будь ласка, додайте потрібні деталі - layouts: - logo: - alt_text: Логотип OpenStreetMap - home: Додому - logout: Вийти - log_in: Увійти - sign_up: Реєстрація - start_mapping: Почати мапити - edit: Редагувати - history: Історія - export: Експорт - issues: Звернення - gps_traces: GPS-треки - user_diaries: Щоденники - edit_with: Редагувати – %{editor} - intro_header: Ласкаво просимо до OpenStreetMap! - intro_text: OpenStreetMap — мапа світу, створена такими ж людьми, як і ви, для - вільного використання під відкритою ліцензією. - hosting_partners_2024_html: Хостинг підтримується %{fastly}, %{corpmembers} та - іншими %{partners}. - partners_corpmembers: Корпоративними членами OSMF - partners_partners: партнерами - tou: Умови використання - nothing_to_preview: Нічого немає для перегляду. - help: Довідка - about: Про проєкт - copyright: Авторські права - communities: Спільноти - learn_more: Докладніше - more: Більше - header: - select_language: Обрати мову - select_language_button: - title: Обрати мову + languages_panes: select_language_list: + search_language: Пошук… languages: af: Африкаанс gsw: Алеманська @@ -2029,6 +1997,41 @@ uk: zh-HK: Китайська (Гонконг) ja: Японська ko: Корейська + layouts: + logo: + alt_text: Логотип OpenStreetMap + home: Додому + logout: Вийти + log_in: Увійти + sign_up: Реєстрація + start_mapping: Почати мапити + edit: Редагувати + history: Історія + export: Експорт + issues: Звернення + gps_traces: GPS-треки + user_diaries: Щоденники + edit_with: Редагувати – %{editor} + intro_header: Ласкаво просимо до OpenStreetMap! + intro_text: OpenStreetMap — мапа світу, створена такими ж людьми, як і ви, для + вільного використання під відкритою ліцензією. + hosting_partners_2024_html: Хостинг підтримується %{fastly}, %{corpmembers} та + іншими %{partners}. + partners_corpmembers: Корпоративними членами OSMF + partners_partners: партнерами + tou: Умови використання + nothing_to_preview: Нічого немає для перегляду. + help: Довідка + about: Про проєкт + copyright: Авторські права + communities: Спільноти + learn_more: Докладніше + more: Більше + header: + select_language: Обрати мову + loading: Завантаження… + select_language_button: + title: Обрати мову offline_flash: osm_offline: База даних OpenStreetMap наразі працює в режимі офлайн, поки проводяться роботи з технічного обслуговування. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index e99565812..3bad2a79f 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1675,40 +1675,7 @@ vi: create: successful_report: Lời báo cáo của bạn đã được gá»­i thành công provide_details: Vui lòng cung cấp các chi tiết được yêu cầu - layouts: - logo: - alt_text: Biểu trÆ°ng OpenStreetMap - home: Về Vị trí Nhà ở - logout: Đăng xuất - log_in: Đăng nhập - sign_up: Mở Tài khoản - start_mapping: Bắt đầu Đóng góp - edit: Sá»­a đổi - history: Lịch sá»­ - export: Xuất - issues: Vấn đề - gps_traces: Tuyến GPS - user_diaries: Nhật ký - edit_with: Sá»­a đổi dùng %{editor} - intro_header: Chào mừng đến với OpenStreetMap! - intro_text: OpenStreetMap là bản đồ thế giới do những người nhÆ° bạn xây dá»±ng và - cho phép sá»­ dụng thoải mái theo một giấy phép nguồn mở. - hosting_partners_2024_html: Dịch vụ lÆ°u trữ nhờ sá»± hỗ trợ của %{fastly}, %{corpmembers}, - và %{partners} khác. - partners_corpmembers: các thành viên công ty Quỹ OSM - partners_partners: các công ty bảo trợ - tou: Điều khoản sá»­ dụng - nothing_to_preview: Không có gì để xem trước. - help: Trợ giúp - about: Giới thiệu - copyright: Bản quyền - communities: Cộng đồng - learn_more: Tìm hiểu Thêm - more: Thêm - header: - select_language: Chọn Ngôn ngữ - select_language_button: - title: Chọn Ngôn ngữ + languages_panes: select_language_list: languages: af: Afrikaans @@ -1819,6 +1786,40 @@ vi: zh-HK: Trung (Hồng Kông) ja: Nhật ko: Hàn + layouts: + logo: + alt_text: Biểu trÆ°ng OpenStreetMap + home: Về Vị trí Nhà ở + logout: Đăng xuất + log_in: Đăng nhập + sign_up: Mở Tài khoản + start_mapping: Bắt đầu Đóng góp + edit: Sá»­a đổi + history: Lịch sá»­ + export: Xuất + issues: Vấn đề + gps_traces: Tuyến GPS + user_diaries: Nhật ký + edit_with: Sá»­a đổi dùng %{editor} + intro_header: Chào mừng đến với OpenStreetMap! + intro_text: OpenStreetMap là bản đồ thế giới do những người nhÆ° bạn xây dá»±ng và + cho phép sá»­ dụng thoải mái theo một giấy phép nguồn mở. + hosting_partners_2024_html: Dịch vụ lÆ°u trữ nhờ sá»± hỗ trợ của %{fastly}, %{corpmembers}, + và %{partners} khác. + partners_corpmembers: các thành viên công ty Quỹ OSM + partners_partners: các công ty bảo trợ + tou: Điều khoản sá»­ dụng + nothing_to_preview: Không có gì để xem trước. + help: Trợ giúp + about: Giới thiệu + copyright: Bản quyền + communities: Cộng đồng + learn_more: Tìm hiểu Thêm + more: Thêm + header: + select_language: Chọn Ngôn ngữ + select_language_button: + title: Chọn Ngôn ngữ offline_flash: osm_offline: CÆ¡ sở dữ liệu OpenStreetMap đang ngoại tuyến trong lúc đang thá»±c hiện những công việc bảo quản cÆ¡ sở dữ liệu cần thiết. diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml index 29f5664a7..ad7f31923 100644 --- a/config/locales/xmf.yml +++ b/config/locales/xmf.yml @@ -38,9 +38,16 @@ xmf: update: ბლოკირაფაშ გოახალაფა activerecord: errors: + messages: + display_name_is_user_n: ვეშილებე ორდას user_n, დო n ვა რე თქავანი მახვარებუშ + იდენტიფიკატორი-და models: user_mute: is_already_muted: უკვე აკორანგვილი რე + social_link: + attributes: + url: + http_parse_error: URL იჭყაფუდას ოკო http:// ვარ-და https:// models: acl: ხემეჭირნაფაშ კონტროლიშ ერკებული changeset: თირაფეფიშ პაკეტი @@ -140,15 +147,22 @@ xmf: active: აქტიური display_name: ჯოხო ეკრანს description: პროფილიშ ეჭარუა + company: კომპანია home_lat: განედი home_lon: გრძედი + home_location_name: ჸუდეშ ორენიშ ჯოხოდვალა languages: კორინელი ნინეფი preferred_editor: კორინელი რედაქტორი pass_crypt: პაროლი pass_crypt_confirmation: დადასურით პაროლი help: doorkeeper/application: + confidential: აპლიკაცია გჷმირინაუფუ თექ, სოდე მახვარებუშ ნოფულიშ ჩუალა შილებე + ოფულარონ (დორხველი მობილური აპლიკაციეფი დო ართხასჷლამი აპლიკაციეფი ვა რენა + კონფიდენციალურეფი) redirect_uri: ართი ღოზი ართი URI-შო + trace: + tagstring: კანწიშ უკული user_block: needs_view: ალობა მებჩათ დო ვარი მახვარებუს სისტემაშა გემშაღთასჷნ, სოიშახ ბლოკირაფა მინწყუმუნ? @@ -157,41 +171,41 @@ xmf: datetime: distance_in_words_ago: about_x_hours: - one: დოხ. 1 სათიშ კინოხ + one: დოხ. %{count} სათიშ კინოხ other: დოხ. %{count} სათიშ კინოხ about_x_months: - one: დოხ. 1 თუთაშ კინოხ + one: დოხ. %{count} თუთაშ კინოხ other: დოხ. %{count} თუთაშ კინოხ about_x_years: - one: დოხ. 1 წანაშ კინოხ + one: დოხ. %{count} წანაშ კინოხ other: დოხ. %{count} წანაშ კინოხ almost_x_years: - one: დახე 1 წანაშ კინოხ + one: დახე %{count} წანაშ კინოხ other: დახე %{count} წანაშ კინოხ half_a_minute: გვერდწუთიშ კინოხ less_than_x_seconds: - one: 1 მერკაშ კინოხ + one: '%{count} მერქაშ კინოხ' other: '%{count} მერქაშ კინოხ' less_than_x_minutes: - one: 1 წუთიშ კინოხ + one: '%{count} წუთიშ კინოხ' other: '%{count} წუთიშ კინოხ' over_x_years: - one: 1 წანაშე უმოსიშ კინოხ + one: '%{count} წანაშე უმოსიშ კინოხ' other: '%{count} წანაშე უმოსიშ კინოხ' x_seconds: - one: 1 მერქაშ კინოხ + one: '%{count} მერქაშ კინოხ' other: '%{count} მერქაშ კინოხ' x_minutes: - one: 1 წუთიშ კინოხ + one: '%{count} წუთიშ კინოხ' other: '%{count} წუთიშ კინოხ' x_days: - one: 1 დღაშ კინოხ + one: '%{count} დღაშ კინოხ' other: '%{count} დღაშ კინოხ' x_months: - one: 1 თუთაშ კინოხ + one: '%{count} თუთაშ კინოხ' other: '%{count} თუთაშ კინოხ' x_years: - one: 1 წანაშ კინოხ + one: '%{count} წანაშ კინოხ' other: '%{count} წანაშ კინოხ' editor: default: უზალებუთ (ასე %{name}) @@ -205,6 +219,7 @@ xmf: providers: none: აკა ვარი google: Google + apple: Apple facebook: Facebook github: GitHub wikipedia: ვიკიპედია @@ -238,6 +253,8 @@ xmf: contributor_terms: heading: კათაფაშ პიჯალეფი agreed: თქვა დუთმოჸუნთ კათაფაშ ახალი პიჯალეფს. + terms_of_use: + heading: გჷმორინაფაშ წესეფი save changes button: თირუეფიშ ჩუალა delete_account: ანგარიშიშ ლასუა... go_public: @@ -358,6 +375,12 @@ xmf: telephone_link: რეკუა %{phone_number} colour_preview: ფერი %{colour_value} გიწოთოლორაფა email_link: ელექტრონული ფოშტა %{email} + versions_navigation: + way: ღოზი + relation: ურთიართობა + history: ისტორია + version: 'ვერსია #%{version}' + versions_label: 'ვერსიეფი:' feature_queries: show: title: მუ რე თაქ? @@ -372,8 +395,14 @@ xmf: title_html: 'ღოზიშ ისტორია: %{name}' relation: title_html: 'ურთიართობაშ ისტორია: %{name}' + older_versions: უმოსი ჯვეში ვერსიეფი + newer_versions: უახალაში ვერსიეფი actions: view_redacted_data: რედაქტირებული მუნაჩემეფშა გინოჯინა + view_redaction_message: რედაქტირაფილი გინაფეფიშ ძირაფა + nodes: + not_found_message: + sorry: 'სანარღოთ, ჭურჭულქ #%{id} ვეგორუ.' changeset_comments: feeds: comment: @@ -428,6 +457,7 @@ xmf: contact: km away: თქვანდე %{count}კმ. m away: თქვანდე %{count}მ. + latest_edit_html: 'ბოლო რედაქტირაფა (%{ago}):' no_edits: (რედაქტირაფა ვა რე) view_changeset_details: თირუეფიშ პაკეტიშ კილიშკილი ინფორმაციაშ ძირაფა popup: diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index af85dc9e6..54aea3e1c 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -2073,16 +2073,7 @@ zh-CN: save: 更新首选项 advanced_preferences: show: - title: |- - 我的高级设置 - - 翻译： - - 高级 - 用法说明： - - 参见：模板:Identical/Advanced - 设置 + title: 我的高级偏好设置 save: 更新首选项 profiles: profile_sections: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index a094eac02..fbb75992d 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -70,10 +70,10 @@ zh-TW: diary_comment: create: 評論 diary_entry: - create: 發布 + create: 發佈 update: 更新 issue_comment: - create: 添加評論 + create: 新增評論 message: create: 寄出 oauth2_application: @@ -378,12 +378,12 @@ zh-TW: consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain confirm: 確認 create: - successfully_declared: 你成功宣稱你的貢獻屬於公共領域了。 - already_declared: 你已經宣稱你的貢獻屬於公共領域了。 - did_not_confirm: 你仍未宣稱你的貢獻屬於公共領域。 + successfully_declared: 你已成功宣稱將你的編輯視為是公共領域了。 + already_declared: 你已宣稱將你的編輯視為是公共領域了。 + did_not_confirm: 你尚未宣稱將你的編輯視為是公共領域。 browse: - deleted_ago_by_html: 由 %{user} %{time_ago} 刪除 - edited_ago_by_html: 由 %{user} %{time_ago} 編輯 + deleted_ago_by_html: 由 %{user} 在 %{time_ago} 刪除 + edited_ago_by_html: 由 %{user} 在 %{time_ago} 編輯 version: 版本 redacted_version: 編修版本 in_changeset: 變更集 @@ -391,7 +391,7 @@ zh-TW: no_comment: (沒有評論) part_of: 屬於： part_of_relations: - one: 1 個關聯 + one: '%{count} 個關聯' other: '%{count} 個關聯' part_of_ways: one: '%{count} 條路徑' @@ -406,16 +406,16 @@ zh-TW: nodes: 節點 nodes_count: one: '%{count} 個節點' - other: '%{count} 個節點' + other: '%{count} 個節點' also_part_of_html: - one: 路徑 %{related_ways} 的部份 - other: 路徑 %{related_ways} 的部份 + one: 此路徑 %{related_ways} 的一部份 + other: 此些路徑 %{related_ways} 的一部份 relation: title_html: 關聯：%{name} members: 成員 members_count: - one: '%{count} 名成員' - other: '%{count} 名成員' + one: '%{count}名成員' + other: '%{count}名成員們' relation_member: entry_role_html: '%{type} %{name} 作為 %{role}' type: @@ -486,7 +486,7 @@ zh-TW: newer_versions: 較新版本 actions: view_redacted_data: 查看編修資料 - view_redaction_message: 查看密文訊息 + view_redaction_message: 查看修訂訊息 nodes: not_found_message: sorry: '抱歉，找不到此節點 #%{id}。' @@ -530,21 +530,21 @@ zh-TW: changeset_comments: feeds: comment: - comment: '由 %{author} 對變更集 #%{changeset_id} 發表的新評論' - commented_at_by_html: 於 %{when} 由 %{user} 更新 + comment: '由 %{author} 在變更集 #%{changeset_id} 上發表的新評論' + commented_at_by_html: 由 %{user} 於 %{when} 更新 show: title_all: 開放貼圖變更集討論 title_particular: 開放街圖變更集 %{changeset_id} 討論 timeout: - sorry: 很抱歉，你請求的變更集評論過長無法讀取 + sorry: 很抱歉，你要求的變更評論的清單花費時間過長。 changesets: changeset_line: comments: one: 1 項評論 other: '%{count} 項評論' changes: - one: '%{count} 變更' - other: '%{count} 變更' + one: '%{count} 個變更' + other: '%{count} 個變更' n_elements_created: one: 已建立 %{count} 個元素 other: 已建立 %{count} 個元素 @@ -1751,42 +1751,9 @@ zh-TW: create: successful_report: 已成功登記你的回報 provide_details: 請提供所需的詳情 - layouts: - project_name: - title: OpenStreetMap 開放街圖 - h1: OpenStreetMap 開放街圖 - logo: - alt_text: 開放街圖標誌 - home: 移至家的位置 - logout: 登出 - log_in: 登入 - sign_up: 註冊 - start_mapping: 開始製圖 - edit: 編輯 - history: 歷史 - export: 匯出 - issues: 問題 - gps_traces: GPS 軌跡 - user_diaries: 日記 - edit_with: 以 %{editor} 編輯 - intro_header: 歡迎來到開放街圖！ - intro_text: 開放街圖是一份全世界的地圖，由像你這樣的人們所建立，在開放授權下可以自由使用。 - hosting_partners_2024_html: 由%{fastly}、%{corpmembers}，和其他%{partners}支援代管。 - partners_corpmembers: OSMF 團體成員 - partners_partners: 合作夥伴 - tou: 使用條款 - nothing_to_preview: 無可預覽內容。 - help: 說明 - about: 關於 - copyright: 著作權 - communities: 社群 - learn_more: 瞭解更多 - more: 更多 - header: - select_language: 選擇語言 - select_language_button: - title: 選擇語言 + languages_panes: select_language_list: + search_language: 搜尋… languages: af: 阿非利卡語 gsw: 阿勒曼尼語 @@ -1897,6 +1864,42 @@ zh-TW: zh-HK: 中文（香港） ja: 日語 ko: 韓語 + layouts: + project_name: + title: OpenStreetMap 開放街圖 + h1: OpenStreetMap 開放街圖 + logo: + alt_text: 開放街圖標誌 + home: 移至家的位置 + logout: 登出 + log_in: 登入 + sign_up: 註冊 + start_mapping: 開始製圖 + edit: 編輯 + history: 歷史 + export: 匯出 + issues: 問題 + gps_traces: GPS 軌跡 + user_diaries: 日記 + edit_with: 以 %{editor} 編輯 + intro_header: 歡迎來到開放街圖！ + intro_text: 開放街圖是一份全世界的地圖，由像你這樣的人們所建立，在開放授權下可以自由使用。 + hosting_partners_2024_html: 由%{fastly}、%{corpmembers}，和其他%{partners}支援代管。 + partners_corpmembers: OSMF 團體成員 + partners_partners: 合作夥伴 + tou: 使用條款 + nothing_to_preview: 無可預覽內容。 + help: 說明 + about: 關於 + copyright: 著作權 + communities: 社群 + learn_more: 瞭解更多 + more: 更多 + header: + select_language: 選擇語言 + loading: 載入中… + select_language_button: + title: 選擇語言 offline_flash: osm_offline: 開放街圖資料庫目前已離線，正在進行必要的維護工作。 osm_read_only: 開放街圖資料庫目前處於唯讀模式，正在進行必要的維護工作。 -- 2.39.5 From a6c39ecd51d74993fb85ff4475cef93cc8f2789a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 30 Sep 2025 18:08:13 +0100 Subject: [PATCH 02/16] Update bundle --- Gemfile.lock | 338 ++++++++++++++++++++++----------------------------- 1 file changed, 145 insertions(+), 193 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 74ca75f11..90281b8b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,8 +107,8 @@ GEM autoprefixer-rails (10.4.21.0) execjs (~> 2) aws-eventstream (1.4.0) - aws-partitions (1.1163.0) - aws-sdk-core (3.232.0) + aws-partitions (1.1167.0) + aws-sdk-core (3.233.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) @@ -116,10 +116,10 @@ GEM bigdecimal jmespath (~> 1, >= 1.6.1) logger - aws-sdk-kms (1.112.0) + aws-sdk-kms (1.113.0) aws-sdk-core (~> 3, >= 3.231.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.199.0) + aws-sdk-s3 (1.199.1) aws-sdk-core (~> 3, >= 3.231.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -285,7 +285,7 @@ GEM factory_bot_rails (6.5.1) factory_bot (~> 6.5) railties (>= 6.1.0) - faraday (2.13.4) + faraday (2.14.0) faraday-net_http (>= 2.0, < 3.5) json logger @@ -310,7 +310,7 @@ GEM process_executer (~> 1.1) rchardet (~> 1.8) glob (0.4.1) - globalid (1.2.1) + globalid (1.3.0) activesupport (>= 6.1) google-protobuf (3.25.8) googleapis-common-protos-types (1.20.0) @@ -484,7 +484,7 @@ GEM omniauth (~> 2.0) open4 (1.3.4) openstreetmap-deadlock_retry (1.3.1) - opentelemetry-api (1.6.0) + opentelemetry-api (1.7.0) opentelemetry-common (0.22.0) opentelemetry-api (~> 1.0) opentelemetry-exporter-otlp (0.30.0) @@ -494,215 +494,167 @@ GEM opentelemetry-common (~> 0.20) opentelemetry-sdk (~> 1.2) opentelemetry-semantic_conventions - opentelemetry-helpers-mysql (0.2.0) - opentelemetry-api (~> 1.0) + opentelemetry-helpers-mysql (0.3.0) + opentelemetry-api (~> 1.7) opentelemetry-common (~> 0.21) - opentelemetry-helpers-sql (0.1.1) - opentelemetry-api (~> 1.0) + opentelemetry-helpers-sql (0.2.0) + opentelemetry-api (~> 1.7) opentelemetry-helpers-sql-obfuscation (0.3.0) opentelemetry-common (~> 0.21) - opentelemetry-instrumentation-action_mailer (0.4.0) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_mailer (0.5.0) opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-action_pack (0.13.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) + opentelemetry-instrumentation-action_pack (0.14.0) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-action_view (0.9.0) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_view (0.10.0) opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_job (0.8.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_model_serializers (0.22.0) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_job (0.9.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-active_model_serializers (0.23.0) opentelemetry-instrumentation-active_support (>= 0.7.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_record (0.9.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_storage (0.1.1) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_record (0.10.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-active_storage (0.2.0) opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-active_support (0.8.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-all (0.80.0) - opentelemetry-instrumentation-active_model_serializers (~> 0.22.0) - opentelemetry-instrumentation-aws_lambda (~> 0.3.0) - opentelemetry-instrumentation-aws_sdk (~> 0.8.0) - opentelemetry-instrumentation-bunny (~> 0.22.0) - opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0) - opentelemetry-instrumentation-dalli (~> 0.27.0) - opentelemetry-instrumentation-delayed_job (~> 0.23.0) - opentelemetry-instrumentation-ethon (~> 0.23.0) - opentelemetry-instrumentation-excon (~> 0.24.0) - opentelemetry-instrumentation-faraday (~> 0.28.0) - opentelemetry-instrumentation-grape (~> 0.3.0) - opentelemetry-instrumentation-graphql (~> 0.29.0) - opentelemetry-instrumentation-grpc (~> 0.2.0) - opentelemetry-instrumentation-gruf (~> 0.3.0) - opentelemetry-instrumentation-http (~> 0.25.0) - opentelemetry-instrumentation-http_client (~> 0.24.0) - opentelemetry-instrumentation-httpx (~> 0.3.0) - opentelemetry-instrumentation-koala (~> 0.21.0) - opentelemetry-instrumentation-lmdb (~> 0.23.0) - opentelemetry-instrumentation-mongo (~> 0.23.0) - opentelemetry-instrumentation-mysql2 (~> 0.29.0) - opentelemetry-instrumentation-net_http (~> 0.23.0) - opentelemetry-instrumentation-pg (~> 0.30.0) - opentelemetry-instrumentation-que (~> 0.9.0) - opentelemetry-instrumentation-racecar (~> 0.4.0) - opentelemetry-instrumentation-rack (~> 0.27.0) - opentelemetry-instrumentation-rails (~> 0.37.0) - opentelemetry-instrumentation-rake (~> 0.3.1) - opentelemetry-instrumentation-rdkafka (~> 0.7.0) - opentelemetry-instrumentation-redis (~> 0.26.1) - opentelemetry-instrumentation-resque (~> 0.6.0) - opentelemetry-instrumentation-restclient (~> 0.24.0) - opentelemetry-instrumentation-ruby_kafka (~> 0.22.0) - opentelemetry-instrumentation-sidekiq (~> 0.26.0) - opentelemetry-instrumentation-sinatra (~> 0.26.0) - opentelemetry-instrumentation-trilogy (~> 0.61.0) - opentelemetry-instrumentation-aws_lambda (0.3.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-aws_sdk (0.8.2) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) + opentelemetry-instrumentation-active_support (0.9.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-all (0.84.0) + opentelemetry-instrumentation-active_model_serializers (~> 0.23.0) + opentelemetry-instrumentation-anthropic (~> 0.2.0) + opentelemetry-instrumentation-aws_lambda (~> 0.5.0) + opentelemetry-instrumentation-aws_sdk (~> 0.9.0) + opentelemetry-instrumentation-bunny (~> 0.23.0) + opentelemetry-instrumentation-concurrent_ruby (~> 0.23.0) + opentelemetry-instrumentation-dalli (~> 0.28.0) + opentelemetry-instrumentation-delayed_job (~> 0.24.0) + opentelemetry-instrumentation-ethon (~> 0.24.0) + opentelemetry-instrumentation-excon (~> 0.25.0) + opentelemetry-instrumentation-faraday (~> 0.29.0) + opentelemetry-instrumentation-grape (~> 0.4.0) + opentelemetry-instrumentation-graphql (~> 0.30.0) + opentelemetry-instrumentation-grpc (~> 0.3.0) + opentelemetry-instrumentation-gruf (~> 0.4.0) + opentelemetry-instrumentation-http (~> 0.26.0) + opentelemetry-instrumentation-http_client (~> 0.25.0) + opentelemetry-instrumentation-httpx (~> 0.4.0) + opentelemetry-instrumentation-koala (~> 0.22.0) + opentelemetry-instrumentation-lmdb (~> 0.24.0) + opentelemetry-instrumentation-mongo (~> 0.24.0) + opentelemetry-instrumentation-mysql2 (~> 0.30.0) + opentelemetry-instrumentation-net_http (~> 0.25.0) + opentelemetry-instrumentation-pg (~> 0.31.0) + opentelemetry-instrumentation-que (~> 0.10.0) + opentelemetry-instrumentation-racecar (~> 0.5.0) + opentelemetry-instrumentation-rack (~> 0.28.0) + opentelemetry-instrumentation-rails (~> 0.38.0) + opentelemetry-instrumentation-rake (~> 0.4.0) + opentelemetry-instrumentation-rdkafka (~> 0.8.0) + opentelemetry-instrumentation-redis (~> 0.27.0) + opentelemetry-instrumentation-resque (~> 0.7.0) + opentelemetry-instrumentation-restclient (~> 0.25.0) + opentelemetry-instrumentation-ruby_kafka (~> 0.23.0) + opentelemetry-instrumentation-sidekiq (~> 0.27.0) + opentelemetry-instrumentation-sinatra (~> 0.27.0) + opentelemetry-instrumentation-trilogy (~> 0.63.0) + opentelemetry-instrumentation-anthropic (0.2.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-aws_lambda (0.5.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-aws_sdk (0.9.0) + opentelemetry-instrumentation-base (~> 0.23) opentelemetry-instrumentation-base (0.23.0) opentelemetry-api (~> 1.0) opentelemetry-common (~> 0.21) opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-bunny (0.22.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (0.22.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-dalli (0.27.3) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-delayed_job (0.23.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-ethon (0.23.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-excon (0.24.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-faraday (0.28.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-grape (0.3.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) + opentelemetry-instrumentation-bunny (0.23.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-concurrent_ruby (0.23.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-dalli (0.28.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-delayed_job (0.24.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-ethon (0.24.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-excon (0.25.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-faraday (0.29.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-grape (0.4.0) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-graphql (0.29.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-grpc (0.2.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-gruf (0.3.0) - opentelemetry-api (>= 1.0.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-http (0.25.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-http_client (0.24.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-httpx (0.3.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-koala (0.21.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-lmdb (0.23.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-mongo (0.23.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-mysql2 (0.29.1) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-graphql (0.30.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-grpc (0.3.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-gruf (0.4.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-http (0.26.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-http_client (0.25.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-httpx (0.4.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-koala (0.22.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-lmdb (0.24.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-mongo (0.24.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-mysql2 (0.30.0) opentelemetry-helpers-mysql opentelemetry-helpers-sql opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-net_http (0.23.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-pg (0.30.1) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-net_http (0.25.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-pg (0.31.0) opentelemetry-helpers-sql opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-que (0.9.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-racecar (0.4.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-rack (0.27.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-rails (0.37.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-action_mailer (~> 0.4.0) - opentelemetry-instrumentation-action_pack (~> 0.13.0) - opentelemetry-instrumentation-action_view (~> 0.9.0) - opentelemetry-instrumentation-active_job (~> 0.8.0) - opentelemetry-instrumentation-active_record (~> 0.9.0) - opentelemetry-instrumentation-active_storage (~> 0.1.0) - opentelemetry-instrumentation-active_support (~> 0.8.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0) - opentelemetry-instrumentation-rake (0.3.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-rdkafka (0.7.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-redis (0.26.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-resque (0.6.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-restclient (0.24.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-ruby_kafka (0.22.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-sidekiq (0.26.1) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) - opentelemetry-instrumentation-sinatra (0.26.0) - opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-base (~> 0.23.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-que (0.10.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-racecar (0.5.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-rack (0.28.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-rails (0.38.0) + opentelemetry-instrumentation-action_mailer (~> 0.4) + opentelemetry-instrumentation-action_pack (~> 0.13) + opentelemetry-instrumentation-action_view (~> 0.9) + opentelemetry-instrumentation-active_job (~> 0.8) + opentelemetry-instrumentation-active_record (~> 0.9) + opentelemetry-instrumentation-active_storage (~> 0.1) + opentelemetry-instrumentation-active_support (~> 0.8) + opentelemetry-instrumentation-concurrent_ruby (~> 0.22) + opentelemetry-instrumentation-rake (0.4.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-rdkafka (0.8.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-redis (0.27.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-resque (0.7.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-restclient (0.25.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-ruby_kafka (0.23.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-sidekiq (0.27.0) + opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-sinatra (0.27.0) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-trilogy (0.61.1) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-trilogy (0.63.0) opentelemetry-helpers-mysql opentelemetry-helpers-sql opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.23.0) + opentelemetry-instrumentation-base (~> 0.23) opentelemetry-semantic_conventions (>= 1.8.0) opentelemetry-registry (0.4.0) opentelemetry-api (~> 1.1) - opentelemetry-sdk (1.8.1) + opentelemetry-sdk (1.9.0) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) opentelemetry-semantic_conventions - opentelemetry-semantic_conventions (1.11.0) + opentelemetry-semantic_conventions (1.36.0) opentelemetry-api (~> 1.0) ostruct (0.6.3) overcommit (0.68.0) @@ -801,10 +753,10 @@ GEM rexml (3.4.4) rinku (2.0.6) rotp (6.3.0) - rouge (4.6.0) + rouge (4.6.1) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.80.2) + rubocop (1.81.1) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -812,7 +764,7 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) rubocop-ast (1.47.1) @@ -832,7 +784,7 @@ GEM lint_roller (~> 1.1) rubocop (>= 1.75.0, < 2.0) rubocop-ast (>= 1.44.0, < 2.0) - rubocop-rails (2.33.3) + rubocop-rails (2.33.4) activesupport (>= 4.2.0) lint_roller (~> 1.1) rack (>= 1.1) @@ -845,7 +797,7 @@ GEM ruby-vips (2.2.5) ffi (~> 1.12) logger - rubyzip (3.1.0) + rubyzip (3.1.1) sanitize (7.0.0) crass (~> 1.0.2) nokogiri (>= 1.16.8) @@ -900,7 +852,7 @@ GEM tilt (2.6.1) timeout (0.4.3) tsort (0.2.0) - turbo-rails (2.0.16) + turbo-rails (2.0.17) actionpack (>= 7.1.0) railties (>= 7.1.0) tzinfo (2.0.6) -- 2.39.5 From 1105be2f2a5a2a4c0a84596252f4b4c998f086a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 23:01:23 +0000 Subject: [PATCH 03/16] Bump maplibre-gl from 5.7.3 to 5.8.0 Bumps [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) from 5.7.3 to 5.8.0. - [Release notes](https://github.com/maplibre/maplibre-gl-js/releases) - [Changelog](https://github.com/maplibre/maplibre-gl-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/maplibre/maplibre-gl-js/compare/v5.7.3...v5.8.0) --- updated-dependencies: - dependency-name: maplibre-gl dependency-version: 5.8.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index ab6ad2a4b..960d94483 100644 --- a/yarn.lock +++ b/yarn.lock @@ -153,10 +153,10 @@ resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-leaflet/-/maplibre-gl-leaflet-0.1.3.tgz#ad132c4ca406d5fdbbb9d67a7114d05539e1ee52" integrity sha512-9+hp1PSJcxuuj5/Zta9zbQ8+ZvN4doWXPtlY7ikNtUZY1VbkamY0uTqzHp9kxRPqpgeKGrI7MjzXvwzU88wWCw== -"@maplibre/maplibre-gl-style-spec@^24.1.1": - version "24.1.1" - resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-24.1.1.tgz#b061e021b6e19f1baa087074240124288e64544e" - integrity sha512-xErR4lvMdzPNTxmglGEhSZxeyG55OusHjGhcPSrdZUnskBMPliVBQBxuzevmkQkb8gnl/UGDCYR+Byy3rkAgYQ== +"@maplibre/maplibre-gl-style-spec@^24.2.0": + version "24.2.0" + resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-24.2.0.tgz#6d82ff1984a3f7ca8d66a744283e0ccbf6cb3ac3" + integrity sha512-cE80g83fRcBbZbQC70siOUxUK6YJ/5ZkClDZbmm+hzrUbv+J6yntkMmcpdz9DbOrWOM7FHKR5rruc6Q/hWx5cA== dependencies: "@mapbox/jsonlint-lines-primitives" "~2.0.2" "@mapbox/unitbezier" "^0.0.1" @@ -671,9 +671,9 @@ make-plural@*, make-plural@^7.4.0: integrity sha512-4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg== maplibre-gl@^5.6.0: - version "5.7.3" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.7.3.tgz#95a61ca62d81e8abe4b5880b45913518f98d3455" - integrity sha512-T6XsjwcSfOr0vtAt4GTzx4m/vD6nrbR0+61MgMzZ9REQwILSEnhqwNpFuFbDedX6LC3ZWjZWnxN7fN/I66WoDQ== + version "5.8.0" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.8.0.tgz#1edcfef5fbda9c9aedfbaee6649afe598caf3ef4" + integrity sha512-zLblPFK+z5sxeitDF8RL2cnqfRaivNwxbGoQMfwAm9st6d1lRGTxgI7NNNr/U1AEPkp5+X+wjROagiHvJD8aqg== dependencies: "@mapbox/geojson-rewind" "^0.5.2" "@mapbox/jsonlint-lines-primitives" "^2.0.2" @@ -682,7 +682,7 @@ maplibre-gl@^5.6.0: "@mapbox/unitbezier" "^0.0.1" "@mapbox/vector-tile" "^2.0.4" "@mapbox/whoots-js" "^3.1.0" - "@maplibre/maplibre-gl-style-spec" "^24.1.1" + "@maplibre/maplibre-gl-style-spec" "^24.2.0" "@maplibre/vt-pbf" "^4.0.3" "@types/geojson" "^7946.0.16" "@types/geojson-vt" "3.2.5" -- 2.39.5 From 3ee0b0cdef2fb19fd8d744906e32d790c07cb3e9 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 2 Oct 2025 14:21:38 +0200 Subject: [PATCH 04/16] Localisation updates from https://translatewiki.net. --- config/locales/br.yml | 2 +- config/locales/de.yml | 5 ++ config/locales/es.yml | 118 +++++++++++++++++++++++++++++++++++- config/locales/fi.yml | 31 ++++++++++ config/locales/he.yml | 2 +- config/locales/hr.yml | 2 +- config/locales/ia.yml | 2 + config/locales/skr-arab.yml | 1 + config/locales/sl.yml | 4 +- config/locales/zh-CN.yml | 10 +++ 10 files changed, 170 insertions(+), 7 deletions(-) diff --git a/config/locales/br.yml b/config/locales/br.yml index 445e53653..853c6f9c6 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -3310,7 +3310,7 @@ br: title: Klask c'hwitet body: N'haller ket kavout "%{place}". instructions: - continue_without_exit: Kenderc'hel war%{name} + continue_without_exit: Kenderc'hel war %{name} slight_right_without_exit: Troit un tammig a-zehoù war %{name} offramp_right: Kemer ar vretell dehou offramp_right_with_exit: Troit a-zehou %{exit} war ar vretell diff --git a/config/locales/de.yml b/config/locales/de.yml index 846be1235..2ff09febc 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -405,6 +405,7 @@ de: only_public_can_edit: Seit der API-Version 0.6 können nur öffentliche Mitglieder Kartendaten bearbeiten. find_out_why: finde heraus wieso + find_out_why_url: https://wiki.openstreetmap.org/wiki/DE:Anonymes_editieren email_not_revealed: Deine E-Mail-Adresse wird durch die Veröffentlichung nicht preisgegeben. not_reversible: Dies kann nicht rückgängig gemacht werden und alle neuen Mitglieder @@ -2968,7 +2969,9 @@ de: OpenStreetMap hat nur wenige formale Regeln, aber wir erwarten von allen Teilnehmern, dass sie mit der Community zusammenarbeiten und kommunizieren. Wenn du andere Aktivitäten als die manuelle Bearbeitung in Betracht ziehst, lies und befolge bitte die Richtlinien zu %{imports_link} und %{automated_edits_link}. imports: Importe + imports_url: https://wiki.openstreetmap.org/wiki/DE:Import/Guidelines automated_edits: Automatisierte Bearbeitungen + automated_edits_url: https://wiki.openstreetmap.org/wiki/DE:Automated_Edits_code_of_conduct start_mapping: Beginne mit dem Bearbeiten der Karte continue_authorization: Autorisierung fortsetzen add_a_note: @@ -3002,6 +3005,7 @@ de: Es besteht keine Notwendigkeit, eine Gruppe im gleichen Umfang wie die Local Chapters offiziell zu gründen. Tatsächlich existieren viele Gruppen sehr erfolgreich als informelle Zusammenkunft von Menschen oder als Community-Gruppe. Jeder kann diese gründen oder beitreten. Lies mehr im %{communities_wiki_link}. communities_wiki: Community-Wiki-Seite + communities_wiki_url: https://wiki.openstreetmap.org/wiki/DE:User_group social_links: show: website: Website @@ -3203,6 +3207,7 @@ de: %{wiki_link}.' upload_new: Einen neuen Track hochladen wiki_page: Wiki-Seite + wiki_page_url: https://wiki.openstreetmap.org/wiki/DE:Beginners_Guide_1.2 upload_trace: Lade einen Track hoch all_traces: Alle Tracks my_traces: Meine Tracks diff --git a/config/locales/es.yml b/config/locales/es.yml index 0b8f32747..89713ba65 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1908,6 +1908,119 @@ es: create: successful_report: Tu denuncia ha sido registrada con éxito provide_details: Proporcione los detalles requeridos + languages_panes: + select_language_list: + search_language: Buscar... + languages: + af: africaans + gsw: alemánico + frp: arpitano + ast: asturiano + az: azerí + id: indonesio + ms: malayo + bs: bosnio + br: bretón + ca: catalán + cs: checo + cy: galés + da: danés + de: alemán + dsb: bajo sorabo + et: estonio + en: inglés + en-GB: inglés (Reino Unido) + es: español + eo: esperanto + eu: vasco + fr: francés + fy: frisón occidental + fur: friulano + ga: irlandés + gd: gaélico escocés + gl: gallego + aln: albanés gheg + hsb: alto sorabo + hr: croata + ia: interlingua + is: islandés + it: italiano + gcf: criollo guadalupeño + ku-Latn: kurdo (latín) + lv: letón + lb: luxemburgués + lt: lituano + hu: húngaro + fit: finés tornedaliano + nl: neerlandés + nb: noruego bokmÃ¥l + nn: noruego nynorsk + oc: occitano + nds: bajo alemán + pl: polaco + pt-PT: portugués + pt: portugués (Brasil) + ksh: kölsch + ro: rumano + sc: sardo + sco: escocés + sq: albanés + scn: siciliano + sk: eslovaco + sl: esloveno + sr-Latn: serbio (latín) + sh: serbocroata (latín) + fi: finés + sv: sueco + tl: tagalo + kab: cabilio + vi: vietnamita + tr: turco + yo: yoruba + diq: dimli + el: griego + ba: baskir + be: bielorruso + be-Tarask: bielorruso (TaraÅ¡k.) + bg: búlgaro + mk: macedonio + mo: moldavo + ce: checheno + ru: ruso + sr: serbio (cirílico) + tt: tártaro (cirílico) + uk: ucraniano + kk-cyrl: kazajo (cirílico) + yi: yidis + he: hebreo + ar: árabe + skr-arab: saraiki + fa: persa + arz: árabe egipcio + pnb: punyabí occidental + ps: pastún + nqo: N'Ko + ne: nepalí + mr: marati + hi: hindi + bn: bengalí + pa: punyabí + gu: guyaratí + ta: tamil + te: télugu + kn: canarés + th: tailandés + my: birmano + shn: shan + xmf: mingreliano + ka: georgiano + km: jemer + sat: santalí + zh-CN: chino (simplificado) + zh-TW: chino (tradicional) + zh-HK: chino (Hong Kong) + ja: japonés + ko: coreano layouts: project_name: title: OpenStreetMap @@ -1944,6 +2057,7 @@ es: more: Más header: select_language: Seleccionar idioma + loading: Cargando... select_language_button: title: Seleccionar idioma offline_flash: @@ -3622,8 +3736,8 @@ es: last_changed: Última modificación apply: Aplicar all: Todas - open: Abierta - closed: Cerrada + open: No resueltas + closed: Resueltas hidden: Oculto status: Estado show: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 627085a32..1327b527f 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -474,6 +474,10 @@ fi: telephone_link: Soita %{phone_number} colour_preview: Värin %{colour_value} esikatselu email_link: Sähköposti %{email} + versions_navigation: + history: Historia + version: 'Versio #%{version}' + versions_label: 'Versiot:' feature_queries: show: title: Ominaisuuskysely @@ -1941,22 +1945,32 @@ fi: profiles: profile_sections: navigation: + description: Kuvaus + links: Linkit image: Kuva company: Yritys + location: Sijainti descriptions: show: title: Muokkaa profiilia save: Päivitä profiili cancel: Peruuta + update: + failure: Profiilin kuvauksen päivittäminen epäonnistui. links: show: title: Muokkaa profiilia + save: Päivitä profiili + cancel: Peruuta social_links: title: Sosiaalisen median profiililinkit remove: Poista add: Lisää sosiaalisen median linkki + update: + failure: Profiilin linkkien päivittäminen epäonnistui. images: show: + save: Päivitä profiili gravatar: gravatar: Käytä Gravataria what_is_gravatar: Mikä on Gravatar? @@ -1966,13 +1980,24 @@ fi: replace image: Korvaa nykyinen kuva image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään 100x100) + update: + failure: Profiilin kuvan päivittäminen epäonnistui. + companies: + show: + save: Päivitä profiili + update: + failure: Profiilin yrityksen päivittäminen epäonnistui. locations: show: + save: Päivitä profiili + cancel: Peruuta no home location: Kotipaikkaa ei ole vielä määritetty. update home location on click: Päivitä kotipaikka karttaa napsauttaessa show: Näytä delete: Poista undelete: Peruuta poistaminen + update: + failure: Profiilin sijainnin päivittäminen epäonnistui. sessions: new: tab_title: Kirjaudu @@ -2815,6 +2840,12 @@ fi: delete_user: Poista tämä käyttäjä confirm: Vahvista report: Ilmianna käyttäjä + edit_profile_details: Muokkaa profiilin tietoja + edit_description: Muokkaa kuvausta + edit_links: Muokkaa linkkejä + change_image: Vaihda kuvaa + edit_company: Muokkaa yritystä + edit_location: Muokkaa sijaintia contributions: one: '%{count} muokkaus viimeisen vuoden aikana' other: '%{count} muokkausta viimeisen vuoden aikana' diff --git a/config/locales/he.yml b/config/locales/he.yml index 56ba2be90..a7d15c364 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1851,7 +1851,7 @@ he: yi: יידיש he: עברית ar: ערבית - skr-arab: סראיקית (ערבית) + skr-arab: סראיקית fa: פרסית arz: ערבית מצרית pnb: פנג׳בית מערבית diff --git a/config/locales/hr.yml b/config/locales/hr.yml index f059667d9..886f601a4 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -1420,7 +1420,7 @@ hr: "yes": Mjesto railway: abandoned: NapuÅ¡tena pruga - buffer_stop: Buffer stop + buffer_stop: Odbojnik construction: Pruga u izgradnji disused: NapuÅ¡tena pruga funicular: Uspinjača diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 14b641ef5..706119735 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1788,6 +1788,7 @@ ia: provide_details: Per favor, forni le detalios necessari languages_panes: select_language_list: + search_language: Cercar… languages: af: Afrikaans gsw: Alemannico @@ -1930,6 +1931,7 @@ ia: more: Plus header: select_language: Selige lingua + loading: Cargamento in curso… select_language_button: title: Selige lingua offline_flash: diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml index d68b8acbf..82518e07d 100644 --- a/config/locales/skr-arab.yml +++ b/config/locales/skr-arab.yml @@ -1770,6 +1770,7 @@ skr-arab: provide_details: مہربانی کر کے مطلوبہ تفصیلات ݙیوو languages_panes: select_language_list: + search_language: ڳولو۔۔۔ languages: gsw: المانی ast: آسٹری diff --git a/config/locales/sl.yml b/config/locales/sl.yml index f6ef422d7..9e1f9a592 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -328,8 +328,8 @@ sl: find_out_why: ugotovite, zakaj email_not_revealed: VaÅ¡ e-poÅ¡tni naslov ne bo razkrit, ko bo vaÅ¡ račun postal javen. - not_reversible: Tega dejanja ni mogoče razveljaviti, vsi novi uporabniki pa - so zdaj privzeto javni. + not_reversible: Tega dejanja ni mogoče razveljaviti, vsi novi uporabniki so + zdaj privzeto javni. make_edits_public_button: Naj bodo vsi moji prispevki javni update: success_confirm_needed: Podatki o uporabniku so bili uspeÅ¡no posodobljeni. Preverite diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 54aea3e1c..de8d129d1 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -314,6 +314,7 @@ zh-CN: none: 无 openid: 开放式身份验证(OpenID) google: 谷歌 + apple: Apple facebook: 脸书 microsoft: 微软 github: GitHub @@ -1786,6 +1787,14 @@ zh-CN: create: successful_report: 您的举报已成功提交 provide_details: 请提供所需详情 + languages_panes: + select_language_list: + languages: + zh-CN: 简体中文 + zh-TW: 繁体中文 + zh-HK: 中文（香港） + ja: 日语 + ko: 韩语 layouts: logo: alt_text: OpenStreetMap 标志 @@ -1816,6 +1825,7 @@ zh-CN: more: 更多 header: select_language: 选择语言 + loading: 加载中... select_language_button: title: 选择语言 offline_flash: -- 2.39.5 From 4191555f2846ac6e6f353b29c7d48f9ef9261efb Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 2 Oct 2025 17:46:54 +0100 Subject: [PATCH 05/16] Switch back to using a released version of active_record_union --- Gemfile | 2 +- Gemfile.lock | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 029927e4b..57343c52d 100644 --- a/Gemfile +++ b/Gemfile @@ -47,7 +47,7 @@ gem "sprockets-exporters_pack" # Load rails plugins gem "actionpack-page_caching", ">= 1.2.0" gem "activerecord-import" -gem "active_record_union", :github => "brianhempel/active_record_union", :ref => "master" +gem "active_record_union" gem "bootstrap", "~> 5.3.2" gem "bootstrap_form", "~> 5.0" gem "cancancan" diff --git a/Gemfile.lock b/Gemfile.lock index 90281b8b3..b92722a4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: https://github.com/brianhempel/active_record_union.git - revision: 8ebe558709aabe039abd24e3e7dd4d4354a6de88 - ref: master - specs: - active_record_union (1.3.0) - activerecord (>= 6.0) - GIT remote: https://github.com/rkoeze/gd2-ffij.git revision: a203a8d5ef004a4198950e86329228fe3f331d06 @@ -64,6 +56,8 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + active_record_union (1.4.0) + activerecord (>= 6.0) activejob (8.0.3) activesupport (= 8.0.3) globalid (>= 0.3.6) @@ -887,7 +881,7 @@ PLATFORMS DEPENDENCIES aasm actionpack-page_caching (>= 1.2.0) - active_record_union! + active_record_union activerecord-import addressable (~> 2.8) annotaterb -- 2.39.5 From 63db7e9b3bf360a5e5f9284e1597f969268558f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Oct 2025 23:01:14 +0000 Subject: [PATCH 06/16] Bump eslint from 9.36.0 to 9.37.0 Bumps [eslint](https://github.com/eslint/eslint) from 9.36.0 to 9.37.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Commits](https://github.com/eslint/eslint/compare/v9.36.0...v9.37.0) --- updated-dependencies: - dependency-name: eslint dependency-version: 9.37.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/yarn.lock b/yarn.lock index 960d94483..6a5776ff8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,15 +28,17 @@ debug "^4.3.1" minimatch "^3.1.2" -"@eslint/config-helpers@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.3.1.tgz#d316e47905bd0a1a931fa50e669b9af4104d1617" - integrity sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA== +"@eslint/config-helpers@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.4.0.tgz#e9f94ba3b5b875e32205cb83fece18e64486e9e6" + integrity sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog== + dependencies: + "@eslint/core" "^0.16.0" -"@eslint/core@^0.15.2": - version "0.15.2" - resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.15.2.tgz#59386327d7862cc3603ebc7c78159d2dcc4a868f" - integrity sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg== +"@eslint/core@^0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.16.0.tgz#490254f275ba9667ddbab344f4f0a6b7a7bd7209" + integrity sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q== dependencies: "@types/json-schema" "^7.0.15" @@ -55,22 +57,22 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.36.0": - version "9.36.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.36.0.tgz#b1a3893dd6ce2defed5fd49de805ba40368e8fef" - integrity sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw== +"@eslint/js@9.37.0": + version "9.37.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.37.0.tgz#0cfd5aa763fe5d1ee60bedf84cd14f54bcf9e21b" + integrity sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg== "@eslint/object-schema@^2.1.6": version "2.1.6" resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.6.tgz#58369ab5b5b3ca117880c0f6c0b0f32f6950f24f" integrity sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA== -"@eslint/plugin-kit@^0.3.5": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz#fd8764f0ee79c8ddab4da65460c641cefee017c5" - integrity sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w== +"@eslint/plugin-kit@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz#f6a245b42886abf6fc9c7ab7744a932250335ab2" + integrity sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A== dependencies: - "@eslint/core" "^0.15.2" + "@eslint/core" "^0.16.0" levn "^0.4.1" "@humanfs/core@^0.19.1": @@ -394,18 +396,18 @@ eslint-visitor-keys@^4.2.1: integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ== eslint@^9.0.0: - version "9.36.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.36.0.tgz#9cc5cbbfb9c01070425d9bfed81b4e79a1c09088" - integrity sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ== + version "9.37.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.37.0.tgz#ac0222127f76b09c0db63036f4fe289562072d74" + integrity sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig== dependencies: "@eslint-community/eslint-utils" "^4.8.0" "@eslint-community/regexpp" "^4.12.1" "@eslint/config-array" "^0.21.0" - "@eslint/config-helpers" "^0.3.1" - "@eslint/core" "^0.15.2" + "@eslint/config-helpers" "^0.4.0" + "@eslint/core" "^0.16.0" "@eslint/eslintrc" "^3.3.1" - "@eslint/js" "9.36.0" - "@eslint/plugin-kit" "^0.3.5" + "@eslint/js" "9.37.0" + "@eslint/plugin-kit" "^0.4.0" "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1" "@humanwhocodes/retry" "^0.4.2" -- 2.39.5 From 3f94e31dbe5e9ef81ae7b694ff57f1ab2c872494 Mon Sep 17 00:00:00 2001 From: ENT8R Date: Sun, 5 Oct 2025 20:29:46 +0200 Subject: [PATCH 07/16] Include preferred_username claim in OIDC ID token --- config/initializers/doorkeeper_openid_connect.rb | 2 +- test/integration/oauth2_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/doorkeeper_openid_connect.rb b/config/initializers/doorkeeper_openid_connect.rb index 7f409ecbe..b3ae58d00 100644 --- a/config/initializers/doorkeeper_openid_connect.rb +++ b/config/initializers/doorkeeper_openid_connect.rb @@ -27,7 +27,7 @@ Doorkeeper::OpenidConnect.configure do end claims do - claim :preferred_username, :scope => :openid do |resource_owner, _scopes, _access_token| + claim :preferred_username, :scope => :openid, :response => [:id_token, :user_info] do |resource_owner, _scopes, _access_token| resource_owner.display_name end diff --git a/test/integration/oauth2_test.rb b/test/integration/oauth2_test.rb index 106ec6844..d6b339f0e 100644 --- a/test/integration/oauth2_test.rb +++ b/test/integration/oauth2_test.rb @@ -110,7 +110,7 @@ class OAuth2Test < ActionDispatch::IntegrationTest end assert_equal user.id.to_s, data["sub"] - assert_not data.key?("preferred_username") + assert_equal user.display_name, data["preferred_username"] get oauth_userinfo_path assert_response :unauthorized -- 2.39.5 From 02f458e7e8092b2ebff556d6538bd4a45861de08 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 6 Oct 2025 14:24:24 +0200 Subject: [PATCH 08/16] Localisation updates from https://translatewiki.net. --- config/locales/ar.yml | 3 + config/locales/br.yml | 121 +++++++++ config/locales/ca.yml | 513 ++++++++++++++++++++++++++++++++++++++- config/locales/fi.yml | 127 +++++++++- config/locales/frp.yml | 5 +- config/locales/pl.yml | 21 +- config/locales/shn.yml | 4 +- config/locales/zh-CN.yml | 138 +++++++++++ config/locales/zh-TW.yml | 4 +- 9 files changed, 907 insertions(+), 29 deletions(-) diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 4cbc9be6d..0a3e738b2 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1554,6 +1554,7 @@ ar: provide_details: يُرجَى تقديم التفاصيل المطلوبة languages_panes: select_language_list: + search_language: بحث... languages: gsw: الألمانية dsb: الصربية السفلى @@ -1597,6 +1598,8 @@ ar: communities: مجتمعات learn_more: التعرف على المزيد more: المزيد + header: + loading: تحميل... user_mailer: diary_comment_notification: subject: '[خريطة الشارع المفتوحة] %{user} علق على مدخلتك في اليومية' diff --git a/config/locales/br.yml b/config/locales/br.yml index 853c6f9c6..c421315e2 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -314,6 +314,7 @@ br: terms_of_use: heading: Termenoù implij agreed: Asantet ho peus d'an termenoù implij d'an %{date}. + not_agreed: N'ho peus ket asantet an Termenoù Implij c'hoazh. review: Lenn an termenoù review_and_accept: Lenn hag asantiñ an termenoù save changes button: Enrollañ ar c'hemmoù @@ -733,10 +734,15 @@ br: errors: contact: contact: darempred + contact_the_community_html: Na dermit ket da vont e %{contact_link} gant kumuniezh + OpenStreetMap m'ho peus kavet ul liamm torret pe ur bug. Notennit URL pizh + ho reked mar plij. bad_request: title: Reked fall forbidden: title: Difennet + description: An oberiadenn ho peus klasket da ober war servijer OpenStreetMap + a zo da gaout evit ar verourien hepken (HTTP 403) internal_server_error: title: Fazi an arload not_found: @@ -1700,6 +1706,115 @@ br: create: successful_report: Enrollet mat eo bet ho tanevell provide_details: Roit ar munudoù goulennet mar plij + languages_panes: + select_language_list: + search_language: Klask... + languages: + af: Afrikaans + gsw: Alemaneg + frp: Arpitaneg + ast: Asturianeg + az: Azereg + id: Indonezeg + ms: Malezeg + bs: Bosneg + br: Brezhoneg + ca: Katalaneg + cs: Tchekeg + cy: Kembraeg + da: Daneg + de: Alamaneg + dsb: Sorabeg izel + et: Estoneg + en: Saozneg + en-GB: Saozneg (Rouantelezh-Unanet) + es: Spagnoleg + eo: Esperanteg + eu: Euskareg + fr: Galleg + fy: Frizeg ar c'hornôg + fur: Friouleg + ga: Iwerzhoneg + gd: Gouezeleg Skos + gl: Galizeg + aln: Albaneg Gheg + hsb: Sorabeg uhel + hr: Kroateg + ia: Interlingua + is: Islandeg + it: Italianeg + gcf: Kreoleg Gwadeloup + ku-Latn: Kurdeg (latin) + lv: Latveg + lb: Luksembourgeg + lt: Lituaneg + hu: Hungareg + fit: Finneg Tornedalen + nl: Izelvroeg + nb: Norvegeg (BokmÃ¥l) + nn: Norvegeg (Nynorsk) + oc: Okitaneg + nds: Alamaneg izel + pl: Poloneg + pt-PT: Portugaleg + pt: Portugaleg (Brazil) + ksh: Kölsch + ro: Roumaneg + sc: Sardeg + sco: Skoseg + sq: Albaneg + scn: Sikilianeg + sk: Slovakeg + sl: Sloveneg + sr-Latn: Serbeg (latin) + sh: Serbeg-kroateg (latin) + fi: Finneg + sv: Svedeg + tl: Tagalog + kab: Kabileg + vi: Vietnameg + tr: Turkeg + yo: Yoruba + diq: Dimli + el: Gresianek + ba: Bachkireg + be: Belaruseg + be-Tarask: Belaruseg (TaraÅ¡k.) + bg: Bulgareg + mk: Makedoneg + mo: Moldoveg + ce: Tchetcheneg + ru: Ruseg + sr: Serbeg (kirillek) + tt: Tatareg (kirillek) + uk: Ukraineg + kk-cyrl: Kazakeg (kirillek) + yi: Yiddish + he: Hebraeg + ar: Arabeg + skr-arab: Saraiki + fa: Perseg + arz: Arabeg Egipt + pnb: Panjabeg ar c'hornôg + ps: Pachtoeg + nqo: N'Ko + ne: Nepaleg + mr: Marathi + hi: Hindi + bn: Bengaleg + pa: Panjabeg + ta: Tamileg + te: Telougou + kn: Kannadeg + th: Thai + my: Birmaneg + ka: Jorjianeg + km: Khmer + zh-CN: Sinaeg (eeunaet) + zh-TW: Sinaeg (hengounel) + zh-HK: Sinaeg (Hong Kong) + ja: Japaneg + ko: Koreaneg layouts: logo: alt_text: Logo OpenStreetMap @@ -1730,8 +1845,14 @@ br: more: Muioc'h header: select_language: Dibab ar yezh + loading: O kargañ... select_language_button: title: Dibab ar yezh + offline_flash: + osm_offline: Ezlinenn eo diaz roadennoù OpenStreetMap evit bremañ e-pad ma pleder + gant ul labour kempenn bras. + osm_read_only: Diaz roadennoù OpenStreetMap zo da lenn hepken evit bremañ evit + bremañ abalamour da labourioù kempenn bras. user_mailer: diary_comment_notification: subject: '[OpenStreetMap] %{user} en deus lezet un addispleg war hoc''h enmoned diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 45dc95f7a..d64248345 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -102,7 +102,7 @@ ca: changeset_tag: Etiqueta del conjunt de canvis country: País/Estat diary_comment: Comentari al Diari - diary_entry: Entrada al Diari + diary_entry: Entrada al diari friend: Amic issue: Incidència language: Llengua @@ -423,7 +423,7 @@ ca: deleted_ago_by_html: Eliminat %{time_ago} per %{user} edited_ago_by_html: Editat %{time_ago} per %{user} version: Versió - redacted_version: Versió editada + redacted_version: Versió censurada in_changeset: Conjunt de canvis anonymous: anònim no_comment: (cap comentari) @@ -435,7 +435,7 @@ ca: one: '%{count} via' other: '%{count} vies' download_xml: Baixa l’XML - view_unredacted_history: Mostra l'historial sense editar + view_unredacted_history: Mostra l'historial no censurat location: 'Ubicació:' node: title_html: 'Node: %{name}' @@ -508,6 +508,8 @@ ca: way: Via relation: Relació history: Historial + version: 'Versió #%{version}' + versions_label: 'Versions:' feature_queries: show: title: Consultar objectes @@ -522,6 +524,55 @@ ca: title_html: 'Historial de la via: %{name}' relation: title_html: 'Historial de la relació: %{name}' + older_versions: Versions anteriors + newer_versions: Versions més noves + actions: + view_redacted_data: Veure dades censurades + view_redaction_message: Veure el missatge de censura + nodes: + not_found_message: + sorry: 'No s''ha pogut trobar el node #%{id}.' + timeout: + sorry: Les dades del node amb l'identificador %{id} han trigat massa a recuperar-se. + old_nodes: + not_found_message: + sorry: 'No s''ha pogut trobar la versió %{version} del node #%{id}.' + timeout: + sorry: L'historial del node amb l'identificador %{id} ha trigat massa a recuperar-se. + ways: + not_found_message: + sorry: 'No s''ha pogut trobar la via #%{id}.' + timeout: + sorry: Les dades de la via amb l'identificador %{id} han trigat massa a recuperar-se. + old_ways: + not_found_message: + sorry: 'No s''ha pogut trobar la versió %{version} de la via #%{id}.' + timeout: + sorry: L'historial del camí amb l'identificador %{id} ha trigat massa a recuperar-se. + relations: + not_found_message: + sorry: 'No s''ha pogut trobar la relació #%{id}.' + timeout: + sorry: Les dades de la relació amb l'identificador %{id} han trigat massa a + recuperar-se. + relation_members: + not_found_message: + sorry: 'No s''ha pogut trobar la relació #%{id}.' + timeout: + sorry: Les dades de la relació amb l'identificador %{id} han trigat massa a + recuperar-se. + old_relations: + not_found_message: + sorry: 'No s''ha pogut trobar la versió %{version} de la relació #%{id}.' + timeout: + sorry: L'historial de la relació amb l'identificador %{id} ha trigat massa a + recuperar-se. + old_relation_members: + not_found_message: + sorry: 'No s''ha pogut trobar la versió %{version} de la relació #%{id}.' + timeout: + sorry: Els membres de la relació amb l'identificador %{id} han trigat massa + a recuperar-se. changeset_comments: feeds: comment: @@ -534,10 +585,27 @@ ca: sorry: La llista de comentaris de conjunts de canvis que heu sol·licitat ha trigat massa a recuperar-se. changesets: + changeset_line: + comments: + one: '%{count} comentaris' + other: '%{count} comentariss' + changes: + one: '%{count} canvi' + other: '%{count} canvis' + n_elements_created: + one: Un element creat + other: '%{count} elements creats' + n_elements_modified: + one: Un element canviat + other: '%{count} elements canviats' + n_elements_deleted: + one: Un element suprimit + other: '%{count} elements suprimits' index: title: Conjunts de canvis title_user: Conjunts de canvis de %{user} title_user_link_html: Conjunts de canvis de %{user_link} + title_followed: Conjunts de canvis dels usuaris que segueixes title_nearby: Conjunts de canvis d'usuaris propers empty: No s'ha trobat cap conjunt de canvis. empty_area: No hi ha cap conjunt de canvis en aquesta àrea. @@ -545,6 +613,8 @@ ca: no_more: No s'ha trobat cap altre conjunt de canvis. no_more_area: No hi ha cap altre conjunt de canvis en aquesta àrea. no_more_user: No hi ha cap altre conjunt de canvis d'aquest usuari. + older_changesets: Conjunts de canvis anteriors + newer_changesets: Conjunts de canvis més nous feed: title: Conjunt de canvis %{id} title_comment: Conjunt de canvis %{id} - %{comment} @@ -564,7 +634,7 @@ ca: still_open: Conjunt de canvis encara obert - el debat començarà quan es tanqui el conjunt de canvis. subscribe: Subscriure's - unsubscribe: Dona de baixa + unsubscribe: Cancel·la la subscripció comment_by_html: Comentari de %{user} %{time_ago} hidden_comment_by_html: Comentari ocult de %{user} %{time_ago} hide_comment: ocultar @@ -573,12 +643,34 @@ ca: changesetxml: XML del conjunt de canvis osmchangexml: XML en format osmChange paging_nav: + nodes_title: Nodes nodes_paginated: Nodes (%{x}-%{y} de %{count}) + ways_title: Vies ways_paginated: Vies (%{x}-%{y} de %{count}) + relations_title: Relacions relations_paginated: Relacions (%{x}-%{y} de %{count}) + range: '%{x}-%{y} de %{count}' + not_found_message: + sorry: 'No s''ha trobat el conjunt de canvis #%{id}.' timeout: sorry: La llista de conjunt de canvis que heu sol·licitat ha trigat massa a carregar-se. + changeset_subscriptions: + show: + subscribe: + heading: Voleu subscriure-us al següent debat sobre el conjunt de canvis? + button: Es subscriure al debat + unsubscribe: + heading: Voleu cancel·lar la subscripció al següent debat sobre el conjunt + de canvis? + button: Cancel·la la subscripció al debat + heading: + title: Conjunt de canvis %{id} + created_by_html: Creat per %{link_user} el %{created}. + no_such_entry: + heading: 'No hi ha cap entrada amb la id: %{id}' + body: No hi ha cap usuari amb el id %{id}. Comproveu l'ortografia; o potser + l'enllaç on heu fet clic és incorrecte. dashboards: contact: km away: '%{count}km de distància' @@ -589,13 +681,18 @@ ca: popup: your location: La vostra ubicació nearby mapper: Cartògraf proper + following: Seguint show: title: El meu tauler no_home_location_html: '%{edit_profile_link} i establiu la ubicació de casa vostra per veure usuaris propers.' edit_your_profile: Editeu el vostre perfil + followings: Usuaris que segueixeu + no followings: Encara no heu seguit cap usuari. nearby users: Altres usuaris propers no nearby users: Cap usuari manifesta cartografiar a prop. + followed_changesets: conjunt de canvis + followed_diaries: entrades del diari nearby_changesets: conjunts de canvis d'usuaris propers nearby_diaries: entrades de diari d'usuaris propers diary_entries: @@ -606,6 +703,7 @@ ca: use_map_link: Useu el mapa index: title: Diaris dels usuaris + title_followed: Diaris dels usuaris seguits title_nearby: Diaris d'usuaris propers user_title: Diari de %{user} in_language_title: Entrades de diari en %{language} @@ -632,6 +730,7 @@ ca: diary_entry: posted_by_html: Publicat per %{link_user} el %{created} en %{language_link}. updated_at_html: Última actualització de %{updated} + full_entry: Veure tota l'entrada comment_link: Comenta aquesta entrada reply_link: Enviar un missatge a l'autor comment_count: @@ -661,18 +760,62 @@ ca: all: title: Entrades de diari d'OpenStreetMap description: Entrades de diari recents dels usuaris d'OpenStreetMap + subscribe: + heading: Voleu subscriure-us al següent debat d'entrades de diari? + button: Es subscriure al debat + unsubscribe: + heading: Voleu cancel·lar la subscripció al següent debat d'entrades de diari? + button: Cancel·la la subscripció al debat navigation: + in_language: Entrades de diari en %{language} my_diary: El meu diari new: Entrada de diari nova new_title: Redacta una nova entrada en el meu diari d'usuari + profile_diaries: + latest_diaries: Últims diaris + comments: + one: '%{count} comentari' + other: '%{count} comentaris' + title_label: Entrada al diari + comments_label: Comentaris + date_label: Data + diary_comments: + new: + heading: Voleu afegir un comentari a la següent entrada del debat? doorkeeper: + errors: + messages: + account_selection_required: El servidor d'autorització requereix la selecció + d'un compte d'usuari final + consent_required: El servidor d'autorització requereix el consentiment de + l'usuari final + interaction_required: El servidor d'autorització requereix la interacció de + l'usuari final + login_required: El servidor d'autorització requereix l'autentificació de l'usuari + final flash: applications: create: notice: S'ha registrat l'aplicació. + openid_connect: + errors: + messages: + auth_time_from_resource_owner_not_configured: Error a causa d'una configuració + que falta a Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner. + reauthenticate_resource_owner_not_configured: Error a causa d'una configuració + que falta a Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner. + resource_owner_from_access_token_not_configured: Error a causa d'una configuració + que falta a Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token. + select_account_for_resource_owner_not_configured: Error a causa d'una configuració + que falta a Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner. + subject_not_configured: La generació del testimoni d'ID ha fallat perquè + falta la configuració de Doorkeeper::OpenidConnect.configure.subject. scopes: + address: Veure la vostra adreça física + email: Veure la vostra adreça electrònica openid: Autentiqueu el vostre compte phone: Vegeu el vostre número de telèfon + profile: Veure la informació del vostre perfil errors: contact: contact_url_title: Diferents canals de contacte explicats @@ -682,6 +825,8 @@ ca: sol·licitud. bad_request: title: Petició incorrecta + description: L'operació que heu sol·licitat al servidor OpenStreetMap no és + vàlida (HTTP 400) forbidden: title: Prohibit description: L'operació que heu sol·licitat al servidor OpenStreetMap només @@ -697,9 +842,20 @@ ca: follows: show: follow: + heading: Voleu seguir %{user}? button: Segueix l'usuari unfollow: + heading: Voleu deixar de seguir %{user}? button: Deixa de seguir l'usuari + create: + success: Ara segueixeu %{name}! + failed: La vostra sol·licitud per seguir %{name} ha fallat. + already_followed: Ja segueixeu %{name}. + limit_exceeded: Us heu amistat amb molts usuaris recentment. Espereu una mica + abans de fer-ho amb algú més. + destroy: + success: Heu deixat de seguir %{name} amb èxit. + not_followed: No segueixeu %{name}. geocoder: search_osm_nominatim: prefix: @@ -949,6 +1105,7 @@ ca: bridleway: Camí de ferradura bus_guideway: Carril per a troleibús bus_stop: Parada d'autobús + busway: Via dedicada als autobusos construction: Carretera en construcció corridor: Passadís crossing: Encreuament @@ -1032,6 +1189,7 @@ ca: wreck: Derelicte "yes": Lloc històric information: + guidepost: Pal de direccions board: Tauler d'informació map: Mapa office: Oficina de turisme @@ -1456,6 +1614,7 @@ ca: lake: Llac pond: Bassa reservoir: Embassament + basin: Conca fishpond: Estany de peixos lagoon: Llacuna wastewater: Aigües residuals @@ -1492,10 +1651,39 @@ ca: level9: Límit inframunicipal (nivell 9) level10: Límit de suburbi-barri (nivell 10) level11: Límit del veïnat (nivell 11) + border_types: + arrondissement: Límit d'arrondissement + borough: Límit de borough + cercle: Límit de Cercle + city: Límit de ciutat + comarca: Límit comarcal + county: Límit de comtat + departement: Límit departamental + department: Límit departamental + district: Límit de districte + distrito: Límit de districte + freguesia: Límit de freguesia + local_authority: Límit d'autoritat local + municipality: Límit municipal + municipi: Límit municipal + município: Límit municipal + nation: Frontera internacional + national: Frontera internacional + neighbourhood: Límit de veïnat + parish: Límit parroquial + province: Límit provincial + região: Límit regional + region: Límit regional + state: Límit estatal + town: Límit de vila + township: Límit de Township + village: Límit de vilatge searches: show: title: latlon: Fonts internes + nominatim: Nominatim + nominatim_reverse: Nominatim queries: create: no_results: Cap resultat trobat @@ -1507,13 +1695,21 @@ ca: time: Temps ascend: Desnivell positiu descend: Desnivell negatiu + kilometers: quilòmetres + miles_feet: milles, peus + miles_yards: milles, iardes + distance_units_settings: Configuració de les unitats de distància + download: Baixa la ruta com a GeoJSON + filename: ruta directions_courtesy_html: Direccions cortesia de %{link} issues: index: title: Incidències select_status: Seleccionar estat select_type: Seleccionar tipus + select_last_managed_by: Seleccionar darrera actualització feta per reported_user: Usuari denunciat + not_managed: No gestionat search: Cerca search_guidance: 'Cercar incidències:' states: @@ -1523,14 +1719,25 @@ ca: page: user_not_found: El compte d’usuari no existeix issues_not_found: No s'ha trobat cap incidència d'aquest tipus + reported_user: Usuari denunciat status: Estat reports: Denúncies last_updated: Darrera actualització + last_managed: Últim gestionat + reporting_users: Denunciació d'usuaris reports_count: one: '%{count} Informe' other: '%{count} Informes' reported_item: Element denunciat + states: + ignored: Ignorat + open: Obert + resolved: Resolt show: + title: + open: 'Problema obert #%{issue_id}' + ignored: Problema ignorat %{issue_id} + resolved: Problema resolt %{issue_id} reports: one: '%{count} informe' other: '%{count} informes' @@ -1555,12 +1762,26 @@ ca: reopened: L'estat de la incidència ha passat a "Oberta" comments: comment_from_html: Comentari de %{user_link} a %{comment_created_at} + reassign_to_moderators: Reassignar el problema als moderadors + reassign_to_administrators: Reassignar el problema als administradors reports: reported_by_html: Denunciat com a %{category} per %{user} a %{updated_at} helper: reportable_title: diary_comment: '%{entry_title}, comentari #%{comment_id}' note: 'Nota #%{note_id}' + reportable_heading: + diary_comment_html: Comentari del diari %{title} creat el %{datetime_created}, + actualitzat el %{datetime_updated} + diary_entry_html: Entrada del diari %{title} creada el %{datetime_created}, + actualitzada el %{datetime_updated} + note_html: '%{title} creat el %{datetime_created}, actualitzat el %{datetime_updated}' + user_html: L'usuari %{title} va ser creat el %{datetime_created} + reporters: + index: + title: Reportadors del problema %{issue_id} + reporters: + more_reporters: i %{count} més issue_comments: create: comment_created: S’ha creat el comentari correctament @@ -1600,6 +1821,119 @@ ca: create: successful_report: S’ha registrat la vostra denúncia correctament provide_details: Proporcioneu els detalls demanats + languages_panes: + select_language_list: + search_language: Cerca… + languages: + af: Afrikaans + gsw: Alamànic + frp: Arpità + ast: Asturià + az: Àzeri + id: Indonesi + ms: Malai + bs: Bosnià + br: Bretó + ca: Català + cs: Txec + cy: Gal·lès + da: Danès + de: Alemany + dsb: Baix sòrab + et: Estonià + en: Anglès + en-GB: Anglès (Regne Unit) + es: Espanyol + eo: Esperanto + eu: Basc + fr: Francès + fy: Frisó occidental + fur: Friülà + ga: Irlandès + gd: Gaèlic escocès + gl: Gallec + aln: Gheg albanès + hsb: Alt sòrab + hr: Croat + ia: Interlingua + is: Islandès + it: Italià + gcf: Crioll guadalupè + ku-Latn: Kurd (llatí) + lv: Letó + lb: Luxemburgès + lt: Lituà + hu: Hongarès + fit: Meänkieli + nl: Neerlandès + nb: Noruec BokmÃ¥l + nn: Noruec Nynorsk + oc: Occità + nds: Baix alemany + pl: Polonès + pt-PT: Portuguès + pt: Portuguès (Brasil) + ksh: Kölsch + ro: Romanès + sc: Sard + sco: Escocès + sq: Albanès + scn: Sicilià + sk: Eslovac + sl: Eslovè + sr-Latn: Serbi (llatí) + sh: Serbo-croat (llatí) + fi: Finès + sv: Suec + tl: Tagalog + kab: Cabilenc + vi: Vietnamita + tr: Turc + yo: Ioruba + diq: Dimli + el: Grec + ba: Baixkir + be: Bielorús + be-Tarask: Bielorús (TaraÅ¡k.) + bg: Búlgar + mk: Macedònic + mo: Moldau + ce: Txetxè + ru: Rus + sr: Serbi (ciríl·lic) + tt: Tatar (ciríl·lic) + uk: Ucraïnès + kk-cyrl: Kazakh (ciríl·lic) + yi: Ídix + he: Hebreu + ar: Àrab + skr-arab: Saraiki + fa: Persa + arz: Àrab egipci + pnb: Panjabi occidental + ps: Paixtu + nqo: N'Ko + ne: Nepalès + mr: Marathi + hi: Hindi + bn: Bangla + pa: Panjabi + gu: Gujarati + ta: Tàmil + te: Telugu + kn: Kannada + th: Tailandès + my: Birmà + shn: Shan + xmf: Mingrelià + ka: Georgià + km: Khmer + sat: Santali + zh-CN: Xinès (simplificat) + zh-TW: Xinès (tradicional) + zh-HK: Xinès (Hong Kong) + ja: Japonès + ko: Coreà layouts: logo: alt_text: Logotip de l'OpenStreetMap @@ -1618,16 +1952,33 @@ ca: intro_header: OpenStreetMap us dona la benvinguda intro_text: L'OpenStreetMap és un mapa del món creat per persones com tu i d'ús lliure sota una llicència oberta. + hosting_partners_2024_html: L'allotjament web està gestionat per %{fastly}, %{corpmembers} + i altres %{partners}. + partners_corpmembers: membres corporatius OSMF partners_partners: socis tou: Condicions d’ús + nothing_to_preview: Res per previsualitzar. help: Ajuda about: Informació copyright: Drets d'autor communities: Comunitats learn_more: Aprèn-ne més more: Més + header: + select_language: Seleccionar una llengua + loading: S'està carregant... + select_language_button: + title: Seleccionar una llengua + offline_flash: + osm_offline: La base de dades OpenStreetMap és fora de línia mentre es fan les + actuacions de manteniment necessàries. + osm_read_only: La base de dades OpenStreetMap actualment és en el mode només + de lectura mentre es fan les actuacions de manteniment necessàries. + expected_restore_html: S'espera que els serveis es restaurin en %{time}. + announcement: Podeu llegir l'anunci aquí. user_mailer: diary_comment_notification: + description: 'Entrada del diari d''OpenStreetMap #%{id}' subject: '[OpenStreetMap] %{user} ha comentat una entrada de diari' hi: Hola %{to_user}, header: '%{from_user} ha comentat l''entrada de diari de l''OpenStreetMap amb @@ -1638,6 +1989,8 @@ ca: o enviar un missatge a l'autor a %{replyurl} footer_html: També podeu llegir el comentari a %{readurl} i comentar-lo a %{commenturl} o enviar un missatge a l'autor a %{replyurl} + footer_unsubscribe: Podeu donar-vos de baixa del debat a %{unsubscribeurl} + footer_unsubscribe_html: Podeu donar-vos de baixa del debat a %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Hola %{to_user}, @@ -1651,16 +2004,40 @@ ca: a l'autor a %{replyurl} follow_notification: hi: Hola %{to_user}, + subject: '[OpenStreetMap] %{user} us ha seguit' + followed_you: '%{user} us està seguint a l''OpenStreetMap.' see_their_profile: Podeu veure el seu perfil a %{userurl}. see_their_profile_html: Podeu veure el seu perfil a %{userurl}. + follow_them: També podeu seguir-los a %{followurl}. + follow_them_html: També podeu seguir-los a %{followurl}. + gpx_details: + details: 'Detalls del vostre fitxer:' + filename: Nom del fitxer + url: URL + description: Descripció + tags: Etiquetes + total_points: Nombre total de punts + imported_points: Nombre de punts importats gpx_failure: hi: Hola %{to_user}, - failed_to_import: 'no es pot importar. L''error ha estat:' + failed_to_import: Sembla que el fitxer no s'ha pogut importar com a traça GPS. + verify: 'Verifiqueu que el vostre fitxer sigui un fitxer GPX vàlid o un arxiu + que contingui fitxers GPX en el format compatible (.tar.gz, .tar.bz2, .tar, + .zip, .gpx.gz, .gpx.bz2). Podria haver-hi un problema de format o sintaxi + amb el vostre fitxer? Aquest és l''error d''importació:' + more_info: Podeu trobar més informació sobre les fallades d'importació de GPX + i com evitar-les a %{url}. more_info_html: Podeu trobar més informació sobre les fallades d'importació de GPX i com evitar-les a %{url}. subject: '[OpenStreetMap] Error d''importació de GPX' gpx_success: hi: Hola %{to_user}, + imported_successfully: Sembla que el fitxer s'ha importat correctament com a + traça GPS. + all_your_traces: Totes les vostres traces GPX carregades amb èxit es poden trobar + a %{url} + all_your_traces_html: Totes les vostres traces GPX carregades amb èxit es poden + trobar a %{url}. subject: '[OpenStreetMap] Importació de GPX correcta' signup_confirm: subject: '[OpenStreetMap] OpenStreetMap us dona la benvinguda' @@ -1685,6 +2062,7 @@ ca: click_the_link: Si sou vós mateix, feu clic a l'enllaç de sota per a reinicialitzar la contrasenya. note_comment_notification: + description: 'Nota d''OpenStreetMap #%{id}' anonymous: Un usuari anònim greeting: Hola, commented: @@ -1726,6 +2104,7 @@ ca: details: Responeu o informeu-vos més sobre la nota a %{url}. details_html: Responeu o informeu-vos més sobre la nota a %{url}. changeset_comment_notification: + description: 'Conjunt de canvis d''OpenStreetMap #%{id}' hi: Hola %{to_user}, commented: subject_own: '[OpenStreetMap] %{commenter} ha comentat un dels vostres conjunts @@ -1760,6 +2139,9 @@ ca: success: Heu confirmat el vostre compte, gràcies per registrar-vos! already active: Aquest compte ja ha estat confirmat. unknown token: Aquest codi de confirmació ha expirat o no existeix. + if_need_resend: Si necessiteu que us tornem a enviar el correu electrònic de + confirmació, feu clic al botó següent. + resend_button: Torna a enviar el correu electrònic de confirmació confirm_resend: failure: L'usuari %{name} no s'ha trobat. confirm_email: @@ -1843,6 +2225,9 @@ ca: muted_inboxes: show: title: Missatges silenciats + messages: + one: '%{count} missatge nou' + other: '%{count} missatges nous' outboxes: show: title: Safata de sortida @@ -1867,6 +2252,10 @@ ca: new password button: Restableix la contrasenya help_text: Introduïu l'adreça de correu electrònic que vau utilitzar per registrar-vos; us hi enviarem un enllaç per a restablir la contrasenya. + create: + send_paranoid_instructions: Si la vostra adreça de correu electrònic existeix + en la nostra base de dades, rebràs un correu electrònic amb instruccions per + a confirmar la vostra adreça de correu electrònic en pocs minuts. edit: title: Restableix la contrasenya heading: Restableix la contrasenya per a %{user} @@ -1874,15 +2263,20 @@ ca: flash token bad: No s'ha trobat el testimoni. Comproveu l'URL. update: flash changed: S'ha canviat la contrasenya. + flash token bad: No s'ha trobat el testimoni. Comproveu l'URL. preferences: preferences: update: failure: No s'han pogut actualitzar les preferències. update_success_flash: message: S'han actualitzat les preferències. + navigation: + preferences: Preferències + advanced_preferences: Preferències avançades basic_preferences: show: title: Les meves preferències + preferred_language: Llengües preferides preferred_site_color_scheme: Esquema de colors preferit pel web site_color_schemes: auto: Auto @@ -1894,20 +2288,43 @@ ca: light: Clar dark: Fosc save: Actualitza les preferències + advanced_preferences: + show: + title: Les meves preferències avançades + save: Actualitza les preferències profiles: profile_sections: navigation: + description: Descripció + links: Enllaços image: Imatge + company: Empresa + location: Ubicació descriptions: show: title: Edita el perfil save: Actualitza el perfil cancel: Cancel·la + update: + success: S'ha actualitzat la descripció del perfil. + failure: No s'ha pogut actualitzar la descripció del perfil. links: show: title: Edita el perfil + save: Actualitza el perfil + cancel: Cancel·la + social_links: + title: Enllaços de perfil social + remove: Suprimeix + add: Afegeix un enllaç social + update: + success: Enllaços de perfil actualitzats. + failure: No s'ha pogut actualitzar el perfil. images: show: + title: Edita el perfil + save: Actualitza el perfil + cancel: Cancel·la gravatar: gravatar: Usa Gravatar what_is_gravatar: Què és Gravatar? @@ -1916,17 +2333,41 @@ ca: delete image: Suprimeix la imatge actual replace image: Reemplaça la imatge actual image size hint: (val més usar imatges quadrades d'almenys 100x100) + update: + success: Imatge de perfil actualitzada. + failure: No s'ha pogut actualitzar la imatge de perfil. + companies: + show: + title: Edita el perfil + save: Actualitza el perfil + cancel: Cancel·la + update: + success: Empresa del perfil actualitzada. + failure: No s'ha pogut actualitzar l'empresa del perfil. locations: show: + title: Edita el perfil + save: Actualitza el perfil + cancel: Cancel·la no home location: No heu especificat la ubicació d'origen. update home location on click: Voleu actualitzar la ubicació d'inici en fer clic al mapa? show: Mostra delete: Esborra undelete: Desfés l'esborrat + update: + success: Ubicació del perfil actualitzada. + failure: No s'ha pogut actualitzar la ubicació del perfil. sessions: new: tab_title: Inicieu la sessió + login_to_authorize_html: Registreu-vos amb OpenStreetMap per accedir a %{client_app_name}. + already_logged_in_html: Ja heu iniciat la sessió com a %{user}. Si torneu a + iniciar la sessió, el vostre compte actual canviarà. + access_another_page: 'Heu arribat aquí mentre intentava accedir a una altra + pàgina. Si voleu accedir a aquesta pàgina utilitzant el vostre compte actual, + feu clic al botó següent:' + visit_referring_page: Visitar la pàgina de referència email or username: Adreça de correu o nom d'usuari password: Contrasenya remember: Recorda'm @@ -1964,21 +2405,41 @@ ca: preview: Previsualitza help: Ajuda pagination: + changeset_comments: + older: Comentaris més antics + newer: Comentaris més nous + oldest: Comentaris els més antics + newest: Comentaris els més nous diary_comments: older: Comentaris més antics newer: Comentaris més nous + oldest: Comentaris els més antics + newest: Comentaris els més nous diary_entries: older: Entrades més antigues newer: Entrades més noves + oldest: Entrades les més antigues + newest: Entrades les més noves + issues: + older: Problemes més antics + newer: Problemes més nous + oldest: Problemes els més antics + newest: Problemes els més nous traces: older: Traces més antigues newer: Traces més recents + oldest: Traces les més antigues + newest: Traces les més noves user_blocks: older: Bloquejos més antics newer: Bloquejos més nous + oldest: Bloquejos els més antics + newest: Bloquejos els més nous users: older: Usuaris més antics newer: Usuaris més nous + oldest: Uruaris els més antics + newest: Usuaris els més nous site: about: heading_html: '%{copyright}Col·laboradors %{br} d''OpenStreetMap' @@ -2038,6 +2499,24 @@ ca: native_link: Versió en català mapping_link: Comença a cartografiar legal_babble: + lead_1_html: |- + OpenStreetMap proporciona dades de mapes obertes per a milers de llocs web, aplicacions mòbils i dispositius de maquinari. + OpenStreetMap està construït per una comunitat de persones com vós que contribueixen i mantenen dades cartogràfiques sobre carreteres, senders, cafeteries, estacions de tren i molt més, arreu del món. + lead_2_html: |- + %{learn_more_about_osm_link} i %{get_started_mapping_link}! + Podeu llegir-ne més a %{osm_blog_link} i subscriure-us a %{weeklyosm_link}. + Trobeu altres cartografiadors a la vostre %{osm_community_link} local. + Doneu suport al projecte unint-vos a %{osm_foundation_link} i %{making_donation_link}. + lead_2_learn_more_about_osm: Llegiu més informació sobre OpenStreetMap + lead_2_get_started_mapping: començar a mapejar + lead_2_osm_blog: Blog d'OpenStreetMap + lead_2_osm_community: Comunitat OSM + lead_2_osm_foundation: Fundació OSM + lead_2_making_donation: fent un donatiu + licensing_title: Llicència d'OpenStreetMap + licensing_1_html: "OpenStreetMap és de dades %{open}, amb llicència \n%{odc_odbl_link} + (ODbL) per part de %{osm_foundation_link} (OSMF). En resum:" + licensing_1_open: obertes licensing_1_odc_odbl: Llicència de base de dades oberta d'Open Data Commons licensing_1_osm_foundation: Fundació OpenStreetMap licensing_4_osmf_license_page: Pàgina de llicència de l'OSMF @@ -2161,6 +2640,7 @@ ca: title: Altres fonts description: Fonts addicionals llistades al wiki d'OpenStreetMap export_button: Exporta + export_download: S'està baixant... fixthemap: title: Informeu d'un problema / Corregiu el mapa how_to_help: @@ -2247,6 +2727,8 @@ ca: bicycle: Bicicleta car: Cotxe foot: A peu + providers: + description: Serveis de direccions welcome: title: Us donem la benvinguda! introduction: Us donem la benvinguda a l'OpenStreetMap, el mapamundi lliure @@ -2424,7 +2906,8 @@ ca: custom_dimensions: Estableix dimensions personalitzades image_dimensions_html: La imatge mostrarà la capa %{layer} amb una mida de %{width} x %{height} - download: Descàrrega + download: Baixa + downloading: S'està baixant... traces: visibility: private: Privat (només compartit com a punts anònims no ordenats) @@ -2582,7 +3065,7 @@ ca: scopes: read_prefs: Llegeix les preferències d'usuari write_prefs: Modifica les preferències d'usuari - write_diary: Creeu entrades del diari, comentaris i feu amics + write_diary: Creeu entrades del diari i comentaris write_api: Modifica el mapa read_gpx: Llegiu traces de GPS privades write_gpx: Carrega traces de GPS @@ -2682,6 +3165,7 @@ ca: my notes: Les meves notes de mapa my messages: Els meus missatges my profile: El meu perfil + my_account: El meu compte my comments: Els meus comentaris my_preferences: Les meves preferències my_dashboard: El meu tauler @@ -2782,15 +3266,15 @@ ca: grant: administrator: Concedeix accés d'administrador moderator: Concedeix accés de moderador - are_you_sure: Esteu segur que voleu concedir el paper "%{role}" a l'usuari - "%{name}"? + are_you_sure: Esteu segur que voleu concedir el paper «%{role}» a l'usuari + «%{name}»? revoke: administrator: Revoca l'accés d'administrador moderator: Revocar l'accés de moderador - are_you_sure: Esteu segur que voleu revocar el rol `%{role}' de l'usuari `%{name}'? + are_you_sure: Esteu segur que voleu revocar el rol «%{role}» de l'usuari «%{name}»? user_role: filter: - not_a_role: La cadena `%{role}' no és un rol vàlid. + not_a_role: La cadena «%{role}» no és un rol vàlid. already_has_role: L'usuari ja té un rol %{role}. doesnt_have_role: L'usuari no té el rol %{role}. not_revoke_admin_current_user: No es poden retirar els drets d'administrador @@ -2903,6 +3387,10 @@ ca: description: Descripció created_at: Creat a last_changed: Últim canvi + apply: Aplicar + all: Totes + open: No resoltes + closed: Resoltes show: title: 'Nota: %{id}' description: Descripció @@ -3007,6 +3495,9 @@ ca: distance_in_units: m: '%{distance}m' km: '%{distance}km' + ft: '%{distance}ft' + yd: '%{distance}yd' + mi: '%{distance}mi' errors: no_route: No s'ha pogut establir una ruta entre aquests dos punts. instructions: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 1327b527f..c59b2b757 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -274,6 +274,7 @@ fi: providers: none: Ei mitään google: Google + apple: Apple facebook: Facebook microsoft: Microsoft github: GitHub @@ -315,6 +316,9 @@ fi: agreed_with_pd: Olet myös ilmaissut muokkaustesi olevan tekijänoikeudesta vapaita (Public Domain). not_agreed_with_pd: Et ole hyväksynyt, että muokkauksesi ovat tekijänoikeudettomia. + terms_of_use: + heading: Käyttöehdot + not_agreed: Et ole vielä hyväksynyt käyttöehtoja. save changes button: Tallenna muutokset delete_account: Poista käyttäjä... go_public: @@ -369,6 +373,7 @@ fi: tou_explain: html: Nämä %{tou_link} ohjaavat verkkosivuston ja muun OSMF:n tarjoaman infrastruktuurin käyttöä. Napsauta linkkiä, lue ja suostu tekstin sisältöön. + tou: Käyttöehdot read_tou: Olen lukenut ja hyväksynyt käyttöehdot guidance_info_html: 'Vaihtoehtoisia lukutapoja: %{readable_summary_link} ja %{informal_translations_link}' @@ -475,6 +480,8 @@ fi: colour_preview: Värin %{colour_value} esikatselu email_link: Sähköposti %{email} versions_navigation: + node: Solmu + way: Tie history: Historia version: 'Versio #%{version}' versions_label: 'Versiot:' @@ -1637,6 +1644,88 @@ fi: create: successful_report: Ilmianto on rekisteröity provide_details: Täydennä puuttuvat tiedot + languages_panes: + select_language_list: + search_language: Hae... + languages: + af: Afrikaans + az: Azeri + id: Indonesia + ms: Malaiji + bs: Bosnia + br: Breton + ca: Katalaani + cs: TÅ¡ekki + cy: Kymri + da: Tanska + de: Saksa + et: Viro + en: Englanti + en-GB: Englanti (UK) + es: Espanja + eo: Esperanto + eu: Baski + fr: Ranska + ga: Iiri + gl: Galego + hr: Kroaatti + ia: Interlingua + is: Islanti + it: Italia + ku-Latn: Kurdi (latina) + lv: Latvia + lb: Luxemburg + lt: Liettua + hu: Unkari + fit: Tornionlaakson suomi + nl: Hollanti + pl: Puola + pt-PT: Portugali + pt: Portugali (Brasilia) + ro: Romania + sc: Sardi + sco: Skotti + sq: Albania + sk: Slovakki + sl: Sloveeni + sr-Latn: Serbi (latina) + fi: Suomi + sv: Ruotsi + tl: Tagalog + vi: Vietnam + tr: Turkki + yo: Joruba + el: Kreikka + ba: BaÅ¡kiiri + be: Valkovenäjä + bg: Bulgaria + mk: Makedonia + ce: TÅ¡etÅ¡eeni + ru: Venäjä + sr: Serbi (kyrillinen) + tt: Tataari (kyrillinen) + uk: Ukraina + yi: JiddiÅ¡ + he: Heprea + ar: Arabia + fa: Persia + arz: Egyptin arabia + ne: Nepali + hi: Hindi + pa: Punjabi + gu: Gudžarati + ta: Tamili + te: Telugu + kn: Kannada + th: Thai + my: Burma + ka: Georgia + km: Khmer + zh-CN: Kiina (yksinkertaistettu) + zh-TW: Kiina (perinteinen) + zh-HK: Kiina (Hongkong) + ja: Japani + ko: Korea layouts: logo: alt_text: OpenStreetMap-logo @@ -1669,6 +1758,7 @@ fi: more: Lisää header: select_language: Valitse kieli + loading: Ladataan... select_language_button: title: Valitse kieli user_mailer: @@ -1708,7 +1798,7 @@ fi: imported_points: Tuotujen pisteiden määrä gpx_failure: hi: Hei %{to_user}! - failed_to_import: 'epäonnistui tuoda. Tässä virhe:' + failed_to_import: Näyttäisi siltä, että tiedostosi tuonti GPS-jälkenä epäonnistui. subject: '[OpenStreetMap] GPX-tuonti epäonnistui' gpx_success: hi: Hei %{to_user}! @@ -1970,7 +2060,9 @@ fi: failure: Profiilin linkkien päivittäminen epäonnistui. images: show: + title: Muokkaa profiilia save: Päivitä profiili + cancel: Peruuta gravatar: gravatar: Käytä Gravataria what_is_gravatar: Mikä on Gravatar? @@ -1981,14 +2073,18 @@ fi: image size hint: (parhaat kuvat ovat neliönmuotoisia, joiden koko on vähintään 100x100) update: + success: Profiilikuva päivitetty. failure: Profiilin kuvan päivittäminen epäonnistui. companies: show: + title: Muokkaa profiilia save: Päivitä profiili + cancel: Peruuta update: failure: Profiilin yrityksen päivittäminen epäonnistui. locations: show: + title: Muokkaa profiilia save: Päivitä profiili cancel: Peruuta no home location: Kotipaikkaa ei ole vielä määritetty. @@ -2042,9 +2138,13 @@ fi: changeset_comments: older: Vanhemmat kommentit newer: Uudemmat kommentit + oldest: Vanhimmat kommentit + newest: Uusimmat kommentit diary_comments: older: Vanhemmat kommentit newer: Uudemmat kommentit + oldest: Vanhimmat kommentit + newest: Uusimmat kommentit diary_entries: older: Vanhempia... newer: Uudempia... @@ -2060,6 +2160,8 @@ fi: users: older: Vanhemmat käyttäjät newer: Uudemmat käyttäjät + oldest: Vanhimmat käyttäjät + newest: Uusimmat käyttäjät site: about: heading_html: '%{copyright}OpenStreetMapin %{br} kartoittajat' @@ -2291,6 +2393,7 @@ fi: title: Muut lähteet description: Muut lähteet ovat esillä OpenStreetMap-wikissä export_button: Vie + export_download: Ladataan... fixthemap: title: Ilmoita ongelmasta / Korjaa karttaa how_to_help: @@ -2414,6 +2517,9 @@ fi: other_groups: title: Muut ryhmät communities_wiki: Yhteisöjen wiki-sivu + social_links: + show: + website: verkkosivu layers_panes: show: map_notes_zoom_in_tooltip: Näytä karttailmoitukset lähentämällä karttaa @@ -2526,6 +2632,7 @@ fi: custom_dimensions: Rajaa alue itse image_dimensions_html: '%{layer}-karttanäkymä koossa %{width} x %{height}' download: Lataa + downloading: Ladataan... traces: visibility: private: Yksityinen (vain pisteet ilman nimeä ja aikaleimoja) @@ -2648,6 +2755,9 @@ fi: google: title: Kirjaudu käyttämällä Google-tunnustasi alt: Google-logo + apple: + title: Kirjaudu Applella + alt: Applen logo facebook: title: Kirjaudu Facebookin avulla alt: Facebook-logo @@ -2777,6 +2887,7 @@ fi: muuttaa asetuksista. by_signing_up: html: Rekisteröitymällä hyväksyt %{tou_link}, %{privacy_policy_link} ja %{contributor_terms_link}. + tou: Käyttöehdot privacy_policy: tietosuojakäytäntö privacy_policy_title: OSM-säätiön tietosuojakäytäntö, mukaan lukien sähköpostiosoitteita koskeva osio @@ -3080,8 +3191,9 @@ fi: last_changed: Viimeksi muutettu apply: Käytä all: Kaikki - open: Avoin - closed: Suljettu + open: Ratkaisematon + closed: Ratkaistu + hidden: Piilotettu status: Tila show: title: 'Karttailmoitus: %{id}' @@ -3158,6 +3270,8 @@ fi: share: title: Jakaminen view_larger_map: Näytä isommalla kartalla + export_failed_title: Kartan vienti epäonnistui + filename: kartta embed: report_problem: Ilmoita ongelmasta legend: @@ -3218,6 +3332,8 @@ fi: mi: '%{distance} mailia' errors: no_route: Reittiä näiden paikkojen välille ei löytynyt. + no_place: + title: Haku epäonnistui instructions: continue_without_exit: Jatka tiellä %{name} slight_right_without_exit: Kaarra oikealle tielle %{name} @@ -3302,6 +3418,8 @@ fi: nothing_found: Karttakohteita ei löytynyt error: 'Yhteysvirhe palvelimeen %{server}: %{error}' timeout: Yhteyden aikakatkaisu palvelimeen %{server} + element: + wikipedia: Wikipedia context: directions_from: Reittiohjeet täältä directions_to: Reittiohjeet tänne @@ -3319,6 +3437,9 @@ fi: contributions: one: '%{count} muokkaus %{date}' other: '%{count} muokkausta %{date}' + remote_edit: + failed: + title: Muokkaaminen epäonnistui edit: id_not_configured: title: iD-ohjelmaa ei ole asetettu diff --git a/config/locales/frp.yml b/config/locales/frp.yml index a9d9ec36d..0ea48f824 100644 --- a/config/locales/frp.yml +++ b/config/locales/frp.yml @@ -1791,6 +1791,7 @@ frp: provide_details: Mèrci de fornir los dètalys ègzigiês languages_panes: select_language_list: + search_language: Rechèrche... languages: af: Afrikâns gsw: Tuche @@ -1874,7 +1875,7 @@ frp: yi: Yidiche he: Hèbrèo ar: Arabo - skr-arab: Saraiki (ècritura araba) + skr-arab: Saraiki fa: Pèrsan arz: Arabo ègipcien pnb: Pendjabi @@ -1891,6 +1892,7 @@ frp: kn: Kannada th: Tayi my: Birman + shn: Shan xmf: Mingrèlien ka: Jorgien km: Khmer @@ -1932,6 +1934,7 @@ frp: more: Més header: select_language: Chouèsir la lengoua + loading: Chargement... select_language_button: title: Chouèsir la lengoua offline_flash: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index dfb2df405..fb445dbdb 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -20,6 +20,7 @@ # Author: DeRudySoulStorm # Author: Debeet # Author: Deejay1 +# Author: Dżamper # Author: Faalagorn # Author: Frozengeist # Author: FunPL @@ -1197,18 +1198,18 @@ pl: give_way: Znak drogowy „Ustąp pierwszeństwa przejazdu” living_street: Strefa zamieszkania (znak D-40) milestone: Słupek pikietażowy - motorway: Autostrada + motorway: Droga autostradowa motorway_junction: Węzeł autostradowy - motorway_link: Autostrada – dojazd + motorway_link: Droga autostradowa – łącznik passing_place: Mijanka path: Ścieżka pedestrian: Droga dla pieszych platform: Miejsce oczekiwania dla pasażerów primary: Droga pierwszorzędna - primary_link: Droga pierwszorzędna – dojazd + primary_link: Droga pierwszorzędna – łącznik proposed: Droga planowana raceway: Tor wyścigowy - residential: Droga lokalna + residential: Droga mieszkaniowa rest_area: Miejsce obsługi podróżnych road: Droga secondary: Droga drugorzędna @@ -1225,8 +1226,8 @@ pl: traffic_mirror: Lustro drogowe traffic_signals: Sygnalizacja świetlna trailhead: Początek szlaku - trunk: Droga główna/ekspresowa - trunk_link: Droga główna/ekspresowa – dojazd + trunk: Droga główna + trunk_link: Droga główna – łącznik turning_circle: Miejsce do zawracania turning_loop: Pętla do zawracania unclassified: Droga czwartorzędna @@ -1900,6 +1901,7 @@ pl: provide_details: Podaj wymagane sczegóły languages_panes: select_language_list: + search_language: Wyszukaj... languages: af: afrikaans gsw: alemański @@ -2045,6 +2047,7 @@ pl: more: Więcej header: select_language: Wybierz język + loading: Ładowanie... select_language_button: title: Wybierz język offline_flash: @@ -2903,7 +2906,7 @@ pl: sidebar: search_results: Wyniki wyszukiwania search: - search: Wyszukiwanie + search: Wyszukaj... get_directions_title: Wyznacz trasę pomiędzy dwoma punktami from: Początek trasy to: Koniec trasy @@ -2999,8 +3002,8 @@ pl: legend_panes: show: entries: - motorway: Autostrada - main_road: Główna droga + motorway: Droga autostradowa + main_road: Drogi główne trunk: Droga główna primary: Droga pierwszorzędna secondary: Droga drugorzędna diff --git a/config/locales/shn.yml b/config/locales/shn.yml index 184ecb8c3..367c33053 100644 --- a/config/locales/shn.yml +++ b/config/locales/shn.yml @@ -1871,9 +1871,9 @@ shn: yi: ယိတ်ႉတိတ်ႉသျ် he: ႁီးပရူး ar: ဢႃႇရၢပ်ႈ - skr-arab: သရၢႆးၵီႇ (လိၵ်ႈဢႃႇရၢပ်ႈ) + skr-arab: သရၢႆးၵီႇ fa: ပႃႇသျႃး - arz: ဢႃႇရၢပ်ႈ (ဢီးၵျိပ်ႈ) + arz: ဢႃႇရၢပ်ႈ ဢီးၵျိပ်ႈ pnb: ပုၼ်ႇၵျႃႇပီႇပွတ်းတူၵ်း ps: ၽတ်ႉသ်ျတူဝ်ႇ nqo: ဢင်းၶူဝ်း diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index de8d129d1..aa7860d0f 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -562,11 +562,21 @@ zh-CN: sorry: '抱歉，未能找到编号为 #%{id} 的关联关系。' timeout: sorry: 抱歉，检索id为%{id}的关系数据花费时间过长。 + relation_members: + not_found_message: + sorry: 抱歉，未能找到编号为#%{id}的关联关系。 + timeout: + sorry: 抱歉，检索id为%{id}的关系数据花费时间过长。 old_relations: not_found_message: sorry: '抱歉，无法找到关系 #%{id} 的版本 %{version}。' timeout: sorry: 抱歉，检索id为%{id}的关系历史花费时间过长。 + old_relation_members: + not_found_message: + sorry: 抱歉，无法找到关系#%{id}的版本%{version}。 + timeout: + sorry: 抱歉，与ID%{id}关联的成员数据获取耗时过长。 changeset_comments: feeds: comment: @@ -1789,7 +1799,112 @@ zh-CN: provide_details: 请提供所需详情 languages_panes: select_language_list: + search_language: 搜索... languages: + af: 南非语 + gsw: 阿勒曼尼语 + frp: 阿皮坦语 + ast: 阿斯图里亚斯语 + az: 阿塞拜疆语 + id: 印度尼西亚语 + ms: 马来语 + bs: 波斯尼亚语 + br: 布列塔尼语 + ca: 加泰罗尼亚语 + cs: 捷克语 + cy: 威尔士语 + da: 丹麦语 + de: 德语 + dsb: 下索布语 + et: 爱沙尼亚语 + en: 英语 + en-GB: 英语（英国） + es: 西班牙语 + eo: 世界语 + eu: 巴斯克语 + fr: 法语 + fy: 西弗里斯兰语 + fur: 弗留利语 + ga: 爱尔兰语 + gd: 苏格兰盖尔语 + gl: 加利西亚语 + aln: 阿尔巴尼亚语盖格方言 + hsb: 上索布语 + hr: 克罗地亚语 + ia: 国际语 + is: 冰岛语 + it: 意大利语 + gcf: 瓜德罗普克里奥尔语 + ku-Latn: 库尔德语（拉丁字母） + lv: 拉脱维亚语 + lb: 卢森堡语 + lt: 立陶宛语 + hu: 匈牙利语 + fit: 托尔讷河谷芬兰语 + nl: 荷兰语 + nb: 书面挪威语 + nn: 新挪威语 + oc: 奥克语 + nds: 低地德语 + pl: 波兰语 + pt-PT: 葡萄牙语 + pt: 葡萄牙语（巴西） + ksh: 科隆方言 + ro: 罗马尼亚语 + sc: 撒丁语 + sco: 低地苏格兰语 + sq: 阿尔巴尼亚语 + scn: 西西里语 + sk: 斯洛伐克语 + sl: 斯洛文尼亚语 + sr-Latn: 塞尔维亚语（拉丁字母） + sh: 塞尔维亚-克罗地亚语（拉丁字母） + fi: 芬兰语 + sv: 瑞典语 + tl: 他加禄语 + kab: 卡拜尔语 + vi: 越南语 + tr: 土耳其语 + yo: 约鲁巴语 + diq: 扎扎其语 + el: 希腊语 + ba: 巴什基尔语 + be: 白俄罗斯语 + be-Tarask: 白俄罗斯语（传统正写法） + bg: 保加利亚语 + mk: 马其顿语 + mo: 摩尔多瓦语 + ce: 车臣语 + ru: 俄语 + sr: 塞尔维亚语（西里尔字母） + tt: 鞑靼语（西里尔字母） + uk: 乌克兰语 + kk-cyrl: 哈萨克语（西里尔字母） + yi: 意第绪语 + he: 希伯来语 + ar: 阿拉伯语 + skr-arab: 色莱基语 + fa: 波斯语 + arz: 埃及阿拉伯语 + pnb: 西旁遮普语 + ps: 普什图语 + nqo: 西非书面文字 + ne: 尼泊尔语 + mr: 马拉地语 + hi: 印地语 + bn: 孟加拉语 + pa: 旁遮普语 + gu: 古吉拉特语 + ta: 泰米尔语 + te: 泰卢固语 + kn: 卡纳达语 + th: 泰语 + my: 缅甸语 + shn: 掸语 + xmf: 明格列尔语 + ka: 格鲁吉亚语 + km: 高棉语 + sat: 桑塔利语 zh-CN: 简体中文 zh-TW: 繁体中文 zh-HK: 中文（香港） @@ -2312,10 +2427,24 @@ zh-CN: licensing_4_osmf_license_page: OSMF 许可页面 credit_title_html: 如何表明作者是 OpenStreetMap credit_1_html: 当您使用 OpenStreetMap 的数据，您会被要求遵循两件事： + credit_2_attribution: 通过显示我们的署名声明，为OpenStreetMap提供署名。 credit_2_license: 明确数据在开放数据库许可证下可用。 + credit_3_v2025_html: |- + 对于署名通知，我们根据您使用我们数据的方式，有不同的%{requirements_on_how_displayed_link}。 + 例如，关于如何展示署名通知，适用不同的规则，这取决于您是否 + 创建了一个可浏览的地图、打印的地图或静态图像。 + 更多详细信息可在%{licensing_requirements_link}的%{attribution_guidelines_link}部分中找到。 credit_3_v2025_requirements_on_how_displayed: 关于如何显示的要求 credit_3_v2025_attribution_guidelines: 署名指南 credit_3_v2025_licensing_requirements: 许可证要求 + credit_4_v2025_html: |- + 一般来说， + 为了明确数据遵循开放数据库许可协议， + 您可以链接至%{this_copyright_page_link}。 + 如果您正在分发OSM（开放街道地图） + 数据表格，请直接命名并链接至相关许可证。 + 若无法提供链接（如印刷作品）， + 请在页面上包含完整的URL，例如%{copyright_page_url}。 credit_4_v2025_this_copyright_page: 该版权页 credit_5_v2025_html: 在此示例中，署名置于地图的角落： attribution_example: @@ -2788,6 +2917,9 @@ zh-CN: google: title: 使用Google登录 alt: Google 标志 + apple: + title: 使用Apple登录 + alt: Apple标志 facebook: title: 使用Facebook登录 alt: Facebook 标志 @@ -3309,6 +3441,7 @@ zh-CN: tracestracktop_topo: 地形地貌地图 hot: 人道救援地图 shortbread: 黄油酥饼 + openmaptiles_osm: MapTiler OMT layers: header: 地图图层 notes: 地图注记 @@ -3327,6 +3460,7 @@ zh-CN: tracestrack: 踪迹地图 hotosm_credit: 由%{osm_france_link}托管的%{hotosm_link}图块风格 hotosm_name: 人道主义开放街图团队 + openmaptiles_credit: 来自%{openmaptiles_link}的矢量图砖，由%{maptiler_link}托管 site: edit_tooltip: 编辑地图 edit_disabled_tooltip: 放大地图以编辑 @@ -3334,6 +3468,9 @@ zh-CN: createnote_disabled_tooltip: 放大地图以添加注记 queryfeature_tooltip: 查询特征 queryfeature_disabled_tooltip: 放大以查询特征 + profile: + social_link_n: 社交资料链接%{n} + remove_social_link_n: 删除社交资料链接%{n} edit_help: 移动地图并在您想编辑的位置放大，然后点击这里。 directions: distance_in_units: @@ -3440,6 +3577,7 @@ zh-CN: remote_edit: failed: title: 编辑失败 + body: 确保JOSM或Merkaartor已加载并且远程控制选项已启用 edit: id_not_configured: title: iD 尚未配置 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index fbb75992d..5e4eff5d8 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -413,9 +413,7 @@ zh-TW: relation: title_html: 關聯：%{name} members: 成員 - members_count: - one: '%{count}名成員' - other: '%{count}名成員們' + members_count: '%{count}個成員' relation_member: entry_role_html: '%{type} %{name} 作為 %{role}' type: -- 2.39.5 From ea1523023525d2fba785adccaf5899339923aba1 Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Fri, 3 Oct 2025 12:05:15 +0100 Subject: [PATCH 09/16] DRY up cookie handling --- app/assets/javascripts/index.js | 8 ++++---- app/assets/javascripts/index/directions.js | 6 +++--- app/assets/javascripts/index/new_note.js | 4 ++-- app/assets/javascripts/language_selector.js | 2 +- app/assets/javascripts/osm.js.erb | 4 +++- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 85288dca3..8f85669be 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -171,16 +171,16 @@ $(function () { map.getLayersCode(), map._object); - Cookies.set("_osm_location", OSM.locationCookie(map), { secure: true, expires: expiry, path: "/", samesite: "lax" }); + OSM.cookies.set("_osm_location", OSM.locationCookie(map), { expires: expiry }); }); - if (Cookies.get("_osm_welcome") !== "hide") { + if (OSM.cookies.get("_osm_welcome") !== "hide") { $(".welcome").removeAttr("hidden"); } $(".welcome .btn-close").on("click", function () { $(".welcome").hide(); - Cookies.set("_osm_welcome", "hide", { secure: true, expires: expiry, path: "/", samesite: "lax" }); + OSM.cookies.set("_osm_welcome", "hide", { expires: expiry }); }); const bannerExpiry = new Date(); @@ -191,7 +191,7 @@ $(function () { $("#banner").hide(); e.preventDefault(); if (cookieId) { - Cookies.set(cookieId, "hide", { secure: true, expires: bannerExpiry, path: "/", samesite: "lax" }); + OSM.cookies.set(cookieId, "hide", { expires: bannerExpiry }); } }); diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 463e11d69..0c0353c92 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -137,17 +137,17 @@ OSM.Directions = function (map) { } setEngine("fossgis_osrm_car"); - setEngine(Cookies.get("_osm_directions_engine")); + setEngine(OSM.cookies.get("_osm_directions_engine")); modeGroup.on("change", "input[name='modes']", function (e) { setEngine(chosenEngine.provider + "_" + e.target.value); - Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" }); + OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires: expiry }); getRoute(true, true); }); select.on("change", function (e) { setEngine(e.target.value + "_" + chosenEngine.mode); - Cookies.set("_osm_directions_engine", chosenEngine.id, { secure: true, expires: expiry, path: "/", samesite: "lax" }); + OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires: expiry }); getRoute(true, true); }); diff --git a/app/assets/javascripts/index/new_note.js b/app/assets/javascripts/index/new_note.js index 220559c58..a126b7100 100644 --- a/app/assets/javascripts/index/new_note.js +++ b/app/assets/javascripts/index/new_note.js @@ -146,8 +146,8 @@ OSM.NewNote = function (map) { createNote(location, text, (feature) => { if (typeof OSM.user === "undefined") { - const anonymousNotesCount = Number(Cookies.get("_osm_anonymous_notes_count")) || 0; - Cookies.set("_osm_anonymous_notes_count", anonymousNotesCount + 1, { secure: true, expires: 30, path: "/", samesite: "lax" }); + const anonymousNotesCount = Number(OSM.cookies.get("_osm_anonymous_notes_count")) || 0; + OSM.cookies.set("_osm_anonymous_notes_count", anonymousNotesCount + 1, { expires: 30 }); } content.find("textarea").val(""); addCreatedNoteMarker(feature); diff --git a/app/assets/javascripts/language_selector.js b/app/assets/javascripts/language_selector.js index 105c19f52..8380c1b0e 100644 --- a/app/assets/javascripts/language_selector.js +++ b/app/assets/javascripts/language_selector.js @@ -8,7 +8,7 @@ $(document).on("click", "#select_language_dialog [data-language-code]", function form.elements.language.value = code; form.submit(); } else { - Cookies.set("_osm_locale", code, { secure: true, path: "/", samesite: "lax" }); + OSM.cookies.set("_osm_locale", code); location.reload(); } }); diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index 0287590fc..d9b2530bf 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -27,6 +27,8 @@ OSM = { end.to_json %>, + cookies: Cookies.withAttributes({ path: "/", samesite: "lax", secure: true }), + DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>, LAYER_DEFINITIONS: <%= MapLayers::full_definitions("config/layers.yml", :legends => "config/legend.yml").to_json %>, @@ -73,7 +75,7 @@ OSM = { const hash = OSM.parseHash(); - const loc = Cookies.get("_osm_location")?.split("|"); + const loc = OSM.cookies.get("_osm_location")?.split("|"); function bboxToLatLngBounds({ minlon, minlat, maxlon, maxlat }) { return L.latLngBounds([minlat, minlon], [maxlat, maxlon]); -- 2.39.5 From 8f7fadf98151511defbeb49b1a3b5e0858a4eecb Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Mon, 6 Oct 2025 16:57:34 +0100 Subject: [PATCH 10/16] Secure cookies only when HTTPS expected This is particularly important if running system tests with a remote Selenium instance. HTTPS and localhost are considered "secure" for this purpose, while a remote Selenium will connect to the app with HTTP instead. --- app/assets/javascripts/osm.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb index d9b2530bf..56b6bd88e 100644 --- a/app/assets/javascripts/osm.js.erb +++ b/app/assets/javascripts/osm.js.erb @@ -27,7 +27,7 @@ OSM = { end.to_json %>, - cookies: Cookies.withAttributes({ path: "/", samesite: "lax", secure: true }), + cookies: Cookies.withAttributes({ path: "/", samesite: "lax", secure: <%= (Settings.server_protocol == "https").to_json %> }), DEFAULT_LOCALE: <%= I18n.default_locale.to_json %>, -- 2.39.5 From b5d96621756534b10e80840d73602f4036ff2bc2 Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Fri, 26 Sep 2025 13:39:19 +0100 Subject: [PATCH 11/16] Selenium/WebDriver thinks that `test` signals a fake file upload Hat tip to https://blog.konoson.com/webdrivererror-you-are-trying-to-upload-something-that-isnt-a-file --- test/application_system_test_case.rb | 2 +- test/controllers/sessions_controller_test.rb | 12 ++-- test/factories/user.rb | 2 +- test/integration/login_test.rb | 64 ++++++++++---------- test/integration/oauth2_test.rb | 2 +- test/integration/page_locale_test.rb | 4 +- test/integration/user_blocks_test.rb | 2 +- test/integration/user_diaries_test.rb | 2 +- test/integration/user_terms_seen_test.rb | 4 +- test/system/user_login_test.rb | 2 +- test/test_helper.rb | 2 +- 11 files changed, 49 insertions(+), 49 deletions(-) diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index fed9ee924..e10501f2b 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -37,7 +37,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase visit login_path within "form", :text => "Email Address or Username" do fill_in "username", :with => user.email - fill_in "password", :with => "test" + fill_in "password", :with => "s3cr3t" click_on "Log in" end end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb index 83499ca9d..49bda996b 100644 --- a/test/controllers/sessions_controller_test.rb +++ b/test/controllers/sessions_controller_test.rb @@ -42,24 +42,24 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "sessions/new" - get login_path, :params => { :username => user.display_name, :password => "test" } + get login_path, :params => { :username => user.display_name, :password => "s3cr3t" } assert_response :success assert_template "sessions/new" - post login_path, :params => { :username => user.display_name, :password => "test" } + post login_path, :params => { :username => user.display_name, :password => "s3cr3t" } assert_redirected_to root_path - post login_path, :params => { :username => " #{user.display_name}", :password => "test" } + post login_path, :params => { :username => " #{user.display_name}", :password => "s3cr3t" } assert_redirected_to root_path - post login_path, :params => { :username => "#{user.display_name} ", :password => "test" } + post login_path, :params => { :username => "#{user.display_name} ", :password => "s3cr3t" } assert_redirected_to root_path end def test_login_remembered user = create(:user) - post login_path, :params => { :username => user.display_name, :password => "test", :remember_me => "yes" } + post login_path, :params => { :username => user.display_name, :password => "s3cr3t", :remember_me => "yes" } assert_redirected_to root_path assert_equal 28 * 86400, session[:_remember_for] @@ -68,7 +68,7 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest def test_login_not_remembered user = create(:user) - post login_path, :params => { :username => user.display_name, :password => "test", :remember_me => "0" } + post login_path, :params => { :username => user.display_name, :password => "s3cr3t", :remember_me => "0" } assert_redirected_to root_path assert_nil session[:_remember_for] diff --git a/test/factories/user.rb b/test/factories/user.rb index b208ae974..b42b7619e 100644 --- a/test/factories/user.rb +++ b/test/factories/user.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -pass_crypt = PasswordHash.create("test").first +pass_crypt = PasswordHash.create("s3cr3t").first FactoryBot.define do factory :user do diff --git a/test/integration/login_test.rb b/test/integration/login_test.rb index 82e38c088..e3dc0368d 100644 --- a/test/integration/login_test.rb +++ b/test/integration/login_test.rb @@ -25,7 +25,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) _uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) } - try_password_login user.email, "test" + try_password_login user.email, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -36,7 +36,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) } - try_password_login uppercase_user.email, "test" + try_password_login uppercase_user.email, "s3cr3t" assert_template "changesets/history" assert_select "span.username", uppercase_user.display_name @@ -47,7 +47,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) _uppercase_user = build(:user, :email => user.email.upcase).tap { |u| u.save(:validate => false) } - try_password_login user.email.titlecase, "test" + try_password_login user.email.titlecase, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -57,7 +57,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password user = create(:user) - try_password_login user.email, "test" + try_password_login user.email, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -66,7 +66,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_upcase user = create(:user) - try_password_login user.email.upcase, "test" + try_password_login user.email.upcase, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -75,7 +75,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_titlecase user = create(:user) - try_password_login user.email.titlecase, "test" + try_password_login user.email.titlecase, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -84,7 +84,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_pending user = create(:user, :pending) - try_password_login user.email, "test" + try_password_login user.email, "s3cr3t" assert_template "confirm" assert_select "span.username", false @@ -93,7 +93,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_pending_upcase user = create(:user, :pending) - try_password_login user.email.upcase, "test" + try_password_login user.email.upcase, "s3cr3t" assert_template "confirm" assert_select "span.username", false @@ -102,7 +102,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_pending_titlecase user = create(:user, :pending) - try_password_login user.email.titlecase, "test" + try_password_login user.email.titlecase, "s3cr3t" assert_template "confirm" assert_select "span.username", false @@ -111,7 +111,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_suspended user = create(:user, :suspended) - try_password_login user.email, "test" + try_password_login user.email, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -123,7 +123,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_suspended_upcase user = create(:user, :suspended) - try_password_login user.email.upcase, "test" + try_password_login user.email.upcase, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -135,7 +135,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_suspended_titlecase user = create(:user, :suspended) - try_password_login user.email.titlecase, "test" + try_password_login user.email.titlecase, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -148,7 +148,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) create(:user_block, :needs_view, :user => user) - try_password_login user.email, "test" + try_password_login user.email, "s3cr3t" assert_template "user_blocks/show" assert_select "span.username", user.display_name @@ -158,7 +158,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) create(:user_block, :needs_view, :user => user) - try_password_login user.email.upcase, "test" + try_password_login user.email.upcase, "s3cr3t" assert_template "user_blocks/show" assert_select "span.username", user.display_name @@ -168,7 +168,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) create(:user_block, :needs_view, :user => user) - try_password_login user.email.titlecase, "test" + try_password_login user.email.titlecase, "s3cr3t" assert_template "user_blocks/show" assert_select "span.username", user.display_name @@ -182,7 +182,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) _uppercase_user = build(:user, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) } - try_password_login user.display_name, "test" + try_password_login user.display_name, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -193,7 +193,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) uppercase_user = build(:user, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) } - try_password_login uppercase_user.display_name, "test" + try_password_login uppercase_user.display_name, "s3cr3t" assert_template "changesets/history" assert_select "span.username", uppercase_user.display_name @@ -204,7 +204,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) _uppercase_user = build(:user, :display_name => user.display_name.upcase).tap { |u| u.save(:validate => false) } - try_password_login user.display_name.downcase, "test" + try_password_login user.display_name.downcase, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -214,7 +214,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password user = create(:user) - try_password_login user.display_name, "test" + try_password_login user.display_name, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -223,7 +223,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_upcase user = create(:user) - try_password_login user.display_name.upcase, "test" + try_password_login user.display_name.upcase, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -232,7 +232,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_downcase user = create(:user) - try_password_login user.display_name.downcase, "test" + try_password_login user.display_name.downcase, "s3cr3t" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -241,7 +241,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_pending user = create(:user, :pending) - try_password_login user.display_name, "test" + try_password_login user.display_name, "s3cr3t" assert_template "confirm" assert_select "span.username", false @@ -250,7 +250,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_pending_upcase user = create(:user, :pending) - try_password_login user.display_name.upcase, "test" + try_password_login user.display_name.upcase, "s3cr3t" assert_template "confirm" assert_select "span.username", false @@ -259,7 +259,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_pending_downcase user = create(:user, :pending) - try_password_login user.display_name.downcase, "test" + try_password_login user.display_name.downcase, "s3cr3t" assert_template "confirm" assert_select "span.username", false @@ -268,7 +268,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_suspended user = create(:user, :suspended) - try_password_login user.display_name, "test" + try_password_login user.display_name, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -280,7 +280,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_suspended_upcase user = create(:user, :suspended) - try_password_login user.display_name.upcase, "test" + try_password_login user.display_name.upcase, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -292,7 +292,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_suspended_downcase user = create(:user, :suspended) - try_password_login user.display_name.downcase, "test" + try_password_login user.display_name.downcase, "s3cr3t" assert_template "sessions/new" assert_select "span.username", false @@ -305,7 +305,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) create(:user_block, :needs_view, :user => user) - try_password_login user.display_name.upcase, "test" + try_password_login user.display_name.upcase, "s3cr3t" assert_template "user_blocks/show" assert_select "span.username", user.display_name @@ -315,7 +315,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) create(:user_block, :needs_view, :user => user) - try_password_login user.display_name, "test" + try_password_login user.display_name, "s3cr3t" assert_template "user_blocks/show" assert_select "span.username", user.display_name @@ -325,7 +325,7 @@ class LoginTest < ActionDispatch::IntegrationTest user = create(:user) create(:user_block, :needs_view, :user => user) - try_password_login user.display_name.downcase, "test" + try_password_login user.display_name.downcase, "s3cr3t" assert_template "user_blocks/show" assert_select "span.username", user.display_name @@ -334,7 +334,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_email_password_remember_me user = create(:user) - try_password_login user.email, "test", "yes" + try_password_login user.email, "s3cr3t", "yes" assert_template "changesets/history" assert_select "span.username", user.display_name @@ -344,7 +344,7 @@ class LoginTest < ActionDispatch::IntegrationTest def test_login_username_password_remember_me user = create(:user) - try_password_login user.display_name, "test", "yes" + try_password_login user.display_name, "s3cr3t", "yes" assert_template "changesets/history" assert_select "span.username", user.display_name diff --git a/test/integration/oauth2_test.rb b/test/integration/oauth2_test.rb index 106ec6844..a0eea00ec 100644 --- a/test/integration/oauth2_test.rb +++ b/test/integration/oauth2_test.rb @@ -161,7 +161,7 @@ class OAuth2Test < ActionDispatch::IntegrationTest get oauth_authorization_path(options) assert_redirected_to login_path(:referer => request.fullpath) - post login_path(:username => user.email, :password => "test") + post login_path(:username => user.email, :password => "s3cr3t") follow_redirect! assert_response :success diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb index afeb0334a..eb5be2da7 100644 --- a/test/integration/page_locale_test.rb +++ b/test/integration/page_locale_test.rb @@ -9,7 +9,7 @@ class PageLocaleTest < ActionDispatch::IntegrationTest get "/login" follow_redirect! - post "/login", :params => { :username => user.email, :password => "test" } + post "/login", :params => { :username => user.email, :password => "s3cr3t" } follow_redirect! get "/diary/new" @@ -34,7 +34,7 @@ class PageLocaleTest < ActionDispatch::IntegrationTest get "/login" follow_redirect! - post "/login", :params => { :username => user.email, :password => "test" } + post "/login", :params => { :username => user.email, :password => "s3cr3t" } follow_redirect! get "/diary" diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb index dbdaf00df..8610485f0 100644 --- a/test/integration/user_blocks_test.rb +++ b/test/integration/user_blocks_test.rb @@ -43,7 +43,7 @@ class UserBlocksTest < ActionDispatch::IntegrationTest assert_response :redirect follow_redirect! assert_response :success - post "/login", :params => { "username" => moderator.email, "password" => "test", :referer => "/user_blocks/#{block.id}/edit" } + post "/login", :params => { "username" => moderator.email, "password" => "s3cr3t", :referer => "/user_blocks/#{block.id}/edit" } assert_response :redirect follow_redirect! assert_response :success diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb index a6f8c3a62..4aac8fa72 100644 --- a/test/integration/user_diaries_test.rb +++ b/test/integration/user_diaries_test.rb @@ -15,7 +15,7 @@ class UserDiariesTest < ActionDispatch::IntegrationTest assert_response :success assert_template "sessions/new" # We can now login - post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/diary/new" } + post "/login", :params => { "username" => user.email, "password" => "s3cr3t", :referer => "/diary/new" } assert_response :redirect follow_redirect! assert_response :success diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb index b8539a5f6..983776e65 100644 --- a/test/integration/user_terms_seen_test.rb +++ b/test/integration/user_terms_seen_test.rb @@ -25,7 +25,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "sessions/new" - post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" } + post "/login", :params => { :username => user.email, :password => "s3cr3t", :referer => "/diary/new" } # but now we need to look at the terms assert_redirected_to account_terms_path(:referer => "/diary/new") follow_redirect! @@ -49,7 +49,7 @@ class UserTermsSeenTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "sessions/new" - post "/login", :params => { :username => user.email, :password => "test", :referer => "/diary/new" } + post "/login", :params => { :username => user.email, :password => "s3cr3t", :referer => "/diary/new" } # but now we need to look at the terms assert_redirected_to account_terms_path(:referer => "/diary/new") diff --git a/test/system/user_login_test.rb b/test/system/user_login_test.rb index 07501a885..2a18487f6 100644 --- a/test/system/user_login_test.rb +++ b/test/system/user_login_test.rb @@ -17,7 +17,7 @@ class UserLoginTest < ApplicationSystemTestCase end fill_in "username", :with => user2.email - fill_in "password", :with => "test" + fill_in "password", :with => "s3cr3t" click_on "Log in" assert_button "Second User" diff --git a/test/test_helper.rb b/test/test_helper.rb index 7416b9a4f..ae784239c 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -210,7 +210,7 @@ module ActiveSupport def session_for(user) get login_path - post login_path, :params => { :username => user.display_name, :password => "test" } + post login_path, :params => { :username => user.display_name, :password => "s3cr3t" } follow_redirect! end -- 2.39.5 From adf561a1f7f251a323982170b967ded9104452fd Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 7 Oct 2025 18:09:51 +0100 Subject: [PATCH 12/16] Update bundle --- Gemfile.lock | 176 ++++++++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 87 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b92722a4f..634b762ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,7 +101,7 @@ GEM autoprefixer-rails (10.4.21.0) execjs (~> 2) aws-eventstream (1.4.0) - aws-partitions (1.1167.0) + aws-partitions (1.1168.0) aws-sdk-core (3.233.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -132,7 +132,7 @@ GEM erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.2.3) + bigdecimal (3.3.0) bindata (2.5.1) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) @@ -263,7 +263,7 @@ GEM dry-initializer (~> 3.2) dry-schema (~> 1.14) zeitwerk (~> 2.6) - erb (5.0.2) + erb (5.0.3) erb_lint (0.9.0) activesupport better_html (>= 2.0.1) @@ -283,7 +283,7 @@ GEM faraday-net_http (>= 2.0, < 3.5) json logger - faraday-follow_redirects (0.3.0) + faraday-follow_redirects (0.4.0) faraday (>= 1, < 3) faraday-http-cache (2.5.1) faraday (>= 0.8) @@ -363,7 +363,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.15.0) + json (2.15.1) json-jwt (1.17.0) activesupport (>= 4.2) aes_key_wrap @@ -411,7 +411,7 @@ GEM nap (1.1.0) net-http (0.6.0) uri - net-imap (0.5.10) + net-imap (0.5.12) date net-protocol net-pop (0.1.2) @@ -441,8 +441,9 @@ GEM octokit (10.0.0) faraday (>= 1, < 3) sawyer (~> 0.9) - omniauth (2.1.3) + omniauth (2.1.4) hashie (>= 3.4.6) + logger rack (>= 2.2.3) rack-protection omniauth-apple (1.3.0) @@ -497,20 +498,20 @@ GEM opentelemetry-common (~> 0.21) opentelemetry-instrumentation-action_mailer (0.5.0) opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-action_pack (0.14.0) + opentelemetry-instrumentation-action_pack (0.14.1) opentelemetry-instrumentation-rack (~> 0.21) opentelemetry-instrumentation-action_view (0.10.0) opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-active_job (0.9.0) - opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-active_job (0.9.2) + opentelemetry-instrumentation-base (~> 0.24) opentelemetry-instrumentation-active_model_serializers (0.23.0) opentelemetry-instrumentation-active_support (>= 0.7.0) - opentelemetry-instrumentation-active_record (0.10.0) - opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-active_record (0.10.1) + opentelemetry-instrumentation-base (~> 0.24) opentelemetry-instrumentation-active_storage (0.2.0) opentelemetry-instrumentation-active_support (~> 0.7) - opentelemetry-instrumentation-active_support (0.9.0) - opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-active_support (0.9.1) + opentelemetry-instrumentation-base (~> 0.24) opentelemetry-instrumentation-all (0.84.0) opentelemetry-instrumentation-active_model_serializers (~> 0.23.0) opentelemetry-instrumentation-anthropic (~> 0.2.0) @@ -549,67 +550,67 @@ GEM opentelemetry-instrumentation-sidekiq (~> 0.27.0) opentelemetry-instrumentation-sinatra (~> 0.27.0) opentelemetry-instrumentation-trilogy (~> 0.63.0) - opentelemetry-instrumentation-anthropic (0.2.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-aws_lambda (0.5.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-aws_sdk (0.9.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-base (0.23.0) - opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-anthropic (0.2.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-aws_lambda (0.5.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-aws_sdk (0.9.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-base (0.24.0) + opentelemetry-api (~> 1.7) opentelemetry-common (~> 0.21) opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-bunny (0.23.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-concurrent_ruby (0.23.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-dalli (0.28.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-delayed_job (0.24.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-ethon (0.24.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-excon (0.25.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-faraday (0.29.0) - opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-bunny (0.23.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-concurrent_ruby (0.23.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-dalli (0.28.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-delayed_job (0.24.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-ethon (0.24.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-excon (0.25.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-faraday (0.29.1) + opentelemetry-instrumentation-base (~> 0.24) opentelemetry-instrumentation-grape (0.4.0) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-graphql (0.30.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-grpc (0.3.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-gruf (0.4.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-http (0.26.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-http_client (0.25.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-httpx (0.4.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-koala (0.22.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-lmdb (0.24.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-mongo (0.24.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-mysql2 (0.30.0) + opentelemetry-instrumentation-graphql (0.30.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-grpc (0.3.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-gruf (0.4.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-http (0.26.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-http_client (0.25.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-httpx (0.4.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-koala (0.22.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-lmdb (0.24.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-mongo (0.24.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-mysql2 (0.30.1) opentelemetry-helpers-mysql opentelemetry-helpers-sql opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-net_http (0.25.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-pg (0.31.0) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-net_http (0.25.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-pg (0.31.1) opentelemetry-helpers-sql opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-que (0.10.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-racecar (0.5.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-rack (0.28.0) - opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-que (0.10.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-racecar (0.5.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-rack (0.28.2) + opentelemetry-instrumentation-base (~> 0.24) opentelemetry-instrumentation-rails (0.38.0) opentelemetry-instrumentation-action_mailer (~> 0.4) opentelemetry-instrumentation-action_pack (~> 0.13) @@ -619,27 +620,27 @@ GEM opentelemetry-instrumentation-active_storage (~> 0.1) opentelemetry-instrumentation-active_support (~> 0.8) opentelemetry-instrumentation-concurrent_ruby (~> 0.22) - opentelemetry-instrumentation-rake (0.4.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-rdkafka (0.8.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-redis (0.27.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-resque (0.7.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-restclient (0.25.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-ruby_kafka (0.23.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-sidekiq (0.27.0) - opentelemetry-instrumentation-base (~> 0.23) - opentelemetry-instrumentation-sinatra (0.27.0) + opentelemetry-instrumentation-rake (0.4.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-rdkafka (0.8.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-redis (0.27.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-resque (0.7.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-restclient (0.25.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-ruby_kafka (0.23.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-sidekiq (0.27.1) + opentelemetry-instrumentation-base (~> 0.24) + opentelemetry-instrumentation-sinatra (0.27.1) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-trilogy (0.63.0) + opentelemetry-instrumentation-trilogy (0.63.1) opentelemetry-helpers-mysql opentelemetry-helpers-sql opentelemetry-helpers-sql-obfuscation - opentelemetry-instrumentation-base (~> 0.23) + opentelemetry-instrumentation-base (~> 0.24) opentelemetry-semantic_conventions (>= 1.8.0) opentelemetry-registry (0.4.0) opentelemetry-api (~> 1.1) @@ -661,7 +662,7 @@ GEM racc pg (1.6.2) popper_js (2.11.8) - pp (0.6.2) + pp (0.6.3) prettyprint prettyprint (0.2.0) prism (1.5.1) @@ -676,7 +677,7 @@ GEM nio4r (~> 2.0) quad_tile (1.0.1) racc (1.8.1) - rack (3.2.1) + rack (3.2.2) rack-cors (3.0.0) logger rack (>= 3.0.14) @@ -738,9 +739,10 @@ GEM rb-inotify (0.11.1) ffi (~> 1.0) rchardet (1.10.0) - rdoc (6.14.2) + rdoc (6.15.0) erb psych (>= 4.0.0) + tsort regexp_parser (2.11.3) reline (0.6.2) io-console (~> 0.5) @@ -854,7 +856,7 @@ GEM unicode-display_width (3.2.0) unicode-emoji (~> 4.1) unicode-emoji (4.1.0) - uri (0.13.2) + uri (0.13.3) useragent (0.16.11) validates_email_format_of (1.8.2) i18n (>= 0.8.0) -- 2.39.5 From 2a05d3233227250f7f56a26103598ff255f5afd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 23:01:09 +0000 Subject: [PATCH 13/16] Bump ruby/setup-ruby from 1.263.0 to 1.264.0 Bumps [ruby/setup-ruby](https://github.com/ruby/setup-ruby) from 1.263.0 to 1.264.0. - [Release notes](https://github.com/ruby/setup-ruby/releases) - [Changelog](https://github.com/ruby/setup-ruby/blob/master/release.rb) - [Commits](https://github.com/ruby/setup-ruby/compare/0481980f17b760ef6bca5e8c55809102a0af1e5a...6797dcbb9a1889fd411d07e8aba7eded53fb8b48) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.264.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/danger.yml | 2 +- .github/workflows/lint.yml | 10 +++++----- .github/workflows/tests.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 8db99abb8..9de19dd3c 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - name: Setup ruby - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 + uses: ruby/setup-ruby@6797dcbb9a1889fd411d07e8aba7eded53fb8b48 # v1.264.0 with: ruby-version: 3.2 rubygems: 3.4.10 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2b4e71b03..1bf93b7a2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: - name: Check out code uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup ruby - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 + uses: ruby/setup-ruby@6797dcbb9a1889fd411d07e8aba7eded53fb8b48 # v1.264.0 with: ruby-version: ${{ env.ruby }} rubygems: 3.4.10 @@ -31,7 +31,7 @@ jobs: - name: Check out code uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup ruby - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 + uses: ruby/setup-ruby@6797dcbb9a1889fd411d07e8aba7eded53fb8b48 # v1.264.0 with: ruby-version: ${{ env.ruby }} rubygems: 3.4.10 @@ -46,7 +46,7 @@ jobs: - name: Check out code uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup ruby - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 + uses: ruby/setup-ruby@6797dcbb9a1889fd411d07e8aba7eded53fb8b48 # v1.264.0 with: ruby-version: ${{ env.ruby }} rubygems: 3.4.10 @@ -69,7 +69,7 @@ jobs: - name: Check out code uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup ruby - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 + uses: ruby/setup-ruby@6797dcbb9a1889fd411d07e8aba7eded53fb8b48 # v1.264.0 with: ruby-version: ${{ env.ruby }} rubygems: 3.4.10 @@ -86,7 +86,7 @@ jobs: - name: Check out code uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup ruby - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 + uses: ruby/setup-ruby@6797dcbb9a1889fd411d07e8aba7eded53fb8b48 # v1.264.0 with: ruby-version: ${{ env.ruby }} rubygems: 3.4.10 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3d438017d..1660833d9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: - name: Checkout source uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Setup ruby - uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 + uses: ruby/setup-ruby@6797dcbb9a1889fd411d07e8aba7eded53fb8b48 # v1.264.0 with: ruby-version: ${{ matrix.ruby }} rubygems: 3.4.10 -- 2.39.5 From 1de5cc253f4c8566a8e88ce6d9d0a6fc6380c784 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 9 Oct 2025 14:24:57 +0200 Subject: [PATCH 14/16] Localisation updates from https://translatewiki.net. --- config/locales/ca.yml | 247 +++++++++++++++++++++++++++++- config/locales/el.yml | 6 + config/locales/fr.yml | 2 - config/locales/frp.yml | 6 + config/locales/gl.yml | 6 + config/locales/hi.yml | 2 + config/locales/hr.yml | 320 ++++++++++++++++++++------------------- config/locales/it.yml | 4 + config/locales/mk.yml | 7 + config/locales/shn.yml | 2 + config/locales/sr.yml | 3 + config/locales/uk.yml | 4 +- config/locales/zh-TW.yml | 5 + 13 files changed, 451 insertions(+), 163 deletions(-) diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d64248345..326827c79 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1183,7 +1183,7 @@ ca: stone: Pedra tomb: Tomba tower: Torre - wayside_chapel: Capella Wayside + wayside_chapel: Capella a la vora del camí wayside_cross: Creu de terme wayside_shrine: Oratori wreck: Derelicte @@ -2519,14 +2519,43 @@ ca: licensing_1_open: obertes licensing_1_odc_odbl: Llicència de base de dades oberta d'Open Data Commons licensing_1_osm_foundation: Fundació OpenStreetMap + licensing_2_html: Sou lliure de copiar, distribuir, transmetre i adaptar les + nostres dades, sempre que especifiqueu que són obra d'OpenStreetMap i els + seus col·laboradors. Si modifiqueu o amplieu les nostres dades, només podreu + distribuir l'obra resultant amb la mateixa llicència. El %{legal_code_link} + complet explica detalladament els vostres drets i responsabilitats. + licensing_2_legal_code: codi legal complet a Open Data Commons + licensing_3_html: La documentació està sota llicència %{creative_commons_license_link} + (CC BY-SA 2.0). + licensing_3_creative_commons_license: Creative Commons Reconeixement-Compartir + Igual 2.0 llicència + licensing_3_creative_commons_license_url: https://creativecommons.org/licenses/by-sa/2.0/ + licensing_4_html: Més informació sobre l'ús de les nostres dades a %{osmf_license_page_link}. licensing_4_osmf_license_page: Pàgina de llicència de l'OSMF credit_title_html: Com atribuir autoria a OpenStreetMap credit_1_html: 'Allà on utilitzeu les dades de l''OpenStreetMap, cal que feu les dues coses següents:' + credit_2_attribution: Doneu reconeixement a OpenstreetMap mostrant l'avís + de copyright. credit_2_license: Deixeu clar que les dades estan disponibles sota la llicència de base de dades oberta (ODbL). + credit_3_v2025_html: |- + Per a l'avís d'atribució, tenim diferents %{requirements_on_how_displayed_link}, depenent de com utilitzeu les nostres dades. + Per exemple, s'apliquen regles diferents sobre com mostrar l'avís d'atribució depenent de si heu creat un mapa navegable, un mapa imprès o una imatge estàtica. + Podeu trobar més detalls a la secció %{attribution_guidelines_link} de %{licensing_requirements_link}. + credit_3_v2025_requirements_on_how_displayed: requisits sobre com s'hauria + de mostrar això credit_3_v2025_attribution_guidelines: directrius d'atribució + credit_3_v2025_licensing_requirements: els requisits de llicència + credit_4_v2025_html: En general, per deixar clar que les dades estan disponibles + sota la llicència Open Database, podeu enllaçar a %{this_copyright_page_link}. + Si distribuïu OSM en un formulari de dades, si us plau, anomeneu i enllaceu + directament a la llicència o a les llicències. En suports on no es poden + introduir enllaços (per exemple, obres impreses), incloeu l'URL complet + de la pàgina, per exemple %{copyright_page_url}. credit_4_v2025_this_copyright_page: aquesta pàgina de copyright + credit_5_v2025_html: 'En aquest exemple, el crèdit apareix a la cantonada + del mapa:' attribution_example: alt: Exemple de com atribuir l'autoria a OpenStreetMap en una pàgina web title: Exemple d'atribució d'autoria @@ -2545,6 +2574,11 @@ ca: són marques registrades de la Fundació OpenStreetMap. Si teniu dubtes sobre l'ús de les marques, vegeu %{trademark_policy_link}. trademarks_1_1_trademark_policy: Polítiques de marca registrada + services_title_html: Serveis addicionals + services_1_html: |- + Tot i que OpenStreetMap són dades obertes, no podem proporcionar + una API gratuïta als mapes per a tercers. + Vegeu la %{api_usage_policy_link}, %{tile_usage_policy_link} i %{nominatim_usage_policy_link}. services_1_api_usage_policy: Política d'ús de l'API services_1_tile_usage_policy: Política d'ús de les tessel·les services_1_nominatim_usage_policy: Política d'ús de Nominatim @@ -2552,26 +2586,56 @@ ca: contributors_intro_html: 'Els nostres col·laboradors són milers de persones. També incloem dades amb llicència oberta de les agències públiques de cartografia i d''altres fonts, entre elles:' + contributors_at_credit_html: '%{austria}: Conté dades de %{stadt_wien_link} + (sota %{cc_by_link}), %{land_vorarlberg_link} i Land Tirol (sota %{cc_by_at_with_amendments_link}).' contributors_at_austria: Àustria contributors_at_stadt_wien: Ciutat de Viena contributors_at_cc_by: CC BY contributors_at_land_vorarlberg: Estat de Vorarlberg contributors_at_cc_by_at_with_amendments: CC BY AT amb esmenes + contributors_au_credit_html: '%{australia}: Incorpora o desenvolupa utilitzant + els límits administratius © %{geoscape_australia_link} amb llicència de + la Commonwealth d''Austràlia sota %{cc_licence_link}.' contributors_au_australia: Austràlia + contributors_au_geoscape_australia: Geoscape Austràlia + contributors_au_cc_licence: Llicència Creative Commons Reconeixement 4.0 Internacional + (CC BY 4.0) + contributors_ca_credit_html: '%{canada}: Conté dades de GeoBase®, GeoGratis + (© Department of Natural Resources Canada), CanVec (© Department of Natural + Resources Canada) i StatCan (Geography Division, Statistics Canada).' contributors_ca_canada: Canadà + contributors_cz_credit_html: '%{czechia}: Conté dades de l''Administració + Estatal de Topografia i Cadastre amb llicència %{cc_licence_link}' contributors_cz_czechia: Txèquia contributors_cz_cc_licence: Llicència Creative Commons Reconeixement 4.0 Internacional (CC BY 4.0) + contributors_fi_credit_html: '%{finland}: Conté dades de la base de dades + topogràfica del Servei Nacional de topografia de Finlàndia i altres conjunts + de dades, sota la %{nlsfi_license_link}.' contributors_fi_finland: Finlàndia + contributors_fi_nlsfi_license: llicència NLSFI contributors_fr_credit_html: '%{france}: Conté dades d''origen de la «Direction Générale des Impôts».' contributors_fr_france: França + contributors_hr_credit_html: '%{croatia}: Conté dades de %{dgu_link} i %{open_data_portal} + (informació pública de Croàcia).' contributors_hr_croatia: Croàcia + contributors_hr_dgu: Administració Geodèsica Estatal de Croàcia + contributors_hr_open_data_portal: Portal Nacional de Dades Obertes + contributors_nl_credit_html: '%{netherlands}: Conté dades © AND, 2007 (%{and_link})' contributors_nl_netherlands: Països Baixos + contributors_nz_credit_html: '%{new_zealand}: Conté dades del %{linz_data_service_link} + i amb llicència per a la seva reutilització sota %{cc_by_link}.' contributors_nz_new_zealand: Nova Zelanda + contributors_nz_linz_data_service: Servei de dades LINZ contributors_nz_cc_by: CC BY 4.0 + contributors_rs_credit_html: '%{serbia}: Conté dades de %{rgz_link} i %{open_data_portal} + (informació pública de Sèrbia), 2018.' contributors_rs_serbia: Sèrbia contributors_rs_rgz: Autoritat geodèsica sèrbia + contributors_rs_open_data_portal: Portal Nacional de Dades Obertes + contributors_si_credit_html: '%{slovenia}: Conté dades de %{gu_link} i %{mkgp_link} + (informació pública d''Eslovènia).' contributors_si_slovenia: Eslovènia contributors_si_gu: Autoritat de topografia i cartografia contributors_si_mkgp: Ministeri d'Agricultura, Forestal i Alimentació @@ -2641,6 +2705,12 @@ ca: description: Fonts addicionals llistades al wiki d'OpenStreetMap export_button: Exporta export_download: S'està baixant... + confirmation: + header: Descarregar les dades XML + body: Voleu descarregar les dades del mapa d'aquesta zona en format XML? Tingueu + en compte que les zones grans poden trigar una estona a descarregar-se. + cancel: Cancel·la + download: Baixar fixthemap: title: Informeu d'un problema / Corregiu el mapa how_to_help: @@ -2775,6 +2845,9 @@ ca: title: No tens temps per editar? Escriu una nota para_1: Si només voleu fer una petita modificació, però no disposeu del temps per registrar-vos i aprendre a editar, deixeu una nota al mapa. + para_2_html: |- + Feu clic a %{note_icon} o a la mateixa icona sobre %{map_link}. + Això afegirà un marcador al mapa, que podeu desplaçar arrossegant-lo. Afegiu el vostre missatge, deseu-lo i altres usuaris ho investigaran. the_map: el mapa communities: title: Comunitats @@ -2796,6 +2869,9 @@ ca: De fet, molts grups existeixen amb molt d'èxit com a reunió informal de persones o com a grup comunitari. Qualsevol pot configurar o unir-se a aquests. Més informació a la %{communities_wiki_link}. communities_wiki: Pàgina wiki de les comunitats + social_links: + show: + website: lloc web layers_panes: show: map_notes_zoom_in_tooltip: Feu zoom per veure les notes del mapa @@ -2813,6 +2889,7 @@ ca: track: Pista - Camí bridleway: Camí de ferradura cycleway: Carril bici + international_bike_route: Carril bici nacional national_bike_route: Carril bici nacional regional_bike_route: Carril bici regional local_bike_route: Carril bici local @@ -2889,6 +2966,7 @@ ca: bicycle_parking: Aparcament de bicicletes bicycle_parking_small: Aparcament de bicicletes petit toilets: Lavabos + see_external_legend: Vegeu la llegenda del mapa extern share_panes: show: link: Enllaç o HTML @@ -2901,6 +2979,8 @@ ca: paste_html: Enganxa l'HTML per inserir-ho a un lloc web geo_uri: Geo-URI image: Imatge + only_layers_exported_as_image: 'Només es poden exportar com a imatge les capes + següents:' format: 'Format:' scale: 'Escala:' custom_dimensions: Estableix dimensions personalitzades @@ -3034,6 +3114,9 @@ ca: google: title: Inicieu la sessió amb Google alt: Logotip de Google + apple: + title: Inicieu la sessió amb Apple + alt: Logotip d'Apple facebook: title: Inicieu la sessió amb Facebook alt: Logotip de Facebook @@ -3047,31 +3130,51 @@ ca: title: Inicieu la sessió amb Viquipèdia alt: Logotip de Viquipèdia share: + share: + title: Comparteix + alt: Icona de compartir email: + title: Comparteix per correu electrònic alt: Icona de correu electrònic bluesky: + title: Comparteix via Bluesky alt: Icona de Bluesky + facebook: + title: Comparteix via Facebook + alt: Icona de Facebook linkedin: + title: Comparteix via LinkedIn alt: Icona de LinkedIn mastodon: + title: Comparteix a Mastodon alt: Icona de Mastodon telegram: + title: Comparteix a Telegram alt: Icona de Telegram x: + title: Comparteix a X alt: Icona de X oauth: permissions: missing: No heu permès l'accés de l'aplicació a aquesta característica scopes: + openid: Inicia la sessió amb OpenStreetMap read_prefs: Llegeix les preferències d'usuari write_prefs: Modifica les preferències d'usuari write_diary: Creeu entrades del diari i comentaris write_api: Modifica el mapa + write_changeset_comments: Comentari sobre els conjunts de canvis read_gpx: Llegiu traces de GPS privades write_gpx: Carrega traces de GPS write_notes: Modifica les notes + write_redactions: Censurar dades del mapa + write_blocks: Crear i revocar blocs d'usuari read_email: Llegir adreça de correu electrònic d'usuari + consume_messages: Llegir, actualitzar l'estat i suprimir els missatges de l'usuari + send_messages: Enviar missatges privats a altres usuaris skip_authorization: Aprovar automàticament l'aplicació + for_roles: + moderator: Aquest permís només està disponible per a accions per a moderadors oauth2_applications: index: title: Les meves aplicacions client @@ -3139,15 +3242,24 @@ ca: arreglar-lo, actualitzar-lo, descarregar-lo i utilitzar-lo. paragraph_2: Registreu-vos per començar a contribuir. welcome: Benvingut/da a OpenStreetMap + duplicate_social_email: Si ja teniu un compte d'OpenStreetMap i voleu fer servir + un proveïdor d'identitat de tercers, inicieu la sessió amb la vostra contrasenya + i modifiqueu la configuració del vostre compte. display name description: El nom d'usuari que es mostrarà públicament. El podeu canviar més endavant a les preferències. by_signing_up: + html: En registrar-vos, accepteu les nostres %{tou_link}, %{privacy_policy_link} + i %{contributor_terms_link}. + tou: condicions d’ús privacy_policy: política de privadesa privacy_policy_title: Política de privadesa de l'OSMF incloent la secció sobre adreces de correu electrònic contributor_terms: condicions de col·laboració continue: Registreu-vos-hi email_help: + privacy_policy: política de privadesa + privacy_policy_title: Política de privadesa de l'OSMF incloent la secció sobre + adreces de correu electrònic html: La vostra adreça no es mostrarà públicament, consulteu la nostra %{privacy_policy_link} per obtenir més informació. or: o @@ -3172,12 +3284,17 @@ ca: blocks on me: Blocs sobre mi blocks by me: Blocs fets per mi create_mute: Silencia aquest usuari + destroy_mute: No silencieu aquest usuari send message: Envia un missatge diary: Diari edits: Edicions traces: Traces notes: Notes de mapa + unfollow: Deixar de seguir + follow: Seguir mapper since: 'Cartografiant des de:' + last map edit: 'Ùltima edició del mapa:' + no activity yet: Encara no hi ha activitat uid: 'ID d''usuari:' ct status: 'Termes de col·laboració:' ct undecided: No decidit @@ -3188,6 +3305,7 @@ ca: spam score: 'Puntuació de contingut brossa:' block_history: Blocatges actius moderator_history: Blocatges fets + revoke_all_blocks: Revocar tots els blocs comments: Comentaris create_block: Bloca aquest usuari activate_user: Activa aquest usuari @@ -3199,6 +3317,19 @@ ca: delete_user: Suprimeix aquest usuari confirm: Confirma report: Denuncieu aquest usuari + edit_profile_details: Editar els detalls del perfil + edit_description: Editar la descripció + edit_links: Modificar els enllaços + change_image: Canviar la imatge + edit_company: Editar l'empresa + edit_location: Editar la ubicació + contributions: + one: '%{count} contribució en l''últim any' + other: '%{count} contribucions en l''últim any' + sidebar_section: + home_location: La vostra ubicació + company: Empresa + company_tooltip: L'afiliació a l'empresa és autodeclarada i no verificada go_public: flash success: Ara totes les vostres edicions són públiques i ja teniu autorització per editar @@ -3213,6 +3344,13 @@ ca: heading_html: Llista de quadres a %{name} empty: '%{name} no ha estat blocat encara.' edit: + title: Revocant tots els bloquejos a %{block_on} + heading_html: Revocant tots els bloquejos a %{block_on} + empty: '%{name} no té cap bloqueig actiu.' + confirm: Esteu segur que voleu revocar %{active_blocks}? + active_blocks: + one: '%{count} bloqueig actiu' + other: '%{count} bloquejos actius' revoke: Revoca destroy: flash: S'han revocat tots els bloquejos actius. @@ -3220,15 +3358,40 @@ ca: show: title: Usuaris heading: Usuaris + select_status: Seleccionar estat + states: + pending: Pendent + active: Actiu + confirmed: Confirmat + suspended: Aturat + deleted: Suprimit + name_or_email: Nom o correu electrònic + ip_address: Adreça IP + edits: Edicions? + has_edits: Té edicions + no_edits: Cap edició + search: Cercar page: + found_users: + one: '%{count} usuari trobat' + other: '%{count} usuaris trobats' confirm: Confirmar usuaris seleccionats hide: Amaga els usuaris seleccionats empty: No hi ha usuaris que coincideixin s'ha trobat user: summary_html: '%{name} creat a partir de %{ip_address} el %{date}' summary_no_ip_html: '%{name} creat el %{date}' + comments: + index: + heading_html: Comentaris de %{user} + changesets: Conjunts de canvis + diary_entries: Entrades del diari + no_comments: Cap comentari changeset_comments: + index: + title: Comentaris del conjunt de canvis afegits per %{user} page: + changeset: Conjunt de canvis when: Quan comment: Comentari diary_comments: @@ -3236,6 +3399,8 @@ ca: title: Comentaris del diari afegits per %{user} page: post: Publicar + when: Quan + comment: Comentari suspended: title: Compte suspès heading: Compte suspès @@ -3263,14 +3428,17 @@ ca: title: administrator: Aquest usuari és administrador moderator: Aquest usuari és moderador + importer: Aquest usuari és un importador grant: administrator: Concedeix accés d'administrador moderator: Concedeix accés de moderador + importer: Concedir accés a l'importador are_you_sure: Esteu segur que voleu concedir el paper «%{role}» a l'usuari «%{name}»? revoke: administrator: Revoca l'accés d'administrador moderator: Revocar l'accés de moderador + importer: Revocar l'accés a l'importador are_you_sure: Esteu segur que voleu revocar el rol «%{role}» de l'usuari «%{name}»? user_role: filter: @@ -3294,6 +3462,7 @@ ca: title: Bloc d'edició en %{name} heading_html: Bloc d'edició en %{name} period: Quant de temps, a partir d'ara, l'usuari tindrà blocat l'accés a l'API. + revoke: Suprimeix el blocatge filter: block_period: El període de blocatge ha de ser un dels valors seleccionables de la llista desplegable. @@ -3301,6 +3470,12 @@ ca: flash: Crear un bloc a l'usuari %{name}. update: only_creator_can_edit: Només el moderador que ha creat aquest bloc pot editar-lo. + only_creator_can_edit_without_revoking: Només el moderador que ha creat aquest + blocatge pot editar-lo. + only_creator_or_revoker_can_edit: Només els moderadors que han creat o revocat + aquest blocatge el poden editar. + inactive_block_cannot_be_reactivated: Aquest blocatge està inactiu i no es pot + reactivar. success: Bloc d'actualització. index: title: Blocs de l'usuari @@ -3328,6 +3503,14 @@ ca: years: one: '%{count} any' other: '%{count} anys' + short: + ended: acabat + revoked_html: revocat per %{name} + active: actiu + active_until_read: actiu fins que es llegeixi + read_html: llegit a %{time} + time_in_future_title: '%{time_absolute}; en %{time_relative}' + time_in_past_title: '%{time_absolute}; %{time_relative}' show: title: '%{block_on} blocat per %{block_by}' heading_html: '%{block_on} blocat per %{block_by}' @@ -3344,6 +3527,8 @@ ca: display_name: S'ha blocat l'usuari creator_name: Creador reason: Motiu del blocatge + start: Inici + end: Final status: Estat navigation: all_blocks: Tots els bloquejos @@ -3352,6 +3537,7 @@ ca: blocks_by_me: Bloquejos fets per mi blocks_by_user_html: Bloquejos fets per %{user} block: 'Bloqueig #%{id}' + new_block: Nou bloqueig user_mutes: index: title: Usuaris silenciats @@ -3361,6 +3547,8 @@ ca: other: Heu silenciat %{count} usuaris user_mute_explainer: Els missatges dels usuaris silenciats es mouen a una safata d'entrada independent i no rebreu notificacions per correu electrònic. + user_mute_admins_and_moderators: Podeu silenciar els administradors i els moderadors, + però els seus missatges no es silenciaran. table: thead: muted_user: Usuari silenciat @@ -3391,12 +3579,16 @@ ca: all: Totes open: No resoltes closed: Resoltes + hidden: Amagat + status: Estat show: title: 'Nota: %{id}' description: Descripció open_title: 'Nota no resolta: #%{note_name}' closed_title: 'Nota resolta #%{note_name}' hidden_title: 'Nota oculta #%{note_name}' + description_when_author_is_deleted: esborrat + description_when_there_is_no_opening_comment: desconegut event_opened_by_html: Creat per %{user} %{time_ago} event_opened_by_anonymous_html: Creat per un anònim %{time_ago} event_commented_by_html: Comentari de %{user} %{time_ago} @@ -3409,6 +3601,9 @@ ca: report: informa d'aquesta nota anonymous_warning: Aquesta nota inclou comentaris d'usuaris anònims que haurien de ser verificats independentment. + discussion: Debat + subscribe: Subscriure's + unsubscribe: Cancel·lar la subscripció hide: Amaga resolve: Resol reactivate: Reactivar @@ -3426,21 +3621,41 @@ ca: intro: Heu trobat un error o bé hi falta res? Informeu-ne a altres col·laboradors per tal que puguin solucionar-ho. Moveu el marcador a la posició correcta i escriviu-hi una anotació per tal de descriure el problema. + anonymous_warning_html: No heu iniciat la sessió. Si us plau, %{log_in} o %{sign_up} + per rebre actualitzacions de la teva nota i ajudar els mapejadors a resoldre-la. anonymous_warning_log_in: inicia la sessió anonymous_warning_sign_up: registreu-vos + counter_warning_html: Ja heu publicat com a mínim %{x_anonymous_notes}, això + és fantàstic per a la comunitat, gràcies! Ara t'animem a %{contribute_by_yourself}, + no és tan complicat i %{community_can_help}. + x_anonymous_notes: + one: '%{count} nota anònima' + other: '%{count} notes anònimes' + counter_warning_guide_link: + text: contribueix vós mateix + counter_warning_forum_link: + text: la comunitat us pot ajudar advice: La vostra nota és pública i pot utilitzar-se per actualitzar el mapa, per tant, no hi introduïu cap informació personal, o informació de mapes amb copyright o bé llistats de directori. add: Afegeix una nota + new_readonly: + title: Nota nova + warning: No es poden crear notes noves perquè l'API d'OpenStreetMap està actualment + en mode de només lectura. notes_paging_nav: showing_page: Pàgina %{page} next: Següent previous: Anterior + not_found_message: + sorry: 'No s''ha pogut trobar el node #%{id}.' javascripts: close: Tanca share: title: Comparteix view_larger_map: Mostra un mapa més gran + export_failed_title: L'exportació del mapa ha fallat + filename: mapa embed: report_problem: Informeu sobre un problema legend: @@ -3465,6 +3680,8 @@ ca: transport_map: Mapa de transports tracestracktop_topo: Tracestrack Topo hot: Humanitari + shortbread: Shortbread + openmaptiles_osm: MapTiler OMT layers: header: Capes del mapa notes: Notes de mapa @@ -3482,6 +3699,8 @@ ca: tracestrack_credit: Tessel·les cortesia de %{tracestrack_link} hotosm_credit: Estil de tessel·les per %{hotosm_link}, hostatjades per %{osm_france_link} hotosm_name: Equip humanitari de l'OpenStreetMap + openmaptiles_credit: Tessel·les vectorials de %{openmaptiles_link} allotjades + per %{maptiler_link} site: edit_tooltip: Modifica el mapa edit_disabled_tooltip: Augmenteu el zoom per modificar el mapa @@ -3489,6 +3708,9 @@ ca: createnote_disabled_tooltip: Fes zoom per afegir una nota al mapa queryfeature_tooltip: Consulta característiques queryfeature_disabled_tooltip: Apropeu-vos per a consultar característiques + profile: + social_link_n: Enllaços de perfil social %{n} + remove_social_link_n: Elimina l'enllaç del perfil social %{n} edit_help: Moveu el mapa i feu zoom sobre una ubicació que vulgueu editar, i a continuació, feu clic aquí. directions: @@ -3500,6 +3722,9 @@ ca: mi: '%{distance}mi' errors: no_route: No s'ha pogut establir una ruta entre aquests dos punts. + no_place: + title: La cerca ha fallat + body: No s'ha pogut localitzar "%{place}". instructions: continue_without_exit: Continuar a %{name} slight_right_without_exit: Gira lleugerament a la dreta a %{name} @@ -3564,6 +3789,7 @@ ca: roundabout_with_exit_ordinal: A la rotonda agafeu la sortida %{exit} cap a %{name} exit_roundabout: Sortiu la rotonda cap a %{name} + ferry_without_exit: Agafa el ferri %{name} unnamed: sense nom exit_counts: first: 1a @@ -3583,6 +3809,8 @@ ca: nothing_found: No s'han trobat característiques error: 'Error en contactar amb %{server}: %{error}' timeout: Temps de contacte amb %{server} excedit + element: + wikipedia: Viquipèdia context: directions_from: Direccions des d'aquí directions_to: Direccions cap aquí @@ -3590,9 +3818,25 @@ ca: show_address: Mostra l'adreça query_features: Consulta les característiques centre_map: Centra el mapa aquí + scroll_to_changeset: Es desplaçar fins al conjunt de canvis + home: + marker_title: La vostra ubicació + not_set: La vostra ubicació no està definida per al vostre compte. + heatmap: + tooltip: + no_contributions: Cap contribució el dia %{date} + contributions: + one: '%{count} contribució en el dia %{date}' + other: '%{count} contribucions en el dia %{date}' + remote_edit: + failed: + title: L'edició ha fallat + body: Assegureu-vos que el JOSM o el Merkaartor estiguin carregats i que l'opció + de control remot estigui activada. edit: id_not_configured: title: iD no s'ha configurat + body: Si us plau, consulteu CONFIGURE.md per obtenir més informació. redactions: edit: heading: Modifica la redacció @@ -3601,6 +3845,7 @@ ca: empty: No hi ha redaccions a mostrar. heading: Llista de redaccions title: Llista de redaccions + new: Nova redacció new: heading: Introduïu informació per una nova redacció title: Creació d’una versió nova diff --git a/config/locales/el.yml b/config/locales/el.yml index e20f07297..c5a44fad1 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -2753,6 +2753,12 @@ el: description: Επιπλέον πηγές απαριθμούνται στο wiki του OpenStreetMap export_button: Εξαγωγή export_download: Γίνεται λήψη... + confirmation: + header: Λήψη δεδομένων XML + body: Θέλετε να κατεβάσετε δεδομένα χάρτη για αυτήν την περιοχή σε μορφή XML; + Λάβετε υπόψη ότι η λήψη μεγάλων περιοχών ενδέχεται να διαρκέσει λίγη ώρα. + cancel: Άκυρο + download: Λήψη fixthemap: title: Αναφέρετε πρόβλημα / Διορθώστε τον χάρτη how_to_help: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 23e8a6d98..7a34077a8 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1930,7 +1930,6 @@ fr: provide_details: Veuillez fournir les détails requis languages_panes: select_language_list: - search_language: Recherche... languages: af: Afrikaans gsw: Alémanique @@ -2076,7 +2075,6 @@ fr: more: Plus header: select_language: Sélectionnez la langue - loading: Chargement... select_language_button: title: Sélectionner la langue offline_flash: diff --git a/config/locales/frp.yml b/config/locales/frp.yml index 0ea48f824..e5bbe0d63 100644 --- a/config/locales/frp.yml +++ b/config/locales/frp.yml @@ -2677,6 +2677,12 @@ frp: description: Sôrses de més listâyes sur lo vouiqui d'OpenStreetMap export_button: Èxportar export_download: Tèlèchargement... + confirmation: + header: Tèlèchargiér les balyês XML + body: 'Vos voléd tèlèchargiér les balyês de mapa de cét endrêt u format XML + ? Atencion : les grandes zones sont longues a tèlèchargiér.' + cancel: Anular + download: Tèlèchargiér fixthemap: title: Signalar un problèmo /Corregiér la mapa how_to_help: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 6e5c04fc2..2133d990d 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -2722,6 +2722,12 @@ gl: description: Fontes adicionais listadas no wiki do OpenStreetMap export_button: Exportar export_download: Descargando... + confirmation: + header: Descargar os datos en XML + body: Queres descargar os datos do mapa desta área en formato XML? Ten en + conta que as áreas grandes poden tardar algún tempo en descargarse. + cancel: Cancelar + download: Descargar fixthemap: title: Denunciar un problema / Corrixir o mapa how_to_help: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index d194aad2f..b868bed48 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -945,6 +945,8 @@ hi: export: manually_select: कृपया, आप एक अलग क्षेत्र चुनिए licence: लाइसेंस + confirmation: + cancel: रद्द करें fixthemap: how_to_help: title: सहायता कैसे करें diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 886f601a4..f41a69f53 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -272,7 +272,7 @@ hr: description_all: Popis prijavljenih, komentiranih ili zatvorenih biljeÅ¡ki description_area: Lista biljeÅ¡ki, prijavljenih, komentiranih ili zatvorenih u tvojem području [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})] - description_item: RSS izvor ta biljeÅ¡ku %{id} + description_item: RSS izvor za biljeÅ¡ku %{id} opened: nova biljeÅ¡ka (blizu %{place}) commented: novi komentar (blizu %{place}) closed: zatvorena biljeÅ¡ka (blizu %{place}) @@ -380,8 +380,8 @@ hr: update: terms accepted: Hvala za prihvaćanje novih Uvjeta za suradnike! terms_declined_flash: - terms_declined_html: Žao nam je Å¡to ste odlučili ne prihvatiti nove Uvjete - za suradnike. Za viÅ¡e informacija pogledajte %{terms_declined_link}. + terms_declined_html: Nažalost, odlučili ste ne prihvatiti nove Uvjete za suradnike. + Za viÅ¡e informacija pogledajte %{terms_declined_link}. terms_declined_link: ova wiki stranica pd_declarations: show: @@ -446,7 +446,7 @@ hr: title: Nije nađeno timeout: title: GreÅ¡ka vremenskog ograničenja - sorry: Žao nam je, predugo traje učitavanje podataka za %{type} sa id %{id} + sorry: Nažalost, učitavanje podataka za %{type} sa id %{id} traje predugo. type: node: čvor way: put @@ -620,7 +620,7 @@ hr: hide_comment: sakrijte unhide_comment: vratite sakriveno comment: Komentirajte - changesetxml: XLM skup promjena + changesetxml: XML skup promjena osmchangexml: osmChange XML paging_nav: nodes_title: Čvorovi @@ -658,7 +658,7 @@ hr: view_changeset_details: Prikažite detalje skupa promjena popup: your location: VaÅ¡a lokacija - nearby mapper: Obližnji maper + nearby mapper: Obližnji kartograf following: Slijedeće show: title: Moja nadzorna ploča @@ -698,15 +698,15 @@ hr: subscribe: Pretplatite se unsubscribe: Otkažite pretplatu leave_a_comment: NapiÅ¡ite komentar - login_to_leave_a_comment_html: '%{login_link} da bi ostavili komentar' + login_to_leave_a_comment_html: '%{login_link} kako biste ostavili komentar' login: Prijavite se no_such_entry: title: Nema takvog dnevničkog zapisa heading: 'Nema zapisa sa id: %{id}' - body: Žao mi je, ne postoji dnevnički zapis ili komentar sa id %{id}. Molimo - vas, provjerite ispravnost upisa, ili je poveznica na koji ste kliknuli neispravna. + body: Nažalost, ne postoji dnevnički zapis ili komentar sa id %{id}. Molimo + vas, provjerite pravopis, ili je možda poveznica na koju ste kliknuli neispravna. diary_entry: - posted_by_html: Poslao %{link_user} %{created} na %{language_link} jeziku. + posted_by_html: Objavio %{link_user} %{created} na %{language_link} jeziku. updated_at_html: Zadnji put ažurirano %{updated}. full_entry: Pogledajte cijeli unos comment_link: Komentirajte ovaj zapis @@ -818,8 +818,8 @@ hr: ga je spriječilo u ispunjavanju zahtjeva (HTTP 500) not_found: title: Datoteka nije pronađena - description: Nije pronađena datoteka/direktorij/API operacija file/directory/API - operation s tim imenom na OpenStreetMap postužitelju (HTTP 404) + description: Nije pronađena datoteka/direktorij/API operacija s tim imenom na + OpenStreetMap postužitelju (HTTP 404) follows: show: follow: @@ -1459,7 +1459,7 @@ hr: bed: Trgovina posteljinom beverages: Trgovina pićem bicycle: Trgovina biciklima - bookmaker: Označivač stranice + bookmaker: Straničnik books: Knjižara boutique: Butik butcher: Mesnica @@ -1745,8 +1745,8 @@ hr: reopened: Status problema postavljen je na 'Otvoreno' comments: comment_from_html: Komentar %{user_link} %{comment_created_at} - reassign_to_moderators: Preusmjeri problem moderatorima - reassign_to_administrators: Preusmjeri problem administratorima + reassign_to_moderators: Preusmjerite problem moderatorima + reassign_to_administrators: Preusmjerite problem administratorima reports: reported_by_html: Prijavljeno kao %{category} %{user} %{updated_at} helper: @@ -1787,7 +1787,7 @@ hr: threat_label: Ovaj dnevnički zapis sadrži prijetnju other_label: Ostalo diary_comment: - spam_label: Ovaj komentar u dnevniku je / sadrži neželjenu poÅ¡tu + spam_label: Ovaj komentar u dnevniku je/sadrži neželjenu poÅ¡tu offensive_label: Ovaj komentar u dnevniku je nepristojan/uvredljiv threat_label: Ovaj komentar u dnevniku sadrži prijetnju other_label: Ostalo @@ -1866,7 +1866,7 @@ hr: sk: Slovački sl: Slovenski sr-Latn: Srpski (Latinica) - sh: Srpsko-hrvatski (latinski) + sh: Srpsko-hrvatski (latinica) fi: Finski sv: Å vedski tl: TagaloÅ¡ki @@ -1946,7 +1946,7 @@ hr: about: O projektu copyright: Autorska prava communities: Zajednice - learn_more: Saznaj viÅ¡e + learn_more: Saznajte viÅ¡e more: ViÅ¡e header: select_language: Izaberite jezik @@ -1964,7 +1964,7 @@ hr: diary_comment_notification: description: 'Dnevnički zapis OpenStreetMapa #%{id}' subject: '[OpenStreetMap] %{user} je komentirao vaÅ¡ dnevnički zapis' - hi: Bok %{to_user}, + hi: Pozdrav %{to_user}, header: '%{from_user} je komentirao vaÅ¡ nedavni OpenStreetMap dnevnički zapis s predmetom %{subject}:' header_html: '%{from_user} je komentirao OpenStreetMap dnevnički zapis s predmetom @@ -1977,7 +1977,7 @@ hr: footer_unsubscribe_html: Možete se odjaviti s rasprave na %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' - hi: Bok %{to_user}, + hi: Pozdrav %{to_user}, header: '%{from_user} ti je poslao poruku preko OpenStreetMap sa predmetom %{subject}:' header_html: '%{from_user} ti je poslao/la poruku preko OpenStreetMap sa predmetom %{subject}:' @@ -2022,25 +2022,26 @@ hr: subject: '[OpenStreetMap] GPX Import uspjeÅ¡an' signup_confirm: subject: '[OpenStreetMap] DobrodoÅ¡li na OpenStreetMap' - greeting: Hej! + greeting: Pozdrav! created: Netko (nadamo se vi) je upravo kreirao račun na %{site_url}. - confirm: 'Prije nego Å¡to iÅ¡ta drugo poduzmemo, moramo potvrditi da je ovaj zahtjev + confirm: 'Prije nego poduzmemo neÅ¡to drugo, moramo potvrditi da je ovaj zahtjev doÅ¡ao od vas, pa ako jest, kliknite donju poveznicu kako biste potvrdili svoj račun:' welcome: Nakon Å¡to potvrdite svoj račun, pružit ćemo vam neke dodatne informacije kako biste mogli započeti. email_confirm: subject: '[OpenStreetMap] Potvrdite svoju e-mail adresu' - greeting: Bok, + greeting: Pozdrav, hopefully_you: Netko (nadamo se vi) želi promijeniti svoju e-mail adresu na %{server_url} u %{new_address}. - click_the_link: Ako si ovo ti, molim klinkni na link ispod da potvrdiÅ¡ promjene. + click_the_link: Ako ste ovo vi, molim klinknite na poveznicu ispod kako biste + potvrdili promjene. lost_password: subject: '[OpenStreetMap] Zahtjev za ponovno postavljanje zaporke' - greeting: Bok, + greeting: Pozdrav, hopefully_you: Netko (moguće vi) je zatražio ponovno postavljanje zaporke za ovu e-mail adresu openstreetmap.org računa. - click_the_link: Ako ste ovo vi, kliknite na donju poveznicu za ponovno postavljanje + click_the_link: Ako ste to vi, kliknite na donju poveznicu za ponovno postavljanje zaporke. note_comment_notification: description: 'OpenStreetMap biljeÅ¡ka #%{id}' @@ -2051,12 +2052,12 @@ hr: biljeÅ¡ki' subject_other: '[OpenStreetMap] %{commenter} je komentirao biljeÅ¡ku koja vas zanima' - your_note: '%{commenter} je ostavio komentar na jednoj od vaÅ¡ih biljeÅ¡ki blizu - %{place}.' + your_note: '%{commenter} je ostavio komentar na jednoj od vaÅ¡ih biljeÅ¡ki na + karti blizu %{place}.' your_note_html: '%{commenter} je ostavio komentar na jednoj od vaÅ¡ih biljeÅ¡ki na karti blizu %{place}.' - commented_note: '%{commenter} je ostavio komentar na biljeÅ¡ki koju ste komentirali. - BiljeÅ¡ka se nalazi blizu %{place}.' + commented_note: '%{commenter} je ostavio komentar na biljeÅ¡ki na karti koju + ste komentirali. BiljeÅ¡ka se nalazi blizu %{place}.' commented_note_html: '%{commenter} je ostavio komentar na biljeÅ¡ku na karti koju ste komentirali. BiljeÅ¡ka se nalazi blizu %{place}.' closed: @@ -2067,7 +2068,7 @@ hr: %{place}.' your_note_html: '%{commenter} je rijeÅ¡io jednu od vaÅ¡ih biljeÅ¡ki na karti blizu %{place}.' - commented_note: '%{commenter} je razrijeÅ¡io biljeÅ¡ku koju ste komentirali. + commented_note: '%{commenter} je razrijeÅ¡io biljeÅ¡ku na karti koju ste komentirali. BiljeÅ¡ka se nalazi blizu %{place}.' commented_note_html: '%{commenter} je rijeÅ¡io biljeÅ¡ku na karti koju ste komentirali. BiljeÅ¡ka se nalazi blizu %{place}.' @@ -2075,10 +2076,11 @@ hr: subject_own: '[OpenStreetMap] %{commenter} je reaktivirao jednu od vaÅ¡ih biljeÅ¡ki' subject_other: '[OpenStreetMap] %{commenter} je reaktivirao biljeÅ¡ku koja vas zanima' - your_note: '%{commenter} je reaktivirao jednu od vaÅ¡ih biljeÅ¡ki blizu %{place}.' - your_note_html: '%{commenter} je reaktivirao jednu od vaÅ¡ih biljeÅ¡ki blizu + your_note: '%{commenter} je reaktivirao jednu od vaÅ¡ih biljeÅ¡ki na karti blizu %{place}.' - commented_note: '%{commenter} je reaktivirao biljeÅ¡ku koju ste komentirali. + your_note_html: '%{commenter} je reaktivirao jednu od vaÅ¡ih biljeÅ¡ki na karti + blizu %{place}.' + commented_note: '%{commenter} je reaktivirao biljeÅ¡ku na karti koju ste komentirali. BiljeÅ¡ka se nalazi blizu %{place}.' commented_note_html: '%{commenter} je reaktivirao biljeÅ¡ku na karti koju ste komentirali. BiljeÅ¡ka se nalazi blizu %{place}.' @@ -2109,24 +2111,25 @@ hr: unsubscribe_html: Možete se odjaviti od ažuriranja ovog skupa promjena na %{url}. confirmations: confirm: - heading: Provjeri svoj email! + heading: Provjerite svoj email! introduction_1: Poslali smo ti potvrdni email. introduction_2: Potvrdite vaÅ¡ račun klikom na poveznicu u e-mailu i moći ćete - započeti s kartiranjem - press confirm button: Pritisni potvrdi da bi aktivirali svoj korisnički račun. - button: Potvrdi - success: Tvoj račun je potvrđen , hvala na uključenju! + započeti s kartiranjem. + press confirm button: Pritisnite potvrdi kako biste aktivirali svoj korisnički + račun. + button: Potvrdite + success: VaÅ¡ račun je potvrđen, hvala na registraciji! already active: Ovaj račun je već potvrđen. unknown token: Taj potvrdni kôd je istekao ili ne postoji. - if_need_resend: Ako trebate da vam ponovno poÅ¡aljemo e-mail za potvrdu, kliknite - tipku ispod. + if_need_resend: Ako trebate ponovno slanje e-maila za potvrdu, kliknite tipku + ispod. resend_button: Ponovno poÅ¡alji e-mail za potvrdu confirm_resend: failure: Korisnik %{name} nije pronađen. confirm_email: - heading: Potvrdi promjenu email adrese. - press confirm button: Pritsni potvrdno dugme ispod i potvrdi novu email adresu. - button: Potvrdi + heading: Potvrdite promjenu email adrese. + press confirm button: Pritsnite potvrdno dugme ispod i potvrdi novu email adresu. + button: Potvrdite success: Promjena email adrese je potvrđena! failure: Email adresa je već potvrđena s ovim token-om. unknown_token: Taj potvrdni kôd je istekao ili ne postoji. @@ -2141,9 +2144,9 @@ hr: enabled: Prikaz vaÅ¡eg Gravatara je omogućen. messages: new: - title: PoÅ¡alji poruku - send_message_to_html: PoÅ¡alji novu poruku za %{name} - back_to_inbox: Nazad u dolaznu poÅ¡tu + title: PoÅ¡aljite poruku + send_message_to_html: PoÅ¡aljite novu poruku za %{name} + back_to_inbox: Natrag u dolaznu poÅ¡tu create: message_sent: Poruka poslana limit_exceeded: Nedavno ste poslali puno poruke, pričekajte prije nego pokuÅ¡ate @@ -2153,10 +2156,10 @@ hr: heading: Nema takve poruke body: Nažalost nema poruka s tim id. show: - title: Pročitaj poruku - reply_button: Odgovori - unread_button: Označi kao nepročitano - destroy_button: ObriÅ¡i + title: Pročitajte poruku + reply_button: Odgovorite + unread_button: Označite kao nepročitano + destroy_button: ObriÅ¡ite back: Natrag wrong_user: Prijavljeni ste kao `%{user}', ali poruka koju ste zamoljeni pročitati nije poslana od ili prema tom korisniku. Molimo, prijavite se kao ispravni @@ -2184,9 +2187,9 @@ hr: date: Datum actions: Radnje message: - unread_button: Označi kao nepročitano - read_button: Označi kao pročitano - destroy_button: ObriÅ¡i + unread_button: Označite kao nepročitano + read_button: Označite kao pročitano + destroy_button: ObriÅ¡ite unmute_button: Premjestite u pristiglu poÅ¡tu inboxes: show: @@ -2218,7 +2221,7 @@ hr: u kontakt s %{people_mapping_nearby_link}? people_mapping_nearby: osobe koje kartiraju u okolici message: - destroy_button: ObriÅ¡i + destroy_button: ObriÅ¡ite replies: new: wrong_user: Prijavljeni ste kao `%{user}', ali poruka koju ste zamoljeni odgovoriti @@ -2320,7 +2323,7 @@ hr: show: title: Uredite profil save: Ažurirajte profil - cancel: Odustani + cancel: Odustanite update: success: Profil tvrtke je ažuriran. failure: Nije moguće ažurirati profil tvrtke. @@ -2328,9 +2331,10 @@ hr: show: title: Uredite profil save: Ažurirajte profil - cancel: Odustani - no home location: Niste unjeli lokaciju vaÅ¡eg doma. - update home location on click: Ažuriraj lokaciju doma kada kliknem na kartu? + cancel: Odustanite + no home location: Niste upisali vaÅ¡u početnu lokaciju. + update home location on click: Ažurirajte početnu lokaciju kada kliknem na + kartu? show: Prikažite delete: IzbriÅ¡ite undelete: PoniÅ¡tite brisanje @@ -2354,13 +2358,13 @@ hr: login_button: Prijavite se with external: ili koristite prijavu treće strane or: ili - auth failure: Žao mi je, ne mogu prijaviti s ovim detaljima. + auth failure: Nažalost, ne mogu se prijaviti s ovim detaljima. destroy: title: Odjava heading: Odjava iz OpenStreetMap-a logout_button: Odjava suspended_flash: - suspended: Žao nam je, vaÅ¡ račun je suspendiran zbog sumnjive aktivnosti. + suspended: Nažalost, vaÅ¡ račun je suspendiran zbog sumnjive aktivnosti. contact_support_html: Molimo vas kontaktirajte %{support_link} ako želite razgovarati o tome. support: podrÅ¡ka @@ -2467,7 +2471,7 @@ hr: legal_2_2_registered_trademarks: registrirani zaÅ¡titni znakovi OSMF-a partners_title: Partneri copyright: - title: Autorska prava i Dozvola + title: Autorska prava i licenca foreign: title: O ovom prijevodu html: U slučaju konflikta između ove prevedene stranice i %{english_original_link}, @@ -2653,10 +2657,10 @@ hr: not_public_description_html: Ne možete viÅ¡e uređivati kartu dok to ne napravite. Možete postaviti svoje promjene kao javne sa %{user_page}. user_page_link: korisnička stranica - anon_edits_link_text: Otkrij zaÅ¡to je to slučaj. + anon_edits_link_text: Istražite zaÅ¡to je to slučaj. export: title: Izvoz - manually_select: Ručno izaberi drukčije područje + manually_select: Ručno izaberite drugo područje licence: Dozvola licence_details_html: OpenStreetMap podaci licencirani su pod %{odbl_link} (ODbL). odbl: Licenca za otvorenu bazu podataka Open Data Commons @@ -2664,8 +2668,8 @@ hr: advice: 'Ako gornji izvoz podataka ne uspije, molim pokuÅ¡aj sa nekim od izvora navedenih ispod:' body: Ovo područje je preveliko da bi se izvezlo u OpenStreetMap XML formatu. - Molim približi prikaz ili odaberi manje područje ili odaberi jedan od izvora - navedenih ispod za preuzimanje velike količine podataka. + Molim približite prikaz ili odaberite manje područje ili odaberite jedan + od izvora navedenih ispod za preuzimanje velike količine podataka. planet: title: PlanetOSM description: Redovno ažurirane kopije kompletne baze podataka OpenStreetMap-a @@ -2744,7 +2748,7 @@ hr: se pokreće u vaÅ¡em web pregledniku kao Å¡to je to prije radio Potlatch. %{change_preferences_link}. change_preferences: Promijenite svoje postavke ovdje any_questions: - title: Ima li pitanja? + title: Imate li pitanja? paragraph_1_html: "OpenStreetMap ima nekoliko izvora za učenje o projektu, postavljanje i odgovaranje na pitanja te zajedničku raspravu i dokumentiranje tema kartiranja. \n%{help_link}. S organizacijom koja pravi planove za OpenStreetMap? %{welcome_mat_link}." @@ -2753,13 +2757,13 @@ hr: sidebar: search_results: Rezultati pretraživanja search: - search: Traži - get_directions_title: Nađi upute između dvije točke + search: Tražite + get_directions_title: Pronađite upute između dvije točke from: Od to: Do where_am_i: Gdje sam? - where_am_i_title: OpiÅ¡i trenutnu lokaciju koristeći pretraživač - submit_text: Idi + where_am_i_title: OpiÅ¡ite trenutnu lokaciju koristeći pretraživač + submit_text: Idite reverse_directions_text: Obrnuti smjerovi modes: bicycle: Bicikl @@ -2773,13 +2777,13 @@ hr: uređivati. Sada kada ste se registrirali, spremni ste za početak kartiranja. Evo kratkog vodiča s najvažnijim stvarima koje trebate znati. whats_on_the_map: - title: Å to ova karta sadrži + title: Å to sadrži ova karta on_the_map_html: |- OpenStreetMap je mjesto za kartiranje stvari koje su i %{real_and_current} - uključujući milijune zgrada, cesta i drugih detalja o mjestima. Možete kartirati sve značajke stvarnog svijeta koje su vam zanimljive. real_and_current: stvarne i važeće off_the_map_html: Ono Å¡to %{doesnt} uključuje su podaci s izraženim miÅ¡ljenjem - kao Å¡to su ocjene, povijesne ili hipotetičke značajke, i podaci iz izvora + kao Å¡to su ocjene, povijesne ili hipotetičke značajke, te podaci iz izvora zaÅ¡tićenih autorskim pravima. Osim ako nemate posebnu dozvolu, ne kopirajte s mrežnih ili papirnatih karata. doesnt: ne @@ -2807,16 +2811,16 @@ hr: smjernice na %{imports_link} i %{automated_edits_link}. imports: Uvoz automated_edits: Automatska uređivanja - start_mapping: Počni kartirati + start_mapping: Počnite kartirati continue_authorization: Nastavite autorizaciju add_a_note: - title: NemaÅ¡ vremena za uređivanje? Dodaj biljeÅ¡ku! + title: Nemate vremena za uređivanje? Dodajte biljeÅ¡ku! para_1: Ako želite samo napraviti malu doradu i nemate vremena za registraciju i učenje pravila uređivanja, možete jednostavno dodati biljeÅ¡ku na kartu. para_2_html: |- Samo kliknite %{note_icon} ili istu ikonu na %{map_link}. To će dodati oznaku na kartu koju možete pomicati povlačenjem. - Dodajte svoju poruku, a zatim kliknite Spremi, a drugi će maperi istražiti. + Dodajte svoju poruku, a zatim kliknite Spremi, a drugi kartografi će istražiti. the_map: karta communities: title: Zajednice @@ -2845,8 +2849,8 @@ hr: website: mrežna stranica layers_panes: show: - map_notes_zoom_in_tooltip: Približi da vidite biljeÅ¡ke na karti - map_data_zoom_in_tooltip: Približi da vidiÅ¡ podatke karte + map_notes_zoom_in_tooltip: Približite kako biste vidjeli biljeÅ¡ke na karti + map_data_zoom_in_tooltip: Približite kako biste vijdeli podatke karte legend_panes: show: entries: @@ -2941,20 +2945,20 @@ hr: share_panes: show: link: Poveznica ili HTML - include_marker: Uključi oznaku + include_marker: Uključite oznaku long_link: Poveznica short_link: Kratka poveznica embed: HTML embed_html_disabled: Ugrađivanje HTML-a nije dostupno za ovaj sloj karte - paste_html: Zalijepi HTML za ugrađivanje na internetsku stranicu + paste_html: Zalijepite HTML za ugrađivanje na internetsku stranicu geo_uri: Geo URI image: Slika only_layers_exported_as_image: 'Samo sljedeći slojevi mogu se izvesti kao slika:' format: 'Format:' scale: 'Mjerilo:' - custom_dimensions: Postavi prilagođene dimenzije + custom_dimensions: Postavite prilagođene dimenzije image_dimensions_html: Slika će prikazati sloj %{layer} na %{width} x %{height} - download: Preuzmi + download: Preuzmite downloading: Preuzimanje... traces: visibility: @@ -2972,8 +2976,8 @@ hr: upload_trace: PoÅ¡aljite GNSS trag trace_uploaded: VaÅ¡a GNSS datoteka je poslana i čeka unoÅ¡enje u bazu podataka. Ovo se obično dogodi za pola sata, a e-mail-om će te dobiti obavijest o zavrÅ¡etku. - upload_failed: Žao nam je, slanje GNSS datoteke nije uspjelo. Administrator - je upozoren na greÅ¡ku. Molim, pokuÅ¡ajte ponovno. + upload_failed: Nažalost, slanje GNSS datoteke nije uspjelo. Administrator je + upozoren na greÅ¡ku. Molim, pokuÅ¡ajte ponovno. traces_waiting: one: ImaÅ¡ %{count} trag na čekanju za učitavanje. Molim pričekaj da se ti tragovi učitaju prije nego počneÅ¡ slati nove, tako da ne blokiraÅ¡ učitavanje @@ -3005,7 +3009,7 @@ hr: tags: 'Oznake:' none: Nijedan edit_trace: Uredite ovaj trag - delete_trace: IzbriÅ¡i ovu trasu + delete_trace: IzbriÅ¡ite ovu trasu trace_not_found: Trag nije pronađen! visibility: 'Vidljivost:' confirm_delete: Izbrisati ovaj trag? @@ -3016,9 +3020,9 @@ hr: few: '%{count} točke' other: '%{count} točaka' more: viÅ¡e - trace_details: Vidi detalje traga - view_map: Prikaži kartu - edit_map: Uredi kartu + trace_details: Pogledajte detalje traga + view_map: Prikažite kartu + edit_map: Uredite kartu public: JAVNI identifiable: IDENTIFICIRAJUĆI private: PRIVATNI @@ -3033,7 +3037,7 @@ hr: tagged_with: ' označeni sa %{tags}' empty_title: JoÅ¡ niÅ¡ta ovdje empty_upload_html: '%{upload_link} ili saznajte viÅ¡e o GNSS praćenju na %{wiki_link}.' - upload_new: PoÅ¡alji novi GNSS trag + upload_new: PoÅ¡aljite novi GNSS trag wiki_page: wiki stranica upload_trace: PoÅ¡alji GNSS trag all_traces: Svi tragovi @@ -3131,7 +3135,7 @@ hr: read_gpx: Pročitajte privatne GNSS tragove write_gpx: PoÅ¡aljite GNSS tragove write_notes: Modificirajte biljeÅ¡ke - write_redactions: Urediter podatke karte + write_redactions: Uredite podatke karte write_blocks: Kreirajte i opozovite korisničke blokove read_email: Pročitajte e-mail adresu korisnika consume_messages: Pročitajte, ažurirajte status i obriÅ¡ite korisničke poruke @@ -3167,7 +3171,7 @@ hr: permissions: Dozvole redirect_uris: Preusmjeravanje URI-jeva not_found: - sorry: Žao nam je, ta aplikacija se ne može naći. + sorry: Nažalost, ta aplikacija se ne može naći. oauth2_authorizations: new: title: Potrebna autorizacija @@ -3214,7 +3218,7 @@ hr: by_signing_up: html: Registracijom prihvaćate naÅ¡e %{tou_link}, %{privacy_policy_link} i %{contributor_terms_link}. - tou: Uvjeti upotrebe + tou: Uvjeti uporabe privacy_policy: pravila o zaÅ¡titi privatnosti privacy_policy_title: OSMF pravila o privatnosti, uključujući odjeljak o e-mail adresama @@ -3231,8 +3235,8 @@ hr: no_such_user: title: Nema takvog korisnika heading: Korisnik %{user} ne postoji - body: Žao mi je, ne postoji korisnik s imenom %{user}. Molim provjerite ukucano - ili je link na koji ste kliknuli neispravan. + body: Nažalost, ne postoji korisnik s imenom %{user}. Molim provjerite pravopis + ili je poveznica na koju ste kliknuli neispravana. deleted: obrisano show: my diary: Moj dnevnik @@ -3249,14 +3253,14 @@ hr: blocks by me: Blokade koje sam postavio create_mute: Isključite zvuk ovog korisnika destroy_mute: Uključite zvuk ovog korisnika - send message: PoÅ¡alji poruku + send message: PoÅ¡aljite poruku diary: Dnevnik edits: Promjene traces: Tragovi notes: BiljeÅ¡ke na karti unfollow: Prestanite pratiti follow: Pratite - mapper since: 'Maper od:' + mapper since: 'Kartograf od:' last map edit: 'Zadnje uređivanje karte:' no activity yet: JoÅ¡ bez aktivnosti uid: 'ID korisnika:' @@ -3268,19 +3272,19 @@ hr: status: 'Stanje:' spam score: 'Spam ocjena:' block_history: Aktivne blokade - moderator_history: Prikaži dane blokade + moderator_history: Prikažite zadane blokade revoke_all_blocks: Opozovite sve blokade comments: Komentari - create_block: Blokiraj ovog korisnika - activate_user: Aktiviraj ovog korisnika - confirm_user: Potvrdi ovog korisnika + create_block: Blokirajte ovog korisnika + activate_user: Aktivirajte ovog korisnika + confirm_user: Potvrdite ovog korisnika unconfirm_user: PoniÅ¡tite potvrdu ovog korisnika unsuspend_user: Uklonite obustavu ovog korisnika - hide_user: Sakrij ovog korisnika - unhide_user: Otkrij ovog korisnika - delete_user: ObriÅ¡i ovog korisnika - confirm: Potvrdi - report: Prijavi ovog korisnika + hide_user: Sakrijte ovog korisnika + unhide_user: Otkrijte ovog korisnika + delete_user: ObriÅ¡ite ovog korisnika + confirm: Potvrdite + report: Prijavite ovog korisnika edit_profile_details: Uredite detalje profila edit_description: Uredite opis edit_links: Uredite poveznice @@ -3299,9 +3303,9 @@ hr: flash success: Sve VaÅ¡e promjene sada su javne i dopuÅ¡teno Vam je uređivanje. issued_blocks: show: - title: Blokade od %{name} - heading_html: Lista blokada od %{name} - empty: '%{name} nije napravila joÅ¡ ni jednu blokadu.' + title: Blokade %{name} + heading_html: Popis blokada %{name} + empty: '%{name} nije napravilo/la joÅ¡ niti jednu blokadu.' received_blocks: show: title: Blokade na %{name} @@ -3341,8 +3345,8 @@ hr: one: '%{count} pronađen korisnik' few: '%{count} pronađena korisnika ' other: '%{count} pronađenih korisnika' - confirm: Potvrdi odabrane korisnike - hide: Sakrij odabrane korisnike + confirm: Potvrdite odabrane korisnike + hide: Sakrijte odabrane korisnike empty: Nema pronađenih odgovarajućih korisnika user: summary_html: '%{name} napravljeno sa %{ip_address} dana %{date}' @@ -3364,14 +3368,14 @@ hr: index: title: Komentare u dnevniku dodao %{user} page: - post: PoÅ¡alji + post: Objavite when: Kada comment: Komentar suspended: title: Račun suspendiran heading: Račun suspendiran support: podrÅ¡ka - automatically_suspended: Žao nam je, vaÅ¡ je račun automatski obustavljen zbog + automatically_suspended: Nažalost, vaÅ¡ je račun automatski obustavljen zbog sumnjive aktivnosti. contact_support_html: Ovu odluku će uskoro pregledati administrator ili možete kontaktirati %{support_link} ako želite o tome razgovarati. @@ -3395,14 +3399,14 @@ hr: moderator: Ovaj korisnik je moderator importer: Ovaj korisnik je uvoznik grant: - administrator: Dodjeli pristup administratoru - moderator: Dodjeli pristup moderatoru + administrator: Dodjelite pristup administratoru + moderator: Dodjelite pristup moderatoru importer: Odobrite pristup uvozniku are_you_sure: Jeste li sigurni da želite dodjeliti ulogu '%{role}' korisniku '%{name}'? revoke: - administrator: Opozovi pristup administatora - moderator: Opozovi pristup moderatora + administrator: Opozovite pristup administatora + moderator: Opozovite pristup moderatora importer: Opozovite pristup uvozniku are_you_sure: Jeste li sigurni da želite opozvati ulogu '%{role}' od korisnika '%{name}'? @@ -3418,21 +3422,21 @@ hr: non_moderator_update: Morate biti moderator da stvorite ili ažurirate blokadu. non_moderator_revoke: Morate biti moderator da opozovete blokadu. not_found: - sorry: Žao mi je, korisnička blokada sa ID %{id} se ne može naći. - back: Nazad na index + sorry: Nažalost, korisnička blokada sa ID %{id} se ne može naći. + back: Natrag na index new: title: Stvaranje blokade na %{name} heading_html: Stvaranje blokade na %{name} - period: Koliko dugo, odsada, će korisnik biti blokiran od API. + period: Koliko dugo, od sada, će korisnik biti blokiran od API. edit: title: Uređivanje blokade na %{name} heading_html: Uređivanje blokade na %{name} - period: Koliko će dugo, odsada, korisnik biti blokiran od API. + period: Koliko će dugo, od sada, korisnik biti blokiran od API. revoke: Opozovite blok filter: block_period: Period blokade mora biti jedna od vrijednosti iz padajuće liste. create: - flash: Napravi blokadu na korisnika %{name}. + flash: Napravite blokadu na korisnika %{name}. update: only_creator_can_edit: Samo moderator koji je napravio blokadu je može urediti. only_creator_can_edit_without_revoking: Samo moderator koji je kreirao ovaj @@ -3487,12 +3491,12 @@ hr: created: Stvoreno duration: 'Trajanje:' status: Status - edit: Uredi + edit: Uredite reason: 'Razlog za blokadu:' revoker: 'Opozivatelj:' block: - show: Prikaži - edit: Uredi + show: Prikažite + edit: Uredite page: display_name: Blokirani korisnik creator_name: Tvorac @@ -3569,7 +3573,7 @@ hr: event_reopened_by_html: Reaktivirao %{user} %{time_ago} event_reopened_by_anonymous_html: Reaktivirao anonimni %{time_ago} event_hidden_by_html: Sakrio %{user} %{time_ago} - report: prijavi ovu biljeÅ¡ku + report: prijavite ovu biljeÅ¡ku anonymous_warning: Ova biljeÅ¡ka sadrži komentare anonimnih korisnika koje je potrebno nezavisno provjeriti. discussion: Rasprava @@ -3621,32 +3625,32 @@ hr: next: Sljedeće previous: Prethodno not_found_message: - sorry: 'Žao nam je, biljeÅ¡ka #%{id} nije pronađena.' + sorry: 'Nažalost, biljeÅ¡ka #%{id} nije pronađena.' javascripts: - close: Zatvori + close: Zatvorite share: - title: Podijeli - view_larger_map: Prikaži veću kartu + title: Podijelite + view_larger_map: Prikažite veću kartu export_failed_title: Izvoz karte nije uspio filename: karta embed: - report_problem: Prijavi problem + report_problem: Prijavite problem legend: title: Legenda tooltip: Legenda tooltip_disabled: Legenda karte nije dostupna za ovaj sloj map: zoom: - in: Približi - out: Udalji + in: Približite + out: Udaljite locate: - title: Pokaži moju lokaciju + title: Pokažite moju lokaciju metersPopup: - one: Nalazite se unutar %{count} metara od ove točke - few: 'nalazite se unutar %{count} metra od odve ' + one: Nalazite se unutar %{count} metra od ove točke + few: nalazite se unutar %{count} metra od ove točke other: ' Nalazite se unutar %{count} metara od ove točke' feetPopup: - one: Nalazite se unutar %{count} stopa od ove točke + one: Nalazite se unutar %{count} stope od ove točke few: 'nalazite se unutar %{count} stope od ove točke ' other: Nalazite se unutar %{count} stopa od ove točke base: @@ -3677,16 +3681,16 @@ hr: openmaptiles_credit: Vektorske podloge %{openmaptiles_link} pružatelja usluga hostiranja %{maptiler_link} site: - edit_tooltip: Uredi kartu - edit_disabled_tooltip: Približi za uređivanje karte - createnote_tooltip: Dodaj biljeÅ¡ku na kartu - createnote_disabled_tooltip: Približi za dodavanje biljeÅ¡ke na kartu - queryfeature_tooltip: Provjeri elemente karte - queryfeature_disabled_tooltip: Približi za provjeru elemenata + edit_tooltip: Uredite kartu + edit_disabled_tooltip: Približite za uređivanje karte + createnote_tooltip: Dodajte biljeÅ¡ku na kartu + createnote_disabled_tooltip: Približite za dodavanje biljeÅ¡ke na kartu + queryfeature_tooltip: Provjerite značajke karte + queryfeature_disabled_tooltip: Približite za provjeru značajki profile: social_link_n: Poveznica na profil na druÅ¡tvenoj mreži %{n} remove_social_link_n: Uklonite poveznicu na profil na druÅ¡tvenoj mreži %{n} - edit_help: Pomakni kartu i približi dio koji želiÅ¡ urediti, zatim klikni ovdje. + edit_help: Pomaknite kartu i približi dio koji želite urediti, zatim klikni ovdje. directions: distance_in_units: m: '%{distance}m' @@ -3700,25 +3704,25 @@ hr: title: Pretraživanje nije uspjelo body: Nije moguće locirati '%{place}'. instructions: - continue_without_exit: Nastavi na %{name} + continue_without_exit: Nastavite na %{name} slight_right_without_exit: Lagano desno na %{name} - offramp_right: Uđite na autocestu desno + offramp_right: Skrenite lijevo na izlaz offramp_right_with_exit: Skrenite na izlaz %{exit} desno offramp_right_with_exit_name: Izađite na izlazu %{exit} desno na %{name} offramp_right_with_exit_directions: Izađite na izlazu %{exit} desno prema %{directions} offramp_right_with_exit_name_directions: Izađite na izlazu %{exit} desno na %{name}, prema %{directions} - offramp_right_with_name: Siđi sa autoceste desno na %{name} + offramp_right_with_name: Skrenite lijevo na izlaz na %{name} offramp_right_with_directions: Skrenite desno na izlaz prema %{directions} offramp_right_with_name_directions: Skrenite desno na izlaz %{name}, prema %{directions} - onramp_right_without_exit: Skreni desno na autocestu %{name} + onramp_right_without_exit: Skrenite desno na izlaz na %{name} onramp_right_with_directions: Skrenite desno na izlaz prema %{directions} - onramp_right_with_name_directions: Skrenite desno na izlazu na %{name}, prema + onramp_right_with_name_directions: Skrenite desno na izlaz na %{name}, prema %{directions} - onramp_right_without_directions: Skrenite desno na rampu - onramp_right: Skrenite desno na rampu + onramp_right_without_directions: Skrenite desno na izlaz + onramp_right: Skrenite desno na izlaz endofroad_right_without_exit: Na kraju ceste skreni desno na %{name} merge_right_without_exit: Uključite se desno na %{name} fork_right_without_exit: Na račvanju skrenite desno na %{name} @@ -3740,10 +3744,10 @@ hr: %{directions} onramp_left_without_exit: Skrenite lijevo na izlaz na %{name} onramp_left_with_directions: Skrenite lijevo na izlaz prema %{directions} - onramp_left_with_name_directions: Skrenite lijevo na izlazu na %{name}, prema + onramp_left_with_name_directions: Skrenite lijevo na izlaz na %{name}, prema %{directions} - onramp_left_without_directions: Skrenite lijevo na rampu - onramp_left: Skrenite lijevo na rampu + onramp_left_without_directions: Skrenite lijevo na izlaz + onramp_left: Skrenite lijevo na izlaz endofroad_left_without_exit: Na kraju ceste skrenite lijevo na %{name} merge_left_without_exit: Uključite se lijevo na %{name} fork_left_without_exit: Na račvanju skrenite lijevo na %{name} @@ -3786,14 +3790,14 @@ hr: context: directions_from: Upute odavde directions_to: Upute do ovog mjesta - add_note: Dodaj biljeÅ¡ku ovdje - show_address: Prikaži adresu - query_features: Provjeri elemente karte - centre_map: Centriraj kartu ovdje + add_note: Dodajte biljeÅ¡ku ovdje + show_address: Prikažite adresu + query_features: Provjerite značajke karte + centre_map: Centrirajte kartu ovdje scroll_to_changeset: Pretražite do skupa promjena home: marker_title: Moja početna stranica - not_set: Početna stranica nije postavljena za vaÅ¡ račun + not_set: Nije postavljena početna lokacija za vaÅ¡ račun heatmap: tooltip: no_contributions: Bez doprinosa %{date} diff --git a/config/locales/it.yml b/config/locales/it.yml index 9d603a2b5..3fa76f72c 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -2745,6 +2745,10 @@ it: description: Ulteriori fonti elencate sul wiki di OpenStreetMap export_button: Esporta export_download: Download in corso... + confirmation: + header: Scarica dati XML + cancel: Annulla + download: Scarica fixthemap: title: Segnala un problema / Correggi la mappa how_to_help: diff --git a/config/locales/mk.yml b/config/locales/mk.yml index e5e0b5aed..2c380069f 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -2666,6 +2666,13 @@ mk: description: Другите извори се наведени на викито на OpenStreetMap export_button: Извези export_download: Преземам... + confirmation: + header: Преземи XML-податоци + body: Дали сакате да ги преземете картографските податоци за ова подрачје + во XML-формат? Имајте на ум дека преземањето на големи подрачја може да + потрае. + cancel: Откажи + download: Преземи fixthemap: title: Пријава на проблем / Исправка на картата how_to_help: diff --git a/config/locales/shn.yml b/config/locales/shn.yml index 367c33053..950146526 100644 --- a/config/locales/shn.yml +++ b/config/locales/shn.yml @@ -1788,6 +1788,7 @@ shn: provide_details: ၶႅၼ်းတေႃႈ ပၼ်ၶေႃႈမုၼ်း ဢၼ်လူဝ်ႇၼၼ်ႉ languages_panes: select_language_list: + search_language: ၶူၼ်ႉႁႃ... languages: af: ဢႃႇၾရိၵၢၼ်ႇ gsw: ဢႄႇလႄႇမၼ်းၼိၵ်ႉ @@ -1930,6 +1931,7 @@ shn: more: ထႅင်ႈ header: select_language: လိူၵ်ႈၽႃႇသႃႇ + loading: တိုၵ်ႉလူတ်ႇ... select_language_button: title: လိူၵ်ႈၽႃႇသႃႇ offline_flash: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 3c6fbaa95..261a6186d 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1912,6 +1912,9 @@ sr: description: Додатни извори наведени на викију OpenStreetMap-а export_button: Извези export_download: Преузимање... + confirmation: + cancel: Откажи + download: Преузми fixthemap: title: Пријави проблем / Поправи карту how_to_help: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 37700a45b..d8a3d60f1 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -827,7 +827,7 @@ uk: in_language: Дописи в щоденнику (%{language}) my_diary: Мій щоденник new: Новий допис у щоденнику - new_title: Зробити новий запис у моєму щоденнику + new_title: Створити новий запис у власному щоденнику користувача profile_diaries: latest_diaries: Останні дописи в Щоденнику comments: @@ -1153,7 +1153,7 @@ uk: landing_site: Місце аварійної посадки life_ring: Рятувальний круг phone: Телефон для екстрених викликів - siren: Аварійна сирена + siren: Сирена надзвичайної ситуації suction_point: Точка аварійного всмоктування water_tank: Пожежний резервуар highway: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 5e4eff5d8..3f93b7ad0 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -2510,6 +2510,11 @@ zh-TW: description: 開放街圖 wiki 上列出的其他來源 export_button: 匯出 export_download: 正在下載… + confirmation: + header: 下載 XML 資料 + body: 您想以 XML 格式下載此區域的地圖資料嗎？請注意，下載大面積區域可能需要一些時間。 + cancel: 取消 + download: 下載 fixthemap: title: 回報問題／改進地圖 how_to_help: -- 2.39.5 From 01fbff08f5c34324b0c2e4aa2acc673e620169c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Oct 2025 23:01:25 +0000 Subject: [PATCH 15/16] Bump maplibre-gl from 5.8.0 to 5.9.0 Bumps [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) from 5.8.0 to 5.9.0. - [Release notes](https://github.com/maplibre/maplibre-gl-js/releases) - [Changelog](https://github.com/maplibre/maplibre-gl-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/maplibre/maplibre-gl-js/compare/v5.8.0...v5.9.0) --- updated-dependencies: - dependency-name: maplibre-gl dependency-version: 5.9.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6a5776ff8..e5cab0490 100644 --- a/yarn.lock +++ b/yarn.lock @@ -673,9 +673,9 @@ make-plural@*, make-plural@^7.4.0: integrity sha512-4/gC9KVNTV6pvYg2gFeQYTW3mWaoJt7WZE5vrp1KnQDgW92JtYZnzmZT81oj/dUTqAIu0ufI2x3dkgu3bB1tYg== maplibre-gl@^5.6.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.8.0.tgz#1edcfef5fbda9c9aedfbaee6649afe598caf3ef4" - integrity sha512-zLblPFK+z5sxeitDF8RL2cnqfRaivNwxbGoQMfwAm9st6d1lRGTxgI7NNNr/U1AEPkp5+X+wjROagiHvJD8aqg== + version "5.9.0" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.9.0.tgz#4bd1b78e92a9390880b45e0110095e1a60c98085" + integrity sha512-YxW9glb/YrDXGDhqy1u+aG113+L86ttAUpTd6sCkGHyUKMXOX8qbGHJQVqxOczy+4CtRKnqcCfSura2MzB0nQA== dependencies: "@mapbox/geojson-rewind" "^0.5.2" "@mapbox/jsonlint-lines-primitives" "^2.0.2" -- 2.39.5 From aa9c0ff2c99b7c69f727cc37d25005458739ad86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Oct 2025 17:47:26 +0000 Subject: [PATCH 16/16] Bump rack from 3.2.2 to 3.2.3 Bumps [rack](https://github.com/rack/rack) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.2.2...v3.2.3) --- updated-dependencies: - dependency-name: rack dependency-version: 3.2.3 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 634b762ba..9a501a56f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -677,7 +677,7 @@ GEM nio4r (~> 2.0) quad_tile (1.0.1) racc (1.8.1) - rack (3.2.2) + rack (3.2.3) rack-cors (3.0.0) logger rack (>= 3.0.14) -- 2.39.5