Merge branch 'staging' into 1180-hundreds-of-ohm-website-test-failures

erictheise · erictheise · commit f308414512b2 · 2025-12-04T08:08:26.000-08:00
diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml
@@ -795,7 +795,7 @@ be-Tarask:
           doityourself: Крама „Зрабі сам“
           dry_cleaning: Хімчыстка
           electronics: Крама электронікі
-          estate_agent: Агенцтва нерухомасьці
+          estate_agent: Аґенцтва нерухомасьці
           farm: Сельская крама
           fashion: Крама моднага адзеньня
           florist: Кветкавая крама
diff --git a/config/locales/be.yml b/config/locales/be.yml
@@ -705,7 +705,6 @@ be:
       profile: Праглядзець інфармацыю вашага профілю
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/Contact
       contact_url_title: Тлумачэнне розных каналаў сувязі
       contact: звяртацца
       contact_the_community_html: Не саромейцеся %{contact_link} да супольнасці OpenHistoricalMap,
diff --git a/config/locales/br.yml b/config/locales/br.yml
@@ -656,7 +656,6 @@ br:
       profile: Gwelet ho titouroù ho profil
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact: darempred
     bad_request:
       title: Reked fall
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
@@ -707,7 +707,6 @@ cy:
       profile: Gweld manylion eich proffil
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Esboniad o sianeli cyswllt amrywiol
       contact: Cysylltwch
       contact_the_community_html: '%{contact_link} â''r gymuned OpenHistoricalMap
diff --git a/config/locales/da.yml b/config/locales/da.yml
@@ -695,7 +695,6 @@ da:
       profile: Se dine profiloplysninger
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Forklaring af forskellige kontaktkanaler
       contact: kontakte
       contact_the_community_html: Vær velkommen til at %{contact_link} OpenHistoricalMap-fællesskabet
diff --git a/config/locales/el.yml b/config/locales/el.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar
+# Author: AmazingJus
 # Author: Andibing
 # Author: BEANS
 # Author: Back ache
@@ -1548,8 +1549,8 @@ en-GB:
       commented:
         subject_own: '[OpenHistoricalMap] %{commenter} has commented on one of your
           notes'
-        subject_other: '[OpenHistoricalMap] %{commenter} has commented on a note you
-          are interested in'
+        subject_other: '[OpenHistoricalMap] %{commenter} has commented on a note that
+          you are interested in'
         your_note: '%{commenter} has left a comment on one of your map notes near
           %{place}.'
         your_note_html: '%{commenter} has left a comment on one of your map notes
@@ -1560,8 +1561,8 @@ en-GB:
           commented on. The note is near %{place}.'
       closed:
         subject_own: '[OpenHistoricalMap] %{commenter} has resolved one of your notes'
-        subject_other: '[OpenHistoricalMap] %{commenter} has resolved a note you are
-          interested in'
+        subject_other: '[OpenHistoricalMap] %{commenter} has resolved a note that
+          you are interested in'
         your_note: '%{commenter} has resolved one of your map notes near %{place}.'
         your_note_html: '%{commenter} has resolved one of your map notes near %{place}.'
         commented_note: '%{commenter} has resolved a map note you have commented on.
@@ -1571,8 +1572,8 @@ en-GB:
       reopened:
         subject_own: '[OpenHistoricalMap] %{commenter} has reactivated one of your
           notes'
-        subject_other: '[OpenHistoricalMap] %{commenter} has reactivated a note you
-          are interested in'
+        subject_other: '[OpenHistoricalMap] %{commenter} has reactivated a note that
+          you are interested in'
         your_note: '%{commenter} has reactivated one of your map notes near %{place}.'
         your_note_html: '%{commenter} has reactivated one of your map notes near %{place}.'
         commented_note: '%{commenter} has reactivated a map note you have commented
@@ -1800,7 +1801,7 @@ en-GB:
   site:
     about:
       lede_text: OpenHistoricalMap is built by a community of mappers that contribute
-        and maintain data about roads, trails, cafés, railway stations, and much more,
+        and maintain data about roads, trails, cafés, railway stations and much more,
         all over the world.
     about_section:
       open_data_title: Open Data
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -2638,7 +2638,6 @@ es:
         description: 'Invítate al espacio de trabajo Slack de OpenStreetMap EE.UU.
           y únete al canal #openhistoricalmap.'
       wiki:
-        title: Wiki de OpenStreetMap
         description: Instrucciones mantenidas por la comunidad para utilizar OHM y
           las pautas para contribuir al proyecto.
     potlatch:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -899,7 +899,6 @@ fr:
       profile: Afficher les informations de votre profil
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Différents canaux de contact expliqués
       contact: contacter
       contact_the_community_html: N’hésitez pas à %{contact_link} la communauté OpenHistoricalMap
diff --git a/config/locales/frp.yml b/config/locales/frp.yml
@@ -804,7 +804,6 @@ frp:
       profile: Vêre les enformacions de voutron profil
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Difèrents canâls de contacto èxplicâs
       contact: contactar
       contact_the_community_html: Margalyéd pas a %{contact_link} la comunôtât OpenHistoricalMap
@@ -2049,14 +2048,14 @@ frp:
           bendes de changements'
         subject_other: '[OpenHistoricalMap] %{commenter} at comentâ yona benda de
           changements que vos entèrèsse'
-        your_changeset: '[OpenStreetMap] %{commenter} at comentâ lo %{time} yona de
-          voutres bendes de changements'
-        your_changeset_html: '[OpenStreetMap] %{commenter} at comentâ lo %{time} yona
-          de voutres bendes de changements'
-        commented_changeset: '[OpenStreetMap] %{commenter} at comentâ lo %{time} yona
-          benda de changements que vos siude et encartâye per %{changeset_author}'
-        commented_changeset_html: '[OpenStreetMap] %{commenter} at comentâ lo %{time}
-          yona benda de changements que vos siude et encartâye per %{changeset_author}'
+        your_changeset: '%{commenter} at comentâ lo %{time} yona de voutres bendes
+          de changements'
+        your_changeset_html: '%{commenter} at comentâ lo %{time} yona de voutres bendes
+          de changements'
+        commented_changeset: '%{commenter} at comentâ lo %{time} yona benda de changements
+          que vos siude et encartâye per %{changeset_author}'
+        commented_changeset_html: '%{commenter} at comentâ lo %{time} yona benda de
+          changements que vos siude et encartâye per %{changeset_author}'
         partial_changeset_with_comment: avouéc lo comentèro « %{changeset_comment} »
         partial_changeset_with_comment_html: avouéc lo comentèro « %{changeset_comment} »
         partial_changeset_without_comment: sen comentèro
@@ -2438,7 +2437,7 @@ frp:
           XML. Mèrci de vos raprochiér ou sèlèccionar una zona més petita ou utilisar
           yona des sôrses siuventes por lo tèlèchargement massu de balyês.
         planet:
-          title: Planèta OSM
+          title: Planèta OHM
           description: Copies règuliérement betâyes a jorn de la bâsa de balyês complèta
             d'OpenHistoricalMap
         overpass:
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
@@ -1117,26 +1117,23 @@ gd:
         subject_own: '[OpenHistoricalMap] Thug %{commenter} beachd air nòta agad'
         subject_other: '[OpenHistoricalMap] Thug %{commenter} beachd air nòta sa bheil
           ùidh agad'
-        your_note: '[OpenStreetMap] Thug %{commenter} beachd air nòta mapa agad faisg
-          air %{place}.'
-        commented_note: '[OpenStreetMap] Thug %{commenter} beachd air nòta mapa a
-          thug thu fhèin beachd air. Tha an nòta faisg air %{place}.'
+        your_note: Thug %{commenter} beachd air nòta mapa agad faisg air %{place}.
+        commented_note: Thug %{commenter} beachd air nòta mapa a thug thu fhèin beachd
+          air. Tha an nòta faisg air %{place}.
       closed:
         subject_own: '[OpenHistoricalMap] Dh''fhuasgail %{commenter} nòta agad'
         subject_other: '[OpenHistoricalMap] Dh''fhuasgail %{commenter} nòta sa bheil
           ùidh agad'
-        your_note: '[OpenStreetMap] Dh''fhuasgail %{commenter} nòta mapa agad faisg
-          air %{place}.'
-        commented_note: '[OpenStreetMap] Dh''fhuasgail %{commenter} nòta mapa a thug
-          thu beachd air. Tha an nòta faisg air %{place}.'
+        your_note: Dh'fhuasgail %{commenter} nòta mapa agad faisg air %{place}.
+        commented_note: Dh'fhuasgail %{commenter} nòta mapa a thug thu beachd air.
+          Tha an nòta faisg air %{place}.
       reopened:
         subject_own: '[OpenHistoricalMap] Ghnìomhaich %{commenter} nòta agad às ùr'
         subject_other: '[OpenHistoricalMap] Ghnìomhaich %{commenter} nòta sa bheil
           ùidh agad às ùr'
-        your_note: '[OpenStreetMap] Ghnìomhaich %{commenter} nòta mapa agad às ùr
-          a tha faisg air %{place}.'
-        commented_note: '[OpenStreetMap] Ghnìomhaich %{commenter} nòta mapa às ùr
-          a thug thu beachd air. Tha an nòta faisg air %{place}.'
+        your_note: Ghnìomhaich %{commenter} nòta mapa agad às ùr a tha faisg air %{place}.
+        commented_note: Ghnìomhaich %{commenter} nòta mapa às ùr a thug thu beachd
+          air. Tha an nòta faisg air %{place}.
       details: Gheibh thu barrachd fiosrachaidh air an nòta air %{url}.
     changeset_comment_notification:
       hi: Shin thu, %{to_user},
@@ -1145,11 +1142,11 @@ gd:
           agad'
         subject_other: '[OpenHistoricalMap] Thug %{commenter} beachd air seata atharraichean
           sa bheil ùidh agad'
-        your_changeset: '[OpenStreetMap] Thug %{commenter} beachd air seata atharraichean
-          agad a chaidh cruthachadh %{time}'
-        commented_changeset: '[OpenStreetMap] Thug %{commenter} beachd air seata atharraichean
-          mapa air a bheil thu a'' cumail sùil agus a chaidh cruthachadh le %{changeset_author}
-          %{time}'
+        your_changeset: Thug %{commenter} beachd air seata atharraichean agad a chaidh
+          cruthachadh %{time}
+        commented_changeset: Thug %{commenter} beachd air seata atharraichean mapa
+          air a bheil thu a' cumail sùil agus a chaidh cruthachadh le %{changeset_author}
+          %{time}
         partial_changeset_with_comment: leis a' bheachd '%{changeset_comment}'
         partial_changeset_without_comment: gun bheachd
       details: Gheibh thu barrachd fiosrachaidh air an seata atharraichean air %{url}.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
@@ -826,7 +826,6 @@ gl:
       profile: Consulta a túa información privada
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Explícanse varias canles de contacto
       contact: contactar
       contact_the_community_html: Non dubides en %{contact_link} coa comunidade do
@@ -2738,7 +2737,6 @@ gl:
         description: 'Entra no espazo de traballo en Slack do OpenStreetMap dos EUA
           e únete á canle #openhistoricalmap.'
       wiki:
-        title: Wiki
         description: Instrucións mantidas pola comunidade para usar o OHM e normas
           para contribuír ao proxecto.
     potlatch:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
@@ -2156,7 +2156,6 @@ hu:
       slack:
         title: IRC
       wiki:
-        title: Wiki
         description: Böngészd a wikit mélyreható OHM dokumentációért.
     potlatch:
       removed: Az alapértelmezett OpenHistoricalMap szerkesztőd a Potlatch. Mivel
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
@@ -807,7 +807,6 @@ ia:
       profile: Vider tu information de profilo
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Varie canales de contacto explicate
       contact: contactar
       contact_the_community_html: Sia libere de %{contact_link} le communitate de
@@ -2718,7 +2717,6 @@ ia:
         description: 'Invita te al spatio de travalio Slack de OpenStreetMap U.S.
           e entra in le canal #openhistoricalmap.'
       wiki:
-        title: Wiki
         description: Percurre le wiki pro le documentation in detalio de OHM.
     potlatch:
       removed: Tu ha le editor predefinite de OpenHistoricalMap fixate como Potlatch.
diff --git a/config/locales/is.yml b/config/locales/is.yml
@@ -775,7 +775,6 @@ is:
       profile: Skoðaðu persónuupplýsingar þínar
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/Contact
       contact_url_title: Ýmsar samskiptaleiðir útskýrðar
       contact: hafa samband við
       contact_the_community_html: Ekki hika við að %{contact_link} OpenHistoricalMap-samfélagið
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
@@ -699,7 +699,6 @@ ja:
       profile: プロフィール情報の表示
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: 複数の連絡チャンネルが存在します
       contact: 連絡
       contact_the_community_html: リンク切れ / バグを見つけたら、遠慮なくOpenHistoricalMapコミュニティに%{contact_link}してください。リクエストの正確なURLを書き留めてください。
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
@@ -671,7 +671,6 @@ ko:
       profile: 내 프로필 정보 보기
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: 다양한 연락 방법이 설명되어 있습니다.
       contact: 여러 연락 수단
       contact_the_community_html: 끊어진 링크나 버그를 발견했다면 언제든지 오픈스트리트맵 커뮤니티에 %{contact_link}으로
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
@@ -1229,19 +1229,18 @@ lv:
           piezīmēm'
         subject_other: '[OpenHistoricalMap] %{commenter} ir atrisinājis kādu piezīmi,
           kas tevi interesē'
-        your_note: '[OpenStreetMap] %{commenter} ir atrisinājis kādu no tavām piezīmēm
-          netālu no %{place}.'
-        commented_note: '[OpenStreetMap] %{commenter} ir atrisinājis kādu piezīmi,
-          kur esi komentējis. Piezīme ir netālu no %{place}.'
+        your_note: '%{commenter} ir atrisinājis kādu no tavām piezīmēm netālu no %{place}.'
+        commented_note: '%{commenter} ir atrisinājis kādu piezīmi, kur esi komentējis.
+          Piezīme ir netālu no %{place}.'
       reopened:
         subject_own: '[OpenHistoricalMap] %{commenter} ir atkal aktivizējis kādu no
           tavām piezīmēm'
         subject_other: '[OpenHistoricalMap] %{commenter} ir atkal aktivizējis kādu
           piezīmi, kas tevi interesē'
-        your_note: '[OpenStreetMap] %{commenter} ir atkal aktivizējis kādu no tavām
-          piezīmēm netālu no %{place}.'
-        commented_note: '[OpenStreetMap] %{commenter} ir atkal aktivizējis kādu piezīmi,
-          kur esi komentējis. Piezīme ir netālu no %{place}.'
+        your_note: '%{commenter} ir atkal aktivizējis kādu no tavām piezīmēm netālu
+          no %{place}.'
+        commented_note: '%{commenter} ir atkal aktivizējis kādu piezīmi, kur esi komentējis.
+          Piezīme ir netālu no %{place}.'
       details: Vairāk informācijas par piezīmēm var atrast %{url}.
     changeset_comment_notification:
       hi: Sveiks, %{to_user},
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
@@ -1741,8 +1741,8 @@ mk:
           белешки'
         subject_other: '[OpenHistoricalMap] %{commenter} преактивира белешка што ве
           интересира'
-        your_note: '[OpenStreetMap] %{commenter} преактивира една од вашите белешки
-          на каритте близу %{place}.'
+        your_note: '%{commenter} преактивира една од вашите белешки на каритте близу
+          %{place}.'
         your_note_html: '[OpenStreetMap] %{commenter} преактивира една од вашите белешки
           на каритте близу %{place}.'
         commented_note: '%{commenter} реши картографска белешка на која имате коментирано.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
@@ -541,9 +541,6 @@ oc:
       applications:
         create:
           notice: S'es enregistrat l'aplicacion.
-  errors:
-    contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/Contact
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -1527,8 +1524,7 @@ oc:
       closed:
         subject_own: '[OpenHistoricalMap] %{commenter} a resolgut una de vòstras nòtas'
         subject_other: '[OpenHistoricalMap] %{commenter} que vis i interessàvetz.'
-        your_note: '[OpenStreetMap] %{commenter} a resolgut una de vòstras nòtas prèp
-          de %{place}.'
+        your_note: '%{commenter} a resolgut una de vòstras nòtas prèp de %{place}.'
         your_note_html: '%{commenter} A reglat una de vòstrei nòtas de mapa pròche
           de %{place}.'
         commented_note: '%{commenter} a resolgut una nòta de mapa qu''avètz comentada.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
@@ -719,7 +719,6 @@ pt-PT:
       profile: Ver a tua informação de perfil
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Vários canais de contacto explicados
       contact: contactar
       contact_the_community_html: Fique à vontade para %{contact_link} a comunidade
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -755,7 +755,6 @@ pt:
       profile: Ver informações do seu perfil
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Vários canais de contato explicados
       contact: contato
     forbidden:
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
@@ -675,7 +675,6 @@ ro:
       profile: Vizualizați informațiile de profil
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Diferite metode de contact explicate
       contact: contact
       contact_the_community_html: Simțiți-vă liber să %{contact_link} comunitatea
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
@@ -1595,12 +1595,12 @@ sc:
           sas notas tuas'
         subject_other: '[OpenHistoricalMap] %{commenter} at torradu a ativare una
           nota chi t''interessat'
-        your_note: '[OpenStreetMap] %{commenter} at torradu a ativare una de sas notas
-          de sa mapa tuas a curtzu a %{place}.'
+        your_note: '%{commenter} at torradu a ativare una de sas notas de sa mapa
+          tuas a curtzu a %{place}.'
         your_note_html: '[OpenStreetMap] %{commenter} at torradu a ativare una de
           sas notas de sa mapa tuas a curtzu a %{place}.'
-        commented_note: '[OpenStreetMap] %{commenter} at torradu a ativare una de
-          sas notas de sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.'
+        commented_note: '%{commenter} at torradu a ativare una de sas notas de sa
+          mapa chi as cummentadu. Sa nota est a curtzu a %{place}.'
         commented_note_html: '[OpenStreetMap] %{commenter} at torradu a ativare una
           de sas notas de sa mapa chi as cummentadu. Sa nota est a curtzu a %{place}.'
       details: Podes agatare detàllios in prus subra de sa nota in %{url}.
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
@@ -2073,7 +2073,6 @@ sk:
       slack:
         title: IRC
       wiki:
-        title: OpenStreetMap Wiki
         description: Podrobnú dokumentáciu OHM nájdete na wiki.
     potlatch:
       removed: Váš prednastavená OpenHistoricalMap editor je nastavený na Potlatch.
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
@@ -744,7 +744,6 @@ sl:
       profile: Ogled vaših profilnih podatkov
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Razloženi so različni kontaktni kanali
       contact: kontaktirati
       contact_the_community_html: Če ste našli nedelujočo povezavo/hrošča, ne oklevajte
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
@@ -713,7 +713,6 @@ tr:
       profile: Profil bilgilerinizi görüntüleyin
   errors:
     contact:
-      contact_url: https://wiki.openstreetmap.org/wiki/OpenHistoricalMap/Communication
       contact_url_title: Çeşitli iletişim kanalları açıklandı
       contact: iletişim
       contact_the_community_html: Bozuk bir bağlantı/hata bulduysanız OpenHistoricalMap
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
