Merge remote-tracking branch 'upstream/pull/4713'

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 80871151fa501761b7a6e6e938a5fc38f3f88653..451eecc50f5acbc79ed7f86e184ab847002c11bb 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -37,6 +37,9 @@ Rails.application.configure do
   # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
+  # Disable logging in tests, for speed increases. Set to :info to bring back logging
+  config.log_level = :warn
+
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 522af1ca145ae4517f924cfc1d884d4dca5f1786..8027297d16e3138c50c89713cfc63fa80c46c483 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -2088,8 +2088,6 @@ br:
           an Tailhoù.'
         contributors_fr_france: Bro-C'hall
         contributors_hr_croatia: Kroatia
-        contributors_hr_dgu_url: https://dgu.gov.hr/
-        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_netherlands: Izelvroioù
         contributors_nz_new_zealand: Zeland Nevez
         contributors_nz_linz_data_service: Servij roadennoù LINZ

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 91e65e8390368d6604c68ef41aa5bdc9a722e175..57e0f48e6c3de76c8013ecffce1960bdb23dea14 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -45,6 +45,7 @@
 # Author: Toniher
 # Author: Vfc
 # Author: XVEC
+# Author: Yupik
 # Author: 아라
 ---
 ca:
@@ -2069,6 +2070,7 @@ ca:
         contributors_fr_credit_html: '%{france}: Conté dades d''origen de la «Direction
           Générale des Impôts».'
         contributors_fr_france: França
+        contributors_hr_croatia: Croàcia
         contributors_nl_netherlands: Països Baixos
         contributors_nz_new_zealand: Nova Zelanda
         contributors_nz_cc_by: CC BY 4.0

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 745d6e6aaee36b76d7633c67556469ff43e9aca3..3fedad4025ba54d01e09b7ef64cd9d97943c044f 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -2221,6 +2221,11 @@ cs:
         contributors_fr_credit_html: '%{france}: Obsahuje data pocházející z Direction
           Générale des Impôts.'
         contributors_fr_france: Francie
+        contributors_hr_credit_html: '%{croatia}: Obsahuje data od %{dgu_link} a z
+          %{open_data_portal} (chorvatská veřejná data).'
+        contributors_hr_croatia: Chorvatsko
+        contributors_hr_dgu: Státní geodetické správy Chorvatska
+        contributors_hr_open_data_portal: Národního portálu otevřených dat
         contributors_nl_credit_html: '%{netherlands}: Obsahuje data © AND, 2007
           (%{and_link})'
         contributors_nl_netherlands: Nizozemsko
@@ -2934,6 +2939,7 @@ cs:
           moderator: Odebrat práva moderátora
       block_history: Účinná zablokování
       moderator_history: Udělená zablokování
+      revoke_all_blocks: Zrušit všechny bloky
       comments: Komentáře
       create_block: Blokovat tohoto uživatele
       activate_user: Aktivovat tohoto uživatele
@@ -3042,6 +3048,18 @@ cs:
       confirm: Opravdu chcete zrušit tento blok?
       revoke: Zrušit !
       flash: Tento blok byl zrušen.
+    revoke_all:
+      title: Zrušení všech bloků uživatele %{block_on}
+      heading_html: Zrušení všech bloků uživatele %{block_on}
+      empty: Uživatel %{name} nemá žádné aktivní bloky.
+      confirm: Opravdu chcete zrušit %{active_blocks}?
+      active_blocks:
+        one: '%{count} aktivní bloky'
+        few: '%{count} aktivní bloky'
+        many: '%{count} aktivního bloku'
+        other: '%{count} aktivních bloků'
+      revoke: Zrušit!
+      flash: Všechny aktivní bloky byly zrušeny.
     helper:
       time_future_html: Končí za %{time}.
       until_login: Aktivní dokud se uživatel nepřihlásí.
@@ -3105,6 +3123,15 @@ cs:
       reason: Důvod pro blok
       status: Stav
       revoker_name: Zrušil
+      older: Starší bloky
+      newer: Novější bloky
+    navigation:
+      all_blocks: Všechny bloky
+      blocks_on_me: Moje zablokování
+      blocks_on_user: Bloky uživatele %{user}
+      blocks_by_me: Zablokování mnou
+      blocks_by_user: Bloky od uživatele %{user}
+      block: 'Blok #%{id}'
   user_mutes:
     index:
       title: Ztlumení uživatelé

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 63cfe341135d06b0eb92270423d78c1ad21e56c2..857dba978bf5f96a668d08ee55face7ba7c80e1b 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -575,7 +575,7 @@ da:
       user_title: Blog for %{user}
       leave_a_comment: Tilføj en kommentar
       login_to_leave_a_comment_html: '%{login_link} for at kommentere'
-      login: Log på
+      login: Log ind
     no_such_entry:
       title: Intet blogindlæg fundet
       heading: 'Intet indlæg med id: %{id}'
@@ -625,6 +625,10 @@ da:
       comment: Kommentar
       newer_comments: Nyere kommentarer
       older_comments: Ældre kommentarer
+    subscribe:
+      button: Abonner på diskussion
+    unsubscribe:
+      heading: Vil du afmelde følgende dagbogsindlægsdiskussion?
   doorkeeper:
     errors:
       messages:
@@ -1731,6 +1735,7 @@ da:
       details: Flere oplysninger om bemærkningen kan findes på %{url}.
       details_html: Flere oplysninger om kortbemærkningen kan findes på %{url}.
     changeset_comment_notification:
+      description: 'OpenStreetMap-ændringssæt #%{id}'
       hi: Hej %{to_user},
       greeting: Hej,
       commented:
@@ -1750,10 +1755,8 @@ da:
         partial_changeset_without_comment: uden kommentar
       details: Flere oplysninger om ændringssættet kan findes på %{url}.
       details_html: Flere oplysninger om ændringssættet kan findes på %{url}.
-      unsubscribe: For at afmelde opdateringer til dette ændringssæt, kan du besøge
-        %{url} og klikke "Afmeld".
-      unsubscribe_html: For at afmelde opdateringer vedrørende dette ændringssæt,
-        kan du besøge %{url} og klikke "Afmeld".
+      unsubscribe: Du kan afmelde opdateringer om dette ændringssæt på %{url}.
+      unsubscribe_html: Du kan afmelde opdateringer om dette ændringssæt på %{url}.
   confirmations:
     confirm:
       heading: Tjek din e-mail!
@@ -1847,7 +1850,7 @@ da:
       back: Tilbage
       wrong_user: Du er logget på som '%{user}', men den besked du har bedt om at
         læse er ikke sendt af eller til den pågældende bruger. Log venligst på som
-        den korrekte bruger for at svare.
+        den korrekte bruger for at læse den.
     sent_message_summary:
       destroy_button: Slet
     heading:
@@ -1870,6 +1873,10 @@ da:
       new password button: Nulstil adgangskode
       help_text: Indtast e-mailadressen du brugte da du oprettede kontoen. Vi sender
         et link til den som du kan bruge til at nulstille din adgangskode.
+    create:
+      send_paranoid_instructions: Hvis din e-mailadresse findes i vores database,
+        vil du modtage et link til gendannelse af adgangskode på din e-mailadresse
+        om nogle få minutter.
     edit:
       title: Nulstil adgangskode
       heading: Nulstil adgangskode for %{user}
@@ -1920,15 +1927,15 @@ da:
       failure: Kunne ikke opdatere profil.
   sessions:
     new:
-      title: Log på
-      heading: Log på
+      title: Log ind
+      heading: Log ind
       email or username: E-mailadresse eller brugernavn
       password: Adgangskode
       remember: Husk mig
       lost password link: Glemt din adgangskode?
-      login_button: Log på
+      login_button: Log ind
       register now: Registrér nu
-      with external: 'Alternativt kan du bruge en tredjepart for at logge på:'
+      with external: 'Alternativt kan du bruge en tredjepart for at logge ind:'
       no account: Har du ingen konto?
       auth failure: Kunne ikke logge på med disse oplysninger.
       openid_logo_alt: Log på med et OpenID

diff --git a/config/locales/es.yml b/config/locales/es.yml
index ce89295f93188f430060a7d93483bdc9e3855437..44d8a1b59f7a6e753cfd40f6033f1229999d2411 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -422,6 +422,7 @@ es:
     deleted_ago_by_html: Eliminado %{time_ago} por %{user}
     edited_ago_by_html: Editado %{time_ago} por %{user}
     version: Versión
+    redacted_version: Versión censurada
     in_changeset: Conjunto de cambios
     anonymous: anónimo
     no_comment: (sin comentarios)
@@ -434,7 +435,10 @@ es:
       other: '%{count} vías'
     download_xml: Descargar XML
     view_history: Ver historial
+    view_unredacted_history: Ver historial sin censura
     view_details: Ver detalles
+    view_redacted_data: Ver datos censurados
+    view_redaction_message: Ver mensaje de censura
     location: 'Ubicación:'
     node:
       title_html: 'Nodo: %{name}'
@@ -573,14 +577,16 @@ es:
         los dígitos, o tal vez el enlace en el que hiciste clic sea incorrecto.
     show:
       title: 'Conjunto de cambios: %{id}'
+      created: 'Creado: %{when}'
+      closed: 'Cerrado: %{when}'
       created_ago_html: Creado %{time_ago}
       closed_ago_html: Cerrado %{time_ago}
       created_ago_by_html: Creado %{time_ago} por %{user}
       closed_ago_by_html: Cerrado %{time_ago} por %{user}
       discussion: Discusión
       join_discussion: Inicia sesión para unirte a la discusión
-      still_open: El conjunto de cambios sigue abierto; la discusión se abrirá cuando
-        se cierre el conjunto de cambios.
+      still_open: El conjunto de cambios sigue abierto - la discusión se abrirá una
+        vez se cierre el conjunto de cambios.
       comment_by_html: Comentario de %{user} %{time_ago}
       hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago}
       changesetxml: XML del conjunto de cambios
@@ -1974,6 +1980,10 @@ es:
       help_text: Escribe la dirección de correo electrónico con la que te registraste,
         te enviaremos un enlace a esa dirección que podrás utilizar para restablecer
         tu contraseña.
+    create:
+      send_paranoid_instructions: Si tu dirección de correo electrónico existe en
+        nuestra base de datos, recibirás un enlace de recuperación de contraseña en
+        tu dirección de correo electrónico en unos minutos.
     edit:
       title: Restablecer contraseña
       heading: Restablecer contraseña para %{user}
@@ -2251,9 +2261,7 @@ es:
           (información pública de Croacia).
         contributors_hr_croatia: Croacia
         contributors_hr_dgu: Administración Geodésica Estatal de Croacia
-        contributors_hr_dgu_url: https://dgu.gov.hr/
         contributors_hr_open_data_portal: Portal Nacional de Datos Abiertos
-        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_credit_html: '%{netherlands}: Contiene © y datos, 2007
           (%{and_link})'
         contributors_nl_netherlands: Países Bajos
@@ -3178,11 +3186,11 @@ es:
       reason: Razón del bloqueo
       status: Estado
       revoker_name: Revocado por
-      older: Bloques más antiguos
-      newer: Bloques más recientes
+      older: Bloqueos más antiguos
+      newer: Bloqueos más recientes
     navigation:
-      all_blocks: Todos los bloques
-      blocks_on_me: Me bloquea
+      all_blocks: Todos los bloqueos
+      blocks_on_me: Bloqueos sobre mí
       blocks_on_user: Bloqueos en %{user}
       blocks_by_me: Bloqueados por mí
       blocks_by_user: Bloqueos por %{user}

diff --git a/config/locales/et.yml b/config/locales/et.yml
index 68b3fb5590dc1aa915a19f13ef604b4f4588c12a..5bb1352dcd784b122b687b0d8f01f231c9d2e96d 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -12,6 +12,7 @@
 # Author: RM87
 # Author: StarrySky
 # Author: WikedKentaur
+# Author: Yupik
 ---
 et:
   time:
@@ -1595,6 +1596,7 @@ et:
         contributors_fr_credit_html: '%{france}: Sisaldab kaardiandmeid, mis on pärit
           maksuametist (Direction Générale des Impôts).'
         contributors_fr_france: Prantsusmaa
+        contributors_hr_croatia: Horvaatia
         contributors_nl_credit_html: '%{netherlands}: Sisaldab ettevõtte © AND
           andmeid (2007, %{and_link})'
         contributors_nl_netherlands: Holland

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 07a3a04058aa0bac919fce1f082037842fb121cd..6930900a06c6833b0a144065862eadb8038eee1d 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -474,6 +474,10 @@ eu:
         created: Sortua
         closed: Itxita
         belongs_to: Egilea
+    subscribe:
+      heading: Aldaketa multzoko eztabaida honetara harpidetu nahi duzu?
+    unsubscribe:
+      button: Eztabaidatik harpidetza kendu
     show:
       title: 'Aldaketa: %{id}'
       created_ago_html: Sortua orain dela %{time_ago}

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 7946799bd85eda42fb1924c10a7c2d538f6bb837..65bc08d2d7b5bbd2279ea9815e0a906485cb0162 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -51,6 +51,7 @@
 # Author: Tumm1
 # Author: Usp
 # Author: Veikk0.ma
+# Author: Yupik
 # Author: ZeiP
 ---
 fi:
@@ -2014,6 +2015,7 @@ fi:
         contributors_fr_credit_html: '%{france}: Sisältää karttatietoja Direction
           Générale des Impôtsista.'
         contributors_fr_france: Ranska
+        contributors_hr_croatia: Kroatia
         contributors_nl_credit_html: '%{netherlands}: Sisältää © AND-karttatietoja
           vuodelta 2007 (%{and_link})'
         contributors_nl_netherlands: Alankomaat
@@ -2213,6 +2215,7 @@ fi:
           golf: Golfkenttä
           park: Puisto
           common: Niitty
+          built_up: Rakennettu alue
           resident: Asuinalue
           retail: Kaupallinen alue
           industrial: Teollisuusalue
@@ -2248,6 +2251,7 @@ fi:
           construction: Rakenteilla olevia teitä
           bus_stop: Bussipysäkki
           bicycle_shop: Pyöräkauppa
+          bicycle_rental: Polkupyörän vuokraus
           bicycle_parking: Pyöräparkki
           bicycle_parking_small: Pieni pyöräparkki
           toilets: Vessat
@@ -2258,14 +2262,21 @@ fi:
         kartan muokkaamisen. Tutustu ensin kuitenkin näihin perusasioihin.'
       whats_on_the_map:
         title: Kartan sisältö
+        off_the_map_html: Kartta %{doesnt} sisällä mielipiteitä, kuten arvosteluja,
+          historiallisia tai hypoteettisia ominaisuuksia, eikä tietoja tekijänoikeuksin
+          suojatuista lähteistä. Ellei sinulla ole erityistä lupaa, älä kopioi verkko-
+          tai paperikarttoja.
+        doesnt: ei
       basic_terms:
         title: Käsitteitä ja termistöä
         paragraph_1: OpenStreetMapissa käytetään paljon vain sille omaista termistöä.
           Kun nämä sanat ovat hallinnassa, olet jo voiton puolella!
         an_editor_html: '%{editor} on ohjelma tai verkkosivu jota voit käyttää kartan
           muokkaamiseen.'
+        a_node_html: '%{node} (engl. node) on pistemäinen kohde kartalla, kuten ravintola
+          tai puu.'
         editor: Muokkain
-        node: piste
+        node: Piste
         way: viiva
       rules:
         title: Pelisäännöt
@@ -2651,6 +2662,8 @@ fi:
     index:
       title: Käyttäjät
       heading: Käyttäjät
+      older: Vanhemmat käyttäjät
+      newer: Uudemmat käyttäjät
       summary_html: '%{name} luotu %{date} osoitteesta %{ip_address}'
       summary_no_ip_html: '%{name} luotu %{date}'
       confirm: Vahvista valitut käyttäjät

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 7f3a00a1fdfd3893b8df0e0f998e9718530862a9..0d0d2b1682fb570f6b1233fcb20d40af6c6c597d 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -2191,9 +2191,7 @@ gl:
           (información pública de Croacia).
         contributors_hr_croatia: Croacia
         contributors_hr_dgu: administración xeodésica estatal de Croacia
-        contributors_hr_dgu_url: https://dgu.gov.hr/
         contributors_hr_open_data_portal: portal nacional de datos libres
-        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_credit_html: '%{netherlands}: Contén datos © AND, 2007
           (%{and_link})'
         contributors_nl_netherlands: Países Baixos

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 24e0b71eab75e54d0f9ab0733351cb36aa2fa3d7..18291aabd11d7e9c2dd6d13119fd970029ef4cdf 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -2182,6 +2182,12 @@ he:
           %{france}: מכילה נתונים שהגיעו במקור
           ממנהלת המיסים הכללית (Direction Générale des Impôts).
         contributors_fr_france: צרפת
+        contributors_hr_credit_html: |-
+          %{croatia}: מכילה נתונים מ%{dgu_link} ומ%{open_data_portal}
+          (מידע ציבורי של קרואטיה).
+        contributors_hr_croatia: קרואטיה
+        contributors_hr_dgu: המִנהל הגאודטי הממלכתי של קרואטיה
+        contributors_hr_open_data_portal: פורטל הנתונים הפתוחים הלאומי
         contributors_nl_credit_html: '%{netherlands}: מכילה © נתוני AND‏, 2007 (‏%{and_link})'
         contributors_nl_netherlands: הולנד
         contributors_nz_credit_html: |-

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index dea771c63e26125b1531f325ba4b75d66307fa05..94bcbb3e19a6c0969155feb73708f4a070ec2c95 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -2161,9 +2161,7 @@ ia:
           (information public de Croatia).
         contributors_hr_croatia: Croatia
         contributors_hr_dgu: Administration Geodetic Statal de Croatia
-        contributors_hr_dgu_url: https://dgu.gov.hr/
         contributors_hr_open_data_portal: Portal national de datos aperte
-        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_credit_html: '%{netherlands}: Contine datos © AND, 2007
           (%{and_link})'
         contributors_nl_netherlands: Nederlandia

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 55230c783c4b22bf8dfb240e4de633e8dd5fdfa4..b6cd13f24bd1ec5db5fa3afb611883b470ed1167 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1940,6 +1940,7 @@ ko:
           %{france}: 프랑스 국세청 (Direction Générale des Impôts)이 제공한
           데이터를 포함합니다.
         contributors_fr_france: 프랑스
+        contributors_hr_croatia: 크로아티아
         contributors_nl_credit_html: '%{netherlands}: 2007년 © AND 데이터 (%{and_link})를
           포함합니다.'
         contributors_nl_netherlands: 네덜란드
@@ -2709,6 +2710,9 @@ ko:
       reason: 차단 이유
       status: 상태
       revoker_name: 해제자
+    navigation:
+      all_blocks: 모든 차단
+      block: '#%{id} 차단'
   notes:
     index:
       title: '%{user} 님이 제출했거나 덧글을 남긴 참고'

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index dcde60dcb7bce74bdb43892072998f679fd06bce..2d0f3ecc46d03e512cc73b967753173a2cd235d1 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -1920,8 +1920,6 @@ lb:
         contributors_fi_finland: Finnland
         contributors_fr_france: Frankräich
         contributors_hr_croatia: Kroatien
-        contributors_hr_dgu_url: https://dgu.gov.hr/
-        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_netherlands: Holland
         contributors_nz_new_zealand: Neiséiland
         contributors_rs_serbia: Serbien

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 5fb84384897b3b60238e83aa14bd9617c793070f..466886758f2aedc115b14edacdac8067d2f39d4f 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -2145,9 +2145,7 @@ mk:
           (информации од јавен карактер на Хрватска).
         contributors_hr_croatia: Хрватска
         contributors_hr_dgu: Државна геодетска управа на Хрватска
-        contributors_hr_dgu_url: https://dgu.gov.hr/
         contributors_hr_open_data_portal: Портал за отворени податоци
-        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_credit_html: '%{netherlands}: Содржи © и податоци, 2007
           (%{and_link})'
         contributors_nl_netherlands: Холандија

diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 22914652e72c4d4a7a6d2bb4e688b14fe528edc1..6c95a901abf41f1989a9760f88e24ffb2a48186a 100644 (file)
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -29,6 +29,7 @@
 # Author: Oyvind
 # Author: SuperPotato
 # Author: The real emj
+# Author: Yupik
 # Author: 6400
 ---
 nb:
@@ -1744,6 +1745,7 @@ nb:
         contributors_cz_czechia: Tsjekkia
         contributors_fi_finland: Finland
         contributors_fr_france: Frankrike
+        contributors_hr_croatia: Kroatia
         contributors_nl_netherlands: Nederland
         contributors_nz_new_zealand: New Zealand
         contributors_rs_serbia: Serbia

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 2695fe8b67853f8b49b499e416ef0c39fcec3c52..6563edcaeb423be0c0ad707add66f062cf60d88b 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -103,6 +103,7 @@ nl:
       messages:
         invalid_email_address: lijkt geen geldig e-mailadres te zijn
         email_address_not_routable: is niet routeerbaar
+        display_name_is_user_n: kan niet user_n zijn, tenzij n uw gebruikers-ID is
       models:
         user_mute:
           is_already_muted: is al gedempt
@@ -1659,7 +1660,10 @@ nl:
     intro_text: OpenStreetMap is een kaart van de wereld, gemaakt door mensen zoals
       u en vrij te gebruiken onder een open licentie.
     intro_2_create_account: Maak een account aan
+    hosting_partners_2024_html: Hosting wordt ondersteund door %{fastly}, %{corpmembers}
+      en andere %{partners}.
     partners_fastly: Fastly
+    partners_corpmembers: OSMF-bedrijfsleden
     partners_partners: partners
     tou: Gebruiksvoorwaarden
     osm_offline: De OpenStreetMap-database is momenteel niet beschikbaar wegens het
@@ -1681,6 +1685,7 @@ nl:
     more: Meer
   user_mailer:
     diary_comment_notification:
+      description: 'OpenStreetMap-dagboekbericht #%{id}'
       subject: '[OpenStreetMap] %{user} heeft een reactie bij uw dagboek geplaatst'
       hi: Hallo %{to_user},
       header: '%{from_user} heeft gereageerd op het OpenStreetMap-dagboekbericht met
@@ -1691,6 +1696,8 @@ nl:
         op %{commenturl} of een bericht sturen naar de auteur via %{replyurl}
       footer_html: U kunt de reactie ook lezen op %{readurl} en u kunt zelf ook reageren
         op %{commenturl} of een bericht sturen naar de auteur via %{replyurl}
+      footer_unsubscribe: U kunt zich afmelden voor de discussie op %{unsubscribeurl}
+      footer_unsubscribe_html: U kunt zich afmelden van de discussie op %{unsubscribeurl}
     message_notification:
       subject: '[OpenStreetMap] %{message_title}'
       hi: Hallo %{to_user},
@@ -1726,6 +1733,8 @@ nl:
       loaded:
         one: goed ontvangen, met %{trace_points} van %{count} mogelijk punt.
         other: goed ontvangen; met %{trace_points} van %{count} mogelijke punten.
+      all_your_traces_html: Alle succesvol geüploade GPX-traces zijn te vinden op
+        %{url}.
       subject: '[OpenStreetMap] GPX-import afgerond'
     signup_confirm:
       subject: '[OpenStreetMap] Welkom bij OpenStreetMap'
@@ -1751,6 +1760,7 @@ nl:
       click_the_link: Als u dit bent, klik dan op de onderstaande koppeling om uw
         wachtwoord opnieuw in te stellen.
     note_comment_notification:
+      description: 'OpenStreetMap-notitie #%{id}'
       anonymous: Een anonieme gebruiker
       greeting: Hallo,
       commented:
@@ -1795,6 +1805,7 @@ nl:
       details: Meer details over de opmerking zijn te vinden op %{url}.
       details_html: Meer details over de opmerking zijn te vinden op %{url}.
     changeset_comment_notification:
+      description: 'OpenStreetMap-wijzigingenreeks #%{id}'
       hi: Hoi %{to_user},
       greeting: Hallo,
       commented:
@@ -1896,6 +1907,9 @@ nl:
       people_mapping_nearby: dichtbijzijnde mappers
     muted:
       title: Gedempte berichten
+      messages:
+        one: '%{count} verborgen bericht'
+        other: U hebt %{count} genegeerde berichten
     reply:
       wrong_user: U bent aangemeld als "%{user}", maar het bericht waarop u wilt antwoorden
         is niet aan die gebruiker gericht. Meld u aan als de juiste gebruiker om te
@@ -1932,6 +1946,9 @@ nl:
       help_text: Voer het e-mailadres in dat u hebt opgegeven bij uw registratie.
         We sturen u dan een webkoppeling die u kunt gebruiken om uw wachtwoord opnieuw
         in te stellen.
+    create:
+      send_paranoid_instructions: Als uw e-mailadres in onze database bestaat, ontvangt
+        u binnen enkele minuten een wachtwoordherstellink op uw e-mailadres.
     edit:
       title: Wachtwoord opnieuw instellen
       heading: Wachtwoord voor %{user} opnieuw instellen
@@ -2209,6 +2226,11 @@ nl:
           %{france}: Bevat gegevens van de
           Direction Générale des Impôts.
         contributors_fr_france: Frankrijk
+        contributors_hr_credit_html: '%{croatia}: bevat gegevens uit de %{dgu_link}
+          en %{open_data_portal} (openbare informatie van Kroatië).'
+        contributors_hr_croatia: Kroatië
+        contributors_hr_dgu: Staatsgeodesisch bestuur van Kroatië
+        contributors_hr_open_data_portal: Nationaal Open Data Portaal
         contributors_nl_credit_html: '%{netherlands}: Bevat gegevens © AND, 2007
           (%{and_link})'
         contributors_nl_netherlands: Nederland
@@ -2463,6 +2485,7 @@ nl:
           scrubland: Struikgewas
           lake: Meer
           reservoir: Reservoir
+          intermittent_water: Onderbroken waterlichaam
           glacier: Gletsjer
           reef: Rif
           wetland: Moeras
@@ -2640,6 +2663,8 @@ nl:
       identifiable: IDENTIFICEERBAAR
       private: PERSOONLIJK
       trackable: TRACEERBAAR
+      details_with_tags_html: '%{time_ago} door %{user} in %{tags}'
+      details_without_tags_html: '%{time_ago} door %{user}'
     index:
       public_traces: Openbare gps-trajecten
       my_gps_traces: Mijn GPS-traces
@@ -2956,6 +2981,9 @@ nl:
       heading: Gebruikers
       older: Oudere gebruikers
       newer: Nieuwere gebruikers
+      found_users:
+        one: '%{count} gebruiker gevonden'
+        other: '%{count} gebruikers gevonden'
       summary_html: '%{name} aangemaakt vanaf %{ip_address} op %{date}'
       summary_no_ip_html: '%{name} aangemaakt op %{date}'
       confirm: Geselecteerde gebruikers bevestigen
@@ -3112,6 +3140,15 @@ nl:
       reason: Reden voor blokkade
       status: Status
       revoker_name: Ingetrokken door
+      older: Oudere blokkades
+      newer: Nieuwere blokkades
+    navigation:
+      all_blocks: Alle blokkades
+      blocks_on_me: Blokkades voor u
+      blocks_on_user: Blokkades voor %{user}
+      blocks_by_me: Blokkades door u
+      blocks_by_user: Blokkades door %{user}
+      block: 'Blokkade #%{id}'
   user_mutes:
     index:
       title: Gedempte gebruikers

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 023c5029a7b6e8c406acb1bc753ee56f8a5695d5..c964aa9274e457d85ea217e4d1fb42b0d352857d 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -2201,6 +2201,12 @@ tr:
         contributors_fr_credit_html: '%{france}: Direction Générale des Impôts''tan
           alınan verileri içerir.'
         contributors_fr_france: Fransa
+        contributors_hr_credit_html: |-
+          %{croatia}: %{dgu_link} ve %{open_data_portal} verilerini içerir.
+          (Hırvatistan halka açık bilgiler).
+        contributors_hr_croatia: Hırvatistan
+        contributors_hr_dgu: Hırvatistan Devlet Jeodezi İdaresi
+        contributors_hr_open_data_portal: Ulusal Açık Veri Portalı
         contributors_nl_credit_html: '%{netherlands}: © AND verilerini içerir,
           2007 (%{and_link})'
         contributors_nl_netherlands: Hollanda

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 205a5ef2b35aa3544c26afcd4c4bc4267f084199..0a77485eff0bd30a66d6bd1f3c4c1249f565c40e 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -2047,9 +2047,7 @@ zh-TW:
         contributors_hr_credit_html: '%{croatia}：包含來自%{dgu_link}和%{open_data_portal}（克羅埃西亞的公共資訊）的資料。'
         contributors_hr_croatia: 克羅埃西亞
         contributors_hr_dgu: 克羅埃西亞國家大地測量局
-        contributors_hr_dgu_url: https://dgu.gov.hr/
         contributors_hr_open_data_portal: 國家開放資料入口網站
-        contributors_hr_open_data_portal_url: https://data.gov.hr/
         contributors_nl_credit_html: '%{netherlands}：包含 © AND 資料，2007（%{and_link}）'
         contributors_nl_netherlands: 荷蘭
         contributors_nz_credit_html: '%{new_zealand}：包含來自 %{linz_data_service_link}與基於%{cc_by_link}

diff --git a/test/factories/user.rb b/test/factories/user.rb
index 5b92345c2dbcf0f356be857b7432018dec6abef5..bc6cddf80225ca5fed39aed52148df98ec7f2b8a 100644 (file)
--- a/test/factories/user.rb
+++ b/test/factories/user.rb
@@ -1,8 +1,10 @@
+pass_crypt = PasswordHash.create("test").first 
+
 FactoryBot.define do
   factory :user do
     sequence(:email) { |n| "user#{n}@example.com" }
     sequence(:display_name) { |n| "User #{n}" }
-    pass_crypt { PasswordHash.create("test").first }
+    pass_crypt { pass_crypt }
 
     # These attributes are not the defaults, but in most tests we want
     # a 'normal' user who can log in without being redirected etc.

diff --git a/yarn.lock b/yarn.lock
index 487e5554212d2e9d1e58bf814b9d068b382fcf6b..4ae9b0a7171eebab20263d467ffef36d6c064249 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,15 +34,15 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.0.0.tgz#1a9e4b4c96d8c7886e0110ed310a0135144a1691"
-  integrity sha512-RThY/MnKrhubF6+s1JflwUjPEsnCEmYCWwqa/aRISKWNXGZ9epUwft4bUMM35SdKF9xvBrLydAM1RDHd1Z//ZQ==
+"@eslint/js@9.1.1":
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.1.1.tgz#eb0f82461d12779bbafc1b5045cde3143d350a8a"
+  integrity sha512-5WoDz3Y19Bg2BnErkZTp0en+c/i9PvgFS7MBe1+m60HjFr0hrphlAGp4yzI7pxpt4xShln4ZyYp4neJm8hmOkQ==
 
-"@humanwhocodes/config-array@^0.12.3":
-  version "0.12.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.12.3.tgz#a6216d90f81a30bedd1d4b5d799b47241f318072"
-  integrity sha512-jsNnTBlMWuTpDkeE3on7+dWJi0D6fdDfeANj/w7MpS8ztROCoLvIO2nG0CcFj+E4k8j4QrSTh4Oryi3i2G669g==
+"@humanwhocodes/config-array@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.13.0.tgz#fb907624df3256d04b9aa2df50d7aa97ec648748"
+  integrity sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==
   dependencies:
     "@humanwhocodes/object-schema" "^2.0.3"
     debug "^4.3.1"
@@ -58,6 +58,11 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
+"@humanwhocodes/retry@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.2.3.tgz#c9aa036d1afa643f1250e83150f39efb3a15a631"
+  integrity sha512-X38nUbachlb01YMlvPFojKoiXq+LzZvuSce70KPMPdeM1Rj03k4dR7lDslhbqXn3Ang4EU3+EAmwEAsbrjHW3g==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -246,16 +251,17 @@ eslint-visitor-keys@^4.0.0:
   integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
 
 eslint@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.0.0.tgz#6270548758e390343f78c8afd030566d86927d40"
-  integrity sha512-IMryZ5SudxzQvuod6rUdIUz29qFItWx281VhtFVc2Psy/ZhlCeD/5DT6lBIJ4H3G+iamGJoTln1v+QSuPw0p7Q==
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.1.0.tgz#262625f6b0921f7550f128a0098d05ecaad989c6"
+  integrity sha512-1TCBecGFQtItia2o39P7Z4BK1X7ByNPxAiWJvwiyTGcOwYnTiiASgMpNA6a+beu8cFPhEDWvPf6mIlYUJv6sgA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^3.0.2"
-    "@eslint/js" "9.0.0"
-    "@humanwhocodes/config-array" "^0.12.3"
+    "@eslint/js" "9.1.1"
+    "@humanwhocodes/config-array" "^0.13.0"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.2.3"
     "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.12.4"
     chalk "^4.0.0"
@@ -271,7 +277,6 @@ eslint@^9.0.0:
     file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
@@ -403,11 +408,6 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graphemer@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
-  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
-
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"