From da0cd4e71c71ec0a5d2e86e1c5c06c5b4edbca39 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 14 Sep 2025 18:35:52 +0100 Subject: [PATCH 01/16] Remove logstash support --- Gemfile | 3 --- Gemfile.lock | 6 ------ config/application.rb | 8 -------- config/settings.yml | 2 -- 4 files changed, 19 deletions(-) diff --git a/Gemfile b/Gemfile index ff96f1865..cda7173a7 100644 --- a/Gemfile +++ b/Gemfile @@ -115,9 +115,6 @@ gem "dalli" # Load canonical-rails to generate canonical URLs gem "canonical-rails" -# Used to generate logstash friendly log files -gem "logstasher" - # Used to generate images for traces gem "bzip2-ffi" gem "ffi-libarchive" diff --git a/Gemfile.lock b/Gemfile.lock index c14e9b11e..f2d256a56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -383,9 +383,6 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) logger (1.7.0) - logstasher (2.1.5) - activesupport (>= 5.2) - request_store loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -572,8 +569,6 @@ GEM regexp_parser (2.11.3) reline (0.6.2) io-console (~> 0.5) - request_store (1.7.0) - rack (>= 1.4) rexml (3.4.4) rinku (2.0.6) rotp (6.3.0) @@ -759,7 +754,6 @@ DEPENDENCIES kramdown libxml-ruby (>= 2.0.5) listen - logstasher marcel maxminddb mini_racer (~> 0.9.0) diff --git a/config/application.rb b/config/application.rb index ed33ea990..3ab67d421 100644 --- a/config/application.rb +++ b/config/application.rb @@ -39,13 +39,5 @@ module OpenStreetMap config.i18n.fallbacks = true # Enables custom error message formats config.active_model.i18n_customize_full_message = true - - # Use logstash for logging if required - if Settings.key?(:logstash_path) - config.logstasher.enabled = true - config.logstasher.suppress_app_log = false - config.logstasher.logger_path = Settings.logstash_path - config.logstasher.log_controller_parameters = true - end end end diff --git a/config/settings.yml b/config/settings.yml index 4368a5750..625aeb007 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -115,8 +115,6 @@ default_legale: GB attachments_dir: ":rails_root/public/attachments" # Log file to use #log_path: "" -# Log file to use for logstash -#logstash_path: "" # MapTiler API key #maptiler_key: "" # List of memcache servers to use for caching -- 2.39.5 From 6980586c10c22fd8c4a1d0a3cdda577f1dda62b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 23:01:14 +0000 Subject: [PATCH 02/16] Bump maplibre-gl from 5.7.1 to 5.7.2 Bumps [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) from 5.7.1 to 5.7.2. - [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.1...v5.7.2) --- updated-dependencies: - dependency-name: maplibre-gl dependency-version: 5.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index c4036b119..d4687fc03 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@^23.3.0": - version "23.3.0" - resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-23.3.0.tgz#b69ab48cb3abead4e49213396c8f83492638b97c" - integrity sha512-IGJtuBbaGzOUgODdBRg66p8stnwj9iDXkgbYKoYcNiiQmaez5WVRfXm4b03MCDwmZyX93csbfHFWEJJYHnn5oA== +"@maplibre/maplibre-gl-style-spec@^24.1.0": + version "24.1.0" + resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-24.1.0.tgz#1797b13247d59e3ffecb18ed116cfe7e4aa6ab57" + integrity sha512-VLmx4+ceP9XKwPvkjqfnwuHGzgp2MHGpRSWLisvotx6bnUgZLiIfwlVv5nVUlwK/IQoj1KFkrvppzVameZnRhA== 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.1" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.7.1.tgz#ad6f2d7f6bfcf4617058360f063b992536980548" - integrity sha512-iCOQB6W/EGgQx8aU4SyfU5a5/GR2E+ELF92NMsqYfs3x+vnY+8mARmz4gor6XZHCz3tv19mnotVDRlRTMNKyGw== + version "5.7.2" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.7.2.tgz#d03efb97242c0b15089102a9f288f4f034a3e5c7" + integrity sha512-SU6VlQ1tPskqzcTrwrvOarj2m5HuSkZARSzxbGUAym6h93ygqP6iwofbkzyIr1u6iv82BYK+dCV6avkUDAtwXg== 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" "^23.3.0" + "@maplibre/maplibre-gl-style-spec" "^24.1.0" "@maplibre/vt-pbf" "^4.0.3" "@types/geojson" "^7946.0.16" "@types/geojson-vt" "3.2.5" -- 2.39.5 From 9c5a4988b30b4c6da8add45a4ceea341cd66f782 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 18 Sep 2025 14:21:31 +0200 Subject: [PATCH 03/16] Localisation updates from https://translatewiki.net. --- config/locales/de.yml | 5 +- config/locales/el.yml | 25 +++- config/locales/eo.yml | 2 +- config/locales/fr.yml | 3 +- config/locales/hr.yml | 248 ++++++++++++++++++++++++++++++-- config/locales/lb.yml | 57 +++++++- config/locales/nl.yml | 1 + config/locales/pl.yml | 1 + config/locales/ps.yml | 10 +- config/locales/shn.yml | 204 +++++++++++++------------- config/locales/sl.yml | 315 +++++++++++++++++++++++++++++++++++++++-- config/locales/uk.yml | 111 +++++++++++++++ config/locales/vi.yml | 1 - 13 files changed, 852 insertions(+), 131 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index e1cf6d3c7..8798bd84b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -2027,9 +2027,9 @@ de: yi: Jiddisch he: Hebräisch ar: Arabisch - skr-arab: Saraiki (arabische Schrift) + skr-arab: Saraiki fa: Persisch - arz: Arabisch (Ägypten) + arz: Ägyptisches Arabisch pnb: Westliches Punjabi ps: Persisch nqo: N’Ko @@ -2044,6 +2044,7 @@ de: kn: Kannada th: Thailändisch my: Birmanisch + shn: Shan xmf: Mingrelisch ka: Georgisch km: Khmer diff --git a/config/locales/el.yml b/config/locales/el.yml index 29839c908..6e3d289a7 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1873,8 +1873,13 @@ el: title: Επιλογή γλώσσας select_language_list: languages: + af: Αφρικάανς + gsw: Αλαμαννικά + frp: Αρπιτανικά ast: Αστουριανά + az: Αζερμπαϊτζανικά id: Ινδονησιακά + ms: Μαλαϊκά bs: Βοσνιακά br: Βρετονικά ca: Καταλανικά @@ -1907,7 +1912,11 @@ el: lb: Λουξεμβουργιανά lt: Λιθουανικά hu: Ουγγρικά + fit: Φινλανδικά Tornedalen nl: Ολλανδικά + nb: Νορβηγικά Μποκμάλ + nn: Νορβηγικά Νινόρσκ + oc: Οξιτανικά nds: Κάτω Γερμανικά pl: Πολωνικά pt-PT: Πορτογαλικά @@ -1925,9 +1934,11 @@ el: fi: Φινλανδικά sv: Σουηδικά tl: Ταγκαλόγκ + kab: Καβυλικά vi: Βιετναμέζικα tr: Τούρκικα yo: Γιορούμπα + diq: Ζαζάκι el: Ελληνικά ba: Μπασκίρ be: Λευκορώσικα @@ -1937,16 +1948,28 @@ el: mo: Μολδαβικά ce: Τσετσενικά ru: Ρώσικα + sr: Σέρβικα (Κυριλλικά) + tt: Ταταρικά (Κυριλλικά) uk: Ουκρανικά kk-cyrl: Καζακικά (Κυριλλικά) yi: Γίντις he: Εβραϊκά ar: Αραβικά + skr-arab: Σαραϊκί fa: Περσικά - arz: Αραβικά (Αίγυπτος) + arz: Αιγυπτιακά Αραβικά + pnb: Δυτικά Παντζάμπι + ps: Παστού + nqo: Ν'Κο + ne: Νεπαλικά + mr: Μαράτι hi: Χίντι + bn: Μπάνγκλα + pa: Παντζάμπι + gu: Γκουτζαράτι ta: Ταμίλ te: Τελούγκου + kn: Κανάντα th: Ταϊλανδικά my: Βιρμανικά shn: Σαν diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 8ab04b30e..f63e9ed71 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1912,7 +1912,7 @@ eo: yi: judgermana he: hebrea ar: araba - skr-arab: saraika (araba) + skr-arab: saraika fa: persa arz: araba (Egiptujo) pnb: panĝaba okcidenta diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 71205aa47..423a17d9e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -2049,7 +2049,7 @@ fr: yi: Yiddish he: Hébreu ar: Arabe - skr-arab: Saraiki (écriture arabe) + skr-arab: Saraiki fa: Perse arz: Arabe égyptien pnb: Pendjabi @@ -2066,6 +2066,7 @@ fr: kn: Kannada th: Thaï my: Birman + shn: Shan xmf: Mingrélien ka: Géorgien km: Khmer diff --git a/config/locales/hr.yml b/config/locales/hr.yml index eb59c5e4e..a64a9af0d 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -115,7 +115,7 @@ hr: allow_write_diary: kreiraj dnevničke zapise i komentare allow_write_api: uredi kartu allow_write_changeset_comments: komentiraj skupove promjena - allow_read_gpx: čitati njihove privatne GNSS tragove + allow_read_gpx: čitatajte njihove privatne GNSS tragove allow_write_gpx: postavi GNSS tragove allow_write_notes: izmijeni bilješke diary_comment: @@ -144,7 +144,7 @@ hr: longitude: Geografska dužina (Longitude) public: Javno description: Opis - gpx_file: Izberi datoteku za GPS praćenje + gpx_file: Izberi datoteku za GNSS praćenje visibility: Vidljivost tagstring: Oznake message: @@ -1840,6 +1840,117 @@ hr: select_language: Izaberite jezik select_language_button: title: Izaberite jezik + select_language_list: + languages: + af: Afrikaans + gsw: Alemanski + frp: Arpitan + ast: Asturijski + az: Azerbajdžanski + id: Indonezijski + ms: Malajski + bs: Bosanski + br: Bretonski + ca: Katalonski + cs: Češki + cy: Velški + da: Danski + de: Njemački + dsb: Donjolužičkosrpski + et: Estonski + en: Engleski + en-GB: Engleski (UK) + es: Španjolski + eo: Esperanto + eu: Baskijski + fr: Francuski + fy: Zapadnofrizijski + fur: Furlanski + ga: Irski + gd: Škotski gaelski + gl: Galicijski + aln: Gegijski albanski + hsb: Gornjolužičkosrpski + hr: Hrvatski + ia: Interlingua + is: Islandski + it: Talijanski + gcf: Gvadalupski kreolski + ku-Latn: Kurdski (latinski) + lv: Latvijski + lb: Luksemburški + lt: Litvanski + hu: Mađarski + fit: Tornedalski finski + nl: Nizozemski + nb: Norveški Bokmål + nn: Norveški Nynorsk + oc: Okcitanski + nds: Donjonjemački + pl: Poljski + pt-PT: Portugalski + pt: Portugalski (Brazil) + ksh: Kölnski + ro: Rumunjski + sc: Sardinski + sco: Škotski + sq: Albanski + scn: Sicilijanski + sk: Slovački + sl: Slovenski + sr-Latn: Srpski (Latinica) + sh: Srpsko-hrvatski (latinski) + fi: Finski + sv: Švedski + tl: Tagaloški + kab: Kabilski + vi: Vijetnamski + tr: Turski + yo: Joruba + diq: Dimli + el: Grčki + ba: Baškirski + be: Bjeloruski + be-Tarask: Bjeloruski (Taraškevica) + bg: Bugarski + mk: Makedonski + mo: Moldavski + ce: Čečenski + ru: Ruski + sr: Srpski (ćirilica) + tt: Tatarski (ćirilica) + uk: Ukrajinski + kk-cyrl: Kazaški (ćirilica) + yi: Jidiš + he: Hebrejski + ar: Arapski + skr-arab: Saraiki + fa: Perzijski + arz: Egipatski arapski + pnb: Zapadni pandžapski + ps: Paštunski + nqo: N'Ko + ne: Nepalski + mr: Marathi + hi: Hindski + bn: Bengalski + pa: Pandžapski + gu: Gudžaratski + ta: Tamilski + te: Telugu + kn: Kannadski + th: Tajski + my: Burmanski + shn: Shan + xmf: Mingrelski + ka: Gruzijski + km: Kmerski + sat: Santali + zh-CN: Kineski (pojednostavljeni) + zh-TW: Kineski (tradicionalni) + zh-HK: Kineski (Hong Kong) + ja: Japanski + ko: Korejski offline_flash: osm_offline: OpenStreetMap baza podataka trenutno je nedostupna jer se izvode nužni radovi održavanja. @@ -1902,7 +2013,7 @@ hr: subject: '[OpenStreetMap] GPX Import nije uspio' gpx_success: hi: Pozdrav %{to_user}, - imported_successfully: Izgleda da je vaša datoteka uspješno uvezena kao GPS + imported_successfully: Izgleda da je vaša datoteka uspješno uvezena kao GNSS trag. all_your_traces: Sve vaše uspješno prenesene GPX tragove možete naći na %{url} all_your_traces_html: Sve vaše uspješno prenesene GPX tragove možete pronaći @@ -2318,8 +2429,8 @@ hr: drugom diljem cijelog svijeta. about_section: local_knowledge_title: Lokalno znanje - local_knowledge_html: OpenStreetMap pridodaje posebnu važnost lokalnom znanju. - Doprinositelji koriste zračne snimke, GPS uređaje i vlastite terenske podatke + local_knowledge_html: OpenStreetMap naglašava posebnu važnost lokalnog znanja. + Doprinositelji koriste zračne snimke, GNSS uređaje i vlastite terenske podatke za provjeru točnosti i ažurnosti OSM podataka. community_driven_title: Vođen zajednicom community_driven_1_html: "OpenStreetMap zajednica je raznolika, strastvena i @@ -2701,6 +2812,10 @@ hr: title: Nemaš vremena za uređivanje? Dodaj 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. the_map: karta communities: title: Zajednice @@ -2719,6 +2834,10 @@ hr: list_text: 'Sljedeće zajednice su formalno osnovane kao Lokalni ogranci:' other_groups: title: Ostale skupine + other_groups_html: Nema potrebe za formalnim osnivanjem grupe u istoj mjeri + kao što je to slučaj s lokalnim ograncima. Doista, mnoge grupe vrlo uspješno + postoje kao neformalno okupljanje ljudi ili kao zajednička grupa. Svatko + ih može osnovati ili im se pridružiti. Više o tome pročitajte više na %{communities_wiki_link}. communities_wiki: Wiki stranica Zajednica social_links: show: @@ -2760,36 +2879,50 @@ hr: taxiway: aerodromske ceste (za avione) apron: Parking za avione (apron) admin: Administrativna granica + capital: Glavni grad city: Grad orchard: Voćnjak vineyard: Vinograd forest: Šuma (održavane, od šumarije) wood: Šume (prirodne, neodržavane) + farmland: Poljoprivredno zemljište + grass: Travnjak meadow: Livada bare_rock: Gola stijena sand: Pijesak golf: Golf teren park: Park common: Travnjaci + built_up: Izgrađeno područje resident: Stambeno područje retail: Maloprodajno područje industrial: Industrijsko područje commercial: Poslovno područje heathland: Gustiš, makija, grmlje + scrubland: Šikara lake: Jezero reservoir: rezervoar + intermittent_water: Povremena vodena površina + glacier: Ledenjak + reef: Greben + wetland: Močvara farm: Polja, farme, njive brownfield: Gradilište cemetery: Groblje allotments: Vrtovi pitch: Sportski teren centre: Sportski centar + beach: Plaža reserve: Rezervat prirode military: Vojno područje school: Škola university: Sveučilište + hospital: Bolnica building: Zgrada station: Željeznički kolodvor + railway_halt: Željezničko stajalište + subway_station: Stanica podzemne željeznice + tram_stop: Tramvajska stanica summit: Vrh peak: vrhunac tunnel: Iscrtkani rubovi = tunel @@ -2797,9 +2930,13 @@ hr: private: Privatni pristup destination: Pristup odredištu construction: Ceste u izgradnji + bus_stop: Autobusna stanica bicycle_shop: Biciklistička prodavaonica + bicycle_rental: Iznajmljivanje bicikala bicycle_parking: Parkiralište za bicikle + bicycle_parking_small: Malo parkiralište za bicikle toilets: Zahodi + see_external_legend: Pogledajte legendu vanjske karte share_panes: show: link: Poveznica ili HTML @@ -2807,13 +2944,17 @@ hr: 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 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 + image_dimensions_html: Slika će prikazati sloj %{layer} na %{width} x %{height} download: Preuzmi + downloading: Preuzimanje... traces: visibility: private: Privatni (prikazuje se kao anonimne, nespoložene točke) @@ -2827,9 +2968,11 @@ hr: visibility_help: što ovo znači? help: Pomoć create: - upload_trace: Pošalji GNSS trag + upload_trace: Učitajte GNSS trag trace_uploaded: Vaša GPX datoteka je prenesena 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, prijenos GPX datoteka nije uspio. 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 @@ -2838,19 +2981,22 @@ hr: ti tragovi učitaju prije nego počneš slati nove, tako da ne blokiraš učitavanje drugih korisnika. edit: - cancel: Otkaži + cancel: Otkažite title: Uređivanje traga %{name} - heading: Uređivanje trase %{name} + heading: Uređivanje traga %{name} visibility_help: Što ovo znači? + update: + updated: Trag ažuriran show: title: Prikaz traga %{name} - heading: Prikaz trase %{name} + heading: Prikaz traga %{name} pending: U TIJEKU filename: 'Ime datoteke:' download: preuzmite - uploaded: 'Poslano:' + uploaded: 'Učitano:' points: 'Točaka:' start_coordinates: 'Početna koordinata:' + coordinates_html: '%{latitude}; %{longitude}' map: karta edit: uredite owner: 'Vlasnik:' @@ -2861,6 +3007,7 @@ hr: delete_trace: Izbriši ovu trasu trace_not_found: Trag nije pronađen! visibility: 'Vidljivost:' + confirm_delete: Izbrisati ovaj trag? trace: pending: U TIJEKU count_points: @@ -2875,13 +3022,23 @@ hr: identifiable: IDENTIFICIRAJUĆI private: PRIVATNI trackable: TRACKABLE + details_with_tags_html: '%{time_ago} %{user} u %{tags}' + details_without_tags_html: '%{time_ago} %{user}' index: public_traces: Javni GNSS tragovi + my_gps_traces: Moji GNSS tragovi public_traces_from: Javni GNSS tragovi korisnika %{user} - description: Pretraži nedavno objavljene GNSS tragove + description: Pretražite nedavno objavljene GNSS tragove 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: Postavi novi GNSS trag + wiki_page: wiki stranica upload_trace: Postavi GNSS trag + all_traces: Svi tragovi my_traces: Moji tragovi + traces_from_html: Javni GNSS tragovi korisnika %{user} + remove_tag_filter: Uklonite filter za oznake destroy: scheduled_for_deletion: Trase raspoređene za brisanje offline_warning: @@ -2895,16 +3052,30 @@ hr: description: description_without_count: GPX datoteka od %{user} application: + permission_denied: Nemate dozvolu za pristup ovoj radnji require_cookies: cookies_needed: Čini se da su vam cookie-i onemogućeni, molim omogućite cookie u vašem pregledniku prije nastavka. setup_user_auth: + blocked_zero_hour: Imate hitnu poruku na OpenStreetMap web stranici. Morate + pročitati poruku prije nego što ćete moći spremiti svoje uređivanje. blocked: Vaš pristup API-ju je blokiran. Prijavite se na web sučelje kako biste saznali više. + need_to_see_terms: Vaš pristup API-ju je privremeno obustavljen. Molimo, prijavite + se na web sučelje kako biste vidjeli Uvjete za suradnike. Ne morate se složiti, + ali ih morate pregledati. + settings_menu: + account_settings: Postavke računa + oauth2_applications: OAuth 2 aplikacije + oauth2_authorizations: OAuth 2 autorizacije + muted_users: Utišani korisnici auth_providers: google: title: Prijavite se pomoću Googlea alt: Logotip Googlea + apple: + title: Prijavite se s Appleom + alt: Apple logotip facebook: title: Prijavite se pomoću Facebooka alt: Logotip Facebooka @@ -2917,9 +3088,44 @@ hr: wikipedia: title: Prijavi se pomoću Wikipedije alt: Logotip Wikipedije + share: + share: + title: Podijelite + alt: Ikona dijeljenja + email: + title: Podijelite e-mailom + alt: Ikona e-maila + bluesky: + title: Podijelite Blueskyem + alt: Bluesky ikona + facebook: + title: Podijelite preko Facebooka + alt: Facebook ikona + linkedin: + title: Podijelite preko LinkedIna + alt: Ikona LinkedIna + mastodon: + title: Podijelite preko Mastodona + alt: Mastodon ikona + telegram: + title: Podijelite na Telegramu + alt: Ikona Telegrama + x: + title: Podijelite na X-u + alt: X ikona oauth: + permissions: + missing: Aplikaciji niste dopustili pristup ovom objektu scopes: + openid: Prijavite se pomoću OpenStreetMapa + read_prefs: Pročitajte korisničke postavke + write_prefs: Promijenite korisničke postavke + write_diary: Izradite dnevničke zapise i komentare + write_api: Izmijenite kartu write_changeset_comments: Komentirajte skupove promjena + read_gpx: Pročitajte privatne GNSS tragove + write_gpx: Učitajte GNSS tragove + write_notes: Modificirajte bilješke users: new: title: Otvori račun @@ -3106,12 +3312,20 @@ hr: title: Bilješke stvorio ili komentirao %{user} heading: Bolješke %{user} subheading_html: Bilješke %{submitted} ili %{commented} %{user} + subheading_submitted: poslano + subheading_commented: komentirao/la no_notes: Bez bilješki id: Id creator: Tvorac description: Opis created_at: Napravljeno last_changed: Zadnji put promijenjeno + apply: Primijenite + all: Sve + open: Neriješene + closed: Riješene + hidden: Skrivene + status: Status show: title: 'Bilješka: %{id}' description: Opis @@ -3120,9 +3334,21 @@ hr: hidden_title: Skrivena bilješka broj %{note_name} description_when_author_is_deleted: obrisano description_when_there_is_no_opening_comment: nepoznato + event_opened_by_html: Izradio %{user} %{time_ago} + event_opened_by_anonymous_html: Izradio anonimni %{time_ago} + event_commented_by_html: Komentar %{user} %{time_ago} + event_commented_by_anonymous_html: Komentar anonimnog %{time_ago} + event_closed_by_html: Riješio %{user} %{time_ago} + event_closed_by_anonymous_html: Riješio anonimni %{time_ago} + 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 anonymous_warning: Ova bilješka sadrži komentare anonimnih korisnika koje je potrebno nezavisno provjeriti. + discussion: Rasprava + subscribe: Pretplatite se + unsubscribe: Otkažite pretplatu hide: Sakrijte resolve: Razriješite reactivate: Ponovno aktivirajte diff --git a/config/locales/lb.yml b/config/locales/lb.yml index 592e1fea5..a8ac273b0 100644 --- a/config/locales/lb.yml +++ b/config/locales/lb.yml @@ -416,7 +416,7 @@ lb: title_html: 'Versioune vum Wee: %{name}' relation: title_html: 'Versioune vun der Relatioun: %{name}' - older_versions: Eeler Versiounen + older_versions: Méi al Versiounen newer_versions: Méi nei Versiounen nodes: not_found_message: @@ -1690,9 +1690,9 @@ lb: yi: Jiddesch he: Hebräesch ar: Arabesch - skr-arab: Saraiki (Arabesch Schrëft) + skr-arab: Saraiki fa: Persesch - arz: Arabesch (Egypten) + arz: Egyptescht Arabesch ne: Nepaleesesch mr: Marathi hi: Hindi @@ -1829,6 +1829,7 @@ lb: details: Äntweren oder méi gewuer ginn iwwer d'Notiz op %{url}. details_html: Äntwert oder méi gewuer ginn iwwer d'Notiz ënner %{url}. changeset_comment_notification: + description: 'OpenStreetMap-Ännerungssaz #%{id}' hi: Salut %{to_user}, commented: subject_own: '[OpenStreetMap] %{commenter} huet ee vun dengen Ännerungssätz @@ -1916,6 +1917,10 @@ lb: notice: Message als gelies markéiert destroy: notice: Message als net gelies markéiert + mutes: + destroy: + notice: De Message gouf an de Postagang geréckelt + error: De Message konnt net an de Postagang geréckelt ginn. mailboxes: heading: my_inbox: Mäi Postagang @@ -1931,6 +1936,7 @@ lb: unread_button: Als net gelies markéieren read_button: Als gelies markéieren destroy_button: Läschen + unmute_button: An de Postagang réckelen inboxes: show: title: Postagang @@ -2114,6 +2120,8 @@ lb: help: Hëllef pagination: changeset_comments: + older: Méi al Kommentaren + newer: Méi nei Kommentaren oldest: Eelst Kommentaren newest: Neist Kommentaren diary_comments: @@ -2134,6 +2142,8 @@ lb: traces: older: Eeler Spueren newer: Méi nei Spueren + oldest: Eelst Spueren + newest: Neist Spueren user_blocks: older: Eeler Spären newer: Méi nei Spären @@ -2159,8 +2169,18 @@ lb: community_driven_title: Communautéitsbedriwwen community_driven_osm_blog: OpenStreetMap-Blog community_driven_community_blogs: Communautéits-Bloggen + community_driven_osm_foundation: OSM Foundation open_data_title: Open Data + open_data_1_html: 'OpenStreetMap ass %{open_data}: Dir kënnt et fir all Zweck + benotzen, soulaang Dir OpenStreetMap a seng Contributeure ernimmt. Wann Dir + op iergendeng Aart a Weis d''Donnéeë verännert oder dorop opbaut, dann däerft + Dir d''Resultat dovunner nëmmen ënner där selwechter Lizenz weiderverbreeden. + Kuckt d''%{copyright_license_link} fir d''Detailer.' + open_data_open_data: Open Data + open_data_copyright_license: Säit iwwer de Copyright an d'Lizenz legal_title: Rechtlech Hiweiser + legal_1_1_openstreetmap_foundation: OpenStreetMap Foundation + legal_1_1_terms_of_use: Benotzungskonditiounen legal_1_1_privacy_policy: Dateschutzrichtlinnen legal_2_1_contact_the_osmf: d'OSMF kontaktéieren partners_title: Partneren @@ -2179,12 +2199,18 @@ lb: lead_2_learn_more_about_osm: Méi iwwer OpenStreetMap gewuer ginn lead_2_osm_blog: OpenStreetMap-Blog lead_2_osm_community: OSM-Communautéit + lead_2_osm_foundation: OSM Foundation licensing_title: OpenStreetMap-Lizenzéierung + licensing_1_html: 'OpenStreetMap ass %{open} Data, lizenzéiert ënner der %{odc_odbl_link} + (ODbL) vun der %{osm_foundation_link} (OSMF). Am Resümmee:' + licensing_1_odc_odbl: Open-Data-Commons-Open-Database-Lizenz + licensing_1_osm_foundation: OpenStreetMap Foundation licensing_4_osmf_license_page: OSMF-Lizenzsäit credit_title_html: Wéi een op d'Urhiewerschaft vun OpenStreetMap hiweist credit_1_html: 'Wann Dir Donnéeë vun OpenStreetMap benotzt, muss Dir dës zwou Saache respektéieren:' infringement_title_html: Copyright-Verletzung + services_title_html: Zousätzlech Servicer contributors_title_html: Eis Matwierkend contributors_intro_html: 'Eis Matwierkend sinn dausende vun eenzele Mënschen. Mir bezéien och oppe lizenzéiert Donnéeë vu nationale Kaartenagenturen an @@ -2414,14 +2440,18 @@ lb: cancel: Ofbriechen heading: Spuer %{name} beaarbechten visibility_help: wat heescht dat? + update: + updated: Spuer aktualiséiert show: title: Spuer %{name} ukucken + heading: Spuer %{name} ukucken pending: AM SUSPENS filename: 'Numm vum Fichier:' download: eroflueden uploaded: 'Eropgelueden:' points: 'Punkten:' start_coordinates: 'Ufankskoordinaten:' + coordinates_html: '%{latitude}; %{longitude}' map: Kaart edit: änneren owner: 'Besëtzer:' @@ -2429,6 +2459,7 @@ lb: tags: 'Markéierungen:' none: Keen edit_trace: Dës Spuer änneren + delete_trace: Dës Spuer läschen trace_not_found: Spuer net fonnt! visibility: 'Visibilitéit:' confirm_delete: Dës Spuer läschen? @@ -2447,9 +2478,13 @@ lb: details_without_tags_html: viru(n) %{time_ago} vum %{user} index: public_traces: Ëffentlech GPS Spueren + my_gps_traces: Meng GPS-Spueren public_traces_from: Ëffentlech GPS-Spuere vu(n) %{user} description: Lescht GPS-Spuer-Uploads duerchsichen + empty_title: Nach näischt hei + upload_new: Eng nei Spuer eroplueden wiki_page: Wiki-Säit + upload_trace: Eng Spuer eroplueden all_traces: All Spuren my_traces: Meng Spueren traces_from_html: Ëffentlech Spuere vum %{user} @@ -2460,6 +2495,9 @@ lb: show: title: OpenStreetMap-GPS-Spueren description: + description_with_count: + one: GPX-Fichier mat %{count} Punkt vum %{user} + other: GPX-Fichier mat %{count} Punkte vum %{user} description_without_count: GPX-Fichier vum %{user} application: setup_user_auth: @@ -2492,6 +2530,7 @@ lb: share: share: title: Deelen + alt: Deelen-Symbol email: title: Per E-Mail deelen alt: E-Mail-Symbol @@ -2515,6 +2554,7 @@ lb: alt: X-Symbol oauth: scopes: + openid: Mat OpenStreetMap umellen read_prefs: Benotzerastellunge liesen write_prefs: Benotzerastellungen änneren write_diary: Bloganträg a Commentairë schreiwen @@ -2620,6 +2660,9 @@ lb: edit_links: Linken änneren change_image: Bild änneren edit_company: Firma änneren + contributions: + one: '%{count} Kontributioun am leschte Joer' + other: '%{count} Kontributiounen am leschte Joer' sidebar_section: home_location: Doheem company: Firma @@ -2666,9 +2709,15 @@ lb: empty: Et goufe keng sou Benotzer fonnt comments: index: + heading_html: Kommentare vum %{user} changesets: Ännerungssätz + diary_entries: Blog-Anträg + no_comments: Keng Kommentaren changeset_comments: + index: + title: Ännerungssaz-Kommentaren derbäigesat vum %{user} page: + changeset: Ännerungssaz when: Wéini comment: Bemierkung diary_comments: @@ -2677,11 +2726,13 @@ lb: page: post: Blogantrag when: Wéini + comment: Kommentar suspended: support: Ënnerstëtzung auth_failure: no_authorization_code: Keen Autorisatiouns-Code auth_association: + heading: Är ID ass nach net mat engem OpenStreetMap-Kont verbonnen. option_1: Wann Dir nei sidd bei OpenSrreetMap da leet wgl. e Benotzerkont un andeem Dir de Formulaire hei drënner benotzt. role_icons: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 837b69aa7..f7e81cf32 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1980,6 +1980,7 @@ nl: kn: Kannada th: Thais my: Birmees + shn: Shan xmf: Mingreels ka: Georgisch km: Khmer diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 163db0601..29605f4cd 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -2037,6 +2037,7 @@ pl: kn: kannada th: tajski my: birmański + shn: szan xmf: megrelski ka: gruziński km: khmerski diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 873bc3eeb..6a6a302e2 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -125,6 +125,14 @@ ps: preferred_editor: غوره سمونگر pass_crypt: پټنوم pass_crypt_confirmation: پټنوم تاييدول + datetime: + distance_in_words_ago: + less_than_x_minutes: + one: تر %{count} دقيقې لږ مخکې + other: تر %{count} دقيقو لږ مخکې + x_minutes: + one: '%{count} دقيقه مخکې' + other: '%{count} دقيقې مخکې' editor: default: تلواليز (اوسنی %{name}) id: @@ -693,7 +701,7 @@ ps: title: سمون نابريالی شو redactions: show: - description: 'څرگندونه:' + description: 'څرگنداوی:' user: 'جوړونکی:' confirm: آيا تاسې ډاډه ياست؟ ... diff --git a/config/locales/shn.yml b/config/locales/shn.yml index c37ec66c0..8f0828ba6 100644 --- a/config/locales/shn.yml +++ b/config/locales/shn.yml @@ -16,25 +16,25 @@ shn: prompt: လိူၵ်ႈၾၢႆႇ submit: diary_comment: - create: ၶွမ်းမႅၼ်ႉ + create: ၶေႃႈႁၼ် diary_entry: create: ပိုၼ်ဢွၵ်ႇ update: ဢၢပ်ႉတဵတ်ႉ issue_comment: - create: သႂ်ႇ ၶွမ်းမႅၼ်ႉ + create: သႂ်ႇၶေႃႈႁၼ် message: create: သူင်ႇ oauth2_application: create: လူင်းသဵၼ်ႈမၢႆ update: ဢၢပ်ႉတဵတ်ႉ redaction: - create: ႁဵတ်းဢွၵ်ႇ ၵၢၼ်မူၼ်ႉမႄး + create: ႁဵတ်းလွင်ႈမႄးထတ်း update: သိမ်းလွင်ႈမႄးထတ်း trace: create: လူတ်ႇၶိုၼ်ႈ update: သိမ်းလွင်ႈလႅၵ်ႈလၢႆႈ user_block: - create: ႁဵတ်း လွင်ႈႁႄႉႁၢမ်ႈ + create: ႁဵတ်းလွင်ႈႁႄႉႁၢမ်ႈ update: ဢၢပ်ႉတဵတ်ႉလွင်ႈႁႄႉႁၢမ်ႈ activerecord: errors: @@ -52,7 +52,7 @@ shn: changeset: မုင်ႉလႅၵ်ႈလၢႆႈ changeset_tag: ထႅၵ်ႉꩡ် မုင်ႉလႅၵ်ႈလၢႆႈ country: မိူင်း - diary_comment: ၶွမ်းမႅၼ်ႉ တၢႆႇယႃႇရီႇ + diary_comment: ၶေႃႈႁၼ်တၢႆႇယႃႇရီႇ diary_entry: လၢႆးၵၢၼ် တၢႆႇယႃႇရီႇ friend: ဢူၺ်းၵေႃႉ issue: ပၼ်ႁႃ @@ -81,19 +81,19 @@ shn: user_preference: ၵၢၼ်တင်ႈ ၽူႈၸႂ်ႉတိုဝ်း user_token: မႂ်ၶပ်ႉ ၽူႈၸႂ်ႉတိုဝ်း way: တၢင်း - way_node: တၢင်းၼူတ်ႉ + way_node: ၼူတ်ႉတၢင်း way_tag: ထႅၵ်ႉꩡ် တၢင်း attributes: client_application: name: ၸိုဝ်ႈ (လူဝ်ႇလႆႈသႂ်ႇ) - url: URL ဢႅပ်ႉပလီႇၵေးသျိၼ်း ပိူင်လူင် (လူဝ်ႇ) + url: URL ဢႅပ်ႉပလီၶေးသျိၼ်း ပိူင်လူင် (လူဝ်ႇ) callback_url: ႁွင်ႉၶိုၼ်း URL support_url: URL ၵမ်ႉထႅမ် allow_read_prefs: ဢၢၼ်ႇတူၺ်း လွင်ႈဢၼ်ၽူႈၸႂ်ႉတိုဝ်းၶဝ် သူင်ၸႂ် - allow_write_prefs: မူၼ်ႉမႄး တၢင်းသူင်ၽူႈၸႂ်ႉတိုဝ်းၶဝ် - allow_write_diary: ႁဵတ်းဢွၵ်ႇ လိၵ်ႈမၢႆတွင်း လႄႈ ၶွမ်းမႅၼ်ႉ + allow_write_prefs: မူၼ်ႉမႄး ၵၢၼ်လိူၵ်ႈၶၼ်ၽူႈၸႂ်ႉတိုဝ်းၶဝ် + allow_write_diary: ႁဵတ်းၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ လႄႈ ၶေႃႈႁၼ် allow_write_api: မူၼ်ႉမႄးၽႅၼ်ႇလိၼ် - allow_write_changeset_comments: ပၼ်တၢင်းႁၼ်ထိုင် ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ + allow_write_changeset_comments: ပၼ်ၶေႃႈႁၼ် ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ allow_read_gpx: ဢၢၼ်ႇ ႁွႆးတၢင်း GPS ၶွင်သုၼ်ႇတူဝ်ၶဝ် allow_write_gpx: လူတ်ႇၶိုၼ်ႈႁွႆးတၢင်း GPS allow_write_notes: မူၼ်ႉမႄးၶေႃႈမၢႆတွင်း @@ -103,8 +103,8 @@ shn: user: ၽူႈၸႂ်ႉတိုဝ်း title: လွင်ႈတၢင်း body: တူဝ် - latitude: လတ်ႉတီႇၸုတ်ႉ - longitude: လွင်ႇꩡီႇၸုတ်ႉ + latitude: လတ်ႉတီႇထုတ်ႉ + longitude: လွင်ႇၵျီႇထုတ်ႉ language_code: ၽႃႇသႃႇ doorkeeper/application: name: ၸိုဝ်ႈ @@ -119,11 +119,11 @@ shn: visible: ႁၼ်လႆႈ name: ၸိုဝ်ႈၾၢႆႇ size: သႅၼ်း - latitude: လတ်ႉတီႇၸုတ်ႉ - longitude: လွင်ႇꩡီႇၸုတ်ႉ + latitude: လတ်ႉတီႇထုတ်ႉ + longitude: လွင်ႇၵျီႇထုတ်ႉ public: ၵၢင်လၢႆ description: ၶေႃႈသပ်းလႅင်း - gpx_file: လိူၵ်ႈဢဝ် ၾၢႆႇၸွမ်းႁွႆး GPS + gpx_file: လိူၵ်ႈဢဝ် ၾၢႆႇႁွႆးတၢင်း GPS visibility: လွင်ႈႁၼ်လႆႈ tagstring: ထႅၵ်ႉ message: @@ -135,27 +135,27 @@ shn: title: ႁူဝ်ၶေႃႈ description: ၶေႃႈသပ်းလႅင်း report: - category: လိူၵ်ႈဢဝ်လွင်ႈတၢင်း တႃႇတၢင်ႇၽိုၼ်ၶၢဝ်ႇ + category: လိူၵ်ႈဢဝ်လွင်ႈတၢင်း တႃႇလၢႆးငၢၼ်းၸဝ်ႈၵဝ်ႇ details: ၶႅၼ်းတေႃႈ ပၼ်ၶေႃႈမုၼ်းႁူဝ်ယွႆႈၵမ်ႈၽွင်း ဢၼ်ၵဵဝ်ႇၵပ်းလွင်ႈပၼ်ႁႃ (လူဝ်ႇ)။ user: - auth_provider: ၽူႈပၼ်လွင်ႈမၵ်းမၼ်ႈ - auth_uid: လွင်ႈမၵ်းမၼ်ႈ UID + auth_provider: ၽူႈပၼ်ဢၼုၺၢတ်ႈ + auth_uid: ၶေႃႈဢၼုၺၢတ်ႈ UID email: ဢီးမေးလ် new_email: ႁဵင်းလိၵ်ႈ ဢီးမေးလ်မႂ်ႇ active: တူင်ႉတိုၼ်ႇ display_name: ၸိုဝ်ႈဢွၵ်ႇၼႄ description: ၶေႃႈသပ်းလႅင်း ပရူဝ်ႇၾၢႆႇ company: ႁူင်းၵၢၼ် - home_lat: လတ်ႉတီႇၸုတ်ႉ - home_lon: လွင်ႇꩡီႇၸုတ်ႉ - home_location_name: ၸိုဝ်ႈ တီႈယူႇႁိူၼ်း + home_lat: လတ်ႉတီႇထုတ်ႉ + home_lon: လွင်ႇၵျီႇထုတ်ႉ + home_location_name: ၸိုဝ်ႈဢွင်ႈတီႈႁိူၼ်း languages: ၽႃႇသႃႇဢၼ်ထုၵ်ႇလိူၵ်ႈ preferred_editor: တူဝ်မႄးထတ်း ဢၼ်ထုၵ်ႇလိူၵ်ႈ pass_crypt: ၶေႃႈလပ်ႉ pass_crypt_confirmation: ယိုၼ်ယၼ် ၶေႃႈလပ်ႉ help: doorkeeper/application: - confidential: တေၸႂ်ႉတိုဝ်း ဢႅပ်ႉပလီႇၵေးသျိၼ်း တီႈဢၼ် ၶေႃႈမုၼ်း ၶႅၵ်ႇလီပၢင်ၸႃႉ + confidential: တေၸႂ်ႉတိုဝ်း ဢႅပ်ႉပလီၶေးသျိၼ်း တီႈဢၼ် ၶေႃႈမုၼ်း ၶႅၵ်ႇလီပၢင်ၸႃႉ တေၸၢင်ႈသိမ်းဝႆႉ လွင်ႈလပ်ႉ (ဢႅပ်ႉ မိုဝ်းထိုဝ် ငဝ်ႈတိုၼ်း လႄႈ ဢႅပ်ႉ ၼႃႈလိၵ်ႈ ဢၼ်လဵဝ်ၼၼ်ႉ ဢၼ်ဢမ်ႇၸႂ်ႈ လွင်ႈလပ်ႉ) redirect_uri: ၸႂ်ႉတိုဝ်း ၼိုင်ႈ URI ၼိုင်ႈထႅဝ် @@ -244,18 +244,18 @@ shn: (%{max_lat}|%{max_lon})] description_item: ၶေႃႈမုၼ်း rss တွၼ်ႈတႃႇ ၶေႃႈမၢႆတွင်း %{id} opened: ၶေႃႈမၢႆတွင်းမႂ်ႇ (ႁိမ်း %{place}) - commented: ၶေႃႈႁၼ်ထိုင်မႂ်ႇ (ႁိမ်း %{place}) + commented: ၶေႃႈႁၼ်မႂ်ႇ (ႁိမ်း %{place}) closed: ၶေႃႈမၢႆတွင်းဢၼ်ဢိုတ်းဝႆႉ (ႁိမ်း %{place}) reopened: ၶေႃႈမၢႆတွင်း ဢၼ်ပိုတ်ႇၶိုၼ်း (ႁိမ်း %{place}) entry: - comment: ၶေႃႈႁၼ်ထိုင် + comment: ၶေႃႈႁၼ် full: ၶေႃႈမၢႆတွင်းတဵမ်ထူၼ်ႈ accounts: show: - title: မႄးထတ်း ဢၶွင်ႉ + title: မႄးထတ်းဢၵွင်ႉ my_account: ဢၵွင်ႉၶႃႈ current email address: ဢီးမေးလ်ယၢမ်းလဵဝ် - external auth: လွင်ႈမၵ်းမၼ်ႈၽၢႆႇၼွၵ်ႈ + external auth: လွင်ႈဢၼုၺၢတ်ႈၽၢႆႇၼွၵ်ႈ contributor_terms: heading: ၶေႃႈမၵ်းမၼ်ႈၽူႈၸွႆႈထႅမ် agreed: ၸဝ်ႈၵဝ်ႇ လႆႈၸႂ် ၶေႃႈမၵ်းမၼ်ႈ ၽူႈၸွႆႈထႅမ် မိူဝ်ႈ %{date}။ @@ -278,7 +278,7 @@ shn: go_public: heading: လွင်ႈမႄးထတ်း ၵူၼ်းတင်းၼမ် currently_not_public: ယၢမ်းလဵဝ် လွင်ႈမႄးထတ်း ၸဝ်ႈၵဝ်ႇၼၼ်ႉ ဢမ်ႇလႆႈၼႄၸိုဝ်ႈလႄႈ - ၵူၼ်းၶဝ် ဢမ်ႇၸၢင်ႈသူင်ႇလိၵ်ႈ ဢမ်ႇၼၼ် ဢမ်ႇၸၢင်ႈတူၺ်းတီႈယူႇၸဝ်ႈၵဝ်ႇလႆႈ။ တႃႇတေၼႄ + ၵူၼ်းၶဝ် ဢမ်ႇၸၢင်ႈသူင်ႇလိၵ်ႈ ဢမ်ႇၼၼ် ဢမ်ႇၸၢင်ႈတူၺ်းဢွင်ႈတီႈၸဝ်ႈၵဝ်ႇလႆႈ။ တႃႇတေၼႄ ဢၼ်ၸဝ်ႈၵဝ်ႇ မႄးထတ်းဝႆႉၼၼ်ႉသေ ႁႂ်ႈပိူၼ်ႈ ၵပ်းသိုပ်ႇ ၸဝ်ႈၵဝ်ႇ လူၺ်ႈ ဝႅပ်ႉသၢႆႉၼၼ်ႉ ၼဵၵ်းတီႈ ၼဵၼ် ဢၼ်မီးပႃႈတႂ်ႈၼႆႉတႃႉ။ only_public_can_edit: တႄႇဢဝ် 0.6 API လႅၵ်ႈလၢႆႈမႃးၼၼ်ႉ ၽူႈၸႂ်ႉတိုဝ်း ၵူၼ်းတင်းၼမ်ၵူၺ်း @@ -302,7 +302,7 @@ shn: delete_introduction: ၸႂ်ႉတိုဝ်း ၼဵၼ် ဢၼ်မီးပႃႈတႂ်ႈၼႆႉသေ မွတ်ႇပႅတ်ႈ ဢၵွင်ႉ OpenStreetMap ၸဝ်ႈၵဝ်ႇလႆႈယူႇ။ ၶႅၼ်းတေႃႈမၢႆတွင်း ၶေႃႈမုၼ်းပႃႈတႂ်ႈၼႆႉၶႃႈ- delete_profile: ၶေႃႈမုၼ်း ပရူဝ်ႇၾၢႆႇ ၸဝ်ႈၵဝ်ႇ ပႃးၸဵမ် ဢႃႇဝႃႇတႃႇ၊ ၶေႃႈသပ်းလႅင်း - လႄႈ တီႈယူႇ ႁိူၼ်းယေး ၸဝ်ႈၵဝ်ႇ ၸိူဝ်းၼႆႉ တေထုၵ်ႇဢဝ်ဢွၵ်ႇပႅတ်ႈ။ + လႄႈ ဢွင်ႈတီႈႁိူၼ်းယေး ၸဝ်ႈၵဝ်ႇ ၸိူဝ်းၼႆႉ တေထုၵ်ႇဢဝ်ဢွၵ်ႇပႅတ်ႈ။ delete_display_name: ၸိုဝ်ႈၼႄၸဝ်ႈၵဝ်ႇၼၼ်ႉ တေထုၵ်ႇဢဝ်ဢွၵ်ႇပႅတ်ႈသေ ဢၵွင်ႉတၢင်ႇဢၼ် တေၸၢင်ႈၸႂ်ႉတိုဝ်းၶိုၼ်းလႆႈယူႇ။ retain_caveats: ၵူၺ်းၵႃႈ ၶေႃႈမုၼ်း ဢၼ်ၵဵဝ်ႇလူၺ်ႈ ၸဝ်ႈၵဝ်ႇ ၵမ်ႈၽွင်ႈ တေသိမ်းဝႆႉ @@ -391,7 +391,7 @@ shn: other: '%{count} တၢင်း' download_xml: လူတ်ႇလူင်း XML view_unredacted_history: တူၺ်းပိုၼ်းဢၼ်ပႆႇလႆႈမႄးထတ်း - location: 'တီႈယူႇ:' + location: 'ဢွင်ႈတီႈ:' node: title_html: 'တီႈလတ်း: %{name}' way: @@ -534,7 +534,7 @@ shn: changeset_comments: feeds: comment: - comment: 'ၶေႃႈႁၼ်ထိုင်မႂ်ႇ ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ #%{changeset_id} လူၺ်ႈ %{author}' + comment: 'ၶေႃႈႁၼ်မႂ်ႇ ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ #%{changeset_id} လူၺ်ႈ %{author}' commented_at_by_html: '%{user} ဢၢပ်ႉတဵတ်ႉမႃး %{when}' show: title_all: လွင်ႈဢုပ်ႇဢူဝ်း လွင်ႈလႅၵ်ႈလၢႆႈ OpenStreetMap @@ -545,8 +545,8 @@ shn: changesets: changeset_line: comments: - one: '%{count} ၶွမ်းမႅၼ်ႉ' - other: '%{count} ၶွမ်းမႅၼ်ႉ' + one: '%{count} ၶေႃႈႁၼ်' + other: '%{count} ၶေႃႈႁၼ်' changes: one: '%{count} လႅၵ်ႈလၢႆႈ' other: '%{count} လႅၵ်ႈလၢႆႈ' @@ -574,8 +574,8 @@ shn: older_changesets: လွင်ႈလႅၵ်ႈလၢႆႈၵဝ်ႇၵဝ်ႇ newer_changesets: လွင်ႈလႅၵ်ႈလၢႆႈမႂ်ႇမႂ်ႇ feed: - title: ၸုမ်ႇလႅၵ်ႈလၢႆႈ %{id} - title_comment: ၸုမ်ႇလႅၵ်ႈလၢႆႈ %{id} - %{comment} + title: လွင်ႈလႅၵ်ႈလၢႆႈ %{id} + title_comment: လွင်ႈလႅၵ်ႈလၢႆႈ %{id} - %{comment} created: ႁဵတ်းဝႆႉ closed: ဢိုတ်း belongs_to: ၽူႈတႅမ်ႈ @@ -593,11 +593,11 @@ shn: ယဝ်ႉၼႆ တေပိုတ်ႇပၢင်ဢုပ်ႇၵုမ်ယူႇ။ subscribe: တိတ်းတၢမ်း unsubscribe: ဢမ်ႇတိတ်းတၢမ်း - comment_by_html: ၶေႃႈႁၼ်ထိုင် တီႈ %{user} %{time_ago} + comment_by_html: ၶေႃႈႁၼ် တီႈ %{user} %{time_ago} hidden_comment_by_html: ၶေႃႈၶႆႈၸႂ် ဢၼ်လပ်ႉဝႆႉ တီႈ %{user} မိူဝ်ႈ %{time_ago} hide_comment: လပ်ႉ unhide_comment: ပိုတ်ႇၽုၺ်ႇ - comment: ၶေႃႈႁၼ်ထိုင် + comment: ၶေႃႈႁၼ် changesetxml: လွင်ႈလႅၵ်ႈလၢႆႈ XML osmchangexml: လွင်ႈလႅၵ်ႈလၢႆႈosm XML paging_nav: @@ -636,12 +636,12 @@ shn: no_edits: (ဢမ်ႇမီးလွင်ႈမႄးထတ်း) view_changeset_details: တူၺ်းႁူဝ်ယွႆႈ လွင်ႈလႅၵ်ႈလၢႆႈ popup: - your location: တီႈယူႇၸဝ်ႈၵဝ်ႇ + your location: ဢွင်ႈတီႈၸဝ်ႈၵဝ်ႇ nearby mapper: ၽူႈႁဵတ်းၽႅၼ်ႇလိၼ် ဢၼ်မီးႁိမ်းႁွမ်း following: တိတ်းတၢမ်း show: title: ၽၢင်ၵုမ်းၵမ် ၵဝ်ၶႃႈ - no_home_location_html: '%{edit_profile_link} သေ တင်ႈတီႈယူႇႁိူၼ်းၸဝ်ႈၵဝ်ႇ ႁႂ်ႈႁၼ်လႆႈ + no_home_location_html: '%{edit_profile_link} သေ တင်ႈဢွင်ႈတီႈႁိူၼ်းၸဝ်ႈၵဝ်ႇ ႁႂ်ႈႁၼ်လႆႈ ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်မီးႁိမ်းႁွမ်း။' edit_your_profile: မႄးထတ်း ပရူဝ်ႇၾၢႆႇၸဝ်ႈၵဝ်ႇ followings: ၽူႈၸႂ်ႉတိုဝ်း ၸိူဝ်းၸဝ်ႈၵဝ်ႇတိတ်းတၢမ်း @@ -657,7 +657,7 @@ shn: new: title: ၶေႃႈမုၼ်းမႂ်ႇ ၼႂ်းတၢႆႇယႃႇ form: - location: တီႈယူႇ + location: ဢွင်ႈတီႈ use_map_link: ၸႂ်ႉၽႅၼ်ႇလိၼ် index: title: တၢႆႇယႃႇရီႇ ၽူႈၸႂ်ႉတိုဝ်း @@ -670,7 +670,7 @@ shn: recent_entries: ၶေႃႈမုၼ်းၼႂ်းတၢႆႇယႃႇ ဢၼ်ပႆႇႁိုင်သင်ၼႆႉ edit: title: မႄးထတ်း ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ - marker_text: တီႈတႅမ်ႈတၢႆႇယႃႇရီႇ + marker_text: ဢွင်ႈတီႈၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ show: title: ပပ်ႉတၢႆႇယႃႇ %{user} | %{title} user_title: ပပ်ႉတၢႆႇယႃႇရီႇ %{user} @@ -694,8 +694,8 @@ shn: comment_link: ပၼ်ၶေႃႈႁၼ်ထိုင် တီႈၼႂ်းလိၵ်ႈၼႆႉ reply_link: သူင်ႇၶေႃႈၵႂၢမ်းထိုင်ၽူႈတႅမ်ႈလိၵ်ႈ comment_count: - one: '%{count} ၶွမ်းမႅၼ်ႉ' - other: '%{count} ၶွမ်းမႅၼ်ႉ' + one: '%{count} ၶေႃႈႁၼ်' + other: '%{count} ၶေႃႈႁၼ်' no_comments: ဢမ်ႇမီးၶေႃႈႁၼ်ထိုင်သင် edit_link: မႄးထတ်းၶေႃႈမုၼ်းၼႆႉ hide_link: လပ်ႉဝႆႉၶေႃႈမုၼ်းၼႆႉ @@ -703,13 +703,13 @@ shn: confirm: ယိုၼ်ယၼ် report: လၢႆးငၢၼ်းၶေႃႈမုၼ်းၼႆႉ diary_comment: - comment_from_html: ၶေႃႈႁၼ်ထိုင် တီႈ %{link_user} ၼိူဝ် %{comment_created_at} + comment_from_html: ၶေႃႈႁၼ် တီႈ %{link_user} ၼိူဝ် %{comment_created_at} hide_link: လပ်ႉၶေႃႈႁၼ်ထိုင်ၼႆႉ unhide_link: ပိုတ်ႇၽုၺ်ႇၶေႃႈႁၼ်ထိုင်ၼႆႉ confirm: ယိုၼ်ယၼ် report: လၢႆးငၢၼ်းၶေႃႈႁၼ်ထိုင်ၼႆႉ location: - location: 'တီႈယူႇ:' + location: 'ဢွင်ႈတီႈ:' feed: user: title: ၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ OpenStreetMap တွၼ်ႈတႃႇ %{user} @@ -736,10 +736,10 @@ shn: profile_diaries: latest_diaries: တၢႆႇယႃႇရီႇ လႃႈသုတ်း comments: - one: '%{count} ၶွမ်းမႅၼ်ႉ' - other: '%{count} ၶွမ်းမႅၼ်ႉ' + one: '%{count} ၶေႃႈႁၼ်' + other: '%{count} ၶေႃႈႁၼ်' title_label: ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ - comments_label: ၶေႃႈႁၼ်ထိုင် + comments_label: ၶေႃႈႁၼ် date_label: ဝၼ်းထီႉ diary_comments: new: @@ -796,7 +796,7 @@ shn: description: ၵၢၼ်ႁဵတ်းသၢင်ႈ ဢၼ်ၸဝ်ႈၵဝ်ႇယွၼ်းဝႆႉ တီႈၼိူဝ် သႃႇဝႃႇ OpenStreetMap ၼၼ်ႉ တေၸႂ်ႉတိုဝ်းလႆႈ တွၼ်ႈတႃႇ ၽူႈၸတ်းၵၢၼ်ၶဝ်ၵွႆး ၶဝ်ၵူၺ်း (HTTP 403) internal_server_error: - title: ဢႅပ်ႉပလီႇၶေးသျိၼ်း ၽိတ်းပိူင်ႈ + title: ဢႅပ်ႉပလီၶေးသျိၼ်း ၽိတ်းပိူင်ႈ description: သႃႇဝႃႇ OpenStreetMap ၼႆႉ လႆႈထူပ်းၺႃး လွင်ႈတၢင်း ဢၼ်ဢမ်ႇထၢင်ႇသေ ႁဵတ်းႁႂ်ႈ မၼ်းဢမ်ႇၸၢင်ႈႁဵတ်းၸွမ်း ၶေႃႈယွၼ်း (HTTP 500) ၼၼ်ႉယဝ်ႉ။ not_found: @@ -1717,7 +1717,7 @@ shn: new_reports: လၢႆးငၢၼ်းမႂ်ႇ other_issues_against_this_user: ပၼ်ႁႃတၢင်ႇဢၼ် ဢၼ်သၢၼ်ၶတ်း ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ no_other_issues: ဢမ်ႇမီးပၼ်ႁႃတၢင်ႇဢၼ် ဢၼ်တေႃႇသူႈ ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ။ - comments_on_this_issue: ၶေႃႈႁၼ်ထိုင် ၵဵဝ်ႇၵပ်းလွင်ႈၼႆႉ + comments_on_this_issue: ၶေႃႈႁၼ် ၵဵဝ်ႇၵပ်းလွင်ႈၼႆႉ resolve: resolved: ငဝ်းလၢႆးပၼ်ႁႃ လႆႈတင်ႈဝႆႉ 'ၵႄႈလိတ်ႈယဝ်ႉ' ignore: @@ -1725,14 +1725,14 @@ shn: reopen: reopened: ငဝ်းလၢႆးပၼ်ႁႃ လႆႈတင်ႈဝႆႉ 'ပိုတ်ႇ' ၼႆယဝ်ႉ။ comments: - comment_from_html: ၶေႃႈႁၼ်ထိုင် တီႈ %{user_link} ၼိူဝ် %{comment_created_at} + comment_from_html: ၶေႃႈႁၼ် မႃးတီႈ %{user_link} ၼိူဝ် %{comment_created_at} reassign_to_moderators: ၶိုၼ်းမၵ်းမၼ်ႈပၼ်ႁႃ တီႈၽူႈထတ်းၵၢၼ် reassign_to_administrators: ၶိုၼ်းမၵ်းမၼ်ႈပၼ် ပၼ်ႁႃ တီႈၽူႈၸတ်းၵၢၼ် reports: reported_by_html: လၢႆးငၢၼ်းဝႆႉဝႃႈ %{category} လူၺ်ႈ %{user} တီႈ %{updated_at} helper: reportable_title: - diary_comment: '%{entry_title}, ၶေႃႈႁၼ်ထိုင် #%{comment_id}' + diary_comment: '%{entry_title}, ၶေႃႈႁၼ် #%{comment_id}' note: 'ၶေႃႈမၢႆတွင်း #%{note_id}' reportable_heading: diary_comment_html: ၶေႃႈထတ်းသၢင် တၢႆႇယႃႇရီႇ %{title} ႁဵတ်းမိူဝ်ႈ %{datetime_created} @@ -1768,8 +1768,8 @@ shn: threat_label: ၼႂ်းတၢႆႇယႃႇရီႇၼႆႉ ပႃးဝႆႉ လွင်ႈလွၵ်ႇငိူတ်ႈ other_label: တၢင်ႇဢၼ် diary_comment: - spam_label: ၶေႃႈႁၼ်ထိုင် ၼႂ်းတၢႆႇယႃႇရီႇၼႆႉ ပဵၼ်/ပႃး သပမ်း - offensive_label: ၶေႃႈႁၼ်ထိုင် ၼႂ်းတၢႆႇယႃႇရီႇၼႆႉ ပဵၼ်ၶေႃႈၵႂၢမ်း ဢၼ်ဝူၺ်ႇ/ဢၼ်လူလၢႆ + spam_label: ၶေႃႈႁၼ် ၼႂ်းတၢႆႇယႃႇရီႇၼႆႉ ပဵၼ်/ပႃး သပမ်း + offensive_label: ၶေႃႈႁၼ် ၼႂ်းတၢႆႇယႃႇရီႇၼႆႉ ပဵၼ်ၶေႃႈၵႂၢမ်း ဢၼ်ဝူၺ်ႇ/ဢၼ်လူလၢႆ threat_label: တီႈၶေႃႈႁၼ်ထိုင် ၼႂ်း တၢႆႇယႃႇရီႇ ၼႆႉ ပႃးဝႆႉ လွင်ႈလွၵ်ႇငိူတ်ႈ other_label: တၢင်ႇဢၼ် user: @@ -1981,7 +1981,7 @@ shn: filename: ၸိုဝ်ႈၾၢႆႇ url: URL description: ၶေႃႈသပ်းလႅင်း - tags: တိတ်း + tags: ထႅၵ်ႉ total_points: ၸုတ်းႁူမ်ႈတင်းသဵင်ႈ imported_points: ႁူဝ်ၼပ်ႉၶေႃႈဢၼ်ဢဝ်ၶဝ်ႈမႃး gpx_failure: @@ -2037,10 +2037,10 @@ shn: subject_own: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ်ထိုင် တီႈၶေႃႈမၢႆတွင်းၸဝ်ႈၵဝ်ႇဢၼ်ၼိုင်ႈ' subject_other: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ်ထိုင် ၼိူဝ်ၶေႃႈမၢႆတွင်း ဢၼ်ၸဝ်ႈၵဝ်ႇသူၼ်ၸႂ်' - your_note: '%{commenter} ၼႆႉ မၼ်းဝႆႉပၼ် ၶေႃႈႁၼ်ထိုင် တီႈ ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ်မႂ်း + your_note: '%{commenter} ၼႆႉ မၼ်းဝႆႉပၼ် ၶေႃႈႁၼ် တီႈ ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ်မႂ်း + ဢၼ်ၼိုင်ႈ ဢၼ်မီးႁိမ်း %{place} ၼၼ်ႉယဝ်ႉ။' + your_note_html: '%{commenter} ၼႆႉ မၼ်းဝႆႉပၼ် ၶေႃႈႁၼ် တီႈ ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ်မႂ်း ဢၼ်ၼိုင်ႈ ဢၼ်မီးႁိမ်း %{place} ၼၼ်ႉယဝ်ႉ။' - your_note_html: '%{commenter} ၼႆႉ မၼ်းဝႆႉပၼ် ၶေႃႈႁၼ်ထိုင် တီႈ ၶေႃႈမၢႆတွင်း - ၽႅၼ်ႇလိၼ်မႂ်း ဢၼ်ၼိုင်ႈ ဢၼ်မီးႁိမ်း %{place} ၼၼ်ႉယဝ်ႉ။' commented_note: '%{commenter} ၼႆႉ မၼ်းဝႆႉပၼ် ၶေႃႈၵႂၢမ်း တီႈၼိူဝ် ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် ဢၼ်ၸဝ်ႈၵဝ်ႇ ပၼ်ၶေႃႈၵႂၢမ်းဝႆႉၼၼ်ႉယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} ။' @@ -2146,8 +2146,8 @@ shn: limit_exceeded: မိူဝ်ႈပူၼ်ႉမႃးၼႆႉ ၸဝ်ႈၵဝ်ႇသူင်ႇၶေႃႈၵႂၢမ်းမႃးၼမ်ၼႃႇ။ ၶႅၼ်းတေႃႈပႂ်ႉၸူဝ်ႈၵႅပ်ႉ ၸင်ႇၶတ်းၸႂ်သူင်ႇထႅင်ႈၶႃႈ။ no_such_message: - title: ဢၼ်ႁၼ် ၶေႃႈႁၼ်ထိုင်ၸိူင်ႉၼႆ - heading: ဢၼ်ႁၼ် ၶေႃႈႁၼ်ထိုင်ၸိူင်ႉၼႆ + title: ဢၼ်ႁၼ် ၶေႃႈႁၼ်ၸိူင်ႉၼႆ + heading: ဢၼ်ႁၼ် ၶေႃႈႁၼ်ၸိူင်ႉၼႆ body: ၵဵင်ၸႂ်ယူႇ ဢမ်ႇမီးၶေႃႈၵႂၢမ်း ဢၼ်ပႃး id ၼၼ်ႉၶႃႈ။ show: title: ဢၢၼ်ႇၶေႃႈၵႂၢမ်း @@ -2173,7 +2173,7 @@ shn: heading: my_inbox: တိူၵ်ႈၵႂၢမ်းၶဝ်ႈၶႃႈ my_outbox: တိူၵ်ႈၵႂၢမ်းဢွၵ်ႇ - muted_messages: ၶေႃႈၵႂၢမ်းဢၼ်ႁၢမ်ႈသဵင်ဝႆႉ + muted_messages: ၶေႃႈၵႂၢမ်းဢၼ်ဢိုတ်းသဵင်ဝႆႉ messages_table: from: လုၵ်ႉတီႈ to: ထိုင် @@ -2200,10 +2200,10 @@ shn: people_mapping_nearby: ၵူၼ်းႁဵတ်းၽႅၼ်ႇလိၼ်ႁိမ်းႁွမ်း muted_inboxes: show: - title: ၶေႃႈၵႂၢမ်းဢၼ်ဢိုတ်းဝႆႉ + title: ၶေႃႈၵႂၢမ်းဢၼ်ဢိုတ်းသဵင်ဝႆႉ messages: - one: ၶေႃႈၵႂၢမ်းဢၼ်ဢိုတ်းဝႆႉ %{count} ဢၼ် - other: ၸဝ်ႈၵဝ်ႇမီးဝႆႉ ၶေႃႈၵႂၢမ်းဢၼ်ဢိုတ်း %{count} ဢၼ်။ + one: ၶေႃႈၵႂၢမ်းဢၼ်ဢိုတ်းသဵင်ဝႆႉ %{count} ဢၼ် + other: ၸဝ်ႈၵဝ်ႇမီးဝႆႉ ၶေႃႈၵႂၢမ်းဢၼ်ဢိုတ်းသဵင် %{count} ဢၼ်။ outboxes: show: title: တိူၵ်ႈၵႂၢမ်းဢွၵ်ႇ @@ -2325,7 +2325,7 @@ shn: title: မႄးထတ်း ပရူဝ်ႇၾၢႆႇ save: ဢၢပ်ႉတဵတ်ႉ ပရူဝ်ႇၾၢႆႇ cancel: ယႃႉၶိုၼ်း - no home location: ၸဝ်ႈၵဝ်ႇဢမ်ႇလႆႈသႂ်ႇဝႆႉဢွင်ႈတီႈႁိူၼ်းၸဝ်ႈၵဝ်ႇ။ + no home location: ၸဝ်ႈၵဝ်ႇဢမ်ႇလႆႈသႂ်ႇဝႆႉ ဢွင်ႈတီႈႁိူၼ်းၸဝ်ႈၵဝ်ႇ။ update home location on click: ႁဵတ်း ဢၢပ်ႉတဵတ်ႉ ဢွင်ႈတီႈႁိူၼ်း မိူဝ်ႈၶႃႈၼဵၵ်းတီႈၽႅၼ်ႇလိၼ်ၼၼ်ႉႁႃႉ? show: ၼႄ delete: မွတ်ႇပႅတ်ႈ @@ -2384,15 +2384,15 @@ shn: help: ၸွႆႈထႅမ် pagination: changeset_comments: - older: ၶေႃႈႁၼ်ထိုင်ၵဝ်ႇၵဝ်ႇ - newer: ၶေႃႈႁၼ်ထိုင်မႂ်ႇသုတ်း - oldest: ၶေႃႈႁၼ်ထိုင်ၵဝ်ႇသုတ်း - newest: ၶေႃႈႁၼ်ထိုင်မႂ်ႇသုတ်း + older: ၶေႃႈႁၼ်ၵဝ်ႇၵဝ်ႇ + newer: ၶေႃႈႁၼ်မႂ်ႇသုတ်း + oldest: ၶေႃႈႁၼ်ၵဝ်ႇသုတ်း + newest: ၶေႃႈႁၼ်မႂ်ႇသုတ်း diary_comments: - older: ၶေႃႈႁၼ်ထိုင်ၵဝ်ႇၵဝ်ႇ - newer: ၶေႃႈႁၼ်ထိုင်မႂ်ႇမႂ်ႇ - oldest: ၶေႃႈႁၼ်ထိုင်ၵဝ်ႇသုတ်း - newest: ၶေႃႈႁၼ်ထိုင်မႂ်ႇသုတ်း + older: ၶေႃႈႁၼ်ၵဝ်ႇၵဝ်ႇ + newer: ၶေႃႈႁၼ်မႂ်ႇမႂ်ႇ + oldest: ၶေႃႈႁၼ်ၵဝ်ႇသုတ်း + newest: ၶေႃႈႁၼ်မႂ်ႇသုတ်း diary_entries: older: ၶေႃႈမုၼ်းၵဝ်ႇၵဝ်ႇ newer: ၶေႃႈမုၼ်းမႂ်ႇမႂ်ႇ @@ -3030,7 +3030,7 @@ shn: edit: မႄးထတ်း owner: 'ၸဝ်ႈၶွင်:' description: 'ၶေႃႈသပ်းလႅင်း:' - tags: 'တိတ်း:' + tags: 'ထႅၵ်ႉ:' none: ဢမ်ႇမီးသင် edit_trace: မႄးထတ်းႁွႆးတၢင်းၼႆႉ delete_trace: မွတ်ႇပႅတ်ႈ ႁွႆးတၢင်းၼႆႉ @@ -3057,7 +3057,7 @@ shn: my_gps_traces: ႁွႆးတၢင်း GPS ၶႃႈ public_traces_from: ထႅဝ်ႁွႆး GPS ၵၢင်လၢႆ ဢၼ်မႃးတီႈ %{user} description: တူၺ်း GPS trace ဢၼ်လူတ်ႇၶိုၼ်ႈပႆႇႁိုင်သင်ၼႆႉ - tagged_with: ' ဢၼ်တိတ်းဝႆႉၸွမ်း %{tags}' + tagged_with: ' ဢၼ်ထႅၵ်ႉဝႆႉၸွမ်း %{tags}' empty_title: တီႈၼႆႈပႆႇမီးသင် empty_upload_html: '%{upload_link} ဢမ်ႇၼၼ် လဵပ်ႈႁဵၼ်းလွင်ႈ ၸွပ်ႇႁႃ GPS တီႈ %{wiki_link} ၼၼ်ႉတႃႉ။' @@ -3100,7 +3100,7 @@ shn: account_settings: ၵၢၼ်လိူၵ်ႈၶၼ် ဢၵွင်ႉ oauth2_applications: ဢႅပ်ႉ OAuth 2 oauth2_authorizations: လွင်ႈပၼ်ဢၼုၺၢတ်ႈ OAuth 2 - muted_users: ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ႁၢမ်ႈသဵင်ဝႆႉ + muted_users: ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ဢိုတ်းသဵင်ဝႆႉ auth_providers: google: title: လွၵ်ႉၶဝ်ႈ ၸွမ်း Google @@ -3152,9 +3152,9 @@ shn: openid: လွၵ်ႉၶဝ်ႈ လွင်ႈၸႂ်ႉတိုဝ်း OpenStreetMap read_prefs: ဢၢၼ်ႇတူၺ်း ၵၢၼ်လိူၵ်ႈၶၼ် ၽူႈၸႂ်ႉတိုဝ်း write_prefs: မူၼ်ႉမႄး ၵၢၼ်လိူင်ႈၶၼ်ၽူႈၸႂ်ႉတိုဝ်း - write_diary: ႁဵတ်းဢွၵ်ႇ ၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ လႄႈ ၶေႃႈႁၼ်ထိုင် + write_diary: ႁဵတ်းၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ လႄႈ ၶေႃႈႁၼ် write_api: မူၼ်ႉမႄးၽႅၼ်ႇလိၼ် - write_changeset_comments: ပၼ်ၶေႃႈႁၼ်ထိုင် ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ + write_changeset_comments: ပၼ်ၶေႃႈႁၼ် ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ read_gpx: ဢၢၼ်ႇ ထႅဝ်ႁွႆး GPS ၶွင်သုၼ်ႇတူဝ် write_gpx: လူတ်ႇၶိုၼ်ႈႁွႆးတၢင်း GPS write_notes: မူၼ်ႉမႄးၶေႃႈမၢႆတွင်း @@ -3164,13 +3164,13 @@ shn: consume_messages: ဢၢၼ်ႇ၊ ႁဵတ်း ဢၢပ်ႉတဵတ်ႉ ငဝ်းလၢႆး လႄႈ မွတ်ႇပႅတ်ႈ ၶေႃႈၵႂၢမ်း ၽူႈၸႂ်ႉတိုဝ်း send_messages: သူင်ႇၶေႃႈၵႂၢမ်းသုၼ်ႇတူဝ်ၸူး ၽူႈၸႂ်ႉတိုဝ်းတၢင်ႇၵေႃႉ - skip_authorization: ႁပ်ႉႁွင်းပၼ် ဢႅပ်ႉပလီႇၶေးသျိၼ်း + skip_authorization: ႁပ်ႉႁွင်းပၼ် ဢႅပ်ႉပလီၶေးသျိၼ်း for_roles: moderator: ၶေႃႈပၼ်ၶႂၢင်ႉၼႆႉ ပဵၼ်တႃႇ လွင်ႈႁဵတ်းသၢင်ႈ ဢၼ်ၸႂ်ႉလႆႈ တႃႇၽူႈၸတ်းၵၢၼ်ၶဝ်ၵူၺ်း oauth2_applications: index: - title: ဢႅပ်ႉပလီႇၶေးသျိၼ်း ၽူႈၸႂ်ႉတိုဝ်းၶႃႈ - no_applications_html: ၸွင်ႇၸဝ်ႈၵဝ်ႇမီး ဢႅပ်ႉပလီႇၶေးသျိၼ်း ဢၼ်ၸဝ်ႈၵဝ်ႇၶႂ်ႈလူင်းၸိုဝ်ႈ + title: ဢႅပ်ႉပလီၶေးသျိၼ်း ၽူႈၸႂ်ႉတိုဝ်းၶႃႈ + no_applications_html: ၸွင်ႇၸဝ်ႈၵဝ်ႇမီး ဢႅပ်ႉပလီၶေးသျိၼ်း ဢၼ်ၸဝ်ႈၵဝ်ႇၶႂ်ႈလူင်းၸိုဝ်ႈ တႃႇၸႂ်ႉတိုဝ်းၸွမ်းႁဝ်းၶႃႈ လူၺ်ႈၸႂ်ႉတိုဝ်း ပိူင် %{oauth2} ၼၼ်ႉႁိုဝ်? ၸဝ်ႈၵဝ်ႇတေလႆႈ လူင်းသဵၼ်ႈမၢႆ ဢႅပ်ႉပလီႇၶေးသျိၼ်း ၸဝ်ႈၵဝ်ႇ ဢွၼ်တၢင်း မၼ်းတေႁဵတ်းပၼ် လွင်ႈယွၼ်း OAuth တီႈ ၵၢၼ်ၸႂ်ႉတိုဝ်း ဢၼ်ၼႆႉ။ @@ -3184,7 +3184,7 @@ shn: new: title: လူင်းၸိုဝ်ႈဢႅပ်ႉပလီႇၶေးသျိၼ်းမႂ်ႇ edit: - title: မႄးထတ်း ဢႅပ်ႉပလီႇၶေးသျိၼ်း + title: မႄးထတ်း ဢႅပ်ႉပလီၶေးသျိၼ်း show: edit: မႄးထတ်း delete: မွတ်ႇပႅတ်ႈ @@ -3209,10 +3209,10 @@ shn: oauth2_authorized_applications: index: title: ဢႅပ်ႉဢပလီႇၶေးသျိၼ်း ဢၼ်လႆႈဢၼုၺၢတ်ႈ ၶွင်ၶႃႈ - application: ဢႅပ်ႉပလီႇၶေးသျိၼ်း + application: ဢႅပ်ႉပလီၶေးသျိၼ်း permissions: ၶေႃႈဢၼုၺၢတ်ႈ last_authorized: ဢၼုၺၢတ်ႈၵမ်းလိုၼ်းသုတ်း - no_applications_html: ၸဝ်ႈၵဝ်ႇပႆႇလႆႈပၼ်ဢၼုၺၢတ်ႈ %{oauth2} ဢႅပ်ႉပလီႇၶေးသျိၼ်းသေဢၼ်ဢၼ်။ + no_applications_html: ၸဝ်ႈၵဝ်ႇပႆႇလႆႈပၼ်ဢၼုၺၢတ်ႈ %{oauth2} ဢႅပ်ႉပလီၶေးသျိၼ်းသေဢၼ်ဢၼ်။ application: revoke: ယႃႉပႅတ်ႈသုၼ်ႇၶဝ်ႈထိုင် confirm_revoke: ယႃႉပႅတ်ႈ သုၼ်ႇၶဝ်ႈထိုင် ဢႅပ်ႉၼႆႉႁႃႉ? @@ -3270,12 +3270,12 @@ shn: my messages: ၶေႃႈၵႂၢမ်းလိၵ်ႈ ၵဝ်ၶႃႈ my profile: ပရူဝ်ႇၾၢႆႇ ၵဝ်ၶႃႈ my_account: ဢၵွင်ႉၵဝ်ၶႃႈ - my comments: ၶေႃႈႁၼ်ထိုင်ၵဝ်ၶႃႈ + my comments: ၶေႃႈႁၼ်ၵဝ်ၶႃႈ my_preferences: ၵၢၼ်တင်ႈ ၶွင်ၶႃႈ my_dashboard: ၽၢင်ၵုမ်းၵမ် ၵဝ်ၶႃႈ blocks on me: လွင်ႈႁႄႉႁၢမ်ႈၼိူဝ်ၶႃႈ blocks by me: လွင်ႈႁႄႉႁၢမ်ႈ လူၺ်ႈၶႃႈ - create_mute: ႁၢမ်ႈသဵင်ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ + create_mute: ဢိုတ်းသဵင်ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ destroy_mute: ပိုတ်ႇသဵင်ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ send message: သူင်ႇၶေႃႈၵႂၢမ်း diary: တၢႆႇယႃႇရီႇ @@ -3298,7 +3298,7 @@ shn: block_history: လွင်ႈႁႄႉႁၢမ်ႈဢၼ်တူင်ႉၼိုင် moderator_history: လွင်ႈႁႄႉႁၢမ်ႈ ဢၼ်ပၼ်ဝႆႉ revoke_all_blocks: ယႃႉပႅတ်ႈ လွင်ႈႁႄႉႁၢမ်ႈ တင်းမူတ်း - comments: ၶေႃႈႁၼ်ထိုင် + comments: ၶေႃႈႁၼ် create_block: ႁႄႉႁၢမ်ႈၽူႈၸႂ်ႉတိုဝ်းၼႆႉ activate_user: ႁဵတ်းႁႂ်ႈၽူႈၸႂ်ႉတိုဝ်းၼႆႉတူင်ႉၼိုင် confirm_user: ယိုၼ်ယၼ်ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ @@ -3375,7 +3375,7 @@ shn: summary_no_ip_html: '%{name} ႁဵတ်းဢွၵ်ႇမိူဝ်ႈ %{date}' comments: index: - heading_html: ၶေႃႈႁၼ်ထိုင် %{user} + heading_html: ၶေႃႈႁၼ် %{user} changesets: လွင်ႈလႅၵ်ႈလၢႆႈ diary_entries: ၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ no_comments: ဢမ်ႇမီးၶေႃႈႁၼ်ထိုင်သင် @@ -3385,14 +3385,14 @@ shn: page: changeset: လွင်ႈလႅၵ်ႈလၢႆႈ when: မိူဝ်ႈလႂ် - comment: ၶေႃႈႁၼ်ထိုင် + comment: ၶေႃႈႁၼ် diary_comments: index: - title: ၶေႃႈႁၼ်ထိုင် တၢႆႇယႃႇရီႇ ဢၼ် %{user} ထႅမ်သႂ်ႇ + title: ၶေႃႈႁၼ် တၢႆႇယႃႇရီႇ ဢၼ် %{user} ထႅမ်သႂ်ႇ page: post: ၽူတ်ႉ when: မိူဝ်ႈလႂ် - comment: ၶေႃႈႁၼ်ထိုင် + comment: ၶေႃႈႁၼ် suspended: title: ဢၵွင်ႉထုၵ်ႇၵိုတ်းဝႆႉ heading: ဢၵွင်ႉထုၵ်ႇၵိုတ်းဝႆႉ @@ -3408,7 +3408,7 @@ shn: no_authorization_code: ဢမ်ႇမီးမၢႆဢၼုၺၢတ်ႈ unknown_signature_algorithm: ဢမ်ႇႁူႉ လွၵ်းလၢႆးလူင်းလၢႆးမိုဝ်း invalid_scope: ၼႃႈၵၢၼ်ဢမ်ႇမၢၼ်ႇမႅၼ်ႈ - unknown_error: လွင်ႈမၵ်းမၼ်ႈဢမ်ႇဢွင်ႇမၢၼ် + unknown_error: လွင်ႈဢၼုၺၢတ်ႈဢမ်ႇဢွင်ႇမၢၼ် auth_association: heading: ID ၸဝ်ႈၵဝ်ႇ ဢမ်ႇပႆႇၵွင်ႉၵၢႆႇၵၼ်တင်း ဢၵွင်ႉ OpenStreetMap ။ option_1: |- @@ -3534,25 +3534,25 @@ shn: new_block: လွင်ႈႁႄႉႁၢမ်ႈမႂ်ႇ user_mutes: index: - title: ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ႁၢမ်ႈသဵင်ဝႆႉ - my_muted_users: ၽူႈၸႂ်ႉတိုဝ်းဢၼ်ၶႃႈႁၢမ်ႈသဵင်ဝႆႉ + title: ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ဢိုတ်းသဵင်ဝႆႉ + my_muted_users: ၽူႈၸႂ်ႉတိုဝ်းဢၼ်ၶႃႈဢိုတ်းသဵင်ဝႆႉ you_have_muted_n_users: - one: ၸဝ်ႈၵဝ်ႇ ဢိုတ်းဝႆႉ ၽူႈၸႂ်ႉတိုဝ်း %{count} ၵေႃႉ - other: ၸဝ်ႈၵဝ်ႇ ဢိုတ်းဝႆႉ ၽူႈၸႂ်ႉတိုဝ်း %{count} ၵေႃႉ - user_mute_explainer: ၶေႃႈၵႂၢမ်း ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ႁၢမ်ႈသဵင်ဝႆႉၼၼ်ႉ တေၶၢႆႉၵႂႃႇဝႆႉ + one: ၸဝ်ႈၵဝ်ႇ ဢိုတ်းသဵင်ဝႆႉ ၽူႈၸႂ်ႉတိုဝ်း %{count} ၵေႃႉ + other: ၸဝ်ႈၵဝ်ႇ ဢိုတ်းသဵင်ဝႆႉ ၽူႈၸႂ်ႉတိုဝ်း %{count} ၵေႃႉ + user_mute_explainer: ၶေႃႈၵႂၢမ်း ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ဢိုတ်းသဵင်ဝႆႉၼၼ်ႉ တေၶၢႆႉၵႂႃႇဝႆႉ ၼႂ်း တိူၵ်ႈၵႂၢမ်းၶဝ်ႈ ႁင်းၶေႃသေ ၸဝ်ႈၵဝ်ႇ တေဢမ်ႇလႆႈႁပ်ႉ ၶေႃႈမုၼ်း ဢီးမေးလ်။ - user_mute_admins_and_moderators: ၸဝ်ႈၵဝ်ႇၸၢင်ႈႁၢမ်ႈသဵင် ၽူႈၸတ်းၵၢၼ် လႄႈ ၽူႈထတ်းၵၢၼ် + user_mute_admins_and_moderators: ၸဝ်ႈၵဝ်ႇၸၢင်ႈဢိုတ်းသဵင် ၽူႈၸတ်းၵၢၼ် လႄႈ ၽူႈထတ်းၵၢၼ် ၶဝ်ယူႇ ၵူၺ်းၵႃႈ ၶေႃႈၵႂၢမ်းၶဝ် တေဢမ်ႇထုၵ်ႇႁၢမ်ႈဝႆႉ။ table: thead: - muted_user: ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ႁၢမ်ႈသဵင် + muted_user: ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ဢိုတ်းသဵင်ဝႆႉ actions: လွင်ႈႁဵတ်းသၢင်ႈ tbody: unmute: ပိုတ်ႇသဵင် send_message: သူင်ႇၶေႃႈၵႂၢမ်း create: notice: ၸဝ်ႈၵဝ်ႇ ဢိုတ်းသဵင် %{name} ဝႆႉ။ - error: '%{name} ဢမ်ႇၸၢင်ႈႁဵတ်းႁႂ်ႈဢိုတ်းလႆႈ။ %{full_message}။' + error: '%{name} ဢမ်ႇၸၢင်ႈႁဵတ်းႁႂ်ႈဢိုတ်းသဵင်ဝႆႉလႆႈ။ %{full_message}။' destroy: notice: ၸဝ်ႈၵဝ်ႇ ပိုတ်ႇသဵင် %{name} ။ error: ၽူႈၸႂ်ႉတိုဝ်း ဢမ်ႇၸၢင်ႈပိုတ်ႇသဵင်လႆႈ။ ၶိုၼ်းၶတ်းၸႂ်တူၺ်းၶႃႈ။ @@ -3586,7 +3586,7 @@ shn: event_opened_by_html: '%{user} ႁဵတ်းမႃး မိူဝ်ႈ %{time_ago}' event_opened_by_anonymous_html: ၽူႈဢမ်ႇၶႂ်ႈဢွၵ်ႇၸိုဝ်ႈ ၵေႃႉႁဵတ်းမႃး မိူဝ်ႈ %{time_ago} event_commented_by_html: ၶေႃႈၶႆႈၸႂ် ဢၼ်လပ်ႉဝႆႉ တီႈ %{user} မိူဝ်ႈ %{time_ago} - event_commented_by_anonymous_html: ၶေႃႈႁၼ်ထိုင် ၽူႈဢမ်ႇၶႂ်ႈဢွၵ်ႇၸိုဝ်ႈ %{time_ago} + event_commented_by_anonymous_html: ၶေႃႈႁၼ် ၽူႈဢမ်ႇၶႂ်ႈဢွၵ်ႇၸိုဝ်ႈ %{time_ago} event_closed_by_html: '%{user} ၵႄႈလိတ်ႈမႃး မိူဝ်ႈ%{time_ago}' event_closed_by_anonymous_html: ၽူႈဢမ်ႇၶႂ်ႈဢွၵ်ႇၸိုဝ်ႈ ၵႄႈလိတ်ႈမႃး မိူဝ်ႈ %{time_ago} event_reopened_by_html: ၶိုၼ်းတူင်ႉတိုၼ်ႇ လူၺ်ႈ %{user} %{time_ago} @@ -3603,7 +3603,7 @@ shn: resolve: ၵႄႈလိတ်ႈ reactivate: ၶိုၼ်းတူင်ႉၼိုင် comment_and_resolve: ပၼ်ၶေႃႈႁၼ်ထိုင် & ၵႄႈလိတ်ႈ - comment: ၶေႃႈႁၼ်ထိုင် + comment: ၶေႃႈႁၼ် log_in_to_comment: လွၵ်ႉၶဝ်ႈ တႃႇပၼ်တၢင်းႁၼ်ထိုင်တီႈ ၶေႃႈမၢႆတွင်းၼႆႉ report_link_html: သင်ဝႃႈ ၶေႃႈမၢႆတွင်းၼႆႉ ပႃးဝႆႉ ၶေႃႈမုၼ်း ဢၼ်လမ်ႇလွင်ႈ ဢၼ်လူဝ်ႇ ဢဝ်ဢွၵ်ႇၼႆၸိုင် ၸဝ်ႈၵဝ်ႇ ၸၢင်ႈ %{link} လႆႈယူႇ။ @@ -3665,7 +3665,7 @@ shn: in: ၶႂၢၵ်ႈတူၺ်း out: ႁုပ်ႈတူၺ်း locate: - title: ၼႄဢွင်ႈတီႈၶႃႈ + title: ၼႄဢွင်ႈတီႈၵဝ်ၶႃႈ metersPopup: one: ၸဝ်ႈၵဝ်ႇယူႇၼႂ်းၵႄႈ %{count} မီႇတႃႇ တီႈၸုတ်ႇၼႆႉ other: ၸဝ်ႈၵဝ်ႇမီးၼႂ်းၵႄႈ %{count} မီႇတႃႇ တီႈၸုတ်ႇၼႆႉ diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 7374e1735..19e277c17 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -8,6 +8,7 @@ # Author: GeographieMan # Author: Gravitystorm # Author: HairyFotr +# Author: JanezPavelZebovec # Author: Lesko987 # Author: Macofe # Author: Marwin H.H. @@ -402,6 +403,10 @@ sl: consider_pd: Svoje prispevke štejem za javno domeno consider_pd_why: Zakaj bi želel_a, da so moji prispevki javna domena? confirm: Potrdi + create: + successfully_declared: Uspešno ste izjavili, da so vaša urejana v javni domeni. + already_declared: Ste že izjavili, da so vaša urejanja del javne domene. + did_not_confirm: Niste potrdili, da so vaša urejanja del javne domene. browse: deleted_ago_by_html: Izbrisal %{user} %{time_ago} edited_ago_by_html: Uredil_a %{user} %{time_ago} @@ -475,6 +480,7 @@ sl: start_rjs: feature_warning: Nalaganje %{num_features}-ih značilnosti, kar lahko upočasni brskalnik ali ga naredi neodzivnega. Ali res želite prikazati te podatke? + feature_error: 'Predmet ni bilo mogoče naložiti: %{message}' load_data: Naloži podatke loading: Nalaganje ... tag_details: @@ -483,11 +489,23 @@ sl: key: Vikstran z opisom oznake %{key} tag: Viki stran z opisom oznake %{key}=%{value} wikidata_link: Predmet %{page} v Wikipodatkih + wikidata_preview: + one: predogled Wikidata + two: predogleda Wikidata + few: predogledi Wikidata + other: predlog Wikidata wikipedia_link: Članek %{page} v Wikipediji wikimedia_commons_link: Predmet %{page} v Wikimedijini zbirki telephone_link: Pokliči %{phone_number} colour_preview: Predogled barve %{colour_value} email_link: E-pošta %{email} + versions_navigation: + node: Vozlišče + way: Pot + relation: Zveza + history: Zgodovina + version: 'Različica #%{version}' + versions_label: 'Različice:' feature_queries: show: title: Preveri značilnosti @@ -502,18 +520,51 @@ sl: title_html: 'Zgodovina poti: %{name}' relation: title_html: 'Zgodovina povezave: %{name}' + older_versions: 'Starejše različice:' + newer_versions: Novejše različice actions: view_redacted_data: Ogled skritih podatkov view_redaction_message: Ogled sporočila o redigiranju + nodes: + not_found_message: + sorry: 'Žal ni bilo mogoče najti vozlišča #%{id}.' + timeout: + sorry: Žal je pridobivanje podatkov za vozlišče z ID-jem %{id} trajalo predolgo. old_nodes: not_found_message: sorry: 'Žal vozlišča #%{id} različice %{version} ni bilo mogoče najti.' + timeout: + sorry: Žal je pridobivanje zgodovine vozlišča z ID-jem %{id} trajalo predolgo. + ways: + not_found_message: + sorry: Žal ni bilo mogoče najti poti %{id}. + timeout: + sorry: Žal je pridobivanje podatkov poti z ID-jem %{id} trajalo predolgo. old_ways: not_found_message: sorry: 'Žal načina #%{id} različice %{version} ni bilo mogoče najti.' + timeout: + sorry: Žal je pridobivanje zgodovine poti z ID-jem %{id} trajalo predolgo. + relations: + not_found_message: + sorry: 'Žal zveze #%{id} ni bilo mogoče najti.' + timeout: + sorry: Žal je prodobivanje podatkov za zvezo z ID-jem %{id} trajalo predolgo. + relation_members: + not_found_message: + sorry: 'Žal zveze #%{id} ni bilo mogoče najti.' + timeout: + sorry: Žal je prodobivanje podatkov za relacijo z ID-jem %{id} trajalo predolgo. old_relations: not_found_message: sorry: 'Žal relacije #%{id} različice %{version} ni bilo mogoče najti.' + timeout: + sorry: Žal je pridobivanje zgodovine relacije z ID-jem %{id} trajalo predolgo. + old_relation_members: + not_found_message: + sorry: 'Žal relacije #%{id} različice %{version} ni bilo mogoče najti.' + timeout: + sorry: Žal je pridobivanje članov relacije z ID-jem %{id} trajalo predolgo. changeset_comments: feeds: comment: @@ -526,10 +577,37 @@ sl: sorry: Žal je trajalo pridobivanje seznama komentarjev nabora sprememb, ki ste ga zahtevali, predolgo. changesets: + changeset_line: + comments: + one: '%{count} komentar' + two: '%{count} komentarja' + few: '%{count} komentarji' + other: '%{count} komentarjev' + changes: + one: '%{count} sprememba' + two: '%{count} spremembi' + few: '%{count} spremembe' + other: '%{count} sprememb' + n_elements_created: + one: '%{count} ustvarjeni element' + two: '%{count} ustvarjena elementa' + few: '%{count} ustvarjeni elementi' + other: '%{count} ustvarjenih elementov' + n_elements_modified: + one: '%{count} element spremenjen' + two: '%{count} elementa spremenjena' + few: '%{count} elementi spremenjeni' + other: '%{count} elementov spremenjenih' + n_elements_deleted: + one: '%{count} element izbrisan' + two: '%{count} elementa izbrisana' + few: '%{count} elementi izbrisani' + other: '%{count} elementov izbrisanih' index: title: Sklopi sprememb title_user: Sklopi sprememb od %{user} title_user_link_html: Sklopi sprememb uporabnika_ce %{user_link} + title_followed: Sklopi srememb uporabnikov, ki jim sledite. title_nearby: Sklopi sprememb bližnjih uporabnikov empty: Ni najdenih množic sprememb. empty_area: Na tem območju ni naborov sprememb. @@ -537,6 +615,8 @@ sl: no_more: Ni drugih najdenih naborov sprememb. no_more_area: Na tem območju ni drugih množic sprememb. no_more_user: Ni drugih naborov sprememb tega uporabnika. + older_changesets: Starejši sklopi sprememb. + newer_changesets: Novejši sklopi sprememb. feed: title: Nabor sprememb %{id} title_comment: Nabor sprememb %{id} – %{comment} @@ -565,9 +645,15 @@ sl: changesetxml: Nabor sprememb XML osmchangexml: osmChange XML paging_nav: + nodes_title: Vozlišča nodes_paginated: Vozlišča (%{x}-%{y} od %{count}) + ways_title: Poti ways_paginated: Poti (%{x}-%{y} od %{count}) + relations_title: Zveze relations_paginated: Zveze (%{x}-%{y} od %{count}) + range: '%{x}-%{y} od %{count}' + not_found_message: + sorry: Žal sklopa sprememb %{id} ni bilo mogoče najti. timeout: sorry: Žal je trajalo pridobivanje zahtevanega nabora sprememb predolgo. changeset_subscriptions: @@ -595,14 +681,19 @@ sl: popup: your location: Vaša lokacija nearby mapper: Bližnji kartograf + following: Spremljajoč show: title: Moja nadzorna plošča no_home_location_html: '%{edit_profile_link} in nastavite svojo domačo lokacijo za prikaz bližnjih uporabnikov.' edit_your_profile: Uredite svoj profil + followings: Uporabniki, ki jih spremljate + no followings: Ne spremljate še nobenega uporabnika. nearby users: Drugi bližnji uporabniki no nearby users: Ni drugih uporabnikov, ki bi sporočili, da kartirajo v vaši bližini. + followed_changesets: sklopi sprememb + followed_diaries: dnevniški vpisi nearby_changesets: sklopi sprememb bližnjih uporabnikov nearby_diaries: dnevniški vnosi bližnjih uporabnikov diary_entries: @@ -613,6 +704,7 @@ sl: use_map_link: Uporabi zemljevid index: title: Dnevniki uporabnikov + title_followed: Dnevniki spremljanih uporabnikov title_nearby: Dnevniki bližnjih uporabnikov user_title: Dnevnik uporabnika %{user} in_language_title: Dnevniški zapisi v jeziku %{language} @@ -626,6 +718,8 @@ sl: title: Dnevnik uporabnika %{user} | %{title} user_title: Dnevnik uporabnika %{user} discussion: Pogovor + subscribe: Naroči se + unsubscribe: Odnaroči se leave_a_comment: Napiši komentar login_to_leave_a_comment_html: '%{login_link} za vpis komentarja' login: Prijava @@ -637,6 +731,7 @@ sl: diary_entry: posted_by_html: Objavil %{link_user} v %{created} v jeziku %{language_link}. updated_at_html: Nazadnje posodobljeno %{updated}. + full_entry: Poglej celotni vnos comment_link: Komentiraj ta vnos reply_link: Pošlji sporočilo avtorju comment_count: @@ -668,10 +763,30 @@ sl: all: title: Dnevniški zapisi OpenStreetMap description: Nedavni dnevniški zapisi uporabnikov OpenStreetmap + subscribe: + heading: Želite spremljati sledečo razpravo dnevniškega vpisa? + button: Spremljaj razpravo + unsubscribe: + heading: Želite prenehati spremljati razpravo sledečega dnevniškega vpisa? + button: Prenehaj spremljati razpravo navigation: + in_language: Dnevniški vnosi v %{language} my_diary: Moj dnevnik new: Nov dnevniški zapis new_title: Sestavi nov zapis v mojem uporabniškem dnevniku + profile_diaries: + latest_diaries: Najnovejši dnevniki + comments: + one: '%{count} komentar' + two: '%{count} komentarja' + few: '%{count} komentarji' + other: '%{count} komentarjev' + title_label: Dnevniški vpis + comments_label: Komentarji + date_label: Datum + diary_comments: + new: + heading: Želite dodati komentar k sledečemu dnevniškemu vpisu? doorkeeper: errors: messages: @@ -710,6 +825,10 @@ sl: contact: kontaktirati contact_the_community_html: Če ste našli nedelujočo povezavo/hrošča, ne oklevajte %{contact_link} skupnosti OpenStreetMap. Zabeležite si točen URL vašega zahtevka. + bad_request: + title: Spodletel ukaz + description: Operacija, ki ste jo zahtevali na strežniku OpenStreetMap, ni veljavna + (HTTP 400) forbidden: title: Prepovedano description: Operacija, ki ste jo zahtevali v strežniku OpenStreetMap, je na @@ -722,6 +841,23 @@ sl: title: Datoteka ni bila najdena description: Datoteke/imenika/API-operacije s tem imenom v strežniku OpenStreetMap ni bilo mogoče najti (HTTP 404) + follows: + show: + follow: + heading: Ali želite spremljati uporabnika %{user}? + button: Spremljaj uporabnika + unfollow: + heading: Ali želite prenehati slediti %{user}? + button: Odsledi uporabnika + create: + success: Zdaj sledite %{name}! + failed: Žal vaš zahtevek za sledenje %{name} ni bil uspešen. + already_followed: Že spremljate uporabnika %{name}. + limit_exceeded: V kratkem času ste začeli slediti številne uporabnike. Prosimo, + nekoliko počakajte, preden začnete slediti nove uporabnike. + destroy: + success: Uspešno ste prenehali slediti %{name}. + not_followed: Ne sledite %{name}. geocoder: search_osm_nominatim: prefix_format: '%{name}' @@ -887,6 +1023,7 @@ sl: college: VIsokošolska stavba commercial: Poslovna stavba construction: Stavba v gradnji + cowshed: Hlev za krave detached: Samostojna hiša dormitory: Študentski dom duplex: Dvostanovanjska hiša @@ -916,6 +1053,7 @@ sl: shed: Lopa stable: Hlev za konje static_caravan: Stanovanjska prikolica + sty: Svinjak temple: Tempelj terrace: Vrstne hiše train_station: Poslopje železniške postaje @@ -970,6 +1108,7 @@ sl: bridleway: Jahalna pot bus_guideway: Turistični avtobus bus_stop: Avtobusna postaja + busway: Avtobusna proga construction: Cesta v izgradnji corridor: Hodnik crossing: Prehod @@ -1052,6 +1191,14 @@ sl: wayside_shrine: Kapelica wreck: Razbitina "yes": Zgodovinski kraj + information: + guidepost: Kažipot + board: Informativna tabla + map: Zemljevid + office: Turistična pisarna + terminal: Informacijski terminal + sign: Informacijski znak + stele: Informacijska stela junction: "yes": Križišče landuse: @@ -1124,6 +1271,8 @@ sl: track: Tekaška proga water_park: Vodni park "yes": Prosti čas + lock: + "yes": Zapornica man_made: adit: Rudarski jašek advertising: Oglaševanje @@ -1464,6 +1613,17 @@ sl: building_passage: Prehod skozi stavbo culvert: Podzemni kanal "yes": Predor + water: + lake: Jezero + pond: Ribnik + reservoir: Vodni zbiralnik + basin: Vodna kotanja + fishpond: Ribnik + lagoon: Laguna + wastewater: Odpadne vode + oxbow: Rečni okljuk + stream_pool: Potočni bazen + lock: Zapornica waterway: artificial: Umetni vodotok boatyard: Ladjedelnica @@ -1484,20 +1644,49 @@ sl: weir: Nizek jez "yes": Vodotok admin_levels: - level2: Državna meja + level2: Mednarodna državna meja level3: Meja regije level4: Meja pokrajine - level5: Meja regije - level6: Meja upravne enote - level7: Meja občine - level8: Meja občine - level9: Meja mesta - level10: Meja predmestja - level11: Meja soseske + level5: Upravna meja (raven 5) + level6: Upravna meja (raven 6) + level7: Upravna meja (raven 7) + level8: Upravna meja (raven 8) + level9: Upravna meja (raven 9) + level10: Upravna meja (raven 10) + level11: Upravna meja (raven 11) + border_types: + arrondissement: Meja okrožja + borough: Meja okraja + cercle: Meja okroga + city: Meja mesta + comarca: Meja comarce + county: Meja okrožja + departement: Meja departmaja + department: Meja departmaja + district: Meja distrikta + distrito: Meja distrikta + freguesia: Meja freguesie + local_authority: Meja lokalne oblasti + municipality: Meja občine + municipi: Občinska meja + município: Občinska meja + nation: Mednarodna meja + national: Mednarodna meja + neighbourhood: Meja soseske + parish: Meja županije + province: Meja province + região: Regionalna meja + region: Regionalna meja + state: Državna meja + town: Meja mesta + township: Meja townshipa + village: Meja vasi searches: show: title: latlon: Notranji + nominatim: Nominatim + nominatim_reverse: Nominatim queries: create: no_results: Ni zadetkov @@ -1509,13 +1698,21 @@ sl: time: Čas ascend: Vzpon descend: Spust + kilometers: kilometri + miles_feet: milje, čevlji + miles_yards: milje, jardi + distance_units_settings: Nastavitve enot razdalj + download: Prenesi pot kot GeoJSON + filename: pot directions_courtesy_html: Navodila prispeva %{link} issues: index: title: Težave select_status: Izberite stanje select_type: Izberite vrsto + select_last_managed_by: Izberi, kar je nazadnje urejal reported_user: Prijavljeni uporabnik + not_managed: Neurejeno search: Iskanje search_guidance: 'Preišči težave:' states: @@ -1525,6 +1722,7 @@ sl: page: user_not_found: Uporabnik ne obstaja issues_not_found: Ni najdenih tovrstnih težav + reported_user: Prijavljeni uporabnik status: Stanje reports: Prijave last_updated: Zadnja posodobitev @@ -1632,6 +1830,107 @@ sl: communities: Skupnosti learn_more: Več o tem more: Več + header: + ok: Potrdi + select_language: Izberite jezik + select_language_button: + title: Izberite jezik + select_language_list: + languages: + af: afrikanščina + az: azerbajdžanščina + id: indonezijščina + ms: malajščina + bs: bosanščina + br: bretonščina + ca: katalonščina + cs: češčina + cy: valižanščina + da: danščina + de: nemščina + dsb: spodnja lužiška srbščina + et: estonščina + en: angleščina + en-GB: Angleščina (VB) + es: španščina + eo: Esperanto + eu: baskovščina + fr: francoščina + fy: Zahodnofrizijščina + ga: irščina + gd: škotska gelščina + hsb: zgornja lužiška srbščina + hr: hrvaščina + is: islandščina + it: italijanščina + gcf: gvadalupska kreolščina + ku-Latn: kurdščina (latinična) + lv: latvijščina + lb: luksemburščina + lt: litovščina + hu: madžarščina + nl: nizozemščina + nb: norveščina (Bokmål) + nn: norveščina (Nynorsk) + oc: okcitanščina + pl: poljščina + pt-PT: portugalščina + pt: portugalščina (Brazilija) + ro: romunščina + sc: sardinščina + sco: škotščina + sq: albanščina + scn: sicilijanščina + sk: slovaščina + sl: slovenščina + sr-Latn: srbščina (latinična) + sh: srbohrvaščina (latinična) + fi: finščina + sv: švedščina + tl: tagaloščina + kab: kabilščina + vi: vietnamščina + tr: turščina + yo: jorubščina + el: grščina + ba: baškirščina + be: beloruščina + be-Tarask: beloruščina (tarašk.) + bg: bolgarščina + mk: makedonščina + mo: moldavščina + ce: čečenščina + ru: ruščina + sr: Srbščina (cirilična) + tt: tatarščina (cirilična) + uk: ukrajinščina + kk-cyrl: kazaščina (cirilična) + yi: jidiš + he: hebrejščina + ar: arabščina + fa: perzijščina + arz: egpiptovska arabščina + pnb: zahodna pandžabščina + nqo: nkojščina + ne: nepalščina + mr: maratščina + hi: hindijščina + bn: bengalščina + pa: pandžabščina + gu: gudžaratščina + ta: tamilščina + te: teluščina + th: tajščina + my: burmajščina + shn: šanščina + xmf: mingrelščina + km: kmerščina + sat: santalščina + zh-CN: kitajščina (poenostavljena) + zh-TW: kitajščina (tradicionalna) + zh-HK: kitajščina (hongkongška) + ja: japonščina + ko: korejščina user_mailer: diary_comment_notification: description: Dnevniški vnos OpenStreetMap št. %{id} diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 5e0e37c0f..9e56dc5ac 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1919,6 +1919,117 @@ uk: select_language: Обрати мову select_language_button: title: Обрати мову + select_language_list: + 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: Китайська (Гонконг) + ja: Японська + ko: Корейська offline_flash: osm_offline: База даних OpenStreetMap наразі працює в режимі офлайн, поки проводяться роботи з технічного обслуговування. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index ee3bb458e..46905ee6d 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -3072,7 +3072,6 @@ vi: khoản tự động cho bạn. please_contact_support_html: Vui lòng liên hệ với %{support_link} để yêu cầu tạo tài khoản – chúng tôi sẽ cố gắng giải quyết yêu cầu nhanh nhất có thể. - support: hỗ trợ about: header: Tự do sử dụng và sửa đổi. paragraph_1: Không giống như với các bản đồ kia, OpenStreetMap được xây dựng -- 2.39.5 From d4b8f171a0e27e496889391191f0e4497511cab3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 23:01:10 +0000 Subject: [PATCH 04/16] Bump ruby/setup-ruby from 1.258.0 to 1.259.0 Bumps [ruby/setup-ruby](https://github.com/ruby/setup-ruby) from 1.258.0 to 1.259.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/3fee6763234110473bd57dd4595c5199fce2c510...866b91cc020931c510d42e43e498a7f07d335f60) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.259.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 f5b7c56d2..0ce468999 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@3fee6763234110473bd57dd4595c5199fce2c510 # v1.258.0 + uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 with: ruby-version: 3.2 rubygems: 3.4.10 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9e27adcb9..ce5569768 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@3fee6763234110473bd57dd4595c5199fce2c510 # v1.258.0 + uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.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@3fee6763234110473bd57dd4595c5199fce2c510 # v1.258.0 + uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.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@3fee6763234110473bd57dd4595c5199fce2c510 # v1.258.0 + uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.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@3fee6763234110473bd57dd4595c5199fce2c510 # v1.258.0 + uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.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@3fee6763234110473bd57dd4595c5199fce2c510 # v1.258.0 + uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 with: ruby-version: ${{ env.ruby }} rubygems: 3.4.10 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6467b6a80..2c30b96b5 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@3fee6763234110473bd57dd4595c5199fce2c510 # v1.258.0 + uses: ruby/setup-ruby@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 with: ruby-version: ${{ matrix.ruby }} rubygems: 3.4.10 -- 2.39.5 From 644e42f9560787d0bbe8dd801e4bb74af3d1c21a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 23:01:11 +0000 Subject: [PATCH 05/16] Bump eslint from 9.35.0 to 9.36.0 Bumps [eslint](https://github.com/eslint/eslint) from 9.35.0 to 9.36.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.35.0...v9.36.0) --- updated-dependencies: - dependency-name: eslint dependency-version: 9.36.0 dependency-type: direct:development 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 d4687fc03..90a88fe28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,10 +55,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.35.0": - version "9.35.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.35.0.tgz#ffbc7e13cf1204db18552e9cd9d4a8e17c692d07" - integrity sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw== +"@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/object-schema@^2.1.6": version "2.1.6" @@ -394,9 +394,9 @@ eslint-visitor-keys@^4.2.1: integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ== eslint@^9.0.0: - version "9.35.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.35.0.tgz#7a89054b7b9ee1dfd1b62035d8ce75547773f47e" - integrity sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg== + version "9.36.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.36.0.tgz#9cc5cbbfb9c01070425d9bfed81b4e79a1c09088" + integrity sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ== dependencies: "@eslint-community/eslint-utils" "^4.8.0" "@eslint-community/regexpp" "^4.12.1" @@ -404,7 +404,7 @@ eslint@^9.0.0: "@eslint/config-helpers" "^0.3.1" "@eslint/core" "^0.15.2" "@eslint/eslintrc" "^3.3.1" - "@eslint/js" "9.35.0" + "@eslint/js" "9.36.0" "@eslint/plugin-kit" "^0.3.5" "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1" -- 2.39.5 From 7447730237666016a338d395040838139dfe8a06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 23:01:18 +0000 Subject: [PATCH 06/16] Bump @stylistic/eslint-plugin from 5.3.1 to 5.4.0 Bumps [@stylistic/eslint-plugin](https://github.com/eslint-stylistic/eslint-stylistic/tree/HEAD/packages/eslint-plugin) from 5.3.1 to 5.4.0. - [Release notes](https://github.com/eslint-stylistic/eslint-stylistic/releases) - [Changelog](https://github.com/eslint-stylistic/eslint-stylistic/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint-stylistic/eslint-stylistic/commits/v5.4.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@stylistic/eslint-plugin" dependency-version: 5.4.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index d4687fc03..c661ad47a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,10 +7,10 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@eslint-community/eslint-utils@^4.7.0", "@eslint-community/eslint-utils@^4.8.0": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.8.0.tgz#0e3b5e45566d1bce1ec47d8aae2fc2ad77ad0894" - integrity sha512-MJQFqrZgcW0UNYLGOuQpey/oTN59vyWwplvCGZztn1cKz9agZPPYpJB7h2OMmuu7VLqkvEjN8feFZJmxNF9D+Q== +"@eslint-community/eslint-utils@^4.8.0", "@eslint-community/eslint-utils@^4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3" + integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g== dependencies: eslint-visitor-keys "^3.4.3" @@ -185,12 +185,12 @@ integrity sha512-Rv5IaFyh9GuFu2BEAGvVvlVGmXt5Jbjd0XhIu0D4Tek81DPQEQryIIwDFTDR27W4NyAtozy8QltB+8SFr2C7mQ== "@stylistic/eslint-plugin@^5.2.3": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-5.3.1.tgz#1aead935023b708ca6a27d079b1a96b726a38fe2" - integrity sha512-Ykums1VYonM0TgkD0VteVq9mrlO2FhF48MDJnPyv3MktIB2ydtuhlO0AfWm7xnW1kyf5bjOqA6xc7JjviuVTxg== + version "5.4.0" + resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin/-/eslint-plugin-5.4.0.tgz#4cd51beb5602a8978a9a956c3568180efffcabe5" + integrity sha512-UG8hdElzuBDzIbjG1QDwnYH0MQ73YLXDFHgZzB4Zh/YJfnw8XNsloVtytqzx0I2Qky9THSdpTmi8Vjn/pf/Lew== dependencies: - "@eslint-community/eslint-utils" "^4.7.0" - "@typescript-eslint/types" "^8.41.0" + "@eslint-community/eslint-utils" "^4.9.0" + "@typescript-eslint/types" "^8.44.0" eslint-visitor-keys "^4.2.1" espree "^10.4.0" estraverse "^5.3.0" @@ -244,10 +244,10 @@ dependencies: "@types/geojson" "*" -"@typescript-eslint/types@^8.41.0": - version "8.41.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.41.0.tgz#9935afeaae65e535abcbcee95383fa649c64d16d" - integrity sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag== +"@typescript-eslint/types@^8.44.0": + version "8.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.44.0.tgz#4b9154ab164a0beff22d3217ff0fdc8d10bce924" + integrity sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA== acorn-jsx@^5.3.2: version "5.3.2" -- 2.39.5 From f0b5edbeaef245943854e842bd6fc5e7248317e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 23:01:26 +0000 Subject: [PATCH 07/16] Bump maplibre-gl from 5.7.2 to 5.7.3 Bumps [maplibre-gl](https://github.com/maplibre/maplibre-gl-js) from 5.7.2 to 5.7.3. - [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.2...v5.7.3) --- updated-dependencies: - dependency-name: maplibre-gl dependency-version: 5.7.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index d4687fc03..f464b2249 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.0": - version "24.1.0" - resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-24.1.0.tgz#1797b13247d59e3ffecb18ed116cfe7e4aa6ab57" - integrity sha512-VLmx4+ceP9XKwPvkjqfnwuHGzgp2MHGpRSWLisvotx6bnUgZLiIfwlVv5nVUlwK/IQoj1KFkrvppzVameZnRhA== +"@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== 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.2" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.7.2.tgz#d03efb97242c0b15089102a9f288f4f034a3e5c7" - integrity sha512-SU6VlQ1tPskqzcTrwrvOarj2m5HuSkZARSzxbGUAym6h93ygqP6iwofbkzyIr1u6iv82BYK+dCV6avkUDAtwXg== + version "5.7.3" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-5.7.3.tgz#95a61ca62d81e8abe4b5880b45913518f98d3455" + integrity sha512-T6XsjwcSfOr0vtAt4GTzx4m/vD6nrbR0+61MgMzZ9REQwILSEnhqwNpFuFbDedX6LC3ZWjZWnxN7fN/I66WoDQ== 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.0" + "@maplibre/maplibre-gl-style-spec" "^24.1.1" "@maplibre/vt-pbf" "^4.0.3" "@types/geojson" "^7946.0.16" "@types/geojson-vt" "3.2.5" -- 2.39.5 From ce80c58bad4e2f017ba09b00182b687d006bc154 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 20 Sep 2025 00:28:46 +0100 Subject: [PATCH 08/16] Fix new eslint warnings --- app/assets/javascripts/index/contextmenu.js | 8 ++++---- .../javascripts/index/directions-route-output.js | 2 +- app/assets/javascripts/index/element.js | 4 ++-- app/assets/javascripts/index/note.js | 8 ++++---- config/eslint.config.mjs | 2 +- test/javascripts/osm_test.js | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js index 4350b012e..dcdfc9e44 100644 --- a/app/assets/javascripts/index/contextmenu.js +++ b/app/assets/javascripts/index/contextmenu.js @@ -5,8 +5,8 @@ OSM.initializeContextMenu = function (map) { const latlng = OSM.cropLocation(e.latlng, map.getZoom()); OSM.router.route("/directions?" + new URLSearchParams({ - "from": latlng.join(","), - "to": getDirectionsEndpointCoordinatesFromInput($("#route_to")) + from: latlng.join(","), + to: getDirectionsEndpointCoordinatesFromInput($("#route_to")) })); } }); @@ -17,8 +17,8 @@ OSM.initializeContextMenu = function (map) { const latlng = OSM.cropLocation(e.latlng, map.getZoom()); OSM.router.route("/directions?" + new URLSearchParams({ - "from": getDirectionsEndpointCoordinatesFromInput($("#route_from")), - "to": latlng.join(",") + from: getDirectionsEndpointCoordinatesFromInput($("#route_from")), + to: latlng.join(",") })); } }); diff --git a/app/assets/javascripts/index/directions-route-output.js b/app/assets/javascripts/index/directions-route-output.js index 71d62b707..36a49d47d 100644 --- a/app/assets/javascripts/index/directions-route-output.js +++ b/app/assets/javascripts/index/directions-route-output.js @@ -130,7 +130,7 @@ OSM.DirectionsRouteOutput = function (map) { writeSteps(route); }); - const blob = new Blob([JSON.stringify(polyline.toGeoJSON())], { "type": "application/json" }); + const blob = new Blob([JSON.stringify(polyline.toGeoJSON())], { type: "application/json" }); URL.revokeObjectURL(downloadURL); downloadURL = URL.createObjectURL(blob); $("#directions_route_download").prop("href", downloadURL); diff --git a/app/assets/javascripts/index/element.js b/app/assets/javascripts/index/element.js index c98fba7e4..b952c8a64 100644 --- a/app/assets/javascripts/index/element.js +++ b/app/assets/javascripts/index/element.js @@ -40,7 +40,7 @@ page._addObject = function (type, id, version, center) { const hashParams = OSM.parseHash(); - map.addObject({ "type": type, "id": parseInt(id, 10), "version": version && parseInt(version, 10) }, function (bounds) { + map.addObject({ type: type, id: parseInt(id, 10), version: version && parseInt(version, 10) }, function (bounds) { if (!hashParams.center && bounds.isValid() && (center || !map.getBounds().contains(bounds))) { OSM.router.withoutMoveListener(function () { @@ -111,7 +111,7 @@ } function renderWikidataResponse({ icon, label, article, description }, $link) { - const localeName = new Intl.DisplayNames(OSM.preferred_languages, { "type": "language" }); + const localeName = new Intl.DisplayNames(OSM.preferred_languages, { type: "language" }); const cell = $("") .attr("colspan", 2) .addClass("bg-body-tertiary"); diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js index 31455f5f4..a587daf49 100644 --- a/app/assets/javascripts/index/note.js +++ b/app/assets/javascripts/index/note.js @@ -66,10 +66,10 @@ OSM.Note = function (map) { if (data) { const hashParams = OSM.parseHash(); map.addObject({ - "type": "note", - "id": parseInt(id, 10), - "latLng": L.latLng(data.coordinates.split(",")), - "icon": OSM.noteMarkers[data.status] + type: "note", + id: parseInt(id, 10), + latLng: L.latLng(data.coordinates.split(",")), + icon: OSM.noteMarkers[data.status] }, function () { if (!hashParams.center && !skipMoveToNote) { const latLng = L.latLng(data.coordinates.split(",")); diff --git a/config/eslint.config.mjs b/config/eslint.config.mjs index 09528c57e..cbb698da8 100644 --- a/config/eslint.config.mjs +++ b/config/eslint.config.mjs @@ -59,7 +59,7 @@ export default [ "@stylistic/eol-last": "error", "@stylistic/function-call-spacing": "error", "@stylistic/indent": ["error", 2, { - CallExpression: { "arguments": "first" }, + CallExpression: { arguments: "first" }, FunctionDeclaration: { parameters: "first" }, FunctionExpression: { parameters: "first" }, SwitchCase: 1, diff --git a/test/javascripts/osm_test.js b/test/javascripts/osm_test.js index 608cc5af3..c5be6b5f6 100644 --- a/test/javascripts/osm_test.js +++ b/test/javascripts/osm_test.js @@ -8,15 +8,15 @@ describe("OSM", function () { describe(".apiUrl", function () { it("returns a URL for a way", function () { - expect(OSM.apiUrl({ "type": "way", "id": 10 })).to.eq("/api/0.6/way/10/full"); + expect(OSM.apiUrl({ type: "way", id: 10 })).to.eq("/api/0.6/way/10/full"); }); it("returns a URL for a node", function () { - expect(OSM.apiUrl({ "type": "node", "id": 10 })).to.eq("/api/0.6/node/10"); + expect(OSM.apiUrl({ type: "node", id: 10 })).to.eq("/api/0.6/node/10"); }); it("returns a URL for a specific version", function () { - expect(OSM.apiUrl({ "type": "node", "id": 10, "version": 2 })).to.eq("/api/0.6/node/10/2"); + expect(OSM.apiUrl({ type: "node", id: 10, version: 2 })).to.eq("/api/0.6/node/10/2"); }); }); @@ -41,15 +41,15 @@ describe("OSM", function () { it("parses object params", function () { let params = OSM.mapParams("?node=1"); expect(params).to.have.property("object"); - expect(params.object).to.eql({ "type": "node", "id": 1 }); + expect(params.object).to.eql({ type: "node", id: 1 }); params = OSM.mapParams("?way=1"); expect(params).to.have.property("object"); - expect(params.object).to.eql({ "type": "way", "id": 1 }); + expect(params.object).to.eql({ type: "way", id: 1 }); params = OSM.mapParams("?relation=1"); expect(params).to.have.property("object"); - expect(params.object).to.eql({ "type": "relation", "id": 1 }); + expect(params.object).to.eql({ type: "relation", id: 1 }); }); it("parses bbox params", function () { -- 2.39.5 From 3bca685f4a10c291ea347196bbef08992d41b457 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 22 Sep 2025 14:21:09 +0200 Subject: [PATCH 09/16] Localisation updates from https://translatewiki.net. --- config/locales/bn.yml | 4 +- config/locales/cy.yml | 114 +++++++++++++++++++ config/locales/eu.yml | 4 +- config/locales/fi.yml | 2 +- config/locales/gl.yml | 6 +- config/locales/hr.yml | 188 ++++++++++++++++++++++++++----- config/locales/ia.yml | 8 +- config/locales/it.yml | 4 +- config/locales/shn.yml | 162 +++++++++++++-------------- config/locales/sl.yml | 234 +++++++++++++++++++++++++++++++++++++-- config/locales/zh-CN.yml | 2 +- config/locales/zh-TW.yml | 6 +- 12 files changed, 603 insertions(+), 131 deletions(-) diff --git a/config/locales/bn.yml b/config/locales/bn.yml index b36d472f8..040139685 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -1592,9 +1592,9 @@ bn: yi: ইদ্দিশ he: হিব্রু ar: আরবি - skr-arab: সারাইকি (আরবি লিপি) + skr-arab: সারাইকি fa: ফার্সি - arz: আরবি (মিশর) + arz: মিশরীয় আরবি pnb: পশ্চিমা পাঞ্জাবি ps: পশতু ne: নেপালি diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 7cd46d906..825e0bb57 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -409,6 +409,8 @@ cy: create: successfully_declared: Rydych wedi datgan yn llwyddiannus eich bod yn ystyried bod eich golygiadau yn y Parth Cyhoeddus. + already_declared: Rydych eisoes wedi datgan eich bod yn ystyried bod eich + golygiadau yn y Parth Cyhoeddus. browse: deleted_ago_by_html: Dilëwyd %{time_ago} gan %{user} edited_ago_by_html: Golygwyd %{time_ago} gan %{user} @@ -1788,6 +1790,7 @@ cy: ac wedi'i ddiweddaru ar %{datetime_updated} diary_entry_html: Cofnod Dyddiadur %{title} a grëwyd ar %{datetime_created} ac wedi'i ddiweddaru ar %{datetime_updated} + note_html: Crëwyd %{title} ar %{datetime_created}, diweddarwyd %{datetime_updated} user_html: Defnyddiwr %{title} a grëwyd ar %{datetime_created} reporters: index: @@ -1868,6 +1871,117 @@ cy: select_language: Dewis iaith select_language_button: title: Dewis iaith + select_language_list: + languages: + af: Affricaneg + gsw: Alemaneg + frp: Arpitan + ast: Astwrieg + az: Aserbaijaneg + id: Indoneseg + ms: Maleieg + bs: Bosnieg + br: Llydaweg + ca: Catalaneg + cs: Tsieceg + cy: Cymraeg + da: Daneg + de: Almaeneg + dsb: Sorbeg Isaf + et: Estoneg + en: Saesneg + en-GB: Saesneg (y DU) + es: Sbaeneg + eo: Esperanto + eu: Basgeg + fr: Ffrangeg + fy: Ffriseg Gorllewinol + fur: Ffriwleg + ga: Gwyddeleg + gd: Gaeleg yr Alban + gl: Galiseg + aln: Albaneg Gheg + hsb: Sorbeg Uchaf + hr: Croateg + ia: Interlingua + is: Islandeg + it: Eidaleg + gcf: Creol Gwadelupaidd + ku-Latn: Cwrdeg (Lladin) + lv: Latfieg + lb: Lwcsembwrgeg + lt: Lithwaneg + hu: Hwngareg + fit: Ffineg Tornedalen + nl: Iseldireg + nb: Norwyeg Bokmål + nn: Norwyeg Nynorsk + oc: Ocsitaneg + nds: Almaeneg Isel + pl: Pwyleg + pt-PT: Portiwgaleg + pt: Portiwgaleg (Brasil) + ksh: Cwleneg + ro: Rwmaneg + sc: Sardeg + sco: Scoteg + sq: Albaneg + scn: Sicileg + sk: Slofaceg + sl: Slofeneg + sr-Latn: Serbeg (Lladin) + sh: Serbo-Croateg (Lladin) + fi: Finneg + sv: Swedeg + tl: Tagalog + kab: Kabyle + vi: Fietnameg + tr: Tyrceg + yo: Iorwba + diq: Dimli + el: Groeg + ba: Bashcireg + be: Belarwseg + be-Tarask: Belarwseg (Tarašk.) + bg: Bwlgareg + mk: Macedoneg + mo: Moldofeg + ce: Tsietsieneg + ru: Rwseg + sr: Serbeg (Cyrilig) + tt: Tatareg (Cyrilig) + uk: Wcreineg + kk-cyrl: Casacheg (Cyrilig) + yi: Iddeweg + he: Hebraeg + ar: Arabeg + skr-arab: Saraiki + fa: Perseg + arz: Arabeg yr Aifft + pnb: Punjabi Gorllewinol + ps: Pashto + nqo: N’Ko + ne: Nepaleg + mr: Marathi + hi: Hindi + bn: Bangla + pa: Pwnjabeg + gu: Gwjarateg + ta: Tamileg + te: Telugu + kn: Kannada + th: Thai + my: Byrmaneg + shn: Shan + xmf: Mingreleg + ka: Georgeg + km: Chmereg + sat: Santali + zh-CN: Tsieinëeg (Symledig) + zh-TW: Tsieinëeg (Traddodiadol) + zh-HK: Tsieinëeg (Hong Kong) + ja: Japaneg + ko: Coreeg 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/eu.yml b/config/locales/eu.yml index 73a9748e8..a8b0d3225 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -187,7 +187,7 @@ eu: one: duela ordu %{count} inguru other: duela %{count} ordu inguru about_x_months: - one: duela hilabete %{count} ingueu + one: duela hilabete inguru other: duela %{count} hilabete inguru about_x_years: one: duela urte %{count} inguru @@ -215,7 +215,7 @@ eu: one: duela egun %{count} other: duela %{count} egun x_months: - one: duela hilabete %{count} + one: duela hilabete other: duela %{count} hilabete x_years: one: duela urte %{count} diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 53fde1dec..627085a32 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -311,7 +311,7 @@ fi: external auth: Kolmannen osapuolen tunnukset kirjautuessa contributor_terms: heading: Osallistumisehdot - agreed: Olet hyväksynyt osallistumisehdot. + agreed: Hyväksyit uudet osallistumisehdot päivänä %{date}. 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. diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 13466f9ec..3d92c1b65 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1917,9 +1917,9 @@ gl: yi: yiddish he: hebreo ar: árabe - skr-arab: saraiki (escritura árabe) + skr-arab: saraiki fa: persa - arz: árabe (Exipto) + arz: árabe exipcio pnb: panxabí occidental ps: paxto nqo: n'ko @@ -3732,7 +3732,7 @@ gl: title: Fallou a busca body: Non se puido localizar "%{place}". instructions: - continue_without_exit: Continúa en %{name} + continue_without_exit: Continúa por %{name} slight_right_without_exit: Xira lixeiramente á dereita cara a %{name} offramp_right: Toma a rampla á dereita offramp_right_with_exit: Toma a saída %{exit} á dereita diff --git a/config/locales/hr.yml b/config/locales/hr.yml index a64a9af0d..361915e7d 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -116,7 +116,7 @@ hr: allow_write_api: uredi kartu allow_write_changeset_comments: komentiraj skupove promjena allow_read_gpx: čitatajte njihove privatne GNSS tragove - allow_write_gpx: postavi GNSS tragove + allow_write_gpx: pošaljite GNSS tragove allow_write_notes: izmijeni bilješke diary_comment: body: Tijelo @@ -173,7 +173,7 @@ hr: languages: 'Željeni jezici:' preferred_editor: 'Preferencijalni uređivač:' pass_crypt: Zaporka - pass_crypt_confirmation: Potvrdi zaporku + pass_crypt_confirmation: Potvrdite zaporku help: doorkeeper/application: confidential: Aplikacija će se koristiti kada je povjerljivost klijenta pouzdana @@ -337,7 +337,7 @@ hr: retain_caveats: 'Međutim, neke informacije o vama će biti sačuvane na OpenStreetMap-u, čak i nakon brisanja vašeg računa:' retain_edits: Vaša uređivanja u bazi podataka karata, ako ih ima, bit će sačuvana. - retain_traces: Vaši GNSS tragovi, ako ih ima, bit će sačuvani. + retain_traces: Vaši poslani GNSS tragovi, ako ih ima, bit će sačuvani. retain_diary_entries: Vaši dnevnički zapisi i dnevnički komentari, ako ih ima, bit će sačuvani, ali skriveni od pogleda. retain_notes: Vaše bilješke i komentari o karti, ako ih ima, bit će sačuvani, @@ -492,10 +492,10 @@ hr: versions_label: 'Inačice:' feature_queries: show: - title: Provjeri elemente karte - introduction: Klikni na kartu za pronalazak okolnih elemenata karte. - nearby: Obližnji elementi karte - enclosing: Obuhvaćeni elementi karte + title: Značajke upita + introduction: Kliknite na kartu kako biste pronašli okolne značajke. + nearby: Okolne značajke + enclosing: Obuhvaćene značajke old_elements: index: node: @@ -2015,9 +2015,8 @@ hr: hi: Pozdrav %{to_user}, imported_successfully: Izgleda da je vaša datoteka uspješno uvezena kao GNSS trag. - all_your_traces: Sve vaše uspješno prenesene GPX tragove možete naći na %{url} - all_your_traces_html: Sve vaše uspješno prenesene GPX tragove možete pronaći - na %{url}. + all_your_traces: Sve vaše uspješno poslane GNSS tragove možete naći na %{url} + all_your_traces_html: Sve vaše uspješno poslane GNSS možete pronaći na %{url}. subject: '[OpenStreetMap] GPX Import uspješan' signup_confirm: subject: '[OpenStreetMap] Dobrodošli na OpenStreetMap' @@ -2227,7 +2226,7 @@ hr: new: title: Izgubljena zaporka heading: Zaboravljena zaporka? - email address: 'E-mail adresa:' + 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. @@ -2964,15 +2963,15 @@ hr: identifiable: Identifcirano (prikazano u listi tragova i kao identificirano, posložene točke sa vremenskom oznakom) new: - upload_trace: Pošalji GNSS trag + upload_trace: Pošaljite GNSS trag visibility_help: što ovo znači? help: Pomoć create: - upload_trace: Učitajte GNSS trag - trace_uploaded: Vaša GPX datoteka je prenesena i čeka unošenje u bazu podataka. + 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, prijenos GPX datoteka nije uspio. Administrator je - upozoren na grešku. Molim, pokušajte ponovno. + upload_failed: Žao nam je, 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 @@ -3028,13 +3027,13 @@ hr: public_traces: Javni GNSS tragovi my_gps_traces: Moji GNSS tragovi public_traces_from: Javni GNSS tragovi korisnika %{user} - description: Pretražite nedavno objavljene GNSS tragove + description: Pretražite nedavno poslane GNSS tragove 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: Postavi novi GNSS trag + upload_new: Pošalji novi GNSS trag wiki_page: wiki stranica - upload_trace: Postavi GNSS trag + upload_trace: Pošalji GNSS trag all_traces: Svi tragovi my_traces: Moji tragovi traces_from_html: Javni GNSS tragovi korisnika %{user} @@ -3042,14 +3041,18 @@ hr: destroy: scheduled_for_deletion: Trase raspoređene za brisanje offline_warning: - message: Sustav za GPX upload trenutno nije u funkciji. + message: Sustav za GNSS slanje trenutno nije u funkciji. offline: heading: GPX spremište Offline - message: Sustav za GPX spremanje i upload trenutno nisu u funkciji. + message: Sustav za GPX spremanje i slanje trenutno je nedostupan. feeds: show: title: OpenStreetMap GNSS tragovi description: + description_with_count: + one: GPX datoteka s %{count} bodom od %{user} + few: 'GPX datoteka s %{count} boda od %{user} ' + other: GPX datoteka s %{count} bodova od %{user} description_without_count: GPX datoteka od %{user} application: permission_denied: Nemate dozvolu za pristup ovoj radnji @@ -3124,21 +3127,104 @@ hr: write_api: Izmijenite kartu write_changeset_comments: Komentirajte skupove promjena read_gpx: Pročitajte privatne GNSS tragove - write_gpx: Učitajte GNSS tragove + write_gpx: Pošaljite GNSS tragove write_notes: Modificirajte bilješke + write_redactions: Urediter 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 + send_messages: Pošaljite privatne poruke drugim korisnicima + skip_authorization: Automatsko odobravanje aplikacije + for_roles: + moderator: Ovo dopuštenje je za radnje dostupne samo moderatorima + oauth2_applications: + index: + title: Moje klijentske aplikacije + no_applications_html: Imate li aplikaciju koju želite registrirati za uporabu + s %{oauth2} standardom? Morate registrirati svoju aplikaciju prije nego možete + podnijeti OAuth zahtjeve za ovu uslugu. + new: Registrirajte novu aplikaciju + name: Naziv + permissions: Dozvole + application: + edit: Uredite + delete: Obrišite + confirm_delete: Izbrišite ovu aplikaciju? + new: + title: Registrirajte novu aplikaciju + edit: + title: Uredite svoju aplikaciju + show: + edit: Uredite + delete: Izbrišite + confirm_delete: Izbrišite ovu aplikaciju? + client_id: ID klijenta + client_secret: Klijentov tajni ključ + client_secret_warning: Obavezno sačuvajte ovaj tjani ključ - više neće biti + dostupan. + permissions: Dozvole + redirect_uris: Preusmjeravanje URI-jeva + not_found: + sorry: Žao nam je, ta aplikacija se ne može naći. + oauth2_authorizations: + new: + title: Potrebna autorizacija + introduction: Autorizirajte %{application} za pristup vašem računu sa sljedećim + dozvolama? + authorize: Autorizirati + deny: Odbiti + error: + title: Dogodila se greska + show: + title: Autorizacijski kôd (Authorization ID) + oauth2_authorized_applications: + index: + title: Moje autorizirane aplikacije + application: Aplikacija + permissions: Dozvole + last_authorized: Posljednje autoriziran + no_applications_html: Još niste autorizirali niti jednu %{oauth2} aplikaciju. + application: + revoke: Opozovite pristup + confirm_revoke: Želite li opozvati pristup za ovu aplikaciju? users: new: title: Otvori račun + tab_title: Registrirajte račun + 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. + please_contact_support_html: Molimo kontaktirajte %{support_link} kako biste + dogovorili kreiranje računa - pokušat ćemo obraditi zahtjev što je brže moguće. + support: podrška about: header: Besplatno i s mogućnošću uređivanja + 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. 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 + i promijenite postavke svog računa. display name description: Vaše javno prikazano korisničko ime. Možete ga kasnije promjeniti u postavkama. by_signing_up: + html: Registracijom prihvaćate naše %{tou_link}, %{privacy_policy_link} i + %{contributor_terms_link}. tou: Uvjeti upotrebe + privacy_policy: pravila o zaštiti privatnosti + privacy_policy_title: OSMF pravila o privatnosti, uključujući odjeljak o e-mail + adresama + contributor_terms: uvjeti doprinositelja continue: Otvori račun + email_help: + privacy_policy: Pravila o zaštiti privatnosti + privacy_policy_title: OSMF pravila o privatnosti, uključujući odjeljak o e-mail + adresama + html: Vaša adresa nije javno prikazana, pogledajte našu %{privacy_policy_link} + za više informacija. + or: ili use external auth: ili se prijavite pomoću treće strane no_such_user: title: Nema takvog korisnika @@ -3153,15 +3239,25 @@ hr: my notes: Moje bilješke my messages: Moje poruke my profile: Moj profil + my_account: Moj korisnički račun my comments: Moji komentari + my_preferences: Moje postavke + my_dashboard: Moja nadzorna ploča blocks on me: Osobne blokade 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 diary: Dnevnik edits: Promjene traces: Tragovi notes: Bilješke na karti + unfollow: Prestanite pratiti + follow: Pratite mapper since: 'Maper od:' + last map edit: 'Zadnje uređivanje karte:' + no activity yet: Još bez aktivnosti + uid: 'ID korisnika:' ct status: 'Uvjeti doprinositelja:' ct undecided: Neopredjeljen ct declined: Odbio @@ -3171,15 +3267,28 @@ hr: spam score: 'Spam ocjena:' block_history: Aktivne blokade moderator_history: Prikaži dane blokade + revoke_all_blocks: Opozovite sve blokade comments: Komentari create_block: Blokiraj ovog korisnika activate_user: Aktiviraj ovog korisnika confirm_user: Potvrdi 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 + edit_profile_details: Uredite detalje profila + edit_description: Uredite opis + edit_links: Uredite poveznice + change_image: Promijenite sliku + edit_company: Uredite tvrtku + edit_location: Uredite lokaciju + sidebar_section: + home_location: Vaša lokacija + company: Tvrtka + company_tooltip: Povezanost s tvrtkom je samoprijavljena i nije verificirana. go_public: flash success: Sve Vaše promjene sada su javne i dopušteno Vam je uređivanje. issued_blocks: @@ -3192,10 +3301,26 @@ hr: title: Blokade na %{name} heading_html: Lista blokada na %{name} empty: '%{name} nije još bio blokiran.' + edit: + revoke: Opozovite! + destroy: + flash: Sve aktivne blokade su opozvane. lists: show: title: Korisnici heading: Korisnici + select_status: Izberite status + states: + pending: Na čekanju + active: Aktivan + confirmed: Potvrđeno + deleted: Obrisano + name_or_email: Ime ili e-mail + ip_address: IP adresa + edits: Uređivanja? + has_edits: Ima uređivanja + no_edits: Nema uređivanja + search: Pretražite page: confirm: Potvrdi odabrane korisnike hide: Sakrij odabrane korisnike @@ -3206,6 +3331,8 @@ hr: comments: index: changesets: Skupovi promjena + diary_entries: Dnevnički zapisi + no_comments: Bez komentara changeset_comments: index: title: Komentari skupa promjena koje je dodao %{user} @@ -3218,9 +3345,20 @@ hr: title: Komentare u dnevniku dodao %{user} page: post: Pošalji + 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 + sumnjive aktivnosti. + auth_failure: + 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. role_icons: title: administrator: Ovaj korisnik je administrator @@ -3245,7 +3383,7 @@ 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, korinička blokada sa ID %{id} se ne može naći. + sorry: Žao mi je, korisnička blokada sa ID %{id} se ne može naći. back: Nazad na index new: title: Stvaranje blokade na %{name} @@ -3263,8 +3401,8 @@ hr: only_creator_can_edit: Samo moderator koji je napravio blokadu je može urediti. success: Blokada ažurirana index: - title: Korisnikove blokade - heading: Lista korisničkih blokada + title: Korisničke blokade + heading: Popis korisničkih blokada empty: Još nije napravljena nijedna blokada. helper: time_future_html: Završava u %{time}. diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 0fce7530f..90e93ce6d 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -272,7 +272,7 @@ ia: como liberate al Dominio Public. review: Leger le Conditiones review_and_accept: Leger e acceptar le Conditiones - consider_pd: Considera le dominio public + consider_pd: Considerar como dominio public terms_of_use: heading: Conditiones de uso agreed: Tu ha acceptate le Conditiones de uso le %{date}. @@ -1905,9 +1905,9 @@ ia: yi: Yiddish he: Hebreo ar: Arabe - skr-arab: Saraiki (scriptura arabe) + skr-arab: Saraiki fa: Persa - arz: Arabe (Egypto) + arz: Arabe de Egypto pnb: Punjabi occidental ps: Pashto nqo: N’Ko @@ -2390,7 +2390,7 @@ ia: issues: older: Problemas plus ancian newer: Problemas plus recente - oldest: Le problema le plus ancian + oldest: Le problemas le plus ancian newest: Le problemas le plus nove traces: older: Tracias plus ancian diff --git a/config/locales/it.yml b/config/locales/it.yml index 0fd3c9ec6..f76b9affb 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1962,9 +1962,9 @@ it: yi: Yiddish he: Ebraico ar: Arabo - skr-arab: Saraiki (scrittura araba) + skr-arab: Saraiki fa: Persiano - arz: Arabo (Egitto) + arz: Arabo egiziano pnb: Punjabi occidentale ne: Nepalese mr: Marathi diff --git a/config/locales/shn.yml b/config/locales/shn.yml index 8f0828ba6..71756bf6a 100644 --- a/config/locales/shn.yml +++ b/config/locales/shn.yml @@ -49,8 +49,8 @@ shn: http_parse_error: Url ၼႆႉ ထုၵ်ႇလီတႄႇတင်း http:// ႁိုဝ် https:// models: acl: ၸႂ်ႉသဵၼ်ႈမၢႆၵုမ်းၵမ် - changeset: မုင်ႉလႅၵ်ႈလၢႆႈ - changeset_tag: ထႅၵ်ႉꩡ် မုင်ႉလႅၵ်ႈလၢႆႈ + changeset: လွင်ႈလႅၵ်ႈလၢႆႈ + changeset_tag: ထႅၵ်ႉ လွင်ႈလႅၵ်ႈလၢႆႈ country: မိူင်း diary_comment: ၶေႃႈႁၼ်တၢႆႇယႃႇရီႇ diary_entry: လၢႆးၵၢၼ် တၢႆႇယႃႇရီႇ @@ -121,7 +121,7 @@ shn: size: သႅၼ်း latitude: လတ်ႉတီႇထုတ်ႉ longitude: လွင်ႇၵျီႇထုတ်ႉ - public: ၵၢင်လၢႆ + public: တင်းလၢႆ description: ၶေႃႈသပ်းလႅင်း gpx_file: လိူၵ်ႈဢဝ် ၾၢႆႇႁွႆးတၢင်း GPS visibility: လွင်ႈႁၼ်လႆႈ @@ -313,9 +313,9 @@ shn: retain_traces: ႁွႆးတၢင်းဢၼ်ၸဝ်ႈၵဝ်ႇ လူတ်ႇၶိုၼ်ႈဝႆႉၼၼ်ႉ သင်ဝႃႈမီးၼႆ တေသိမ်းဝႆႉယူႇ။ retain_diary_entries: ၶေႃႈမုၼ်း ၼႂ်းတၢႆႇယႃႇရီႇ လႄႈ ၶေႃႈၵႂၢမ်း ၼႂ်းတၢႆႇယႃႇရီႇ ၸဝ်ႈၵဝ်ႇ သင်ဝႃႈမီးၼႆ တေသိမ်းဝႆႉ ၵူၺ်းၵႃႈ တေလပ်ႉဝႆႉ ႁႂ်ႈဢမ်ႇလႆႈႁၼ်။ - retain_notes: ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် လႄႈ ၶေႃႈမၢႆတွင်း ၶွမ်းမႅၼ်း သင်ဝႃႈ မီးၼႆၸိုင် - တေသိမ်းဝႆႉ ၵူၺ်းၵႃႈ တေလပ်ႉဝႆႉ ႁႂ်ႈဢမ်ႇလႆႈႁၼ်။ - retain_changeset_discussions: လွင်ႈဢုပ်ႇဢူဝ်း ၵၢၼ်လႅၵ်ႈလၢႆႈ ၸဝ်ႈၵဝ်ႇ သင်ဝႃႈမီးၼႆ + retain_notes: ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ်ၸဝ်ႈၵဝ်ႇ လႄႈ ၶေႃႈႁၼ် ၶေႃႈမၢႆတွင်း၊ သင်ဝႃႈ + မီးၼႆၸိုင် တေသိမ်းဝႆႉ ၵူၺ်းၵႃႈ တေလပ်ႉဝႆႉ ႁႂ်ႈဢမ်ႇလႆႈႁၼ်။ + retain_changeset_discussions: လွင်ႈဢုပ်ႇၵုမ် လွင်ႈလႅၵ်ႈလၢႆႈ ၸဝ်ႈၵဝ်ႇ သင်ဝႃႈမီးၼႆ တေသိမ်းဝႆႉယူႇ။ retain_email: ဢီးမေးလ် ၸဝ်ႈၵဝ်ႇ တေသိမ်းဝႆႉယူႇ။ recent_editing_html: ယွၼ်ႉဝႃႈ ၸဝ်ႈၵဝ်ႇ လႆႈမႄးထတ်း မိူဝ်ႈပူၼ်ႉမႃး ဢမ်ႇႁိုင်ၼႆႉ @@ -380,8 +380,8 @@ shn: version: ဝႃးသျိၼ်း redacted_version: ဝႃးသျိၼ်း ဢၼ်မႄးဝႆႉ in_changeset: လွင်ႈလႅၵ်ႈလၢႆႈ - anonymous: မေႃလိၵ်ႈ ဢၼ်ဢမ်ႇႁူႉၸိုဝ်ႈ - no_comment: (ဢမ်ႇမီးၶွမ်းမႅၼ်ႉ) + anonymous: ၽူႈဢမ်ႇႁူႉၸိုဝ်ႈ + no_comment: (ဢမ်ႇမီးၶေႃႈႁၼ်) part_of: တွၼ်ႈၶွင် part_of_relations: one: '%{count} ၵွင်ႉၵၢႆႇ' @@ -393,13 +393,13 @@ shn: view_unredacted_history: တူၺ်းပိုၼ်းဢၼ်ပႆႇလႆႈမႄးထတ်း location: 'ဢွင်ႈတီႈ:' node: - title_html: 'တီႈလတ်း: %{name}' + title_html: 'ၼူတ်ႉ: %{name}' way: title_html: 'တၢင်း: %{name}' - nodes: တီႈလတ်း + nodes: ၼူတ်ႉ nodes_count: - one: '%{count} တီႈလတ်း' - other: '%{count} တီႈလတ်း' + one: '%{count} ၼူတ်ႉ' + other: '%{count} ၼူတ်ႉ' also_part_of_html: one: တွၼ်ႈတၢင်း %{related_ways} other: တွၼ်ႈတၢင်း %{related_ways} @@ -485,15 +485,15 @@ shn: view_redaction_message: တူၺ်းၶေႃႈၵႂၢမ်းဢၼ်မႄးဝႆႉ nodes: not_found_message: - sorry: 'ၶႂၢင်းပၼ်ၶႃႈ ဢမ်ႇႁၼ် တီႈလတ်း #%{id} ။' + sorry: 'ၵဵင်ၸႂ်ယူႇ၊ ဢမ်ႇႁၼ်ၼူတ်ႉ #%{id} ။' timeout: - sorry: ၶႂၢင်းပၼ်ၶႃႈ ၶေႃႈမုၼ်း တွၼ်ႈတႃႇ တီႈလတ်း ဢၼ်မီး မၢႆတူဝ် %{id} ၼၼ်ႉ လႆႈၸႂ်ႉၶၢဝ်းယၢမ်းႁိုင်ၼႃႇ + sorry: ၶႂၢင်းပၼ်ၶႃႈ ၶေႃႈမုၼ်း တွၼ်ႈတႃႇ ၼူတ်ႉ ဢၼ်မီး id %{id} ၼၼ်ႉ လႆႈၸႂ်ႉၶၢဝ်းယၢမ်းႁိုင်ၼႃႇ တႃႇတေႁပ်ႉဢဝ်။ old_nodes: not_found_message: sorry: 'ၶႂၢင်းပၼ်သေၵမ်း၊ ဢမ်ႇႁၼ်လႆႈ တီႈ #%{id} ဝႃးသျိၼ်း %{version}။' timeout: - sorry: ၶႂၢင်းပၼ်သေၵမ်း၊ ပိုၼ်းၶွင် တီႈလတ်း ဢၼ်မီး မၢႆတူဝ် %{id} ၼၼ်ႉ မၼ်းလႆႈၸႂ်ႉၶၢဝ်းယၢမ်းႁိုင်ၼႃႇ + sorry: ၶႂၢင်းပၼ်ၶႃႈ ပိုၼ်းၶွင် ၼူတ်ႉ ဢၼ်မီး id %{id} ၼၼ်ႉ မၼ်းလႆႈၸႂ်ႉၶၢဝ်းယၢမ်းႁိုင်ၼႃႇ တႃႇတေဢဝ်ၶိုၼ်း။ ways: not_found_message: @@ -537,8 +537,8 @@ shn: comment: 'ၶေႃႈႁၼ်မႂ်ႇ ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ #%{changeset_id} လူၺ်ႈ %{author}' commented_at_by_html: '%{user} ဢၢပ်ႉတဵတ်ႉမႃး %{when}' show: - title_all: လွင်ႈဢုပ်ႇဢူဝ်း လွင်ႈလႅၵ်ႈလၢႆႈ OpenStreetMap - title_particular: 'လွင်ႈလႅၵ်ႈလၢႆႈ OpenStreetMap #%{changeset_id} ဢုပ်ႇဢူဝ်း' + title_all: လွင်ႈဢုပ်ႇၵုမ် လွင်ႈလႅၵ်ႈလၢႆႈ OpenStreetMap + title_particular: 'လွင်ႈဢုပ်ႇၵုမ် လွင်ႈလႅၵ်ႈလၢႆႈ OpenStreetMap #%{changeset_id}' timeout: sorry: ၵဵင်ၸႂ်ယူႇ၊ သဵၼ်ႈမၢႆ ၶေႃႈလႅၵ်ႈလၢႆႈ ဢၼ်ၸဝ်ႈၵဝ်ႇ ယွၼ်းၼၼ်ႉ လႆႈၸႂ်ႉၶၢဝ်းယၢမ်း ႁိုင်ၼႃႇ တႃႇတေ ႁပ်ႉဢဝ်ၶိုၼ်း။ @@ -595,7 +595,7 @@ shn: unsubscribe: ဢမ်ႇတိတ်းတၢမ်း comment_by_html: ၶေႃႈႁၼ် တီႈ %{user} %{time_ago} hidden_comment_by_html: ၶေႃႈၶႆႈၸႂ် ဢၼ်လပ်ႉဝႆႉ တီႈ %{user} မိူဝ်ႈ %{time_ago} - hide_comment: လပ်ႉ + hide_comment: သိူင်ႇ unhide_comment: ပိုတ်ႇၽုၺ်ႇ comment: ၶေႃႈႁၼ် changesetxml: လွင်ႈလႅၵ်ႈလၢႆႈ XML @@ -611,16 +611,16 @@ shn: not_found_message: sorry: 'ၵဵင်းၸႂ်ယူႇ၊ ဢမ်ႇႁၼ် လွင်ႈလႅၵ်ႈလၢႆႈ #%{id} လႆႈ။' timeout: - sorry: ၵဵင်းၸႂ်ယူႇ၊ သဵၼ်ႈမၢႆ လွင်ႈလႅၵ်ႈလၢႆႈ ဢၼ်ၸဝ်ႈၵဝ်ႇ ယွၼ်းၼၼ်ႉ မၼ်းႁိုင်ၼႃႇ + sorry: ၵဵင်ၸႂ်ယူႇ၊ သဵၼ်ႈမၢႆ လွင်ႈလႅၵ်ႈလၢႆႈ ဢၼ်ၸဝ်ႈၵဝ်ႇ ယွၼ်းၼၼ်ႉ မၼ်းႁိုင်ၼႃႇ တႃႇတေႁပ်ႉၶိုၼ်း။ changeset_subscriptions: show: subscribe: heading: တိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် ၵၢၼ်လႅၵ်ႈလၢႆႈ ပႃႈတႂ်ႈၼႆႉႁႃႉ? - button: တိတ်းတၢမ်းပၢင်ဢုပ်ႇဢူဝ်း + button: တိတ်းတၢမ်းလွင်ႈဢုပ်ႇၵုမ် unsubscribe: - heading: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇဢူဝ်း ၵၢၼ်လႅၵ်ႈလၢႆႈ ပႃႈတႂ်ႈၼႆႉႁႃႉ? - button: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇဢူဝ်း + heading: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် ၵၢၼ်လႅၵ်ႈလၢႆႈ ပႃႈတႂ်ႈၼႆႉႁႃႉ? + button: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် heading: title: လွင်ႈလႅၵ်ႈလၢႆႈ %{id} created_by_html: '%{link_user} ႁဵတ်းမႃး ၼိူဝ် %{created} ။' @@ -663,7 +663,7 @@ shn: title: တၢႆႇယႃႇရီႇ ၽူႈၸႂ်ႉတိုဝ်း title_followed: တိတ်းတၢမ်း တၢႆႇယႃႇရီႇ ၽူႈၸႂ်ႉတိုဝ်းၶဝ် title_nearby: တၢႆႇယႃႇရီႇ ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်မီးႁိမ်းႁွမ်း - user_title: ပပ်ႉတၢႆႇယႃႇရီႇ %{user} + user_title: တၢႆႇယႃႇရီႇ %{user} in_language_title: ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ ၽၢႆႇ %{language} no_entries: ဢမ်ႇမီးၶေႃႈမုၼ်းၼႂ်းတၢႆႇယႃႇ page: @@ -672,13 +672,13 @@ shn: title: မႄးထတ်း ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ marker_text: ဢွင်ႈတီႈၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ show: - title: ပပ်ႉတၢႆႇယႃႇ %{user} | %{title} - user_title: ပပ်ႉတၢႆႇယႃႇရီႇ %{user} + title: တၢႆႇယႃႇရီႇ %{user} | %{title} + user_title: တၢႆႇယႃႇရီႇ %{user} discussion: လွင်ႈဢုပ်ႇၵုမ် subscribe: တိတ်းတၢမ်း unsubscribe: ဢမ်ႇတိတ်းတၢမ်း - leave_a_comment: ပၼ်ၶေႃႈႁၼ်ထိုင် - login_to_leave_a_comment_html: '%{login_link} တႃႇပၼ်တၢင်းႁၼ်ထိုင်' + leave_a_comment: ပၼ်ၶေႃႈႁၼ် + login_to_leave_a_comment_html: '%{login_link} တႃႇပၼ်ၶေႃႈႁၼ်' login: လွၵ်ႉၶဝ်ႈ no_such_entry: title: ဢမ်ႇမီးလိၵ်ႈၼႂ်းတၢႆႇယႃႇရီႇၸိူင်ႉၼႆ @@ -687,25 +687,25 @@ shn: ၶႅၼ်းတေႃႈ ထတ်းတူၺ်း တူဝ်လိၵ်ႈ ၸဝ်ႈၵဝ်ႇ ဢမ်ႇၼၼ် လင့်ၶ် ဢၼ်ၸဝ်ႈၵဝ်ႇ ၼဵၵ်းၼၼ်ႉ လႅပ်ႈတေၽိတ်းဝႆႉ။ diary_entry: - posted_by_html: ၽူတ်ႉသ်လူၺ်ႈ %{link_user} တီႈ %{created} ၼင်ႇ %{language_link} - ။ + posted_by_html: '%{link_user} တၢင်ႇမႃး မိူဝ်ႈ %{created} ၼင်ႇ %{language_link} + ။' updated_at_html: ဢၢပ်ႉတဵတ်ႉ ၵမ်းလိုၼ်းသုတ်း မိူဝ်ႈ %{updated} ။ full_entry: တူၺ်းၶေႃႈမုၼ်းတဵမ်ထူၼ်ႈ - comment_link: ပၼ်ၶေႃႈႁၼ်ထိုင် တီႈၼႂ်းလိၵ်ႈၼႆႉ + comment_link: ပၼ်ၶေႃႈႁၼ် တီႈၼႂ်းလိၵ်ႈၼႆႉ reply_link: သူင်ႇၶေႃႈၵႂၢမ်းထိုင်ၽူႈတႅမ်ႈလိၵ်ႈ comment_count: one: '%{count} ၶေႃႈႁၼ်' other: '%{count} ၶေႃႈႁၼ်' - no_comments: ဢမ်ႇမီးၶေႃႈႁၼ်ထိုင်သင် + no_comments: ဢမ်ႇမီးၶေႃႈႁၼ်သင် edit_link: မႄးထတ်းၶေႃႈမုၼ်းၼႆႉ - hide_link: လပ်ႉဝႆႉၶေႃႈမုၼ်းၼႆႉ - unhide_link: ပိုတ်ႇၽုၺ်ႇ ၶေႃႈမုၼ်းၼႆႉ + hide_link: သိူင်ႇၶေႃႈမုၼ်းၼႆႉ + unhide_link: ၼႄ​ၶေႃႈမုၼ်းၼႆႉ confirm: ယိုၼ်ယၼ် report: လၢႆးငၢၼ်းၶေႃႈမုၼ်းၼႆႉ diary_comment: comment_from_html: ၶေႃႈႁၼ် တီႈ %{link_user} ၼိူဝ် %{comment_created_at} - hide_link: လပ်ႉၶေႃႈႁၼ်ထိုင်ၼႆႉ - unhide_link: ပိုတ်ႇၽုၺ်ႇၶေႃႈႁၼ်ထိုင်ၼႆႉ + hide_link: သိူင်ႇၶေႃႈႁၼ်ၼႆႉ + unhide_link: ၼႄၶေႃႈႁၼ်ၼႆႉ confirm: ယိုၼ်ယၼ် report: လၢႆးငၢၼ်းၶေႃႈႁၼ်ထိုင်ၼႆႉ location: @@ -723,11 +723,11 @@ shn: description: ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ လႃႈသုတ်း ဢၼ်ၽူႈၸႂ်ႉတိုဝ်း OpenStreetMap ၶဝ် တႅမ်ႈဝႆႉ subscribe: - heading: တိတ်းတၢမ်း လွင်ႈဢုပ်ႇဢူဝ်း ၸိူဝ်းၶဝ်ႈပႃး ၼႂ်းတၢႆႇယႃႇရီႇ ပႃႈတႂ်ႈၼႆႉႁႃႉ? - button: တိတ်းတၢမ်းလွင်ႈဢုပ်ႇဢူဝ်း + heading: တိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် ၸိူဝ်းၶဝ်ႈပႃး ၼႂ်းတၢႆႇယႃႇရီႇ ပႃႈတႂ်ႈၼႆႉႁႃႉ? + button: တိတ်းတၢမ်းလွင်ႈဢုပ်ႇၵုမ် unsubscribe: - heading: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇဢူဝ်း ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ ပႃႈတႂ်ႈၼႆႉႁႃႉ? - button: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇဢူဝ်း + heading: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ ပႃႈတႂ်ႈၼႆႉႁႃႉ? + button: ဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် navigation: in_language: ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ ၽၢႆႇ %{language} my_diary: တၢႆႇယႃႇရီႇ ၵဝ်ၶႃႈ @@ -740,10 +740,10 @@ shn: other: '%{count} ၶေႃႈႁၼ်' title_label: ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ comments_label: ၶေႃႈႁၼ် - date_label: ဝၼ်းထီႉ + date_label: ဝၼ်းထိ diary_comments: new: - heading: ထႅမ်ပၼ်ၶေႃႈႁၼ်ထိုင် တီႈပၢင်ဢုပ်ႇဢူဝ်း လွင်ႈၶဝ်ႈၼႂ်း တၢႆႇယႃႇရီႇ ပႃႈတႂ်ႈၼႆႉႁႃႉ? + heading: ထႅမ်ပၼ်ၶေႃႈႁၼ်ထိုင် တီႈပၢင်ဢုပ်ႇၵုမ် လွင်ႈၶဝ်ႈၼႂ်း တၢႆႇယႃႇရီႇ ပႃႈတႂ်ႈၼႆႉႁႃႉ? doorkeeper: errors: messages: @@ -789,8 +789,8 @@ shn: URL တႅတ်ႈတေႃး ဢၼ်ၸဝ်ႈၵဝ်ႇတုၵ်းယွၼ်းၼၼ်ႉ။ bad_request: title: တုၵ်းယွၼ်းဢမ်ႇလီ - description: လွင်ႈႁဵတ်းသၢင်ႈ ဢၼ်ၸဝ်ႈၵဝ်ႇယွၼ်းဝႆႉ တီႈၼိူဝ် သႃႇဝႃႇ ဢူဝ်းပႅၼ်းသထရိမႅပ်ႉၼၼ်ႉ - ဢမ်ႇၸႂ်ႉလႆႈ (HTTP 400) + description: လွင်ႈႁဵတ်းသၢင်ႈ ဢၼ်ၸဝ်ႈၵဝ်ႇယွၼ်းဝႆႉ တီႈၼိူဝ် သႃႇဝႃႇ OpenStreetMap + ၼၼ်ႉ ဢမ်ႇၸႂ်ႉလႆႈ (HTTP 400) forbidden: title: ႁၢမ်ႈဝႆႉ description: ၵၢၼ်ႁဵတ်းသၢင်ႈ ဢၼ်ၸဝ်ႈၵဝ်ႇယွၼ်းဝႆႉ တီႈၼိူဝ် သႃႇဝႃႇ OpenStreetMap @@ -1942,19 +1942,19 @@ shn: user_mailer: diary_comment_notification: description: 'ၶေႃႈမုၼ်း တၢႆႇယႃႇရီႇ OpenStreetMap #%{id}' - subject: '[OpenStreetMap] %{user} ပၼ်ၶေႃႈႁၼ်ထိုင်ၼိူဝ် ၶေႃႈမုၼ်းၼႂ်းတၢႆႇယႃႇရီႇ' + subject: '[OpenStreetMap] %{user} ပၼ်ၶေႃႈႁၼ်ၼိူဝ် ၶေႃႈမုၼ်းၼႂ်းတၢႆႇယႃႇရီႇ' hi: မႂ်ႇသုင် %{to_user}၊ - header: '%{from_user} ပၼ်ၶေႃႈႁၼ်ထိုင် ၼိူဝ် ၶေႃႈမုၼ်း ၼႂ်းပပ်ႉမၢႆတွင်း OpenStreetMap + header: '%{from_user} ပၼ်ၶေႃႈႁၼ် ၼိူဝ် ၶေႃႈမုၼ်း ၼႂ်းပပ်ႉမၢႆတွင်း OpenStreetMap ဢၼ်ပႃး ႁူဝ်ၶေႃႈ %{subject}:' - header_html: '%{from_user} ပၼ်ၶေႃႈႁၼ်ထိုင် ၼိူဝ် ၶေႃႈမုၼ်း ၼႂ်းတၢႆႇယႃႇရီႇ OpenStreetMap + header_html: '%{from_user} ပၼ်ၶေႃႈႁၼ် ၼိူဝ် ၶေႃႈမုၼ်း ၼႂ်းတၢႆႇယႃႇရီႇ OpenStreetMap ဢၼ်ပႃး ႁူဝ်ၶေႃႈ %{subject}:' footer: ယဝ်ႉၵေႃႈ လူဢၢၼ်ႇလႆႈ ၶေႃႈၵႂၢမ်း တီႈ %{readurl} လႄႈ ပၼ်တၢင်းႁၼ်ထိုင် တီႈ %{commenturl} ဢမ်ႇၼၼ် သူင်ႇလိၵ်ႈၸူး ၽူႈတႅမ်ႈလိၵ်ႈ တီႈ %{replyurl} ၵေႃႈလႆႈ။ footer_html: ၸဝ်ႈၵဝ်ႇ လူဢၢၼ်ႇပႃးလႆႈ ၶေႃႈၵႂၢမ်း တီႈ %{readurl} လႄႈ ပၼ်တၢင်းႁၼ်ထိုင် တီႈ %{commenturl} ဢမ်ႇၼၼ် သူင်ႇလိၵ်ႈၸူး ၽူႈတႅမ်ႈလိၵ်ႈ တီႈ %{replyurl} ၵေႃႈလႆႈ။ - footer_unsubscribe: ၸဝ်ႈၵဝ်ႇၸၢင်ႈဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇဢူဝ်း တီႈ %{unsubscribeurl} + footer_unsubscribe: ၸဝ်ႈၵဝ်ႇၸၢင်ႈဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် တီႈ %{unsubscribeurl} လႆႈယူႇ။ - footer_unsubscribe_html: ၸဝ်ႈၵဝ်ႇၸၢင်ႈဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇဢူဝ်း တီႈ %{unsubscribeurl} + footer_unsubscribe_html: ၸဝ်ႈၵဝ်ႇၸၢင်ႈဢမ်ႇတိတ်းတၢမ်း လွင်ႈဢုပ်ႇၵုမ် တီႈ %{unsubscribeurl} လႆႈယူႇ။ message_notification: subject: '[OpenStreetMap] %{message_title}' @@ -2026,7 +2026,7 @@ shn: lost_password: subject: '[OpenStreetMap] ယွၼ်းၶိုၼ်းမၢႆလပ်ႉ' greeting: မႂ်ႇသုင်၊ - hopefully_you: မီးၵူၼ်းၵေႃႉၼိုင်ႈ (ၸၢင်ႈပဵၼ်ၸဝ်ႈၵဝ်ႇ) ယွၼ်းႁႂ်ႈမႄးၶိုၼ်း မၢႆလပ်ႉ + hopefully_you: မီးၵူၼ်းၵေႃႉၼိုင်ႈ (ၸၢင်ႈပဵၼ်ၸဝ်ႈၵဝ်ႇ) ယွၼ်းႁႂ်ႈမႄးၶိုၼ်း ၶေႃႈလပ်ႉ တီႈၼႂ်းဢီးမေးလ် ဢၵွင်ႉ openstreetmap.org ၼႆႉ။ click_the_link: သင်ဝႃႈပဵၼ်ၸဝ်ႈၵဝ်ႇၼႆ ၼဵၵ်းတီႈလိင်ႉၶ်တႂ်ႈၼႆႉသေ ၶိုၼ်းမႄးမၢႆလပ်ႉၸဝ်ႈၵဝ်ႇတႃႉ။ note_comment_notification: @@ -2034,8 +2034,8 @@ shn: anonymous: ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ဢမ်ႇၶႂ်ႈဢွၵ်ႇၸိုဝ်ႈ greeting: မႂ်ႇသုင်၊ commented: - subject_own: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ်ထိုင် တီႈၶေႃႈမၢႆတွင်းၸဝ်ႈၵဝ်ႇဢၼ်ၼိုင်ႈ' - subject_other: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ်ထိုင် ၼိူဝ်ၶေႃႈမၢႆတွင်း + subject_own: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ် တီႈၶေႃႈမၢႆတွင်းၸဝ်ႈၵဝ်ႇဢၼ်ၼိုင်ႈ' + subject_other: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ် ၼိူဝ်ၶေႃႈမၢႆတွင်း ဢၼ်ၸဝ်ႈၵဝ်ႇသူၼ်ၸႂ်' your_note: '%{commenter} ၼႆႉ မၼ်းဝႆႉပၼ် ၶေႃႈႁၼ် တီႈ ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ်မႂ်း ဢၼ်ၼိုင်ႈ ဢၼ်မီးႁိမ်း %{place} ၼၼ်ႉယဝ်ႉ။' @@ -2056,9 +2056,9 @@ shn: your_note_html: '%{commenter} ၼႆႉ မၼ်းၵႄႈလိတ်ႈပၼ် ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် ဢၼ်မီးႁိမ်း %{place} ၼၼ်ႉ ဢၼ်ၼိူင်ႈယဝ်ႉ။' commented_note: '%{commenter} ၵႄႈလိတ်ႈပၼ် ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် ဢၼ်ၸဝ်ႈၵဝ်ႇ - ပၼ်ၶေႃႈႁၼ်ထိုင်ဝႆႉၼၼ်ႉယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} ။' + ပၼ်ၶေႃႈႁၼ်ဝႆႉၼၼ်ႉယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} ။' commented_note_html: '%{commenter} ၵႄႈလိတ်ႈပၼ် ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် ဢၼ်ၸဝ်ႈၵဝ်ႇ - ပၼ်ၶေႃႈႁၼ်ထိုင်ဝႆႉၼၼ်ႉယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} ။' + ပၼ်ၶေႃႈႁၼ်ဝႆႉၼၼ်ႉယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} ။' reopened: subject_own: '[OpenStreetMap] %{commenter} လႆႈၶိုၼ်းႁဵတ်းႁႂ်ႈ ၶေႃႈမၢႆတွင်းၸဝ်ႈၵဝ်ႇ ဢၼ်ၼိုင်ႈ ႁဵတ်းၵၢၼ်ၶိုၼ်း' @@ -2069,10 +2069,10 @@ shn: your_note_html: '%{commenter} လႆႈႁဵတ်းႁႂ်ႈ ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် ဢၼ်မီးႁိမ်း %{place} ၼၼ်ႉ ၶိုၼ်းႁဵတ်းၵၢၼ်ယဝ်ႉ။' commented_note: '%{commenter} လႆႈႁဵတ်းႁႂ်ႈ ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် ဢၼ်ၸဝ်ႈၵဝ်ႇ - ပၼ်ၶေႃႈႁၼ်ထိုင်ဝႆႉၼၼ်ႉ ၶိုၼ်းႁဵတ်းၵၢၼ်မႃးယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} + ပၼ်ၶေႃႈႁၼ်ဝႆႉၼၼ်ႉ ၶိုၼ်းႁဵတ်းၵၢၼ်မႃးယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} ။' commented_note_html: '%{commenter} လႆႈႁဵတ်းႁႂ်ႈ ၶေႃႈမၢႆတွင်း ၽႅၼ်ႇလိၼ် ဢၼ်ၸဝ်ႈၵဝ်ႇ - ပၼ်ၶေႃႈႁၼ်ထိုင်ဝႆႉၼၼ်ႉ ၶိုၼ်းႁဵတ်းၵၢၼ်မႃးယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} + ပၼ်ၶေႃႈႁၼ်ဝႆႉၼၼ်ႉ ၶိုၼ်းႁဵတ်းၵၢၼ်မႃးယဝ်ႉ။ ၶေႃႈမၢႆတွင်း မီးႁိမ်း %{place} ။' details: တွပ်ႇၶိုၼ်း ဢမ်ႇၼၼ် လဵပ်ႈႁဵၼ်းလွင်ႈ ၶေႃႈမၢႆတွင်း တီႈ %{url} ၼၼ်ႉတႃႉ။ details_html: တွပ်ႇၶိုၼ်း ဢမ်ႇၼၼ် လဵပ်ႈႁဵၼ်းလွင်ႈ ၶေႃႈမၢႆတွင်း တီႈ %{url} ၼၼ်ႉတႃႉ။ @@ -2080,9 +2080,9 @@ shn: description: 'လွင်ႈလႅၵ်ႈလၢႆႈ OpenStreetMap #%{id}' hi: မႂ်ႇသုင် %{to_user}၊ commented: - subject_own: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ်ထိုင် ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ + subject_own: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ် ၼိူဝ်လွင်ႈလႅၵ်ႈလၢႆႈ ၸဝ်ႈၵဝ်ႇဢၼ်ၼိုင်ႈ' - subject_other: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ်ထိုင် ၼိူဝ် လွင်ႈလႅၵ်ႈလၢႆႈ + subject_other: '[OpenStreetMap] %{commenter} ပၼ်ၶေႃႈႁၼ်ဝႆႉ ၼိူဝ် လွင်ႈလႅၵ်ႈလၢႆႈ ဢၼ်ၸဝ်ႈၵဝ်ႇ သူၼ်ၸႂ်ၼၼ်ႉ' your_changeset: '%{commenter} ဝႆႉၵႂႃႇ ၶေႃႈၵႂၢမ်း မိူဝ်ႈ %{time} တီႈၼိူဝ် လွင်ႈလႅၵ်ႈလၢႆႈ ၸဝ်ႈၵဝ်ႇ ဢၼ်ၼိုင်ႈ' @@ -2092,8 +2092,8 @@ shn: လွင်ႈလႅၵ်ႈလၢႆႈ ဢၼ်ၸဝ်ႈၵဝ်ႇ တူၺ်းယူႇ ဢၼ် %{changeset_author} ႁဵတ်းဢွၵ်ႇမႃးၼၼ်ႉယဝ်ႉ။' commented_changeset_html: '%{commenter} ဝႆႉၵႂႃႇ ၶေႃႈၵႂၢမ်း မိူဝ်ႈ %{time} ၼိူဝ် လွင်ႈလႅၵ်ႈလၢႆႈ ဢၼ်ၸဝ်ႈၵဝ်ႇ တူၺ်းယူႇ ဢၼ် %{changeset_author} ႁဵတ်းဢွၵ်ႇမႃးၼၼ်ႉယဝ်ႉ။' - partial_changeset_with_comment: ၸွမ်းၼင်ႇၶေႃႈႁၼ်ထိုင် '%{changeset_comment}' - partial_changeset_with_comment_html: ၸွမ်းၼင်ႇၶေႃႈႁၼ်ထိုင် '%{changeset_comment}' + partial_changeset_with_comment: ၸွမ်းၼင်ႇၶေႃႈႁၼ် '%{changeset_comment}' + partial_changeset_with_comment_html: ၸွမ်းၼင်ႇၶေႃႈႁၼ် '%{changeset_comment}' partial_changeset_without_comment: ဢမ်ႇမီးၶေႃႈႁၼ်ထိုင် details: တွပ်ႇၶိုၼ်း ဢမ်ႇၼၼ် လဵပ်ႈႁဵၼ်းလွင်ႈလႅၵ်ႈလၢႆႈ တီႈ %{url} ။ details_html: တွပ်ႇၶိုၼ်း ဢမ်ႇၼၼ် လဵပ်ႈႁဵၼ်းလွင်ႈလႅၵ်ႈလၢႆႈ တီႈ %{url} ။ @@ -2222,15 +2222,15 @@ shn: ၶဝ်ႈၵႂႃႇပဵၼ် ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ထုၵ်ႇမႅၼ်ႈၼၼ်ႉလႄႈ။ passwords: new: - title: မၢႆလပ်ႉႁၢႆၵႂႃႇ + title: ၶေႃႈလပ်ႉႁၢႆၵႂႃႇ heading: လိုမ်းမၢႆလပ်ႉယဝ်ႉႁႃႉ? email address: ႁဵင်းလိၵ်ႈဢီးမေးလ် new password button: ၶိုၼ်းမႄးမၢႆလပ်ႉ help_text: သႂ်ႇပၼ် ဢီးမေးလ် ဢၼ်ၸဝ်ႈၵဝ်ႇၸႂ်ႉတိုဝ်း တႃႇလူင်းသဵၼ်ႈမၢႆၼၼ်ႉ ႁဝ်းၶႃႈတေသူင်ႇပၼ် - လင့်ၶ်မၼ်း ဢၼ်ၸဝ်ႈၵဝ်ႇ ၸၢင်ႈၸႂ်ႉတိုဝ်း တႃႇမႄးၶိုၼ်း မၢႆလပ်ႉၸဝ်ႈၵဝ်ႇလႆႈၼၼ်ႉယဝ်ႉ။ + လင့်ၶ်မၼ်း ဢၼ်ၸဝ်ႈၵဝ်ႇ ၸၢင်ႈၸႂ်ႉတိုဝ်း တႃႇမႄးၶိုၼ်း ၶေႃႈလပ်ႉၸဝ်ႈၵဝ်ႇလႆႈၼၼ်ႉယဝ်ႉ။ create: send_paranoid_instructions: သင်ဝႃႈ ဢီးမေးလ် ၸဝ်ႈၵဝ်ႇ မီးဝႆႉ ၼႂ်းၶေႃႈမုၼ်း ႁဝ်းၶႃႈၼႆၸိုင် - ၼႂ်းၶၢဝ်းတၢင်း သွင်သၢမ်မိၼိတ်ႉ ၸဝ်ႈၵဝ်ႇ တေလႆႈႁပ်ႉ လင့်ၶ် တႃႇၶိုၼ်းဢဝ် မၢႆလပ်ႉ + ၼႂ်းၶၢဝ်းတၢင်း သွင်သၢမ်မိၼိတ်ႉ ၸဝ်ႈၵဝ်ႇ တေလႆႈႁပ်ႉ လင့်ၶ် တႃႇၶိုၼ်းဢဝ် ၶေႃႈလပ်ႉ တီႈဢီးမေးလ် ၸဝ်ႈၵဝ်ႇၼၼ်ႉယဝ်ႉ။ edit: title: ၶိုၼ်းမႄးမၢႆလပ်ႉ @@ -2347,7 +2347,7 @@ shn: email or username: ႁဵင်းလိၵ်ႈဢီးမေးလ် ႁိုဝ် ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း password: ၶေႃႈလပ်ႉ remember: တွင်းၵဝ်ဝႆႉ - lost password link: မၢႆလပ်ႉႁၢႆၵႂႃႇႁႃႉ? + lost password link: ၶေႃႈလပ်ႉႁၢႆၵႂႃႇႁႃႉ? login_button: လွၵ်ႉၶဝ်ႈ with external: ႁိုဝ် လွၵ်ႉၶဝ်ႈ ၸွမ်း ၽူႈတၢင်တူဝ် ၵေႃႉထူၼ်ႈသၢမ် or: ဢမ်ႇၼၼ် @@ -2670,7 +2670,7 @@ shn: not_public_flash: not_public: ၸဝ်ႈၵဝ်ႇ ဢမ်ႇလႆႈတမ်းဝၢင်း လွင်ႈမႄးထတ်း ႁႂ်ႈပဵၼ် တႃႇၵူၼ်းတင်းၼမ်။ not_public_description_html: သင်ဝႃႈ ဢမ်ႇႁဵတ်းၸိူင်ႉၼၼ်ၸိုင် တေဢမ်ႇၸၢင်ႈမႄးထတ်း - ၽႅၼ်ႇလိၼ်လႆႈထႅင်ႈ။ ၸဝ်ႈၵဝ်ႇၸၢင်ႈတင်ႈ လွင်ႈမႄးထတ်း ႁႂ်ႈပဵၼ် ၵၢင်လၢႆ လုၵ်ႉတီႈ + ၽႅၼ်ႇလိၼ်လႆႈထႅင်ႈ။ ၸဝ်ႈၵဝ်ႇၸၢင်ႈတင်ႈ လွင်ႈမႄးထတ်း ႁႂ်ႈပဵၼ် ၼင်ႇတင်းလၢႆ လုၵ်ႉတီႈ %{user_page} ၸဝ်ႈၵဝ်ႇလႆႈယူႇ။ user_page_link: ၼႃႈလိၵ်ႈၽူႈၸႂ်ႉတိုဝ်း anon_edits_link_text: ႁႃတူၺ်းဝႃႈ ယွၼ်ႉသင်လႄႈ ပဵၼ်ၸိူင်ႉၼႆ။ @@ -2804,8 +2804,8 @@ shn: မၼ်းပႃးဝႆႉ ႁူင်းႁေႃ၊ သဵၼ်ႈတၢင်း လႄႈ ၶေႃႈမုၼ်း ဢၼ်ၵဵဝ်ႇလူၺ်ႈ ဢွင်ႈတီႈ ဢၢၼ်ႇႁူဝ်လၢၼ်ႉမၼ်း။ ၸဝ်ႈၵဝ်ႇၸၢင်ႈႁဵတ်း ၽႅၼ်ႇလိၼ် ဢၼ်ပဵၼ်ၽၢင်ႁၢင်ႈတႄႉ ဢၼ်ၸဝ်ႈၵဝ်ႇ ၶဝ်ႈၸႂ်ၼၼ်ႉ လႆႈယူႇ။ real_and_current: ဢၼ်ပဵၼ်တႄႉလႄႈယၢမ်းလဵဝ် off_the_map_html: |- - ဢၼ်မၼ်း %{doesnt} ၼၼ်ႉ ပဵၼ်ၶေႃႈမုၼ်း ဢၼ်မီးတၢင်းႁၼ်ထိုင် မိူၼ်ၼင်ႇ လွင်ႈပၼ်ၸၼ်ႉထၢၼ်ႈ၊ ၽၢင်ႁၢင်ႈပိုၼ်း ဢမ်ႇၼၼ် - တၢင်းႁၼ်ထိုင် လႄႈ ၶေႃႈမုၼ်း ဢၼ်လုၵ်ႉတီႈ ၶေႃႈမုၼ်း ဢၼ်မီးသုၼ်ႇၶွင်ၽူႈတႅမ်ႈလိၵ်ႈၼၼ်ႉယဝ်ႉ။ သင်ဝႃႈ ဢမ်ႇမီးၶႂၢင်ႉ + ဢၼ်မၼ်း %{doesnt} ၼၼ်ႉ ပဵၼ်ၶေႃႈမုၼ်း ဢၼ်ၶေႃႈႁၼ် မိူၼ်ၼင်ႇ လွင်ႈပၼ်ၸၼ်ႉထၢၼ်ႈ၊ ၽၢင်ႁၢင်ႈပိုၼ်း ဢမ်ႇၼၼ် + ၶေႃႈႁၼ် လႄႈ ၶေႃႈမုၼ်း ဢၼ်လုၵ်ႉတီႈ ၶေႃႈမုၼ်း ဢၼ်မီးသုၼ်ႇၶွင်ၽူႈတႅမ်ႈလိၵ်ႈၼၼ်ႉယဝ်ႉ။ သင်ဝႃႈ ဢမ်ႇမီးၶႂၢင်ႉ ၶိုၵ်ႉတွၼ်းၼႆၸိုင် ယႃႇပေထုတ်ႇဢဝ် ၽႅၼ်ႇလိၼ် ဢၼ်မီးၼိူဝ်ဢွၼ်ႇလၢႆး ဢမ်ႇၼၼ် ၽႅၼ်ႇလိၼ် ဢၼ်ပဵၼ်ၽိုၼ်လိၵ်ႈၼၼ်ႉ။ doesnt: ဢမ်ႇလႆႈႁဵတ်း basic_terms: @@ -2920,7 +2920,7 @@ shn: sand: သၢႆး golf: ပၢင်လဵၼ်ႈၵွပ်ႉၾ် park: သူၼ်လိုဝ်ႈ - common: ၵၢင်လၢႆ + common: ၵူႈလွင်ႈလွင်ႈ built_up: ၼႃႈလိၼ်ဢၼ်ၵေႃႇသၢင်ႈဝႆႉ resident: ဢွင်ႈတီးၵူၼ်းယူႇသဝ်း retail: ဢွင်ႈတီႈၶၢႆယွႆႈ @@ -2986,7 +2986,7 @@ shn: traces: visibility: private: သုၼ်ႇတူဝ် (ၽႄပၼ် မိူၼ်ၼင်ႇ ဢမ်ႇၼႄၸိုဝ်ႈ၊ တီႈဢၼ်ဢမ်ႇၶပ်ႉဝႆႉ) - public: ၵၢင်လၢႆ (ၼႄဝႆႉၼႂ်းသဵၼ်ႈမၢႆ ႁွႆးတၢင်း လႄႈ မိူၼ်ၼင်ႇ ဢမ်ႇၼႄၸိုဝ်ႈ၊ တီႈဢၼ်ဢမ်ႇၶပ်ႉဝႆႉ) + public: တင်းလၢႆး (ၼႄဝႆႉၼႂ်းသဵၼ်ႈမၢႆ ႁွႆးတၢင်း လႄႈ မိူၼ်ၼင်ႇ ဢမ်ႇၼႄၸိုဝ်ႈ၊ တီႈဢၼ်ဢမ်ႇၶပ်ႉဝႆႉ) trackable: ၸၢင်ႈၸွမ်းႁႃလႆႈ (ၽေပၼ်မိူၼ်ၼင်ႇ ဢမ်ႇၼႄၸိုဝ်ႈၵူၺ်း၊ ၸုတ်းၸိူဝ်းၶပ်ႉဝႆႉ ၸွမ်းလူၺ်ႈၶၢဝ်းယၢမ်း) identifiable: ဢၼ်ၸႅၵ်ႇႁူႉလႆႈ (ၼႄဝႆႉ ၼႂ်းသဵၼ်ႈမၢႆႆႁွႆးတၢင်း လႄႈ ၼင်ႇ ဢၼ်ၸႅၵ်ႇႁူႉလႆႈ၊ @@ -3046,16 +3046,16 @@ shn: trace_details: တူၺ်းႁူဝ်ယွႆႈ ႁွႆးတၢင်း view_map: တူၺ်းၽႅၼ်ႇလိၼ် edit_map: မႄးထတ်း ၽႅၼ်ႇလိၼ် - public: ၵၢင်လၢႆ + public: တင်းလၢႆ identifiable: ဢၼ်ၸႅၵ်ႇႁူႉလႆႈ private: သုၼ်ႇတူဝ် trackable: ဢၼ်ၸွမ်းလႆႈ details_with_tags_html: '%{time_ago} လူၺ်ႈ %{user} ၼႂ်း %{tags}' details_without_tags_html: ဢိုတ်းဝႆႉ %{time_ago} လူၺ်ႈ %{user} index: - public_traces: ႁွႆးတၢင်း GPS ၵၢင်လၢႆ + public_traces: ႁွႆးတၢင်း GPS တင်းလၢႆ my_gps_traces: ႁွႆးတၢင်း GPS ၶႃႈ - public_traces_from: ထႅဝ်ႁွႆး GPS ၵၢင်လၢႆ ဢၼ်မႃးတီႈ %{user} + public_traces_from: ထႅဝ်ႁွႆး GPS တင်းလၢႆ ဢၼ်မႃးတီႈ %{user} description: တူၺ်း GPS trace ဢၼ်လူတ်ႇၶိုၼ်ႈပႆႇႁိုင်သင်ၼႆႉ tagged_with: ' ဢၼ်ထႅၵ်ႉဝႆႉၸွမ်း %{tags}' empty_title: တီႈၼႆႈပႆႇမီးသင် @@ -3235,7 +3235,7 @@ shn: paragraph_2: လူင်းသဵၼ်ႈမၢႆ တႃႇတႄႇၸွႆႈထႅမ်။ welcome: ႁူမ်ၸူမ်းႁပ်ႉတွၼ်ႈထိုင် OpenStreetMap ယူႇ duplicate_social_email: သင်ဝႃႈ ၸဝ်ႈၵဝ်ႇ မီးဝႆႉ ဢၵွင်ႉ OpenStreetMap ယဝ်ႉသေ ၶႂ်ႈၸႂ်ႉတိုဝ်း - ၽူႈၵမ်ႉထႅမ် ၶေႃႈမုၼ်း ၽၢႆႇ 3 ၼႆၸိုင် ၸႂ်ႉတိုဝ်း မၢႆလပ်ႉ ၸဝ်ႈၵဝ်ႇသေ ၶဝ်ႈၵႂႃႇသေ + ၽူႈၵမ်ႉထႅမ် ၶေႃႈမုၼ်း ၽၢႆႇ 3 ၼႆၸိုင် ၸႂ်ႉတိုဝ်း ၶေႃႈလပ်ႉ ၸဝ်ႈၵဝ်ႇသေ ၶဝ်ႈၵႂႃႇသေ မူၼ်ႉမႄး လွင်ႈလိူၵ်ႈၶၼ် ဢၵွင်ႉ ၸဝ်ႈၵဝ်ႇၼၼ်ႉလႄႈ။ display name description: ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ၼႄဝႆႉ ၵူၼ်းတင်းၼမ်။ ဝၢႆးမႃး တီႈၼႂ်း ၵၢၼ်လိူၵ်ႈၶၼ်ၼၼ်ႉ ၸဝ်ႈၵဝ်ႇ ၸၢင်ႈလႅၵ်ႈလၢႆႈလႆႈယူႇ။ @@ -3304,8 +3304,8 @@ shn: confirm_user: ယိုၼ်ယၼ်ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ unconfirm_user: ဢမ်ႇယိုၼ်ယၼ် ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ unsuspend_user: ဢမ်ႇၵိုတ်းယိုတ်း ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ - hide_user: လပ်ႉၽူႈၸႂ်ႉတိုဝ်းၼႆႉ - unhide_user: ပိုတ်ႇၽုၺ်ႇ ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ + hide_user: သိူင်ႇၽူႈၸႂ်ႉတိုဝ်းၼႆႉ + unhide_user: ၼႄၽူႈၸႂ်ႉတိုဝ်းၼႆႉ delete_user: မွတ်ႇပႅတ်ႈ ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ confirm: ယိုၼ်ယၼ် report: လၢႆးငၢၼ်း ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ @@ -3368,7 +3368,7 @@ shn: one: '%{count} ၵေႃႉ' other: ႁၼ် %{count} ၵေႃႉ confirm: ယိုၼ်ယၼ်ၽူႈၸႂ်ႉတိုဝ်းဢၼ်လိူၵ်ႈဝႆႉ - hide: လပ်ႉၽူႈၸႂ်ႉတိုဝ်းဢၼ်လိူၵ်ႈဝႆႉ + hide: သိူင်ႇၽူႈၸႂ်ႉတိုဝ်းဢၼ်လိူၵ်ႈဝႆႉ empty: ဢမ်ႇႁၼ်ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ထုၵ်ႇၵၼ် user: summary_html: '%{name} ႁဵတ်းဢွၵ်ႇမႃးတီႈ %{ip_address} မိူဝ်ႈ %{date}' @@ -3378,7 +3378,7 @@ shn: heading_html: ၶေႃႈႁၼ် %{user} changesets: လွင်ႈလႅၵ်ႈလၢႆႈ diary_entries: ၶေႃႈမုၼ်းတၢႆႇယႃႇရီႇ - no_comments: ဢမ်ႇမီးၶေႃႈႁၼ်ထိုင်သင် + no_comments: ဢမ်ႇမီးၶေႃႈႁၼ်သင် changeset_comments: index: title: ၶေႃႈထတ်းသၢင် လွင်ႈလႅၵ်ႈလၢႆႈ လူၺ်ႈ %{user} @@ -3416,7 +3416,7 @@ shn: ၸႂ်ႉတိုဝ်း ၽိုၼ်လိၵ်ႈ ဢၼ်မီးပႃႈတႂ်ႈၼႆႉတႃႉ။ option_2: |- သင်ဝႃႈ ၸဝ်ႈၵဝ်ႇမီးဝႆႉ ဢၵွင်ႉယဝ်ႉၼႆၸိုင် ၸဝ်ႈၵဝ်ႇၸၢင်ႈၶဝ်ႈၵႂႃႇၼႂ်း ဢၵွင်ႉ - ၸဝ်ႈၵဝ်ႇ လူၺ်ႈၸႂ်ႉတိုဝ်း ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း လႄႈ မၢႆလပ်ႉၸဝ်ႈၵဝ်ႇသေ ဝၢႆးၼၼ်ႉ ဢဝ်ဢၵွင်ႉ + ၸဝ်ႈၵဝ်ႇ လူၺ်ႈၸႂ်ႉတိုဝ်း ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း လႄႈ ၶေႃႈလပ်ႉၸဝ်ႈၵဝ်ႇသေ ဝၢႆးၼၼ်ႉ ဢဝ်ဢၵွင်ႉ ၼၼ်ႉ ၵွင်ႉသၢၼ်ၵၼ်တင်း ID ၸဝ်ႈၵဝ်ႇ တီႈၼႂ်း ၵၢၼ်တင်ႈၶၼ်ၽူႈၸႂ်ႉတိုဝ်း ၸဝ်ႈၵဝ်ႇၼၼ်ႉယူႇ။ role_icons: title: @@ -3558,7 +3558,7 @@ shn: error: ၽူႈၸႂ်ႉတိုဝ်း ဢမ်ႇၸၢင်ႈပိုတ်ႇသဵင်လႆႈ။ ၶိုၼ်းၶတ်းၸႂ်တူၺ်းၶႃႈ။ notes: index: - title: ၶေႃႈမၢႆတွင်း ဢၼ် %{user} သူင်ႇ ဢမ်ႇၼၼ် ပၼ်ၶေႃႈႁၼ်ထိုင် + title: ၶေႃႈမၢႆတွင်း ဢၼ် %{user} သူင်ႇ ဢမ်ႇၼၼ် ပၼ်ၶေႃႈႁၼ်ဝႆႉ heading: ၶေႃႈမၢႆတွင်း %{user} subheading_html: ၶေႃႈမၢႆတွင်း %{submitted} ႁိုဝ် %{commented} လူၺ်ႈ %{user} subheading_submitted: တၢင်ႇယိုၼ်ႈယဝ်ႉ @@ -3592,7 +3592,7 @@ shn: event_reopened_by_html: ၶိုၼ်းတူင်ႉတိုၼ်ႇ လူၺ်ႈ %{user} %{time_ago} event_reopened_by_anonymous_html: ၶိုၼ်းတူင်ႉတိုၼ်ႇ လူၺ်ႈ ၵူၼ်းဢမ်ႇႁူႉၸိုဝ်ႈ %{time_ago} - event_hidden_by_html: '%{user} လပ်ႉဝႆႉ မိူဝ်ႈ %{time_ago}' + event_hidden_by_html: '%{user} သိူင်ႇဝႆႉ မိူဝ်ႈ %{time_ago}' report: လၢႆးငၢၼ်းၶေႃႈမၢႆတွင်းၼႆႉ anonymous_warning: ၶေႃႈမၢႆတွင်းၼႆႉ ပႃးဝႆႉ ၶေႃႈၵႂၢမ်း ၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ဢမ်ႇၶႂ်ႈဢွၵ်ႇၸိုဝ်ႈ ဢၼ်ထုၵ်ႇလီ ထတ်းသၢင် လွတ်ႈလွတ်ႈလႅဝ်းလႅဝ်းၼၼ်ႉယဝ်ႉ။ @@ -3602,7 +3602,7 @@ shn: hide: သိူင်ႇ resolve: ၵႄႈလိတ်ႈ reactivate: ၶိုၼ်းတူင်ႉၼိုင် - comment_and_resolve: ပၼ်ၶေႃႈႁၼ်ထိုင် & ၵႄႈလိတ်ႈ + comment_and_resolve: ပၼ်ၶေႃႈႁၼ် & ၵႄႈလိတ်ႈ comment: ၶေႃႈႁၼ် log_in_to_comment: လွၵ်ႉၶဝ်ႈ တႃႇပၼ်တၢင်းႁၼ်ထိုင်တီႈ ၶေႃႈမၢႆတွင်းၼႆႉ report_link_html: သင်ဝႃႈ ၶေႃႈမၢႆတွင်းၼႆႉ ပႃးဝႆႉ ၶေႃႈမုၼ်း ဢၼ်လမ်ႇလွင်ႈ ဢၼ်လူဝ်ႇ @@ -3684,7 +3684,7 @@ shn: header: လေႇယႃႇၽႅၼ်ႇလိၼ် notes: ၶေႃႈမၢႆတွင်းၽႅၼ်ႇလိၼ် data: ၶေႃႈမုၼ်းၽႅၼ်ႇလိၼ် - gps: ထႅဝ်ႁွႆး GPS ၵၢင်လၢႆ + gps: ထႅဝ်ႁွႆး GPS တင်းလၢႆ overlays: ပိုတ်ႇပၼ် လွင်ႈသႂ်ႇၼိူဝ် တႃႇၵႄႈလိတ်ႈပၼ်ႁႃ ၽႅၼ်ႇလိၼ် title: လေႇယႃႇ openstreetmap_contributors: ၽူႈႁူမ်ႈသၢင်ႈ OpenStreetMap diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 19e277c17..601bced7a 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -25,10 +25,10 @@ sl: date: formats: - heatmap: '%B %-d' + heatmap: '%-d. %B' time: formats: - friendly: '%e. %B %Y ob %H:%M' + friendly: '%e. %B %Y, ob %H:%M' blog: '%e %B %Y' helpers: file: @@ -1726,13 +1726,23 @@ sl: status: Stanje reports: Prijave last_updated: Zadnja posodobitev + last_managed: Zadnje upravljano + reporting_users: Prijavljeni uporabniki reports_count: one: '%{count} poročilo' two: '%{count} poročili' few: '%{count} poročila' other: '%{count} poročil' reported_item: Prijavljeni predmet + states: + ignored: Prezrto + open: Odprto + resolved: Rešeno show: + title: + open: 'Odprta težava #%{issue_id}' + ignored: 'Prezrta težava #%{issue_id}' + resolved: 'Rešena težava #%{issue_id}' reports: one: '%{count} prijava' two: '%{count} prijavi' @@ -1759,12 +1769,27 @@ sl: reopened: Stanje težave je nastavljeno na »Odprto« comments: comment_from_html: Komentar uporabnika %{user_link} dne %{comment_created_at} + reassign_to_moderators: Predodeli težavo moderatorjem + reassign_to_administrators: Predodeli težavo administratorjem reports: reported_by_html: Sporočil_a %{user} kot %{category} dne %{updated_at} helper: reportable_title: diary_comment: '%{entry_title}, komentar #%{comment_id}' note: 'Opomba #%{note_id}' + reportable_heading: + diary_comment_html: Dnevniški komentar %{title}, ustvarjen dne %{datetime_created}, + posodobljen dne %{datetime_updated} + diary_entry_html: Dnevniški vnos %{title}, ustvarjen dne %{datetime_created}, + posodobljen dne %{datetime_updated} + note_html: '%{title}, ustvarjeno dne %{datetime_created}, posodobljeno dne + %{datetime_updated}' + user_html: Uporabnik %{title} je ustvaril dne %{datetime_created} + reporters: + index: + title: 'Prijavitelji težave #%{issue_id}' + reporters: + more_reporters: in še %{count} issue_comments: create: comment_created: Vaš komentar je bil uspešno ustvarjen @@ -1822,8 +1847,12 @@ sl: 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 @@ -1838,6 +1867,9 @@ sl: select_language_list: languages: af: afrikanščina + gsw: alemanščina + frp: arpitanščina + ast: asturijščina az: azerbajdžanščina id: indonezijščina ms: malajščina @@ -1857,10 +1889,14 @@ sl: eu: baskovščina fr: francoščina fy: Zahodnofrizijščina + fur: furlanščina ga: irščina gd: škotska gelščina + gl: galicijščina + aln: gegovska albanščina hsb: zgornja lužiška srbščina hr: hrvaščina + ia: interlingua is: islandščina it: italijanščina gcf: gvadalupska kreolščina @@ -1869,13 +1905,16 @@ sl: lb: luksemburščina lt: litovščina hu: madžarščina + fit: tornedalska finščina nl: nizozemščina nb: norveščina (Bokmål) nn: norveščina (Nynorsk) oc: okcitanščina + nds: nizka nemščina pl: poljščina pt-PT: portugalščina pt: portugalščina (Brazilija) + ksh: kölnščina ro: romunščina sc: sardinščina sco: škotščina @@ -1892,6 +1931,7 @@ sl: vi: vietnamščina tr: turščina yo: jorubščina + diq: zazaščina el: grščina ba: baškirščina be: beloruščina @@ -1908,9 +1948,11 @@ sl: yi: jidiš he: hebrejščina ar: arabščina + skr-arab: sarajščina fa: perzijščina arz: egpiptovska arabščina pnb: zahodna pandžabščina + ps: paštunščina nqo: nkojščina ne: nepalščina mr: maratščina @@ -1920,10 +1962,12 @@ sl: gu: gudžaratščina ta: tamilščina te: teluščina + kn: kanareščina th: tajščina my: burmajščina shn: šanščina xmf: mingrelščina + ka: gruzinščina km: kmerščina sat: santalščina zh-CN: kitajščina (poenostavljena) @@ -1931,6 +1975,13 @@ sl: zh-HK: kitajščina (hongkongška) ja: japonščina ko: korejščina + offline_flash: + osm_offline: Baza OpenStreetMap zaradi izvajanja nujnih vzdrževalnih del trenutno + ni dostopna. + osm_read_only: Baza OpenStreetMap je zaradi izvajanja nujnih vzdrževalnih del + trenutno dostopna samo za branje. + expected_restore_html: Storitve bodo predvidoma znova vzpostavljene v %{time}. + announcement: Objavo si lahko preberete tukaj. user_mailer: diary_comment_notification: description: Dnevniški vnos OpenStreetMap št. %{id} @@ -1943,6 +1994,8 @@ sl: ali odgovorite na %{replyurl} footer_html: Komentar lahko preberete tudi na %{readurl}, komentirate na %{commenturl} ali odgovorite na %{replyurl} + footer_unsubscribe: Od razprave se lahko odjavite na %{unsubscribeurl} + footer_unsubscribe_html: Od razprave se lahko odjavite na %{unsubscribeurl} message_notification: subject: '[OpenStreetMap] %{message_title}' hi: Pozdravljeni, %{to_user}, @@ -1956,17 +2009,37 @@ sl: na %{replyurl} follow_notification: hi: Pozdravljeni, %{to_user}, + subject: Posledil_a vas je [OpenStreetMap] %{user} + followed_you: '%{user} vas zdaj sledi na OpenStreetMap.' see_their_profile: Njegov profil si lahko ogledate na %{userurl}. see_their_profile_html: Njegov profil si lahko ogledate na %{userurl}. + follow_them: Tudi vi ga_jo ga lahko posledite na %{followurl}. + follow_them_html: Tudi vi ga_jo lahko posledite na %{followurl}. + gpx_details: + details: 'Podrobnosti vaše datoteke:' + filename: Ime datoteke + url: URL + description: Opis + tags: Oznake + total_points: Skupno število točk + imported_points: Število uvoženih točk gpx_failure: hi: Pozdravljeni, %{to_user}, - failed_to_import: ' vsebovala neko napako, zaradi katere je ni bilo mogoče uvoziti. - Napaka:' + failed_to_import: Zdi se, da vaše datoteke ni bilo mogoče uvoziti kot sled GPS. + verify: 'Prosimo, potrdite, da je vaša datoteka veljavna datoteka GPX ali arhiv, + ki vsebuje datoteko/e GPX v podprtem formatu (.tar.gz, .tar.bz2, .tar, .zip, + .gpx.gz, .gpx.bz2). Bi lahko prišlo do težave s formatom ali skladnjo vaše + datoteke? Tu je napaka uvoza:' + more_info: Več informacij o napakah pri uvozu GPX in o tem, kako se jim izogniti, + lahko najdete na %{url}. more_info_html: Več informacij o napakah pri uvozu GPX in o tem, kako se jim izogniti, lahko najdete na %{url}. subject: '[OpenStreetMap] Neuspeh uvoza datoteke GPX' gpx_success: hi: Pozdravljeni, %{to_user}, + imported_successfully: Zdi se, da je bila vaša datoteka uspešno uvožena kot + sled GPS. + all_your_traces: Vse vaše uspešno naložene sledi GPX najdete na %{url}. all_your_traces_html: Vse vaše uspešno naložene sledi GPX najdete na %{url}. subject: '[OpenStreetMap] Uspeh uvoza datoteke GPX' signup_confirm: @@ -2070,6 +2143,9 @@ sl: success: Vaš uporabniški račun je potrjen. Hvala, da ste se vpisali! already active: Ta račun je že bil potrjen. unknown token: Ta potrditvena koda je potekla ali ne obstaja. + if_need_resend: Če želite, da vam ponovno pošljemo potrditveno e-pošto, kliknite + spodnji gumb. + resend_button: Ponovno pošlji potrditveno e-pošto confirm_resend: failure: Uporabnika %{name} ni bilo mogoče najti. confirm_email: @@ -2108,8 +2184,9 @@ sl: unread_button: Označi kot neprebrano destroy_button: Izbriši back: Nazaj - wrong_user: Prijavljeni ste kot '%{user}', ampak sporočilo, ko ga \elite prebrati - ni bilo poslano vam. Prosimo, prijavite se, kot pravi uporabnik za branje. + wrong_user: Prijavljeni ste kot »%{user}«, toda sporočilo, ki ga želite prebrati, + ni bilo poslano od ali do tega uporabnika. Da ga boste lahko prebrali, se + prijavite kot pravi uporabnik. destroy: destroyed: Sporočilo izbrisano read_marks: @@ -2187,6 +2264,10 @@ sl: new password button: Pošlji mi novo geslo help_text: Vpišite e-poštni naslov, s katerim ste se registrirali. Poslali vam bomo povezavo za ponastavitev gesla. + create: + send_paranoid_instructions: Če vaš e-poštni naslov obstaja v naši podatkovni + zbirki, boste v nekaj minutah na svoj e-poštni naslov prejeli povezavo za + obnovitev gesla. edit: title: Ponastavitev gesla heading: Ponastavi geslo za %{user} @@ -2203,24 +2284,61 @@ sl: failure: Prilagoditev ni bilo mogoče posodobiti. update_success_flash: message: Nastavitve posodobljene. + navigation: + preferences: Nastavitve + advanced_preferences: Napredne nastavitve basic_preferences: show: title: Moje prilagoditve + preferred_language: Prednostni jezik + preferred_site_color_scheme: Prednostna barvna shema spletnega mesta + site_color_schemes: + auto: Samodejno + light: Svetlo + dark: Temno + preferred_map_color_scheme: Prednostna barvna shema zemljevida + map_color_schemes: + auto: Samodejno + light: Svetlo + dark: Temno save: Posodobi prilagoditve + advanced_preferences: + show: + title: Moje napredne nastavitve + save: Posodobi nastavitve profiles: profile_sections: navigation: + description: Opis + links: Povezave image: Slika + company: Podjetje + location: Lokacija descriptions: show: title: Uredi profil save: Posodobi profil cancel: Prekliči + update: + success: Opis profila je posodobljen. + failure: Opisa profila ni bilo mogoče posodobiti. links: show: title: Uredi profil + save: Posodobi profil + cancel: Prekliči + social_links: + title: Povezave do družbenih profilov + remove: Odstrani + add: Dodaj družbeno povezavo + update: + success: Povezave profila so posodobljene. + failure: Povezav profila ni bilo mogoče posodobiti. images: show: + title: Uredi profil + save: Posodobi profil + cancel: Prekliči gravatar: gravatar: Uporabi Gravatar what_is_gravatar: Kaj je Gravatar? @@ -2229,17 +2347,40 @@ sl: delete image: Odstrani trenutno sliko replace image: Zamenjaj trenutno sliko image size hint: (najbolje delujejo kvadratne slike vsaj 100x100 točk) + update: + success: Profilna slika je posodobljena. + failure: Profilne slike ni bilo mogoče posodobiti. + companies: + show: + title: Uredi profil + save: Posodobi profil + cancel: Prekliči + update: + success: Podjetje v profilu je posodobljeno. + failure: Podjetja v profilu ni bilo mogoče posodobiti. locations: show: + title: Uredi profil + save: Posodobi profil + cancel: Prekliči no home location: Niste nastavili vaše domače lokacije. update home location on click: Posodobim domačo lokacijo ob kliku zemljevida? show: Prikaži delete: Izbriši undelete: Razvljavi izbris + update: + success: Lokacija profila je posodobljena. + failure: Lokacije profila ni bilo mogoče posodobiti. sessions: new: tab_title: Prijava login_to_authorize_html: Za dostop do %{client_app_name} se prijavite z OpenStreetMap + already_logged_in_html: Prijavljeni ste že kot %{user}. Ponovna prijava bo spremenila + vaš trenutni račun. + access_another_page: 'Prispeli ste sem, medtem ko ste poskušali dostopati do + druge strani. Če želite do te strani dostopati s svojim trenutnim računom, + kliknite spodnji gumb:' + visit_referring_page: Obišči referenčno stran email or username: E-poštni naslov ali uporabniško ime password: Geslo remember: Zapomni si me @@ -2275,16 +2416,43 @@ sl: richtext_field: edit: Uredi preview: Predogled + help: Pomoč pagination: + changeset_comments: + older: Starejši komentarji + newer: Novejši komentarji + oldest: Najstarejši komentarji + newest: Najnovejši komentarji diary_comments: older: Starejši komentarji newer: Novejši komentarji + oldest: Najstarejši komentarji + newest: Najnovejši komentarji diary_entries: older: Starejši zapisi newer: Novejši zapisi + oldest: Najstarejši vnosi + newest: Najnovejši vnosi + issues: + older: Starejše težave + newer: Novejše težave + oldest: Najstarejše težave + newest: Najnovejše težave traces: older: Starejše sledi newer: Novejše sledi + oldest: Najstarejše sledi + newest: Najnovejše sledi + user_blocks: + older: Starejša blokiranja + newer: Novejša blokiranja + oldest: Najstarejša blokiranja + newest: Najnovejša blokiranja + users: + older: Starejši uporabniki + newer: Novejši uporabniki + oldest: Najstarejši uporabniki + newest: Najnovejši uporabniki site: about: heading_html: Sodelavci %{copyright}OpenStreetMap %{br} @@ -2351,6 +2519,22 @@ sl: native_link: Slovensko verzijo mapping_link: začnete kartirati legal_babble: + lead_1_html: OpenStreetMap ponuja odprte kartografske podatke za tisoče spletnih + mest, mobilnih aplikacij in naprav strojne opreme. OpenStreetMap gradi skupnost + ljudi, kot ste vi, ki prispevajo in vzdržujejo kartografske podatke o cestah, + poteh, kavarnah, železniških postajah in še veliko več po vsem svetu. + lead_2_html: |- + %{learn_more_about_osm_link} in %{get_started_mapping_link}! + Več si lahko preberete na %{osm_blog_link} in se naročite na %{weeklyosm_link}. + Poiščite druge kartografe v vaši lokalni %{osm_community_link}. + Podprite projekt tako, da se pridružite %{osm_foundation_link} in %{making_donation_link}. + lead_2_learn_more_about_osm: Več o OpenStreetMap + lead_2_get_started_mapping: začnite kartirati + lead_2_osm_blog: Blog OpenStreetMap + lead_2_osm_community: Skupnost OSM + lead_2_osm_foundation: Fundaciji OSM + lead_2_making_donation: donirate + licensing_title: Licence OpenStreetMap licensing_1_odc_odbl: Licenca za odprte podatkovne zbirke Open Data Commons licensing_1_osm_foundation: Fundacija OpenStreetMap licensing_3_creative_commons_license_url: https://creativecommons.org/licenses/by-sa/2.0/deed.sl @@ -2665,6 +2849,9 @@ sl: obstajajo kot neformalno srečevanje ali kot skupina v skupnosti. Vsakdo jih lahko ustanovi ali se jim pridruži. Preberite več na %{communities_wiki_link}. communities_wiki: Vikistran skupnosti + social_links: + show: + website: spletno mesto layers_panes: show: map_notes_zoom_in_tooltip: Približaj za ogled opomb zemljevida @@ -2907,6 +3094,9 @@ sl: wikipedia: title: Prijavi se z Wikipedijo alt: Logotip Wikipedije + share: + share: + title: Deli oauth: permissions: missing: Aplikaciji niste dovolili dostopa do te funkcije @@ -3025,6 +3215,7 @@ sl: my notes: Moje opombe my messages: Sporočila my profile: Moj profil + my_account: Moj račun my comments: Moji komentarji my_preferences: Moje prilagoditve my_dashboard: Moja nadzorna plošča @@ -3037,7 +3228,10 @@ sl: edits: Prispevki traces: Sledi notes: Opombe na zemljevidu + follow: Spremljaj mapper since: 'Kartograf od:' + last map edit: 'Zadnje urejanje zemljevida:' + no activity yet: Še ni dejavnosti uid: 'ID uporabnika:' ct status: 'Pogoji sodelovanja:' ct undecided: Neodločen @@ -3060,6 +3254,15 @@ sl: delete_user: Izbriši uporabnika confirm: Potrdi report: Prijavi tega uporabnika + edit_profile_details: Uredi podrobnosti profila + edit_description: Uredi opis + edit_links: Uredi povezave + change_image: Spremeni sliko + edit_company: Uredi podjetje + edit_location: Uredi lokacijo + sidebar_section: + home_location: Domača lokacija + company: Podjetje go_public: flash success: Zdaj so vsi vaši prispevki javni in lahko urejate podatke. issued_blocks: @@ -3089,6 +3292,12 @@ sl: show: title: Uporabniki heading: Uporabniki + select_status: Izberi stanje + ip_address: Naslov IP + edits: Urejanja? + has_edits: Ima urejanja + no_edits: Brez urejanj + search: Išči page: confirm: Potrdi izbrane uporabnike hide: Skrij izbrane uporabnike @@ -3096,8 +3305,16 @@ sl: user: summary_html: '%{name} ustvarjen iz %{ip_address} dne %{date}' summary_no_ip_html: '%{name} ustvarjen dne %{date}' + comments: + index: + changesets: Sklopi sprememb + diary_entries: Dnevniški vpisi + no_comments: Brez komentarjev changeset_comments: + index: + title: Komentarji k sklopom sprememb, ki jih je dodal(a) %{user} page: + changeset: Sklop sprememb when: Kdaj comment: Komentar diary_comments: @@ -3105,6 +3322,8 @@ sl: title: Dnevniški komentarji, ki jih je dodal_a %{user} page: post: Objavi + when: Kdaj + comment: Komentar suspended: title: Račun zaklenjen heading: Račun zaklenjen @@ -3134,7 +3353,7 @@ sl: administrator: Podeli administratorski dostop moderator: Podeli moderatorski dostop importer: Podeli dostop uvoznika - are_you_sure: Ali res želite podeliti vlogo »%{role}« uporabniku »%{name}«? + are_you_sure: Ali res želite podeliti vlogo '%{role}' uporabniku_ci '%{name}'? revoke: administrator: Odvzemi administratorski dostop moderator: Odvzemi moderatorski dostop @@ -3264,6 +3483,7 @@ sl: description: Opis created_at: Ustvarjeno last_changed: Zadnja sprememba + all: Vse show: title: 'Opomba: %{id}' description: Opis diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 0271e5835..bf6d57b0b 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -2739,7 +2739,7 @@ zh-CN: identifiable: 可识别 private: 私有 trackable: 可追踪 - details_with_tags_html: 由%{user}在%{tags}于%{time_ago} + details_with_tags_html: '%{time_ago}由%{user}发布于%{tags}' details_without_tags_html: 由%{user}于%{time_ago} index: public_traces: 公开GPS轨迹 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 1b0e54b65..27fc52d35 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1871,9 +1871,9 @@ zh-TW: yi: 意第緒語 he: 希伯來語 ar: 阿拉伯語 - skr-arab: 色萊基語(阿拉伯字母) + skr-arab: 色萊基語 fa: 波斯語 - arz: 阿拉伯語(埃及) + arz: 埃及阿拉伯語 pnb: 西旁遮普語 ps: 普什圖語 nqo: 西非書面字母 @@ -2811,7 +2811,7 @@ zh-TW: identifiable: 可辨識 private: 私人 trackable: 可追蹤 - details_with_tags_html: 由 %{user} 在 %{tags} 於 %{time_ago} + details_with_tags_html: '%{time_ago}由 %{user} 發佈於 %{tags}' details_without_tags_html: 由 %{user} 於 %{time_ago} index: public_traces: 公開 GPS 軌跡 -- 2.39.5 From 6452d88c47ac7e995d4e363b3ce029b366e6d3de Mon Sep 17 00:00:00 2001 From: Pablo Brasero Date: Mon, 22 Sep 2025 13:30:34 +0100 Subject: [PATCH 10/16] Use fork that introduces support for Docker on Apple silicon --- Gemfile | 3 ++- Gemfile.lock | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index cda7173a7..20653c646 100644 --- a/Gemfile +++ b/Gemfile @@ -118,7 +118,8 @@ gem "canonical-rails" # Used to generate images for traces gem "bzip2-ffi" gem "ffi-libarchive" -gem "gd2-ffij", ">= 0.4.0" +# Use https://github.com/dark-panda/gd2-ffij/pull/28 for Docker/macOS compatibility +gem "gd2-ffij", :github => "rkoeze/gd2-ffij", :ref => "a203a8d5ef004a4198950e86329228fe3f331d06" gem "marcel" # Used for S3 object storage diff --git a/Gemfile.lock b/Gemfile.lock index f2d256a56..a8b25c2be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,6 +6,14 @@ GIT active_record_union (1.3.0) activerecord (>= 6.0) +GIT + remote: https://github.com/rkoeze/gd2-ffij.git + revision: a203a8d5ef004a4198950e86329228fe3f331d06 + ref: a203a8d5ef004a4198950e86329228fe3f331d06 + specs: + gd2-ffij (0.4.1.dev) + ffi (>= 1.0.0) + GEM remote: https://rubygems.org/ specs: @@ -296,8 +304,6 @@ GEM frozen_record (0.27.4) activemodel fspath (3.1.2) - gd2-ffij (0.4.0) - ffi (>= 1.0.0) git (2.3.3) activesupport (>= 5.0) addressable (~> 2.8) @@ -740,7 +746,7 @@ DEPENDENCIES faraday ffi-libarchive frozen_record - gd2-ffij (>= 0.4.0) + gd2-ffij! htmlentities http_accept_language (~> 2.1.1) i18n-js (~> 4.2.3) -- 2.39.5 From 653e8f83e0291b24e20489651d48b97dd897c69a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 23:01:21 +0000 Subject: [PATCH 11/16] Bump ruby/setup-ruby from 1.259.0 to 1.263.0 Bumps [ruby/setup-ruby](https://github.com/ruby/setup-ruby) from 1.259.0 to 1.263.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/866b91cc020931c510d42e43e498a7f07d335f60...0481980f17b760ef6bca5e8c55809102a0af1e5a) --- updated-dependencies: - dependency-name: ruby/setup-ruby dependency-version: 1.263.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 0ce468999..8db99abb8 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@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 + uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 with: ruby-version: 3.2 rubygems: 3.4.10 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ce5569768..2b4e71b03 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@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 + uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.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@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 + uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.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@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 + uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.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@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 + uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.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@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 + uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 with: ruby-version: ${{ env.ruby }} rubygems: 3.4.10 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2c30b96b5..3d438017d 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@866b91cc020931c510d42e43e498a7f07d335f60 # v1.259.0 + uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0 with: ruby-version: ${{ matrix.ruby }} rubygems: 3.4.10 -- 2.39.5 From 65d6f0be71e171b1b4dbbfb5818e56c24a6941fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 23:01:22 +0000 Subject: [PATCH 12/16] Bump tag2link from 2025.8.21 to 2025.9.21 Bumps [tag2link](https://github.com/JOSM/tag2link) from 2025.8.21 to 2025.9.21. - [Release notes](https://github.com/JOSM/tag2link/releases) - [Commits](https://github.com/JOSM/tag2link/compare/2025.8.21...2025.9.21) --- updated-dependencies: - dependency-name: tag2link dependency-version: 2025.9.21 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 ba80685d9..ab6ad2a4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -861,9 +861,9 @@ supports-color@^7.1.0: has-flag "^4.0.0" tag2link@^2025.7.21: - version "2025.8.21" - resolved "https://registry.yarnpkg.com/tag2link/-/tag2link-2025.8.21.tgz#1b556552690c12447412bb6cd206c0f0f75815a0" - integrity sha512-M0tI77mHkKnt3IQamhWMJLptu7rBerbolbLOnwMLgMWjK5Jll8OAxxLoCnOW0KsXX1y+hO3QPck8dvqf7ISaoQ== + version "2025.9.21" + resolved "https://registry.yarnpkg.com/tag2link/-/tag2link-2025.9.21.tgz#61f6b85e92f07e3f96754e7dca43a0f40c1ff503" + integrity sha512-B6lclYj3+LkK6wXzbMuQfptM3yzutBGzpwh+lCIQ6gTumonf0e0QCOsnc30gft8Szag//LqKlFl2CLOSZ1ksgw== tinyqueue@^3.0.0: version "3.0.0" -- 2.39.5 From 8f2c13f94c97fd049ff5249544e0523e67f4a643 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 23 Sep 2025 19:04:27 +0100 Subject: [PATCH 13/16] Update bundle --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a8b25c2be..58f77cedd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -107,7 +107,7 @@ GEM autoprefixer-rails (10.4.21.0) execjs (~> 2) aws-eventstream (1.4.0) - aws-partitions (1.1160.0) + aws-partitions (1.1163.0) aws-sdk-core (3.232.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) @@ -131,9 +131,9 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) - better_html (2.1.1) - actionview (>= 6.0) - activesupport (>= 6.0) + better_html (2.2.0) + actionview (>= 7.0) + activesupport (>= 7.0) ast (~> 2.0) erubi (~> 1.4) parser (>= 2.4) @@ -367,7 +367,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.13.2) + json (2.15.0) json-jwt (1.17.0) activesupport (>= 4.2) aes_key_wrap @@ -428,12 +428,12 @@ GEM nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oauth (1.1.0) - oauth-tty (~> 1.0, >= 1.0.1) + oauth (1.1.2) + oauth-tty (~> 1.0, >= 1.0.6) snaky_hash (~> 2.0) - version_gem (~> 1.1) - oauth-tty (1.0.5) - version_gem (~> 1.1, >= 1.1.1) + version_gem (~> 1.1, >= 1.1.9) + oauth-tty (1.0.6) + version_gem (~> 1.1, >= 1.1.9) oauth2 (2.0.17) faraday (>= 0.17.3, < 4.0) jwt (>= 1.0, < 4.0) @@ -592,7 +592,7 @@ GEM rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) + rubocop-ast (1.47.1) parser (>= 3.3.7.2) prism (~> 1.4) rubocop-capybara (2.22.1) -- 2.39.5 From 3df72e7eb646eff403c59536f54b6693cc39645f Mon Sep 17 00:00:00 2001 From: Gregory Date: Tue, 23 Sep 2025 19:13:37 +0100 Subject: [PATCH 14/16] Add image for SotM Europe banner --- app/assets/images/banners/sotm_eu_2025.png | Bin 0 -> 43098 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/banners/sotm_eu_2025.png diff --git a/app/assets/images/banners/sotm_eu_2025.png b/app/assets/images/banners/sotm_eu_2025.png new file mode 100644 index 0000000000000000000000000000000000000000..88a5dac71514e99ef83acfb2457202f9629de2ee GIT binary patch literal 43098 zcmZ_#1yCkE7p{%s?(Xh7xVyvP?l8E!ySv-q4EEse?hG)vySqNP^Yeb^-*tAKs#Dcn zolbXGY9;Bc>q{UT0KtK)tJ7J){b0+CM@V+k)79#Q@ARzS# z@bAWu-}j&{DpI1Lt78lS-!~*C(kk*GAl_6UAc3JEAg|w9fhQm!Za+Xk&Wu1ncz=U{ zU_0h?DD!_mfchmTCH{TI1W`r(w^s3;f_0SEb^!rlBLD9M^(+x`|IUPVm64Z#K83}E zVM2Yr&{z5{1Vlz$M9p*UBG)2EZE1jE)YEvVLf2 z>sKr#p3i+09>+*}X+1p_L;c8>a6K6u7@0n=ZMO5dm%+b*tEs7fQ;*8m*LRuNd_Ko{ z&et!wUoV;>3FMTZU=T1U1%m|;swgDFfgqqjD46eraM%CxNl3Op{!2u1{r3nAVhI2L zdM7Z@6a0VQ{`r`pF2MgGDg6p_!bGtdTHKnLN}p^WUHtPoG|>_aL0Hq*6#{AJ6%0Bm zh9s(B9NRW6IIhPiS8e44z9MK+rA}dhTBVN1^Z37#o+7wU#zdVH&)C!+POG0W;APa3 z#6iT^G5=D7%z)}Ag@Psq7JIC{^g}byN=u7~ik4th0Wq+i;h4SP9HddZf0s}`qPT^>jp&`=R+26)7woJc z^5e+A5>-YJtW#KNuxP1EL@`{NB#02NzuYP_8Sl@H{ zE_)mP!-_5x>AwG3V|{A{w5{KfN7{u({ScY+br8JeIaoWrAG1bQ;)Vzs1_i}I*M!C~ z_Q<8_sxIZIS(nfLiRn4Sht&NdUS|nX8Dj(v+XUOA9~n0?F>1l>hbxBqup)(WG8RP& zjSMuofjo_Jh%Vu1Wtn7+Rzia<_}YV8Kk*$nB)TKX- zcw-mVwk(e@rJ^o7>3tY%1@gnt@?T)6D$-oO?0j$TI z56)d^z3Dw>7qRukAbx*`7m3vvz@T3Wl@Xx@Z(aLV;#5I@-3|O@b z`eXu}CFXWmgl>Gl|5}nQ1{^TG($1f(gdI&v<7uUmw`EbGNJI$)yuTe=8>*J6S~SoM z>u{<|@#=4NtCj^N8MGw0u^bxziJ(c-;4K9b;XubqZrfp3NuwSm=F(p2=RJ4;Cv}0? zO#NQF@?>n=woY&O)&j)#j*G$%{~IL`X9+zQns6Q3n$!ei;&8#ZaukV$M6N z{O=*(BMb|U*B;7Ppu3PB!8IWK#VzE$JW^ATini~^R^vQX8i3jAkumnA&-25KstF(o z)QAesO*?kT|5<}!PLu3{n62+tyIOo6f!Ku$O%lKw^!JKf39);YgM)sVq*q_=cGzPk z&o^6ofUXQ01wNa5J|LFI3v5IIJo5fz?KeMT_VZhQ-`CcV?`^kvB?-S#OSMx>HM9u! z_b@RN<5u1HKgRV! zFYt@YcEoFs=e{#fB#t`U?HaRY+%3J|FKCugIFJ|%m{?omq@8WQmX@H!Xav z9$(0@pl$#Aj`pmP`B%>~s<&Ii2erKs^U#$TD&J)!%{f?jd{vo9jX}iwE&f5*@J>to zbM@zD8IPkP+33$A*W+-Ai#4RBYx4mpVI#dd1*Dh1;-HaSMQ%9X#H-~5!Re&C{c$(lW0sv3$8k`3k_>G zq~5d$c#he+5(GthK5(6ZYgiG8qi%%f9rHAsUs9nR>74J|OR_n9*J1&Cj0+XwTTdH1 zw0i06;A7u@=b8`rDVd~))^f6mFy|)qC}Q9Zl_Vhfr_4La=zZY zJ$}+(hMgPA>S{s5WWAN3kKFFfxHaLhzxhtnW*_sq1706RUXPsrvo`-Sq3pPQca=%q zp-bu{SXb$n`__}*A?-Vh6)PLbHV9}>{*X^#;=6$DJhP!#R;kf7ADVqz1)?l(c510<@#v@%$dymjKUivO*J+3%L81F?pKKKrD|Oc*0#k*Ecl7jRV}QC12=QF zW>tUNJu?n5!xSHcS4pL__1r-m$vC4h{Edr*bHgsH-or`Zvvk3Lrq)F{|8?2M1#Lft z8y1j=kwP=f4vKTohtz*$S3KauC3cQ!y|>W>md?-@asL$>#;)9cJL+^3@gaP>@T#8P z)KS%jx(i1t+-}s!eobJBsdr;kng>YjNN;#HmK7Ae4367_hp-eK~?| z+jb(^(S76prYKv>dLN)4hQnEw8G8Z{6b)Q+y@CpuvS|CtiOT84v9`6W38+D_<^9rn z&2wfTtL~O>-Btu%CLH@sdl2NBq*3^ZdCrsRDef9&uI*vStcgqWXXwrWSw3gC%oFhLS2m**w-%gL*WVlz$yC^WRw`kqQ zZJWKv$xFvyhg^DtYrzN&HH|O2(<-q38|l88+2v4uZm}&a@NmN4A_&P+hy2TkI1$aQ zAs^1T^BcR9%KfxV802*>7N2>#Hl=UJR;~$d*Pt!%E1^rIj^Wp&e;9 z)FvAQiIrgL5fZ!2x>Mn9vtv}e=#cm7>D`FMgHy5sQLzq|mYbPqZ%aq)5>*r`h*us) z{xVoqEuU60FWFv;{H65{Kd~l5y1{EH24~bjvW#3BTPa=$$81|5OTGg{R29`Ey!ev_ ziQJuVgKSSqU6uFH5yosf>EuZ-Nk!=*X6GdRM~4E ztY&bz=E`}1aIsmtH_Oi^c*TBV0krxFkW~GMmd)@V&M<4&iX%K{Pdv5oyG0*B&h-4Y z=v;;DB)pUw72g?%mUjX1+45zwENQp}FQboOrOw5-{S!FRdDdMPIK%Tbf4HzI=}WZy2XMbKuW&?|??{&yLTq1XbdC~M`G zxnuW{lRbBDu~fuDs2Am+q;mxskDAA-%){xQ=g?4b5Si~8HNEd)`G!g5JJ+DYdf`Vs z*wn1P`!c_~k}p|v_FT*3aVMPzFP%fnEETswUuMTd+1lek^M0IMKd<7hi{ha}{Ky7E zm1EGEi#$bd*-T&EQa{?YQ^ly3fY7DFuiFHgyw66cZM&XxgFd-C1dvIanA2og?Sp@0}@U~ZTVG!FFTd5 zrrzBf7tP%(&Lx0(aw~M@3*^E-Ycbe&-^F9D(v-zv7CH)W^@N~`QAOAO`IadsI|jS$ zVy|~PQwQpG+e<}O2xM(23-0Rq?rn!Qf?wRYo4p+{GT4(Qkw+}6j-G3*&&@?>JAA@j z=%EK(rSq=JvZQrXmm;%n$3>^K#M;bOjju;vGj~@OyuN6uAy49|X|7wUj{5Irl{cTS zAfIw}`%HilJNGs>stL?6e*jTT;ko55${}{XsGAw(AMNXdd(wEAu{6>c$S6nhr|Kmm zD=0GJl6GIT@XVHx2SOuAAyMg?D2h8y#}iTKRI4KJ(I(UvK^tCz96-=4MskWM79Txt zN>%zxYA>eqitco6cUj^)nJJ6#BF~R<^a4VK6}v-)CFHhY*HubntL1GUlyUW5N;QoR z{kcldTS!@l?A2nV2K~qP6A35k}7hff$b${l8v@t@T7QC z{A6a&=+VJAJP;m_da3g5AxedC7bLstij=dGey>V!3QGdfbDYOS(bM9ahXjLWS!B5M zeJR1UE~Zvj(S6Bq@ce10RyFeZop=u1c!r*I-v_hznLF`e7)-p1U&rzqNy{so3t?Oa zL9QlYZmj^OA)I%Gf5;NF714x#+)Hz^hunIv{u4LdWSOSf(p!(96|UY+8Lr!^$0<=S z9LK`$=kyW}yZo80!kcR7!LDUPf4O4`;5IvSY~5;}MWZiZ0E=%~HDX1@(U)Op-b*my zH2Pr6vT%0IdwRCLf39Wvl!CN<#uYc83X@OeW0uQcr?(?(s!2UYP=K#RWO~%+(=BIk+RkHc(_Ib8&;@@n zCSytFx0uIB$Ay|H&C@Sh%w!iaBs(jr_I}ki3gd=S*ydmmZ+gLq-<*nAl%89zIE#{g zZL_L4hUiE448`z{9YqbK@*Nx6cAHTb?1Of~TJab;`9JWInELc!EvOKZAEc*Il2v2h z(HV2AI^&j>=-p+*lmf_owBe9`o^_d@$8F`RB4&ULd4+XQT7hK4+2sqL*4qKMU7LM=Qv3m=zMMU9 zc$(2;T3%Zs{B&0|KK6{nMsL{a{FPl9| zX<(iZW#_31hgA&O6l*=wh?DMa*Nl;qD#j`>KNnTB%-5`I+54i{E&t@ z94eZ%8MM5tz|m#u3fkky=5+%T&nN6VA@N#wawPs8_VhQ#%L3U(F4bXWphA^tw1yGC zI09j#(LZdnv1)9asI)WI0Xl8-ux4N-wBMe?*j^#@_vMN0*q_0RT5mlEUc0$R8kO`< z#X-*VXf!oU%1F%7RlQUr3HC7`(oW^!^QA6YiDK8)(|v7J`J;CP8S)Z z+7pnXo+tIFI%2JA2Cz@=#}z_IWpfU)XQ+^}go;y|EpCedSH(Q;6iu>_XW^wiX4aN8 zY7{$Ct3d|u61zstEo<3+@l>q`5E8O4QhwlM{J=rwI@Lfo&s%r5F2hri88|ly1E5vJv%j$k zO>=Sqnz_X9oTuJEjHI(tdugR*)wqW`6B2*25oE1-m_%Gl%^Gx;!mK>3c%BE)ytr!b z{u5?jAf5c{W&?lL@9||xi%%2)s%>LSPu$6uoxoEtmT~xF&{&*)Eti4<`UFWTlk=`f z#(uUd=XJbaxD|n-vjR41`rqv}ttjW5k3rr-WB5S}yF0z^8~pq|z)vkQAyB^VH?~?;h?GGk@CcvuC)d=kH^T<#vp2 zHU|k%;=%v}8TQ*{?r=)mtwPs+Q)JJ7cDF3;JlBG0hA|?IJ8qNhP|h1ySh*N;k98G7 zxD0Ym@)T`eTE^WU2(j53uo6DjE+0{ldI=n`!!2Q}$ZI9xApZSLj87rWw>TYnLJ`-LANDnVkPU-0XSl z7qtwu)5GyQ$o%s%LAQ8HF zE`-&yM~%I^j*=^TU5?3CrJI4Spn|UK@l9FG^zyCvt*!EBbebyKtE@>^1X2!-8yKK# zfu7UsT~z0$!=rIjtOdv*d1gi1eCYC6iB@WX&bRD;&GcLZ4m#wY6?>w69`xI=H$r_@ zFFl`xV)PooY^eiaHB@J(c!*dE14Oz(s06#-@$yoVIprcQhDxJ+j^5=n$zF1|-YrWH zn~T}VvGy2s0j0PQ7mH~9q)sUuxSwAIX{!%aJ*iyvOP9domJvRMt4IMUxV%OLDk?V( zFZpxs?0Lby(Bl4|6C_Ea1QaDZP7_AG#j|_I{G?VlT6velB}V3#E8tDoAM9+JgLzZE5 z%rUoJUVWD|jMU{&-A%#b3WogZ&e*EzhAzenK~l(b>pS4qk)>TaslBe?mOe+qt@nR* z;>WfI@66%)1Nfi?SFb2$C^BL#(gEh zwb%Q?qGd102199_3O-u+wd+cAJ_qsg$_>y9`x=RWA#8U1R2y$6y9SPRSWjy;hK_-39D-7=SlcEL3|+9ktq8|J*h9?mhqyocI3;~xI)Wp30HH*o}ZY- z{5Uu(g^A4&U_IHPhRuO!cRgER9w6|O6u0QZQB-Cb#N#y>Ux1Qi6NFH%t4N$q%0l6y zp6$MtuSe6s7rld_st)^bc^+j`4&VQjyKQ+R-uG}GYg=T%BVC}x4A*Tm<=Mop zW?-=L05~te`joh>4RpUMynp%SG}4I~ltu0uJacue5?fFkk}5qCh2U(p795qXzt=`O z{FGS6bh{oe4S5{%@(Y+OvZ)IPgRnH*+tj>s@nM4r^0(AqlX`hrrimIDKcuCK6}dm% z+~K=UdGVa?UUZLJpm3aiW&89YHluW&t;V<qWkSuWKsy8@3G)B!tK7qCQ6XI3%Q*cUdPAaY{i7m!If^y`p;NwLB zi@Q4F<1YW=s|J_4_;2fp_i}5V#hvvo(doJINv?hGi4YE zm7giHI}9R(vA2m%V>fWfKHKP_|2p~t4`-8F8pQkOk4>sxJJyTA=xITBuK+??=ACR* z15?>C!6HpT(R^J;@WI?+c@M0}p@E6BfkBP5_p#GDC~oBa?ln(R50NuooR`9i{i7ce zdU8dfc#)4hvI73L;U1wDK3(RWXNO#F6eU3=Q<+GG1yR^a`yZmkk5LmNH@z#Emr0#2 zKtrYBf|&pJun72J5dAw&L$y@~XWs?gflES#2*TwsZj&QpK3nE@FWV-R6*c%fNMtKP zyFjL-q{^&%bofOoS<^RccW~N8xT*6~QvAK7l(nG}^)=8*xP^Uvx%xNyA05tYE7zHW zVxZEo4>wF-Zm(shNZol~Pa6-NTPlnUyO!K!*0ySvGVKe5L<8Uo0{uyhd3Ms&W+#;7;pc+sDB4SyR-b#V%euB!C4wLwm41w z!=9dL^{(gC@X)=g8EtelZUD|1;cT(8oBMP3Ukd^n;O{bvqH~cI&5&e+u z^d*iHs-&>*1N6di7J7|4B&P=rmt;7$E6|>=4`{4v=`4k^Bc0!i74ijLPIb=SR$q7` zmob7W{!ntWAeTS2R!oCCgQIrHGo{FaWpV#L0+|R;Da1SZI`+|RvROqnJo-%+3c_zbzuh+Nsx9uYQ zS0N@Tgww@x=8>a}v-_P{0|93$Z{pvBTCUwkNeuCK>Q4JZXHvi2!RbFlyzmmEr7?@% z*=;d(OdkG^7ND_*Mx=^+YN-$+h78N&?8WZg1d`vf%@?(PMaw5a%PD740v1b>frxDb z3X*gkobBHQ5t62*f68p(s$&J2*OsdmPW_5nY5|p$I7e@~^k2j55K- zK~9?@8SChMH7rUkO!-^czq`eK6NQ(Nt?bLD)^xLZhwEQWLN66AGEY*2Gqr-m(PWuX z4zsKWrBe?qk9jt{5n(6u=nq}!e9ie&7cXvi<~W|DZ0F5~)}xGVgP{i@k;9qBF~(VP zQPSlD1EO<=58Sk-Kx>*OmQSk5{SwRI)6z+j#iF)HB03bz(Ml9%ZAwX zwfN1DNz~q66uE|`4Ei$0`7Z?TIm{m>1AQ)sig3;JO%GDh(K0+yu&YQdTzZh@(VmV$ zb?tcIbQY3Dcy&%5@A|eMDbKfE&iF}D5IqW&yY8X8iA4CGjYqRwcCj%V8&oaip$A#g z$w6MSV;za#lS%$8>K8$j7B-D2`q#d@A81*IBHKPSX z!eCb43<8I4@t!-Gt@;H4)Rl)bYl$%GLY(q9Q8HK{U z29;*@@m#-qGtHUo`(<~E_`0DFZ136XjtMN9i}WuCG!#b_W;YfaISDv#ozZuhoxclM z-5!fa`lL|hbL$knWLdBMvlNw>k&t$;wK$NI?bk6hmP?;gEaJ$J3Z@yF-Xv>@42%OFehDh`0JpT^y3UxO4O=&u+wS*`Nu4W zxH83PIn5j2?f24PcBzeDto)`{APn8k?hQaIHDo6O@y*?0_DE%|2i}XR267P8L*^+* zzGFdpSqg3?0B2K%f5zz}!!-kxH3PfpBc$~|%$sLN zy=rV0Np(+3fO#BiOW%_6smFf`$)xnxqogq8Zu8P9yfor! zl7a)M<)M~CadF^h`LOn4wc0>;9R^JYtvm={p0Yd__5M_qprVw^w9;4n;N92aFW_5q zJ7&+k?lZiXH~!ZF@wKT)s(6iT)@od4LA<_87g2WK0*J)uK$^YC)+qyzqr2wj?WFu^ z|DaNP?Su9`O-aZyYSf`WCO~!Uw4eFB(+m_x~PyZYyu_ z9Z$SZAkf0C#fm9E5^vU5K!LWX>niJ@MiSs>FNyfQE@^V}XKKG@=To_r_klh{x~DEB zLZo}reNFyZ`ycVzWcwgu90u<(vd>EOPuz7Z%4Ef|7g7fEU~jbb78K+=9nwvWFnw() zVxyn%T?EOXa=U2yN>~8fvjcjM@wgeA_!Ot%D;9X%fDDy^mi6+3El~aP;YV(_66^oj zrPof>Zp>Ergyfa?=C*LB&}Z0%u;i*27_EyLA`L-`F|(N7O>P&NK*(50(Mk(WYs&_W zB@(jFCmgV7BEjx)nB-dCp1s#dUS2U+J&c$>QlyiML4=u{kB3;YiA(7dwJsSNA7_{~v@K;mpkn%)*-bX{8VjJm`ub~O&gWsTxXz{Ydhg{wFes=85g zkIK$nt8GU!XmN{|W-A*m+2QT?55g{+;=+kejgDnNj-4az&gZIBV<%^_lTmEWxvpebkm?smtWLSlZ{#TZW<=yjCU5w1{jFU3wO2jfTt>J5S7%Q>hIeFH zE%q$IdxT~3ZT6M1J!Re%?I8T9Qb=4I_ADu7z1xAPAOoZ1vyQNAs%CIIF#?n(h4)v^ zk#o(NOAcAP>Qh@M;by{Bb2F5rFlHN_t=T_hWr!|Q-k%(HObFDOnyE(iE2U+GugwIW z9eJ+0w2%Q!*?@J%u^%7Mrb$W;bNt~YGMz7HzZ4O)-sRlhb?lh<{I-Ltl-Az4F7cRu_}6~2?7UTjJp3#Q&tJ)JwUS1;&~e9{Qtlw zW|KCzq(oo57TnywsDWzq<%Fi(KiLU5U*O=%|91XV{F2voNRQ_w*K7fcB~ICR&k`-Vdf@cH!*WX)uv4ZXW{0rA^@Czb?O z&9$w!z3=G>?NFYJOFUJ1H7oyvOhX9E(@w6EmiFMS4TRY@uHOVcc2;koS;oWrh{m~N zT$N{j4t54kebAe>LAF81tV#qzgH_Q)Q|=GZo2vL1VK%ci6aCMQ}-ntyr@0F>{DJlv?a~-HC{=WjWkO{g_Zp1+e;MpcvzeO=>GC^|V zZVftc-~Qq|Vn0^@V{~=R!(4^s6oR>R<@tla2HeemgNar!V&bwnzy~SN-NZ zTVuL36{XEs)QvsbjpVlJvJ6AU&FVu!6L$-9sCQV>U47=T?M;!l`yDwd!zum?f&z?)MHlTh6MyX{ zp&a4Z%=KzE!5T1YK4yQMy^OZ{^#;yGnVc)I=9_WtsXqswkqDpiMRD}y_UuS1?xyvj zXlM;}YDMSFGD%$fM_0)|qv7#`v=UYvME~(qhPqy0MSF2K*%b_`@EljKh`;5$8 z=geX(w@gK>&UWy-3a(nVPYags*MUPRu#0-KaelMHv*AQrPnO*vPG+*d2kwTub-1w~ihzgZru^Pmus@8m`uakU>i4pomH628{vvpb3$qwaw-dCU zw-f3KU1}I^Y4!>2&zW?{^fdTWeLS^6;4&ej55)RAX5=^q&>dGWay2BG>_6!MB_)5^8S|U)j@BgJ^bP=~DeIqiKA)ox(1BB8UYzDG+QnOef^gVdvx9+C! z$1hX=EmUVY$Sri{1@bD_y$85Yk-rFe*rJv4H4V*pPg#6-@Qh5+B(INF+QjbX5i9kY zvTwjkZ*SjcuO%BzPdLTaMt@DtJ9Lu1r*zN#zL4~!2MJ9}91?&=1{(uxRB@l+!eC z1Lse$R62TkQoO%__w5Ce-zT|%P}H430T(?jq-=2ce`4}a4VBs|a8+JEsme_Y?_ z?CI(lzcTbxqD`}q{v)CTZf76~H;%hT()UD0okKfBx?XA>m%{xiC zHorVvS1^{#=vDuaG(cXqUVV5+#<4Ft_fSm1ocjupwzEHj1vB_TxFnw9Yd~;3tsU(a zk9||O%PRD%{tu0an^R8K9yfk8nlDj{=ZqshM&iHF*GmVQ3i?6Us53S`+eXf;;!{KvH#)E^=^Dmf?I_=mL4;6-UY{ZQySJ&%TjIZn+24%ND#QFmaJ>Yz zBkv6!L~peJbKg$eqDL0)$Xn!4E07IyEM*n~8V6|;L+Ctb)1i$YTi!9$icRa`gp7i> zoDM=i)bv}QwAtjvl4YrpcG%ySO&T#lE;C}uWEPzuS@FXHdDuc|bGOAZ`1oI`9XOX2 z5wisPPcA#Ca-w0;!sLn}g8vKOOrc$at|fVbexA}Yj5%$vANz~^Ql=Z(#^FG4csi0b zE~MQW_Bq2mXh2A#L_>^WjlPBej>n?;6;1SPhCbcPwHK|qA}TM$`r^)ym@I|EIDA?P znq8YSZ#1l^XW~N0*EN#8s8Yx{p`-2Sl16;T+8v3Kf2m3Pqc(UlrW*PmK@V{5-)}5e z^eG}l@EG%*bNqiuO%|-Z86eSR5G5!gZM-YYcwQ*LG_neXm^$NG@y*3U>-sVHQ-L8LIc& z$G6D7c!x!>C}y&@%>-qGPz)BUMpyn=o2 z1BoDRa%9$gZnEq7V1UCD`Gc$VUN7ZuvduG` z&LDiePZcp@@HSD{rg&%j8=Y_%Lyd^u$A@u~W0^Za;s5*QA_YacWE7(%4^IDo(9F^+ zOX*~j@bNlu2>vEIMSrb;=LVKh{rbGI$jyLd9$n&61i1Ot?dI5U#aTh|7G3RPq;h=dz1+~X|@B%z=HET*U^vg!Tv9y*ooe}N5YWph0J ze-%it_Aq0#B4zH!DA$8E$1;GQw@M1X zlCoRb|0<=|3OQPcnvxk%Ke4QRoclfJ`>lGu6Z<7?|JgfEnH^Wz9ZqBJkr>04Yc%NW zTlD0ZxwId(Ry@23?ayHV+x{_W~wxePv z)>q81TRF1;@pXt|mMtr17c!-kqC^=T&<&r(ygT(_tqnP#nO(zmCsi8nIArqvRC}H$ z`)sskJd5D#x|AIQ0jnLcWX_cV8Vf*p*h$~6$mos^c+V&?lE|8B)vXTIg}9gQ4EP_n z$-HBuh_mdZ7372BU;FM%KUCqi9Gk14a&IPxm3i1oQWjzgPnPpSY}io=cD>tLH)47% zah+GKH=r$c4V)|#zIQ-Xa{rarJu4pD;={NXLkW2`$LWpHn{_pVYyWn}2NO;f-LZPT zxB-u&&(}v(29-^bGm{wwVPev>Q38(yBRT&L*9CTz*AFra?mf0}=vB5L9+cBY-_=WC znd$1J=mFil)thz|Vam9#IGD+V7(&MY8hJn^$RN0YL*uNuY$t#quA3vFM%KLB7WlO} zT`J&S@^-Q-J{nv2+Ei{C;6uk%-qi|nY+=FK%O(S@t*k6%JLoPe5i~a7E0Su=XR+aV zQ21{8v;7a;_1-$LO#nF^+G$uu9I9j>dbx`;o2d1B5q)cxH~vxcD&RTGceOg5R*qQt zS%rBlqM$z)Ovt~pui@TFQN8KOh&r87F8*jo>QxQTc{uewxD(w$POrBcI^69794o9* zI^w-9P#0oxRs@S~DQ~mY*B|-{n{Zg_GyMd!qmP83P%PB| z4z?4H_^*U4Y`VS((JfgseY_8L!Uf$UjjgCvX+`L2#0f{?wO8T{wU*Y*a*k zYk+QFSB|hWz}1R31Hu4DC0jCI|ByYK?jpHhbB-bV6>Hwr|Hkq=$UD@2)B@B@$tXjzj_u+FS-3DA_YA$qigotna=aQ zgBpDDrtz%m=Tv#tS$Qe63af$X%y=^0FlO(-)k->;F8 zgPFqLhio$fQN}JY{~zG_EWjey0o(K6lGaA%9T-LQog)8B9DtR~9;_}rwR1Vpd(;+_ zo5R#8mNrsOgo~8L8dfqn`n`fU%H3txFT!(^o*l~xBkOKAlE4qd2tULK#-3o1 z4my9yy?`xN&koql@~X6)@BIr@cu3j4kYTA@;#9N8-)P8)!mkgTz!?80=h^FuE-({U zo^^RvYll_~28vE_-!&ue;ex9)vFbMM`e5X}JH?X}Q}*3QcYmJ10O@t^fui;cJ4#*` zB}?|nkU(;8qiCJKX}R}{C$faBE%i!Yc_e|R3%YK(Ca!Slof+#J_1b3h{NUKb{z@jA zM-ruhp;=Z-^PCf zCw*P3#B6(;f0HxF)sLS74T;}MqiOoy8(S%AWw~O!8C4+dv}i{qe;OOxGb*t?$CZh= z^dlF+6pU^TwgT&96MiC7Uqt*!k_L*B>W?A#I-)j;@G%_0WN7|}YFH4{g1@ z>3`o3wQIlT)Ooh&dheJY+vCS0a~W ze~XapKiV)whU=k~{711jp@E#4 zf3kT0UkK$z$3lA}6Nb+0tbX2tCoIkLW+rTJbZ;;Q@>Ts zXwu~wgKN=|lg?ks>0ece(Iiew?1g}LG;)HG>axE=-*YDR+$Xm5{%LSD1d6SnZGGx5`9)^cKN);w z4!&bl0=Ecx`vqxO^Ov<5$^yow>z<@lo6&Er9UDl$WmY~>fI&f2B=Y?rt^vmlEeE~s|d<@2AJ6bR{9B_p^=O8_2u)nv#i4+?I zx`)ZSKBrx7{+y3I- zUC$Ram7${u!nVuBCybNt_olIYXJLGKCR03&GHU#`-u5@+F37}A2*C)_?u)p+XXsFO z!Y(h8jukBBvVpW&K2h~`;PJlTJ9|R|=V`1}0g?BQH8+c(RVOJ9mO|#&>Wl&e;)UNJ zT$($Aw?8Z4$Q-u*#O~cGiZL?{G!wRL+%p$03&kdzxg_<$w@fLwOlkJ(z@Y5BQ3CyS zX@mcd7QlWGO3^r!jCLB8uxL_Wx+^9ehZRPEU?9gGBr0yZ(670}EiRxD>(yNhw_T1A z9xk;XT$w61yewL;j=`m5yG3|fW#KMf5aK7JYX9Bg%Wg}>@XrB%a>m)T@X(c zW(+Z5AG1$-L-n>oO`>!(WA%cU-fU-@;T@8 zzH4t3@1h?0{#NvcEvE#uaL0 z4vl@INE0KLd9G4_87=YLrwX`>%GLa~hrkY1O|a_hf-C{p-??@M5|$kaJd-K-<_Zob zEa+OErLZ|$^B+sf9JD79rjdYGDC|)=hqDaHD1VnFe9E@^%p((rwk|^fy+xl*lI|s- zHN?eJavof;@$~y-#uRm+j5Gb_R`}>Q|FBIlT`Q^>K?9O(!*?kpMx^^u>#c+9Utms( z#@S&gI*Q0CDP8-p(SW1qt+FD!=&!)Y9N|HgL)224EdFj#-Vj9>s+7RfcZ(}AoOu23nnvph3R=0t=pD|Hb33^(`H8=@ zFyr_&W&KjAyBx35!4yvI5L_Hb6FXY2T6j)atArnTB_@S4wye(QlrEtDP|~|S!yY=x z+8ez+YS-g;OSw#IAS58zD5Y2Tc4Mkv$@|`8kGju2TBgrrT-kYhMa!i(PWA0nQ=qV7 z3NLVv`Q!QPCs|46VeJ7-Y6qY~hXu{%w1I_`U+qP!lLwtY?iKhzo~ zxeW9gPmu(5fp3pDsj0$o>SIMF!gB-BxW9*klMEU4WFW}C#%t?)ejNyAiqL-c(F=1u zw9{yb?`0hM*6p^H{tY@t$GDmXu@5$t^054pVfeq1%#Mn2Vf}!&EU>!2H?}u;;uN$o zwTTxp?lcmuY)8+N(D0r!yQCaf_B?LannA+U+$bgf&UVj+fcVd~e%oTWSuaEpoYXqP zuP-mjz0deBp?V*?$s@_4ay&PAB7;5<#n1mF`F+}kInmmdqisk;{%`?Z;61EnsO60I zvwMXI!Ee=^r=x+)pV!Ulwj#B*YUs7P9_u?X9i3>ywzgs+t17PdKfU0m4&yL8Hs4b0 zd1r_0u8(D;a_{o*dhcf5_TsItz<(koivF&!7jvI8a#q%)lGgS0B}MR|PsjMALBBns zHopj8LY)r%wLYb8a}MRC4(&ReUHT77!Kr97%M&H|j|;E-Qk~6yeFt=gWznuLnQ7V#O7;py{XSC}&3zVP z_-S7}lxQ8u9kwUinmw_KLRe(+$hc^~XyqYyr@u!gy3H}DM>R7-!?tD*zMPvtNeMpN z;2xs57cT3wKVn=Y^`ju>4k?vlN4O8Qn-IUs+tK0Zns#ZNKw+v8zr9CP?|)`i)3n-fqE????vWK#2$- z_QDBQ?QTmOC`ansBss(WiPe`nR){7Rq0u8?-N5Sbio69)t0N#gAyQ`Zq|xgl!jkdM z^_S?GU=~OQpNJrknKM(LPiF2^DKUtyG$=B4U(Qja^6=)As}QcwQU*G?MLu$yx{0{s zyaiV*?<}wrAO>NQ|B0Ax6A#L@m&caEGU2k99|;H`40>cih z1XGjyfPlH891Rk>V2SXL2ZNBpZjWgYd!Z3K1p3zO08|EwARb-B1PdX19 zby&-GWH)SZ5g8-iLcI>C{5 zQf>a|g6!i#<2ief)BcY(Ksk~b2;KFTbKstj#!B5)1W}j=iTybi zURJ9$tEaD9)<6G=zGq^>S+UOBpMM=xSGU|^_A9g~v~gG;TRz&-x9ppvG-qsJuK(;; zqY>76r=+eTMf=}BtW=3+exdGENzu`5L>J0{DEG6PBkg`}SxP0hh)pWq5aR}l0w-mtyP8D%M|MM%YByxEiIV8xRW7EQ>XE$ zDWaVshhfg6K2tm9?ypEu>HW07$8GuKmkL}dJ_u5BvmuYKL?);m0GaHe?75zZ2)c84 zvkLAN9?YPtwf5)kA^~G3A?Wal&kGMatVzR}mcy@PK1}D?k_^r*TcXuI)tqQzOcP!) zn@l7Zxp6;+NyK!SK`b^0Zed>{7CjIgPRM74oQYFuyKJ)-2R{m>xs%>9Cc}@0vg9M- z+pUOjI>=vvM|t`b-9R7y(-J>RH?p4}ojKn6a6rZPb&2HW)X`7wPXxdDJ`ua$ajYgv z{JKO!RSC`=iG_Xps%P}k6674QI#r>LFgpM3LMZKTcZfKDtI`EnJF-Y7{<0zLX{)d- zVirPhXY%YYi^w6IAz6;=uRHUHN1X}|1KM%IC&cTjegz(03(q5+{AZ7t#&DkG@ZOL; zbg2Bfro99wiJK{*9Y=SIEf1^u?Xb3d!}`;8d+QyvC2y%N|0Pjp+VC?U;I)PF`{9uZMY=b=pF?*Z&-}-pmD6Q~Ukq`mW>9GcS#0Ud72H?%45s~Y9>C@{^XCh2U>am8QRXqCAuG-?y!1uHD?${%8R7aq7wPL zWS#}8P+=Ly`HE?7VcjnCscd+oPR6-&cgqxi3~fgrjQf87ptro!Xvr~+)GwJ2a=%Kb zCZ)`!);qxNGU`+P=S<{Zb%zUh^&GXd_YfJdw3FzMqlWl{boI?P%YHA2R6uObjZxRz z2FhnH73JBFuIk|w#uCtY`tFb&GkT2;+Wjj9IYezr@g+{*uHv5o^8OHpsdhqK+<*P; zsALptVHIhwf3*LMLa~iT25x%uK^VjBac6uA?KQs1cM#xN}F4}xhFvzB_t55P)BWv4>ktJ0U?bVt23uiS$j72}? z|HA9(d8Kb@(~abJC8V~Dg#EtFQ$%xW)t)mg#jb|Yk_J^gwM)(}=bwIce;cC2OS2MD zO5ix{Lma5eIp!noIeyIjRBI~qxsWB?(Ze?WU5tUE!a+!>yHTw38XN|PmFrc$4g*nI z&GUce9;sH`F7z<;JpEbK!5tq&BMQA@w`O4b>E|-M$9jZapbASrf7k;PrrEy|H zIX}*Q;yeu% zmpTkL7iGatMCw1uX`aeU`>aZ#w|=eTylEjW(~>au&3w%AKT}TzAH2)*`i>!OJ52X&iQ4CIt6P$Zd&@^PC|F`0oTu2MY&Vk;OJ-#FscLP(uwfXZkZ--cYI>G6tV-u-&A0VCKu3uMlLq7|vBx5AwEH z6#?x3TRtnG`lRU|kuLMi%zHA`W+z{_$C0c{v=wpNhP^Z$TAFx%uOxS^wejpu)9W-_ zn}v0Wp{+1_6&{ubYxVbDH}ma(c18_?#_bJYPVVI>Wdf_>_r|os59h#}O0FMaK3K37 zX-%#9-gQ_VwuGN5USbKSa#J2)v`@U7LU+{*<(W9f+k1F<_gUh{P!fSzu)*)h(-?Jr z6r)4>OHPH8KO>(hgb}L1cB~DiBVbsbJ{_IaBZ@tvg$0GmJ4$y_mBhKjA zs-@lzWw`*MOYQ);Z+jpfK5r=gjo1SluyurY+2DH~DEpnQbQMt#BU^0f73ndq;Ogs= zDQyI-1m2Wj<`6E!s;w@c4>7N<_MP1@n>!wD4vb@-&sOOqW^mWhgz^Y@PvgrIelF!5 zjHit!kgqJe>k$?NnSD?$6k2H~2|t(^(QUfN)O%dt1Fygbe5KIBoc3ADvs8RQ+ULnT zSVNTC-=Nrs3;999hha2m_d9K2^^=?Sv{P^n!=HPRd55FB1-ePLAEK$Qfk8p9&aU>I zShsAx1ZT)0AfVrlrU;mPB5>p|n%HQVY|w$6h{YDZ3TH!czt~E3=KFZYUN&b_DEFAN zML+Goci_RWr-EtcnEPtaUy+~@khB_C9#dPY%|{!kkvk*lq<`NhzFKC?buwXxrE6UAi&WA z)+2S|`sDUu?8)WH3jF@lq}gHqW>**ao!zP&ZFcMy%VapiOzTJAZsMn>@w~Z16IEuJ zLzb47IQ~_#^NRR>93bvl`soE%+q+GNy%zWZ;(Tk4BCPfsD+t8E_NMiROct`3FxoUu zTbFPYI$^k77eipwz=+^)ew+g(enk(QCnFopGI5XKajxDHqSGeFZJHoNkBh^qeJjPO zc!CdO4(r`&ZNu1`r$O-U7wR(2wYd_uAMrIijPYRFb#VJfkMUrD`wtSwz=Z<@4%Z8i zLRRhZoeF+qJhzE&p2#Cj@k}Y*rPJ0P{SbQ!#k22)dIW{s8yGkUOMl?`^JdVBdgVod z*r^&ubeqxhH=JoLzfjT@LUE5#i0xzXik)x%=I%+RNq@K#+w+?K&J%lr>0q34j`uqu z;v-(iEw+0;xz5T;Jwtm0}eu%#s`FX8$$sG7@s0M}v*& zXd1!SrN+}uFVW=>c}f8clQkO+{W6)ZO$t^J=9AthhiiM8oL4`FLq~y?K`Fd60v!>< znmk@wjIfpA{p_d9kNUvhQ#7|+oUYh!Ai0@qyua1I%qI}`6NJ>{N#3qfF z)x7-VJAn;$xF2!}$Hg#s$QBG?1rHj*EJDg7wV5WrW<%LwN^ukD;2(2&>2-)b^)5gikT1^u zga3f+yK~RF-r~H}^RsBKT*9v~ffei5XLAQgR1T`j^(ph`f<6x;SKJ2O$Sa3`wzeb< z|A1cfos^Ib5?&H{8p=}mC}ol&WeHdCzoO;9G3&SCn(4>UxR9%eb7FFbnQr`0ilfgX zN@Z<{W!6hOwJZDjRfBPj*>?wTJTY>OXeLe)@8=3X7S=#RL`xk*B27LKDlM%9Lju+S z@@xO=HZNL+nglw1N$EOpr$hDa?6DWHhCjdi4D)mmAz9uk-)?v@4XfMfK$IyDFZ6I_ zMeQGrSX0t@r?0_!-j8$7!<)Cih9h?R@Z*z7T8wsm)MK9DdWi2jA+i&P*y;WlNn}gg zEt+kkYKbzTpxfLDxwoAB!&Rknnl6E!y#p?+1dDFlP{r;>5%}J*uP>U&=zE!VB1N%k ztVxpxU#$#O(D#B*c=5pYcPqj+qfoA>eC(v@9p-5?;#}pL@lJWcG-y6O<33%b$_QL2 zXVBa3CGHg%Z&s>GPq3h7!HMA)4ERyy0eG*>yL`YLmQiO2Ch@BX~(dvN`&@-^rK6Uobj zQdzKM+i>IBMpv>=G^ee=TOmR`oR`Kmr^`YvCfh@fbN6g@{ig@e2&YF(Q$K4Cb5mpr z*y&B+&e>^;?G`<6puUOQ*~v5QBFAlEs0ONhR!e^z6K8H)p?H*IT(ZadhT4@Uf7xvK z4R|HDR*JONbnsUff8Bij4}Ny(@N36|e%?hCU5Vf?D+_*qQWDJ+?yhOEs`v*vl_=N* zDwM9k2+Zcja^yzn=H{MqJJ`iLS7LfO$aH?FSYGa12|R}rCcb<=5B_}}bM(NNAeo0| zj}1g;lLMg-3pf0HB^V_#JFi5AV6y=pH8aAIaPIohEmGeoc)rY0^r~OLmyN{P6Z-N7 zExV&}ZLTZ1J^R%SNt2|drDZ-_wxEQ-&DNk3p_>ls&#Ro7h4yDK+|6n4pKk&-cW#97 zaOz%c!M%@Ny#vu}d4wR8i4luj97T74>S^ zXAOxV6BN78Xet*>b@#if7CEG$Yn^LsGr0u^v?$+a2Rrw)H=^2tUVZd>kw+!L)i`#s z)(Bu-6?=6Dda=7X#%nL6Scq4y79!n$V6#%5DsT{h;UM+w9n*uCJAwXLHwk_rAA2Rg zQB3705Tm)vE*4HT3Duw&VM0McF*$jfQO2j@2@J9_aT%Lo$00e4*cR|U|C=OyN+lyA zChl&7J*03CrufG1_40*Bz0Lg<8=*;?TGgBr^yQL{Uq(U#zQwf^^=E#cZ}}RXe0sU! zNA`t|k&o{NUfvAkdyGmK#Fd|2 zBrIoDi0@Ap8aSe(qiN=Dk7hHtLGYnD5geCyd2@1zI3uH%yWb+STf_*_(|Bw4IVI-v zL{2jLuc1-AW1FYvU^#$V4u;bU+_BCp{y~T5%zEfi z;&M?3IC=cH>@6;~-TqNMFqXWAB)crjxz^j5-Uz5h>v5UHd|+(QO6yuSAv;5wdqUlA zIi(dQ9&pf00cYLpOKW`dVI=P!375Nn5>q6qNGhw?tJo_zg#{?}h+<#wrQgdF^|dxM z2&BxO2gmudteRFTzU6E~>^;;Do700~>*Px~_6{CbuiEn<>8XNnM|ANLn;7?xp!-*x zFnI6@0gJgMI&V}ZY1I1IArJsp zpD_9GNc4_rOXm=?Uq=)2-o%Pt{&+ri&Cz!n!tWPoRRj=Q!d+qn~^qj307o#~k5 z5>KI*KlTUhpIeQ2d6c$AU^iYL1^`}Y`Yp{rui>W+|sK98>Y49vUz%%0jMjb~SJWJvlTlsHsyc2)1|hlGb` zq0US+TIKV_H4Np!^W~D=`k^id9ANH~qB*v*;zSwu%`VISX z=u6OrSceBQ!*sEJ>=NzDLhUsS?`_7qh&?{eu!mxur$a=ujziAA*oO7v4Hsurv=&0hK||1m(g zMAi3}iG_rO#NN5y1~!>HZWZ!uANWy3xY^%qL+xCe5s%8IHk1(ip8dri5Sqc zqXi`WHiWIQl@M7yniGD#fh82TTiIHNEyVz!xIX$eRWz>DHtRlR!W%5@#qsMd+CcT) zL&dq7-~>=h%y0Q(+chb|< zc8TJ}Czk!&j?b^+On=?C=h2^;p?%#QH*nn8B8VpG{JOT_6&SQnufhPI$bg&o9|JbadbkNi2J4-A*r5zA!0)aVsKL@I}yASL{Cjt{Q`bc#vm_Cn_o z7KTrNQzmZV9kTam$Mc4$Tc=aZuQYCIoS~f}#{%W8!T71I`v}~soSr{XFoFDfJ?Wgn zKrI)A1B$LSxy%QjWLtxXd|rr$I(#G++O82SnE48w!^-RJl+r205Jjbl(j7UqXqnQqu7TYuzZzyN0(5t`Qo(fijZjAtX z@@*}MHi0oNjHAL@sh{^Eyl1Xz&GGEF6e<~i1atx3bTA<;YQY?twi4C{j|jFM*uLjTnvj{M zuF-;!#zY64duXnP^!0l1z?wW-{cF)G5$`g<;!&Oo1=~XF`xr|xG|*s1yUazTI2^F zJoZ-VDz3yK>YWFmURv8aC6gV;4Q+IG=|YQ*uR~ni-2Ej{aLB1WwH2IyxBO-QY+ui4 zlkjMzoIY+k6`dW`-?opPZg)~9G| z%2zxiV^8WFrsU%-mRoNX?T05ce>QY{@2$u|$G_uIzK=+-p}c!EK)>?z$ylJ>ojTTDs~MHCS@i9-C>WfS zJiF`+5w$b>uNUBbW~<9#rSn+p7x?|VKRGJ-o4|CkdnBos;dovVe#k^?1UvhTka9#; z-5J5pG0qg#z9sJ>M<(UT)GN~eb8_(WX(2!|ks(Nm5Oh^GLf&DSKAN%&%To13qiy71 zl{aXTrda%==xV8lGGy!egcs|pepRCscdLulmpH0^vmU~zV2CZD^f=+?T`nNl9IFFu zjcBm->%S|+J|ALv9?M$E^iJ(9_%*=XDO@#oxg&?}$BcffOFCIXMZlUegi|tOo%Zx1 zXp*w|ln73mSmj7CX>$k!&4FvcYwx0oTYG18zHJSzOYg^dZH0oz^80`ea%#p8QUIZTTgPyHwzNByb8e)+DYY)Hm#rRfb-6h;@=Wye*nZCYMo*5+jW2F5y53ImC zC*#&>H=9di+a(rlwhI`u)#d%BtKXJu8da;3yFeR*73P#;O(5Wa0%$g$$N4Dh;!?0< zBqu65kxyxgG0@tM5kM(#r zds90GL|6E#IZM(lny*cXLl|}e>_-uz_(h=B>C`O#X{nVlX{&G5)}R(_o#)fa$@CSy zntZWSo+Q0*uj8gZN4AZle8W3P5L14ZuC=mSWbWqEmWs#c6&YS8ekdOuxyi5bkYJF8M`JlRfr_BkvOyWP9C(!EXqYkUXHc97_Pq1HbxZwVv{_tA- zxzyOKwa$2(rqZBu6o|syUN_1K4{9n!OkV)b=<}!$s?;oI`+3AVUC--cKYh_$c`tXA zuRl6_6sSkE+O`ZB)X6NdY#DWy=s2n&8Q;KyDjnK>Nzl4)daY=m+<%$!pj{@8HCn3k z${#Gnwe>=d2ZlQMBX5r9w-w|wd1QcunpDttXhD}^t30F2l%9L{a}4Vdu*~@$y>h6-n)f$_p9GGp@QY4zq9MMm z!EP4FXf4$~OCCvG5ODG_e#&<8I6uOidLE`n<_s z8t;N^>tgF7owV|%ILel6SYLH{0)X)?F{_k`jBWX;5v5LoQ&)LqBtd7!?DMQRPou9L z5g(r;jCeb%R}yuh$GbW6y87b*xMoN5&E6g1Xzf~6nsezAhcx$9v`W))qEU~D>VUKqDAGT> z-x0s)u}{$aZ7aEDx(}F0OGmyDxwG2n_$|a{W&9?S*5mwwe|vZ<$G4q$FX^L^T}9ZPR3V+2;NoYr$*ry`8I) z4Z>His`e&*_^87@em5$3nR*L~F4z4TD=9H;2+$UhJzUE22xGB@S{#2Cygo5yW*$4w zU8j~h=s4OUa`tZM3qI!Q_=Bz zyuZ1?GjqMDTH?z@U0p+eu525tX)hKK^OxZ%ObQJ;LHdi0Ac~5oAqJURsN#1K6joDj zG1ucI_E?m^axdVG`1`Yov7xMU&>d6;5bJ>)lR3#`ns+XT31O~kI?f0{mh~-wmdo>q zuV{RkHr?yM(xue6ECx58wNk%MOWXLU(}_!8zi^4!_u(p)7>Nwy3sBUo#)^V!?cU>ElU|Hj8A(HQR`y>@9#y|2;E0 z5GYowUw$GUlnVm>EEJ}pTdU4XHrvlyiywqWoT{}l89>fG#>)MeeMqk;&a=2Ym@&`w zI~~$#!F|F-wPxYc0~HfXtVK)aVJGUk`v+3j=DVKN^-ni@SPIz!MW7g|N&O+?%q+vB zHmvgOrC_*g(EJFEV=?(Ripu(er*U02@|BK?_IXJC=gWba%^z!@y*)>x9I{TAn-$K} zHmN2_7G}~bWO(Y%#^IV;d0=woXJ#uNVGge+fHnaMJ*0LC z9~id}X3{z8q-2fc+WT~)HnMEw%b*jcLl?91)DiJMqdP~l3rI{2W>-b zs-?jnXj*KO_U!r!UpfnBZX4_}Dz27{wb1~_i`EitIFO_8x!-B>SbW3}?2~y(9J?j^ z*u{_@N%;BmmsWQi`s~EAd&%8SJEDo1^zvrh zZ1JoSJ-1Y|4>waSY9iCtI7J=b?Mc9#%PXH>&x`&ug#|4-H@4lyW)V5c( zVS&L3u5{bVMr?Pb<3?#hV2}K9$NJax{JN|`SEu4L^^M=*g zxi_W;lr)|?82kkRUgi!!IfBcw)D;~+&h4^EQUq5S@a=HEv5+>A!E>qNrPGaHQ~9Oo z01JkvLO|Yz0t?JHFt@0z*ILgO%bm*S@(RGN4G-J^52hZx1;F9jYEG=H%fk~loA_;b zv19e=Pc0r-%W!G4)x&3P&T^H3!q_%boxQxEJVo+6(}#sRjr?)Luf`aBkg98l`6#~m zR13=7N~uaK;w>59&ei_q6=_TGS3`c=mXY-x50=%ocj565P||Dk_zPP3j9<(?6l~#; zr}Ir(*OPX-XZcu)=E3A_YL2iy0>7ub1*+%ATQc{%t7iq_ws#!;L>i0Am6auXng$sM zPInt1^{NGmzD=PFCvI?83&J>SXNRE6LBf?SQ#9rysmBQ9_)&ID(EBcsehSy|VvE4v zf3+`FK$}asPx8bdsW?raj&5b>e<}AX8f9Y zyyi&hjM}vmqKd!`%$ld{sEk(H;Al7(I{C?b<{F4pIJQ(i8^9;OBmB!JmpxzZ(>cPe z+6PIiNX{A{s*_aA`SO`@KYz}ZKf75_+0uikKY7Lsn#5*?sPE8;ySu4* zx!qq96I@Sy{j8^pCBwIrKtV3oRzv>myLaf;KkPz+BHQc(D8w!v3t+jV~o&Z+fL4 z#4nXL9fZg7nsVPxjEYR=uroozQC=4*uKr=NKxVKgCgVdFwupBS+0e7&y2_MsWu zi&4JywrWuTp_y+!3>;fm=T=NGV%8VEG=1(GUpSS? z;}ac6-Bw=8nd)vE*)*MWF_Io}JnUV(;90q~9W*WvlfvJEs!_RWa?&zfKJSp86QG|; zy~?P?>S%fSk+31-Z}KQUE&xaTS?aTckXafBhS|iXHW`zj0NP|zF#^J@Oax6E;%-C& zGl!?nnm_fT+3a+uRz(N7fcYgZ-nC(cYkGrEuJ3)MYNcihkWVjcHZo2=qg5V?Ky0+i zYo#V~VM_pZ3_sqvAyWKJ-Dgg67dNshrpQ7bLQI7AwG(QFwGmahipkAA*h{1lDq~wh zIP<~rF`rilLTb31^%+31dB)sm*6J)WVVFVZm%QT;A5N;;aMU2A-Oa1m&V{<$;(V2B zPzzN8%i$oj)LrF=5NW*Bg+ocq&c=o;)Gl#P&0Ay}DP(pc)t7pK!X|N8 zyzVGl&gP6i3S@0DlsqcYP`bJ`yelmEOJZ?$un!PKY}CQ$7=mp(+Pc;TM=yeS;c1$y`AH$%eLJS!PSBfdYDnK|zST*-jY-4#zRiA}0k$mi?N6ql z;0Wj_H2@sVPp@B|;iVG}DQpcqTyG`g`zX%e)$KlsG%D#Zwd~A>4dR|oURU^pbczFg zb|{lDYzBtXm4H@6?!ODg?&*p>bdmo;us+4>wy`wA^tq6IVRq&Ux8CLHt1I+zs;Jasb zdO9hL*7)w%G%KERn`eD<$Z2gc-dWtmH=P&n3M0L4NaH1ML1tgc1Fir)GQIior9cPB zG!KF>%UIG4`O_PZ^7NM0C^MHjp1+1oN_dAfx_xSEk4PncygRQGZM!~HPvpo;CdUG| zb)RFsFfLP_Ko`oy$l*}-u&o*tviP{QYVGOn+aJ%#r-eGnWzLxORMP^8NZ)`oKVcot z%5L|M^4cudhwwkL#Bs$2TdTDdtF&UKezpi@MXQ;ih$!KhYdE|ufFj|JfV4}jak4y| zK7slb=>v^RRyCc|ERzyOmA!h^4a#nRMNL<#4Vu;rEHw%vlh&Q2A5%kGd}?foZoW3~ zfG`~X{B&SoPkr?>d|%FLwLEJfrJ9{EnA2|6Xn6L`(W)0}yYLU==C>6g4G(wQdQOZmL2i^jJ)?Ie9&`Wx>*a zP~SDzv+Hlr5h^NpPhx?!Flva9sW!#hNlbSE;m9;t9Vo^Nv+2qf!)feJ_4_?)I50p$9PRwl=`>zE z>5RLYMgLa|>_FoEU0LZsVA>3)(&TlTbG4-XPg4__&6W#m22zd_O7?o5V9U+~onmiK zDa(*FOLcG(X|!#I%=g)ocIuR#Yp=j6Z@>DQa9m!P{lP9D$1<~5QAkT%l4mOJ?0HKqUbTfQ3w$WKkh21>-TZ4&Y z7pyIBY5_G6f&VJO?Ioi=l|+5_SHl*GlT2O(%1l4NFtZ!%k;;}sCKVSNfX`m4@!nun z?dr*-btf9#iwN z(xB~lS_Sb7gij~EVI;Y_UMxOvtDa%dv2|>QE&9GtS~)FKhXrF3G?|MMMWH3gwU|_z z;u|8)5psyEU-cQx&dhzgpMu6RrfmdH!8mH>}IDd12C zOgz?{#4kPLU+&Mv^~&e3^}*)8#*NH!`O&aHCV+SF6z1fMu$zxLeEA}z{3hWXosym!UTGk^;5%fX_1j6dJ(cT}& z9VngykvO^5F6X*~mW%n2!9U>H^3+tmlL0jLCwo%x#a2Jp?EdFQjJM?4Rh;jCHYHcK zdQA_#l2>ZG*VD}?QE7*n>p&j{!~^dK)8$@nh_>mcnVr`ToX|Mxb~>%e2#lUp`|Cv} zRAR0^GN-6)7d;8P97AC=X>1moSdzazi5k=1L5NT>2F0Z0stvb9X1aa3s<)1bHTSLu zYe3Tt_-8E>`s!`DcxfS^*2Y3)07)iotZ~;BQrT+HX>OC#*xrtU@=gq+pg0stxxb_d zwKnV(m1*>e$i>39*s7AE5?fEI2TrL0@u8bPO^tg%AtUyMWy5U2x-gWqLAj(l9XIuY zs2AhKN(&_Pug2za+x_3c1RlA^)ehe}lPD=g6Km5sf$0*Dh z9!OPBbQkj4$Mgx!3>s0qx))iG&b_2MWXE(p@w+QkSTt)Ku`+o$>Y_MFqk@enin84X zn#dg0Maq)cHJd>+Fi5x+CPyg(N{DK!ozT#+p5Bz=*0MKZ6p|Sdy?>b^Qwj3B`(I=2 z{asCf8!RnyXh|f3kpd9Jgeue}!Z8Bq-mJEmF@?FWwbkekFmUjI*5Bwk7@>W|9XcTZUyOA9{*v?yMu@(F~50@Veq>~sUEmn11?IR=4A5Ca0 zf7gWwD6dUxmmp@MpNWi>-!khZ?99}@`sgrWRVZ)J+v--h<@EeuyXZ#B@|?w5S)er& z`VW|lb@(G!#aZo`SjA>*t{Ae>)Wo%<7I6e(e6+yo8*()nU1Z|(v1Z7unA+z)_LF+Z z{AAK1Ii~}hUg@<9-K0rdpPhD)Wr-CDzQ*dc4`!|KFJ3`@(?wV<*ZlfwwLh&Vc@ z5#{3HVfD2^vs)zy2K)nm!>yGQ+GLG~gL1xPcfs(jX2)|4+BcSLA{)bfz&QC<^#Fs?>``SMVzhbeV zdL{!>CLxzM%oNYyC_6QqAzU4=UXJWc9<~Dc3h8{Q^oJ$=HWaoYMk}HSTwI>l^xM1@?pZyG4XUIQWHfCn#BSI#GKc{w8xv5;PV<0Mt0!=$#n~D6Q>%6E=;d;o7C#?f?dD-?Ha|RbJhLsP^&DLn*oEP8Bgnz# zr!b`q^hveaxl@@ykhx=)PA1frlH6+ic+D?zNUpEzJmBy_v^i2RM@0R{ck)dld%#k1 zW}JFnf(%}R`vfRU{sAHsnLvJqg_MjBKgZ{2k^Gl2{`zi&0yv}y^UPYZ6~Ex^vcPELu4B1rA^C5hx2hql&{;`zeIk4wU=)9LQLP{S3s*CTwjKaefuw)l1KuGO zMGXxUk6E|R?NR`hq*c6yO{!R@2pPzGp3Jq5O0X>6G0qIt6+Xklb(pWcm>luGXVxD4 zKk7TjL~~uCf=>*`dn_=c;RoBY`2&^A8(xJej(9n2(D(`xM;Vd1LS{{9wdgJb2e6#X zh1U9sZC*HGisUn)JL(ZPLr{R{*6+15bkBe_{S0AUX326T8iUQVF|wUEjLQ-&tR8uN z9*7&#WfN4nU@H0VYsax+5>xhp~Z#Fu>B;BI<#agk^L7@7cY<7OQGB$N8$agpwmQt z&$aDwAEY2NRj`s2{yA%X>cfGRlta$HBM~9@*y{5r&X_9bpX3eHlOfAzn?U^ED6LPo~(G$J@H#K+us~flT&Tw zy+`o>=)Q+d|C}eGAU6qW(9V&ls+qh8n9?T(Xl5%~E?*Y#n67cCzw^m#Me8K@DI!U3 z!zqwz<=4w3y?{7Y02r#Y>NK5_iZOJ~FzNCSu)X$dSGx!QZ=8JF>UH}~5fHBTpZ-Gl z=K1NMiUSq~?}sZb{EwEo&d+mxl;ZMu%z7>6j!^~2RXQ=BlpmtfUB#tOlk#c+>6<)E zML8Bu7A7J$}F&JNt=3i(xN(G zZD{v3nGP-0?D)+ok!F%7XO6-+VHv^X?;n}|Yj+s5)JOMe5W4ikZL--~4N;W)F170z zFMV1}cdu6~HxW;%hMeY@YDY!lZD*<3 z(Qk`fh^>tg+6s?O!>d&Hia@6N3gbM5?E~u!iiZD^*n&t1We_E^bN^8kkSm_;Zn0y) zg|x}?HQIYW-EmL4{B?o~cm0h1uNOdyRJlMFBL|fka9>;IXF>%0P#dK5=5=Vtlq>im zmJHsCg}(_In`62{sF?GP^4I z9~t;{o2@gB(FqCrm+#A(ub=AVF4hmy!lSSI=*2=&iT`^IoHN8)JNtmV~1Ku8S1Lr8H_EKvHrc$3Cn+%aYHf*w_M zA+LaYotR0MI^4XpaW4kd_WY{_NVyZmgPFs3sWxE(Y8u&vjG9i-K+$~Qs`={|5+|K9 z6$^_&hxyjqH5SmxZMBWGiFShxI&BLG(m%0@C&x3}{-}^zKd-=}K19j={0QMZ&vM*l z3zy>fe*sJr;5yNU#pS+J0^>T);gieZVjwJ$*lFGISC@=V`-sv+nKN>(z#th{$Frvo z^vA2uFVn?JvDkz0eW~)x(^e6G?K(ht^vUJo2i-8b&Og)CxHF=~3-eXmcIRB8Djl04 zC4G1N4S}Fb1RIm>NpB$ysmtH^ccS930B5?<@EYj67%^W8FO{oXNRv*!Nh_01?U%LkduJT4^c4Z~Eu6v=x#=Q*1wGXt7(30Ob`i6mWMn%s5x zzfortc^FV{Z|L11@Z;~lPfJzBD*RF2x?b|~FflYM7(j8uqsGKiYb!toV|LzM8 zV@k5#hn5=S8D_gRl>8J8T!sX^_7ET*;V@^!Oi8?$kFVy%+09q&$0>G{(?ZKOmTwHX_9u^q7)%PW!ah7izp%XK-@%%C>LK$@ki!mH9@BT%Y# zO=BQ{29&sy5P9bGlK$EMzY)@?_E5v-u$%PSB1%20@3<-uFZty$z5TJ5x~FKIp9WO8 zrOK%Bl_60^jNXtSb1akp0a&5m?t);Rwn&1)!3GNyQt_ctZgV#TcG1(Bd4O?(3E-Ua3}2Z4gT zMl2@mAL62zsy~$^M;UmRMcA-hN)+)Pm&A~vjb#z`5a>>e_o632>vDuhrh2|@|9BWL zdaGN80eRSee5n1Ko}>SuPmf)x!H;A2#Wc7`2bY)_J_!eI#I~8RGt9h<-Y>JGAB>2| z%>_S7k(x0SXcWD_<5Wg{t9+)9P$T0oUuOSPf7zRcClim`xF%KKDR!m`c4rO6^RuWREVJcGZKZ!BAa1lrV;C&Zpcy53sYWK|m5DjS~&^O`ekT3w$S4PL7E z#vivy!n5XxyryHP9P%GhA^QGPn?AaGOUQ1iQc75h7&3pOq6q}!zv>dZak;CE}nXZse zN)s=<+)SInEw<`Xq&ZimEqUzceoULa!7m%^)BLt?dVjw)WlxZp+sY+U$$*+}8SM^p zxXg0M!4KPN0A%n#8?mQ5ZC=;ko&>Xf*qN>tbWMv&4)9qm#@d8AM3m=o))&`ZzG z*OkUnVkr31t7N?XRod{ki$Hal5)JaCx?9jX{9;kk6xVy?N^>meDwe%WoZvyZiqfm(*+0qjW~M1^zUjw;ND^PSSRt2mFFLT zsd&%WpArCc^72g^39Ju}5euq)A4{`mm6N4D`65YrXsXTBC0sNb&utA_$1Ig*tw@Kp zr@>;?;U}|}6Az~XQFXkilQ7vs^$_yd{+O!UIH)PDSK-P&1q;FgH(tldP1L`bz`;S^ z0vkNWq-?aAaI~}Vxg7SRtCV016Zc>9CHb=6YL22B@aW-}^9QtME_v9?Cth!@f`^nx zvDsDH)17#Ji$uY1tAa;IEV%`;gziB_uPAm#RFZp$>~JLXH#PHf&stOrqn4uC)(wh) z2?a3{y;(NN?|E}PBX#nG_!jv-yXi#Q&$y+udSn#)yi;3Sk2~>^(5GsjOvnhUz5IAh z-04YEF3kQ4nam=!TTTUL(+G1NW?`^TB*S%Mol#7CiK41$%{3@Q6iO6UmxOi|IxYZy ztI>hkbU30s3499}WwEV)IsW?Ktj|B4Azqp-4y+A_<4X@#%$nY{R&iw$devydbu*Dg z5{Gd4%|y~Q3QON}x_j>6DAL$A@qcXv zt-b~lEsX^s?#C33=F*=4--=R1D;+k1eGX+>S(B@OG<={^6LHB%_Ux(`OGqd+nGvzn zsmhKmqNnDV@rc-?;va)VU0_`5lPzC0bEmU-@%)b8V@G6i;(zpwB+2vsw)iBSKe|n}$?cL(=60P)iQ(4XL^Nc&z?W5RS4NbYxfnOQ+{r2T zxYt!NzL8GE%JP?DUfw}5V+KJqQs)yy=tUbxAKspn zQn`rg6kDnK`TH#RM|NyQg_Z#M{Ap8)88}7MH!=%f9;)F{S~3g_e0q`82@J2vF-sgA zn@as;slsc2UG7PjWkpELU<4IJ#i->O4U?SsIV_+>RBlXdQ`i2AN}mVdbC{po5?3qU zA@tIm7sa_EoB1kjjZK&DBu8$2sX8K8_sGQW_Z;PZUjlm!CtOy-s}Ce2JQ7#Iq;1s{ zWXoNN6EvR&`D%C{R1Cf<{NA>YkMLY~5XlTC>+ne>kPE8MCSrxf(($jC*OCFd z*JkA|L7Cn=M;j@afE_@j9Tr}@o|I9AXHotj9}FP$&P=mGvU_GX(|!PVQ@9t$%%_=p z7a(5{x#BSA1jo4^?*av^T+*%aMo1LgXreUs1Q*+FMr}mj1s#;1BW}miI@=?bo=i4B zWr5*GZ2ugANN1-xAr%`9zFB9qYXc$!r+)N1y;eCY=L>!78l2+S=^3S-IC*_%9iVf! z!Fi^Sflx62*KTeC4=c=p}##IZ)+femQ46$eR+f6}q8q?V}Rdp*oAu1`74 zHK0z0rT+@nx7PcD0qQ!?6HK)mtX5FEN><|xA&xq(n0zX4$7hNfcuryryWi%D;0{Si zNSs&QHt085c5q9k#p`)3zVZA$4hyS(H|74vK3N-8JDpGHI(_%iT;+d1oN=0cqv&CO zU0Aus_$Mt-F8^uk#MxXvVez$`|I`&ZzRv0Tmt*ya`d~&8iMR*OlbC=Sp&Th_qcYuV z;D+;pdk~)5ij7HF!p8?nt*BH?I*kVO2)GX_H3pT9qqxsdUq5)gG{N-bBbU<|05A*9 zzYXGoq;QG9RLY!HJ}DO+8B$zV8ElMxZ1`|bX~zPn$5ZS|$r=S~WT#y&+fzO^s?1xJxoi{AYg@HC>eV{uvN@<(s~Z_c`=oH683$ zh3-;eO>?*?Vra3v$l{2mq`=&J;c@XpXRH$JuSbTP=H{vLtByT(7keYP5RX_{0uuJ4 zJFj(stJmq*y&xrRaQwWQs(auj86C39vfeoMIVuwXsWO197Z7zz5-)%1Al~O1;&iw}y6tGumg(Ir$ADgEY7UKPb2bFk&xmAzSwOCVziJba;L6n$2gtS<7 zjroul4rI(H!wphf@W#tB&>KL<`DC>0dfSmJLWes882?*#bfitCuJ5bLuWCMc&+e-RTF$fr9$?eOBGD1LP}Ni9*-rgn}iP@ z5?hKF%Q6)ZtgNmSlM<2g?VCuKeA;4mD|@kX*lOTsRF19X#id+Xk1f<;LI-=ZM_`fk z^uY0q5!U_{`S2X96Wc(Dph!F_e7bE?HEzBfki5a)jNo_T30HqK+#`bMz6NLN4f zJ1N?zz^p=^*vif28Sfz#Y`eOT;f#6?>|>TNQ@UmOhX5QU75e-RfAIB+{bON~XomFS zVC0~FXqzVns3PuMRbMhiiZx%<@oy)x4(o_0y5FH{fh&T>>=|y!uaoy8d$3#XTAM@j z-znZziVu3Ge0n<|$S(`E?qRWpx6q7HT+$QhT3jXk8yQ64{6O-D zzE&1j!KU2EorfGtCGuNKWxJ~IDEAgZirIk2SOoE~yHV8&C$urk{Yw6XaI?a1RYJEi zlFOKylv$Q>Fz$L;II9IG(8@BYR`B(EbhJ^-=#J(~QTx$o@l7$OcWMwW24n~NX}9%J zKOu8|KD@~(B*Hk8vC$TvCOUBiqbJjF`GhdMC+}VWPH#a=Dszl6+9KcjUtiwB8%Z-IP*%S>-Lf4|TOQ#~r5)1{X^&n(gNxKME|&%D55+H^ zcX^YXY5eLD;p`M8((ITAEwn^V@r~K#_`1h7>AId@^g`*go4-;=Cv_`83j>aY&nBTJ zpZr=T12ht66L7@bgaKC;`U*^4Bnh)>U*&G+*`i+=0a!(`H21ccRX>DD=dM2C4?B>? zYu*6$5QmopqHm93f^N>ys>n7px7TN@!x^OLch*O|h^yjax$UF}Ko&x3E) z+IK*~ww93qDrz>_Hq1u}{{|_cc5*Z^%^so0=T2)ej=fjc61D8SJrYdlF(0B%deN*y zL+iYAQ)>m1fe*P%HT^iQwqG4qsj%N>8!BWQ8uDbSi=%brV0qlIaErwJg(eAEXk6rU z65J0+^o-qe!;p@i6aostn+MXc_gu-}LE%M5c<(|I5ZGTFZFu=#7vcH((_IaWSebfv z2Ri(CJ`PF(7OkZM*~nvbY)chclK=b7(U+Y(Muml_Mg=A6<4r~>{6|D*ffE0>C^B)e zLeYI2R7m+d8MAV!zE`O#x3Ag^d%*+EdFSoXPkgCM;OAX5mow0;L-Ql^*%)h49Q)MK z13id?IOGN*G3#)e{z~vc`Z&Swvw6~22&93tO@{$pL7%D!NH*bamv5s?tYb;%k<=p9?NV=#3^+YtpBQE>^cB;VRU)+^=y0_wc#7 ze&jm({;;XaZ*(L!5u+n9X5fKiln6+Y(#1QwPy&C)VXQfb2nX9AC=n{_*TN3wi zk7ur@PjH)m1dKVXBb9=$qja!z56$bT;p{VhBr8*V#Ok9rC4?XL&`ZA~P|KSwvSRaT zUSm&O!9D+B0ryEgeJ}-)l2T$dy>vXcskR~G{) z?^+7igY0EVnv@szp`@f}&mXuE#6wS;~wShOFD0yO&k~A@_PCxr6sG*R~ zLi0FIueRw)oy`lG-?oPOwYt1+=d^;gpa-H7`H{b<=WHyw4M=YVW4_KrSIBE1WfPS|BDamB z`))$S%Sm+GY2KHIS$5dxid^hEGjsoZZ1PL_Jl^s3n1v5!;mj*oTNyL!qRxw`1`I^YV{lfqv>3Wwp{g(fFclq zfq>jWO$^LX;V=0q+(chgDQNa!p;FFo4|xj?%|Yr!5mQ{$p!V&T8b(||BQ8ihO|5s8 zH6V}qyTEv1t~ODA2LlN??b_rG7x4HEDE3LXZWru#MLQKOA+89cG{ zNd>E?&R-n3qiftgT>s|TXJ7re$$O;anWBw3QQTdLc;gQnvxXVAuXrg}4}v#3wM`5~ z%6xFgLnrY&9FP5>>vVU0$wr~^&K=8oQNu+rlv9+|R0 zj;VSn=FEzSSCs}M*QF?VUiN3=&!4SjCA9hqH<4j4?!^!;dG3CEtwBs^Nz2dIXl`Xz z-QFWpb1)=DdD}lZa=qCL<;y1MI2Bx@d~*}%0~wcDqp~=`t}>^XU+129%IGQv`gM0J zyu#;Wv8=-^Ni)ye*YQF-KTya(A=(EwySdj}3LnMc#nQZg@ke5RjIkS9WG`>2i1)iw zc6IcP?`eg)+=%d3c}Q#hpIMimyA#yy`1d{ef0irYwkC6PAGHVNZkTQYp7vZ{0ej}q z(LPRf6EmKdyUhlh8sJueEJ|&I`q_Fa*5nVvk9(BrR?pvJDwex!qM@0z6#I5{M7xmH z3&Sg{Jbw~(u@wGcb(`42Vdb|U8{_MAFXAtqLi&R`mZw~7aYoVcpq)ouHLK9BJDK+}eVWA(w+)hzlZnsk| zeO%cSt8pzHYe1sqFr;A|BuOtru)VaDuaiX#`w@ggUqyrMHGk@QEKvqnU^eJ7=j?TP@5dVoE;4-gV8(^B?%JU2CQ-XEF$8Z8_1!wMRNvpq@$8k9r#nBw$X(ZdVLZ(?!_%HoL-k z_vA;|C5rjhq^vDB;?9kKbM)?T+84a$R+)uKPR$`njT&c!vZY58_f#bh!)XZ~t2DVD z*M@MpJxxpc3|6h$B~phyck5QOvCjziT>zW4o>!XFmRG7jkKGaxfp#;!c)mKuy#p6e)c0 z0`qkCr_!R~&g=ly3sSo6j{;bQdu={}Gc!KW}l&zgBrE)~)LsTdw5oQ&bsPdH-f|V0foqx+&wANGX>i)8AUAxiDc;Xpm zNN8d>J41A<4ar>Zbn{EPNe3n@mtPExN-0#!AbqEct6_tqhHaH=+hc!sRTWZT4DiyS zgyO7@zuN}3n{SJM>=Ajw9M2o0#>0xae_wMq;&$pip?OG#Uj<^ae4kF+~r@av8RA+zsEyt6D$D2pN!f#=U=_axjm=;~ttvMK|{ z`MA0X>A`IXO9)gR8#PTq8@PCbnCQe4S<|TX3NF(Dj>iZw&Bh9D0_Ud2#r)!|qEo*w zuO+Z{+IKj8M0_xJBcTZ#=Udf>-ejJgWBJsAlIuWdsx_IQi1xwG_t?F;4YZ1ALn0e? z_*|0pT!+`suH>FS_nCcC&t%6KM1b{#J1}#(Ix5}M1#s}inwe}smTr`tCa(%B`*0{* z<7R|)%w)2w=d{%A!J)uqllk1q|0@+>YZ-G@og$r<*}q-eLIs zoETw=MBACf8di3xVr;DE2`yH1gpnW$V%?g9U(7zk^_nrtuR|^E1X~WV>+1if94a?(8|J9$v$rn8TZduAAP0|Xt zEvG&_#J{LC+ndCize+aLew(&Ddu9K8RLG;@oZwHCe298mTc4oM>=7+miHwlQdi92Fy{fhcr9aZ|2%tctG_sGV*whk2kZe7jsD2a_K{x zq1a7!daL%C8ktjY<+jjQ52D*AP;({AcW7w1Z!}aC^_eigXg_axNujNPWI%2z*4rDb z8Huv4od0ZLHzHzQ-6Bo(u=Qj_c<72Q+_IH?RhL9Zhbw>ce;)VlM_UZdtPSV*YF>i5 zI}aa$W+Kp&J!vpCkpJ@E>g{(q|M0d-=hk>7+7!wyh(jQV5 zWtn3a5~2a$^=90Kre0=px7XW+e3Y>H-839>=IVIAN6kra9mzD&nTJiz>5m^cEuJy{ zGPKS;zBJBG^I8C6C?EyIR$^fG39xs{Ig)bbe6_dT2@8@T;nvQGP9#u%CDxg@VhX7! zRxrKiPmw@fCTuuuJ{I(5IPblQmqm4fOMtE{OO zWGw6utjm2j{e+P zUen>nHvGJg-V{zl$U4xgc+-Ub__xGNHu0w!w#TwAmk7t#T~)^=45R%Jsel-#=3LLW zc;{uE)%mHNnu?v0w`lM;=CiM~o3)#ku8&Dd=gneA4cNRpl{0KQ&#RLGEoMopLrD1ZDwjwa6_Md)}V2`nACvD z;hq$&{~Al&JCUV42~LGaNZnWW=gerD4U%x<9Oy<8Dw6r`bK+{|eg$i$6`}t(>3n|j zqXM0VF`&x3qzTeemwRc&J6-a)^c7yp%#){=q4$0kKq2;IvKbC@;~Fh3%mp7(&5gP2 z1Iy5SGOz&JJ5~H zNsm&gk}8xit=H^U@4|ybDv$}SRw7LSbIQaen}hb$?1?NK7;37jNAZ0MGI?wOv= z;kvVk%+)3v0{Rkjp>Eb&>YtCOCulXd9oXD#!|bKXqV|5Ew&DA6+;}2E`gHxr{B&kzJ1zEU2M;D z8JxwDqKch$DrCY(%DZ6a1Q09kJPM)~mrfF5=D0d-7|o7^qh(t4D}SocY=_hD01o~* zzaL~3dDKEBF}n5idIT&m7McmS;_SKy=vT=UtuDoItL!ZobBok{RA7 zr@VFa^`MB>dKG@70 Date: Tue, 23 Sep 2025 19:23:55 +0100 Subject: [PATCH 15/16] Update banners.yml Add config for SotM Europe banner --- config/banners.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/banners.yml b/config/banners.yml index 549309fc2..e7600ccb9 100644 --- a/config/banners.yml +++ b/config/banners.yml @@ -8,3 +8,12 @@ sotm_2025: - [banners/sotm_2025@2x.png, 2x] startdate: 2025-jul-01 enddate: 2025-oct-05 +sotm_eu_2025: + id: sotm_eu_2025 + alt: State of the Map Europe 2025 + link: https://2025.stateofthemap.eu + img: banners/sotm_eu_2025.png + srcset: + - [banners/sotm_eu_2025.png, 1x] + startdate: 2025-oct-06 + enddate: 2025-nov-05 -- 2.39.5 From f9895040014100a4a91b8fe92fa6ad851a4364a8 Mon Sep 17 00:00:00 2001 From: Gregory Date: Tue, 23 Sep 2025 20:05:40 +0100 Subject: [PATCH 16/16] Update banners.yml --- config/banners.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/banners.yml b/config/banners.yml index e7600ccb9..e20f99124 100644 --- a/config/banners.yml +++ b/config/banners.yml @@ -15,5 +15,5 @@ sotm_eu_2025: img: banners/sotm_eu_2025.png srcset: - [banners/sotm_eu_2025.png, 1x] - startdate: 2025-oct-06 - enddate: 2025-nov-05 + startdate: 2025-sep-24 + enddate: 2025-oct-23 -- 2.39.5