From 113d72790ac051b62ec07f230db80ff8bfc3c5e0 Mon Sep 17 00:00:00 2001
From: Yaroslav Kosterin <ateamcms@gmail.com>
Date: Thu, 20 Nov 2025 11:47:58 +0200
Subject: [PATCH 1/3] wcag improvements

---
 .../scss/includes/blocks/block-empty.scss     |  2 +-
 .../scss/includes/blocks/block-fund.scss      | 47 ++++++++++++-------
 .../templates/SelectControlOptionsFD.tsx      |  7 +--
 .../templates/SelectControlOptionsLang.tsx    |  3 +-
 .../block-panel-group/PaneGroupPanel.tsx      |  4 +-
 .../elements/forms/RangeControl.tsx           |  5 +-
 .../templates/ProductsListItemGrid.tsx        |  4 +-
 .../templates/ProductsListItemList.tsx        |  4 +-
 .../components/elements/sections/Section.tsx  | 15 +++++-
 .../components/elements/tooltip/Tooltip.tsx   |  4 +-
 .../top-navbar/desktop/TopNavbarDesktop.tsx   |  3 ++
 .../modals/ModalIdentityProxyExpired.tsx      |  2 +-
 .../components/modals/ModalNotification.tsx   |  2 +-
 .../webshop/components/pages/auth/Start.tsx   | 12 ++---
 .../pages/fund-requests/FundRequests.tsx      |  3 +-
 .../steps/FundRequestStepCriteriaOverview.tsx |  4 +-
 .../components/pages/funds-show/FundsShow.tsx | 38 +++++++--------
 .../pages/identity-security/Security2FA.tsx   |  6 ++-
 .../identity-security/SecuritySessions.tsx    |  2 +-
 .../components/pages/payouts/Payouts.tsx      | 15 ++++--
 .../PushNotificationPreferencesCard.tsx       | 15 ++++++
 .../pages/products-show/ProductsShow.tsx      |  2 +-
 .../components/pages/products/Products.tsx    |  2 +-
 .../elements/ProductsFilterGroupProviders.tsx |  4 +-
 .../pages/providers-show/ProvidersShow.tsx    |  6 ++-
 .../pages/reimbursements/Reimbursements.tsx   |  3 +-
 .../reservations-show/ReservationsShow.tsx    |  4 +-
 .../pages/reservations/Reservations.tsx       |  9 ++--
 .../pages/vouchers-show/VouchersShow.tsx      |  2 +-
 react/src/webshop/i18n/nl/components/form.mjs |  2 +
 .../webshop/i18n/nl/directives/app-footer.mjs |  4 ++
 .../src/webshop/i18n/nl/layout/top_navbar.mjs |  4 ++
 .../nl/pages/preferences-notifications.mjs    |  2 +
 react/src/webshop/i18n/nl/pages/provider.mjs  |  1 +
 .../layout/elements/BlockSkipLinks.tsx        |  9 +++-
 .../webshop/layout/elements/LayoutFooter.tsx  |  8 +++-
 36 files changed, 167 insertions(+), 92 deletions(-)

diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-empty.scss b/react/assets/forus-webshop/scss/includes/blocks/block-empty.scss
index 72aba81ad..04ac81e6f 100644
--- a/react/assets/forus-webshop/scss/includes/blocks/block-empty.scss
+++ b/react/assets/forus-webshop/scss/includes/blocks/block-empty.scss
@@ -38,7 +38,7 @@
     }
 
     .block-description {
-        font: 700 14px/20px var(--base-font);
+        font: 700 14px/24px var(--base-font);
         color: #646f79;
         margin: 0 0 35px;
 
diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-fund.scss b/react/assets/forus-webshop/scss/includes/blocks/block-fund.scss
index c33adf0ef..e2848d89a 100644
--- a/react/assets/forus-webshop/scss/includes/blocks/block-fund.scss
+++ b/react/assets/forus-webshop/scss/includes/blocks/block-fund.scss
@@ -56,23 +56,23 @@
         }
 
         .fund-details-items {
-            display: flex;
-            flex-direction: row;
-
-            .fund-details-item {
-                flex-direction: column;
-                width: 100%;
-
-                .fund-details-item-label {
-                    font: 600 14px var(--base-font);
-                    color: #646f79;
-                    margin-bottom: 5px;
-                }
+            display: grid;
+            grid-auto-flow: column;
+            grid-auto-rows: auto auto;
+            gap: 5px 10px;
+            align-items: start;
+
+            .fund-details-item-label {
+                font: 600 14px var(--base-font);
+                color: #646f79;
+                grid-row: 1;
+            }
 
-                .fund-details-item-value {
-                    font: 600 16px var(--base-font);
-                    color: #303030;
-                }
+            .fund-details-item-value {
+                font: 600 16px var(--base-font);
+                color: #303030;
+                grid-row: 2;
+                margin: 0;
             }
         }
     }
@@ -90,8 +90,19 @@
             }
 
             .fund-details-items {
-                gap: 20px;
-                flex-direction: column;
+                display: block;
+
+                .fund-details-item-label {
+                    margin-bottom: 5px;
+                }
+
+                .fund-details-item-value {
+                    margin-bottom: 20px;
+
+                    &:last-child {
+                        margin-bottom: 0;
+                    }
+                }
             }
         }
     }
diff --git a/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsFD.tsx b/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsFD.tsx
index 4f3be9601..e4eaf9693 100644
--- a/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsFD.tsx
+++ b/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsFD.tsx
@@ -62,8 +62,8 @@ export default function SelectControlOptionsFD<T>({
             aria-haspopup="listbox"
             aria-expanded={showOptions}
             aria-labelledby={ariaLabelledby || controlId}
-            aria-controls={`${controlId}_options`}
-            aria-activedescendant={modelValue ? `option_${modelValue.id}` : null}
+            aria-controls={showOptions ? `${controlId}_options` : null}
+            aria-activedescendant={showOptions && modelValue ? `option_${modelValue.id}` : null}
             ref={selectorRef}
             onKeyDown={(e) => (disabled ? null : onKeyDown(e))}
             onBlur={onBlur}>
@@ -125,7 +125,7 @@ export default function SelectControlOptionsFD<T>({
                         className="select-control-search form-control"
                         onClick={searchOption}
                         style={{ display: showOptions && allowSearch ? 'none' : 'block' }}
-                        title={placeholderValue || placeholder}>
+                        aria-label={placeholderValue || placeholder}>
                         <span className="select-control-search-placeholder">{placeholderValue || placeholder}</span>
                         <span className={'select-control-icon'}>
                             <em className={showOptions ? 'mdi mdi-chevron-up' : 'mdi mdi-chevron-down'} />
@@ -142,6 +142,7 @@ export default function SelectControlOptionsFD<T>({
                                     value={query}
                                     tabIndex={0}
                                     onClick={onInputClick}
+                                    aria-controls={`${controlId}_options`}
                                     onChange={(e) => setQuery(e.target.value)}
                                     className="select-control-search form-control"
                                 />
diff --git a/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsLang.tsx b/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsLang.tsx
index e27345233..f36911b49 100644
--- a/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsLang.tsx
+++ b/react/src/dashboard/components/elements/select-control/templates/SelectControlOptionsLang.tsx
@@ -50,7 +50,7 @@ export default function SelectControlOptionsLang<T>({
             data-dusk={dusk}
             aria-haspopup="listbox"
             aria-expanded={showOptions}
-            aria-labelledby={controlId}
+            aria-labelledby={allowSearch ? controlId : null}
             aria-controls={`${controlId}_options`}
             ref={selectorRef}
             onKeyDown={onKeyDown}
@@ -59,7 +59,6 @@ export default function SelectControlOptionsLang<T>({
                 {/* Placeholder */}
                 <label
                     htmlFor={controlId}
-                    role="presentation"
                     ref={placeholderRef}
                     className="lang-control-search"
                     onClick={searchOption}
diff --git a/react/src/webshop/components/elements/block-panel-group/PaneGroupPanel.tsx b/react/src/webshop/components/elements/block-panel-group/PaneGroupPanel.tsx
index 47de3c0d5..f5d252726 100644
--- a/react/src/webshop/components/elements/block-panel-group/PaneGroupPanel.tsx
+++ b/react/src/webshop/components/elements/block-panel-group/PaneGroupPanel.tsx
@@ -47,9 +47,9 @@ export default function PaneGroupPanel({
                         {icon === 'store-marker-outline' && <em className="mdi mdi-store-marker-outline" />}
                     </div>
                 )}
-                <h3 className="panel-header-title" id={titleId}>
+                <h2 className="panel-header-title" id={titleId}>
                     {title}
-                </h3>
+                </h2>
                 <em className={`mdi ${isOpen ? 'mdi-chevron-down' : 'mdi-chevron-right'}`} aria-hidden="true" />
                 <span className="sr-only">
                     {isOpen ? translate('product.labels.collapse_section') : translate('product.labels.expand_section')}
diff --git a/react/src/webshop/components/elements/forms/RangeControl.tsx b/react/src/webshop/components/elements/forms/RangeControl.tsx
index 1767cc138..37df6e186 100644
--- a/react/src/webshop/components/elements/forms/RangeControl.tsx
+++ b/react/src/webshop/components/elements/forms/RangeControl.tsx
@@ -35,7 +35,10 @@ export default function RangeControl({
                 className="horizontal-slider"
                 thumbClassName="horizontal-slider-thumb"
                 trackClassName="horizontal-slider-track"
-                ariaLabelledby={['first-slider-label', 'second-slider-label']}
+                ariaLabel={[
+                    translate('form.range_control.first_slider_aria_label'),
+                    translate('form.range_control.second_slider_aria_label'),
+                ]}
                 ariaValuetext={(state) => {
                     return translate('form.range_control.aria_value', {
                         prefix: prefix?.trim(),
diff --git a/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemGrid.tsx b/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemGrid.tsx
index e7362097f..7b70726e2 100644
--- a/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemGrid.tsx
+++ b/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemGrid.tsx
@@ -49,9 +49,9 @@ export default function ProductsListItemGrid({
                 />
             </div>
             <div className="product-details">
-                <h3 className="product-title" data-dusk="productName">
+                <h2 className="product-title" data-dusk="productName">
                     {product.name}
-                </h3>
+                </h2>
                 <div className="product-subtitle">{product.organization.name}</div>
             </div>
             <div className="product-actions">
diff --git a/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemList.tsx b/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemList.tsx
index 32cb40bdf..053f011a0 100644
--- a/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemList.tsx
+++ b/react/src/webshop/components/elements/lists/products-list/templates/ProductsListItemList.tsx
@@ -38,9 +38,9 @@ export default function ProductsListItemList({
             <div className="product-content">
                 <div className="product-details">
                     <div className="product-details-header">
-                        <h3 className="product-title" data-dusk="productName">
+                        <h2 className="product-title" data-dusk="productName">
                             {product.name}
-                        </h3>
+                        </h2>
                         <div className="product-subtitle">{product.organization.name}</div>
                     </div>
 
diff --git a/react/src/webshop/components/elements/sections/Section.tsx b/react/src/webshop/components/elements/sections/Section.tsx
index 8c16eb199..c42a33015 100644
--- a/react/src/webshop/components/elements/sections/Section.tsx
+++ b/react/src/webshop/components/elements/sections/Section.tsx
@@ -1,5 +1,6 @@
-import React, { ReactNode } from 'react';
+import React, { ReactNode, useMemo } from 'react';
 import classNames from 'classnames';
+import useTranslate from '../../../../dashboard/hooks/useTranslate';
 
 export default function Section({
     id,
@@ -24,6 +25,16 @@ export default function Section({
     wrapper?: boolean;
     children: ReactNode | ReactNode[];
 }) {
+    const translate = useTranslate();
+
+    const ariaLabel = useMemo(() => {
+        if (type === 'footer') {
+            return translate('app_footer.footer_aria_label');
+        }
+
+        return type === 'copyright' ? translate('app_footer.copyright_aria_label') : null;
+    }, [translate, type]);
+
     return (
         <section
             className={classNames(
@@ -41,6 +52,8 @@ export default function Section({
                 type === 'breadcrumbs' && 'section-breadcrumbs',
                 type === 'voucher_details' && 'section-voucher-details',
             )}
+            role={type === 'footer' ? 'contentinfo' : type === 'copyright' ? 'region' : null}
+            aria-label={ariaLabel}
             id={id}>
             {wrapper ? <div className="wrapper">{children}</div> : children}
         </section>
diff --git a/react/src/webshop/components/elements/tooltip/Tooltip.tsx b/react/src/webshop/components/elements/tooltip/Tooltip.tsx
index 53c891c58..3742b46fd 100644
--- a/react/src/webshop/components/elements/tooltip/Tooltip.tsx
+++ b/react/src/webshop/components/elements/tooltip/Tooltip.tsx
@@ -5,8 +5,8 @@ export default function Tooltip({ text, className }: { text: string; className?:
     const translate = useTranslate();
 
     return (
-        <div className="tooltip-block" aria-label={translate(text)} title={translate(text)}>
-            <div className="tooltip-icon" role="button" tabIndex={0}>
+        <div className="tooltip-block" title={translate(text)}>
+            <div className="tooltip-icon" aria-label={translate(text)} role="button" tabIndex={0}>
                 <em className="mdi mdi-information-variant-circle" />
             </div>
             <div className={`tooltip ${className}`}>{translate(text)}</div>
diff --git a/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktop.tsx b/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktop.tsx
index cc38e4ee7..7364a93ba 100644
--- a/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktop.tsx
+++ b/react/src/webshop/components/elements/top-navbar/desktop/TopNavbarDesktop.tsx
@@ -13,6 +13,7 @@ import { mainContext } from '../../../../contexts/MainContext';
 import { TopNavbarDesktopSearchButton } from './TopNavbarDesktopSearchButton';
 import { layoutContext } from '../../../../contexts/LayoutContext';
 import { useElementSize } from '../../../../hooks/useElementSize';
+import useTranslate from '../../../../../dashboard/hooks/useTranslate';
 
 export const TopNavbarDesktop = ({
     hideOnScroll = false,
@@ -21,6 +22,7 @@ export const TopNavbarDesktop = ({
     hideOnScroll?: boolean;
     className?: string;
 }) => {
+    const translate = useTranslate();
     const envData = useEnvData();
     const appConfigs = useAppConfigs();
     const { showSearchBox } = useContext(mainContext);
@@ -49,6 +51,7 @@ export const TopNavbarDesktop = ({
     return (
         <nav
             ref={navbarDesktopRef}
+            aria-label={translate('top_navbar.nav_aria_label')}
             className={classNames(
                 'block block-navbar-desktop',
                 className,
diff --git a/react/src/webshop/components/modals/ModalIdentityProxyExpired.tsx b/react/src/webshop/components/modals/ModalIdentityProxyExpired.tsx
index b504608e9..5f2d07ea4 100644
--- a/react/src/webshop/components/modals/ModalIdentityProxyExpired.tsx
+++ b/react/src/webshop/components/modals/ModalIdentityProxyExpired.tsx
@@ -47,7 +47,7 @@ export default function ModalIdentityProxyExpired({ modal }: { modal: ModalState
                         <div className="modal-section-icon">
                             <div className="mdi mdi-cancel" />
                         </div>
-                        <h2 className="modal-section-title" role="heading" id="expiredIdentityDialogTitle">
+                        <h2 className="modal-section-title" id="expiredIdentityDialogTitle">
                             {translate('expired_identity.title')}
                         </h2>
                         <div className="modal-section-description" id="expiredIdentityDialogDescription">
diff --git a/react/src/webshop/components/modals/ModalNotification.tsx b/react/src/webshop/components/modals/ModalNotification.tsx
index 85ac20771..7e8bb1128 100644
--- a/react/src/webshop/components/modals/ModalNotification.tsx
+++ b/react/src/webshop/components/modals/ModalNotification.tsx
@@ -96,7 +96,7 @@ export default function ModalNotification({
                     role="button"
                 />
                 <div className="modal-header">
-                    <h2 className="modal-header-title" role="heading" id="notificationDialogTitle">
+                    <h2 className="modal-header-title" id="notificationDialogTitle">
                         {title}
                     </h2>
                 </div>
diff --git a/react/src/webshop/components/pages/auth/Start.tsx b/react/src/webshop/components/pages/auth/Start.tsx
index b81b0047a..f935aa4fe 100644
--- a/react/src/webshop/components/pages/auth/Start.tsx
+++ b/react/src/webshop/components/pages/auth/Start.tsx
@@ -579,9 +579,7 @@ export default function Start() {
 
                                     {authEmailRestoreSent && (
                                         <div className="sign_up-pane">
-                                            <h1 className="sr-only" role="heading">
-                                                {translate('popup_auth.header.title_sr')}
-                                            </h1>
+                                            <h1 className="sr-only">{translate('popup_auth.header.title_sr')}</h1>
                                             <h2 className="sign_up-pane-header">
                                                 {translate('popup_auth.header.title')}
                                             </h2>
@@ -611,10 +609,8 @@ export default function Start() {
                                     )}
                                     {authEmailConfirmationSent && (
                                         <div className="sign_up-pane">
-                                            <h1 className="sr-only" role="heading">
-                                                {translate('popup_auth.header.title_sr')}
-                                            </h1>
-                                            <h2 className="sign_up-pane-header" role="heading">
+                                            <h1 className="sr-only">{translate('popup_auth.header.title_sr')}</h1>
+                                            <h2 className="sign_up-pane-header">
                                                 {translate('popup_auth.header.title')}
                                             </h2>
                                             <div className="sign_up-pane-body" data-dusk="authEmailSentConfirmation">
@@ -626,7 +622,7 @@ export default function Start() {
                                                             alt=""
                                                         />
                                                     </div>
-                                                    <h3 className="sign_up-email_sent-title" role="heading">
+                                                    <h3 className="sign_up-email_sent-title">
                                                         {translate(
                                                             `popup_auth.header.title_existing_user_succes_${appConfigs?.communication_type}`,
                                                         )}
diff --git a/react/src/webshop/components/pages/fund-requests/FundRequests.tsx b/react/src/webshop/components/pages/fund-requests/FundRequests.tsx
index fe6eeb0ab..f37d0cab2 100644
--- a/react/src/webshop/components/pages/fund-requests/FundRequests.tsx
+++ b/react/src/webshop/components/pages/fund-requests/FundRequests.tsx
@@ -122,7 +122,7 @@ export default function FundRequests() {
                     <div className="form form-compact">
                         <div className="profile-aside-block">
                             <div className="form-group">
-                                <label className="form-label" htmlFor="select_fund">
+                                <label className="form-label" id="select_fund_label" htmlFor="select_fund">
                                     Tegoeden
                                 </label>
                                 <SelectControl
@@ -132,6 +132,7 @@ export default function FundRequests() {
                                     options={funds}
                                     multiline={true}
                                     dusk="selectControlFunds"
+                                    ariaLabelledby="select_fund_label"
                                     onChange={(fund_id?: number) => filterUpdate({ fund_id })}
                                 />
                             </div>
diff --git a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx
index c72dfb1f5..4f90f6ee9 100644
--- a/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx
+++ b/react/src/webshop/components/pages/funds-request/elements/steps/FundRequestStepCriteriaOverview.tsx
@@ -29,9 +29,7 @@ export default function FundRequestStepCriteriaOverview({
             {progress}
 
             <div className="sign_up-pane" data-dusk="criteriaStepsOverview">
-                <h2 className="sign_up-pane-header" role="heading">
-                    {translate('fund_request.sign_up.pane.header_title')}
-                </h2>
+                <h2 className="sign_up-pane-header">{translate('fund_request.sign_up.pane.header_title')}</h2>
                 <div className="sign_up-pane-body">
                     <p className="sign_up-pane-text">
                         {translate('fund_request.sign_up.pane.text', {
diff --git a/react/src/webshop/components/pages/funds-show/FundsShow.tsx b/react/src/webshop/components/pages/funds-show/FundsShow.tsx
index 8c1160030..f4d1b0b89 100644
--- a/react/src/webshop/components/pages/funds-show/FundsShow.tsx
+++ b/react/src/webshop/components/pages/funds-show/FundsShow.tsx
@@ -183,35 +183,31 @@ export default function FundsShow() {
 
                                 {!fund.hide_meta && (
                                     <dl className={'fund-details-items'}>
-                                        <dt className={'fund-details-item'}>
-                                            <div className="fund-details-item-label">
-                                                {translate('fund.details.by')}
-                                            </div>
-                                            <div className="fund-details-item-value">{fund.organization?.name}</div>
-                                        </dt>
+                                        <dt className="fund-details-item-label">{translate('fund.details.by')}</dt>
+                                        <dd className="fund-details-item-value">{fund.organization?.name}</dd>
                                         {formulaList.multiply?.map((formula, index) => (
-                                            <dt key={index} className={'fund-details-item'}>
-                                                <div className="fund-details-item-label">
+                                            <Fragment key={index}>
+                                                <dt className="fund-details-item-label">
                                                     {translate('fund.criterias.multiplied_amount')}
-                                                </div>
-                                                <div className="fund-details-item-value">{formula.amount_locale}</div>
-                                            </dt>
+                                                </dt>
+                                                <dd className="fund-details-item-value">{formula.amount_locale}</dd>
+                                            </Fragment>
                                         ))}
                                         {fund.key != 'IIT' && (
-                                            <dt className={'fund-details-item'}>
-                                                <div className="fund-details-item-label">
+                                            <Fragment>
+                                                <dt className="fund-details-item-label">
                                                     {translate('fund.details.start_date')}
-                                                </div>
-                                                <div className="fund-details-item-value">{fund.start_date_locale}</div>
-                                            </dt>
+                                                </dt>
+                                                <dd className="fund-details-item-value">{fund.start_date_locale}</dd>
+                                            </Fragment>
                                         )}
                                         {fund.key != 'IIT' && (
-                                            <dt className={'fund-details-item'}>
-                                                <div className="fund-details-item-label">
+                                            <Fragment>
+                                                <dt className="fund-details-item-label">
                                                     {translate('fund.details.end_date')}
-                                                </div>
-                                                <div className="fund-details-item-value">{fund.end_date_locale}</div>
-                                            </dt>
+                                                </dt>
+                                                <dd className="fund-details-item-value">{fund.end_date_locale}</dd>
+                                            </Fragment>
                                         )}
                                     </dl>
                                 )}
diff --git a/react/src/webshop/components/pages/identity-security/Security2FA.tsx b/react/src/webshop/components/pages/identity-security/Security2FA.tsx
index a5936ef81..4839bf56a 100644
--- a/react/src/webshop/components/pages/identity-security/Security2FA.tsx
+++ b/react/src/webshop/components/pages/identity-security/Security2FA.tsx
@@ -235,7 +235,10 @@ export default function Security2FA() {
                     <div className="block block-auth-2fa">
                         <form className="form form-compact" onSubmit={form.submit}>
                             <div className="form-group">
-                                <label className="form-label" htmlFor="auth_2fa_remember_ip">
+                                <label
+                                    className="form-label"
+                                    htmlFor="auth_2fa_remember_ip"
+                                    id="auth_2fa_remember_ip_select">
                                     {translate('security_2fa.remember_ip')}
                                 </label>
                                 {!auth2FAState.auth_2fa_forget_force.voucher &&
@@ -250,6 +253,7 @@ export default function Security2FA() {
                                         }}
                                         options={auth2FARememberIpOptions}
                                         multiline={true}
+                                        ariaLabelledby={'auth_2fa_remember_ip_select'}
                                     />
                                 ) : (
                                     <input
diff --git a/react/src/webshop/components/pages/identity-security/SecuritySessions.tsx b/react/src/webshop/components/pages/identity-security/SecuritySessions.tsx
index c0359c66a..7b1ed4c75 100644
--- a/react/src/webshop/components/pages/identity-security/SecuritySessions.tsx
+++ b/react/src/webshop/components/pages/identity-security/SecuritySessions.tsx
@@ -154,7 +154,7 @@ export default function SecuritySessions() {
                         <div className="profile-content-title">
                             <div className="pull-left">
                                 {sessions && <div className="profile-content-title-count">{sessions?.data.length}</div>}
-                                {translate('security_sessions.title')}
+                                <h1 className="profile-content-header">{translate('security_sessions.title')}</h1>
                             </div>
                         </div>
                     </div>
diff --git a/react/src/webshop/components/pages/payouts/Payouts.tsx b/react/src/webshop/components/pages/payouts/Payouts.tsx
index ac4d79fd1..401b44bc1 100644
--- a/react/src/webshop/components/pages/payouts/Payouts.tsx
+++ b/react/src/webshop/components/pages/payouts/Payouts.tsx
@@ -11,6 +11,7 @@ import useSetProgress from '../../../../dashboard/hooks/useSetProgress';
 import useFilterNext from '../../../../dashboard/modules/filter_next/useFilterNext';
 import PayoutCard from './elements/PayoutCard';
 import { WebshopRoutes } from '../../../modules/state_router/RouterBuilder';
+import UIControlText from '../../../../dashboard/components/elements/forms/ui-controls/UIControlText';
 
 export default function Payouts() {
     const translate = useTranslate();
@@ -63,13 +64,17 @@ export default function Payouts() {
                     <div className="form form-compact">
                         <div className="profile-aside-block">
                             <div className="form-group">
-                                <input
-                                    type="text"
-                                    className={'form-control'}
+                                <label className="form-label" htmlFor="payouts_search">
+                                    {translate('payouts.search')}
+                                </label>
+
+                                <UIControlText
+                                    id="payouts_search"
                                     value={filterValues.q}
-                                    onChange={(e) => filterUpdate({ q: e.target.value })}
+                                    onChangeValue={(q) => filterUpdate({ q })}
+                                    dataDusk="listPayoutsSearch"
+                                    ariaLabel={translate('payouts.search')}
                                     placeholder={translate('payouts.search')}
-                                    data-dusk="listPayoutsSearch"
                                 />
                             </div>
                         </div>
diff --git a/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx b/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx
index e40cf9f93..3fcfc68ad 100644
--- a/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx
+++ b/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx
@@ -146,13 +146,19 @@ export default function PushNotificationPreferencesCard({
                 {notificationsDismissTime.webshop > 0 && (
                     <div className="card-section card-section-primary card-section-md">
                         <div className="form-group">
+                            <label className="form-label" htmlFor="select_dismiss_time" id="dismiss_time_select">
+                                {translate('preferences_notifications.push_notifications_dismiss_time.webshop.label')}
+                            </label>
+
                             <SelectControl
+                                id="select_dismiss_time"
                                 propKey="key"
                                 multiline={true}
                                 allowSearch={false}
                                 value={notificationsDismissTime.webshop}
                                 onChange={(time?: number) => selectDismissTime('webshop', time)}
                                 options={dismissTimeOptions}
+                                ariaLabelledby="dismiss_time_select"
                             />
                         </div>
                     </div>
@@ -198,13 +204,22 @@ export default function PushNotificationPreferencesCard({
                 {notificationsDismissTime.bookmarks > 0 && (
                     <div className="card-section card-section-primary card-section-md">
                         <div className="form-group">
+                            <label
+                                className="form-label"
+                                htmlFor="select_bookmarks_dismiss_time"
+                                id="bookmarks_dismiss_time_select">
+                                {translate('preferences_notifications.push_notifications_dismiss_time.bookmarks.label')}
+                            </label>
+
                             <SelectControl
+                                id="select_bookmarks_dismiss_time"
                                 propKey="key"
                                 multiline={true}
                                 allowSearch={false}
                                 value={notificationsDismissTime.bookmarks}
                                 onChange={(time?: number) => selectDismissTime('bookmarks', time)}
                                 options={dismissTimeOptions}
+                                ariaLabelledby="bookmarks_dismiss_time_select"
                             />
                         </div>
                     </div>
diff --git a/react/src/webshop/components/pages/products-show/ProductsShow.tsx b/react/src/webshop/components/pages/products-show/ProductsShow.tsx
index 5920f7d82..33fc86e8d 100644
--- a/react/src/webshop/components/pages/products-show/ProductsShow.tsx
+++ b/react/src/webshop/components/pages/products-show/ProductsShow.tsx
@@ -233,7 +233,7 @@ export default function ProductsShow() {
                                     <h1 className="product-overview-name" data-dusk="productName">
                                         {product.name}
                                     </h1>
-                                    <div className="product-prop-item-category" role="text">
+                                    <div className="product-prop-item-category">
                                         <em className="mdi mdi-television-classic" aria-hidden="true" />
                                         <span>{product?.product_category?.name}</span>
                                     </div>
diff --git a/react/src/webshop/components/pages/products/Products.tsx b/react/src/webshop/components/pages/products/Products.tsx
index 9f263107a..1b446dd60 100644
--- a/react/src/webshop/components/pages/products/Products.tsx
+++ b/react/src/webshop/components/pages/products/Products.tsx
@@ -254,7 +254,7 @@ export default function Products() {
                                 onKeyDown={clickOnKeyEnter}
                                 role="button"
                                 tabIndex={0}
-                                aria-label={translate('product.buttons.bookmark')}
+                                aria-label={translate('products.filters.bookmarked')}
                                 aria-pressed={!!filterValues.bookmarked}>
                                 <em className="mdi mdi-cards-heart-outline" />
 
diff --git a/react/src/webshop/components/pages/products/elements/ProductsFilterGroupProviders.tsx b/react/src/webshop/components/pages/products/elements/ProductsFilterGroupProviders.tsx
index cfc6a1ab6..f6ea9e2c1 100644
--- a/react/src/webshop/components/pages/products/elements/ProductsFilterGroupProviders.tsx
+++ b/react/src/webshop/components/pages/products/elements/ProductsFilterGroupProviders.tsx
@@ -51,11 +51,11 @@ export default function ProductsFilterGroupProviders({
         <ProductsFilterGroup
             dusk={'productFiltersGroupProviders'}
             title={translate('products.filters.providers')}
-            controls={'price_filters'}
+            controls={'provider_filters'}
             openByDefault={openByDefault}
             content={(isOpen) => (
                 <div
-                    id="price_filters"
+                    id="provider_filters"
                     hidden={!isOpen}
                     className="showcase-aside-group-body"
                     role="group"
diff --git a/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx b/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx
index 80a93acdd..49095668d 100644
--- a/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx
+++ b/react/src/webshop/components/pages/providers-show/ProvidersShow.tsx
@@ -206,7 +206,11 @@ export default function ProvidersShow() {
                                                     }}
                                                     className="office-item">
                                                     <div className="office-item-map-icon">
-                                                        <em className="mdi mdi-map-marker" role="img" aria-label="" />
+                                                        <em
+                                                            className="mdi mdi-map-marker"
+                                                            role="img"
+                                                            aria-label={translate('provider.details.map_icon')}
+                                                        />
                                                     </div>
                                                     <div className="office-pane">
                                                         <div className="office-pane-block">
diff --git a/react/src/webshop/components/pages/reimbursements/Reimbursements.tsx b/react/src/webshop/components/pages/reimbursements/Reimbursements.tsx
index c5bd78903..d9321bc44 100644
--- a/react/src/webshop/components/pages/reimbursements/Reimbursements.tsx
+++ b/react/src/webshop/components/pages/reimbursements/Reimbursements.tsx
@@ -140,7 +140,7 @@ export default function Reimbursements() {
                     <div className="form form-compact">
                         <div className="profile-aside-block">
                             <div className="form-group">
-                                <label className="form-label" htmlFor="select_fund">
+                                <label className="form-label" htmlFor="select_fund" id="fund_select">
                                     Tegoeden
                                 </label>
                                 <SelectControl
@@ -151,6 +151,7 @@ export default function Reimbursements() {
                                     multiline={true}
                                     allowSearch={true}
                                     dusk="selectControlFunds"
+                                    ariaLabelledby="fund_select"
                                     onChange={(fund_id?: number) => filterUpdate({ fund_id })}
                                 />
                             </div>
diff --git a/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx b/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx
index 4a9aa83cf..3d5f348ee 100644
--- a/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx
+++ b/react/src/webshop/components/pages/reservations-show/ReservationsShow.tsx
@@ -96,9 +96,9 @@ export default function ReservationsShow() {
                                     </div>
                                     <div className="reservation-content">
                                         <div className="reservation-header">
-                                            <h2 className="reservation-title">
+                                            <h1 className="reservation-title">
                                                 {translate('reservation.details.title')}
-                                            </h2>
+                                            </h1>
                                             <div className={`label label-${stateData.stateClass}`}>
                                                 {stateData.stateText}
                                             </div>
diff --git a/react/src/webshop/components/pages/reservations/Reservations.tsx b/react/src/webshop/components/pages/reservations/Reservations.tsx
index 7b292ffa6..c25f876bc 100644
--- a/react/src/webshop/components/pages/reservations/Reservations.tsx
+++ b/react/src/webshop/components/pages/reservations/Reservations.tsx
@@ -144,7 +144,7 @@ export default function Reservations() {
                             />
                         </div>
                         <div className="form-group">
-                            <label className="form-label" htmlFor="select_fund">
+                            <label className="form-label" htmlFor="select_fund" id="fund_select">
                                 {translate('reservations.filters.fund')}
                             </label>
 
@@ -157,10 +157,11 @@ export default function Reservations() {
                                 allowSearch={true}
                                 dusk="selectControlFunds"
                                 onChange={(fund_id?: number) => filterUpdate({ fund_id })}
+                                ariaLabelledby="fund_select"
                             />
                         </div>
                         <div className="form-group">
-                            <label className="form-label" htmlFor="select_provider">
+                            <label className="form-label" htmlFor="select_provider" id="provider_select">
                                 {translate('reservations.filters.provider')}
                             </label>
 
@@ -173,10 +174,11 @@ export default function Reservations() {
                                 multiline={true}
                                 allowSearch={true}
                                 dusk="selectControlOrganizations"
+                                ariaLabelledby="provider_select"
                             />
                         </div>
                         <div className="form-group">
-                            <label className="form-label" htmlFor="select_state">
+                            <label className="form-label" htmlFor="select_state" id="state_select">
                                 {translate('reservations.filters.state')}
                             </label>
 
@@ -189,6 +191,7 @@ export default function Reservations() {
                                 multiline={true}
                                 allowSearch={true}
                                 dusk="selectControlStates"
+                                ariaLabelledby="state_select"
                             />
                         </div>
                     </div>
diff --git a/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx b/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx
index 608cfed84..d3343857b 100644
--- a/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx
+++ b/react/src/webshop/components/pages/vouchers-show/VouchersShow.tsx
@@ -153,7 +153,7 @@ export default function VouchersShow() {
                                             />
                                         </div>
                                         <div className="voucher-fund-overview-content">
-                                            <div className="voucher-fund-overview-title">{voucher?.fund?.name}</div>
+                                            <h1 className="voucher-fund-overview-title">{voucher?.fund?.name}</h1>
                                             <div className="voucher-fund-overview-description">
                                                 {translate('voucher.overview.description')}
                                             </div>
diff --git a/react/src/webshop/i18n/nl/components/form.mjs b/react/src/webshop/i18n/nl/components/form.mjs
index 52398fcd5..0dc4d62bb 100644
--- a/react/src/webshop/i18n/nl/components/form.mjs
+++ b/react/src/webshop/i18n/nl/components/form.mjs
@@ -6,5 +6,7 @@ export default {
     },
     range_control: {
         aria_value: 'Value {{prefix}}{{value}}, minimum waarde {{prefix}}{{min}}, maximum waarde {{prefix}}{{max}}',
+        first_slider_aria_label: 'Schuifknop voor minimale prijs',
+        second_slider_aria_label: 'Schuifknop voor maximale prijs',
     },
 };
diff --git a/react/src/webshop/i18n/nl/directives/app-footer.mjs b/react/src/webshop/i18n/nl/directives/app-footer.mjs
index dd3415a6e..f1e2db753 100644
--- a/react/src/webshop/i18n/nl/directives/app-footer.mjs
+++ b/react/src/webshop/i18n/nl/directives/app-footer.mjs
@@ -14,4 +14,8 @@ export default {
         terms_and_conditions: 'Algemene voorwaarden',
         sitemap: 'Sitemap',
     },
+    footer_aria_label: 'Voettekst',
+    copyright_aria_label: 'Voorwaarden en verklaringen',
+    me_app_aria_label: 'Informatie over het downloaden van de Me-app',
+    nav_provider_aria_label: 'Aanmelden als aanbieder',
 };
diff --git a/react/src/webshop/i18n/nl/layout/top_navbar.mjs b/react/src/webshop/i18n/nl/layout/top_navbar.mjs
index d847e1e2b..05a4f0b50 100644
--- a/react/src/webshop/i18n/nl/layout/top_navbar.mjs
+++ b/react/src/webshop/i18n/nl/layout/top_navbar.mjs
@@ -2,6 +2,10 @@ export default {
     start: 'Start',
     open_home: `Terug naar hoofdpagina`,
     main_menu: 'Hoofdmenu',
+    nav_aria_label: 'Hoofdmenu',
+    skip_links: 'Ga direct naar:',
+    skip_links_content: 'Hoofdinhoud',
+    skip_links_aria_label: 'Ga direct naar: Hoofdinhoud',
     start_button: {
         potjeswijzer: 'Start aanvraag',
         geertruidenberg: 'Start aanvraag',
diff --git a/react/src/webshop/i18n/nl/pages/preferences-notifications.mjs b/react/src/webshop/i18n/nl/pages/preferences-notifications.mjs
index aa2563138..186f32227 100644
--- a/react/src/webshop/i18n/nl/pages/preferences-notifications.mjs
+++ b/react/src/webshop/i18n/nl/pages/preferences-notifications.mjs
@@ -144,10 +144,12 @@ export default {
     },
     push_notifications_dismiss_time: {
         webshop: {
+            label: 'Selecteer de tijd in seconden dat automatische systeemmeldingen worden gesloten nadat een actie is uitgevoerd.',
             title: 'Algemene meldingen automatisch sluiten',
             description: 'Verberg systeemmeldingen automatisch nadat een actie is uitgevoerd.',
         },
         bookmarks: {
+            label: 'Selecteer de tijd in seconden dat systeemmeldingen betreft favoriete producten worden gesloten nadat een actie is uitgevoerd.',
             title: 'Meldingen over favoriete producten automatisch sluiten',
             description:
                 'Verberg de systeemmeldingen automatisch nadat favoriete producten worden toegevoegd of verwijderd.',
diff --git a/react/src/webshop/i18n/nl/pages/provider.mjs b/react/src/webshop/i18n/nl/pages/provider.mjs
index ab0b8e26b..76b73c2ab 100644
--- a/react/src/webshop/i18n/nl/pages/provider.mjs
+++ b/react/src/webshop/i18n/nl/pages/provider.mjs
@@ -11,6 +11,7 @@ export default {
         phone: 'Telefoonnummer:',
         type: 'Type aanbieder:',
         type_none: 'Geen aanbieder type',
+        map_icon: 'Icoon van de vestiging',
     },
     description: {
         title: 'Omschrijving',
diff --git a/react/src/webshop/layout/elements/BlockSkipLinks.tsx b/react/src/webshop/layout/elements/BlockSkipLinks.tsx
index 644ff8d7e..60c518ffd 100644
--- a/react/src/webshop/layout/elements/BlockSkipLinks.tsx
+++ b/react/src/webshop/layout/elements/BlockSkipLinks.tsx
@@ -1,12 +1,17 @@
 import React from 'react';
 import { useHelperService } from '../../../dashboard/services/HelperService';
 import { clickOnKeyEnter } from '../../../dashboard/helpers/wcag';
+import useTranslate from '../../../dashboard/hooks/useTranslate';
 
 export default function BlockSkipLinks() {
+    const translate = useTranslate();
     const helperService = useHelperService();
 
     return (
-        <div className="block block-skip-links" role="navigation">
+        <div
+            className="block block-skip-links"
+            role="navigation"
+            aria-label={translate('top_navbar.skip_links_aria_label')}>
             <a
                 className="sr-only sr-only-focusable"
                 href="#"
@@ -15,7 +20,7 @@ export default function BlockSkipLinks() {
                     e.preventDefault();
                     helperService.focusElement(document.querySelector('#main-content'));
                 }}>
-                Ga direct naar: <span>Hoofdinhoud</span>
+                {translate('top_navbar.skip_links')} <span>{translate('top_navbar.skip_links_content')}</span>
             </a>
         </div>
     );
diff --git a/react/src/webshop/layout/elements/LayoutFooter.tsx b/react/src/webshop/layout/elements/LayoutFooter.tsx
index 30a9ba852..7e7c965b4 100644
--- a/react/src/webshop/layout/elements/LayoutFooter.tsx
+++ b/react/src/webshop/layout/elements/LayoutFooter.tsx
@@ -82,7 +82,9 @@ export default function LayoutFooter() {
                             {appConfigs.pages.provider && (
                                 <div className="block block-markdown">
                                     <h3>{translate('app_footer.columns.links')}</h3>
-                                    <nav className="footer-nav">
+                                    <nav
+                                        className="footer-nav"
+                                        aria-label={translate('app_footer.nav_provider_aria_label')}>
                                         <div className="footer-nav-item">
                                             <StateNavLink name={WebshopRoutes.SIGN_UP} target="_self">
                                                 {translate('app_footer.provider_sign_up')}
@@ -114,7 +116,9 @@ export default function LayoutFooter() {
                                                 <AppLinks
                                                     theme={envData.config?.flags.useLightAppIcons ? 'light' : 'dark'}
                                                 />
-                                                <nav className="footer-nav">
+                                                <nav
+                                                    className="footer-nav"
+                                                    aria-label={translate('app_footer.me_app_aria_label')}>
                                                     <div className="footer-nav-item">
                                                         <div className="flex">
                                                             <span aria-hidden="true">

From 0978c517d01ac54e51250a2aeab037a5570257f4 Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Fri, 5 Dec 2025 04:23:06 +0200
Subject: [PATCH 2/3] wcag update minor refactoring and update translated texts

---
 .../scss/_common/dashboard.scss               |  1 +
 .../includes/blocks/block-preferences.scss    |  1 +
 .../scss/includes/components/card.scss        |  5 ++
 .../PushNotificationPreferencesCard.tsx       |  4 +-
 react/src/webshop/i18n/translated/ar.json     | 34 ++++++----
 react/src/webshop/i18n/translated/de.json     | 34 ++++++----
 react/src/webshop/i18n/translated/en-US.json  | 34 ++++++----
 react/src/webshop/i18n/translated/fr.json     | 34 ++++++----
 react/src/webshop/i18n/translated/pl.json     | 34 ++++++----
 react/src/webshop/i18n/translated/ru.json     | 36 +++++++----
 react/src/webshop/i18n/translated/tr.json     | 34 ++++++----
 react/src/webshop/i18n/translated/uk.json     | 34 ++++++----
 translations/cache/cache.json                 | 62 ++++++++++++++++---
 13 files changed, 249 insertions(+), 98 deletions(-)

diff --git a/react/assets/forus-platform/scss/_common/dashboard.scss b/react/assets/forus-platform/scss/_common/dashboard.scss
index d525cb619..ca8ebf181 100644
--- a/react/assets/forus-platform/scss/_common/dashboard.scss
+++ b/react/assets/forus-platform/scss/_common/dashboard.scss
@@ -3897,6 +3897,7 @@ body {
             padding: 10px 25px;
             cursor: pointer;
             transition: background 0.4s;
+            outline-offset: -2px;
 
             .preference-option-details {
                 flex-grow: 1;
diff --git a/react/assets/forus-webshop/scss/includes/blocks/block-preferences.scss b/react/assets/forus-webshop/scss/includes/blocks/block-preferences.scss
index e4a624158..91451317b 100644
--- a/react/assets/forus-webshop/scss/includes/blocks/block-preferences.scss
+++ b/react/assets/forus-webshop/scss/includes/blocks/block-preferences.scss
@@ -8,6 +8,7 @@
         padding: 10px 25px;
         cursor: pointer;
         transition: background .4s;
+        outline-offset: -2px !important;
 
         .preference-option-details {
             flex-grow: 1;
diff --git a/react/assets/forus-webshop/scss/includes/components/card.scss b/react/assets/forus-webshop/scss/includes/components/card.scss
index fc4decc11..7558e17b0 100644
--- a/react/assets/forus-webshop/scss/includes/components/card.scss
+++ b/react/assets/forus-webshop/scss/includes/components/card.scss
@@ -172,6 +172,11 @@
             padding: 15px;
         }
 
+        &.card-section-md-vertical {
+            padding-top: 15px;
+            padding-bottom: 15px;
+        }
+
         &.card-section-sm {
             padding: 10px;
         }
diff --git a/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx b/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx
index 3fcfc68ad..23b3bd429 100644
--- a/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx
+++ b/react/src/webshop/components/pages/preferences-notifications/elements/PushNotificationPreferencesCard.tsx
@@ -144,7 +144,7 @@ export default function PushNotificationPreferencesCard({
                 </label>
 
                 {notificationsDismissTime.webshop > 0 && (
-                    <div className="card-section card-section-primary card-section-md">
+                    <div className="card-section card-section-primary card-section-md-vertical">
                         <div className="form-group">
                             <label className="form-label" htmlFor="select_dismiss_time" id="dismiss_time_select">
                                 {translate('preferences_notifications.push_notifications_dismiss_time.webshop.label')}
@@ -202,7 +202,7 @@ export default function PushNotificationPreferencesCard({
                 </label>
 
                 {notificationsDismissTime.bookmarks > 0 && (
-                    <div className="card-section card-section-primary card-section-md">
+                    <div className="card-section card-section-primary card-section-md-vertical">
                         <div className="form-group">
                             <label
                                 className="form-label"
diff --git a/react/src/webshop/i18n/translated/ar.json b/react/src/webshop/i18n/translated/ar.json
index 296550680..aab674e5f 100644
--- a/react/src/webshop/i18n/translated/ar.json
+++ b/react/src/webshop/i18n/translated/ar.json
@@ -422,11 +422,8 @@
             "sort": "فرز",
             "payment_option_qr": "إظهار رمز الاستجابة السريعة لدى المزود",
             "payment_option_reservation": "احجز عبر الإنترنت",
-            "payment_options": "خيارات الدفع",
-            "payment_options_info": "اقرأ المزيد عن خيارات الدفع",
             "price": "السعر (€)",
             "price_from": "من",
-            "price_to": "إلى",
             "payment_option_extra_payment": "الدفع عبر الإنترنت باستخدام iDeal",
             "price_type_option_discount_fixed": "الخصم باليورو",
             "price_type_option_discount_percentage": "الخصم بالنسبة المئوية",
@@ -435,7 +432,10 @@
             "price_type_option_regular": "السعر",
             "price_type_options": "نوع العرض",
             "price_type_options_info": "اقرأ المزيد عن أنواع العروض",
-            "category": "الفئات"
+            "category": "الفئات",
+            "payment_options": "خيارات الدفع",
+            "payment_options_info": "اقرأ المزيد عن خيارات الدفع",
+            "price_to": "إلى"
         },
         "sort": {
             "created_at_asc": "الأقدم أولاً",
@@ -775,7 +775,11 @@
         },
         "language": {
             "prefix": "لغتك"
-        }
+        },
+        "nav_aria_label": "القائمة الرئيسية",
+        "skip_links": "انتقل مباشرةً إلى:",
+        "skip_links_aria_label": "انتقل مباشرةً إلى: المحتوى الرئيسي",
+        "skip_links_content": "المحتوى الرئيسي"
     },
     "week_days": {
         "0": "الإثنين",
@@ -1608,7 +1612,8 @@
             "phone": "رقم الهاتف",
             "title": "معلومات المزود",
             "type": "نوع مقدم الخدمة:",
-            "type_none": "لا يوجد نوع الموفر"
+            "type_none": "لا يوجد نوع الموفر",
+            "map_icon": "أيقونة المؤسسة"
         },
         "funds": {
             "title": "الفروع"
@@ -2359,11 +2364,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "إخفاء إشعارات النظام تلقائياً بعد إضافة المنتجات المفضلة أو إزالتها.",
-                "title": "إغلاق الإشعارات حول المنتجات المفضلة تلقائياً"
+                "title": "إغلاق الإشعارات حول المنتجات المفضلة تلقائياً",
+                "label": "حدد الوقت بالثواني التي يتم فيها إغلاق إشعارات النظام المتعلقة بالمنتجات المفضلة بعد تنفيذ إجراء ما."
             },
             "webshop": {
                 "description": "إخفاء إعلامات النظام تلقائياً بعد تنفيذ إجراء ما.",
-                "title": "الإخطارات العامة تغلق تلقائياً"
+                "title": "الإخطارات العامة تغلق تلقائياً",
+                "label": "حدد الوقت بالثواني الذي يتم فيه إغلاق إعلامات النظام التلقائية بعد تنفيذ إجراء ما."
             }
         },
         "push_notifications_preferences": {
@@ -3321,7 +3328,11 @@
         },
         "me_app_more_info": "تعرّف على المزيد حول تطبيق Me",
         "provider_sign_up": "التسجيل كمقدم خدمات",
-        "sponsor_logo_alt": "شعار الراعي"
+        "sponsor_logo_alt": "شعار الراعي",
+        "copyright_aria_label": "الشروط والبيانات",
+        "footer_aria_label": "التذييل",
+        "me_app_aria_label": "معلومات حول تنزيل تطبيق Me",
+        "nav_provider_aria_label": "التسجيل كمقدم خدمات"
     },
     "block_funds": {
         "labels": {
@@ -3416,7 +3427,6 @@
             "notifications": "الإشعارات",
             "payouts": "المدفوعات",
             "profile": "البيانات",
-            "records": "البيانات الشخصية",
             "reimbursements": "استرداد التكاليف",
             "reservations": "الحجوزات",
             "security": "الأمن",
@@ -3568,7 +3578,9 @@
             "select_option": "حدد الخيار"
         },
         "range_control": {
-            "aria_value": "القيمة {{prefix}}{{value}} ، القيمة الدنيا {{prefix}}{{min}} ، القيمة القصوى  ، القيمة القصوى {{prefix}}{{max}}"
+            "aria_value": "القيمة {{prefix}}{{value}} ، القيمة الدنيا {{prefix}}{{min}} ، القيمة القصوى  ، القيمة القصوى {{prefix}}{{max}}",
+            "first_slider_aria_label": "شريط تمرير الحد الأدنى للسعر",
+            "second_slider_aria_label": "شريط التمرير لأقصى سعر"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/react/src/webshop/i18n/translated/de.json b/react/src/webshop/i18n/translated/de.json
index df6d87704..9f7a6426d 100644
--- a/react/src/webshop/i18n/translated/de.json
+++ b/react/src/webshop/i18n/translated/de.json
@@ -123,7 +123,11 @@
         },
         "me_app_more_info": "Erfahren Sie mehr über die Me-App",
         "provider_sign_up": "Als Anbieter registrieren",
-        "sponsor_logo_alt": "Logo des Sponsors"
+        "sponsor_logo_alt": "Logo des Sponsors",
+        "copyright_aria_label": "Bedingungen und Erklärungen",
+        "footer_aria_label": "Fußzeile",
+        "me_app_aria_label": "Informationen zum Herunterladen der Me-App",
+        "nav_provider_aria_label": "Als Anbieter registrieren"
     },
     "auth_start": {
         "example": "Geben Sie eine gültige E-Mail-Adresse ein, z. B. naam@voorbeeld. <strong>com</strong>"
@@ -2075,11 +2079,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "Blenden Sie Systembenachrichtigungen automatisch aus, wenn bevorzugte Produkte hinzugefügt oder entfernt werden.",
-                "title": "Benachrichtigungen über bevorzugte Produkte automatisch schließen"
+                "title": "Benachrichtigungen über bevorzugte Produkte automatisch schließen",
+                "label": "Legen Sie die Zeit in Sekunden fest, nach der Systembenachrichtigungen zu bevorzugten Produkten geschlossen werden, nachdem eine Aktion ausgeführt wurde."
             },
             "webshop": {
                 "description": "Systembenachrichtigungen automatisch ausblenden, nachdem eine Aktion ausgeführt wurde.",
-                "title": "Allgemeine Benachrichtigungen werden automatisch geschlossen"
+                "title": "Allgemeine Benachrichtigungen werden automatisch geschlossen",
+                "label": "Wählen Sie die Zeit in Sekunden, nach der automatische Systembenachrichtigungen geschlossen werden, nachdem eine Aktion ausgeführt wurde."
             }
         },
         "push_notifications_preferences": {
@@ -2348,11 +2354,8 @@
             "sort": "Sortieren",
             "payment_option_qr": "QR-Code beim Anbieter anzeigen",
             "payment_option_reservation": "Online buchen",
-            "payment_options": "Zahlungsmöglichkeiten",
-            "payment_options_info": "Lesen Sie mehr über Zahlungsmöglichkeiten",
             "price": "Preis (€)",
             "price_from": "Von",
-            "price_to": "An",
             "payment_option_extra_payment": "Online-Bezahlung mit iDeal",
             "price_type_option_discount_fixed": "Rabatt in Euro",
             "price_type_option_discount_percentage": "Rabatt in Prozent",
@@ -2361,7 +2364,10 @@
             "price_type_option_regular": "Preis",
             "price_type_options": "Art des Angebots",
             "price_type_options_info": "Lesen Sie mehr über die Arten von Angeboten",
-            "category": "Kategorien"
+            "category": "Kategorien",
+            "payment_options": "Zahlungsmöglichkeiten",
+            "payment_options_info": "Lesen Sie mehr über Zahlungsmöglichkeiten",
+            "price_to": "An"
         },
         "sort": {
             "created_at_asc": "Älteste zuerst",
@@ -2390,7 +2396,6 @@
             "notifications": "Benachrichtigungen",
             "payouts": "Auszahlungen",
             "profile": "Daten",
-            "records": "Persönliche Daten",
             "reimbursements": "Kostendeckung",
             "reservations": "Reservierungen",
             "security": "Sicherheit",
@@ -2490,7 +2495,8 @@
             "phone": "Rufnummer:",
             "title": "Informationen zum Anbieter",
             "type": "Art des Anbieters:",
-            "type_none": "Kein Anbietertyp"
+            "type_none": "Kein Anbietertyp",
+            "map_icon": "Niederlassungssymbol"
         },
         "funds": {
             "title": "Zweigstellen"
@@ -3239,7 +3245,11 @@
         },
         "language": {
             "prefix": "Ihre Sprache:"
-        }
+        },
+        "nav_aria_label": "Hauptmenü",
+        "skip_links": "Gehen Sie direkt zu:",
+        "skip_links_aria_label": "Gehen Sie direkt zu: Hauptinhalt",
+        "skip_links_content": "Hauptinhalt"
     },
     "voucher_printable": {
         "budget_voucher": {
@@ -3568,7 +3578,9 @@
             "select_option": "Option auswählen"
         },
         "range_control": {
-            "aria_value": "Wert {{prefix}}{{value}} , Mindestwert {{prefix}}{{min}} , Höchstwert {{prefix}}{{max}}"
+            "aria_value": "Wert {{prefix}}{{value}} , Mindestwert {{prefix}}{{min}} , Höchstwert {{prefix}}{{max}}",
+            "first_slider_aria_label": "Schieberegler für den Mindestpreis",
+            "second_slider_aria_label": "Schieberegler für den Höchstpreis"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/react/src/webshop/i18n/translated/en-US.json b/react/src/webshop/i18n/translated/en-US.json
index 5645e87fc..0f82729c0 100644
--- a/react/src/webshop/i18n/translated/en-US.json
+++ b/react/src/webshop/i18n/translated/en-US.json
@@ -353,7 +353,11 @@
         },
         "language": {
             "prefix": "Your language:"
-        }
+        },
+        "nav_aria_label": "Main menu",
+        "skip_links": "Go directly to:",
+        "skip_links_aria_label": "Go directly to: Main Content",
+        "skip_links_content": "Main Content"
     },
     "auth_start": {
         "example": "Enter a valid email address, for example <strong>naam@voorbeeld.com</strong>"
@@ -459,11 +463,8 @@
             "sort": "Sort",
             "payment_option_qr": "Show QR code at the provider",
             "payment_option_reservation": "Online booking",
-            "payment_options": "Payment options",
-            "payment_options_info": "Learn more about payment options",
             "price": "Price (€)",
             "price_from": "From",
-            "price_to": "To",
             "payment_option_extra_payment": "Online additional payment with iDeal",
             "price_type_option_discount_fixed": "Discount in euro",
             "price_type_option_discount_percentage": "Discount in percent",
@@ -472,7 +473,10 @@
             "price_type_option_regular": "Price",
             "price_type_options": "Type of offer",
             "price_type_options_info": "Read more about the types of offerings",
-            "category": "Categories"
+            "category": "Categories",
+            "payment_options": "Payment options",
+            "payment_options_info": "Learn more about payment options",
+            "price_to": "To"
         },
         "sort": {
             "created_at_asc": "Oldest first",
@@ -1340,7 +1344,8 @@
             "phone": "Phone number:",
             "title": "Provider information",
             "type": "Type of provider:",
-            "type_none": "No provider type"
+            "type_none": "No provider type",
+            "map_icon": "Establishment icon"
         },
         "funds": {
             "title": "Branches"
@@ -2055,11 +2060,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "Hide system notifications automatically after favorite products are added or deleted.",
-                "title": "Close notifications about favorite products automatically"
+                "title": "Close notifications about favorite products automatically",
+                "label": "Select the time in seconds that system notifications concerning favorite products are closed after an action is performed."
             },
             "webshop": {
                 "description": "Hide system notifications automatically after an action is performed.",
-                "title": "General notifications automatically close"
+                "title": "General notifications automatically close",
+                "label": "Select the time in seconds that automatic system notifications are closed after an action is performed."
             }
         },
         "push_notifications_preferences": {
@@ -2639,7 +2646,11 @@
         },
         "me_app_more_info": "Learn more about the Me app",
         "provider_sign_up": "Register as a provider",
-        "sponsor_logo_alt": "Sponsor logo"
+        "sponsor_logo_alt": "Sponsor logo",
+        "copyright_aria_label": "Conditions and statements",
+        "footer_aria_label": "Footer",
+        "me_app_aria_label": "Information about downloading the Me app",
+        "nav_provider_aria_label": "Register as a provider"
     },
     "block_funds": {
         "labels": {
@@ -2734,7 +2745,6 @@
             "notifications": "Notifications",
             "payouts": "Payouts",
             "profile": "Data",
-            "records": "Personal data",
             "reimbursements": "Cost recovery",
             "reservations": "Reservations",
             "security": "Security",
@@ -3568,7 +3578,9 @@
             "select_option": "Select option"
         },
         "range_control": {
-            "aria_value": "Value {{prefix}}{{value}} , minimum value {{prefix}}{{min}} , maximum value {{prefix}}{{max}}"
+            "aria_value": "Value {{prefix}}{{value}} , minimum value {{prefix}}{{min}} , maximum value {{prefix}}{{max}}",
+            "first_slider_aria_label": "Slider for minimum price",
+            "second_slider_aria_label": "Slider for maximum price"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/react/src/webshop/i18n/translated/fr.json b/react/src/webshop/i18n/translated/fr.json
index c7b070fcd..434c2cbc0 100644
--- a/react/src/webshop/i18n/translated/fr.json
+++ b/react/src/webshop/i18n/translated/fr.json
@@ -123,7 +123,11 @@
         },
         "me_app_more_info": "En savoir plus sur l'application Me",
         "provider_sign_up": "S'inscrire en tant que fournisseur",
-        "sponsor_logo_alt": "Logo du sponsor"
+        "sponsor_logo_alt": "Logo du sponsor",
+        "copyright_aria_label": "Conditions et déclarations",
+        "footer_aria_label": "Pied de page",
+        "me_app_aria_label": "Informations sur le téléchargement de l'application Me",
+        "nav_provider_aria_label": "S'inscrire en tant que fournisseur"
     },
     "auth_start": {
         "example": "Saisissez une adresse électronique valide, par exemple <strong>naam@voorbeeld.com</strong>"
@@ -2075,11 +2079,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "Masquer automatiquement les notifications du système après l'ajout ou la suppression de produits favoris.",
-                "title": "Fermer automatiquement les notifications concernant les produits favoris"
+                "title": "Fermer automatiquement les notifications concernant les produits favoris",
+                "label": "Sélectionnez la durée en secondes pendant laquelle les notifications du système concernant les produits favoris sont fermées après l'exécution d'une action."
             },
             "webshop": {
                 "description": "Masquer automatiquement les notifications du système après l'exécution d'une action.",
-                "title": "Fermeture automatique des notifications générales"
+                "title": "Fermeture automatique des notifications générales",
+                "label": "Sélectionnez le délai en secondes pendant lequel les notifications automatiques du système sont fermées après l'exécution d'une action."
             }
         },
         "push_notifications_preferences": {
@@ -2348,11 +2354,8 @@
             "sort": "Trier",
             "payment_option_qr": "Afficher le code QR au fournisseur",
             "payment_option_reservation": "Réserver en ligne",
-            "payment_options": "Options de paiement",
-            "payment_options_info": "En savoir plus sur les options de paiement",
             "price": "Prix (€)",
             "price_from": "De",
-            "price_to": "Pour",
             "payment_option_extra_payment": "Payer en ligne avec iDeal",
             "price_type_option_discount_fixed": "Remise en euros",
             "price_type_option_discount_percentage": "Remise en pourcentage",
@@ -2361,7 +2364,10 @@
             "price_type_option_regular": "Prix",
             "price_type_options": "Type d'offre",
             "price_type_options_info": "En savoir plus sur les types d'offres",
-            "category": "Catégories"
+            "category": "Catégories",
+            "payment_options": "Options de paiement",
+            "payment_options_info": "En savoir plus sur les options de paiement",
+            "price_to": "Pour"
         },
         "sort": {
             "created_at_asc": "Le plus vieux d'abord",
@@ -2390,7 +2396,6 @@
             "notifications": "Notifications",
             "payouts": "Paiements",
             "profile": "Données",
-            "records": "Données personnelles",
             "reimbursements": "Recouvrement des coûts",
             "reservations": "Réservations",
             "security": "Sécurité",
@@ -2490,7 +2495,8 @@
             "phone": "Numéro de téléphone :",
             "title": "Informations sur le fournisseur",
             "type": "Type de prestataire :",
-            "type_none": "Pas de type de fournisseur"
+            "type_none": "Pas de type de fournisseur",
+            "map_icon": "Icône d'établissement"
         },
         "funds": {
             "title": "Branches"
@@ -3239,7 +3245,11 @@
         },
         "language": {
             "prefix": "Votre langue :"
-        }
+        },
+        "nav_aria_label": "Menu principal",
+        "skip_links": "Aller directement à :",
+        "skip_links_aria_label": "Aller directement à : Contenu principal",
+        "skip_links_content": "Contenu principal"
     },
     "voucher_printable": {
         "budget_voucher": {
@@ -3568,7 +3578,9 @@
             "select_option": "Sélectionner une option"
         },
         "range_control": {
-            "aria_value": "Valeur {{prefix}}{{value}} , valeur minimale {{prefix}}{{min}} , valeur maximale {{prefix}}{{max}}"
+            "aria_value": "Valeur {{prefix}}{{value}} , valeur minimale {{prefix}}{{min}} , valeur maximale {{prefix}}{{max}}",
+            "first_slider_aria_label": "Curseur pour le prix minimum",
+            "second_slider_aria_label": "Curseur pour le prix maximum"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/react/src/webshop/i18n/translated/pl.json b/react/src/webshop/i18n/translated/pl.json
index 7f663f0ef..a68d53603 100644
--- a/react/src/webshop/i18n/translated/pl.json
+++ b/react/src/webshop/i18n/translated/pl.json
@@ -123,7 +123,11 @@
         },
         "me_app_more_info": "Dowiedz się więcej o aplikacji Me",
         "provider_sign_up": "Zarejestruj się jako dostawca",
-        "sponsor_logo_alt": "Logo sponsora"
+        "sponsor_logo_alt": "Logo sponsora",
+        "copyright_aria_label": "Warunki i oświadczenia",
+        "footer_aria_label": "Stopka",
+        "me_app_aria_label": "Informacje na temat pobierania aplikacji Me",
+        "nav_provider_aria_label": "Zarejestruj się jako dostawca"
     },
     "auth_start": {
         "example": "Wprowadź prawidłowy adres e-mail, np. <strong>naam@voorbeeld.com</strong>."
@@ -2075,11 +2079,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "Automatyczne ukrywanie powiadomień systemowych po dodaniu lub usunięciu ulubionych produktów.",
-                "title": "Automatyczne zamykanie powiadomień o ulubionych produktach"
+                "title": "Automatyczne zamykanie powiadomień o ulubionych produktach",
+                "label": "Wybierz czas w sekundach, przez jaki powiadomienia systemowe dotyczące ulubionych produktów będą zamykane po wykonaniu akcji."
             },
             "webshop": {
                 "description": "Automatyczne ukrywanie powiadomień systemowych po wykonaniu akcji.",
-                "title": "Automatyczne zamykanie powiadomień ogólnych"
+                "title": "Automatyczne zamykanie powiadomień ogólnych",
+                "label": "Wybierz czas w sekundach, przez jaki automatyczne powiadomienia systemowe będą zamykane po wykonaniu akcji."
             }
         },
         "push_notifications_preferences": {
@@ -2348,11 +2354,8 @@
             "sort": "Sortuj",
             "payment_option_qr": "Pokaż kod QR u dostawcy",
             "payment_option_reservation": "Zarezerwuj online",
-            "payment_options": "Opcje płatności",
-            "payment_options_info": "Więcej informacji o opcjach płatności",
             "price": "Cena (€)",
             "price_from": "Od",
-            "price_to": "Do",
             "payment_option_extra_payment": "Płatność online za pomocą iDeal",
             "price_type_option_discount_fixed": "Rabat w euro",
             "price_type_option_discount_percentage": "Rabat w procentach",
@@ -2361,7 +2364,10 @@
             "price_type_option_regular": "Cena",
             "price_type_options": "Rodzaj oferty",
             "price_type_options_info": "Dowiedz się więcej o rodzajach ofert",
-            "category": "Kategorie"
+            "category": "Kategorie",
+            "payment_options": "Opcje płatności",
+            "payment_options_info": "Więcej informacji o opcjach płatności",
+            "price_to": "Do"
         },
         "sort": {
             "created_at_asc": "Najstarszy pierwszy",
@@ -2390,7 +2396,6 @@
             "notifications": "Powiadomienia",
             "payouts": "Wypłaty",
             "profile": "Dane",
-            "records": "Dane osobowe",
             "reimbursements": "Zwrot kosztów",
             "reservations": "Rezerwacje",
             "security": "Bezpieczeństwo",
@@ -2490,7 +2495,8 @@
             "phone": "Numer telefonu:",
             "title": "Informacje o dostawcy",
             "type": "Typ dostawcy:",
-            "type_none": "Brak typu dostawcy"
+            "type_none": "Brak typu dostawcy",
+            "map_icon": "Ikona ustanowienia"
         },
         "funds": {
             "title": "Oddziały"
@@ -3239,7 +3245,11 @@
         },
         "language": {
             "prefix": "Twój język:"
-        }
+        },
+        "nav_aria_label": "Menu główne",
+        "skip_links": "Przejdź bezpośrednio do:",
+        "skip_links_aria_label": "Przejdź bezpośrednio do: Treść główna",
+        "skip_links_content": "Główna treść"
     },
     "voucher_printable": {
         "budget_voucher": {
@@ -3568,7 +3578,9 @@
             "select_option": "Wybierz opcję"
         },
         "range_control": {
-            "aria_value": "Wartość {{prefix}}{{value}} , wartość minimalna {{prefix}}{{min}} , wartość maksymalna {{prefix}}{{max}}"
+            "aria_value": "Wartość {{prefix}}{{value}} , wartość minimalna {{prefix}}{{min}} , wartość maksymalna {{prefix}}{{max}}",
+            "first_slider_aria_label": "Suwak ceny minimalnej",
+            "second_slider_aria_label": "Suwak ceny maksymalnej"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/react/src/webshop/i18n/translated/ru.json b/react/src/webshop/i18n/translated/ru.json
index 58eb2ccde..c73c08281 100644
--- a/react/src/webshop/i18n/translated/ru.json
+++ b/react/src/webshop/i18n/translated/ru.json
@@ -123,7 +123,11 @@
         },
         "me_app_more_info": "Узнайте больше о приложении Me",
         "provider_sign_up": "Зарегистрируйтесь в качестве провайдера",
-        "sponsor_logo_alt": "Логотип спонсора"
+        "sponsor_logo_alt": "Логотип спонсора",
+        "copyright_aria_label": "Условия и заявления",
+        "footer_aria_label": "Нижний колонтитул",
+        "me_app_aria_label": "Информация о загрузке приложения Me",
+        "nav_provider_aria_label": "Зарегистрируйтесь в качестве провайдера"
     },
     "auth_start": {
         "example": "Введите действительный адрес электронной почты, например, <strong>naam@voorbeeld.com</strong>."
@@ -2075,11 +2079,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "Автоматически скрывайте системные уведомления после добавления или удаления любимых продуктов.",
-                "title": "Автоматически закрывайте уведомления о любимых товарах"
+                "title": "Автоматически закрывайте уведомления о любимых товарах",
+                "label": "Выберите время в секундах, в течение которого системные уведомления, касающиеся избранных продуктов, будут закрыты после выполнения действия."
             },
             "webshop": {
                 "description": "Автоматическое скрытие системных уведомлений после выполнения действия.",
-                "title": "Автоматическое закрытие общих уведомлений"
+                "title": "Автоматическое закрытие общих уведомлений",
+                "label": "Выберите время в секундах, в течение которого автоматические системные уведомления будут закрыты после выполнения действия."
             }
         },
         "push_notifications_preferences": {
@@ -2348,11 +2354,8 @@
             "sort": "Сортировать",
             "payment_option_qr": "Показать QR-код у провайдера",
             "payment_option_reservation": "Забронировать онлайн",
-            "payment_options": "Варианты оплаты",
-            "payment_options_info": "Подробнее о вариантах оплаты",
             "price": "Цена (€)",
-            "price_from": "С сайта",
-            "price_to": "На",
+            "price_from": "От",
             "payment_option_extra_payment": "Оплата онлайн с помощью iDeal",
             "price_type_option_discount_fixed": "Скидка в евро",
             "price_type_option_discount_percentage": "Скидка в процентах",
@@ -2361,7 +2364,10 @@
             "price_type_option_regular": "Цена",
             "price_type_options": "Тип предложения",
             "price_type_options_info": "Подробнее о типах предложений",
-            "category": "Категории"
+            "category": "Категории",
+            "payment_options": "Варианты оплаты",
+            "payment_options_info": "Подробнее о вариантах оплаты",
+            "price_to": "До"
         },
         "sort": {
             "created_at_asc": "Самый старый первый",
@@ -2390,7 +2396,6 @@
             "notifications": "Уведомления",
             "payouts": "Выплаты",
             "profile": "Данные",
-            "records": "Персональные данные",
             "reimbursements": "Возмещение затрат",
             "reservations": "Бронирование",
             "security": "Безопасность",
@@ -2490,7 +2495,8 @@
             "phone": "Номер телефона:",
             "title": "Информация о поставщике",
             "type": "Тип поставщика:",
-            "type_none": "Нет типа поставщика"
+            "type_none": "Нет типа поставщика",
+            "map_icon": "Значок учреждения"
         },
         "funds": {
             "title": "Филиалы"
@@ -3239,7 +3245,11 @@
         },
         "language": {
             "prefix": "Ваш язык:"
-        }
+        },
+        "nav_aria_label": "Главное меню",
+        "skip_links": "Перейдите по прямой ссылке:",
+        "skip_links_aria_label": "Перейти непосредственно к: Основное содержание",
+        "skip_links_content": "Основное содержание"
     },
     "voucher_printable": {
         "budget_voucher": {
@@ -3568,7 +3578,9 @@
             "select_option": "Выберите вариант"
         },
         "range_control": {
-            "aria_value": "Значение {{prefix}}{{value}} , минимальное значение {{prefix}}{{min}} , максимальное значение {{prefix}}{{max}}"
+            "aria_value": "Значение {{prefix}}{{value}} , минимальное значение {{prefix}}{{min}} , максимальное значение {{prefix}}{{max}}",
+            "first_slider_aria_label": "Слайдер для минимальной цены",
+            "second_slider_aria_label": "Ползунок для максимальной цены"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/react/src/webshop/i18n/translated/tr.json b/react/src/webshop/i18n/translated/tr.json
index 279f24091..2f030b255 100644
--- a/react/src/webshop/i18n/translated/tr.json
+++ b/react/src/webshop/i18n/translated/tr.json
@@ -422,11 +422,8 @@
             "sort": "Sırala",
             "payment_option_qr": "QR kodunu sağlayıcıda göster",
             "payment_option_reservation": "Online rezervasyon",
-            "payment_options": "Ödeme seçenekleri",
-            "payment_options_info": "Ödeme seçenekleri hakkında daha fazla bilgi edinin",
             "price": "Fiyat (€)",
             "price_from": "Kimden",
-            "price_to": "için",
             "payment_option_extra_payment": "iDeal ile çevrimiçi ödeme",
             "price_type_option_discount_fixed": "Euro cinsinden indirim",
             "price_type_option_discount_percentage": "Yüzde olarak indirim",
@@ -435,7 +432,10 @@
             "price_type_option_regular": "Fiyat",
             "price_type_options": "Teklif türü",
             "price_type_options_info": "Teklif türleri hakkında daha fazla bilgi edinin",
-            "category": "Kategoriler"
+            "category": "Kategoriler",
+            "payment_options": "Ödeme seçenekleri",
+            "payment_options_info": "Ödeme seçenekleri hakkında daha fazla bilgi edinin",
+            "price_to": "için"
         },
         "sort": {
             "created_at_asc": "Önce en yaşlı",
@@ -775,7 +775,11 @@
         },
         "language": {
             "prefix": "Senin dilin:"
-        }
+        },
+        "nav_aria_label": "Ana menü",
+        "skip_links": "Doğrudan şuraya git:",
+        "skip_links_aria_label": "Doğrudan şuraya gidin: Ana içerik",
+        "skip_links_content": "Ana içerik"
     },
     "week_days": {
         "0": "Pazartesi",
@@ -1269,7 +1273,8 @@
             "phone": "Telefon numarası:",
             "title": "Sağlayıcı bilgileri",
             "type": "Sağlayıcı türü:",
-            "type_none": "Sağlayıcı türü yok"
+            "type_none": "Sağlayıcı türü yok",
+            "map_icon": "Kuruluş simgesi"
         },
         "funds": {
             "title": "Şubeler"
@@ -2359,11 +2364,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "Favori ürünler eklendikten veya kaldırıldıktan sonra sistem bildirimlerini otomatik olarak gizleyin.",
-                "title": "Favori ürünlerle ilgili bildirimleri otomatik olarak kapatın"
+                "title": "Favori ürünlerle ilgili bildirimleri otomatik olarak kapatın",
+                "label": "Bir eylem gerçekleştirildikten sonra favori ürünlerle ilgili sistem bildirimlerinin kapatılacağı süreyi saniye cinsinden seçin."
             },
             "webshop": {
                 "description": "Bir eylem gerçekleştirildikten sonra sistem bildirimlerini otomatik olarak gizleyin.",
-                "title": "Genel bildirimler otomatik kapanır"
+                "title": "Genel bildirimler otomatik kapanır",
+                "label": "Bir eylem gerçekleştirildikten sonra otomatik sistem bildirimlerinin kapatılacağı süreyi saniye cinsinden seçin."
             }
         },
         "push_notifications_preferences": {
@@ -3321,7 +3328,11 @@
         },
         "me_app_more_info": "Me uygulaması hakkında daha fazla bilgi edinin",
         "provider_sign_up": "Sağlayıcı olarak kaydolun",
-        "sponsor_logo_alt": "Sponsor logosu"
+        "sponsor_logo_alt": "Sponsor logosu",
+        "copyright_aria_label": "Koşullar ve beyanlar",
+        "footer_aria_label": "Altbilgi",
+        "me_app_aria_label": "Me uygulamasını indirme hakkında bilgi",
+        "nav_provider_aria_label": "Sağlayıcı olarak kaydolun"
     },
     "block_funds": {
         "labels": {
@@ -3416,7 +3427,6 @@
             "notifications": "Bildirimler",
             "payouts": "Ödemeler",
             "profile": "Veri",
-            "records": "Kişisel veriler",
             "reimbursements": "Maliyet geri kazanımı",
             "reservations": "Rezervasyonlar",
             "security": "Güvenlik",
@@ -3568,7 +3578,9 @@
             "select_option": "Seçeneği seçin"
         },
         "range_control": {
-            "aria_value": "Değer {{prefix}}{{value}} , minimum değer {{prefix}}{{min}} , maksimum değer {{prefix}}{{max}}"
+            "aria_value": "Değer {{prefix}}{{value}} , minimum değer {{prefix}}{{min}} , maksimum değer {{prefix}}{{max}}",
+            "first_slider_aria_label": "Minimum fiyat için kaydırıcı",
+            "second_slider_aria_label": "Maksimum fiyat için kaydırıcı"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/react/src/webshop/i18n/translated/uk.json b/react/src/webshop/i18n/translated/uk.json
index 02796a509..d422e88dd 100644
--- a/react/src/webshop/i18n/translated/uk.json
+++ b/react/src/webshop/i18n/translated/uk.json
@@ -123,7 +123,11 @@
         },
         "me_app_more_info": "Дізнайтеся більше про додаток Me",
         "provider_sign_up": "Зареєструйтеся як провайдер",
-        "sponsor_logo_alt": "Логотип спонсора"
+        "sponsor_logo_alt": "Логотип спонсора",
+        "copyright_aria_label": "Умови та заяви",
+        "footer_aria_label": "Нижній колонтитул",
+        "me_app_aria_label": "Інформація про завантаження додатку Me",
+        "nav_provider_aria_label": "Зареєструйтеся як провайдер"
     },
     "auth_start": {
         "example": "Введіть дійсну адресу електронної пошти, наприклад, <strong>naam@voorbeeld.com</strong>"
@@ -2075,11 +2079,13 @@
         "push_notifications_dismiss_time": {
             "bookmarks": {
                 "description": "Автоматично приховувати системні сповіщення після додавання або видалення обраних продуктів.",
-                "title": "Автоматично закривати сповіщення про улюблені товари"
+                "title": "Автоматично закривати сповіщення про улюблені товари",
+                "label": "Виберіть час у секундах, через який система закриває сповіщення щодо обраних продуктів після виконання певної дії."
             },
             "webshop": {
                 "description": "Автоматично приховувати системні сповіщення після виконання дії.",
-                "title": "Загальні сповіщення автоматично закриваються"
+                "title": "Загальні сповіщення автоматично закриваються",
+                "label": "Виберіть час у секундах, через який автоматичні сповіщення системи будуть закриті після виконання дії."
             }
         },
         "push_notifications_preferences": {
@@ -2348,11 +2354,8 @@
             "sort": "Сортування",
             "payment_option_qr": "Показати QR-код у постачальника",
             "payment_option_reservation": "Бронюйте онлайн",
-            "payment_options": "Варіанти оплати",
-            "payment_options_info": "Дізнайтеся більше про способи оплати",
             "price": "Ціна (€)",
             "price_from": "Від",
-            "price_to": "До",
             "payment_option_extra_payment": "Оплата в Інтернеті за допомогою iDeal",
             "price_type_option_discount_fixed": "Знижка в євро",
             "price_type_option_discount_percentage": "Знижка у відсотках",
@@ -2361,7 +2364,10 @@
             "price_type_option_regular": "Ціна",
             "price_type_options": "Тип пропозиції",
             "price_type_options_info": "Дізнайтеся більше про типи пропозицій",
-            "category": "Категорії"
+            "category": "Категорії",
+            "payment_options": "Варіанти оплати",
+            "payment_options_info": "Дізнайтеся більше про способи оплати",
+            "price_to": "До"
         },
         "sort": {
             "created_at_asc": "Найстарший перший",
@@ -2390,7 +2396,6 @@
             "notifications": "Сповіщення",
             "payouts": "Виплати",
             "profile": "Дані",
-            "records": "Персональні дані",
             "reimbursements": "Відшкодування витрат",
             "reservations": "Бронювання",
             "security": "Безпека",
@@ -2490,7 +2495,8 @@
             "phone": "Номер телефону:",
             "title": "Інформація про постачальника",
             "type": "Тип постачальника:",
-            "type_none": "Немає типу постачальника"
+            "type_none": "Немає типу постачальника",
+            "map_icon": "Іконка установи"
         },
         "funds": {
             "title": "Філії"
@@ -3239,7 +3245,11 @@
         },
         "language": {
             "prefix": "Твоя мова:"
-        }
+        },
+        "nav_aria_label": "Головне меню",
+        "skip_links": "Переходьте прямо до:",
+        "skip_links_aria_label": "Перейти безпосередньо до: Основний зміст",
+        "skip_links_content": "Основний зміст"
     },
     "voucher_printable": {
         "budget_voucher": {
@@ -3568,7 +3578,9 @@
             "select_option": "Виберіть варіант"
         },
         "range_control": {
-            "aria_value": "Значення {{prefix}}{{value}} , мінімальне значення {{prefix}}{{min}} , максимальне значення {{prefix}}{{max}}"
+            "aria_value": "Значення {{prefix}}{{value}} , мінімальне значення {{prefix}}{{min}} , максимальне значення {{prefix}}{{max}}",
+            "first_slider_aria_label": "Слайдер за мінімальною ціною",
+            "second_slider_aria_label": "Повзунок для максимальної ціни"
         }
     },
     "modal_deactivate_voucher": {
diff --git a/translations/cache/cache.json b/translations/cache/cache.json
index 61bdc781a..062ed4a8d 100644
--- a/translations/cache/cache.json
+++ b/translations/cache/cache.json
@@ -371,6 +371,14 @@
         "app_footer.columns.site_info",
         "Site informatie"
     ],
+    [
+        "app_footer.copyright_aria_label",
+        "Voorwaarden en verklaringen"
+    ],
+    [
+        "app_footer.footer_aria_label",
+        "Voettekst"
+    ],
     [
         "app_footer.links.accessibility",
         "Toegankelijkheidsverklaring"
@@ -387,10 +395,18 @@
         "app_footer.links.terms_and_conditions",
         "Algemene voorwaarden"
     ],
+    [
+        "app_footer.me_app_aria_label",
+        "Informatie over het downloaden van de Me-app"
+    ],
     [
         "app_footer.me_app_more_info",
         "Meer informatie over de Me-app"
     ],
+    [
+        "app_footer.nav_provider_aria_label",
+        "Aanmelden als aanbieder"
+    ],
     [
         "app_footer.provider_sign_up",
         "Aanmelden als aanbieder"
@@ -999,6 +1015,14 @@
         "form.range_control.aria_value",
         "Value {{prefix}}{{value}}, minimum waarde {{prefix}}{{min}}, maximum waarde {{prefix}}{{max}}"
     ],
+    [
+        "form.range_control.first_slider_aria_label",
+        "Schuifknop voor minimale prijs"
+    ],
+    [
+        "form.range_control.second_slider_aria_label",
+        "Schuifknop voor maximale prijs"
+    ],
     [
         "form.required",
         "Verplicht"
@@ -5923,6 +5947,10 @@
         "preferences_notifications.push_notifications_dismiss_time.bookmarks.description",
         "Verberg de systeemmeldingen automatisch nadat favoriete producten worden toegevoegd of verwijderd."
     ],
+    [
+        "preferences_notifications.push_notifications_dismiss_time.bookmarks.label",
+        "Selecteer de tijd in seconden dat systeemmeldingen betreft favoriete producten worden gesloten nadat een actie is uitgevoerd."
+    ],
     [
         "preferences_notifications.push_notifications_dismiss_time.bookmarks.title",
         "Meldingen over favoriete producten automatisch sluiten"
@@ -5931,6 +5959,10 @@
         "preferences_notifications.push_notifications_dismiss_time.webshop.description",
         "Verberg systeemmeldingen automatisch nadat een actie is uitgevoerd."
     ],
+    [
+        "preferences_notifications.push_notifications_dismiss_time.webshop.label",
+        "Selecteer de tijd in seconden dat automatische systeemmeldingen worden gesloten nadat een actie is uitgevoerd."
+    ],
     [
         "preferences_notifications.push_notifications_dismiss_time.webshop.title",
         "Algemene meldingen automatisch sluiten"
@@ -6637,11 +6669,11 @@
     ],
     [
         "products.filters.payment_options",
-        "Betalingsmogelijkheden"
+        "Betaalopties"
     ],
     [
         "products.filters.payment_options_info",
-        "Lees meer over de betalingsopties"
+        "Lees meer over de betaalopties"
     ],
     [
         "products.filters.postcode",
@@ -6657,7 +6689,7 @@
     ],
     [
         "products.filters.price_to",
-        "Naar"
+        "Tot"
     ],
     [
         "products.filters.price_type_option_discount_fixed",
@@ -6791,10 +6823,6 @@
         "profile_menu.buttons.provider_sign_up",
         "Aanmelden als aanbieder"
     ],
-    [
-        "profile_menu.buttons.records",
-        "Persoonsgegevens"
-    ],
     [
         "profile_menu.buttons.reimbursements",
         "Kosten terugvragen"
@@ -7015,6 +7043,10 @@
         "provider.details.email",
         "E-mailadres:"
     ],
+    [
+        "provider.details.map_icon",
+        "Icoon van de vestiging"
+    ],
     [
         "provider.details.phone",
         "Telefoonnummer:"
@@ -8735,10 +8767,26 @@
         "top_navbar.main_menu",
         "Hoofdmenu"
     ],
+    [
+        "top_navbar.nav_aria_label",
+        "Hoofdmenu"
+    ],
     [
         "top_navbar.open_home",
         "Terug naar hoofdpagina"
     ],
+    [
+        "top_navbar.skip_links",
+        "Ga direct naar:"
+    ],
+    [
+        "top_navbar.skip_links_aria_label",
+        "Ga direct naar: Hoofdinhoud"
+    ],
+    [
+        "top_navbar.skip_links_content",
+        "Hoofdinhoud"
+    ],
     [
         "top_navbar.start",
         "Start"

From 668bb51f20a6cb8faa4fe22407caaba839cdd9dc Mon Sep 17 00:00:00 2001
From: dev-rminds <dev@rminds.nl>
Date: Thu, 11 Dec 2025 12:57:40 +0200
Subject: [PATCH 3/3] fix webshop 2fa auth page

---
 .../components/modals/Modal2FASetup.tsx       |  8 +++++--
 react/src/webshop/i18n/nl/pages/auth.mjs      |  2 +-
 react/src/webshop/i18n/translated/ar.json     | 22 +++++++++++------
 react/src/webshop/i18n/translated/de.json     | 22 +++++++++++------
 react/src/webshop/i18n/translated/en-US.json  | 22 +++++++++++------
 react/src/webshop/i18n/translated/fr.json     | 22 +++++++++++------
 react/src/webshop/i18n/translated/pl.json     | 22 +++++++++++------
 react/src/webshop/i18n/translated/ru.json     | 22 +++++++++++------
 react/src/webshop/i18n/translated/tr.json     | 22 +++++++++++------
 react/src/webshop/i18n/translated/uk.json     | 22 +++++++++++------
 react/src/webshop/router/routes.tsx           |  5 ++--
 translations/cache/cache.json                 | 24 ++++++++++++-------
 12 files changed, 146 insertions(+), 69 deletions(-)

diff --git a/react/src/webshop/components/modals/Modal2FASetup.tsx b/react/src/webshop/components/modals/Modal2FASetup.tsx
index 82f591ab8..a1b3284fc 100644
--- a/react/src/webshop/components/modals/Modal2FASetup.tsx
+++ b/react/src/webshop/components/modals/Modal2FASetup.tsx
@@ -613,11 +613,15 @@ export default function Modal2FASetup({
                             <div className="modal-section-description">
                                 <div className="form-group">
                                     {auth2FA.provider_type.type == 'phone' && (
-                                        <div className="form-label">{translate('modal_2fa_setup.enter_sms_code')}</div>
+                                        <div className="form-label flex flex-center">
+                                            {translate('modal_2fa_setup.enter_sms_code')}
+                                        </div>
                                     )}
 
                                     {auth2FA.provider_type.type == 'authenticator' && (
-                                        <div className="form-label">{translate('modal_2fa_setup.enter_app_code')}</div>
+                                        <div className="form-label flex flex-center">
+                                            {translate('modal_2fa_setup.enter_app_code')}
+                                        </div>
                                     )}
 
                                     <div className="form-group">
diff --git a/react/src/webshop/i18n/nl/pages/auth.mjs b/react/src/webshop/i18n/nl/pages/auth.mjs
index 650d24f80..b29fc3542 100644
--- a/react/src/webshop/i18n/nl/pages/auth.mjs
+++ b/react/src/webshop/i18n/nl/pages/auth.mjs
@@ -1,7 +1,7 @@
 export default {
     setup_2fa_title: 'Tweefactorauthenticatie instellen',
     choose_option: 'Kies een optie',
-    '': 'Tweefactorauthenticatie',
+    '2fa_title': 'Tweefactorauthenticatie',
     logout: 'Uitloggen',
     back: 'Terug',
     back_start: 'Terug naar inloggen',
diff --git a/react/src/webshop/i18n/translated/ar.json b/react/src/webshop/i18n/translated/ar.json
index 296550680..727d11b00 100644
--- a/react/src/webshop/i18n/translated/ar.json
+++ b/react/src/webshop/i18n/translated/ar.json
@@ -3,7 +3,6 @@
         "example": "أدخل عنوان بريد إلكتروني صالح، على سبيل المثال <strong>naam@voorbeeld.com</strong>"
     },
     "auth": {
-        "": "المصادقة الثنائية",
         "back": "رجوع",
         "back_start": "العودة إلى تسجيل الدخول",
         "choose_option": "اختر خياراً",
@@ -42,7 +41,8 @@
         },
         "terms_link": {
             "text": "أوافق على <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">الشروط والأحكام</a>"
-        }
+        },
+        "2fa_title": "المصادقة الثنائية"
     },
     "blocks": {
         "block_exception": {
@@ -422,11 +422,8 @@
             "sort": "فرز",
             "payment_option_qr": "إظهار رمز الاستجابة السريعة لدى المزود",
             "payment_option_reservation": "احجز عبر الإنترنت",
-            "payment_options": "خيارات الدفع",
-            "payment_options_info": "اقرأ المزيد عن خيارات الدفع",
             "price": "السعر (€)",
             "price_from": "من",
-            "price_to": "إلى",
             "payment_option_extra_payment": "الدفع عبر الإنترنت باستخدام iDeal",
             "price_type_option_discount_fixed": "الخصم باليورو",
             "price_type_option_discount_percentage": "الخصم بالنسبة المئوية",
@@ -435,7 +432,10 @@
             "price_type_option_regular": "السعر",
             "price_type_options": "نوع العرض",
             "price_type_options_info": "اقرأ المزيد عن أنواع العروض",
-            "category": "الفئات"
+            "category": "الفئات",
+            "payment_options": "خيارات الدفع",
+            "payment_options_info": "اقرأ المزيد عن خيارات الدفع",
+            "price_to": "إلى"
         },
         "sort": {
             "created_at_asc": "الأقدم أولاً",
@@ -740,6 +740,9 @@
             },
             "westerkwartier": {
                 "funds": "البرطمانات"
+            },
+            "fijnder": {
+                "funds": "المخططات"
             }
         },
         "user_menu": {
@@ -1210,6 +1213,9 @@
             },
             "winterswijk": {
                 "title": "تفعيل"
+            },
+            "fijnder": {
+                "title": "المخططات"
             }
         },
         "header": {
@@ -1740,6 +1746,9 @@
             },
             "winterswijk": {
                 "start_email": "بدء التفعيل"
+            },
+            "fijnder": {
+                "start_email": "تفعيل"
             }
         }
     },
@@ -3416,7 +3425,6 @@
             "notifications": "الإشعارات",
             "payouts": "المدفوعات",
             "profile": "البيانات",
-            "records": "البيانات الشخصية",
             "reimbursements": "استرداد التكاليف",
             "reservations": "الحجوزات",
             "security": "الأمن",
diff --git a/react/src/webshop/i18n/translated/de.json b/react/src/webshop/i18n/translated/de.json
index df6d87704..941b30655 100644
--- a/react/src/webshop/i18n/translated/de.json
+++ b/react/src/webshop/i18n/translated/de.json
@@ -129,7 +129,6 @@
         "example": "Geben Sie eine gültige E-Mail-Adresse ein, z. B. naam@voorbeeld. <strong>com</strong>"
     },
     "auth": {
-        "": "Zwei-Faktor-Authentifizierung",
         "back": "Zurück",
         "back_start": "Zurück zur Anmeldung",
         "choose_option": "Wählen Sie eine Option",
@@ -168,7 +167,8 @@
         },
         "terms_link": {
             "text": "Ich stimme den <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">Bedingungen und Konditionen</a> zu"
-        }
+        },
+        "2fa_title": "Zwei-Faktor-Authentifizierung"
     },
     "block_funds": {
         "labels": {
@@ -764,6 +764,9 @@
             },
             "winterswijk": {
                 "title": "Aktivieren Sie"
+            },
+            "fijnder": {
+                "title": "Schemata"
             }
         },
         "header": {
@@ -2348,11 +2351,8 @@
             "sort": "Sortieren",
             "payment_option_qr": "QR-Code beim Anbieter anzeigen",
             "payment_option_reservation": "Online buchen",
-            "payment_options": "Zahlungsmöglichkeiten",
-            "payment_options_info": "Lesen Sie mehr über Zahlungsmöglichkeiten",
             "price": "Preis (€)",
             "price_from": "Von",
-            "price_to": "An",
             "payment_option_extra_payment": "Online-Bezahlung mit iDeal",
             "price_type_option_discount_fixed": "Rabatt in Euro",
             "price_type_option_discount_percentage": "Rabatt in Prozent",
@@ -2361,7 +2361,10 @@
             "price_type_option_regular": "Preis",
             "price_type_options": "Art des Angebots",
             "price_type_options_info": "Lesen Sie mehr über die Arten von Angeboten",
-            "category": "Kategorien"
+            "category": "Kategorien",
+            "payment_options": "Zahlungsmöglichkeiten",
+            "payment_options_info": "Lesen Sie mehr über Zahlungsmöglichkeiten",
+            "price_to": "An"
         },
         "sort": {
             "created_at_asc": "Älteste zuerst",
@@ -2390,7 +2393,6 @@
             "notifications": "Benachrichtigungen",
             "payouts": "Auszahlungen",
             "profile": "Daten",
-            "records": "Persönliche Daten",
             "reimbursements": "Kostendeckung",
             "reservations": "Reservierungen",
             "security": "Sicherheit",
@@ -2998,6 +3000,9 @@
             },
             "winterswijk": {
                 "start_email": "Aktivierung starten"
+            },
+            "fijnder": {
+                "start_email": "Aktivieren Sie"
             }
         }
     },
@@ -3204,6 +3209,9 @@
             },
             "westerkwartier": {
                 "funds": "Krüge"
+            },
+            "fijnder": {
+                "funds": "Schemata"
             }
         },
         "user_menu": {
diff --git a/react/src/webshop/i18n/translated/en-US.json b/react/src/webshop/i18n/translated/en-US.json
index 5645e87fc..8ff9d1271 100644
--- a/react/src/webshop/i18n/translated/en-US.json
+++ b/react/src/webshop/i18n/translated/en-US.json
@@ -318,6 +318,9 @@
             },
             "wadenheuvel": {
                 "funds": "Regulations"
+            },
+            "fijnder": {
+                "funds": "Regulations"
             }
         },
         "user_menu": {
@@ -359,7 +362,6 @@
         "example": "Enter a valid email address, for example <strong>naam@voorbeeld.com</strong>"
     },
     "auth": {
-        "": "Two-factor authentication",
         "back": "Back",
         "back_start": "Back to login",
         "choose_option": "Choose an option",
@@ -398,7 +400,8 @@
         "sign_in_up_title": "Create an account or start an application?",
         "privacy_link": {
             "text": "I have read the <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">privacy statement</a> "
-        }
+        },
+        "2fa_title": "Two-factor authentication"
     },
     "bookmarked_products": {
         "empty": {
@@ -459,11 +462,8 @@
             "sort": "Sort",
             "payment_option_qr": "Show QR code at the provider",
             "payment_option_reservation": "Online booking",
-            "payment_options": "Payment options",
-            "payment_options_info": "Learn more about payment options",
             "price": "Price (€)",
             "price_from": "From",
-            "price_to": "To",
             "payment_option_extra_payment": "Online additional payment with iDeal",
             "price_type_option_discount_fixed": "Discount in euro",
             "price_type_option_discount_percentage": "Discount in percent",
@@ -472,7 +472,10 @@
             "price_type_option_regular": "Price",
             "price_type_options": "Type of offer",
             "price_type_options_info": "Read more about the types of offerings",
-            "category": "Categories"
+            "category": "Categories",
+            "payment_options": "Payment options",
+            "payment_options_info": "Learn more about payment options",
+            "price_to": "To"
         },
         "sort": {
             "created_at_asc": "Oldest first",
@@ -935,6 +938,9 @@
             },
             "winterswijk": {
                 "title": "Activate"
+            },
+            "fijnder": {
+                "title": "Regulations"
             }
         },
         "header": {
@@ -1456,6 +1462,9 @@
             },
             "winterswijk": {
                 "start_email": "Start activation"
+            },
+            "fijnder": {
+                "start_email": "Activate"
             }
         }
     },
@@ -2734,7 +2743,6 @@
             "notifications": "Notifications",
             "payouts": "Payouts",
             "profile": "Data",
-            "records": "Personal data",
             "reimbursements": "Cost recovery",
             "reservations": "Reservations",
             "security": "Security",
diff --git a/react/src/webshop/i18n/translated/fr.json b/react/src/webshop/i18n/translated/fr.json
index c7b070fcd..7f654c01c 100644
--- a/react/src/webshop/i18n/translated/fr.json
+++ b/react/src/webshop/i18n/translated/fr.json
@@ -129,7 +129,6 @@
         "example": "Saisissez une adresse électronique valide, par exemple <strong>naam@voorbeeld.com</strong>"
     },
     "auth": {
-        "": "Authentification à deux facteurs",
         "back": "Retour",
         "back_start": "Retour au login",
         "choose_option": "Choisir une option",
@@ -168,7 +167,8 @@
         },
         "terms_link": {
             "text": "J'accepte les <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">termes et conditions</a>"
-        }
+        },
+        "2fa_title": "Authentification à deux facteurs"
     },
     "block_funds": {
         "labels": {
@@ -764,6 +764,9 @@
             },
             "winterswijk": {
                 "title": "Activer"
+            },
+            "fijnder": {
+                "title": "Régimes"
             }
         },
         "header": {
@@ -2348,11 +2351,8 @@
             "sort": "Trier",
             "payment_option_qr": "Afficher le code QR au fournisseur",
             "payment_option_reservation": "Réserver en ligne",
-            "payment_options": "Options de paiement",
-            "payment_options_info": "En savoir plus sur les options de paiement",
             "price": "Prix (€)",
             "price_from": "De",
-            "price_to": "Pour",
             "payment_option_extra_payment": "Payer en ligne avec iDeal",
             "price_type_option_discount_fixed": "Remise en euros",
             "price_type_option_discount_percentage": "Remise en pourcentage",
@@ -2361,7 +2361,10 @@
             "price_type_option_regular": "Prix",
             "price_type_options": "Type d'offre",
             "price_type_options_info": "En savoir plus sur les types d'offres",
-            "category": "Catégories"
+            "category": "Catégories",
+            "payment_options": "Options de paiement",
+            "payment_options_info": "En savoir plus sur les options de paiement",
+            "price_to": "Pour"
         },
         "sort": {
             "created_at_asc": "Le plus vieux d'abord",
@@ -2390,7 +2393,6 @@
             "notifications": "Notifications",
             "payouts": "Paiements",
             "profile": "Données",
-            "records": "Données personnelles",
             "reimbursements": "Recouvrement des coûts",
             "reservations": "Réservations",
             "security": "Sécurité",
@@ -2998,6 +3000,9 @@
             },
             "winterswijk": {
                 "start_email": "Démarrer l'activation"
+            },
+            "fijnder": {
+                "start_email": "Activer"
             }
         }
     },
@@ -3204,6 +3209,9 @@
             },
             "westerkwartier": {
                 "funds": "Bocaux"
+            },
+            "fijnder": {
+                "funds": "Régimes"
             }
         },
         "user_menu": {
diff --git a/react/src/webshop/i18n/translated/pl.json b/react/src/webshop/i18n/translated/pl.json
index 7f663f0ef..efc93d4b0 100644
--- a/react/src/webshop/i18n/translated/pl.json
+++ b/react/src/webshop/i18n/translated/pl.json
@@ -129,7 +129,6 @@
         "example": "Wprowadź prawidłowy adres e-mail, np. <strong>naam@voorbeeld.com</strong>."
     },
     "auth": {
-        "": "Uwierzytelnianie dwuskładnikowe",
         "back": "Powrót",
         "back_start": "Powrót do logowania",
         "choose_option": "Wybierz opcję",
@@ -168,7 +167,8 @@
         },
         "terms_link": {
             "text": "Zgadzam się na <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">warunki i postanowienia</a>"
-        }
+        },
+        "2fa_title": "Uwierzytelnianie dwuskładnikowe"
     },
     "block_funds": {
         "labels": {
@@ -764,6 +764,9 @@
             },
             "winterswijk": {
                 "title": "Aktywuj"
+            },
+            "fijnder": {
+                "title": "Programy"
             }
         },
         "header": {
@@ -2348,11 +2351,8 @@
             "sort": "Sortuj",
             "payment_option_qr": "Pokaż kod QR u dostawcy",
             "payment_option_reservation": "Zarezerwuj online",
-            "payment_options": "Opcje płatności",
-            "payment_options_info": "Więcej informacji o opcjach płatności",
             "price": "Cena (€)",
             "price_from": "Od",
-            "price_to": "Do",
             "payment_option_extra_payment": "Płatność online za pomocą iDeal",
             "price_type_option_discount_fixed": "Rabat w euro",
             "price_type_option_discount_percentage": "Rabat w procentach",
@@ -2361,7 +2361,10 @@
             "price_type_option_regular": "Cena",
             "price_type_options": "Rodzaj oferty",
             "price_type_options_info": "Dowiedz się więcej o rodzajach ofert",
-            "category": "Kategorie"
+            "category": "Kategorie",
+            "payment_options": "Opcje płatności",
+            "payment_options_info": "Więcej informacji o opcjach płatności",
+            "price_to": "Do"
         },
         "sort": {
             "created_at_asc": "Najstarszy pierwszy",
@@ -2390,7 +2393,6 @@
             "notifications": "Powiadomienia",
             "payouts": "Wypłaty",
             "profile": "Dane",
-            "records": "Dane osobowe",
             "reimbursements": "Zwrot kosztów",
             "reservations": "Rezerwacje",
             "security": "Bezpieczeństwo",
@@ -2998,6 +3000,9 @@
             },
             "winterswijk": {
                 "start_email": "Rozpoczęcie aktywacji"
+            },
+            "fijnder": {
+                "start_email": "Aktywuj"
             }
         }
     },
@@ -3204,6 +3209,9 @@
             },
             "westerkwartier": {
                 "funds": "Słoiki"
+            },
+            "fijnder": {
+                "funds": "Programy"
             }
         },
         "user_menu": {
diff --git a/react/src/webshop/i18n/translated/ru.json b/react/src/webshop/i18n/translated/ru.json
index 58eb2ccde..dac498bfb 100644
--- a/react/src/webshop/i18n/translated/ru.json
+++ b/react/src/webshop/i18n/translated/ru.json
@@ -129,7 +129,6 @@
         "example": "Введите действительный адрес электронной почты, например, <strong>naam@voorbeeld.com</strong>."
     },
     "auth": {
-        "": "Двухфакторная аутентификация",
         "back": "Назад",
         "back_start": "Назад к входу в систему",
         "choose_option": "Выберите вариант",
@@ -168,7 +167,8 @@
         },
         "terms_link": {
             "text": "Я согласен с <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">условиями и положениями</a>"
-        }
+        },
+        "2fa_title": "Двухфакторная аутентификация"
     },
     "block_funds": {
         "labels": {
@@ -764,6 +764,9 @@
             },
             "winterswijk": {
                 "title": "Активируйте"
+            },
+            "fijnder": {
+                "title": "Схемы"
             }
         },
         "header": {
@@ -2348,11 +2351,8 @@
             "sort": "Сортировать",
             "payment_option_qr": "Показать QR-код у провайдера",
             "payment_option_reservation": "Забронировать онлайн",
-            "payment_options": "Варианты оплаты",
-            "payment_options_info": "Подробнее о вариантах оплаты",
             "price": "Цена (€)",
             "price_from": "С сайта",
-            "price_to": "На",
             "payment_option_extra_payment": "Оплата онлайн с помощью iDeal",
             "price_type_option_discount_fixed": "Скидка в евро",
             "price_type_option_discount_percentage": "Скидка в процентах",
@@ -2361,7 +2361,10 @@
             "price_type_option_regular": "Цена",
             "price_type_options": "Тип предложения",
             "price_type_options_info": "Подробнее о типах предложений",
-            "category": "Категории"
+            "category": "Категории",
+            "payment_options": "Варианты оплаты",
+            "payment_options_info": "Подробнее о вариантах оплаты",
+            "price_to": "На"
         },
         "sort": {
             "created_at_asc": "Самый старый первый",
@@ -2390,7 +2393,6 @@
             "notifications": "Уведомления",
             "payouts": "Выплаты",
             "profile": "Данные",
-            "records": "Персональные данные",
             "reimbursements": "Возмещение затрат",
             "reservations": "Бронирование",
             "security": "Безопасность",
@@ -2998,6 +3000,9 @@
             },
             "winterswijk": {
                 "start_email": "Начало активации"
+            },
+            "fijnder": {
+                "start_email": "Активируйте"
             }
         }
     },
@@ -3204,6 +3209,9 @@
             },
             "westerkwartier": {
                 "funds": "Кувшины"
+            },
+            "fijnder": {
+                "funds": "Схемы"
             }
         },
         "user_menu": {
diff --git a/react/src/webshop/i18n/translated/tr.json b/react/src/webshop/i18n/translated/tr.json
index 279f24091..e5d710853 100644
--- a/react/src/webshop/i18n/translated/tr.json
+++ b/react/src/webshop/i18n/translated/tr.json
@@ -3,7 +3,6 @@
         "example": "Geçerli bir e-posta adresi girin, örneğin <strong>naam@voorbeeld.com</strong>"
     },
     "auth": {
-        "": "İki faktörlü kimlik doğrulama",
         "back": "Geri",
         "back_start": "Girişe geri dön",
         "choose_option": "Bir seçenek seçin",
@@ -42,7 +41,8 @@
         },
         "terms_link": {
             "text": "<a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">Hüküm ve koşulları</a> kabul ediyorum"
-        }
+        },
+        "2fa_title": "İki faktörlü kimlik doğrulama"
     },
     "blocks": {
         "block_exception": {
@@ -422,11 +422,8 @@
             "sort": "Sırala",
             "payment_option_qr": "QR kodunu sağlayıcıda göster",
             "payment_option_reservation": "Online rezervasyon",
-            "payment_options": "Ödeme seçenekleri",
-            "payment_options_info": "Ödeme seçenekleri hakkında daha fazla bilgi edinin",
             "price": "Fiyat (€)",
             "price_from": "Kimden",
-            "price_to": "için",
             "payment_option_extra_payment": "iDeal ile çevrimiçi ödeme",
             "price_type_option_discount_fixed": "Euro cinsinden indirim",
             "price_type_option_discount_percentage": "Yüzde olarak indirim",
@@ -435,7 +432,10 @@
             "price_type_option_regular": "Fiyat",
             "price_type_options": "Teklif türü",
             "price_type_options_info": "Teklif türleri hakkında daha fazla bilgi edinin",
-            "category": "Kategoriler"
+            "category": "Kategoriler",
+            "payment_options": "Ödeme seçenekleri",
+            "payment_options_info": "Ödeme seçenekleri hakkında daha fazla bilgi edinin",
+            "price_to": "için"
         },
         "sort": {
             "created_at_asc": "Önce en yaşlı",
@@ -740,6 +740,9 @@
             },
             "westerkwartier": {
                 "funds": "Kavanozlar"
+            },
+            "fijnder": {
+                "funds": "Şemalar"
             }
         },
         "user_menu": {
@@ -1210,6 +1213,9 @@
             },
             "winterswijk": {
                 "title": "Etkinleştir"
+            },
+            "fijnder": {
+                "title": "Şemalar"
             }
         },
         "header": {
@@ -1740,6 +1746,9 @@
             },
             "winterswijk": {
                 "start_email": "Etkinleştirmeyi başlat"
+            },
+            "fijnder": {
+                "start_email": "Etkinleştir"
             }
         }
     },
@@ -3416,7 +3425,6 @@
             "notifications": "Bildirimler",
             "payouts": "Ödemeler",
             "profile": "Veri",
-            "records": "Kişisel veriler",
             "reimbursements": "Maliyet geri kazanımı",
             "reservations": "Rezervasyonlar",
             "security": "Güvenlik",
diff --git a/react/src/webshop/i18n/translated/uk.json b/react/src/webshop/i18n/translated/uk.json
index 02796a509..8c0f824bc 100644
--- a/react/src/webshop/i18n/translated/uk.json
+++ b/react/src/webshop/i18n/translated/uk.json
@@ -129,7 +129,6 @@
         "example": "Введіть дійсну адресу електронної пошти, наприклад, <strong>naam@voorbeeld.com</strong>"
     },
     "auth": {
-        "": "Двофакторна автентифікація",
         "back": "Назад",
         "back_start": "Повернутися до входу",
         "choose_option": "Виберіть варіант",
@@ -168,7 +167,8 @@
         },
         "terms_link": {
             "text": "Я погоджуюся з <a tabIndex=\"3\" class=\"text-primary-light sign_up-pane-link\" target=\"_blank\" href=\"{{ link_url }}\">умовами та положеннями</a>"
-        }
+        },
+        "2fa_title": "Двофакторна автентифікація"
     },
     "block_funds": {
         "labels": {
@@ -764,6 +764,9 @@
             },
             "winterswijk": {
                 "title": "Активувати"
+            },
+            "fijnder": {
+                "title": "Схеми"
             }
         },
         "header": {
@@ -2348,11 +2351,8 @@
             "sort": "Сортування",
             "payment_option_qr": "Показати QR-код у постачальника",
             "payment_option_reservation": "Бронюйте онлайн",
-            "payment_options": "Варіанти оплати",
-            "payment_options_info": "Дізнайтеся більше про способи оплати",
             "price": "Ціна (€)",
             "price_from": "Від",
-            "price_to": "До",
             "payment_option_extra_payment": "Оплата в Інтернеті за допомогою iDeal",
             "price_type_option_discount_fixed": "Знижка в євро",
             "price_type_option_discount_percentage": "Знижка у відсотках",
@@ -2361,7 +2361,10 @@
             "price_type_option_regular": "Ціна",
             "price_type_options": "Тип пропозиції",
             "price_type_options_info": "Дізнайтеся більше про типи пропозицій",
-            "category": "Категорії"
+            "category": "Категорії",
+            "payment_options": "Варіанти оплати",
+            "payment_options_info": "Дізнайтеся більше про способи оплати",
+            "price_to": "До"
         },
         "sort": {
             "created_at_asc": "Найстарший перший",
@@ -2390,7 +2393,6 @@
             "notifications": "Сповіщення",
             "payouts": "Виплати",
             "profile": "Дані",
-            "records": "Персональні дані",
             "reimbursements": "Відшкодування витрат",
             "reservations": "Бронювання",
             "security": "Безпека",
@@ -2998,6 +3000,9 @@
             },
             "winterswijk": {
                 "start_email": "Почніть активацію"
+            },
+            "fijnder": {
+                "start_email": "Активувати"
             }
         }
     },
@@ -3204,6 +3209,9 @@
             },
             "westerkwartier": {
                 "funds": "Банки."
+            },
+            "fijnder": {
+                "funds": "Схеми"
             }
         },
         "user_menu": {
diff --git a/react/src/webshop/router/routes.tsx b/react/src/webshop/router/routes.tsx
index 34658d10e..b1460160e 100644
--- a/react/src/webshop/router/routes.tsx
+++ b/react/src/webshop/router/routes.tsx
@@ -67,8 +67,9 @@ router.state(WebshopRoutes.START, <Start />, {
 });
 
 router.state(WebshopRoutes.AUTH_2FA, <Auth2FA />, {
-    path: `/auth-2fa`,
-    protected: true,
+    path: `/tweefactorauthenticatie`,
+    altPath: `/auth-2fa`,
+    protected: false,
 });
 
 router.state(WebshopRoutes.IDENTITY_RESTORE, <IdentityRestore confirmation={false} />, {
diff --git a/translations/cache/cache.json b/translations/cache/cache.json
index 61bdc781a..23ff3fef3 100644
--- a/translations/cache/cache.json
+++ b/translations/cache/cache.json
@@ -404,7 +404,7 @@
         "Vul een geldig e-mailadres in, bijvoorbeeld <strong>naam@voorbeeld.com</strong>"
     ],
     [
-        "auth.",
+        "auth.2fa_title",
         "Tweefactorauthenticatie"
     ],
     [
@@ -1907,6 +1907,10 @@
         "funds.funds.berkelland.title",
         "Activeren"
     ],
+    [
+        "funds.funds.fijnder.title",
+        "Regelingen"
+    ],
     [
         "funds.funds.geertruidenberg.title",
         "Activeren"
@@ -6637,11 +6641,11 @@
     ],
     [
         "products.filters.payment_options",
-        "Betalingsmogelijkheden"
+        "Betaalopties"
     ],
     [
         "products.filters.payment_options_info",
-        "Lees meer over de betalingsopties"
+        "Lees meer over de betaalopties"
     ],
     [
         "products.filters.postcode",
@@ -6657,7 +6661,7 @@
     ],
     [
         "products.filters.price_to",
-        "Naar"
+        "Tot"
     ],
     [
         "products.filters.price_type_option_discount_fixed",
@@ -6791,10 +6795,6 @@
         "profile_menu.buttons.provider_sign_up",
         "Aanmelden als aanbieder"
     ],
-    [
-        "profile_menu.buttons.records",
-        "Persoonsgegevens"
-    ],
     [
         "profile_menu.buttons.reimbursements",
         "Kosten terugvragen"
@@ -8235,6 +8235,10 @@
         "signup.items.errors.email.value_missing",
         "Vul alstublieft een geldig e-mailadres in, bijvoorbeeld naam@voorbeeld.com."
     ],
+    [
+        "signup.items.fijnder.start_email",
+        "Activeren"
+    ],
     [
         "signup.items.geertruidenberg.signup_option",
         "Log in met DigiD om verder te gaan"
@@ -8639,6 +8643,10 @@
         "top_navbar.items.explanation",
         "Uitleg"
     ],
+    [
+        "top_navbar.items.fijnder.funds",
+        "Regelingen"
+    ],
     [
         "top_navbar.items.funds",
         "Activeren"