From 9b81ba2a06da77b1113f03229ca77a0a1f347db1 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Mon, 5 Aug 2024 14:11:51 +0100
Subject: [PATCH 01/18] An attempt at extracting the uac form components

---
 rh_ui/templates/partials/uac_form.html | 47 ++++++++++++++++++++++++++
 rh_ui/templates/start.html             | 35 ++-----------------
 2 files changed, 49 insertions(+), 33 deletions(-)
 create mode 100644 rh_ui/templates/partials/uac_form.html

diff --git a/rh_ui/templates/partials/uac_form.html b/rh_ui/templates/partials/uac_form.html
new file mode 100644
index 0000000..16342ef
--- /dev/null
+++ b/rh_ui/templates/partials/uac_form.html
@@ -0,0 +1,47 @@
+{# Create error component if error message has been flashed to use in onsAccessCode #}
+{% set flashed_messages = get_flashed_messages() %}
+{% set error_uac = None %}
+
+{{flashed_messages}}
+{% if flashed_messages  %}
+    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
+    {%- if 'uac_empty' in flashed_messages -%}
+        {%- set error_uac = {
+            'id': 'uac_empty',
+            'text': _('Enter an access code'),
+            'field': 'uac_empty',
+            'group': 'ERROR'
+        } -%}
+    {%- elif 'uac_invalid_length' in flashed_messages -%}
+        {%- set error_uac = {
+            'id': 'uac_invalid_length',
+            'text': _('Enter a 16-character access code'),
+            'field': 'uac_invalid_length',
+            'group': 'ERROR'} -%}
+    {%- elif 'uac_invalid' in flashed_messages -%}
+        {%- set error_uac = {
+            'id': 'uac_invalid',
+            'text': _('Access code not recognised. Enter the code again.'),
+            'field': 'uac_invalid',
+            'group': 'ERROR'} -%}
+    {%- endif -%}
+{%- endif -%}
+
+
+{{ onsAccessCode({
+        "id": "uac",
+        "name": "uac",
+        
+        "label": {
+            "text": _("Enter your 16-character access code"),
+            "description": _('Keep this code safe. You will need to enter it every time you access your study')
+        },
+
+        "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
+
+        "error": error_uac
+
+}) }}
+
+
+
diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
index 10e53c9..cc5d510 100644
--- a/rh_ui/templates/start.html
+++ b/rh_ui/templates/start.html
@@ -4,24 +4,7 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/details/_macro.njk" import onsDetails %}
 
-{# display uac error msg if exists #}
-
-{% set flashed_messages = get_flashed_messages() %}
-
-{%- if 'uac_empty' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_empty', 'text': _('Enter an access code'), 'field': 'uac_empty','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-{%- elif 'uac_invalid_length' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_invalid_length', 'text': _('Enter a 16-character access code'), 'field': 'uac_invalid_length','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-{%- elif 'uac_invalid' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_invalid', 'text': _('Access code not recognised. Enter the code again.'), 'field': 'uac_invalid','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-
-{%- else -%}
-    {%- set error_uac = None -%}
-    {%- set page_title_value = _('Start study - ONS Surveys') -%}
-{%- endif -%}
+{% set page_title_value = _('Start study - ONS Surveys') %}
 
 {% block main %}
   <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
@@ -30,21 +13,7 @@
 {% endif %}
 <h1 class="ons-u-fs-xxl ons-u-mt-l">{{ _('Start study') }}</h1>
 
-
-{{ onsAccessCode({
-        "id": "uac",
-        "name": "uac",
-        
-        "label": {
-            "text": _("Enter your 16-character access code"),
-            "description": _('Keep this code safe. You will need to enter it every time you access your study')
-        },
-
-        "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
-
-        "error": error_uac
-
-    }) }}
+{% include "partials/uac_form.html"  with context %}
 
 {{ onsButton({
         'id': 'submit_uac_btn',

From af5195760d769aac6b82f5cc02c106207079857e Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Mon, 5 Aug 2024 16:31:14 +0100
Subject: [PATCH 02/18] Reverted the changes

---
 rh_ui/templates/partials/uac_form.html | 47 --------------------------
 rh_ui/templates/start.html             | 35 +++++++++++++++++--
 2 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 rh_ui/templates/partials/uac_form.html

diff --git a/rh_ui/templates/partials/uac_form.html b/rh_ui/templates/partials/uac_form.html
deleted file mode 100644
index 16342ef..0000000
--- a/rh_ui/templates/partials/uac_form.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{# Create error component if error message has been flashed to use in onsAccessCode #}
-{% set flashed_messages = get_flashed_messages() %}
-{% set error_uac = None %}
-
-{{flashed_messages}}
-{% if flashed_messages  %}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-    {%- if 'uac_empty' in flashed_messages -%}
-        {%- set error_uac = {
-            'id': 'uac_empty',
-            'text': _('Enter an access code'),
-            'field': 'uac_empty',
-            'group': 'ERROR'
-        } -%}
-    {%- elif 'uac_invalid_length' in flashed_messages -%}
-        {%- set error_uac = {
-            'id': 'uac_invalid_length',
-            'text': _('Enter a 16-character access code'),
-            'field': 'uac_invalid_length',
-            'group': 'ERROR'} -%}
-    {%- elif 'uac_invalid' in flashed_messages -%}
-        {%- set error_uac = {
-            'id': 'uac_invalid',
-            'text': _('Access code not recognised. Enter the code again.'),
-            'field': 'uac_invalid',
-            'group': 'ERROR'} -%}
-    {%- endif -%}
-{%- endif -%}
-
-
-{{ onsAccessCode({
-        "id": "uac",
-        "name": "uac",
-        
-        "label": {
-            "text": _("Enter your 16-character access code"),
-            "description": _('Keep this code safe. You will need to enter it every time you access your study')
-        },
-
-        "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
-
-        "error": error_uac
-
-}) }}
-
-
-
diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
index cc5d510..10e53c9 100644
--- a/rh_ui/templates/start.html
+++ b/rh_ui/templates/start.html
@@ -4,7 +4,24 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/details/_macro.njk" import onsDetails %}
 
-{% set page_title_value = _('Start study - ONS Surveys') %}
+{# display uac error msg if exists #}
+
+{% set flashed_messages = get_flashed_messages() %}
+
+{%- if 'uac_empty' in flashed_messages -%}
+    {%- set error_uac = {'id': 'uac_empty', 'text': _('Enter an access code'), 'field': 'uac_empty','group': 'ERROR'} -%}
+    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
+{%- elif 'uac_invalid_length' in flashed_messages -%}
+    {%- set error_uac = {'id': 'uac_invalid_length', 'text': _('Enter a 16-character access code'), 'field': 'uac_invalid_length','group': 'ERROR'} -%}
+    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
+{%- elif 'uac_invalid' in flashed_messages -%}
+    {%- set error_uac = {'id': 'uac_invalid', 'text': _('Access code not recognised. Enter the code again.'), 'field': 'uac_invalid','group': 'ERROR'} -%}
+    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
+
+{%- else -%}
+    {%- set error_uac = None -%}
+    {%- set page_title_value = _('Start study - ONS Surveys') -%}
+{%- endif -%}
 
 {% block main %}
   <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
@@ -13,7 +30,21 @@
 {% endif %}
 <h1 class="ons-u-fs-xxl ons-u-mt-l">{{ _('Start study') }}</h1>
 
-{% include "partials/uac_form.html"  with context %}
+
+{{ onsAccessCode({
+        "id": "uac",
+        "name": "uac",
+        
+        "label": {
+            "text": _("Enter your 16-character access code"),
+            "description": _('Keep this code safe. You will need to enter it every time you access your study')
+        },
+
+        "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
+
+        "error": error_uac
+
+    }) }}
 
 {{ onsButton({
         'id': 'submit_uac_btn',

From 4f40f422288e4eaa51b2d3cd891c89b8bd298c4a Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Mon, 5 Aug 2024 16:36:18 +0100
Subject: [PATCH 03/18] Cleaned up the start template

---
 rh_ui/templates/start.html | 46 ++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
index 10e53c9..2297db0 100644
--- a/rh_ui/templates/start.html
+++ b/rh_ui/templates/start.html
@@ -6,22 +6,40 @@
 
 {# display uac error msg if exists #}
 
+{%- set error_uac = None -%}
+{%- set page_title_value = _('Start study - ONS Surveys') -%}
+
 {% set flashed_messages = get_flashed_messages() %}
 
-{%- if 'uac_empty' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_empty', 'text': _('Enter an access code'), 'field': 'uac_empty','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-{%- elif 'uac_invalid_length' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_invalid_length', 'text': _('Enter a 16-character access code'), 'field': 'uac_invalid_length','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-{%- elif 'uac_invalid' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_invalid', 'text': _('Access code not recognised. Enter the code again.'), 'field': 'uac_invalid','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-
-{%- else -%}
-    {%- set error_uac = None -%}
-    {%- set page_title_value = _('Start study - ONS Surveys') -%}
-{%- endif -%}
+{% if flashed_messages %}
+    {% set page_title_value = _('Error: Start study - ONS Surveys') %}
+
+    {% if 'uac_empty' in flashed_messages %}
+        {% set error_uac = {
+        'id': 'uac_empty',
+        'text': _('Enter an access code'),
+        'field': 'uac_empty',
+        'group': 'ERROR'
+        } %}
+    {% elif 'uac_invalid_length' in flashed_messages %}
+        {% set error_uac = {
+        'id': 'uac_invalid_length',
+        'text': _('Enter a 16-character access code'),
+        'field': 'uac_invalid_length',
+        'group': 'ERROR'
+        } %}
+    {% elif 'uac_invalid' in flashed_messages %}
+        {% set error_uac = {
+        'id': 'uac_invalid', 
+        'text': _('Access code not recognised. Enter the code again.'),
+        'field': 'uac_invalid',
+        'group': 'ERROR'
+        } %}
+    {% endif %}
+
+{% endif %}}
+
+
 
 {% block main %}
   <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>

From 7ec59043f19ce68cf790d0ea3a2dc293e4afbd42 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Mon, 5 Aug 2024 17:15:02 +0100
Subject: [PATCH 04/18] Some more cleanup/refactoring

---
 rh_ui/templates/partials/messages.html        | 38 ----------
 .../partials/uac_error_message_list.html      | 30 ++++++++
 rh_ui/templates/start.html                    | 75 +++++++++----------
 3 files changed, 67 insertions(+), 76 deletions(-)
 delete mode 100644 rh_ui/templates/partials/messages.html
 create mode 100644 rh_ui/templates/partials/uac_error_message_list.html

diff --git a/rh_ui/templates/partials/messages.html b/rh_ui/templates/partials/messages.html
deleted file mode 100644
index 2527ed1..0000000
--- a/rh_ui/templates/partials/messages.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-{%- from './components/panel/_macro.njk' import onsPanel -%}
-{%- from './components/list/_macro.njk' import onsList -%}
-
-{%- if error_uac  -%}
-    {%- if '/start/' in currentLanguage['url'] -%}
-        {%- set errorTitle = _('There is a problem with this page') -%}
-    {%- endif -%}
-{%- endif -%}
-
-{%- set itemsList = [] -%}
-
-{%- if itemsList.append( {
-                'text': error_uac['text'],
-                'url': '#' + error_uac['field'],
-                'variants': 'inPageLink'
-            } )
--%} {%- endif -%}
-
-
-
-{%- if error_uac['group']=='ERROR' -%}
-{%- call
-    onsPanel({
-        'title': errorTitle,
-        'variant': 'error'
-    })
--%}
-
-{{
-    onsList({
-        'element': 'ol',
-        'itemsList': itemsList
-    })
-}}
-{%- endcall -%}
-{%- endif -%}
-
diff --git a/rh_ui/templates/partials/uac_error_message_list.html b/rh_ui/templates/partials/uac_error_message_list.html
new file mode 100644
index 0000000..957ecb5
--- /dev/null
+++ b/rh_ui/templates/partials/uac_error_message_list.html
@@ -0,0 +1,30 @@
+{%- from './components/panel/_macro.njk' import onsPanel -%}
+{%- from './components/list/_macro.njk' import onsList -%}
+
+{% if error_uac %}
+    {%
+    call onsPanel({
+        'title': _('There is a problem with this page'),
+        'variant': 'error'
+    })
+    %}
+
+    {{
+    onsList({
+        'element': 'ol',
+        'itemsList': [ 
+            {
+                'text': error_uac['text'],
+                'url': '#' + error_uac['field'],
+                'variants': 'inPageLink'
+            }
+        ]
+    })
+    }}
+    
+    {% endcall %}
+{% endif %}
+
+
+
+
diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
index 2297db0..9b74ac6 100644
--- a/rh_ui/templates/start.html
+++ b/rh_ui/templates/start.html
@@ -42,52 +42,51 @@
 
 
 {% block main %}
-  <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
-{% if error_uac %}
-    {% include 'partials/messages.html' with context %}
-{% endif %}
-<h1 class="ons-u-fs-xxl ons-u-mt-l">{{ _('Start study') }}</h1>
+    {% include 'partials/uac_error_message_list.html' with context %}
 
+    <h1 class="ons-u-fs-xxl ons-u-mt-l">{{ _('Start study') }}</h1>
 
-{{ onsAccessCode({
-        "id": "uac",
-        "name": "uac",
-        
-        "label": {
-            "text": _("Enter your 16-character access code"),
-            "description": _('Keep this code safe. You will need to enter it every time you access your study')
-        },
+  <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
+    {{ onsAccessCode({
+            "id": "uac",
+            "name": "uac",
+            
+            "label": {
+                "text": _("Enter your 16-character access code"),
+                "description": _('Keep this code safe. You will need to enter it every time you access your study')
+            },
 
-        "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
+            "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
 
-        "error": error_uac
+            "error": error_uac
 
     }) }}
 
-{{ onsButton({
-        'id': 'submit_uac_btn',
-        'text': _('Access study'),
-        'classes': 'ons-u-mb-xl',
-        'name': 'action[save_continue]',
-        "variants": 'loader'
+    {{ onsButton({
+            'id': 'submit_uac_btn',
+            'text': _('Access study'),
+            'classes': 'ons-u-mb-xl',
+            'name': 'action[save_continue]',
+            "variants": 'loader'
     }) }}
+    </form>
 
-<h2 class="ons-u-fs-xl ons-u-mt-l" id="find_access_code">{{ _('Where to find your access code') }}</h2>
-<p>{{ _('Your access code can be found in the invitation letter or email you received.
-        Your 16-character access code will be a combination of letters and numbers.') }}</p>
-
-{%- set further_info_content -%}
-<p>{{ _('Telephone: +44 0808 196 1270<br>9am to 4:30pm Monday to Thursday<br>9am to 3pm Friday') }}</p>
-<p>{{ _('Minicom (for the deaf and hearing impaired): 18001 +44 800 085 7376') }}</p>
-<p>{{ _('Email:') }} <a href="mailto: surveyfeedback@ons.gov.uk">surveyfeedback@ons.gov.uk</a></p>
-{%- endset -%}
-
-{{ onsDetails({
-        "titleTag": "h3",
-        "id": "details",
-        "title": _('Who can I contact for further information?'),
-        "content": further_info_content
-    }) }}
 
-  </form>
+    <h2 class="ons-u-fs-xl ons-u-mt-l" id="find_access_code">{{ _('Where to find your access code') }}</h2>
+    <p>{{ _('Your access code can be found in the invitation letter or email you received.
+            Your 16-character access code will be a combination of letters and numbers.') }}</p>
+
+    {%- set further_info_content -%}
+    <p>{{ _('Telephone: +44 0808 196 1270<br>9am to 4:30pm Monday to Thursday<br>9am to 3pm Friday') }}</p>
+    <p>{{ _('Minicom (for the deaf and hearing impaired): 18001 +44 800 085 7376') }}</p>
+    <p>{{ _('Email:') }} <a href="mailto: surveyfeedback@ons.gov.uk">surveyfeedback@ons.gov.uk</a></p>
+    {%- endset -%}
+
+    {{ onsDetails({
+            "titleTag": "h3",
+            "id": "details",
+            "title": _('Who can I contact for further information?'),
+            "content": further_info_content
+        }) }}
+
 {% endblock %}
\ No newline at end of file

From fe88de684b5482035d608c3a9b000cd60fa6dd57 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Mon, 5 Aug 2024 17:49:43 +0100
Subject: [PATCH 05/18] Added the gtag.js script

---
 config.py                  |  1 +
 rh_ui/templates/base.html  | 22 +++++++++++++++++++++-
 rh_ui/templates/start.html |  4 +---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/config.py b/config.py
index 736a8df..a865d77 100644
--- a/config.py
+++ b/config.py
@@ -12,6 +12,7 @@ class BaseConfig:
 
     SECRET_KEY = os.getenv("SECRET_KEY")
     SESSION_COOKIE_SECURE = bool(strtobool(os.getenv('SESSION_COOKIE_SECURE', 'True')))
+    GOOGLE_TAG_ID = os.getenv("GOOGLE_TAG_ID")
 
     # Account service url is a link back to our service that we send to eq as part of the token
     ACCOUNT_SERVICE_URL = f"{DOMAIN_URL_PROTOCOL}{DOMAIN_URL}"
diff --git a/rh_ui/templates/base.html b/rh_ui/templates/base.html
index 60cfcdd..2e3c4f4 100644
--- a/rh_ui/templates/base.html
+++ b/rh_ui/templates/base.html
@@ -4,8 +4,28 @@
 {%- block preHeader -%}
 {%- autoescape false -%}
 
-{% set cookiesPageURL = url_for('i18n.info_pages_bp.cookies') %}
+{% set g_tag_id = config.GOOGLE_TAG_ID %}
+
+
+{% block head %}
+    {% if g_tag_id %}
+        {% set script_src_url = "https://www.googletagmanager.com/gtag/js?id=" + g_tag_id %}
+        <!-- Google tag (gtag.js) -->
+        <script async src=sript_src_url></script>
+        <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', g_tag_id);
+        </script>
+    {% endif %}
+{% endblock%}
 
+
+
+
+{% set cookiesPageURL = url_for('i18n.info_pages_bp.cookies') %}
 {%- from 'components/cookies-banner/_macro.njk' import onsCookiesBanner -%}
 {{ onsCookiesBanner({
         'lang': g.lang_code,
diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
index 9b74ac6..d92a553 100644
--- a/rh_ui/templates/start.html
+++ b/rh_ui/templates/start.html
@@ -4,8 +4,6 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/details/_macro.njk" import onsDetails %}
 
-{# display uac error msg if exists #}
-
 {%- set error_uac = None -%}
 {%- set page_title_value = _('Start study - ONS Surveys') -%}
 
@@ -46,7 +44,7 @@
 
     <h1 class="ons-u-fs-xxl ons-u-mt-l">{{ _('Start study') }}</h1>
 
-  <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
+    <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
     {{ onsAccessCode({
             "id": "uac",
             "name": "uac",

From 351be771f05bb9b5dc82a3f4910d1f06da8b5354 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 10:05:49 +0100
Subject: [PATCH 06/18] Add the config variable to vulture whitelist

---
 whitelist.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/whitelist.py b/whitelist.py
index e6ec23c..20f997c 100644
--- a/whitelist.py
+++ b/whitelist.py
@@ -4,20 +4,21 @@
 RH_SVC_URL  # unused variable (config.py:9)
 SECRET_KEY  # unused variable (config.py:13)
 SESSION_COOKIE_SECURE  # unused variable (config.py:14)
-ACCOUNT_SERVICE_URL  # unused variable (config.py:17)
-LANGUAGES  # unused variable (config.py:18)
-EQ_URL  # unused variable (config.py:19)
-DEBUG  # unused variable (config.py:23)
-PORT  # unused variable (config.py:24)
-HOST  # unused variable (config.py:25)
-LOGGING_LEVEL  # unused variable (config.py:26)
-EQ_URL  # unused variable (config.py:27)
-SECRET_KEY  # unused variable (config.py:31)
-SESSION_COOKIE_SECURE  # unused variable (config.py:32)
-ACCOUNT_SERVICE_URL  # unused variable (config.py:34)
-RH_SVC_URL  # unused variable (config.py:35)
-DEBUG  # unused variable (config.py:39)
-RH_SVC_URL  # unused variable (config.py:40)
+GOOGLE_TAG_ID  # unused variable (config.py:15)
+ACCOUNT_SERVICE_URL  # unused variable (config.py:18)
+LANGUAGES  # unused variable (config.py:19)
+EQ_URL  # unused variable (config.py:20)
+DEBUG  # unused variable (config.py:24)
+PORT  # unused variable (config.py:25)
+HOST  # unused variable (config.py:26)
+LOGGING_LEVEL  # unused variable (config.py:27)
+EQ_URL  # unused variable (config.py:28)
+SECRET_KEY  # unused variable (config.py:32)
+SESSION_COOKIE_SECURE  # unused variable (config.py:33)
+ACCOUNT_SERVICE_URL  # unused variable (config.py:35)
+RH_SVC_URL  # unused variable (config.py:36)
+DEBUG  # unused variable (config.py:40)
+RH_SVC_URL  # unused variable (config.py:41)
 wsgi_app  # unused variable (gunicorn.conf.py:9)
 bind  # unused variable (gunicorn.conf.py:12)
 worker_class  # unused variable (gunicorn.conf.py:14)
@@ -28,7 +29,7 @@
 _.secret_key  # unused attribute (rh_ui/app_setup.py:28)
 _.session_cookie_name  # unused attribute (rh_ui/app_setup.py:29)
 _.session_cookie_secure  # unused attribute (rh_ui/app_setup.py:30)
-TestingConfig  # unused class (config.py:38)
+TestingConfig  # unused class (config.py:39)
 add_language_code  # unused function (rh_ui/views/i18n.py:19)
 pull_lang_code  # unused function (rh_ui/views/i18n.py:24)
 cookies  # unused function (rh_ui/views/info_pages.py:11)

From e70e37a895cf90fb06a700b82fb2831e751383d4 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 10:12:37 +0100
Subject: [PATCH 07/18] Added the tracking label attributes

---
 rh_ui/templates/start.html | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
index d92a553..31a49f4 100644
--- a/rh_ui/templates/start.html
+++ b/rh_ui/templates/start.html
@@ -17,21 +17,36 @@
         'id': 'uac_empty',
         'text': _('Enter an access code'),
         'field': 'uac_empty',
-        'group': 'ERROR'
+        'group': 'ERROR',
+        'attributes': {
+            "data-ga": "error", 
+            "data-ga-category": "UAC-error", 
+            "data-ga-label": "uac_empty_error" 
+        } 
         } %}
     {% elif 'uac_invalid_length' in flashed_messages %}
         {% set error_uac = {
         'id': 'uac_invalid_length',
         'text': _('Enter a 16-character access code'),
         'field': 'uac_invalid_length',
-        'group': 'ERROR'
+        'group': 'ERROR',
+        'attributes': {
+            "data-ga": "error", 
+            "data-ga-category": "UAC-error", 
+            "data-ga-label": "uac_invalid_length_error" 
+        } 
         } %}
     {% elif 'uac_invalid' in flashed_messages %}
         {% set error_uac = {
         'id': 'uac_invalid', 
         'text': _('Access code not recognised. Enter the code again.'),
         'field': 'uac_invalid',
-        'group': 'ERROR'
+        'group': 'ERROR',
+        'attributes': {
+            "data-ga": "error", 
+            "data-ga-category": "UAC-error", 
+            "data-ga-label": "uac_invalid_error" 
+        } 
         } %}
     {% endif %}
 

From e4bac6eed95749df0574b22583eb6e6edb654d10 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 10:16:13 +0100
Subject: [PATCH 08/18] Removed unused attributes from the error templates

---
 rh_ui/templates/partials/uac_error_message_list.html | 2 +-
 rh_ui/templates/start.html                           | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/rh_ui/templates/partials/uac_error_message_list.html b/rh_ui/templates/partials/uac_error_message_list.html
index 957ecb5..139852e 100644
--- a/rh_ui/templates/partials/uac_error_message_list.html
+++ b/rh_ui/templates/partials/uac_error_message_list.html
@@ -15,7 +15,7 @@
         'itemsList': [ 
             {
                 'text': error_uac['text'],
-                'url': '#' + error_uac['field'],
+                'url': '#' + error_uac['id'],
                 'variants': 'inPageLink'
             }
         ]
diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
index 31a49f4..1876e6c 100644
--- a/rh_ui/templates/start.html
+++ b/rh_ui/templates/start.html
@@ -16,8 +16,6 @@
         {% set error_uac = {
         'id': 'uac_empty',
         'text': _('Enter an access code'),
-        'field': 'uac_empty',
-        'group': 'ERROR',
         'attributes': {
             "data-ga": "error", 
             "data-ga-category": "UAC-error", 
@@ -28,8 +26,6 @@
         {% set error_uac = {
         'id': 'uac_invalid_length',
         'text': _('Enter a 16-character access code'),
-        'field': 'uac_invalid_length',
-        'group': 'ERROR',
         'attributes': {
             "data-ga": "error", 
             "data-ga-category": "UAC-error", 
@@ -40,8 +36,6 @@
         {% set error_uac = {
         'id': 'uac_invalid', 
         'text': _('Access code not recognised. Enter the code again.'),
-        'field': 'uac_invalid',
-        'group': 'ERROR',
         'attributes': {
             "data-ga": "error", 
             "data-ga-category": "UAC-error", 

From fce41b36e57a9b89a2efb1d4414253c4fb28a5a9 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 10:28:11 +0100
Subject: [PATCH 09/18] Add tracking attributes to uac error pages and server
 error pages

---
 rh_ui/templates/error_pages/404.html          | 22 +++++++++++-------
 rh_ui/templates/error_pages/error.html        | 23 +++++++++++--------
 .../uac_error_pages/uac-already-used.html     |  8 ++++++-
 .../uac_error_pages/uac-inactive.html         |  7 +++++-
 4 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/rh_ui/templates/error_pages/404.html b/rh_ui/templates/error_pages/404.html
index daed3cd..641f574 100644
--- a/rh_ui/templates/error_pages/404.html
+++ b/rh_ui/templates/error_pages/404.html
@@ -4,15 +4,21 @@
 
 {%- block main -%}
 
-<h1>{{ _('Page not found') }}</h1>
+        <h1
+        data-ga= "error", 
+        data-ga-category= "server-error", 
+        data-ga-label= "404_page_not_pound" 
+        >
+        {{ _('Page not found') }}
+        </h1>
 
-<p>{{ _('If you entered a web address, check it is correct.') }}</p>
-<p>{{ _('If you pasted the web address, check you copied the whole address.') }}</p>
+        <p>{{ _('If you entered a web address, check it is correct.') }}</p>
+        <p>{{ _('If you pasted the web address, check you copied the whole address.') }}</p>
 
-{%- autoescape false -%}
-{% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
-<p>{{ _('If the web address is correct or you selected a link or button, %(open)scontact us%(close)s for more help.', open='<a href="%s">'
-        % contact_us_link, close='</a>')|safe }}</p>
-{%- endautoescape -%}
+        {%- autoescape false -%}
+                {% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
+                <p>{{ _('If the web address is correct or you selected a link or button, %(open)scontact us%(close)s for more help.', open='<a href="%s">'
+                        % contact_us_link, close='</a>')|safe }}</p>
+        {%- endautoescape -%}
 
 {%- endblock -%}
diff --git a/rh_ui/templates/error_pages/error.html b/rh_ui/templates/error_pages/error.html
index 22d207d..11a612b 100644
--- a/rh_ui/templates/error_pages/error.html
+++ b/rh_ui/templates/error_pages/error.html
@@ -3,16 +3,21 @@
 {% set page_title_value = _('ONS Surveys') %}
 
 {%- block main -%}
+    
+    <h1
+    data-ga= "error", 
+    data-ga-category= "server-error", 
+    data-ga-label= "500_internal_server_error" 
+    >
+        {{ _('Sorry, something went wrong') }}
+    </h1>
 
-<h1 data-ga="error" data-ga-category="error" data-ga-action="error-message-shown" data-ga-label="system-error">
-    {{ _('Sorry, something went wrong') }}
-</h1>
+    <p>{{ _('We are experiencing some technical problems.') }}</p>
 
-<p>{{ _('We are experiencing some technical problems.') }}</p>
-
-{%- autoescape false -%}
-{% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
-<p>{{ _('Please try again later, or %(open)scontact us%(close)s if the problem continues.', open='<a href="%s">' % contact_us_link, close='</a>')|safe }}</p>
-{%- endautoescape -%}
+    {%- autoescape false -%}
+        {% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
+        <p>{{ _('Please try again later, or %(open)scontact us%(close)s if the problem continues.',
+         open='<a href="%s">' % contact_us_link, close='</a>')|safe }}</p>
+    {%- endautoescape -%}
 
 {%- endblock main -%}
diff --git a/rh_ui/templates/uac_error_pages/uac-already-used.html b/rh_ui/templates/uac_error_pages/uac-already-used.html
index 3cfef5b..fe920a5 100644
--- a/rh_ui/templates/uac_error_pages/uac-already-used.html
+++ b/rh_ui/templates/uac_error_pages/uac-already-used.html
@@ -18,7 +18,13 @@
 
 {%- block main -%}
 
-    <h1>{{ _('This access code has already been used') }}</h1>
+    <h1
+        data-ga= "error", 
+        data-ga-category= "UAC-error", 
+        data-ga-label= "uac_already_used_error" 
+    >
+    {{ _('This access code has already been used') }}
+    </h1>
 
     <p>{{ _('Someone has already submitted a response using this access code.') }}</p>
 
diff --git a/rh_ui/templates/uac_error_pages/uac-inactive.html b/rh_ui/templates/uac_error_pages/uac-inactive.html
index d7c9d97..c825de6 100644
--- a/rh_ui/templates/uac_error_pages/uac-inactive.html
+++ b/rh_ui/templates/uac_error_pages/uac-inactive.html
@@ -17,7 +17,12 @@
 {%- endblock -%}
 
 {%- block main -%}
-    <h1>
+    <h1
+        data-ga= "error", 
+        data-ga-category= "UAC-error", 
+        data-ga-label= "uac_questionnaire_closed_error" 
+    >
         {{ _('This questionnaire has now closed') }}
     </h1>
+
 {%- endblock main -%}
\ No newline at end of file

From 5b5a7638f344903343fd25a354ebbf4c2056926f Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 14:07:37 +0100
Subject: [PATCH 10/18] Updated the CSP whitelist

---
 rh_ui/security.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rh_ui/security.py b/rh_ui/security.py
index 469fb07..24c609e 100644
--- a/rh_ui/security.py
+++ b/rh_ui/security.py
@@ -12,6 +12,7 @@
     'script-src': [
         "'self'",
         'https://cdn.ons.gov.uk',
+        'https://www.googletagmanager.com',
     ],
     'connect-src': [
         "'self'",

From e690aac8eefb046c7450af48b4d3056b63086e6c Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 16:02:41 +0100
Subject: [PATCH 11/18] Mock value for gtag_id, reformat base.html

---
 config.py                 |  2 +-
 rh_ui/templates/base.html | 52 +++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/config.py b/config.py
index a865d77..89f55ee 100644
--- a/config.py
+++ b/config.py
@@ -12,7 +12,7 @@ class BaseConfig:
 
     SECRET_KEY = os.getenv("SECRET_KEY")
     SESSION_COOKIE_SECURE = bool(strtobool(os.getenv('SESSION_COOKIE_SECURE', 'True')))
-    GOOGLE_TAG_ID = os.getenv("GOOGLE_TAG_ID")
+    GOOGLE_TAG_ID = os.getenv("GOOGLE_TAG_ID", "G-XXXXXXXXXX")
 
     # Account service url is a link back to our service that we send to eq as part of the token
     ACCOUNT_SERVICE_URL = f"{DOMAIN_URL_PROTOCOL}{DOMAIN_URL}"
diff --git a/rh_ui/templates/base.html b/rh_ui/templates/base.html
index 2e3c4f4..1bd13aa 100644
--- a/rh_ui/templates/base.html
+++ b/rh_ui/templates/base.html
@@ -1,45 +1,41 @@
 {%- extends 'layout/_template.njk' -%}
 
 
-{%- block preHeader -%}
-{%- autoescape false -%}
-
-{% set g_tag_id = config.GOOGLE_TAG_ID %}
-
-
 {% block head %}
+    {% set g_tag_id = config.GOOGLE_TAG_ID %}
     {% if g_tag_id %}
         {% set script_src_url = "https://www.googletagmanager.com/gtag/js?id=" + g_tag_id %}
+
         <!-- Google tag (gtag.js) -->
-        <script async src=sript_src_url></script>
+        <script async src={{ script_src_url }}></script>
         <script>
         window.dataLayer = window.dataLayer || [];
         function gtag(){dataLayer.push(arguments);}
         gtag('js', new Date());
-
-        gtag('config', g_tag_id);
+        gtag('config', "{{ g_tag_id }}");
         </script>
     {% endif %}
 {% endblock%}
 
 
-
-
-{% set cookiesPageURL = url_for('i18n.info_pages_bp.cookies') %}
-{%- from 'components/cookies-banner/_macro.njk' import onsCookiesBanner -%}
-{{ onsCookiesBanner({
-        'lang': g.lang_code,
-        'statementTitle': _('Cookies'),
-        'serviceName': '',
-        'settingsLinkTextURL': cookiesPageURL,
-        'statementText': _("To collect information about how you use this website, we use%(open_cookies_link)s cookies.%(close_link)s</br>
-                        This information helps us improve our services and make sure that the website works as well as possible.",
-                        open_cookies_link='<a href="%s">' % cookiesPageURL, close_link='</a>'),
-        'preferencesText':  _("You can %(open_cookies_link)s change your cookie preferences%(close_link)s at any time.",open_cookies_link='<a href="%s">' % cookiesPageURL, close_link='</a>')
-        }) }}
-{% endautoescape %}
+{%- block preHeader -%}
+    {%- autoescape false -%}
+        {% set cookiesPageURL = url_for('i18n.info_pages_bp.cookies') %}
+        {%- from 'components/cookies-banner/_macro.njk' import onsCookiesBanner -%}
+        {{ onsCookiesBanner({
+                'lang': g.lang_code,
+                'statementTitle': _('Cookies'),
+                'serviceName': '',
+                'settingsLinkTextURL': cookiesPageURL,
+                'statementText': _("To collect information about how you use this website, we use%(open_cookies_link)s cookies.%(close_link)s</br>
+                                This information helps us improve our services and make sure that the website works as well as possible.",
+                                open_cookies_link='<a href="%s">' % cookiesPageURL, close_link='</a>'),
+                'preferencesText':  _("You can %(open_cookies_link)s change your cookie preferences%(close_link)s at any time.",open_cookies_link='<a href="%s">' % cookiesPageURL, close_link='</a>')
+                }) }}
+    {% endautoescape %}
 {%- endblock -%}
 
+
 {%- set language = { 'languages':
     [
         {
@@ -57,6 +53,7 @@
     ]
 }-%}
 
+
 {%- set footer_content = {
     'newTabWarning': _('The following links open in a new tab'),
     'crest': true,
@@ -100,6 +97,7 @@
     }
 }-%}
 
+
 {%- set pageConfig = {
     'title': page_title_value,
     'header': {
@@ -113,9 +111,3 @@
     'cspNonce': csp_nonce(),
     'meta' : {}
 } -%}
-
-
-{%- block bodyStart -%}
-
-
-{%- endblock -%}
\ No newline at end of file

From 15ced91f741a9663bcae605c5850a3b803110600 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 16:54:35 +0100
Subject: [PATCH 12/18] Added the tracking cookies check with a comment

---
 rh_ui/templates/base.html | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/rh_ui/templates/base.html b/rh_ui/templates/base.html
index 1bd13aa..8bc5020 100644
--- a/rh_ui/templates/base.html
+++ b/rh_ui/templates/base.html
@@ -9,10 +9,19 @@
         <!-- Google tag (gtag.js) -->
         <script async src={{ script_src_url }}></script>
         <script>
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-        gtag('config', "{{ g_tag_id }}");
+        // NOTE!!!
+        // We currently don't have an option to turn this cookie on/off on the cookies page in rh
+        // It is set to false by default and can only be set to true
+        // When the participant accepts all cookies on the cookies banner 
+        // (and can't be swithced back to false unless the user clear their cookies)
+        var allowTrackingCookies = /^(.*)?\s*'usage':true\s*[^;]+(.*)?$/;
+
+        if (document.cookie.match(allowTrackingCookies)) {
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+            gtag('config', "{{ g_tag_id }}");
+        }
         </script>
     {% endif %}
 {% endblock%}

From 459c3f52ff68e53f41a7c6274a083b989eab3501 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 6 Aug 2024 16:55:38 +0100
Subject: [PATCH 13/18] Moved the gtagid mock value to dev config

---
 config.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config.py b/config.py
index 89f55ee..e433bff 100644
--- a/config.py
+++ b/config.py
@@ -12,7 +12,7 @@ class BaseConfig:
 
     SECRET_KEY = os.getenv("SECRET_KEY")
     SESSION_COOKIE_SECURE = bool(strtobool(os.getenv('SESSION_COOKIE_SECURE', 'True')))
-    GOOGLE_TAG_ID = os.getenv("GOOGLE_TAG_ID", "G-XXXXXXXXXX")
+    GOOGLE_TAG_ID = os.getenv("GOOGLE_TAG_ID")
 
     # Account service url is a link back to our service that we send to eq as part of the token
     ACCOUNT_SERVICE_URL = f"{DOMAIN_URL_PROTOCOL}{DOMAIN_URL}"
@@ -31,6 +31,7 @@ class DevelopmentConfig(BaseConfig):
 
     SECRET_KEY = os.getenv('SECRET_KEY', b'_5#y2L"F4Q8z\n\xec]/')
     SESSION_COOKIE_SECURE = bool(strtobool(os.getenv('SESSION_COOKIE_SECURE', 'False')))
+    GOOGLE_TAG_ID = os.getenv("GOOGLE_TAG_ID", "G-XXXXXXXXXX")
 
     ACCOUNT_SERVICE_URL = f"{DOMAIN_URL_PROTOCOL}{DOMAIN_URL}"
     RH_SVC_URL = os.getenv("RH_SVC_URL", "http://localhost:8071")

From 57a7810edd5285602a14cbff8007e97a5d49cb09 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Wed, 7 Aug 2024 10:59:10 +0100
Subject: [PATCH 14/18] Add nonce and whitelist to make CSP happy

---
 rh_ui/security.py         | 1 +
 rh_ui/templates/base.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rh_ui/security.py b/rh_ui/security.py
index 24c609e..7761a3e 100644
--- a/rh_ui/security.py
+++ b/rh_ui/security.py
@@ -17,6 +17,7 @@
     'connect-src': [
         "'self'",
         'https://cdn.ons.gov.uk',
+        'https://*.google-analytics.com/'
     ],
     'img-src': [
         "'self'",
diff --git a/rh_ui/templates/base.html b/rh_ui/templates/base.html
index 8bc5020..d75f358 100644
--- a/rh_ui/templates/base.html
+++ b/rh_ui/templates/base.html
@@ -7,8 +7,8 @@
         {% set script_src_url = "https://www.googletagmanager.com/gtag/js?id=" + g_tag_id %}
 
         <!-- Google tag (gtag.js) -->
-        <script async src={{ script_src_url }}></script>
-        <script>
+        <script nonce="{{ csp_nonce() }}" async src={{ script_src_url }}></script>
+        <script nonce="{{ csp_nonce() }}"w>
         // NOTE!!!
         // We currently don't have an option to turn this cookie on/off on the cookies page in rh
         // It is set to false by default and can only be set to true

From 5f69b7b47339a8616757e7d5ffacbf9393804571 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Wed, 7 Aug 2024 16:49:01 +0100
Subject: [PATCH 15/18] =?UTF-8?q?w=20=F0=9F=91=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rh_ui/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rh_ui/templates/base.html b/rh_ui/templates/base.html
index d75f358..1d723a2 100644
--- a/rh_ui/templates/base.html
+++ b/rh_ui/templates/base.html
@@ -8,7 +8,7 @@
 
         <!-- Google tag (gtag.js) -->
         <script nonce="{{ csp_nonce() }}" async src={{ script_src_url }}></script>
-        <script nonce="{{ csp_nonce() }}"w>
+        <script nonce="{{ csp_nonce() }}">
         // NOTE!!!
         // We currently don't have an option to turn this cookie on/off on the cookies page in rh
         // It is set to false by default and can only be set to true

From 11657f286157e8d5420f503be84099cd4c6868ce Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 13 Aug 2024 08:53:45 +0100
Subject: [PATCH 16/18] Added the GA paragraph

---
 rh_ui/templates/info_pages/cookies.html | 110 +++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

diff --git a/rh_ui/templates/info_pages/cookies.html b/rh_ui/templates/info_pages/cookies.html
index 1c11788..31c719b 100644
--- a/rh_ui/templates/info_pages/cookies.html
+++ b/rh_ui/templates/info_pages/cookies.html
@@ -53,8 +53,116 @@ <h2>{{ _('Cookie settings') }}</h2>
             }) }}
 </div>
 <div class="ons-u-db-no-js_disabled">
-    <p>{{ _("We use two types of cookie. You can choose which cookies you're happy for us to use.") }}</p>
+    <p>{{ _("We use three types of cookie. You can choose which cookies you're happy for us to use.") }}</p>
     <form data-module="cookie-settings">
+
+        <h3>Cookies that measure website use</h3>
+        <p>
+            We use Google Analytics to measure how you use the website so we can improve it based on user needs. Google Analytics
+            sets cookies that store anonymised information about:
+        </p>
+        <ul>
+            <li>how you got to the site</li>
+            <li>the pages you visit on ons.gov.uk and how long you spend on each page</li>
+            <li>what you click on while you're visiting the site</li>
+        </ul>
+        {%
+            call onsDetails({
+                "id": "cookies-measure-website-use-details",
+                "classes": "ons-u-mb-s",
+                "title": "Learn more about these Google Analytics cookies",
+                "titleTag": 'h4',
+                "button": {
+                    "close": "Hide this"
+                }
+            })
+        %}
+            {{
+                onsTable({
+                    "ths": [
+                        {
+                            "value": "Name"
+                        },
+                        {
+                            "value": "Purpose"
+                        },
+                        {
+                            "value": "Expires"
+                        }
+                    ],
+                    "trs": [
+                        {
+                            "tds": [
+                                {
+                                    "value": "<code>_ga</code>"
+                                },
+                                {
+                                    "value": 'This helps us count how many people visit ons.gov.uk by tracking if you’ve visited before'
+                                },
+                                {
+                                    "value": "2 years"
+                                }
+                            ]
+                        },
+                        {
+                            "tds": [
+                                {
+                                    "value": "<code>_gid</code>"
+                                },
+                                {
+                                    "value": 'This helps us count how many people visit ons.gov.uk by tracking if you’ve visited before'
+                                },
+                                {
+                                    "value": "24 hours"
+                                }
+                            ]
+                        },
+                        {
+                            "tds": [
+                                {
+                                    "value": "<code>_gat</code>"
+                                },
+                                {
+                                    "value": 'Used to manage the rate at which page view requests are made'
+                                },
+                                {
+                                    "value": "10 minutes"
+                                }
+                            ]
+                        }
+                    ]
+                })
+            }}
+        {% endcall %}
+        <p>We do not allow Google to use or share the data about how you use this site.</p>
+        <div class="ons-u-mb-s">
+            {{
+                onsRadios({
+                    "id": "cookies-measure-website-use",
+                    "name": "cookies-usage",
+                    "legend": "Do you want to allow usage tracking?",
+                    "legendClasses": "ons-u-vh",
+                    "radios": [
+                        {
+                            "id": "on-1",
+                            "label": {
+                                "text": "On"
+                            },
+                            "value": "on"
+                        },
+                        {
+                            "id": "off-1",
+                            "label": {
+                                "text": "Off"
+                            },
+                            "value": "off"
+                        }
+                    ]
+                })
+            }}
+        </div>
+        <p>This selection will expire after two years.</p>
+
         <h3>{{ _('Cookies that help with our communications') }}</h3>
         <p>{{ _('Some of our pages may contain content from other sites which may set their own cookies. These sites are
                 sometimes called “third party” services. This tells us how many people see the content and

From 9dd21b5f7dbba3f22244b3122772cd8d1ce2e366 Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 13 Aug 2024 09:58:48 +0100
Subject: [PATCH 17/18] Added translations

---
 rh_ui/templates/info_pages/cookies.html       |  45 ++-
 rh_ui/translations/cy/LC_MESSAGES/messages.mo | Bin 16878 -> 15841 bytes
 rh_ui/translations/cy/LC_MESSAGES/messages.po | 309 +++++++++++-------
 rh_ui/translations/messages.pot               | 300 ++++++++++-------
 4 files changed, 401 insertions(+), 253 deletions(-)

diff --git a/rh_ui/templates/info_pages/cookies.html b/rh_ui/templates/info_pages/cookies.html
index 31c719b..6658b23 100644
--- a/rh_ui/templates/info_pages/cookies.html
+++ b/rh_ui/templates/info_pages/cookies.html
@@ -55,25 +55,24 @@ <h2>{{ _('Cookie settings') }}</h2>
 <div class="ons-u-db-no-js_disabled">
     <p>{{ _("We use three types of cookie. You can choose which cookies you're happy for us to use.") }}</p>
     <form data-module="cookie-settings">
-
-        <h3>Cookies that measure website use</h3>
+        <h3>{{ _("Cookies that measure website use") }}</h3>
         <p>
-            We use Google Analytics to measure how you use the website so we can improve it based on user needs. Google Analytics
-            sets cookies that store anonymised information about:
+            {{ _("We use Google Analytics to measure how you use the website so we can improve it based on user needs. Google Analytics
+            sets cookies that store anonymised information about:")}}
         </p>
         <ul>
-            <li>how you got to the site</li>
-            <li>the pages you visit on ons.gov.uk and how long you spend on each page</li>
-            <li>what you click on while you're visiting the site</li>
+            <li>{{_("how you got to the site")}}</li>
+            <li>{{_("the pages you visit on ons.gov.uk and how long you spend on each page")}}</li>
+            <li>{{_("what you click on while you're visiting the site")}}</li>
         </ul>
         {%
             call onsDetails({
                 "id": "cookies-measure-website-use-details",
                 "classes": "ons-u-mb-s",
-                "title": "Learn more about these Google Analytics cookies",
+                "title": _("Learn more about these Google Analytics cookies"),
                 "titleTag": 'h4',
                 "button": {
-                    "close": "Hide this"
+                    "close": _("Hide this")
                 }
             })
         %}
@@ -81,13 +80,13 @@ <h3>Cookies that measure website use</h3>
                 onsTable({
                     "ths": [
                         {
-                            "value": "Name"
+                            "value": _("Name")
                         },
                         {
-                            "value": "Purpose"
+                            "value": _("Purpose")
                         },
                         {
-                            "value": "Expires"
+                            "value": _("Expires")
                         }
                     ],
                     "trs": [
@@ -97,10 +96,10 @@ <h3>Cookies that measure website use</h3>
                                     "value": "<code>_ga</code>"
                                 },
                                 {
-                                    "value": 'This helps us count how many people visit ons.gov.uk by tracking if you’ve visited before'
+                                    "value": _('This helps us count how many people visit ons.gov.uk by tracking if you’ve visited before')
                                 },
                                 {
-                                    "value": "2 years"
+                                    "value": _("2 years")
                                 }
                             ]
                         },
@@ -110,10 +109,10 @@ <h3>Cookies that measure website use</h3>
                                     "value": "<code>_gid</code>"
                                 },
                                 {
-                                    "value": 'This helps us count how many people visit ons.gov.uk by tracking if you’ve visited before'
+                                    "value": _('This helps us count how many people visit ons.gov.uk by tracking if you’ve visited before')
                                 },
                                 {
-                                    "value": "24 hours"
+                                    "value": _("24 hours")
                                 }
                             ]
                         },
@@ -123,10 +122,10 @@ <h3>Cookies that measure website use</h3>
                                     "value": "<code>_gat</code>"
                                 },
                                 {
-                                    "value": 'Used to manage the rate at which page view requests are made'
+                                    "value": _('Used to manage the rate at which page view requests are made')
                                 },
                                 {
-                                    "value": "10 minutes"
+                                    "value": _("10 minutes")
                                 }
                             ]
                         }
@@ -134,26 +133,26 @@ <h3>Cookies that measure website use</h3>
                 })
             }}
         {% endcall %}
-        <p>We do not allow Google to use or share the data about how you use this site.</p>
+        <p>{{_("We do not allow Google to use or share the data about how you use this site.")}}</p>
         <div class="ons-u-mb-s">
             {{
                 onsRadios({
                     "id": "cookies-measure-website-use",
                     "name": "cookies-usage",
-                    "legend": "Do you want to allow usage tracking?",
+                    "legend": _("Do you want to allow usage tracking?"),
                     "legendClasses": "ons-u-vh",
                     "radios": [
                         {
                             "id": "on-1",
                             "label": {
-                                "text": "On"
+                                "text": _("On")
                             },
                             "value": "on"
                         },
                         {
                             "id": "off-1",
                             "label": {
-                                "text": "Off"
+                                "text": _("Off")
                             },
                             "value": "off"
                         }
@@ -161,7 +160,7 @@ <h3>Cookies that measure website use</h3>
                 })
             }}
         </div>
-        <p>This selection will expire after two years.</p>
+        <p>{{_("This selection will expire after two years.")}}</p>
 
         <h3>{{ _('Cookies that help with our communications') }}</h3>
         <p>{{ _('Some of our pages may contain content from other sites which may set their own cookies. These sites are
diff --git a/rh_ui/translations/cy/LC_MESSAGES/messages.mo b/rh_ui/translations/cy/LC_MESSAGES/messages.mo
index 305c0b14ead45bec67faf82865ae75717c659ec1..3d96f134ca437eba7ec9759527cb4f76798680e6 100644
GIT binary patch
delta 1663
zcmYM!ZD^KN7y#f~x3)F2blR3{)|wyFw%Im6aznvvYNoZUrj~0Hv#&w^NXQ?d8);z_
zN~N(MnN(;-;GY*FD$6p+prR0h@B`AMSX87ClvrIi6MA{x=Q`(k&ikBm-{*eb-?onU
z;i>*p6~(*5XPs}2Z(~vR{{PG?iEzYxr?Ko{3s>?AZs*n9%__dbVjf{RkMc?$<5fJ(
zQl8`Di2nFnW0DKExH_E=G5b3?hXooEL#*W=9M6if;c@jGr@xGOzn6x@z@_Wk*{A<1
zTUmO!g^h@4=R)(xBFp^RjqU8@s!<Ws_!jdA-|$uz2{$8KLYHDWGg+%SlHJTmdwCZ(
z@LGP%T+nf5hR)Ct7o6(MA7!H>F0z5ypYACO_%`zaL(B<F<Zl8iSj|RuaS5kz4{zWR
z4)QGPxn<1o`2C!!{|R&4&+MO}QEp??Hr~rec{dO7VUDR7&cG)2=zqXQR?GWrsa(Qb
z_-6aEmKWK{9)<BV53++Tl@TlWB(LMqN<X_%<0ltZu|j?_HGRCmO`Ob)*GM-9DM@jb
zt9hP=#Bynw%k|6}+QUWsoLNJorE4iWcn^0l7jnAVvS--DS@Qgg3lCb>Vs>6HD!#&;
z_!Kk64Yd*Pig*RpQ<T*WZ_!xJ({G~WL?835*vu@}mw6cv&~C=TOCIXiunqC$r2!|o
zQvVEdkJ={<+s#`2EzF7bGK=a2vlf12z6JlXnd77_C+=Wo_&zH5*v4Go4i2#Yb&ZU;
zPI%Kq_88adzob(B<azdSNG0Wiy1W|mIl#=&M=WBAyyw=HGc!}g64o*oSkE<F$SmsD
zC?oyxzD7oRm<l#dGbcL7zc^9nc~&)e$N453`8zYh8XZAL3zb83F^hBqGZSAii|rq7
z<HV-nVt<3vvuwZBnC->|3O-uA3WADNyp01~&o7u;GvlU+NB9go_$%*VtJx$e2G}E$
z2l#@1X=}ub+{Io_of+{QpXKf5k1@0Sd2kJFd%Q<S9Cuom_pL57vytOHcq?<FL8YB3
zJ<QzunwujYU^6SZgO1qelmVS&F1W<2VlA<Zi|^OiqLGn(&rDr&n-z}q7tBxfC#bju
zJi$&*Q~-DKaZcuk^9y|?BS#gwE2b0|zN@S%D(tLoFDswh)H1WSxvhQnoWilX&qfz^
Twd^l0?49#OQDI;E($fC`iSxbZ

delta 2643
zcmZ|PX^a#_6u|Mff*k9~!UA$xT(VpP%c(06ToCX?5S0}ad!}o)+wJKdyL;%27{^;t
z5@HsD#w(iOm3YKegT{nJ<%5Zu7_S(k#%K&G(HPW-V)XxZM){(f-T8IZ)KtCq>dk(+
z?T1^NYM-|Z+%5cA{>JgQa)6GG{RD$V_>~eb!!X5myaP|feb|Zza1?%u1Mx66<8OE}
z4j3$Q3br7>GKrT}A~l)8!(=9|!|AxYG2V}h7=MNAA!CM!7@UYBuoLxjSKx5m)_8v>
z@)3EyF~1M5W&AeI!^J}htcf}7<b0_R=DWPH57*+ICy2D+$EY9BG*`fU)XXyEEx7@;
zSa;!ZxC1rQop=d8jAQXf)PPPnsa~Ps$dt^)Nt`cd^6)2aLLGOp%X0h#b%Qa~O%Ggz
zr(q|K!OeIXW;hk!!HIYn@59zpMW*4isOvw%Gw>(Wb)&h@T8@Vf9)3h0b==h=vH|bH
z_4pYUaV~Y%O6<X_@l%|I9o)x4O4^N@z(X{|H8_4`eV-d~E#vp`7Mx6@ti;Dhv3wm5
z-!m}*myQ;hft&FPyc4xlU*I2j2p`3Rlwk_qO<EV?b4c;zC~m}N%BIa&z%y|hYHz)W
z=i=w6y)|VV;hx9CCR+be+>08}5zKM97mO!3#@CzvZj~Z+Tg~_x)PsLPEq&)Ck(Zl9
zJfzR$bfV)7X~QMB5-FnGjQVZah1$eV*LXOdhyBQP%YlX;AlD>cHQxUjFK7Haa;B`~
zR5d|^yHO8%8MWCCqu%)+$Sui8E`Bb~Ks|U9YNcys9{4861E>-1#hY*+uEMkEpf)nQ
z39n)N6km;Bv6*^ai%smJ8wI>9#XYDM`Vc9gjGtM*!ilJr$>AVej09MdWjt(Rq6@WT
zFX8d{9%_akBMmJ_P!AeP#~r~1cn{`gb4~avG9`oPV9jtoPR2Dz+em=gw6~*H;%l6s
z?b<p=<TfT2Aan8xYO@@~h1kMsswitv|1X4i6!+j7+|@4P;%BH=)H#oD0^W}+v1z`@
zMYswnqU^$}spxCCL%%L#Iptn_5_O{vT5}6Ng4^*gJRi3&=9_^ZAblq7wDtnrfO&l%
zPr*Ytf&-3XFXLey^@I1KR{9+rj?>Sk{#Ws^l!uY{0J68dfST!ds2L2Wvq(lZ;+1$0
zUXI_OmUJl>zx_Co2k~{rXDqM(1N#=&GM;gc$i;X)PQkZO+D+9uao>tTN16v0q9Cw^
zw0A`7l;xStCw^*Ynar9>VyCu6WgBiOL{X1#lP!TC_DoMqW0;%TRtTcRHl~-%$;Zoj
z*Nr``w!!lg<A=p4E;*?mg~qc%IblEJm&$Rp)taaho5aRj{en%56S}74^jMQrVrx>*
zNqMnE&>xD)qPT}e2@^q}mZK!`^MTFDhRF0-TQ=3GViLbQv@XY*zO}<z23|t+Ce0#~
zR?D0b6&q3KOc#p_PG|~VMDQl_{DSvSO1jfDg7BPjxoSv2gH9tYMc?MuaRb&n1tQi8
zxVC?jyk%8|1UOfN_QS1yT2DH#X=-D`9=7E8L4T03Em(i6b#u+8@zd3t8#0b^`{c%E
z4qKP<epugvsO!7bixgH$c^mhYM|TcsUOao=Let*fv2bqRYv#?9%(<~CWmU3rlJ1~l
zy0dCNavhs`#wk(QwD;Y4V``Z#lDHRzvrJrdt0lt+Tw4sQuIoqtbJtnHPyXwsFLLa(
z*c>~CU3EK4A@sT{#_zu{r+=n9a}p<9q478slI+exTXA)L;vaY^HpFVGtk>|E?9Qy8
zdVXZOt4Znv=8eZp*^BhjbA7ek69a3jogm1#HrKToy;jy8iL*Z|y-m-b7IHCeKv2F3
zePb)f63v<QBp))(qJPsjE|C=-3dXT))*+pgC2K4zIBrHJ?5&mUTRwl|fWfQjM?W^b
z`xlI@Y1CB{1l825#)jmmjh&s3l9UfPUPOT%R}*)#Br140qnp<^q?b&oO7H55_C+St
mT2O;(u@dT3WOUcqhGBo{V$Ux+m7GxjMnF*#_3d4>Wbog3{S?&z

diff --git a/rh_ui/translations/cy/LC_MESSAGES/messages.po b/rh_ui/translations/cy/LC_MESSAGES/messages.po
index d7acd4e..5baab0b 100644
--- a/rh_ui/translations/cy/LC_MESSAGES/messages.po
+++ b/rh_ui/translations/cy/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-07-25 11:50+0100\n"
+"POT-Creation-Date: 2024-08-13 09:56+0100\n"
 "PO-Revision-Date: 2022-11-18 18:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: cy\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: rh_ui/templates/base.html:12 rh_ui/templates/base.html:68
+#: rh_ui/templates/base.html:36 rh_ui/templates/base.html:94
 msgid "Cookies"
 msgstr "Cwcis"
 
-#: rh_ui/templates/base.html:15
-#, python-format
+#: rh_ui/templates/base.html:39
+#, fuzzy, python-format
 msgid ""
 "To collect information about how you use this website, we "
 "use%(open_cookies_link)s cookies.%(close_link)s</br>\n"
-"                        This information helps us improve our services "
-"and make sure that the website works as well as possible."
+"                                This information helps us improve our "
+"services and make sure that the website works as well as possible."
 msgstr ""
 "Er mwyn casglu gwybodaeth am sut rydych chi'n defnyddio'r wefan hon, "
 "rydym yn defnyddio%(open_cookies_link)s cwcis.%(close_link)s</br>Mae'r "
 "wybodaeth hon yn ein helpu i wella ein gwasanaethau a gwneud yn siŵr bod "
 "y wefan yn gweithio gystal â phosibl."
 
-#: rh_ui/templates/base.html:18
+#: rh_ui/templates/base.html:42
 #, python-format
 msgid ""
 "You can %(open_cookies_link)s change your cookie "
@@ -45,84 +45,83 @@ msgstr ""
 "Gallwch chi %(open_cookies_link)s newid eich dewisiadau o ran cwcis "
 "%(close_link)s ar unrhyw adeg."
 
-#: rh_ui/templates/base.html:41
+#: rh_ui/templates/base.html:67
 msgid "The following links open in a new tab"
 msgstr "Mae’r dolenni canlynol yn agor mewn tab newydd"
 
-#: rh_ui/templates/base.html:47
+#: rh_ui/templates/base.html:73
 msgid "About ONS studies"
 msgstr "Ynglŷn ag astudiaethau SYG"
 
-#: rh_ui/templates/base.html:48
+#: rh_ui/templates/base.html:74
 msgid "https://www.ons.gov.uk/surveys/informationforhouseholdsandindividuals"
 msgstr "https://cy.ons.gov.uk/surveys/informationforhouseholdsandindividuals"
 
-#: rh_ui/templates/base.html:52
+#: rh_ui/templates/base.html:78
 msgid "Accessibility statement"
 msgstr "Datganiad hygyrchedd"
 
-#: rh_ui/templates/base.html:53
+#: rh_ui/templates/base.html:79
 msgid "https://www.ons.gov.uk/help/accessibility"
 msgstr "https://cy.ons.gov.uk/help/accessibility"
 
-#: rh_ui/templates/base.html:57
+#: rh_ui/templates/base.html:83
 msgid "Contact us"
 msgstr "Cysylltu â ni"
 
-#: rh_ui/templates/base.html:58 rh_ui/templates/error_pages/404.html:13
-#: rh_ui/templates/error_pages/error.html:14
+#: rh_ui/templates/base.html:84 rh_ui/templates/error_pages/404.html:19
+#: rh_ui/templates/error_pages/error.html:18
 msgid "https://www.ons.gov.uk/aboutus/contactus/surveyenquiries"
 msgstr "https://cy.ons.gov.uk/aboutus/contactus/surveyenquiries"
 
-#: rh_ui/templates/base.html:72
+#: rh_ui/templates/base.html:98
 #: rh_ui/templates/info_pages/privacy-and-data-protection.html:5
 #: rh_ui/templates/info_pages/privacy-and-data-protection.html:21
 msgid "Privacy and data protection"
 msgstr "Preifatrwydd a diogelu data"
 
-#: rh_ui/templates/base.html:79
+#: rh_ui/templates/base.html:105
 msgid "Crown copyright and database rights 2020 OS 100019153."
 msgstr "Hawlfraint y Goron a hawliau cronfa ddata 2020 OS 100019153."
 
-#: rh_ui/templates/base.html:86
+#: rh_ui/templates/base.html:113
 msgid "https://www.ons.gov.uk/"
 msgstr "https://cy.ons.gov.uk/"
 
-#: rh_ui/templates/base.html:87 rh_ui/templates/error_pages/404.html:3
+#: rh_ui/templates/base.html:114 rh_ui/templates/error_pages/404.html:3
 #: rh_ui/templates/error_pages/error.html:3
 msgid "ONS Surveys"
 msgstr "Arolygon SYG"
 
-#: rh_ui/templates/start.html:12
-msgid "Enter an access code"
-msgstr "Rhowch god mynediad"
+#: rh_ui/templates/start.html:8
+msgid "Start study - ONS Surveys"
+msgstr "Dechrau'r astudiaeth - Arolygon SYG"
 
-#: rh_ui/templates/start.html:13 rh_ui/templates/start.html:16
-#: rh_ui/templates/start.html:19
+#: rh_ui/templates/start.html:13
 msgid "Error: Start study - ONS Surveys"
 msgstr "Gwall: Dechrau'r astudiaeth - Arolygon SYG"
 
-#: rh_ui/templates/start.html:15
+#: rh_ui/templates/start.html:18
+msgid "Enter an access code"
+msgstr "Rhowch god mynediad"
+
+#: rh_ui/templates/start.html:28
 msgid "Enter a 16-character access code"
 msgstr "Rhowch god mynediad 16 nod"
 
-#: rh_ui/templates/start.html:18
+#: rh_ui/templates/start.html:38
 msgid "Access code not recognised. Enter the code again."
 msgstr "Nid yw'r cod mynediad yn cael ei gydnabod. Rhowch y cod eto."
 
-#: rh_ui/templates/start.html:23
-msgid "Start study - ONS Surveys"
-msgstr "Dechrau'r astudiaeth - Arolygon SYG"
-
-#: rh_ui/templates/start.html:31
+#: rh_ui/templates/start.html:54
 msgid "Start study"
 msgstr "Dechrau'r astudiaeth"
 
-#: rh_ui/templates/start.html:39
+#: rh_ui/templates/start.html:62
 msgid "Enter your 16-character access code"
 msgstr "Rhowch eich cod mynediad sy'n cynnwys 16 o nodau"
 
-#: rh_ui/templates/start.html:40
+#: rh_ui/templates/start.html:63
 msgid ""
 "Keep this code safe. You will need to enter it every time you access your"
 " study"
@@ -130,7 +129,7 @@ msgstr ""
 "Cadwch y cod hwn yn ddiogel. Bydd angen i chi roi eich cod bob tro y "
 "byddwch chi'n mynd at eich astudiaeth"
 
-#: rh_ui/templates/start.html:43
+#: rh_ui/templates/start.html:66
 msgid ""
 "Your personal information is protected by law and will be kept "
 "confidential."
@@ -138,26 +137,27 @@ msgstr ""
 "Mae eich gwybodaeth bersonol wedi'i diogelu gan y gyfraith a chaiff ei "
 "chadw'n gyfrinachol."
 
-#: rh_ui/templates/start.html:51
+#: rh_ui/templates/start.html:74
 msgid "Access study"
 msgstr "Agor yr astudiaeth"
 
-#: rh_ui/templates/start.html:57
+#: rh_ui/templates/start.html:82
 msgid "Where to find your access code"
 msgstr "Ble i ddod o hyd i'ch cod mynediad"
 
-#: rh_ui/templates/start.html:58
+#: rh_ui/templates/start.html:83
+#, fuzzy
 msgid ""
 "Your access code can be found in the invitation letter or email you "
 "received.\n"
-"        Your 16-character access code will be a combination of letters "
-"and numbers."
+"            Your 16-character access code will be a combination of "
+"letters and numbers."
 msgstr ""
 "Gellir dod o hyd i'ch cod mynediad yn y llythyr neu'r e-bost gwahoddiad a"
 " gawsoch. Bydd eich cod mynediad 16 nod yn gyfuniad o lythrennau a "
 "rhifau."
 
-#: rh_ui/templates/start.html:62
+#: rh_ui/templates/start.html:87
 msgid ""
 "Telephone: +44 0808 196 1270<br>9am to 4:30pm Monday to Thursday<br>9am "
 "to 3pm Friday"
@@ -165,33 +165,33 @@ msgstr ""
 "Ffôn: +44 0808 196 1270<br>9am i 4:30pm o ddydd Llun i ddydd Iau<br>9am i"
 " 3pm ar ddydd Gwener"
 
-#: rh_ui/templates/start.html:63
+#: rh_ui/templates/start.html:88
 msgid "Minicom (for the deaf and hearing impaired): 18001 +44 800 085 7376"
 msgstr "Minicom (ar gyfer pobl fyddar neu drwm eu clyw): 18001 +44 800 085 7376"
 
-#: rh_ui/templates/start.html:64
+#: rh_ui/templates/start.html:89
 msgid "Email:"
 msgstr "E-bost:"
 
-#: rh_ui/templates/start.html:70
+#: rh_ui/templates/start.html:95
 msgid "Who can I contact for further information?"
 msgstr "Â phwy y gallaf gysylltu i gael rhagor o wybodaeth?"
 
-#: rh_ui/templates/error_pages/404.html:7
+#: rh_ui/templates/error_pages/404.html:12
 msgid "Page not found"
 msgstr "Heb ddod o hyd i'r dudalen"
 
-#: rh_ui/templates/error_pages/404.html:9
+#: rh_ui/templates/error_pages/404.html:15
 msgid "If you entered a web address, check it is correct."
 msgstr "Os gwnaethoch chi roi cyfeiriad gwe, gwnewch yn siŵr ei fod yn gywir."
 
-#: rh_ui/templates/error_pages/404.html:10
+#: rh_ui/templates/error_pages/404.html:16
 msgid "If you pasted the web address, check you copied the whole address."
 msgstr ""
 "Os gwnaethoch chi ludo'r cyfeiriad gwe, gwnewch yn siŵr eich bod wedi "
 "copïo'r cyfeiriad cyfan."
 
-#: rh_ui/templates/error_pages/404.html:14
+#: rh_ui/templates/error_pages/404.html:20
 #, python-format
 msgid ""
 "If the web address is correct or you selected a link or button, "
@@ -200,15 +200,15 @@ msgstr ""
 "Os yw'r cyfeiriad gwe yn gywir neu os gwnaethoch chi ddewis dolen neu "
 "fotwm, %(open)scysylltwch â ni%(close)s am fwy o gymorth."
 
-#: rh_ui/templates/error_pages/error.html:8
+#: rh_ui/templates/error_pages/error.html:12
 msgid "Sorry, something went wrong"
 msgstr "Mae’n ddrwg gennym, aeth rhywbeth o’i le"
 
-#: rh_ui/templates/error_pages/error.html:11
+#: rh_ui/templates/error_pages/error.html:15
 msgid "We are experiencing some technical problems."
 msgstr "Rydym yn profi rhai problemau technegol"
 
-#: rh_ui/templates/error_pages/error.html:15
+#: rh_ui/templates/error_pages/error.html:19
 #, python-format
 msgid ""
 "Please try again later, or %(open)scontact us%(close)s if the problem "
@@ -291,19 +291,121 @@ msgid "reloading the page in case there was a temporary fault with JavaScript"
 msgstr "ail-lwytho’r dudalen rhag ofn bod nam dros dro gyda JavaScript"
 
 #: rh_ui/templates/info_pages/cookies.html:56
+#, fuzzy
 msgid ""
-"We use two types of cookie. You can choose which cookies you're happy for"
-" us to use."
+"We use three types of cookie. You can choose which cookies you're happy "
+"for us to use."
 msgstr ""
 "Gallwch ddewis pa gwcis rydych chi'n fodlon i ni eu defnyddio. Rydyn ni'n"
 " defnyddio dau fath o gwci:"
 
 #: rh_ui/templates/info_pages/cookies.html:58
-#: rh_ui/templates/info_pages/cookies.html:67
+#, fuzzy
+msgid "Cookies that measure website use"
+msgstr "Cwcis sy'n cofio eich gosodiadau"
+
+#: rh_ui/templates/info_pages/cookies.html:60
+msgid ""
+"We use Google Analytics to measure how you use the website so we can "
+"improve it based on user needs. Google Analytics\n"
+"            sets cookies that store anonymised information about:"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:64
+msgid "how you got to the site"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:65
+msgid "the pages you visit on ons.gov.uk and how long you spend on each page"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:66
+msgid "what you click on while you're visiting the site"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:72
+#, fuzzy
+msgid "Learn more about these Google Analytics cookies"
+msgstr "Rhagor o wybodaeth am y cwcis hanfodol hyn"
+
+#: rh_ui/templates/info_pages/cookies.html:75
+msgid "Hide this"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:83
+#: rh_ui/templates/info_pages/cookies.html:239
+#: rh_ui/templates/info_pages/cookies.html:348
+msgid "Name"
+msgstr "Enw"
+
+#: rh_ui/templates/info_pages/cookies.html:86
+#: rh_ui/templates/info_pages/cookies.html:242
+#: rh_ui/templates/info_pages/cookies.html:351
+msgid "Purpose"
+msgstr "Diben"
+
+#: rh_ui/templates/info_pages/cookies.html:89
+#: rh_ui/templates/info_pages/cookies.html:245
+#: rh_ui/templates/info_pages/cookies.html:354
+msgid "Expires"
+msgstr "Daw i ben"
+
+#: rh_ui/templates/info_pages/cookies.html:99
+#: rh_ui/templates/info_pages/cookies.html:112
+msgid ""
+"This helps us count how many people visit ons.gov.uk by tracking if "
+"you’ve visited before"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:102
+#, fuzzy
+msgid "2 years"
+msgstr "Blwyddyn"
+
+#: rh_ui/templates/info_pages/cookies.html:115
+msgid "24 hours"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:125
+msgid "Used to manage the rate at which page view requests are made"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:128
+msgid "10 minutes"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:136
+msgid ""
+"We do not allow Google to use or share the data about how you use this "
+"site."
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:142
+msgid "Do you want to allow usage tracking?"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:148
+#: rh_ui/templates/info_pages/cookies.html:180
+#: rh_ui/templates/info_pages/cookies.html:205
+msgid "On"
+msgstr "Ymlaen"
+
+#: rh_ui/templates/info_pages/cookies.html:155
+#: rh_ui/templates/info_pages/cookies.html:187
+#: rh_ui/templates/info_pages/cookies.html:212
+msgid "Off"
+msgstr "I ffwrdd"
+
+#: rh_ui/templates/info_pages/cookies.html:163
+msgid "This selection will expire after two years."
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:165
+#: rh_ui/templates/info_pages/cookies.html:174
 msgid "Cookies that help with our communications"
 msgstr "Cwcis sy'n ein helpu i gyfathrebu"
 
-#: rh_ui/templates/info_pages/cookies.html:59
+#: rh_ui/templates/info_pages/cookies.html:166
 msgid ""
 "Some of our pages may contain content from other sites which may set "
 "their own cookies. These sites are\n"
@@ -316,7 +418,7 @@ msgstr ""
 "parti” weithiau. Mae hyn yn dweud wrthym faint o bobl sy'n gweld y "
 "cynnwys a ph'un a yw'n ddefnyddiol."
 
-#: rh_ui/templates/info_pages/cookies.html:62
+#: rh_ui/templates/info_pages/cookies.html:169
 msgid ""
 "In addition, if you share a link to a page, the service you share it on "
 "may set a cookie. We have no\n"
@@ -328,22 +430,12 @@ msgstr ""
 "unrhyw reolaeth dros gwcis a gaiff eu gosod ar wefannau eraill – gallwch "
 "eu diffodd, ond nid drwyddom ni."
 
-#: rh_ui/templates/info_pages/cookies.html:73
-#: rh_ui/templates/info_pages/cookies.html:98
-msgid "On"
-msgstr "Ymlaen"
-
-#: rh_ui/templates/info_pages/cookies.html:80
-#: rh_ui/templates/info_pages/cookies.html:105
-msgid "Off"
-msgstr "I ffwrdd"
-
-#: rh_ui/templates/info_pages/cookies.html:86
-#: rh_ui/templates/info_pages/cookies.html:92
+#: rh_ui/templates/info_pages/cookies.html:193
+#: rh_ui/templates/info_pages/cookies.html:199
 msgid "Cookies that remember your settings"
 msgstr "Cwcis sy'n cofio eich gosodiadau"
 
-#: rh_ui/templates/info_pages/cookies.html:87
+#: rh_ui/templates/info_pages/cookies.html:194
 msgid ""
 "These cookies personalise your experience of using the site,\n"
 "                by doing things like remembering your preferences and the"
@@ -352,21 +444,21 @@ msgstr ""
 "Mae'r cwcis hyn yn personoli eich profiad wrth ddefnyddio'r wefan, drwy "
 "wneud pethau fel cofio eich eich gosodiadau a'ch dewisiadau."
 
-#: rh_ui/templates/info_pages/cookies.html:111
+#: rh_ui/templates/info_pages/cookies.html:218
 msgid "Strictly necessary cookies"
 msgstr "Cwcis cwbl angenrheidiol"
 
-#: rh_ui/templates/info_pages/cookies.html:112
+#: rh_ui/templates/info_pages/cookies.html:219
 msgid "These essential cookies do things like:"
 msgstr "Mae'r cwcis hanfodol hyn yn gwneud pethau fel:"
 
-#: rh_ui/templates/info_pages/cookies.html:116
+#: rh_ui/templates/info_pages/cookies.html:223
 msgid "remember the notifications you've seen so we do not show you them again"
 msgstr ""
 "cofio'r hysbysiadau rydych chi wedi'u gweld fel nad ydym yn eu dangos i "
 "chi eto"
 
-#: rh_ui/templates/info_pages/cookies.html:119
+#: rh_ui/templates/info_pages/cookies.html:226
 msgid ""
 "remember your progress through a form (for example, online business "
 "surveys)"
@@ -374,15 +466,15 @@ msgstr ""
 "cofio ble rydych chi arni ar ffurflen (er enghraifft, arolygon busnes ar-"
 "lein)"
 
-#: rh_ui/templates/info_pages/cookies.html:123
+#: rh_ui/templates/info_pages/cookies.html:230
 msgid "They always need to be on."
 msgstr "Mae angen i'r rhain fod ymlaen bob amser."
 
-#: rh_ui/templates/info_pages/cookies.html:126
+#: rh_ui/templates/info_pages/cookies.html:233
 msgid "Your progress"
 msgstr "Ble rydych chi arni"
 
-#: rh_ui/templates/info_pages/cookies.html:127
+#: rh_ui/templates/info_pages/cookies.html:234
 msgid ""
 "We’ll set a cookie to remember your progress while logged in. These "
 "cookies do not store your\n"
@@ -391,35 +483,20 @@ msgstr ""
 "Byddwn yn gosod cwci er mwyn cofio ble rydych chi arni tra byddwch chi "
 "wedi mewngofnodi. Nid yw'r cwcis hyn yn storio eich data personol."
 
-#: rh_ui/templates/info_pages/cookies.html:132
-#: rh_ui/templates/info_pages/cookies.html:241
-msgid "Name"
-msgstr "Enw"
-
-#: rh_ui/templates/info_pages/cookies.html:135
-#: rh_ui/templates/info_pages/cookies.html:244
-msgid "Purpose"
-msgstr "Diben"
-
-#: rh_ui/templates/info_pages/cookies.html:138
-#: rh_ui/templates/info_pages/cookies.html:247
-msgid "Expires"
-msgstr "Daw i ben"
-
-#: rh_ui/templates/info_pages/cookies.html:148
+#: rh_ui/templates/info_pages/cookies.html:255
 msgid "To check that your browser can support cookies"
 msgstr "Cadarnhau y gall eich porwr gynnal cwcis"
 
-#: rh_ui/templates/info_pages/cookies.html:151
-#: rh_ui/templates/info_pages/cookies.html:164
-#: rh_ui/templates/info_pages/cookies.html:177
-#: rh_ui/templates/info_pages/cookies.html:190
-#: rh_ui/templates/info_pages/cookies.html:203
-#: rh_ui/templates/info_pages/cookies.html:229
+#: rh_ui/templates/info_pages/cookies.html:258
+#: rh_ui/templates/info_pages/cookies.html:271
+#: rh_ui/templates/info_pages/cookies.html:284
+#: rh_ui/templates/info_pages/cookies.html:297
+#: rh_ui/templates/info_pages/cookies.html:310
+#: rh_ui/templates/info_pages/cookies.html:336
 msgid "When a user closes the browser or when their cookie cache is cleared"
 msgstr "Pan fydd defnyddiwr yn cau'r porwr neu pan gaiff y storfa cwcis ei chlirio"
 
-#: rh_ui/templates/info_pages/cookies.html:161
+#: rh_ui/templates/info_pages/cookies.html:268
 msgid ""
 "To store your preferred language so that certain content can be displayed"
 " in your own language"
@@ -427,7 +504,7 @@ msgstr ""
 "Storio eich dewis iaith fel bod modd dangos cynnwys penodol yn yr iaith "
 "honno"
 
-#: rh_ui/templates/info_pages/cookies.html:174
+#: rh_ui/templates/info_pages/cookies.html:281
 msgid ""
 "To keep your session active when using your account to access portfolio "
 "and messages"
@@ -435,11 +512,11 @@ msgstr ""
 "Cadw eich sesiwn yn weithredol pan fyddwch chi'n defnyddio eich cyfrif i "
 "agor portffolio a negeseuon"
 
-#: rh_ui/templates/info_pages/cookies.html:187
+#: rh_ui/templates/info_pages/cookies.html:294
 msgid "To store the universally unique identifier created for your account"
 msgstr "Storio'r dynodydd unigryw cyffredinol a grëwyd ar gyfer eich cyfrif"
 
-#: rh_ui/templates/info_pages/cookies.html:200
+#: rh_ui/templates/info_pages/cookies.html:307
 msgid ""
 "To store the timestamp of the last request so that the session expiry "
 "warning message can be displayed"
@@ -447,11 +524,11 @@ msgstr ""
 "Storio stamp amser y cais diwethaf fel bod modd dangos neges yn rhybuddio"
 " bod y sesiwn ar fin dod i ben"
 
-#: rh_ui/templates/info_pages/cookies.html:213
+#: rh_ui/templates/info_pages/cookies.html:320
 msgid "To keep you signed in when completing a survey"
 msgstr "Sicrhau eich bod yn parhau i fod wedi'ch mewngofnodi wrth gwblhau arolwg"
 
-#: rh_ui/templates/info_pages/cookies.html:216
+#: rh_ui/templates/info_pages/cookies.html:323
 msgid ""
 "When a user logs out or closes the browser. Or when their cookie cache is"
 " cleared"
@@ -459,7 +536,7 @@ msgstr ""
 "Pan fydd defnyddiwr yn allgofnodi neu'n cau'r porwr. Neu pan gaiff y "
 "storfa cwcis ei chlirio"
 
-#: rh_ui/templates/info_pages/cookies.html:226
+#: rh_ui/templates/info_pages/cookies.html:333
 msgid ""
 "To store the flash object identifier for the most recent action you have "
 "performed"
@@ -467,11 +544,11 @@ msgstr ""
 "Storio'r dynodydd gwrthrych fflach ar gyfer y weithred ddiweddaraf a "
 "gwblhawyd gennych"
 
-#: rh_ui/templates/info_pages/cookies.html:235
+#: rh_ui/templates/info_pages/cookies.html:342
 msgid "Cookie message"
 msgstr "Neges am gwcis"
 
-#: rh_ui/templates/info_pages/cookies.html:236
+#: rh_ui/templates/info_pages/cookies.html:343
 msgid ""
 "You may see a banner when you visit start.surveys.ons.gov.uk inviting you"
 " to accept cookies or review your settings.\n"
@@ -484,24 +561,24 @@ msgstr ""
 "eich bod wedi'i gweld ac yn peidio â'i dangos eto, ac i storio eich "
 "gosodiadau."
 
-#: rh_ui/templates/info_pages/cookies.html:257
+#: rh_ui/templates/info_pages/cookies.html:364
 msgid "Lets us know that you’ve seen our cookie message"
 msgstr "Mae'n rhoi gwybod i ni eich bod wedi gweld ein neges am gwcis"
 
-#: rh_ui/templates/info_pages/cookies.html:260
-#: rh_ui/templates/info_pages/cookies.html:273
+#: rh_ui/templates/info_pages/cookies.html:367
+#: rh_ui/templates/info_pages/cookies.html:380
 msgid "1 year"
 msgstr "Blwyddyn"
 
-#: rh_ui/templates/info_pages/cookies.html:270
+#: rh_ui/templates/info_pages/cookies.html:377
 msgid "Saves your cookie consent settings"
 msgstr "Mae'n cadw eich gosodiadau caniatâd cwcis"
 
-#: rh_ui/templates/info_pages/cookies.html:284
+#: rh_ui/templates/info_pages/cookies.html:391
 msgid "Learn more about these essential cookies"
 msgstr "Rhagor o wybodaeth am y cwcis hanfodol hyn"
 
-#: rh_ui/templates/info_pages/cookies.html:290
+#: rh_ui/templates/info_pages/cookies.html:397
 msgid "Save changes"
 msgstr "Cadw newidiadau"
 
@@ -625,7 +702,7 @@ msgstr ""
 "href=\"https://cy.ons.gov.uk/aboutus/transparencyandgovernance/dataprotection\""
 " target=\"_blank\">tudalen diogelu data.</a>"
 
-#: rh_ui/templates/partials/messages.html:7
+#: rh_ui/templates/partials/uac_error_message_list.html:7
 msgid "There is a problem with this page"
 msgstr "Mae problem gyda'r dudalen hon"
 
@@ -634,15 +711,15 @@ msgstr "Mae problem gyda'r dudalen hon"
 msgid "Error - ONS Surveys"
 msgstr "Gwall - Arolygon SYG"
 
-#: rh_ui/templates/uac_error_pages/uac-already-used.html:21
+#: rh_ui/templates/uac_error_pages/uac-already-used.html:26
 msgid "This access code has already been used"
 msgstr "Mae'r cod mynediad hwn eisoes wedi cael ei ddefnyddio"
 
-#: rh_ui/templates/uac_error_pages/uac-already-used.html:23
+#: rh_ui/templates/uac_error_pages/uac-already-used.html:29
 msgid "Someone has already submitted a response using this access code."
 msgstr "Mae rhywun eisoes wedi cyflwyno ymateb gan ddefnyddio’r cod mynediad hwn."
 
-#: rh_ui/templates/uac_error_pages/uac-inactive.html:21
+#: rh_ui/templates/uac_error_pages/uac-inactive.html:25
 msgid "This questionnaire has now closed"
 msgstr "Mae'r holiadur hwn wedi cau erbyn hyn"
 
diff --git a/rh_ui/translations/messages.pot b/rh_ui/translations/messages.pot
index 639f862..0ebf647 100644
--- a/rh_ui/translations/messages.pot
+++ b/rh_ui/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-07-25 11:50+0100\n"
+"POT-Creation-Date: 2024-08-13 09:56+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,177 +17,176 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: rh_ui/templates/base.html:12 rh_ui/templates/base.html:68
+#: rh_ui/templates/base.html:36 rh_ui/templates/base.html:94
 msgid "Cookies"
 msgstr ""
 
-#: rh_ui/templates/base.html:15
+#: rh_ui/templates/base.html:39
 #, python-format
 msgid ""
 "To collect information about how you use this website, we "
 "use%(open_cookies_link)s cookies.%(close_link)s</br>\n"
-"                        This information helps us improve our services "
-"and make sure that the website works as well as possible."
+"                                This information helps us improve our "
+"services and make sure that the website works as well as possible."
 msgstr ""
 
-#: rh_ui/templates/base.html:18
+#: rh_ui/templates/base.html:42
 #, python-format
 msgid ""
 "You can %(open_cookies_link)s change your cookie "
 "preferences%(close_link)s at any time."
 msgstr ""
 
-#: rh_ui/templates/base.html:41
+#: rh_ui/templates/base.html:67
 msgid "The following links open in a new tab"
 msgstr ""
 
-#: rh_ui/templates/base.html:47
+#: rh_ui/templates/base.html:73
 msgid "About ONS studies"
 msgstr ""
 
-#: rh_ui/templates/base.html:48
+#: rh_ui/templates/base.html:74
 msgid "https://www.ons.gov.uk/surveys/informationforhouseholdsandindividuals"
 msgstr ""
 
-#: rh_ui/templates/base.html:52
+#: rh_ui/templates/base.html:78
 msgid "Accessibility statement"
 msgstr ""
 
-#: rh_ui/templates/base.html:53
+#: rh_ui/templates/base.html:79
 msgid "https://www.ons.gov.uk/help/accessibility"
 msgstr ""
 
-#: rh_ui/templates/base.html:57
+#: rh_ui/templates/base.html:83
 msgid "Contact us"
 msgstr ""
 
-#: rh_ui/templates/base.html:58 rh_ui/templates/error_pages/404.html:13
-#: rh_ui/templates/error_pages/error.html:14
+#: rh_ui/templates/base.html:84 rh_ui/templates/error_pages/404.html:19
+#: rh_ui/templates/error_pages/error.html:18
 msgid "https://www.ons.gov.uk/aboutus/contactus/surveyenquiries"
 msgstr ""
 
-#: rh_ui/templates/base.html:72
+#: rh_ui/templates/base.html:98
 #: rh_ui/templates/info_pages/privacy-and-data-protection.html:5
 #: rh_ui/templates/info_pages/privacy-and-data-protection.html:21
 msgid "Privacy and data protection"
 msgstr ""
 
-#: rh_ui/templates/base.html:79
+#: rh_ui/templates/base.html:105
 msgid "Crown copyright and database rights 2020 OS 100019153."
 msgstr ""
 
-#: rh_ui/templates/base.html:86
+#: rh_ui/templates/base.html:113
 msgid "https://www.ons.gov.uk/"
 msgstr ""
 
-#: rh_ui/templates/base.html:87 rh_ui/templates/error_pages/404.html:3
+#: rh_ui/templates/base.html:114 rh_ui/templates/error_pages/404.html:3
 #: rh_ui/templates/error_pages/error.html:3
 msgid "ONS Surveys"
 msgstr ""
 
-#: rh_ui/templates/start.html:12
-msgid "Enter an access code"
+#: rh_ui/templates/start.html:8
+msgid "Start study - ONS Surveys"
 msgstr ""
 
-#: rh_ui/templates/start.html:13 rh_ui/templates/start.html:16
-#: rh_ui/templates/start.html:19
+#: rh_ui/templates/start.html:13
 msgid "Error: Start study - ONS Surveys"
 msgstr ""
 
-#: rh_ui/templates/start.html:15
-msgid "Enter a 16-character access code"
+#: rh_ui/templates/start.html:18
+msgid "Enter an access code"
 msgstr ""
 
-#: rh_ui/templates/start.html:18
-msgid "Access code not recognised. Enter the code again."
+#: rh_ui/templates/start.html:28
+msgid "Enter a 16-character access code"
 msgstr ""
 
-#: rh_ui/templates/start.html:23
-msgid "Start study - ONS Surveys"
+#: rh_ui/templates/start.html:38
+msgid "Access code not recognised. Enter the code again."
 msgstr ""
 
-#: rh_ui/templates/start.html:31
+#: rh_ui/templates/start.html:54
 msgid "Start study"
 msgstr ""
 
-#: rh_ui/templates/start.html:39
+#: rh_ui/templates/start.html:62
 msgid "Enter your 16-character access code"
 msgstr ""
 
-#: rh_ui/templates/start.html:40
+#: rh_ui/templates/start.html:63
 msgid ""
 "Keep this code safe. You will need to enter it every time you access your"
 " study"
 msgstr ""
 
-#: rh_ui/templates/start.html:43
+#: rh_ui/templates/start.html:66
 msgid ""
 "Your personal information is protected by law and will be kept "
 "confidential."
 msgstr ""
 
-#: rh_ui/templates/start.html:51
+#: rh_ui/templates/start.html:74
 msgid "Access study"
 msgstr ""
 
-#: rh_ui/templates/start.html:57
+#: rh_ui/templates/start.html:82
 msgid "Where to find your access code"
 msgstr ""
 
-#: rh_ui/templates/start.html:58
+#: rh_ui/templates/start.html:83
 msgid ""
 "Your access code can be found in the invitation letter or email you "
 "received.\n"
-"        Your 16-character access code will be a combination of letters "
-"and numbers."
+"            Your 16-character access code will be a combination of "
+"letters and numbers."
 msgstr ""
 
-#: rh_ui/templates/start.html:62
+#: rh_ui/templates/start.html:87
 msgid ""
 "Telephone: +44 0808 196 1270<br>9am to 4:30pm Monday to Thursday<br>9am "
 "to 3pm Friday"
 msgstr ""
 
-#: rh_ui/templates/start.html:63
+#: rh_ui/templates/start.html:88
 msgid "Minicom (for the deaf and hearing impaired): 18001 +44 800 085 7376"
 msgstr ""
 
-#: rh_ui/templates/start.html:64
+#: rh_ui/templates/start.html:89
 msgid "Email:"
 msgstr ""
 
-#: rh_ui/templates/start.html:70
+#: rh_ui/templates/start.html:95
 msgid "Who can I contact for further information?"
 msgstr ""
 
-#: rh_ui/templates/error_pages/404.html:7
+#: rh_ui/templates/error_pages/404.html:12
 msgid "Page not found"
 msgstr ""
 
-#: rh_ui/templates/error_pages/404.html:9
+#: rh_ui/templates/error_pages/404.html:15
 msgid "If you entered a web address, check it is correct."
 msgstr ""
 
-#: rh_ui/templates/error_pages/404.html:10
+#: rh_ui/templates/error_pages/404.html:16
 msgid "If you pasted the web address, check you copied the whole address."
 msgstr ""
 
-#: rh_ui/templates/error_pages/404.html:14
+#: rh_ui/templates/error_pages/404.html:20
 #, python-format
 msgid ""
 "If the web address is correct or you selected a link or button, "
 "%(open)scontact us%(close)s for more help."
 msgstr ""
 
-#: rh_ui/templates/error_pages/error.html:8
+#: rh_ui/templates/error_pages/error.html:12
 msgid "Sorry, something went wrong"
 msgstr ""
 
-#: rh_ui/templates/error_pages/error.html:11
+#: rh_ui/templates/error_pages/error.html:15
 msgid "We are experiencing some technical problems."
 msgstr ""
 
-#: rh_ui/templates/error_pages/error.html:15
+#: rh_ui/templates/error_pages/error.html:19
 #, python-format
 msgid ""
 "Please try again later, or %(open)scontact us%(close)s if the problem "
@@ -259,16 +258,114 @@ msgstr ""
 
 #: rh_ui/templates/info_pages/cookies.html:56
 msgid ""
-"We use two types of cookie. You can choose which cookies you're happy for"
-" us to use."
+"We use three types of cookie. You can choose which cookies you're happy "
+"for us to use."
 msgstr ""
 
 #: rh_ui/templates/info_pages/cookies.html:58
-#: rh_ui/templates/info_pages/cookies.html:67
+msgid "Cookies that measure website use"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:60
+msgid ""
+"We use Google Analytics to measure how you use the website so we can "
+"improve it based on user needs. Google Analytics\n"
+"            sets cookies that store anonymised information about:"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:64
+msgid "how you got to the site"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:65
+msgid "the pages you visit on ons.gov.uk and how long you spend on each page"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:66
+msgid "what you click on while you're visiting the site"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:72
+msgid "Learn more about these Google Analytics cookies"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:75
+msgid "Hide this"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:83
+#: rh_ui/templates/info_pages/cookies.html:239
+#: rh_ui/templates/info_pages/cookies.html:348
+msgid "Name"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:86
+#: rh_ui/templates/info_pages/cookies.html:242
+#: rh_ui/templates/info_pages/cookies.html:351
+msgid "Purpose"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:89
+#: rh_ui/templates/info_pages/cookies.html:245
+#: rh_ui/templates/info_pages/cookies.html:354
+msgid "Expires"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:99
+#: rh_ui/templates/info_pages/cookies.html:112
+msgid ""
+"This helps us count how many people visit ons.gov.uk by tracking if "
+"you’ve visited before"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:102
+msgid "2 years"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:115
+msgid "24 hours"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:125
+msgid "Used to manage the rate at which page view requests are made"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:128
+msgid "10 minutes"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:136
+msgid ""
+"We do not allow Google to use or share the data about how you use this "
+"site."
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:142
+msgid "Do you want to allow usage tracking?"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:148
+#: rh_ui/templates/info_pages/cookies.html:180
+#: rh_ui/templates/info_pages/cookies.html:205
+msgid "On"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:155
+#: rh_ui/templates/info_pages/cookies.html:187
+#: rh_ui/templates/info_pages/cookies.html:212
+msgid "Off"
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:163
+msgid "This selection will expire after two years."
+msgstr ""
+
+#: rh_ui/templates/info_pages/cookies.html:165
+#: rh_ui/templates/info_pages/cookies.html:174
 msgid "Cookies that help with our communications"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:59
+#: rh_ui/templates/info_pages/cookies.html:166
 msgid ""
 "Some of our pages may contain content from other sites which may set "
 "their own cookies. These sites are\n"
@@ -277,7 +374,7 @@ msgid ""
 "                whether it’s useful."
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:62
+#: rh_ui/templates/info_pages/cookies.html:169
 msgid ""
 "In addition, if you share a link to a page, the service you share it on "
 "may set a cookie. We have no\n"
@@ -285,132 +382,107 @@ msgid ""
 " them off, but not through us."
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:73
-#: rh_ui/templates/info_pages/cookies.html:98
-msgid "On"
-msgstr ""
-
-#: rh_ui/templates/info_pages/cookies.html:80
-#: rh_ui/templates/info_pages/cookies.html:105
-msgid "Off"
-msgstr ""
-
-#: rh_ui/templates/info_pages/cookies.html:86
-#: rh_ui/templates/info_pages/cookies.html:92
+#: rh_ui/templates/info_pages/cookies.html:193
+#: rh_ui/templates/info_pages/cookies.html:199
 msgid "Cookies that remember your settings"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:87
+#: rh_ui/templates/info_pages/cookies.html:194
 msgid ""
 "These cookies personalise your experience of using the site,\n"
 "                by doing things like remembering your preferences and the"
 " choices you make."
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:111
+#: rh_ui/templates/info_pages/cookies.html:218
 msgid "Strictly necessary cookies"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:112
+#: rh_ui/templates/info_pages/cookies.html:219
 msgid "These essential cookies do things like:"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:116
+#: rh_ui/templates/info_pages/cookies.html:223
 msgid "remember the notifications you've seen so we do not show you them again"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:119
+#: rh_ui/templates/info_pages/cookies.html:226
 msgid ""
 "remember your progress through a form (for example, online business "
 "surveys)"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:123
+#: rh_ui/templates/info_pages/cookies.html:230
 msgid "They always need to be on."
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:126
+#: rh_ui/templates/info_pages/cookies.html:233
 msgid "Your progress"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:127
+#: rh_ui/templates/info_pages/cookies.html:234
 msgid ""
 "We’ll set a cookie to remember your progress while logged in. These "
 "cookies do not store your\n"
 "                    personal data."
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:132
-#: rh_ui/templates/info_pages/cookies.html:241
-msgid "Name"
-msgstr ""
-
-#: rh_ui/templates/info_pages/cookies.html:135
-#: rh_ui/templates/info_pages/cookies.html:244
-msgid "Purpose"
-msgstr ""
-
-#: rh_ui/templates/info_pages/cookies.html:138
-#: rh_ui/templates/info_pages/cookies.html:247
-msgid "Expires"
-msgstr ""
-
-#: rh_ui/templates/info_pages/cookies.html:148
+#: rh_ui/templates/info_pages/cookies.html:255
 msgid "To check that your browser can support cookies"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:151
-#: rh_ui/templates/info_pages/cookies.html:164
-#: rh_ui/templates/info_pages/cookies.html:177
-#: rh_ui/templates/info_pages/cookies.html:190
-#: rh_ui/templates/info_pages/cookies.html:203
-#: rh_ui/templates/info_pages/cookies.html:229
+#: rh_ui/templates/info_pages/cookies.html:258
+#: rh_ui/templates/info_pages/cookies.html:271
+#: rh_ui/templates/info_pages/cookies.html:284
+#: rh_ui/templates/info_pages/cookies.html:297
+#: rh_ui/templates/info_pages/cookies.html:310
+#: rh_ui/templates/info_pages/cookies.html:336
 msgid "When a user closes the browser or when their cookie cache is cleared"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:161
+#: rh_ui/templates/info_pages/cookies.html:268
 msgid ""
 "To store your preferred language so that certain content can be displayed"
 " in your own language"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:174
+#: rh_ui/templates/info_pages/cookies.html:281
 msgid ""
 "To keep your session active when using your account to access portfolio "
 "and messages"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:187
+#: rh_ui/templates/info_pages/cookies.html:294
 msgid "To store the universally unique identifier created for your account"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:200
+#: rh_ui/templates/info_pages/cookies.html:307
 msgid ""
 "To store the timestamp of the last request so that the session expiry "
 "warning message can be displayed"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:213
+#: rh_ui/templates/info_pages/cookies.html:320
 msgid "To keep you signed in when completing a survey"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:216
+#: rh_ui/templates/info_pages/cookies.html:323
 msgid ""
 "When a user logs out or closes the browser. Or when their cookie cache is"
 " cleared"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:226
+#: rh_ui/templates/info_pages/cookies.html:333
 msgid ""
 "To store the flash object identifier for the most recent action you have "
 "performed"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:235
+#: rh_ui/templates/info_pages/cookies.html:342
 msgid "Cookie message"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:236
+#: rh_ui/templates/info_pages/cookies.html:343
 msgid ""
 "You may see a banner when you visit start.surveys.ons.gov.uk inviting you"
 " to accept cookies or review your settings.\n"
@@ -418,24 +490,24 @@ msgid ""
 "seen it and not to show it again and store your settings."
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:257
+#: rh_ui/templates/info_pages/cookies.html:364
 msgid "Lets us know that you’ve seen our cookie message"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:260
-#: rh_ui/templates/info_pages/cookies.html:273
+#: rh_ui/templates/info_pages/cookies.html:367
+#: rh_ui/templates/info_pages/cookies.html:380
 msgid "1 year"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:270
+#: rh_ui/templates/info_pages/cookies.html:377
 msgid "Saves your cookie consent settings"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:284
+#: rh_ui/templates/info_pages/cookies.html:391
 msgid "Learn more about these essential cookies"
 msgstr ""
 
-#: rh_ui/templates/info_pages/cookies.html:290
+#: rh_ui/templates/info_pages/cookies.html:397
 msgid "Save changes"
 msgstr ""
 
@@ -526,7 +598,7 @@ msgid ""
 " target=\"_blank\">protection page</a>."
 msgstr ""
 
-#: rh_ui/templates/partials/messages.html:7
+#: rh_ui/templates/partials/uac_error_message_list.html:7
 msgid "There is a problem with this page"
 msgstr ""
 
@@ -535,15 +607,15 @@ msgstr ""
 msgid "Error - ONS Surveys"
 msgstr ""
 
-#: rh_ui/templates/uac_error_pages/uac-already-used.html:21
+#: rh_ui/templates/uac_error_pages/uac-already-used.html:26
 msgid "This access code has already been used"
 msgstr ""
 
-#: rh_ui/templates/uac_error_pages/uac-already-used.html:23
+#: rh_ui/templates/uac_error_pages/uac-already-used.html:29
 msgid "Someone has already submitted a response using this access code."
 msgstr ""
 
-#: rh_ui/templates/uac_error_pages/uac-inactive.html:21
+#: rh_ui/templates/uac_error_pages/uac-inactive.html:25
 msgid "This questionnaire has now closed"
 msgstr ""
 

From 6bed605e30ea0f88d71755b1957e58650747fe2a Mon Sep 17 00:00:00 2001
From: Kacper Prywata <kacper.prywata@ons.gov.uk>
Date: Tue, 13 Aug 2024 13:54:02 +0100
Subject: [PATCH 18/18] Fixed the translations

---
 rh_ui/translations/cy/LC_MESSAGES/messages.mo | Bin 15841 -> 16688 bytes
 rh_ui/translations/cy/LC_MESSAGES/messages.po |  15 ++++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/rh_ui/translations/cy/LC_MESSAGES/messages.mo b/rh_ui/translations/cy/LC_MESSAGES/messages.mo
index 3d96f134ca437eba7ec9759527cb4f76798680e6..44c70d8b1c37950659e1604f1ed039b293c7e09b 100644
GIT binary patch
delta 2391
zcmZ|PYitx%6u|LId9)UhXA88Axx5!B3$1`kYb_ukQiMuDd0A$6@9qwrooQxvyKEpX
zA@Bh(5VOG;GzKvw{bGbPn3zCJP*Fp~7{V8c2q8uZF&H&If=2(Rvk89C&F=o@%+B0<
z?zw07=I+z`h7_-l8+J_bO7Lmm(>he5`>$;yl;W+n^EDO|*o1xfAogPop2dlH35Ve=
ztj6#0A^aIfV@0J>ywy0qRw`9gbsS9NgoU&5KskOF7ZYDW?p4)QN@*O66R;WOzEwCL
zd&<8Tkz3S>^7($;Nqi2Qan=KjHAJZ`xQzLgA<fJD(2wgdKT@d(eu8qtkGLGCv0PbM
z3OS`5lw$3|3fzOT(ju<MBUq2$pd@q;r9wkTg_Wzvsm!k;9Q=iAP~z2$(vF{@3{Xwo
zWWt#^8Jn>VJ8&bWa0Z^oDR>KC!{K9CExw6z{Y9LKH&L#uVn2&f4(4$18*WC4JI5*2
zg?sTiyoyPTP-m&cQG5}vU?VoOAB!kyH_8Hz(GWYZrZ%i-AMPW*h)>~a%Fu~NCUW`1
z9Ngf<9Q+%f$2pV2679o##7FTI9%lK|v5Dn$;3lMK>TP@h&mcpnYRdK)PDSadt+)aY
zp!C!wT#XeCq`QHG4q9I_I)PC(^(VYTJVg(7sTxJSRuOlhO#B8)$#3I(L+I?Ol#}@4
zv~bJ5z*gcrNbyvJtmP?bL22Gj9FEB%2W+!)%I-$CM;$6(@H%cHehZmP{a&_?*)?%1
z%0$~yn(R1I1a%VG9d#ZT;Fl;9SI_`b>50e#po+^lkPJI;FLvWfynzu`Hj570LA;(v
z;#WL_JF%a-%0T1!dIH-}DzpcO;zvlst4~oXa}`J6b(93Z#jS(wGB+&QHXP0myHHm8
z64J=(1ahr9jep=ZJd9WAyftXe3!CsAlofu3R9)Rg+D471qor9JQ7Um5rRUD!ereZh
z9Pm~<=7-I46c-V{k5o<FMHa1Uxcg6R!>6&ODg4*mkFrI#F@^2TVVC#gTH+s&BC3{0
zNQ8>U@nzx*3zd3B9+!2@){QsuATFgvpTSGG4Qn5zlQBT<QLkc5e#g-mrPU`ea2uA0
zH#{Cr_#IMWHF`<;9}>3{7qJ$<#w25?UpSBzHnxPBZ$y$-$8igOj<UiCohGF$;=u~`
z5-$*^pA7%7=C+5=yMxbi{v6V;YUI*^B_k?ER>nQYG4X6^Le2E{yom*N)->w8(Ye6P
zh<Lrm?T&k1k8Of($98*W2f7?aXGG$T7nt(t*7-5Nt<+gRxwN36s@Rpb18uuW&(By{
z+jDi=IK2U5YCF^GdwoWGIbR3H@3Z43(3YFf8LP+WAm<yMO<P&M3|S1Oqw}8M!$kon
z97pW+g20YBCaStT-D6CzE_gW|*eTZ}m{t$08#}vllND!d$v0ti+;Vly=%klpDz1>>
zZMV<PhUqybn>D`nd~Gt8?F<g*o4B$2Od?vX|Ml8jidHpHAe&4W&|>&Z%yz?Jyrd3C
z3YX;OGBM*1^iCR6t5^6slP|a=5~Q4*PUQ<RFJYN%T3Z>Goh@B%t}EtEl04I%+o=6Q
zqL9(tkT6NNkVx3x|LjISZU_Ih7i%pu%h&g(VN@B;uz1;woVEwcX$_u9<*mSSmrFiY
zjzy*NuE{0j`oRA9tgp#c7r0*1<76st>}=ZhbgB?!Ek}QNQun4k*^=l$F*>=baupk8
z`?~bO!uq1zP|%K3$fgUvW?a%T^I~3*WgIK*u{J9qb6WYpi>IS{8OtTBcv`kjX9{ep
tT+y^xyOIXe7m_(wPI+2J^^NNeX6>i#q?L;*mLA@p@&a$*)Z*64e*iI=yQcsE

delta 1637
zcmYM!Z)jFk7y$6cKW%Gf>8owJwp!DiYjbT&t(k(^)J$tx&Y9XKX8#8HMaU1~Hq2sC
z7-hyjWKmHWfdqqy%Ch{BK}FH0@DDT-V-b-;P{Zo?Frk<G-rqU*p7);fJm<OZ`@6^e
z^hDpO!o>aIv(>lKw_!r|{{Jj4ig3gdr>SgXGuQJn4)99uXF1>FL>^@+kMVN;z$-Y+
zVxHrQh`#t+W0niIx?0Bvnf>RvkV7;iMp(^1IGu%(v2nGWroWnbzng|c|HbPA?9qRP
zEiAs&!p21`;xhBca?AYIjRCf^b5g`yzQg>%cf5@ggqxAAq)V}enXC;Q&&|w8yLmUa
z^D2JET+nf5hECHFqfRyEkCMp|7g*2i*LliPzRP^T2y?<B`J2fCE7-seuH<z*z-xJw
zgFM4p_D&fa|2F67f6g5D3;P;1N^NY~%5{8%_wX<u;*`Qz26nPb|6?|=Lf#ih<x1wl
zciERMyufyLDU97b#5OjUMXcrHyqd?#{Oo#-vo3V9AU~O!9*%M+XLH94>E<9MDb8>M
z&(n}tBP};`8?%NEa5=wZ*3e|>TE#Zr%e~Bn3|CloqfMMI&%e6xfMu;<`!%BC%gl*S
zF;iS$9r1yP*HS%2NzK?6P32<!d6b;!VZIf+n8mt}m+&C%W*oZc;XV!95MN&$aFXlw
zPc!#u(X25yvs%BGInis(qB_B>g`b&k!M|+cG-=C;+n5=?j|x8aFc-L&{p@>PBO|U6
z-dvGA$}RdYs+2!@o;@5<N%^1-uf`JgGc)ulC$LD~bL&c(nJH%xtC<U|<t8p;7WJ!?
zk-qpyBO^UR1slW6iO%saR_Q#;@_O$$-(&-SXGU15Bj{+Ra)=IQk#1*Z;u~hM{lh)1
znm1PLZ?G=Q_Ir&5Zj4g!(d<<aRCMxo_H!G*Vs1_24G|CXDYo%9-pLlTNmBH)OC}HU
zIsM|6h!^-0yE*5^h-dgT?=XK%neWeon`qnPLptKP)7HFib(xtRobJI-GA9~T+L_WL
z%)PI?DdK)Mv5b4^h_{?Fpp(o67kO2zC029AMvY#LjO<5d>Y7@uaJ;`@exW~8#VzFt
qwzEnB+{MQ@o1ZKh+E_Gx($KoX;^Lu&6(wauw=~Zv89Lj#s`x)5lC)a@

diff --git a/rh_ui/translations/cy/LC_MESSAGES/messages.po b/rh_ui/translations/cy/LC_MESSAGES/messages.po
index 5baab0b..51dabce 100644
--- a/rh_ui/translations/cy/LC_MESSAGES/messages.po
+++ b/rh_ui/translations/cy/LC_MESSAGES/messages.po
@@ -24,7 +24,7 @@ msgid "Cookies"
 msgstr "Cwcis"
 
 #: rh_ui/templates/base.html:39
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "To collect information about how you use this website, we "
 "use%(open_cookies_link)s cookies.%(close_link)s</br>\n"
@@ -146,7 +146,6 @@ msgid "Where to find your access code"
 msgstr "Ble i ddod o hyd i'ch cod mynediad"
 
 #: rh_ui/templates/start.html:83
-#, fuzzy
 msgid ""
 "Your access code can be found in the invitation letter or email you "
 "received.\n"
@@ -291,18 +290,14 @@ msgid "reloading the page in case there was a temporary fault with JavaScript"
 msgstr "ail-lwytho’r dudalen rhag ofn bod nam dros dro gyda JavaScript"
 
 #: rh_ui/templates/info_pages/cookies.html:56
-#, fuzzy
 msgid ""
 "We use three types of cookie. You can choose which cookies you're happy "
 "for us to use."
 msgstr ""
-"Gallwch ddewis pa gwcis rydych chi'n fodlon i ni eu defnyddio. Rydyn ni'n"
-" defnyddio dau fath o gwci:"
 
 #: rh_ui/templates/info_pages/cookies.html:58
-#, fuzzy
 msgid "Cookies that measure website use"
-msgstr "Cwcis sy'n cofio eich gosodiadau"
+msgstr ""
 
 #: rh_ui/templates/info_pages/cookies.html:60
 msgid ""
@@ -324,9 +319,8 @@ msgid "what you click on while you're visiting the site"
 msgstr ""
 
 #: rh_ui/templates/info_pages/cookies.html:72
-#, fuzzy
 msgid "Learn more about these Google Analytics cookies"
-msgstr "Rhagor o wybodaeth am y cwcis hanfodol hyn"
+msgstr ""
 
 #: rh_ui/templates/info_pages/cookies.html:75
 msgid "Hide this"
@@ -358,9 +352,8 @@ msgid ""
 msgstr ""
 
 #: rh_ui/templates/info_pages/cookies.html:102
-#, fuzzy
 msgid "2 years"
-msgstr "Blwyddyn"
+msgstr ""
 
 #: rh_ui/templates/info_pages/cookies.html:115
 msgid "24 hours"