From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 22 Feb 2023 15:26:20 +0000 (+0000)
Subject: Merge pull request #3935 from Hufkratzer/rename-horse-riding-label
X-Git-Tag: live~1415
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ab4de87d1eef4546a96738154cf81b7d7f72d988?hp=275fb83b5562b0bcbb1b2292c4749eee87905bea

Merge pull request #3935 from Hufkratzer/rename-horse-riding-label

Change label for leisure=horse_riding in en.yml
---

diff --git a/Gemfile.lock b/Gemfile.lock
index d301e1ae1..657c111ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,7 +86,7 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.711.0)
+    aws-partitions (1.714.0)
     aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -123,7 +123,7 @@ GEM
     bootstrap_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    brakeman (5.4.0)
+    brakeman (5.4.1)
     brotli (0.4.0)
     browser (5.3.1)
     builder (3.2.4)
@@ -152,7 +152,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    dalli (3.2.3)
+    dalli (3.2.4)
     date (3.3.3)
     debug_inspector (1.1.0)
     deep_merge (1.2.2)
@@ -186,11 +186,11 @@ GEM
       dry-logic (>= 1.5, < 2)
       dry-types (>= 1.7, < 2)
       zeitwerk (~> 2.6)
-    dry-types (1.7.0)
+    dry-types (1.7.1)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
-      dry-inflector (~> 1.0, < 2)
-      dry-logic (>= 1.4, < 2)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     dry-validation (1.10.0)
       concurrent-ruby (~> 1.0)
@@ -238,7 +238,7 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
-    image_optim (0.31.2)
+    image_optim (0.31.3)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       image_size (>= 1.5, < 4)
@@ -430,8 +430,8 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.26.0)
       parser (>= 3.2.1.0)
-    rubocop-minitest (0.27.0)
-      rubocop (>= 0.90, < 2.0)
+    rubocop-minitest (0.28.0)
+      rubocop (>= 1.39, < 2.0)
     rubocop-performance (1.16.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -459,7 +459,7 @@ GEM
       sprockets-rails
       tilt
     secure_headers (6.5.0)
-    selenium-webdriver (4.8.0)
+    selenium-webdriver (4.8.1)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -484,13 +484,13 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    strong_migrations (1.4.2)
+    strong_migrations (1.4.3)
       activerecord (>= 5.2)
     terser (1.1.13)
       execjs (>= 0.3.0, < 3)
     thor (1.2.1)
-    tilt (2.0.11)
-    timeout (0.3.1)
+    tilt (2.1.0)
+    timeout (0.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
diff --git a/config/locales/be.yml b/config/locales/be.yml
index eeb05467e..a97b23805 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -87,7 +87,7 @@ be:
       tracepoint: Пункт следу
       tracetag: Тэг следу
       user: Карыстальнік
-      user_preference: Параметры карыстальніка
+      user_preference: Параметры ўдзельніка
       user_token: Токен карыстальніка
       way: Лінія
       way_node: Пункт лініі
@@ -98,8 +98,8 @@ be:
         url: Галоўны URL-адрас дастасаваньня (абявязкова)
         callback_url: URL-адрас зваротнага выкліку
         support_url: URL-адрас падтрымкі
-        allow_read_prefs: чытаць параметры карыстальніка
-        allow_write_prefs: змяняць параметры карыстальніка
+        allow_read_prefs: чытаць параметры ўдзельніка
+        allow_write_prefs: змяняць параметры ўдзельніка
         allow_write_diary: рабіць запісы ў дзённіку, каментаваць і заводзіць сяброў
         allow_write_api: змяняць карту
         allow_read_gpx: чытаць прыватныя GPS-трэкі
@@ -169,11 +169,10 @@ be:
       trace:
         tagstring: падзеленыя коскамі
       user_block:
-        reason: Прычына блакіроўкі карыстальніка. Калі ласка, будзьце як мага больш
-          спакойнымі і разважлівымі, расказвайце як мага больш дэталяў аб сітуацыі,
-          памятаючы, што паведамленне будзе агульнадаступным. Майце на ўвазе, што
-          не ўсе карыстальнікі разумеюць жаргон супольнасці, таму паспрабуйце не выкарыстоўваць
-          прафесіяналізмы.
+        reason: Прычына блакіроўкі ўдзельніка. Калі ласка, будзьце як мага больш спакойнымі
+          і разважлівымі, расказвайце як мага больш дэталяў аб сітуацыі, памятаючы,
+          што паведамленне будзе агульнадаступным. Майце на ўвазе, што не ўсе карыстальнікі
+          разумеюць жаргон супольнасці, таму паспрабуйце не выкарыстоўваць прафесіяналізмы.
         needs_view: Ці трэба ўдзельніку ўвайсці ў сістэму, перад тым як блакіроўка
           будзе знята?
       user:
diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 7320231c0..df3514aec 100644
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -603,12 +603,24 @@ ku-Latn:
         create:
           notice: Aplîkasyon hate qeydkirin.
   errors:
+    contact:
+      contact_url_title: Çendîn kanalên îrtîbatê hatiye îzahkirin
+      contact: îrtîbat
+      contact_the_community_html: Ger lînkeke xira / çewtiyekê bibînî bi serbestî
+        wan bi lînka %{contact_link} ragihîne civata OpenStreetMapê. URLya temam ya
+        teleba xwe not bike.
+    forbidden:
+      title: Qedexekirî
+      description: Kiryara ku te li ser OpenStreetMapê daxwaz kiriye, tenê ji bo admînan
+        berdest e (HTTP 403)
     internal_server_error:
       title: Çewtiya sepanê
       description: Servera OpenStreetMapê bi halekî nehêvîkirî re rû bi rû bû ku rê
         li ber digire daxwaza te were bicîanîn (HTTP 500)
     not_found:
       title: Dosye peyda nebû
+      description: Ti kiryara dosye/pelrêç/APIyê peyda nebû bi wê navê li ser servera
+        OpenStreetMapê (HTTP 404)
   friendships:
     make_friend:
       heading: Bila %{user} li hevalên te were zêdekirin?
@@ -2671,6 +2683,9 @@ ku-Latn:
       title: Xwe Qeyd Bike
       no_auto_account_create: Mixabin, em vêga nikarin bi otomatîkî ji bo we hesabekî
         çêbikin.
+      please_contact_support_html: Xêra xwe bi %{support_link} re têkiliyê deyne ji
+        bo hesabekî were çêkirin - em ê hewl bidin ku daxwaza te di wextekî kurt de
+        çareser bikin.
       support: piştgirî
       about:
         header: Belaş e û dikare were sererastkirin
@@ -2807,6 +2822,9 @@ ku-Latn:
       support: piştgirî
       automatically_suspended: Bibore, hesaba te ji ber aktîvîteyên şibhedar hatiye
         rawestandin.
+      contact_support_html: Ev qerar wê di wextekî kurt de ji aliyê admînekî ve were
+        kontrolkirin, an tu jî dikarî bi %{support_link} re têkiliyê deynî ger bixwazî
+        vê yekê gotûbêj bikî.
     auth_failure:
       connection_failed: Girêdana bi peydakera teyîdkirina nasnameyê re bi ser neket
       invalid_credentials: Ji bo teyîdkirina nasnameyê agahî nerast in
@@ -3100,9 +3118,14 @@ ku-Latn:
         graphhopper_bicycle: Bisiklêt (GraphHopper)
         graphhopper_car: Erebe (GraphHopper)
         graphhopper_foot: Peyade (GraphHopper)
+        fossgis_valhalla_bicycle: Bisîklêt (Valhalla)
+        fossgis_valhalla_car: Erebe (Valhalla)
+        fossgis_valhalla_foot: Peyade (Valhalla)
       descend: Nizm bûn
       directions: Îstiqametên rotayê
       distance: Mesafe
+      distance_m: '%{distance}m'
+      distance_km: '%{distance}km'
       errors:
         no_route: Di navbera van du cihan de rotayek nehate dîtin.
         no_place: Bibore - '%{place}' nehate dîtin.
diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 1e4830f73..1b15a138b 100644
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -10,6 +10,7 @@
 # Author: Robby
 # Author: Soued031
 # Author: Talex42
+# Author: Volvox
 ---
 lb:
   time:
@@ -102,6 +103,7 @@ lb:
       diary_entry:
         user: Benotzer
         title: Sujet
+        body: Inhalt
         latitude: Geografesch Breet
         longitude: Geografesch Längt
         language_code: Sprooch
@@ -287,6 +289,7 @@ lb:
       public editing:
         heading: Ëffentlecht Beaarbechten
         enabled: Aktivéiert. Net anonym a kann Daten änneren.
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: wat ass dëst?
         disabled: Déaktivéiert an kann keng Daten änneren, all vireg Beaarbeschtungen
           sinn anonym.
@@ -310,6 +313,7 @@ lb:
           ze gesinn an ze akzeptéieren.
         agreed_with_pd: Dir hudd och deklaréiert dass Dir Är Ännerungen der Öffentlechkeet
           zur Verfügung stellt (Public Domain).
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: wat ass dëst?
       save changes button: Ännerunge späicheren
       make edits public button: All meng Ännerunge ëffentlech maachen
@@ -589,7 +593,11 @@ lb:
           notice: Applikatioun registréiert.
   errors:
     contact:
+      contact_url_title: Erklärung vu verschiddene Kontaktkanäl
       contact: kontaktéieren
+      contact_the_community_html: Dir kënnt gären d'OpenStreetMap-Communautéit %{contact_link},
+        wann Dir ee futtisse Link oder e Feeler fannt. Notéiert Iech déi exakt URL
+        vun Ärer Ufro.
     forbidden:
       title: Verbueden
     not_found:
@@ -2145,6 +2153,7 @@ lb:
           school:
           - Schoul
           - Universitéit
+          building: Bedeitend Gebai
           station: Gare (Eisebunn)
           summit:
           - Spëtzt
@@ -2247,11 +2256,13 @@ lb:
       description_without_count: GPX-Fichier vum %{user}
   application:
     settings_menu:
+      account_settings: Astellunge vum Benotzerkont
       oauth1_settings: OAuth 1-Astellungen
       oauth2_applications: OAuth 2 Applikatiounen
       oauth2_authorizations: OAuth 2 Autorisatiounen
   oauth:
     authorize:
+      title: Zougrëff op Äre Benotzerkont autoriséieren
       allow_read_prefs: Är Benotzerastellunge liesen.
       allow_write_prefs: Är Benotzerastellungen änneren.
       allow_write_diary: Bloganträg a Commentairë schreiwen a Frënn fannen
@@ -2450,6 +2461,18 @@ lb:
         hours:
           one: 1 Stonn
           other: '%{count} Stonnen'
+        days:
+          one: 1 Dag
+          other: '%{count} Deeg'
+        weeks:
+          one: 1 Woch
+          other: '%{count} Wochen'
+        months:
+          one: 1 Mount
+          other: '%{count} Méint'
+        years:
+          one: 1 Joer
+          other: '%{count} Joren'
     blocks_on:
       title: Späre vum %{name}
       empty: '%{name} gouf bis elo nach net gespaart.'
@@ -2544,6 +2567,7 @@ lb:
           other: Dir sidd %{count} Féiss vun dësem Punkt ewech
       base:
         standard: Standard
+        cyclosm: CyclOSM
         cycle_map: Vëloskaart
         transport_map: Verkéierskaart
         hot: Humanitär
@@ -2611,6 +2635,8 @@ lb:
         leave_roundabout_without_exit: Aus dem Kreesverkéier erausgoen - %{name}
         stay_roundabout_without_exit: Am Kreesverkéier bleiwen - %{name}
         start_without_exit: Bei %{name} ufänken
+        roundabout_with_exit: Am Rond-point huelt d'Ausfaart %{exit} op %{name}
+        roundabout_with_exit_ordinal: Am Rond-point huelt déi %{exit} exit op %{name}
         exit_roundabout: Am Kreesverkéier d'Ausfaart op %{name} huelen
         unnamed: Strooss ouni Numm
         exit_counts:
diff --git a/config/locales/skr-arab.yml b/config/locales/skr-arab.yml
index 4ee89fd01..61042c3a3 100644
--- a/config/locales/skr-arab.yml
+++ b/config/locales/skr-arab.yml
@@ -285,6 +285,7 @@ skr-arab:
       edit_link: ایں انٹری وچ تبدیلی کرو
       hide_link: ایہ انٹری لکاؤ
       confirm: تصدیق
+      report: ایں اندارج دی رپورٹ کرو
     diary_comment:
       comment_from_html: '%{comment_created_at}دے بارے %{link_user} دی رائے'
       hide_link: ایہ رائے لُکاؤ
@@ -377,6 +378,7 @@ skr-arab:
           prison: جیل
           public_bath: عوامی غسل خانہ
           public_building: عوامی عمارت
+          ranger_station: رینجر ٹیشݨ
           restaurant: ریسٹوران
           school: سکول
           shelter: پناہ گاہ
@@ -466,8 +468,11 @@ skr-arab:
           secondary_link: ثانوی سڑک
           service: سروس روڈ
           speed_camera: رفتار کیمرا
+          steps: پَوڑیاں
           stop: رکݨ دا کنایہ
           track: ٹرَیک
+          trunk: ٹرنک روڈ
+          trunk_link: ٹرنک روڈ
           "yes": سڑک
         historic:
           battlefield: جنگ دا میدان
@@ -511,6 +516,8 @@ skr-arab:
           beehive: ماکھی دا چھتہ
           bridge: پُل
           chimney: چمنی
+          crane: کرین
+          cross: کراس
           lighthouse: لائٹ ہاؤس
           mineshaft: میݙا شافٹ
           pipeline: پائپ لائن
@@ -523,18 +530,22 @@ skr-arab:
           windmill: ہوا چکی
           works: فیکٹری
         military:
+          bunker: بنکر
           "yes": فوج
         mountain_pass:
           "yes": درا
         natural:
           bay: کھاڑی
           beach: ساحل
+          cliff: چٹان
           forest: جنگل
           hill: پہاڑی
           hot_spring: گرم پاݨی دا چشمہ
           island: جزیرہ
           mud: گارا
+          point: نقطہ
           sand: ریت
+          spring: چشمہ
           stone: پتھر
           tree: درخت
           tree_row: جھُنڈ
@@ -546,6 +557,8 @@ skr-arab:
           company: کمپنی
           educational_institution: تعلیمی ادارہ
           employment_agency: روزگار ایجنسی
+          it: آئی ٹی دفتر
+          lawyer: وکیل
           newspaper: اخبار دفتر
           ngo: این جی او دفتر
           notary: نوٹری
@@ -562,6 +575,7 @@ skr-arab:
           country: ملک
           county: کاؤنٹی
           house: ہاؤس
+          houses: گھر
           island: جزیرہ
           municipality: میونسپلٹی
           postcode: پوسٹ کوڈ
@@ -616,7 +630,15 @@ skr-arab:
           ice_cream: آئس کریم دکان
           mall: مال
           massage: سنیہا
+          optician: عینک ساز
+          organic: کاربنی خوِراک دی دُکان
+          photo: فوٹو شاپ
+          sewing: درزی دی ہٹی
+          shoes: چتیاں دی ہٹی
           tailor: درزی
+          tea: چاہ آلا
+          ticket: ٹِکٹ دی دُکان
+          tobacco: تماکو دی دکان
           tyres: ٹائر شاپ
           "yes": دکان
         tourism:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 5850d7f56..f377d9566 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -596,9 +596,16 @@ zh-TW:
           notice: 應用程式已註冊。
   errors:
     contact:
+      contact_url_title: 各種聯絡管道說明
       contact: 聯絡
+      contact_the_community_html: 如果您發現有損壞的連結/錯誤，請隨時%{contact_link}OpenStreetMap 社群。並請記下您的請求的確切
+        URL 位址。
+    forbidden:
+      title: Forbidden
+      description: 您在 OpenStreetMap 伺服器上請求的運作僅限管理員使用（HTTP 403）
     internal_server_error:
       title: 應用程式錯誤
+      description: OpenStreetMap 伺服器遇到意外情況，而無法滿足請求（HTTP 500）
     not_found:
       title: 檔案未找到
       description: 在 OpenStreetMap 服務器上找不到該名稱的文件/目錄/API 操作 (HTTP 404)
@@ -2863,6 +2870,7 @@ zh-TW:
       descend: 下降
       directions: 路線
       distance: 距離
+      distance_m: '%{distance} m'
       distance_km: '%{distance}公里'
       errors:
         no_route: 查無兩個地點間的路徑。
diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index aa99e2a4d..033a221d4 100644
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -195,6 +195,22 @@ class RichTextTest < ActiveSupport::TestCase
     end
   end
 
+  def test_markdown_table_alignment
+    # Ensure that kramdown table alignment styles are converted to bootstrap classes
+    markdown_table = <<~MARKDOWN
+      | foo  | bar |
+      |:----:|----:|
+      |center|right|
+    MARKDOWN
+    r = RichText.new("markdown", markdown_table)
+    assert_html r do
+      assert_select "td[style='text-align:center']", false
+      assert_select "td[class='text-center']", true
+      assert_select "td[style='text-align:right']", false
+      assert_select "td[class='text-end']", true
+    end
+  end
+
   def test_markdown_to_text
     r = RichText.new("markdown", "foo [bar](http://example.com/) baz")
     assert_equal "foo [bar](http://example.com/) baz", r.to_text