From 1a0f32e9db7f9c1bac6dbd000ad4293e60ea2869 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 5 Mar 2026 15:39:43 +0100
Subject: [PATCH 1/9] [T3038] FIX: changed tab names to MyCompassion

- FEAT: created an override template for titles in all MyCompassion pages
- FEAT: added template override to manifest
---
 my_compassion/__manifest__.py                      | 1 +
 my_compassion/templates/website_title_override.xml | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 my_compassion/templates/website_title_override.xml

diff --git a/my_compassion/__manifest__.py b/my_compassion/__manifest__.py
index e4bbef98..2e5d1b14 100644
--- a/my_compassion/__manifest__.py
+++ b/my_compassion/__manifest__.py
@@ -52,6 +52,7 @@
         "templates/login_template.xml",
         "templates/signup.xml",
         "templates/my2_change_password.xml",
+        "templates/website_title_override.xml",
         "views/correspondence_template_view.xml",
         "views/my2_event_banner_views.xml",
         "views/partner_compassion_view.xml",
diff --git a/my_compassion/templates/website_title_override.xml b/my_compassion/templates/website_title_override.xml
new file mode 100644
index 00000000..1ff86ff0
--- /dev/null
+++ b/my_compassion/templates/website_title_override.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <!-- This template overrides the default website title to 'MyCompassion' -->
+    <template id="layout" inherit_id="website.layout">
+        <xpath expr="//title" position="replace">
+            <title>MyCompassion</title>
+        </xpath>
+    </template>
+</odoo>

From ccddca59974d0a4a12c63a79829847b71c736226 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 5 Mar 2026 15:54:50 +0100
Subject: [PATCH 2/9] [T3038] REFACTOR: changed template global override to
 record

- REFACTOR: using record with website filter to avoid global override and replace command
---
 .../templates/website_title_override.xml       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/my_compassion/templates/website_title_override.xml b/my_compassion/templates/website_title_override.xml
index 1ff86ff0..c2026a56 100644
--- a/my_compassion/templates/website_title_override.xml
+++ b/my_compassion/templates/website_title_override.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <!-- This template overrides the default website title to 'MyCompassion' -->
-    <template id="layout" inherit_id="website.layout">
-        <xpath expr="//title" position="replace">
-            <title>MyCompassion</title>
-        </xpath>
-    </template>
+    <!-- This record overrides the default MyCompassion website title to 'MyCompassion' -->
+    <record id="mycompassion_website_title_override" model="ir.ui.view">
+        <field name="name">MyCompassion Layout Title</field>
+        <field name="inherit_id" ref="website.layout" />
+        <field name="website_id" ref="my_compassion.my2_website" />
+        <field name="type">qweb</field>
+        <field name="arch" type="xml">
+            <xpath expr="//title" position="replace">
+                <title>MyCompassion</title>
+            </xpath>
+        </field>
+    </record>
 </odoo>

From f9670706f2b7ab7083b7a81f8c2ef95c4bff59aa Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Thu, 5 Mar 2026 16:04:13 +0100
Subject: [PATCH 3/9] [T3038] FIX: using attributes + t-esc instead of replace

pre-commit complained again as usual
---
 my_compassion/templates/website_title_override.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/my_compassion/templates/website_title_override.xml b/my_compassion/templates/website_title_override.xml
index c2026a56..cff37364 100644
--- a/my_compassion/templates/website_title_override.xml
+++ b/my_compassion/templates/website_title_override.xml
@@ -6,9 +6,10 @@
         <field name="inherit_id" ref="website.layout" />
         <field name="website_id" ref="my_compassion.my2_website" />
         <field name="type">qweb</field>
+        <field name="priority">99</field>
         <field name="arch" type="xml">
-            <xpath expr="//title" position="replace">
-                <title>MyCompassion</title>
+            <xpath expr="//title" position="attributes">
+                <attribute name="t-esc">'MyCompassion'</attribute>
             </xpath>
         </field>
     </record>

From daafe38d74ac03a940bf44e5e04a43490f61a53a Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Fri, 6 Mar 2026 16:07:22 +0100
Subject: [PATCH 4/9] [T3038] REFACTOR: added title to pages

- REFACTOR: applied <t t-set="additional_title">Page Title</t> to all mycompassion pages
---
 my_compassion/__manifest__.py                    |  1 -
 my_compassion/templates/login_template.xml       |  2 ++
 my_compassion/templates/my2_change_password.xml  |  2 ++
 my_compassion/templates/pages/my2_add_a_gift.xml |  2 ++
 .../templates/pages/my2_child_letters.xml        |  2 ++
 .../templates/pages/my2_child_timeline.xml       |  2 ++
 my_compassion/templates/pages/my2_children.xml   |  2 ++
 my_compassion/templates/pages/my2_dashboard.xml  |  2 ++
 .../templates/pages/my2_donation_details.xml     |  2 ++
 my_compassion/templates/pages/my2_donations.xml  |  2 ++
 .../templates/pages/my2_gift_package.xml         |  2 ++
 my_compassion/templates/pages/my2_gifts.xml      |  2 ++
 .../templates/pages/my2_gifts_thank_you.xml      |  2 ++
 .../templates/pages/my2_login_template.xml       |  2 ++
 my_compassion/templates/pages/my2_new_letter.xml |  2 ++
 .../pages/my2_new_sponsorship_wizard.xml         |  4 ++++
 .../templates/pages/my2_sponsorships.xml         |  2 ++
 .../templates/pages/my2_user_settings.xml        |  2 ++
 .../templates/website_title_override.xml         | 16 ----------------
 19 files changed, 36 insertions(+), 17 deletions(-)
 delete mode 100644 my_compassion/templates/website_title_override.xml

diff --git a/my_compassion/__manifest__.py b/my_compassion/__manifest__.py
index 2e5d1b14..e4bbef98 100644
--- a/my_compassion/__manifest__.py
+++ b/my_compassion/__manifest__.py
@@ -52,7 +52,6 @@
         "templates/login_template.xml",
         "templates/signup.xml",
         "templates/my2_change_password.xml",
-        "templates/website_title_override.xml",
         "views/correspondence_template_view.xml",
         "views/my2_event_banner_views.xml",
         "views/partner_compassion_view.xml",
diff --git a/my_compassion/templates/login_template.xml b/my_compassion/templates/login_template.xml
index ba1c5981..fa3d820b 100644
--- a/my_compassion/templates/login_template.xml
+++ b/my_compassion/templates/login_template.xml
@@ -19,6 +19,8 @@
     </template>
     <!-- oca-hooks:disable=xml-dangerous-qweb-replace-low-priority -->
     <template id="login_layout" inherit_id="website.login_layout">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Login</t>
         <xpath expr="t" position="replace">
             <t t-call="website.layout">
                 <div class="container mt-5 mx-auto">
diff --git a/my_compassion/templates/my2_change_password.xml b/my_compassion/templates/my2_change_password.xml
index 522eb61a..243222c6 100644
--- a/my_compassion/templates/my2_change_password.xml
+++ b/my_compassion/templates/my2_change_password.xml
@@ -6,6 +6,8 @@
         priority="99"
     >
         <xpath expr="t" position="replace">
+            <!-- Set the page title -->
+            <t t-set="additional_title">Change Password</t>
             <t t-call="website.layout">
                 <div class="container col-lg-6 mx-auto">
                     <!-- Change password -->
diff --git a/my_compassion/templates/pages/my2_add_a_gift.xml b/my_compassion/templates/pages/my2_add_a_gift.xml
index bd3622ae..4a429c6c 100644
--- a/my_compassion/templates/pages/my2_add_a_gift.xml
+++ b/my_compassion/templates/pages/my2_add_a_gift.xml
@@ -14,6 +14,8 @@
 <odoo>
     <!-- ADD A GIFT PAGE -->
     <template id="my2_add_a_gift_page" name="Add a Gift Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Add a Gift</t>
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_add_a_gift.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_add_a_gift.css" />
diff --git a/my_compassion/templates/pages/my2_child_letters.xml b/my_compassion/templates/pages/my2_child_letters.xml
index bc3d6143..cd6d9658 100644
--- a/my_compassion/templates/pages/my2_child_letters.xml
+++ b/my_compassion/templates/pages/my2_child_letters.xml
@@ -14,6 +14,8 @@
 -->
 <odoo>
     <template id="my2_child_letters_page" name="My Compassion 2 Child Letters Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Letters</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/child_letters.css" />
         <t t-call="website.layout">
             <div class="container">
diff --git a/my_compassion/templates/pages/my2_child_timeline.xml b/my_compassion/templates/pages/my2_child_timeline.xml
index a7a8396d..dbd28f8d 100644
--- a/my_compassion/templates/pages/my2_child_timeline.xml
+++ b/my_compassion/templates/pages/my2_child_timeline.xml
@@ -23,6 +23,8 @@
 -->
 <odoo>
     <template id="my2_child_timeline_page" name="My Compassion 2 Child Timeline Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title" t-value="compassion_child.preferred_name" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/child_profile.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/child_profile_timeline.css" />
         <t
diff --git a/my_compassion/templates/pages/my2_children.xml b/my_compassion/templates/pages/my2_children.xml
index 6efa201e..da51f4a4 100644
--- a/my_compassion/templates/pages/my2_children.xml
+++ b/my_compassion/templates/pages/my2_children.xml
@@ -14,6 +14,8 @@ Page: My Compassion 2 Children Page
 -->
 <odoo>
     <template id="my2_children_page" name="My Compassion 2 Children Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">My Sponsorships</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- Title -->
diff --git a/my_compassion/templates/pages/my2_dashboard.xml b/my_compassion/templates/pages/my2_dashboard.xml
index 7405e1ae..3349b841 100644
--- a/my_compassion/templates/pages/my2_dashboard.xml
+++ b/my_compassion/templates/pages/my2_dashboard.xml
@@ -22,6 +22,8 @@ Page: My Compassion 2 Dashboard Page
     </template>
     <!-- DASHBOARD -->
     <template id="my2_dashboard_page" name="My Compassion 2 Dashboard Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Home</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_dashboard.css" />
         <t t-call="website.layout">
             <div class="container">
diff --git a/my_compassion/templates/pages/my2_donation_details.xml b/my_compassion/templates/pages/my2_donation_details.xml
index b7bff7a4..4ddde216 100644
--- a/my_compassion/templates/pages/my2_donation_details.xml
+++ b/my_compassion/templates/pages/my2_donation_details.xml
@@ -16,6 +16,8 @@
 <odoo>
     <!-- DONATION DETAILS PAGE -->
     <template id="my2_donation_details_page" name="Donation Details Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title" t-value="'Gifts - ' + product.my_compassion_name" />
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_donation_details.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_donation_details.css" />
diff --git a/my_compassion/templates/pages/my2_donations.xml b/my_compassion/templates/pages/my2_donations.xml
index 09c47802..12a3f4b7 100644
--- a/my_compassion/templates/pages/my2_donations.xml
+++ b/my_compassion/templates/pages/my2_donations.xml
@@ -29,6 +29,8 @@ Page: My Compassion 2 Donations Page
 <odoo>
     <data>
         <template id="my2_my_donations_page" name="My Account Donations Details">
+            <!-- Set the page title -->
+            <t t-set="additional_title">My Donations</t>
             <t t-call="website.layout">
                 <div class="container">
                     <div class="single-column">
diff --git a/my_compassion/templates/pages/my2_gift_package.xml b/my_compassion/templates/pages/my2_gift_package.xml
index bdcdc342..d616f2af 100644
--- a/my_compassion/templates/pages/my2_gift_package.xml
+++ b/my_compassion/templates/pages/my2_gift_package.xml
@@ -120,6 +120,8 @@
     </template>
     <!-- GIFT PACKAGE PAGE -->
     <template id="my2_gift_package_page" name="Gift Package Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Gift Basket</t>
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_gift_package.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_gift_package.css" />
diff --git a/my_compassion/templates/pages/my2_gifts.xml b/my_compassion/templates/pages/my2_gifts.xml
index 61b3cc4b..934d45a2 100644
--- a/my_compassion/templates/pages/my2_gifts.xml
+++ b/my_compassion/templates/pages/my2_gifts.xml
@@ -18,6 +18,8 @@ Page: My Compassion 2 Gifts Page
 <odoo>
     <!-- GIFTS DASHBOARD -->
     <template id="my2_gifts_page" name="My Compassion 2 Gifts Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Gifts</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- HELPER FLAGS -->
diff --git a/my_compassion/templates/pages/my2_gifts_thank_you.xml b/my_compassion/templates/pages/my2_gifts_thank_you.xml
index 40bd52dc..dc6d1cf4 100644
--- a/my_compassion/templates/pages/my2_gifts_thank_you.xml
+++ b/my_compassion/templates/pages/my2_gifts_thank_you.xml
@@ -13,6 +13,8 @@ Page: My Compassion 2 Thank you Page
 -->
 <odoo>
     <template id="my2_gifts_thank_you_page" name="My Compassion 2 Thank you Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Thank you</t>
         <!-- Include stylesheet -->
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_gifts_thank_you.css" />
         <t t-call="website.layout">
diff --git a/my_compassion/templates/pages/my2_login_template.xml b/my_compassion/templates/pages/my2_login_template.xml
index ac3b24ec..947c0b7a 100644
--- a/my_compassion/templates/pages/my2_login_template.xml
+++ b/my_compassion/templates/pages/my2_login_template.xml
@@ -4,6 +4,8 @@
     <!-- Custom Login Page Layout -->
     <template id="my2_login_template" inherit_id="website.login_layout" website_id="my_compassion.my2_website">
         <xpath expr="t" position="replace">
+            <!-- Set the page title -->
+            <t t-set="additional_title">Login</t>
             <t t-set="no_footer" t-value="True" />
             <!-- Add css to the page -->
             <link rel="stylesheet" href="/my_compassion/static/src/css/my2_login.css" />
diff --git a/my_compassion/templates/pages/my2_new_letter.xml b/my_compassion/templates/pages/my2_new_letter.xml
index ff438c3d..998f3523 100644
--- a/my_compassion/templates/pages/my2_new_letter.xml
+++ b/my_compassion/templates/pages/my2_new_letter.xml
@@ -16,6 +16,8 @@
 -->
 <odoo>
     <template id="my2_new_letter_page" name="My Compassion 2 New Letter Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">New Letter</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/template_image.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/add_a_picture_input.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/delete_a_picture_input.css" />
diff --git a/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml b/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml
index 73a1a736..2e0cfb68 100644
--- a/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml
+++ b/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml
@@ -534,6 +534,8 @@ Page: My Compassion 2 New Sponsorship Wizard Page
     </template>
     <!-- NEW SPONSORSHIP WIZARD PAGE -->
     <template id="my2_new_sponsorship_wizard_page" name="New Sponsorship Wizard Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Payment Options</t>
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_new_sponsorship_wizard.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_new_sponsorship_wizard.css" />
         <t t-call="website.layout">
@@ -550,6 +552,8 @@ Page: My Compassion 2 New Sponsorship Wizard Page
     </template>
     <!-- NEW SPONSORSHIP THANK YOU PAGE -->
     <template id="my2_new_sponsorship_thank_you_page" name="New Sponsorship Thank You Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Thank you</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_new_sponsorship_wizard.css" />
         <t t-call="website.layout">
             <div class="container">
diff --git a/my_compassion/templates/pages/my2_sponsorships.xml b/my_compassion/templates/pages/my2_sponsorships.xml
index 0b7cacfe..761ceb24 100644
--- a/my_compassion/templates/pages/my2_sponsorships.xml
+++ b/my_compassion/templates/pages/my2_sponsorships.xml
@@ -38,6 +38,8 @@ Page: My Compassion 2 Sponsorships Page
     </template>
     <!-- SPONSORSHIPS PAGE -->
     <template id="my2_sponsorships_page" name="Sponsorships Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Sponsor a child</t>
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_sponsorships.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_sponsorships.css" />
         <t t-call="website.layout">
diff --git a/my_compassion/templates/pages/my2_user_settings.xml b/my_compassion/templates/pages/my2_user_settings.xml
index 2ffab798..6bd41ed3 100644
--- a/my_compassion/templates/pages/my2_user_settings.xml
+++ b/my_compassion/templates/pages/my2_user_settings.xml
@@ -22,6 +22,8 @@ Injected data:
 -->
 <odoo>
     <template id="my2_user_settings_page" name="My Compassion 2 User Settings Page">
+        <!-- Set the page title -->
+        <t t-set="additional_title">Settings</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/user_settings.css" />
         <t t-call="website.layout">
             <div class="container my-4">
diff --git a/my_compassion/templates/website_title_override.xml b/my_compassion/templates/website_title_override.xml
deleted file mode 100644
index cff37364..00000000
--- a/my_compassion/templates/website_title_override.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <!-- This record overrides the default MyCompassion website title to 'MyCompassion' -->
-    <record id="mycompassion_website_title_override" model="ir.ui.view">
-        <field name="name">MyCompassion Layout Title</field>
-        <field name="inherit_id" ref="website.layout" />
-        <field name="website_id" ref="my_compassion.my2_website" />
-        <field name="type">qweb</field>
-        <field name="priority">99</field>
-        <field name="arch" type="xml">
-            <xpath expr="//title" position="attributes">
-                <attribute name="t-esc">'MyCompassion'</attribute>
-            </xpath>
-        </field>
-    </record>
-</odoo>

From c0fcfcdb3b121c6684cf0d73bb3ed9de903c0a14 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 9 Mar 2026 15:06:34 +0100
Subject: [PATCH 5/9] [T3038] REFACTOR: moved the additional titles to the
 controllers

- REFACTOR: additional_titles's are now passed on from the controllers (and are translated now)
- REFACTOR: added reset password intercept controller
- FEAT: added translation paths and new translations for new titles
---
 my_compassion/controllers/__init__.py         |  1 +
 my_compassion/controllers/my2_children.py     |  2 +
 my_compassion/controllers/my2_donations.py    | 12 +++-
 my_compassion/controllers/my2_gifts.py        |  2 +
 my_compassion/controllers/my2_letters.py      |  2 +
 my_compassion/controllers/my2_login.py        |  9 ++-
 .../controllers/my2_reset_password.py         | 28 ++++++++++
 my_compassion/controllers/my2_sponsorships.py |  4 ++
 my_compassion/controllers/my2_user.py         |  2 +
 .../controllers/my2_user_settings.py          |  1 +
 my_compassion/i18n/de.po                      | 56 +++++++++++++++++++
 my_compassion/i18n/fr_CH.po                   | 56 +++++++++++++++++++
 my_compassion/i18n/it.po                      | 56 +++++++++++++++++++
 my_compassion/templates/login_template.xml    |  2 -
 .../templates/my2_change_password.xml         |  2 -
 .../templates/pages/my2_add_a_gift.xml        |  2 -
 .../templates/pages/my2_child_letters.xml     |  2 -
 .../templates/pages/my2_child_timeline.xml    |  2 -
 .../templates/pages/my2_children.xml          |  2 -
 .../templates/pages/my2_dashboard.xml         |  2 -
 .../templates/pages/my2_donation_details.xml  |  2 -
 .../templates/pages/my2_donations.xml         |  2 -
 .../templates/pages/my2_gift_package.xml      |  2 -
 my_compassion/templates/pages/my2_gifts.xml   |  2 -
 .../templates/pages/my2_gifts_thank_you.xml   |  2 -
 .../templates/pages/my2_login_template.xml    |  2 -
 .../templates/pages/my2_new_letter.xml        |  2 -
 .../pages/my2_new_sponsorship_wizard.xml      |  4 --
 .../templates/pages/my2_sponsorships.xml      |  2 -
 .../templates/pages/my2_user_settings.xml     |  2 -
 30 files changed, 229 insertions(+), 38 deletions(-)
 create mode 100644 my_compassion/controllers/my2_reset_password.py

diff --git a/my_compassion/controllers/__init__.py b/my_compassion/controllers/__init__.py
index 15e24156..55aa4b56 100644
--- a/my_compassion/controllers/__init__.py
+++ b/my_compassion/controllers/__init__.py
@@ -20,6 +20,7 @@
     my2_user_settings,
     my2_sponsorships,
     my2_login,
+    my2_reset_password,
     my2_auth_signup,
     my2_event_banner,
     my2_home_redirect,
diff --git a/my_compassion/controllers/my2_children.py b/my_compassion/controllers/my2_children.py
index 47c99286..8d85c0f8 100644
--- a/my_compassion/controllers/my2_children.py
+++ b/my_compassion/controllers/my2_children.py
@@ -334,6 +334,7 @@ def my2_render_children_page(self, **kwargs):
                 ),
                 "latest_correspondences_by_child_id": latest_corr_by_child,
                 "breadcrumbs": breadcrumbs,
+                "additional_title": _("My Sponsorships"),
             },
         )
 
@@ -383,6 +384,7 @@ def my2_render_child_timeline_page(self, child, **kwargs):
                 "google_custom_map_id": google_custom_map_id,
                 "timezone": child.sudo().project_id.timezone,
                 "birthday_formatted": birthday_formatted,
+                "additional_title": child.sudo().preferred_name,
             },
         )
 
diff --git a/my_compassion/controllers/my2_donations.py b/my_compassion/controllers/my2_donations.py
index 357db9bb..5d86a125 100644
--- a/my_compassion/controllers/my2_donations.py
+++ b/my_compassion/controllers/my2_donations.py
@@ -16,6 +16,7 @@
 
 from odoo import fields, http
 from odoo.http import request
+from odoo.tools.translate import _
 
 from odoo.addons.portal.controllers.portal import CustomerPortal
 
@@ -41,6 +42,9 @@ def my2_render_donation_details_page(self, product, **kwargs):
             "product": product,
             "sponsorships": sponsorships,
             "donation_limits": donation_limits,
+            "additional_title": "{} - {}".format(
+                _("Gifts"), product.my_compassion_name
+            ),
         }
 
         return request.render(
@@ -180,6 +184,7 @@ def my2_render_gift_package_page(self, **kwargs):
                 "order": order,
                 "limits": limits,
                 "acquirer": acquirer,
+                "additional_title": _("Gift Basket"),
             },
         )
 
@@ -299,6 +304,7 @@ def my2_render_add_a_gift_page(self, **kwargs):
                 "sponsorships": sponsorships,
                 "limits": limits,
                 "currency_name": order.pricelist_id.currency_id.name,
+                "additional_title": _("Add a Gift"),
             },
         )
 
@@ -315,7 +321,10 @@ def my2_gifts_thank_you_page(self, **kwargs):
             sale_order = request.env["sale.order"].sudo().browse(sale_order_id)
             return request.render(
                 "my_compassion.my2_gifts_thank_you_page",
-                {"sale_order": sale_order},
+                {
+                    "sale_order": sale_order,
+                    "additional_title": _("Thank you"),
+                },
             )
         return request.redirect("/my2/dashboard")
 
@@ -449,6 +458,7 @@ def my_donations(self, invoice_page=1, invoice_per_page=12, **kw):
                 "paid_invoices_subset": paid_invoices_data["paid_invoices_subset"],
                 "current_page": paid_invoices_data["current_page"],
                 "total_pages": paid_invoices_data["total_pages"],
+                "additional_title": _("My Donations"),
             }
         )
         return request.render("my_compassion.my2_my_donations_page", values)
diff --git a/my_compassion/controllers/my2_gifts.py b/my_compassion/controllers/my2_gifts.py
index b1753a18..7df7d4d3 100644
--- a/my_compassion/controllers/my2_gifts.py
+++ b/my_compassion/controllers/my2_gifts.py
@@ -9,6 +9,7 @@
 
 from odoo import http
 from odoo.http import request
+from odoo.tools.translate import _
 
 
 class MyCompassionGiftController(http.Controller):
@@ -32,5 +33,6 @@ def render_donation_page(self, type="fund", **kwargs):
             {
                 "my_compassion_gifts": my_compassion_gifts,
                 "type": type,
+                "additional_title": _("Give"),
             },
         )
diff --git a/my_compassion/controllers/my2_letters.py b/my_compassion/controllers/my2_letters.py
index f29e4bbb..4f565685 100644
--- a/my_compassion/controllers/my2_letters.py
+++ b/my_compassion/controllers/my2_letters.py
@@ -177,6 +177,7 @@ def my2_render_child_letters_page(self, **kwargs):
                 },
                 "nr_filters_applied": nr_filters_applied,
                 "months": months,
+                "additional_title": _("Letters"),
             },
         )
 
@@ -261,6 +262,7 @@ def my2_render_new_letter_page(self, **kwargs):
                 "sponsorship_ids": sponsorships,
                 "templates": templates,
                 "draft": draft,
+                "additional_title": _("New Letter"),
             },
         )
 
diff --git a/my_compassion/controllers/my2_login.py b/my_compassion/controllers/my2_login.py
index b75d0bbc..23618828 100644
--- a/my_compassion/controllers/my2_login.py
+++ b/my_compassion/controllers/my2_login.py
@@ -10,6 +10,7 @@
 # -*- coding: utf-8 -*-
 from odoo import http
 from odoo.http import request
+from odoo.tools.translate import _
 
 from odoo.addons.website.controllers.main import Website
 
@@ -27,4 +28,10 @@ def web_login(self, *args, **kw):
             return request.redirect("/my2/dashboard/")
 
         # If the user is not logged in, execute the original Odoo logic for login
-        return super().web_login(*args, **kw)
+        response = super().web_login(*args, **kw)
+
+        # Inject page title
+        if hasattr(response, "qcontext"):
+            response.qcontext["additional_title"] = _("Login")
+
+        return response
diff --git a/my_compassion/controllers/my2_reset_password.py b/my_compassion/controllers/my2_reset_password.py
new file mode 100644
index 00000000..654f7d3d
--- /dev/null
+++ b/my_compassion/controllers/my2_reset_password.py
@@ -0,0 +1,28 @@
+##############################################################################
+#
+#    Copyright (C) 2026 Compassion CH (http://www.compassion.ch)
+#    @author: Daniel Gergely <dgergely@compassion.ch>
+#
+#    The licence is in the file __manifest__.py
+#
+##############################################################################
+
+# -*- coding: utf-8 -*-
+from odoo import http
+from odoo.tools.translate import _
+
+from odoo.addons.auth_signup.controllers.main import AuthSignupHome
+
+class WebsitePasswordReset(AuthSignupHome):
+    @http.route('/web/reset_password', type='http', auth='public', website=True, sitemap=False)
+    def web_auth_reset_password(self, *args, **kw):
+        """
+        Adds an 'additional_title' to the password reset page.
+        """
+        response = super().web_auth_reset_password(*args, **kw)
+
+        # Inject page title
+        if hasattr(response, 'qcontext'):
+            response.qcontext['additional_title'] = _('Reset Password')
+
+        return response
\ No newline at end of file
diff --git a/my_compassion/controllers/my2_sponsorships.py b/my_compassion/controllers/my2_sponsorships.py
index 61cf6a2c..ee991f95 100644
--- a/my_compassion/controllers/my2_sponsorships.py
+++ b/my_compassion/controllers/my2_sponsorships.py
@@ -14,6 +14,7 @@
 
 from odoo import fields, http
 from odoo.http import request
+from odoo.tools.translate import _
 
 from odoo.addons.website_sponsorship.controllers.main import WebsiteChild
 from odoo.addons.website_sponsorship.models.compassion_child import ChildNotFound
@@ -44,6 +45,7 @@ def my2_render_sponsorships_page(self, **kwargs):
             {
                 "countries": countries,
                 "sponsorship_type": "standard",
+                "additional_title": _("Sponsor a child"),
             },
         )
 
@@ -235,6 +237,7 @@ def wizard_start(self, child, sponsorship_type="standard", **kwargs):
             "my_compassion.my2_new_sponsorship_wizard_page",
             {
                 "form_content_html": self._render_form_content(wizard),
+                "additional_title": _("Payment options"),
             },
         )
 
@@ -316,6 +319,7 @@ def wizard_thank_you(self, sponsorship_id, **kwargs):
             {
                 "n_steps": 3,
                 "sponsorship": sponsorship,
+                "additional_title": _("Thank you"),
             },
         )
 
diff --git a/my_compassion/controllers/my2_user.py b/my_compassion/controllers/my2_user.py
index bf31dd00..bfab477c 100644
--- a/my_compassion/controllers/my2_user.py
+++ b/my_compassion/controllers/my2_user.py
@@ -8,6 +8,7 @@
 ##############################################################################
 from odoo import http
 from odoo.http import request
+from odoo.tools.translate import _
 
 
 class MyCompassionUserController(http.Controller):
@@ -29,6 +30,7 @@ def my2_render_dashboard_page(self, **kwargs):
                 "has_unread_correspondence": has_unread_correspondence,
                 "sorted_vignettes": vignettes_data,
                 "partner": partner,
+                "additional_title": _("Home"),
             },
         )
 
diff --git a/my_compassion/controllers/my2_user_settings.py b/my_compassion/controllers/my2_user_settings.py
index e6c64427..3b8c37b2 100644
--- a/my_compassion/controllers/my2_user_settings.py
+++ b/my_compassion/controllers/my2_user_settings.py
@@ -38,6 +38,7 @@ def render_user_settings_page(self, **kwargs):
                 "titles": titles,
                 "countries": countries,
                 "current_tab": current_tab,
+                "additional_title": _("Settings"),
             },
         )
 
diff --git a/my_compassion/i18n/de.po b/my_compassion/i18n/de.po
index b2a4f73e..5ab08ebe 100644
--- a/my_compassion/i18n/de.po
+++ b/my_compassion/i18n/de.po
@@ -838,7 +838,9 @@ msgid "Add &amp; check out"
 msgstr "Hinzufügen &amp; zur Kasse gehen"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_add_a_gift_page
+#, python-format
 msgid "Add a Gift"
 msgstr "Ein Geschenk hinzufügen"
 
@@ -1974,7 +1976,9 @@ msgid "Gift"
 msgstr "Geschenk"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_page
+#, python-format
 msgid "Gift Basket"
 msgstr "Geschenkkorb"
 
@@ -2009,6 +2013,8 @@ msgstr "Mädchen"
 #: model_terms:ir.ui.view,arch_db:my_compassion.dashboard_donations_vignette
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#: code:addons/my_compassion/controllers/my2_gifts.py:0
+#, python-format
 msgid "Give"
 msgstr "Geben"
 
@@ -2055,7 +2061,11 @@ msgid "Hobbies"
 msgstr "Hobbys"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_user.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.http_error_custom
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_dashboard_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#, python-format
 msgid "Home"
 msgstr "Startseite"
 
@@ -2484,7 +2494,10 @@ msgid "Letter saved!"
 msgstr "Brief gespeichert!"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_letters.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_letters_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#, python-format
 msgid "Letters"
 msgstr "Briefe"
 
@@ -2746,7 +2759,10 @@ msgid "My Country"
 msgstr "Mein Land"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_my_donations_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_account_menu
+#, python-format
 msgid "My Donations"
 msgstr "Meine Spenden"
 
@@ -2766,7 +2782,9 @@ msgid "My Sponsorship"
 msgstr "Meine Patenschaft"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_children.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_children_page
+#, python-format
 msgid "My Sponsorships"
 msgstr "Meine Patenschaften"
 
@@ -3068,7 +3086,9 @@ msgid "Payment mode"
 msgstr "Zahlungsart"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model:new.sponsorship.wizard.step,title:my_compassion.new_sponsorship_wizard_step_payment_methods
+#, python-format
 msgid "Payment options"
 msgstr "Zahlungsoptionen"
 
@@ -3555,7 +3575,9 @@ msgid "Sponsor"
 msgstr "Finde ein Patenkind"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_sponsorships_page
+#, python-format
 msgid "Sponsor a child"
 msgstr "Eine Patenschaft übernehmen"
 
@@ -3782,7 +3804,10 @@ msgid "Text Color"
 msgstr "Textfarbe"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_thank_you_page
+#, python-format
 msgid "Thank you"
 msgstr "Vielen Dank"
 
@@ -4604,3 +4629,34 @@ msgid ""
 msgstr ""
 "Jahre alt\n"
 "                        <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_login.py:0
+#, python-format
+msgid "Login"
+msgstr "Login"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my_reset_password.py:0
+#, python-format
+msgid "Reset Password"
+msgstr "Passwort zurücksetzen"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#, python-format
+msgid "Gifts"
+msgstr "Geschenke"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_letters.py:0
+#, python-format
+msgid "New Letter"
+msgstr "Neuer Brief"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_user_settings.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_user_settings_page
+#, python-format
+msgid "Settings"
+msgstr "Einstellungen"
\ No newline at end of file
diff --git a/my_compassion/i18n/fr_CH.po b/my_compassion/i18n/fr_CH.po
index 9dcd2a73..665d3bde 100644
--- a/my_compassion/i18n/fr_CH.po
+++ b/my_compassion/i18n/fr_CH.po
@@ -787,7 +787,9 @@ msgid "Add &amp; check out"
 msgstr "Ajouter au panier"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_add_a_gift_page
+#, python-format
 msgid "Add a Gift"
 msgstr "Ajouter un cadeau"
 
@@ -1934,7 +1936,9 @@ msgid "Gift"
 msgstr "Cadeau"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_page
+#, python-format
 msgid "Gift Basket"
 msgstr "Panier cadeau"
 
@@ -1969,6 +1973,8 @@ msgstr "Fille"
 #: model_terms:ir.ui.view,arch_db:my_compassion.dashboard_donations_vignette
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#: code:addons/my_compassion/controllers/my2_gifts.py:0
+#, python-format
 msgid "Give"
 msgstr "Donner"
 
@@ -2015,7 +2021,11 @@ msgid "Hobbies"
 msgstr "Hobbies"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_user.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.http_error_custom
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_dashboard_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#, python-format
 msgid "Home"
 msgstr "Accueil"
 
@@ -2443,7 +2453,10 @@ msgid "Letter saved!"
 msgstr "Lettre sauvegardée!"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_letters.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_letters_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#, python-format
 msgid "Letters"
 msgstr "Lettres"
 
@@ -2699,7 +2712,10 @@ msgid "My Country"
 msgstr "Mon pays"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_my_donations_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_account_menu
+#, python-format
 msgid "My Donations"
 msgstr "Mes dons"
 
@@ -2719,7 +2735,9 @@ msgid "My Sponsorship"
 msgstr "Mon parrainage"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_children.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_children_page
+#, python-format
 msgid "My Sponsorships"
 msgstr "Mes parrainages"
 
@@ -3021,7 +3039,9 @@ msgid "Payment mode"
 msgstr "Mode de paiement"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model:new.sponsorship.wizard.step,title:my_compassion.new_sponsorship_wizard_step_payment_methods
+#, python-format
 msgid "Payment options"
 msgstr "Options de paiement"
 
@@ -3522,7 +3542,9 @@ msgid "Sponsor"
 msgstr "Parrainer"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_sponsorships_page
+#, python-format
 msgid "Sponsor a child"
 msgstr "Parrainer un enfant"
 
@@ -3750,7 +3772,10 @@ msgid "Text Color"
 msgstr "Couleur du texte"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_thank_you_page
+#, python-format
 msgid "Thank you"
 msgstr "Merci"
 
@@ -4550,3 +4575,34 @@ msgid ""
 "years old\n"
 "                        <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
 msgstr "ans <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_login.py:0
+#, python-format
+msgid "Login"
+msgstr "Connexion"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my_reset_password.py:0
+#, python-format
+msgid "Reset Password"
+msgstr "Réinitialiser votre mot de passe"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#, python-format
+msgid "Gifts"
+msgstr "Cadeaux"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_letters.py:0
+#, python-format
+msgid "New Letter"
+msgstr "Nouvelle lettre"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_user_settings.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_user_settings_page
+#, python-format
+msgid "Settings"
+msgstr "Paramètres"
\ No newline at end of file
diff --git a/my_compassion/i18n/it.po b/my_compassion/i18n/it.po
index b6d923d3..7c459e8e 100644
--- a/my_compassion/i18n/it.po
+++ b/my_compassion/i18n/it.po
@@ -846,7 +846,9 @@ msgid "Add &amp; check out"
 msgstr "Aggiungi e procedi al checkout"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_add_a_gift_page
+#, python-format
 msgid "Add a Gift"
 msgstr "Aggiungi un regalo"
 
@@ -1993,7 +1995,9 @@ msgid "Gift"
 msgstr "Regalo"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_page
+#, python-format
 msgid "Gift Basket"
 msgstr "Carrello per i regali"
 
@@ -2028,6 +2032,8 @@ msgstr "Bambina"
 #: model_terms:ir.ui.view,arch_db:my_compassion.dashboard_donations_vignette
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#: code:addons/my_compassion/controllers/my2_gifts.py:0
+#, python-format
 msgid "Give"
 msgstr "Dona"
 
@@ -2074,7 +2080,11 @@ msgid "Hobbies"
 msgstr "Hobby"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_user.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.http_error_custom
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_dashboard_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#, python-format
 msgid "Home"
 msgstr "Home"
 
@@ -2504,7 +2514,10 @@ msgid "Letter saved!"
 msgstr "Lettera salvata!"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_letters.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_letters_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
+#, python-format
 msgid "Letters"
 msgstr "Lettere"
 
@@ -2765,7 +2778,10 @@ msgid "My Country"
 msgstr "Il mio Paese"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_my_donations_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_account_menu
+#, python-format
 msgid "My Donations"
 msgstr "Le mie donazioni"
 
@@ -2785,7 +2801,9 @@ msgid "My Sponsorship"
 msgstr "Il mio sostegno"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_children.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_children_page
+#, python-format
 msgid "My Sponsorships"
 msgstr "I miei sostegni"
 
@@ -3087,7 +3105,9 @@ msgid "Payment mode"
 msgstr "Modalità di pagamento"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model:new.sponsorship.wizard.step,title:my_compassion.new_sponsorship_wizard_step_payment_methods
+#, python-format
 msgid "Payment options"
 msgstr "Opzioni di pagamento"
 
@@ -3586,7 +3606,9 @@ msgid "Sponsor"
 msgstr "Sostieni un bambino"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_sponsorships_page
+#, python-format
 msgid "Sponsor a child"
 msgstr "Sostieni un bambino"
 
@@ -3812,7 +3834,10 @@ msgid "Text Color"
 msgstr "Colore del testo"
 
 #. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_thank_you_page
+#, python-format
 msgid "Thank you"
 msgstr "Grazie"
 
@@ -4617,3 +4642,34 @@ msgid ""
 msgstr ""
 "anni\n"
 "                        <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_login.py:0
+#, python-format
+msgid "Login"
+msgstr "Login"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my_reset_password.py:0
+#, python-format
+msgid "Reset Password"
+msgstr "Reimposta la tua password"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_donations.py:0
+#, python-format
+msgid "Gifts"
+msgstr "Regali"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_letters.py:0
+#, python-format
+msgid "New Letter"
+msgstr "Nuova lettera"
+
+#. module: my_compassion
+#: code:addons/my_compassion/controllers/my2_user_settings.py:0
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_user_settings_page
+#, python-format
+msgid "Settings"
+msgstr "Impostazioni"
diff --git a/my_compassion/templates/login_template.xml b/my_compassion/templates/login_template.xml
index fa3d820b..ba1c5981 100644
--- a/my_compassion/templates/login_template.xml
+++ b/my_compassion/templates/login_template.xml
@@ -19,8 +19,6 @@
     </template>
     <!-- oca-hooks:disable=xml-dangerous-qweb-replace-low-priority -->
     <template id="login_layout" inherit_id="website.login_layout">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Login</t>
         <xpath expr="t" position="replace">
             <t t-call="website.layout">
                 <div class="container mt-5 mx-auto">
diff --git a/my_compassion/templates/my2_change_password.xml b/my_compassion/templates/my2_change_password.xml
index 243222c6..522eb61a 100644
--- a/my_compassion/templates/my2_change_password.xml
+++ b/my_compassion/templates/my2_change_password.xml
@@ -6,8 +6,6 @@
         priority="99"
     >
         <xpath expr="t" position="replace">
-            <!-- Set the page title -->
-            <t t-set="additional_title">Change Password</t>
             <t t-call="website.layout">
                 <div class="container col-lg-6 mx-auto">
                     <!-- Change password -->
diff --git a/my_compassion/templates/pages/my2_add_a_gift.xml b/my_compassion/templates/pages/my2_add_a_gift.xml
index 4a429c6c..bd3622ae 100644
--- a/my_compassion/templates/pages/my2_add_a_gift.xml
+++ b/my_compassion/templates/pages/my2_add_a_gift.xml
@@ -14,8 +14,6 @@
 <odoo>
     <!-- ADD A GIFT PAGE -->
     <template id="my2_add_a_gift_page" name="Add a Gift Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Add a Gift</t>
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_add_a_gift.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_add_a_gift.css" />
diff --git a/my_compassion/templates/pages/my2_child_letters.xml b/my_compassion/templates/pages/my2_child_letters.xml
index cd6d9658..bc3d6143 100644
--- a/my_compassion/templates/pages/my2_child_letters.xml
+++ b/my_compassion/templates/pages/my2_child_letters.xml
@@ -14,8 +14,6 @@
 -->
 <odoo>
     <template id="my2_child_letters_page" name="My Compassion 2 Child Letters Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Letters</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/child_letters.css" />
         <t t-call="website.layout">
             <div class="container">
diff --git a/my_compassion/templates/pages/my2_child_timeline.xml b/my_compassion/templates/pages/my2_child_timeline.xml
index dbd28f8d..a7a8396d 100644
--- a/my_compassion/templates/pages/my2_child_timeline.xml
+++ b/my_compassion/templates/pages/my2_child_timeline.xml
@@ -23,8 +23,6 @@
 -->
 <odoo>
     <template id="my2_child_timeline_page" name="My Compassion 2 Child Timeline Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title" t-value="compassion_child.preferred_name" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/child_profile.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/child_profile_timeline.css" />
         <t
diff --git a/my_compassion/templates/pages/my2_children.xml b/my_compassion/templates/pages/my2_children.xml
index da51f4a4..6efa201e 100644
--- a/my_compassion/templates/pages/my2_children.xml
+++ b/my_compassion/templates/pages/my2_children.xml
@@ -14,8 +14,6 @@ Page: My Compassion 2 Children Page
 -->
 <odoo>
     <template id="my2_children_page" name="My Compassion 2 Children Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">My Sponsorships</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- Title -->
diff --git a/my_compassion/templates/pages/my2_dashboard.xml b/my_compassion/templates/pages/my2_dashboard.xml
index 3349b841..7405e1ae 100644
--- a/my_compassion/templates/pages/my2_dashboard.xml
+++ b/my_compassion/templates/pages/my2_dashboard.xml
@@ -22,8 +22,6 @@ Page: My Compassion 2 Dashboard Page
     </template>
     <!-- DASHBOARD -->
     <template id="my2_dashboard_page" name="My Compassion 2 Dashboard Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Home</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_dashboard.css" />
         <t t-call="website.layout">
             <div class="container">
diff --git a/my_compassion/templates/pages/my2_donation_details.xml b/my_compassion/templates/pages/my2_donation_details.xml
index 4ddde216..b7bff7a4 100644
--- a/my_compassion/templates/pages/my2_donation_details.xml
+++ b/my_compassion/templates/pages/my2_donation_details.xml
@@ -16,8 +16,6 @@
 <odoo>
     <!-- DONATION DETAILS PAGE -->
     <template id="my2_donation_details_page" name="Donation Details Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title" t-value="'Gifts - ' + product.my_compassion_name" />
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_donation_details.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_donation_details.css" />
diff --git a/my_compassion/templates/pages/my2_donations.xml b/my_compassion/templates/pages/my2_donations.xml
index 12a3f4b7..09c47802 100644
--- a/my_compassion/templates/pages/my2_donations.xml
+++ b/my_compassion/templates/pages/my2_donations.xml
@@ -29,8 +29,6 @@ Page: My Compassion 2 Donations Page
 <odoo>
     <data>
         <template id="my2_my_donations_page" name="My Account Donations Details">
-            <!-- Set the page title -->
-            <t t-set="additional_title">My Donations</t>
             <t t-call="website.layout">
                 <div class="container">
                     <div class="single-column">
diff --git a/my_compassion/templates/pages/my2_gift_package.xml b/my_compassion/templates/pages/my2_gift_package.xml
index d616f2af..bdcdc342 100644
--- a/my_compassion/templates/pages/my2_gift_package.xml
+++ b/my_compassion/templates/pages/my2_gift_package.xml
@@ -120,8 +120,6 @@
     </template>
     <!-- GIFT PACKAGE PAGE -->
     <template id="my2_gift_package_page" name="Gift Package Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Gift Basket</t>
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_gift_package.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_gift_package.css" />
diff --git a/my_compassion/templates/pages/my2_gifts.xml b/my_compassion/templates/pages/my2_gifts.xml
index 934d45a2..61b3cc4b 100644
--- a/my_compassion/templates/pages/my2_gifts.xml
+++ b/my_compassion/templates/pages/my2_gifts.xml
@@ -18,8 +18,6 @@ Page: My Compassion 2 Gifts Page
 <odoo>
     <!-- GIFTS DASHBOARD -->
     <template id="my2_gifts_page" name="My Compassion 2 Gifts Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Gifts</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- HELPER FLAGS -->
diff --git a/my_compassion/templates/pages/my2_gifts_thank_you.xml b/my_compassion/templates/pages/my2_gifts_thank_you.xml
index dc6d1cf4..40bd52dc 100644
--- a/my_compassion/templates/pages/my2_gifts_thank_you.xml
+++ b/my_compassion/templates/pages/my2_gifts_thank_you.xml
@@ -13,8 +13,6 @@ Page: My Compassion 2 Thank you Page
 -->
 <odoo>
     <template id="my2_gifts_thank_you_page" name="My Compassion 2 Thank you Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Thank you</t>
         <!-- Include stylesheet -->
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_gifts_thank_you.css" />
         <t t-call="website.layout">
diff --git a/my_compassion/templates/pages/my2_login_template.xml b/my_compassion/templates/pages/my2_login_template.xml
index 947c0b7a..ac3b24ec 100644
--- a/my_compassion/templates/pages/my2_login_template.xml
+++ b/my_compassion/templates/pages/my2_login_template.xml
@@ -4,8 +4,6 @@
     <!-- Custom Login Page Layout -->
     <template id="my2_login_template" inherit_id="website.login_layout" website_id="my_compassion.my2_website">
         <xpath expr="t" position="replace">
-            <!-- Set the page title -->
-            <t t-set="additional_title">Login</t>
             <t t-set="no_footer" t-value="True" />
             <!-- Add css to the page -->
             <link rel="stylesheet" href="/my_compassion/static/src/css/my2_login.css" />
diff --git a/my_compassion/templates/pages/my2_new_letter.xml b/my_compassion/templates/pages/my2_new_letter.xml
index 998f3523..ff438c3d 100644
--- a/my_compassion/templates/pages/my2_new_letter.xml
+++ b/my_compassion/templates/pages/my2_new_letter.xml
@@ -16,8 +16,6 @@
 -->
 <odoo>
     <template id="my2_new_letter_page" name="My Compassion 2 New Letter Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">New Letter</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/template_image.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/add_a_picture_input.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/delete_a_picture_input.css" />
diff --git a/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml b/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml
index 2e0cfb68..73a1a736 100644
--- a/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml
+++ b/my_compassion/templates/pages/my2_new_sponsorship_wizard.xml
@@ -534,8 +534,6 @@ Page: My Compassion 2 New Sponsorship Wizard Page
     </template>
     <!-- NEW SPONSORSHIP WIZARD PAGE -->
     <template id="my2_new_sponsorship_wizard_page" name="New Sponsorship Wizard Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Payment Options</t>
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_new_sponsorship_wizard.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_new_sponsorship_wizard.css" />
         <t t-call="website.layout">
@@ -552,8 +550,6 @@ Page: My Compassion 2 New Sponsorship Wizard Page
     </template>
     <!-- NEW SPONSORSHIP THANK YOU PAGE -->
     <template id="my2_new_sponsorship_thank_you_page" name="New Sponsorship Thank You Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Thank you</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_new_sponsorship_wizard.css" />
         <t t-call="website.layout">
             <div class="container">
diff --git a/my_compassion/templates/pages/my2_sponsorships.xml b/my_compassion/templates/pages/my2_sponsorships.xml
index 761ceb24..0b7cacfe 100644
--- a/my_compassion/templates/pages/my2_sponsorships.xml
+++ b/my_compassion/templates/pages/my2_sponsorships.xml
@@ -38,8 +38,6 @@ Page: My Compassion 2 Sponsorships Page
     </template>
     <!-- SPONSORSHIPS PAGE -->
     <template id="my2_sponsorships_page" name="Sponsorships Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Sponsor a child</t>
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_sponsorships.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_sponsorships.css" />
         <t t-call="website.layout">
diff --git a/my_compassion/templates/pages/my2_user_settings.xml b/my_compassion/templates/pages/my2_user_settings.xml
index 6bd41ed3..2ffab798 100644
--- a/my_compassion/templates/pages/my2_user_settings.xml
+++ b/my_compassion/templates/pages/my2_user_settings.xml
@@ -22,8 +22,6 @@ Injected data:
 -->
 <odoo>
     <template id="my2_user_settings_page" name="My Compassion 2 User Settings Page">
-        <!-- Set the page title -->
-        <t t-set="additional_title">Settings</t>
         <link rel="stylesheet" href="/my_compassion/static/src/css/user_settings.css" />
         <t t-call="website.layout">
             <div class="container my-4">

From 9067b6186e622f329708ab1117d5f686f9b57ce1 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 9 Mar 2026 15:10:22 +0100
Subject: [PATCH 6/9] [T3038] STYLE: pre-commit

---
 my_compassion/controllers/my2_reset_password.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/my_compassion/controllers/my2_reset_password.py b/my_compassion/controllers/my2_reset_password.py
index 654f7d3d..2ff21fb5 100644
--- a/my_compassion/controllers/my2_reset_password.py
+++ b/my_compassion/controllers/my2_reset_password.py
@@ -13,8 +13,11 @@
 
 from odoo.addons.auth_signup.controllers.main import AuthSignupHome
 
+
 class WebsitePasswordReset(AuthSignupHome):
-    @http.route('/web/reset_password', type='http', auth='public', website=True, sitemap=False)
+    @http.route(
+        "/web/reset_password", type="http", auth="public", website=True, sitemap=False
+    )
     def web_auth_reset_password(self, *args, **kw):
         """
         Adds an 'additional_title' to the password reset page.
@@ -22,7 +25,7 @@ def web_auth_reset_password(self, *args, **kw):
         response = super().web_auth_reset_password(*args, **kw)
 
         # Inject page title
-        if hasattr(response, 'qcontext'):
-            response.qcontext['additional_title'] = _('Reset Password')
+        if hasattr(response, "qcontext"):
+            response.qcontext["additional_title"] = _("Reset Password")
 
-        return response
\ No newline at end of file
+        return response

From 021696a3feaaff23f291ad9a09fa9c7529be85e3 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 9 Mar 2026 15:26:23 +0100
Subject: [PATCH 7/9] [T3038] STYLE: hopefully this satisfies pre-commit

---
 theme_compassion_2025/views/template_header.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme_compassion_2025/views/template_header.xml b/theme_compassion_2025/views/template_header.xml
index ad3822cf..9bceb337 100644
--- a/theme_compassion_2025/views/template_header.xml
+++ b/theme_compassion_2025/views/template_header.xml
@@ -52,7 +52,7 @@
         <xpath expr="//div[hasclass('dropdown-menu')]" position="attributes">
             <attribute name="class" add="shadow-sm animation-drop language-selector__dropdown-menu" separator=" " />
         </xpath>
-        <!--    Modify the dropdown button to use a custom pill style button-->
+        <!-- Modify the dropdown button to use a custom pill style button-->
         <xpath expr="//button[hasclass('dropdown-toggle')]" position="replace">
             <t t-call="theme_compassion_2025.LanguageSelector">
                 <t t-set="variant" t-value="'compact'" />

From b4481be787b0731d7a20e0be2153b59809c4eca0 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Mon, 9 Mar 2026 15:35:22 +0100
Subject: [PATCH 8/9] [T3038] STYLE: pre-commit after git hub auto merge

---
 theme_compassion_2025/views/template_header.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/theme_compassion_2025/views/template_header.xml b/theme_compassion_2025/views/template_header.xml
index 8b19dc2c..f5eccf2b 100644
--- a/theme_compassion_2025/views/template_header.xml
+++ b/theme_compassion_2025/views/template_header.xml
@@ -52,17 +52,11 @@
         <xpath expr="//div[hasclass('dropdown-menu')]" position="attributes">
             <attribute name="class" add="shadow-sm animation-drop language-selector__dropdown-menu" separator=" " />
         </xpath>
-<<<<<<< T3038-tab-name
         <!-- Modify the dropdown button to use a custom pill style button-->
-        <xpath expr="//button[hasclass('dropdown-toggle')]" position="replace">
-=======
-
         <xpath expr="//button[hasclass('dropdown-toggle')]" position="attributes">
             <attribute name="class" separator=" " add="d-none" />
         </xpath>
-
         <xpath expr="//button[hasclass('dropdown-toggle')]" position="after">
->>>>>>> 14.0
             <t t-call="theme_compassion_2025.LanguageSelector">
                 <t t-set="variant" t-value="'compact'" />
                 <t t-set="variation" t-value="'p-1 hollow'" />

From 49e755e187f5273c261235bdb39e600b460f6da9 Mon Sep 17 00:00:00 2001
From: Daniel Gergely <dgergely@compassion.ch>
Date: Tue, 31 Mar 2026 16:33:50 +0200
Subject: [PATCH 9/9] [T3038] FIX: tab names now in tempaltes

- FIX: tab names now not in controllers but in templates
- FIX: adapted translations as well
---
 my_compassion/controllers/my2_children.py     |  2 --
 my_compassion/controllers/my2_donations.py    |  3 ---
 my_compassion/controllers/my2_gifts.py        |  2 --
 my_compassion/controllers/my2_letters.py      |  2 --
 my_compassion/controllers/my2_login.py        |  5 -----
 my_compassion/controllers/my2_sponsorships.py |  1 -
 my_compassion/controllers/my2_user.py         |  2 --
 .../controllers/my2_user_settings.py          |  1 -
 my_compassion/i18n/de.po                      | 21 +------------------
 my_compassion/i18n/fr_CH.po                   | 21 +------------------
 my_compassion/i18n/it.po                      | 21 +------------------
 .../templates/pages/my2_add_a_gift.xml        |  1 +
 .../templates/pages/my2_child_letters.xml     |  1 +
 .../templates/pages/my2_child_timeline.xml    |  3 +++
 .../templates/pages/my2_children.xml          |  1 +
 .../templates/pages/my2_dashboard.xml         |  1 +
 .../templates/pages/my2_donation_details.xml  |  1 +
 .../templates/pages/my2_donations.xml         |  1 +
 .../templates/pages/my2_gift_package.xml      |  1 +
 my_compassion/templates/pages/my2_gifts.xml   |  1 +
 .../templates/pages/my2_gifts_thank_you.xml   |  1 +
 .../templates/pages/my2_new_letter.xml        |  1 +
 .../templates/pages/my2_sponsorships.xml      |  1 +
 .../templates/pages/my2_user_settings.xml     |  1 +
 24 files changed, 18 insertions(+), 78 deletions(-)

diff --git a/my_compassion/controllers/my2_children.py b/my_compassion/controllers/my2_children.py
index 8d85c0f8..47c99286 100644
--- a/my_compassion/controllers/my2_children.py
+++ b/my_compassion/controllers/my2_children.py
@@ -334,7 +334,6 @@ def my2_render_children_page(self, **kwargs):
                 ),
                 "latest_correspondences_by_child_id": latest_corr_by_child,
                 "breadcrumbs": breadcrumbs,
-                "additional_title": _("My Sponsorships"),
             },
         )
 
@@ -384,7 +383,6 @@ def my2_render_child_timeline_page(self, child, **kwargs):
                 "google_custom_map_id": google_custom_map_id,
                 "timezone": child.sudo().project_id.timezone,
                 "birthday_formatted": birthday_formatted,
-                "additional_title": child.sudo().preferred_name,
             },
         )
 
diff --git a/my_compassion/controllers/my2_donations.py b/my_compassion/controllers/my2_donations.py
index 5d86a125..2e437d83 100644
--- a/my_compassion/controllers/my2_donations.py
+++ b/my_compassion/controllers/my2_donations.py
@@ -184,7 +184,6 @@ def my2_render_gift_package_page(self, **kwargs):
                 "order": order,
                 "limits": limits,
                 "acquirer": acquirer,
-                "additional_title": _("Gift Basket"),
             },
         )
 
@@ -304,7 +303,6 @@ def my2_render_add_a_gift_page(self, **kwargs):
                 "sponsorships": sponsorships,
                 "limits": limits,
                 "currency_name": order.pricelist_id.currency_id.name,
-                "additional_title": _("Add a Gift"),
             },
         )
 
@@ -323,7 +321,6 @@ def my2_gifts_thank_you_page(self, **kwargs):
                 "my_compassion.my2_gifts_thank_you_page",
                 {
                     "sale_order": sale_order,
-                    "additional_title": _("Thank you"),
                 },
             )
         return request.redirect("/my2/dashboard")
diff --git a/my_compassion/controllers/my2_gifts.py b/my_compassion/controllers/my2_gifts.py
index 7df7d4d3..b1753a18 100644
--- a/my_compassion/controllers/my2_gifts.py
+++ b/my_compassion/controllers/my2_gifts.py
@@ -9,7 +9,6 @@
 
 from odoo import http
 from odoo.http import request
-from odoo.tools.translate import _
 
 
 class MyCompassionGiftController(http.Controller):
@@ -33,6 +32,5 @@ def render_donation_page(self, type="fund", **kwargs):
             {
                 "my_compassion_gifts": my_compassion_gifts,
                 "type": type,
-                "additional_title": _("Give"),
             },
         )
diff --git a/my_compassion/controllers/my2_letters.py b/my_compassion/controllers/my2_letters.py
index 4f565685..f29e4bbb 100644
--- a/my_compassion/controllers/my2_letters.py
+++ b/my_compassion/controllers/my2_letters.py
@@ -177,7 +177,6 @@ def my2_render_child_letters_page(self, **kwargs):
                 },
                 "nr_filters_applied": nr_filters_applied,
                 "months": months,
-                "additional_title": _("Letters"),
             },
         )
 
@@ -262,7 +261,6 @@ def my2_render_new_letter_page(self, **kwargs):
                 "sponsorship_ids": sponsorships,
                 "templates": templates,
                 "draft": draft,
-                "additional_title": _("New Letter"),
             },
         )
 
diff --git a/my_compassion/controllers/my2_login.py b/my_compassion/controllers/my2_login.py
index 23618828..401f4cc9 100644
--- a/my_compassion/controllers/my2_login.py
+++ b/my_compassion/controllers/my2_login.py
@@ -10,7 +10,6 @@
 # -*- coding: utf-8 -*-
 from odoo import http
 from odoo.http import request
-from odoo.tools.translate import _
 
 from odoo.addons.website.controllers.main import Website
 
@@ -30,8 +29,4 @@ def web_login(self, *args, **kw):
         # If the user is not logged in, execute the original Odoo logic for login
         response = super().web_login(*args, **kw)
 
-        # Inject page title
-        if hasattr(response, "qcontext"):
-            response.qcontext["additional_title"] = _("Login")
-
         return response
diff --git a/my_compassion/controllers/my2_sponsorships.py b/my_compassion/controllers/my2_sponsorships.py
index ee991f95..b52f141c 100644
--- a/my_compassion/controllers/my2_sponsorships.py
+++ b/my_compassion/controllers/my2_sponsorships.py
@@ -45,7 +45,6 @@ def my2_render_sponsorships_page(self, **kwargs):
             {
                 "countries": countries,
                 "sponsorship_type": "standard",
-                "additional_title": _("Sponsor a child"),
             },
         )
 
diff --git a/my_compassion/controllers/my2_user.py b/my_compassion/controllers/my2_user.py
index bfab477c..bf31dd00 100644
--- a/my_compassion/controllers/my2_user.py
+++ b/my_compassion/controllers/my2_user.py
@@ -8,7 +8,6 @@
 ##############################################################################
 from odoo import http
 from odoo.http import request
-from odoo.tools.translate import _
 
 
 class MyCompassionUserController(http.Controller):
@@ -30,7 +29,6 @@ def my2_render_dashboard_page(self, **kwargs):
                 "has_unread_correspondence": has_unread_correspondence,
                 "sorted_vignettes": vignettes_data,
                 "partner": partner,
-                "additional_title": _("Home"),
             },
         )
 
diff --git a/my_compassion/controllers/my2_user_settings.py b/my_compassion/controllers/my2_user_settings.py
index 3b8c37b2..e6c64427 100644
--- a/my_compassion/controllers/my2_user_settings.py
+++ b/my_compassion/controllers/my2_user_settings.py
@@ -38,7 +38,6 @@ def render_user_settings_page(self, **kwargs):
                 "titles": titles,
                 "countries": countries,
                 "current_tab": current_tab,
-                "additional_title": _("Settings"),
             },
         )
 
diff --git a/my_compassion/i18n/de.po b/my_compassion/i18n/de.po
index fd0ea9e2..8d2294e9 100644
--- a/my_compassion/i18n/de.po
+++ b/my_compassion/i18n/de.po
@@ -844,7 +844,6 @@ msgid "Add &amp; check out"
 msgstr "Hinzufügen &amp; zur Kasse gehen"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_add_a_gift_page
 #, python-format
 msgid "Add a Gift"
@@ -1977,7 +1976,6 @@ msgid "Gift"
 msgstr "Geschenk"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_page
 #, python-format
 msgid "Gift Basket"
@@ -2014,7 +2012,6 @@ msgstr "Mädchen"
 #: model_terms:ir.ui.view,arch_db:my_compassion.dashboard_donations_vignette
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
-#: code:addons/my_compassion/controllers/my2_gifts.py:0
 #, python-format
 msgid "Give"
 msgstr "Geben"
@@ -2062,11 +2059,9 @@ msgid "Hobbies"
 msgstr "Hobbys"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_user.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.http_error_custom
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_dashboard_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
-#, python-format
 msgid "Home"
 msgstr "Startseite"
 
@@ -2495,7 +2490,6 @@ msgid "Letter saved!"
 msgstr "Brief gespeichert!"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_letters.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_letters_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
 #, python-format
@@ -3576,9 +3570,7 @@ msgid "Sponsor"
 msgstr "Finde ein Patenkind"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_sponsorships_page
-#, python-format
 msgid "Sponsor a child"
 msgstr "Eine Patenschaft übernehmen"
 
@@ -3805,8 +3797,6 @@ msgid "Text Color"
 msgstr "Textfarbe"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
-#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_thank_you_page
 #, python-format
 msgid "Thank you"
@@ -4720,12 +4710,6 @@ msgstr ""
 "Jahre alt\n"
 "                        <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
 
-#. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_login.py:0
-#, python-format
-msgid "Login"
-msgstr "Login"
-
 #. module: my_compassion
 #: code:addons/my_compassion/controllers/my_reset_password.py:0
 #, python-format
@@ -4739,14 +4723,11 @@ msgid "Gifts"
 msgstr "Geschenke"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_letters.py:0
-#, python-format
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_letter_page
 msgid "New Letter"
 msgstr "Neuer Brief"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_user_settings.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_user_settings_page
-#, python-format
 msgid "Settings"
 msgstr "Einstellungen"
\ No newline at end of file
diff --git a/my_compassion/i18n/fr_CH.po b/my_compassion/i18n/fr_CH.po
index 67ad207c..2940ccb7 100644
--- a/my_compassion/i18n/fr_CH.po
+++ b/my_compassion/i18n/fr_CH.po
@@ -793,7 +793,6 @@ msgid "Add &amp; check out"
 msgstr "Ajouter au panier"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_add_a_gift_page
 #, python-format
 msgid "Add a Gift"
@@ -1938,7 +1937,6 @@ msgid "Gift"
 msgstr "Cadeau"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_page
 #, python-format
 msgid "Gift Basket"
@@ -1975,7 +1973,6 @@ msgstr "Fille"
 #: model_terms:ir.ui.view,arch_db:my_compassion.dashboard_donations_vignette
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
-#: code:addons/my_compassion/controllers/my2_gifts.py:0
 #, python-format
 msgid "Give"
 msgstr "Donner"
@@ -2023,11 +2020,9 @@ msgid "Hobbies"
 msgstr "Hobbies"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_user.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.http_error_custom
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_dashboard_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
-#, python-format
 msgid "Home"
 msgstr "Accueil"
 
@@ -2455,7 +2450,6 @@ msgid "Letter saved!"
 msgstr "Lettre sauvegardée!"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_letters.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_letters_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
 #, python-format
@@ -3544,9 +3538,7 @@ msgid "Sponsor"
 msgstr "Parrainer"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_sponsorships_page
-#, python-format
 msgid "Sponsor a child"
 msgstr "Parrainer un enfant"
 
@@ -3774,8 +3766,6 @@ msgid "Text Color"
 msgstr "Couleur du texte"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
-#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_thank_you_page
 #, python-format
 msgid "Thank you"
@@ -4664,12 +4654,6 @@ msgid ""
 "                        <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
 msgstr "ans <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
 
-#. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_login.py:0
-#, python-format
-msgid "Login"
-msgstr "Connexion"
-
 #. module: my_compassion
 #: code:addons/my_compassion/controllers/my_reset_password.py:0
 #, python-format
@@ -4683,14 +4667,11 @@ msgid "Gifts"
 msgstr "Cadeaux"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_letters.py:0
-#, python-format
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_letter_page
 msgid "New Letter"
 msgstr "Nouvelle lettre"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_user_settings.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_user_settings_page
-#, python-format
 msgid "Settings"
 msgstr "Paramètres"
\ No newline at end of file
diff --git a/my_compassion/i18n/it.po b/my_compassion/i18n/it.po
index 015facb4..2719cd51 100644
--- a/my_compassion/i18n/it.po
+++ b/my_compassion/i18n/it.po
@@ -851,7 +851,6 @@ msgid "Add &amp; check out"
 msgstr "Aggiungi e procedi al checkout"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_add_a_gift_page
 #, python-format
 msgid "Add a Gift"
@@ -1996,7 +1995,6 @@ msgid "Gift"
 msgstr "Regalo"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gift_package_page
 #, python-format
 msgid "Gift Basket"
@@ -2033,7 +2031,6 @@ msgstr "Bambina"
 #: model_terms:ir.ui.view,arch_db:my_compassion.dashboard_donations_vignette
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
-#: code:addons/my_compassion/controllers/my2_gifts.py:0
 #, python-format
 msgid "Give"
 msgstr "Dona"
@@ -2081,11 +2078,9 @@ msgid "Hobbies"
 msgstr "Hobby"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_user.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.http_error_custom
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_dashboard_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
-#, python-format
 msgid "Home"
 msgstr "Home"
 
@@ -2515,7 +2510,6 @@ msgid "Letter saved!"
 msgstr "Lettera salvata!"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_letters.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_child_letters_page
 #: model_terms:ir.ui.view,arch_db:my_compassion.my_compassion_dynamic_menu
 #, python-format
@@ -3607,9 +3601,7 @@ msgid "Sponsor"
 msgstr "Sostieni un bambino"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_sponsorships_page
-#, python-format
 msgid "Sponsor a child"
 msgstr "Sostieni un bambino"
 
@@ -3835,8 +3827,6 @@ msgid "Text Color"
 msgstr "Colore del testo"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_donations.py:0
-#: code:addons/my_compassion/controllers/my2_sponsorships.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_gifts_thank_you_page
 #, python-format
 msgid "Thank you"
@@ -4731,12 +4721,6 @@ msgstr ""
 "anni\n"
 "                        <i class=\"icon-user01 bg-low-yellow mx-1\"/>"
 
-#. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_login.py:0
-#, python-format
-msgid "Login"
-msgstr "Login"
-
 #. module: my_compassion
 #: code:addons/my_compassion/controllers/my_reset_password.py:0
 #, python-format
@@ -4750,14 +4734,11 @@ msgid "Gifts"
 msgstr "Regali"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_letters.py:0
-#, python-format
+#: model_terms:ir.ui.view,arch_db:my_compassion.my2_new_letter_page
 msgid "New Letter"
 msgstr "Nuova lettera"
 
 #. module: my_compassion
-#: code:addons/my_compassion/controllers/my2_user_settings.py:0
 #: model_terms:ir.ui.view,arch_db:my_compassion.my2_user_settings_page
-#, python-format
 msgid "Settings"
 msgstr "Impostazioni"
diff --git a/my_compassion/templates/pages/my2_add_a_gift.xml b/my_compassion/templates/pages/my2_add_a_gift.xml
index bd3622ae..00fd3d77 100644
--- a/my_compassion/templates/pages/my2_add_a_gift.xml
+++ b/my_compassion/templates/pages/my2_add_a_gift.xml
@@ -17,6 +17,7 @@
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_add_a_gift.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_add_a_gift.css" />
+        <t t-set="additional_title">Add a Gift</t>
         <t t-call="website.layout">
             <div class="container">
                 <div class="single-column my2-add-a-gift">
diff --git a/my_compassion/templates/pages/my2_child_letters.xml b/my_compassion/templates/pages/my2_child_letters.xml
index 4a7c81c4..ae5bf415 100644
--- a/my_compassion/templates/pages/my2_child_letters.xml
+++ b/my_compassion/templates/pages/my2_child_letters.xml
@@ -15,6 +15,7 @@
 <odoo>
     <template id="my2_child_letters_page" name="My Compassion 2 Child Letters Page">
         <link rel="stylesheet" href="/my_compassion/static/src/css/child_letters.css" />
+        <t t-set="additional_title">Letters</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- Title -->
diff --git a/my_compassion/templates/pages/my2_child_timeline.xml b/my_compassion/templates/pages/my2_child_timeline.xml
index a7a8396d..00bf7fb1 100644
--- a/my_compassion/templates/pages/my2_child_timeline.xml
+++ b/my_compassion/templates/pages/my2_child_timeline.xml
@@ -29,6 +29,9 @@
             t-set="is_sponsorship_terminated"
             t-value="compassion_child.my_sponsorship_id and compassion_child.my_sponsorship_id.state=='terminated'"
         />
+        <t t-set="additional_title">
+            <t t-esc="compassion_child.preferred_name" />
+        </t>
         <t t-call="website.layout">
             <div class="container">
                 <div class="single-column">
diff --git a/my_compassion/templates/pages/my2_children.xml b/my_compassion/templates/pages/my2_children.xml
index 8e8c43a6..70322226 100644
--- a/my_compassion/templates/pages/my2_children.xml
+++ b/my_compassion/templates/pages/my2_children.xml
@@ -14,6 +14,7 @@ Page: My Compassion 2 Children Page
 -->
 <odoo>
     <template id="my2_children_page" name="My Compassion 2 Children Page">
+        <t t-set="additional_title">My Sponsorships</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- Title -->
diff --git a/my_compassion/templates/pages/my2_dashboard.xml b/my_compassion/templates/pages/my2_dashboard.xml
index 63278ff4..7b2138f7 100644
--- a/my_compassion/templates/pages/my2_dashboard.xml
+++ b/my_compassion/templates/pages/my2_dashboard.xml
@@ -23,6 +23,7 @@ Page: My Compassion 2 Dashboard Page
     <!-- DASHBOARD -->
     <template id="my2_dashboard_page" name="My Compassion 2 Dashboard Page">
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_dashboard.css" />
+        <t t-set="additional_title">Home</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- BANNER -->
diff --git a/my_compassion/templates/pages/my2_donation_details.xml b/my_compassion/templates/pages/my2_donation_details.xml
index b7bff7a4..da7049cf 100644
--- a/my_compassion/templates/pages/my2_donation_details.xml
+++ b/my_compassion/templates/pages/my2_donation_details.xml
@@ -19,6 +19,7 @@
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_donation_details.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_donation_details.css" />
+        <t t-set="additional_title" t-value="product.my_compassion_name" />
         <t t-call="website.layout">
             <!-- HEADER -->
             <div class="single-column">
diff --git a/my_compassion/templates/pages/my2_donations.xml b/my_compassion/templates/pages/my2_donations.xml
index 09c47802..a4116c26 100644
--- a/my_compassion/templates/pages/my2_donations.xml
+++ b/my_compassion/templates/pages/my2_donations.xml
@@ -29,6 +29,7 @@ Page: My Compassion 2 Donations Page
 <odoo>
     <data>
         <template id="my2_my_donations_page" name="My Account Donations Details">
+            <t t-set="additional_title">My Donations</t>
             <t t-call="website.layout">
                 <div class="container">
                     <div class="single-column">
diff --git a/my_compassion/templates/pages/my2_gift_package.xml b/my_compassion/templates/pages/my2_gift_package.xml
index bdcdc342..6ca9fedd 100644
--- a/my_compassion/templates/pages/my2_gift_package.xml
+++ b/my_compassion/templates/pages/my2_gift_package.xml
@@ -123,6 +123,7 @@
         <!-- Include js and stylesheet -->
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_gift_package.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_gift_package.css" />
+        <t t-set="additional_title">Gift Basket</t>
         <t t-call="website.layout">
             <div class="container">
                 <div class="single-column my2_gift_package">
diff --git a/my_compassion/templates/pages/my2_gifts.xml b/my_compassion/templates/pages/my2_gifts.xml
index 61b3cc4b..12119372 100644
--- a/my_compassion/templates/pages/my2_gifts.xml
+++ b/my_compassion/templates/pages/my2_gifts.xml
@@ -18,6 +18,7 @@ Page: My Compassion 2 Gifts Page
 <odoo>
     <!-- GIFTS DASHBOARD -->
     <template id="my2_gifts_page" name="My Compassion 2 Gifts Page">
+        <t t-set="additional_title">Give</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- HELPER FLAGS -->
diff --git a/my_compassion/templates/pages/my2_gifts_thank_you.xml b/my_compassion/templates/pages/my2_gifts_thank_you.xml
index 40bd52dc..a81dcacb 100644
--- a/my_compassion/templates/pages/my2_gifts_thank_you.xml
+++ b/my_compassion/templates/pages/my2_gifts_thank_you.xml
@@ -15,6 +15,7 @@ Page: My Compassion 2 Thank you Page
     <template id="my2_gifts_thank_you_page" name="My Compassion 2 Thank you Page">
         <!-- Include stylesheet -->
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_gifts_thank_you.css" />
+        <t t-set="additional_title">Thank you</t>
         <t t-call="website.layout">
             <div class="container">
                 <div class="single-column">
diff --git a/my_compassion/templates/pages/my2_new_letter.xml b/my_compassion/templates/pages/my2_new_letter.xml
index ff438c3d..b831e7ac 100644
--- a/my_compassion/templates/pages/my2_new_letter.xml
+++ b/my_compassion/templates/pages/my2_new_letter.xml
@@ -19,6 +19,7 @@
         <link rel="stylesheet" href="/my_compassion/static/src/css/template_image.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/add_a_picture_input.css" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/delete_a_picture_input.css" />
+        <t t-set="additional_title">New Letter</t>
         <t t-call="website.layout">
             <div class="container">
                 <!-- Calling breadcrumb component -->
diff --git a/my_compassion/templates/pages/my2_sponsorships.xml b/my_compassion/templates/pages/my2_sponsorships.xml
index 0b7cacfe..bb0ba9ae 100644
--- a/my_compassion/templates/pages/my2_sponsorships.xml
+++ b/my_compassion/templates/pages/my2_sponsorships.xml
@@ -40,6 +40,7 @@ Page: My Compassion 2 Sponsorships Page
     <template id="my2_sponsorships_page" name="Sponsorships Page">
         <script type="text/javascript" src="/my_compassion/static/src/js/my2_sponsorships.js" />
         <link rel="stylesheet" href="/my_compassion/static/src/css/my2_sponsorships.css" />
+        <t t-set="additional_title">Sponsor a Child</t>
         <t t-call="website.layout">
             <!-- HEADER -->
             <div class="sponsorships-foreground pb-4">
diff --git a/my_compassion/templates/pages/my2_user_settings.xml b/my_compassion/templates/pages/my2_user_settings.xml
index 2ffab798..b5915d21 100644
--- a/my_compassion/templates/pages/my2_user_settings.xml
+++ b/my_compassion/templates/pages/my2_user_settings.xml
@@ -23,6 +23,7 @@ Injected data:
 <odoo>
     <template id="my2_user_settings_page" name="My Compassion 2 User Settings Page">
         <link rel="stylesheet" href="/my_compassion/static/src/css/user_settings.css" />
+        <t t-set="additional_title">Settings</t>
         <t t-call="website.layout">
             <div class="container my-4">
                 <div class="container-content">