diff --git a/priv/gettext/es/LC_MESSAGES/dotcom.po b/priv/gettext/es/LC_MESSAGES/dotcom.po
index 37a4a8a38e..280b86f380 100644
--- a/priv/gettext/es/LC_MESSAGES/dotcom.po
+++ b/priv/gettext/es/LC_MESSAGES/dotcom.po
@@ -5539,15 +5539,10 @@ msgstr "Zona 1A del Puerto Interior"
 msgid "Winthrop and Quincy Ferry"
 msgstr "Winthrop y Quincy Ferry"
 
-<<<<<<< lev/feat/trip_planner/a11y_notice
 #: lib/dotcom_web/live/trip_planner_live.ex
 #, elixir-autogen, elixir-format
 msgid "<strong>Use caution:</strong> Wheelchair-accessible directions are not adjusted for temporary elevator outages. Elevator alerts are shown in trip suggestions when available."
-msgstr "<strong>Ten precaución:</strong> Las direcciones accesibles de persona en silla de ruedas no se ajustan para cortes temporales de ascensores. Las alertas"
-" de ascensor aparecen en las sugerencias de viaje cuando están disponibles."
-=======
 #: lib/dotcom_web/components/trip_planner/results_summary.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong. Please try again later."
-msgstr ""
->>>>>>> main
+msgstr "Algo salió mal. Por favor, inténtalo de nuevo más tarde."
diff --git a/priv/gettext/fr-FR/LC_MESSAGES/dotcom.po b/priv/gettext/fr-FR/LC_MESSAGES/dotcom.po
index 7f3b2ab9c4..1370c990ec 100644
--- a/priv/gettext/fr-FR/LC_MESSAGES/dotcom.po
+++ b/priv/gettext/fr-FR/LC_MESSAGES/dotcom.po
@@ -5540,15 +5540,10 @@ msgstr "Zone 1A du port intérieur"
 msgid "Winthrop and Quincy Ferry"
 msgstr "Winthrop et Quincy Ferry"
 
-<<<<<<< lev/feat/trip_planner/a11y_notice
 #: lib/dotcom_web/live/trip_planner_live.ex
 #, elixir-autogen, elixir-format
 msgid "<strong>Use caution:</strong> Wheelchair-accessible directions are not adjusted for temporary elevator outages. Elevator alerts are shown in trip suggestions when available."
-msgstr "<strong>Soyez prudent :</strong> fauteuil roulant -accessible directions ne sont pas ajustées pour les pannes temporaires de l’ascenseur. Les alertes ascenseur"
-" sont affichées dans les suggestions de trajet lorsque disponibles."
-=======
 #: lib/dotcom_web/components/trip_planner/results_summary.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong. Please try again later."
-msgstr ""
->>>>>>> main
+msgstr "Quelque chose a mal tourné. Veuillez réessayer plus tard."
diff --git a/priv/gettext/ht/LC_MESSAGES/dotcom.po b/priv/gettext/ht/LC_MESSAGES/dotcom.po
index bba4866662..fbd6cc2c75 100644
--- a/priv/gettext/ht/LC_MESSAGES/dotcom.po
+++ b/priv/gettext/ht/LC_MESSAGES/dotcom.po
@@ -5527,14 +5527,10 @@ msgstr "Zòn Pò Enteryè 1A"
 msgid "Winthrop and Quincy Ferry"
 msgstr "Winthrop ak Quincy Ferry"
 
-<<<<<<< lev/feat/trip_planner/a11y_notice
 #: lib/dotcom_web/live/trip_planner_live.ex
 #, elixir-autogen, elixir-format
 msgid "<strong>Use caution:</strong> Wheelchair-accessible directions are not adjusted for temporary elevator outages. Elevator alerts are shown in trip suggestions when available."
-msgstr "<strong>Fè atansyon:</strong> direksyon pou kay asansè a pa ajiste pou pann asansè tanporè. Yo montre sijesyon vwayaj pou asansè a lè yo disponib."
-=======
 #: lib/dotcom_web/components/trip_planner/results_summary.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong. Please try again later."
-msgstr ""
->>>>>>> main
+msgstr "Gen yon bagay ki pa mache byen. Tanpri eseye ankò pita."
diff --git a/priv/gettext/pt-BR/LC_MESSAGES/dotcom.po b/priv/gettext/pt-BR/LC_MESSAGES/dotcom.po
index 624ea36e2c..90c362bd82 100644
--- a/priv/gettext/pt-BR/LC_MESSAGES/dotcom.po
+++ b/priv/gettext/pt-BR/LC_MESSAGES/dotcom.po
@@ -5535,15 +5535,10 @@ msgstr "Zona 1A do Porto Interior"
 msgid "Winthrop and Quincy Ferry"
 msgstr "Balsa Winthrop e Quincy Ferry"
 
-<<<<<<< lev/feat/trip_planner/a11y_notice
 #: lib/dotcom_web/live/trip_planner_live.ex
 #, elixir-autogen, elixir-format
 msgid "<strong>Use caution:</strong> Wheelchair-accessible directions are not adjusted for temporary elevator outages. Elevator alerts are shown in trip suggestions when available."
-msgstr "<strong>Tenha cuidado:</strong> as direções da cadeira de rodas-acessível não são ajustadas para interrupções temporárias do elevador. Os alertas de elevador"
-" são exibidos nas sugestões de viagem quando disponíveis."
-=======
 #: lib/dotcom_web/components/trip_planner/results_summary.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong. Please try again later."
-msgstr ""
->>>>>>> main
+msgstr "Algo deu errado. Por favor, tente novamente mais tarde."
diff --git a/priv/gettext/vi/LC_MESSAGES/dotcom.po b/priv/gettext/vi/LC_MESSAGES/dotcom.po
index e13946242c..28ec77181a 100644
--- a/priv/gettext/vi/LC_MESSAGES/dotcom.po
+++ b/priv/gettext/vi/LC_MESSAGES/dotcom.po
@@ -5531,15 +5531,10 @@ msgstr "Khu vực cảng nội địa 1A"
 msgid "Winthrop and Quincy Ferry"
 msgstr "Winthrop và Quincy Ferry"
 
-<<<<<<< lev/feat/trip_planner/a11y_notice
 #: lib/dotcom_web/live/trip_planner_live.ex
 #, elixir-autogen, elixir-format
 msgid "<strong>Use caution:</strong> Wheelchair-accessible directions are not adjusted for temporary elevator outages. Elevator alerts are shown in trip suggestions when available."
-msgstr "<strong>Sử dụng thận trọng:</strong> xe lăn-có thể tiếp cận được chỉ đường không được điều chỉnh cho thang máy tạm thờitages. Cảnh báo thang máy được hiển"
-" thị trong đề xuất chuyến đi khi có sẵn."
-=======
 #: lib/dotcom_web/components/trip_planner/results_summary.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong. Please try again later."
-msgstr ""
->>>>>>> main
+msgstr "Đã xảy ra lỗi. Vui lòng thử lại sau."
diff --git a/priv/gettext/zh-CN/LC_MESSAGES/dotcom.po b/priv/gettext/zh-CN/LC_MESSAGES/dotcom.po
index 3ae31d5447..bb8541f49f 100644
--- a/priv/gettext/zh-CN/LC_MESSAGES/dotcom.po
+++ b/priv/gettext/zh-CN/LC_MESSAGES/dotcom.po
@@ -5511,14 +5511,10 @@ msgstr "内港区 1A"
 msgid "Winthrop and Quincy Ferry"
 msgstr "Winthrop和Quincy Ferry"
 
-<<<<<<< lev/feat/trip_planner/a11y_notice
 #: lib/dotcom_web/live/trip_planner_live.ex
 #, elixir-autogen, elixir-format
 msgid "<strong>Use caution:</strong> Wheelchair-accessible directions are not adjusted for temporary elevator outages. Elevator alerts are shown in trip suggestions when available."
-msgstr "<strong>请谨慎使用：</strong>轮椅-使用方向不会因电梯临时停运而调整。 如有电梯警报，将在行程建议中显示。"
-=======
 #: lib/dotcom_web/components/trip_planner/results_summary.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong. Please try again later."
-msgstr ""
->>>>>>> main
+msgstr "出问题了。请稍后再试。"
diff --git a/priv/gettext/zh-TW/LC_MESSAGES/dotcom.po b/priv/gettext/zh-TW/LC_MESSAGES/dotcom.po
index 6f4ce2077c..e1c2871c30 100644
--- a/priv/gettext/zh-TW/LC_MESSAGES/dotcom.po
+++ b/priv/gettext/zh-TW/LC_MESSAGES/dotcom.po
@@ -5514,8 +5514,7 @@ msgstr "Winthrop和Quincy Ferry"
 #: lib/dotcom_web/live/trip_planner_live.ex
 #, elixir-autogen, elixir-format
 msgid "<strong>Use caution:</strong> Wheelchair-accessible directions are not adjusted for temporary elevator outages. Elevator alerts are shown in trip suggestions when available."
-msgstr "<strong>請謹慎使用：</strong>輪椅-使用方向不會因電梯暫時停駛而調整。 如有電梯警報，將在行程建議中顯示。"
 #: lib/dotcom_web/components/trip_planner/results_summary.ex
 #, elixir-autogen, elixir-format
 msgid "Something went wrong. Please try again later."
-msgstr ""
+msgstr "出問題了。請稍後再試。"