Merge remote-tracking branch 'default-theme/main'

templates/contact_form.html

@@ -3,13 +3,13 @@
 
 <div class="row">
     <div class="col-md-6">
-        <h4>{{ _('Company information')}}</h4>
+        <h4>{{ _('Name of the Operator')}}</h4>
         {% bootstrap_field wizard.form.company_name show_label=False placeholder=_("Name") %}
     </div>
 </div>
 <div class="row">
     <div class="col-md-6">
-        <h4>{{ _('Person in charge of the incident notification')}}</h4>
+        <h4>{{ _('Incident Notification Manager')}}</h4>
         <div class="row">
             <div class="col-md-6">
                 {% bootstrap_field wizard.form.contact_firstname show_label=False placeholder=_("First name") %}
@@ -23,7 +23,7 @@ <h4>{{ _('Person in charge of the incident notification')}}</h4>
         </div>
         <div class="row">
             <div class="col-md-6">
-                {% bootstrap_field wizard.form.contact_email show_label=False placeholder=_("E-mail") %}
+                {% bootstrap_field wizard.form.contact_email show_label=False placeholder=_("Email") %}
             </div>
             <div class="col-md-6">
                 {% bootstrap_field wizard.form.contact_telephone show_label=False placeholder=_("Telephone") %}
@@ -35,7 +35,7 @@ <h4>{{ _('Person in charge of the incident notification')}}</h4>
     <div class="col-md-6">
         <h4>{{ _('Technical contact')}}</h4>
         <div class="d-flex d-inline m-2 form-switch">
-                {% translate "Is the same person responsible for the technical aspect?" as translated_label %}
+                {% translate "Is the incident notification manager also the technical contact?" as translated_label %}
                 {% bootstrap_label translated_label label_class="pe-4" %}
                 {% bootstrap_field wizard.form.is_technical_the_same show_label=False%}
         </div>
@@ -52,7 +52,7 @@ <h4>{{ _('Technical contact')}}</h4>
         </div>
         <div class="row">
             <div class="col-md-6">
-                {% bootstrap_field wizard.form.technical_email show_label=False placeholder=_("E-mail") %}
+                {% bootstrap_field wizard.form.technical_email show_label=False placeholder=_("Email") %}
             </div>
             <div class="col-md-6">
                 {% bootstrap_field wizard.form.technical_telephone show_label=False placeholder=_("Telephone") %}

templates/cookiebanner/bootstrap5.html

@@ -57,7 +57,7 @@ <h3 class="modal-title text-white fw-bold" id="cookiebannerModalLabel">{{ cb_set
           <p class="text-left">{{ cb_settings.footer_text|safe }}</p>
         {% endif %}
         <input type="submit" name="enable_all" class="cookiebannerSubmit btn btn-primary mx-auto text-white fw-bold"
-               value="{{ _('Do not display anymore') }}">
+               value="{{ _('Accept') }}">
         <nav class="cookie-footer-links">
           {% for link in cb_settings.footer_links %}
             <span class="nav-item"><a class="nav-link" href="{{ link.href }}">{{ link.title }}</a></span>

templates/incidents_base.html

@@ -21,14 +21,14 @@
 <link rel="stylesheet" href="{% static 'css/incidents.css' %}" />
 {% endblock %}{% block content %}
 {% block content_title %}
-<h3>{% translate "Reported incidents" %}</h3>
+<h3>{% translate "Overview of reported incidents" %}</h3>
 {% endblock %}
 {% settings_value "TIME_ZONE" as time_zone %}
 <div class="d-flex {% if is_regulator and not is_regulator_incidents or is_observer %}justify-content-end{% else %}justify-content-between{% endif %}">
     {% if not is_regulator and not is_observer or is_regulator_incidents %}
     <div>
         <a role="button" class="btn btn-primary btn-sm" href="{% url 'declaration' %}">
-            {% translate "Report an incident" %}
+            {% translate "Notify an incident" %}
         </a>
     </div>
     {% endif %}
@@ -37,7 +37,7 @@ <h3>{% translate "Reported incidents" %}</h3>
         {% translate "Filter" %}
         {% if is_filtered %}
         <span>
-            ({% translate "Applied" %})
+            ({% translate "Active" %})
         </span>
         {% endif %}
         <i class="bi bi-funnel-fill"></i>
@@ -47,18 +47,16 @@ <h3>{% translate "Reported incidents" %}</h3>
     <div id="collapseFilters" class="collapse">
         <form method="get">
             <div class="row">
-                <div class="col-6">
+                <div class="col-3">
                     {% bootstrap_field filter.form.incident_id show_label=True %}
                 </div>
-                <div class="col-6">
+                <div class="col-3">
                     {% bootstrap_field filter.form.incident_status show_label=True %}
                 </div>
-            </div>
-            <div class="row">
-                <div class="col-6">
+                <div class="col-3">
                     {% bootstrap_field filter.form.is_significative_impact show_label=True %}
                 </div>
-                <div class="col-6">
+                <div class="col-3">
                     {% bootstrap_field filter.form.affected_sectors show_label=True wrapper_class="affected-sector-filter" %}
                 </div>
             </div>
@@ -75,13 +73,13 @@ <h3>{% translate "Reported incidents" %}</h3>
 <table id="incidents-table" class="table align-middle table-sm small">
     <thead>
         <tr>
-            <th class="text-start">{% translate "Incident creation date" %}</th>
+            <th class="text-start">{% translate "Incident notification creation date" %}</th>
             <th>{% translate "Reference" %}</th>
             <th>
                 {% if is_observer %}
                 {% translate "Regulator" %}
                 {% else %}
-                {% translate "Regulation" %}
+                {% translate "Legal basis" %}
                 {% endif %}
             </th>
             <th>
@@ -93,11 +91,11 @@ <h3>{% translate "Reported incidents" %}</h3>
             </th>
             <th>{% translate "Sectors" %}</th>
             <th>{% translate "Subsectors" %}</th>
-            <th>
+            <th class="p-0">
                 <table class="table table-borderless table-sm m-0">
                     <tr>
-                        <td>{% translate "Report" %}</td>
-                        <td>{% translate "Status" %}</td>
+                        <td class="col-6">{% translate "Report" %}</td>
+                        <td class="col-6">{% translate "Report status" %}</td>
                     </tr>
                 </table>
             </th>
@@ -152,7 +150,7 @@ <h3>{% translate "Reported incidents" %}</h3>
                     {% endfor %}
                 </ul>
             </td>
-            <td class="table-group-divider"> <!-- Report name and status -->
+            <td class="table-group-divider p-0"> <!-- Report name and status -->
                 {% block content_table_report %}
                 <table class="table table-borderless table-sm m-0">
                     {% for report in incident.get_all_workflows %}
@@ -170,14 +168,14 @@ <h3>{% translate "Reported incidents" %}</h3>
                                 data-incident-ref="{{ incident.incident_id}}"
                                 data-review-url="{% url 'review_workflow' %}?incident_workflow_id="
                                 data-download-url="{% url 'download_incident_report_pdf' 0 %}" data-bs-toggle="modal"
-                                data-bs-target="#report_versions" title="Report versions">
+                                data-bs-target="#report_versions" title="{% translate 'Version control' %}">
                                 <i class="bi bi-clock-history"></i>
                             </button>
                             {% endif %}
                             {% if filtered_workflows %}
                             <a class="btn text-secondary p-0 {% if not incident_workflows %}ps-1{% endif %} border-0"
                                 href="{% url 'download_incident_report_pdf' filtered_workflows.instance.id %}"
-                                title="Download">
+                                title="{% translate 'Download' %}">
                                 <i class="bi bi-filetype-pdf"></i>
                             </a>
                             {% endif %}
@@ -222,11 +220,11 @@ <h3>{% translate "Reported incidents" %}</h3>
                 <div class="col d-flex align-items-center">
                     {% block content_table_actions %}
                     <button class="btn text-secondary access_log p-0" data-incident-id="{{ incident.id }}"
-                        title="Access Log">
+                        title="{% translate 'Access log' %}">
                         <i class="bi bi-file-earmark-person h4"></i>
                     </button>
                     <a class="btn text-secondary p-0 border-0" href="{% url 'download_incident_pdf' incident.id %}"
-                        title="Download">
+                        title="{% translate 'Download' %}">
                         <i class="bi bi-filetype-pdf h4"></i>
                     </a>
                     {% endblock %}

templates/modals/contacts_incident.html

@@ -14,9 +14,9 @@ <h4 class="modal-title" id="contacts_incident_label">
             <div class="card-body text-center">
                 <h5 class="card-title" id="contact-name"></h5>
                 <h6 class="card-subtitle text-muted" id="contact-jobtitle"></h6>
-                <h6 class="small card-subtitle text-muted fst-italic" id="card-subtitle-contact">{% translate "Person in charge" %}</h6>
+                <h6 class="small card-subtitle text-muted fst-italic" id="card-subtitle-contact">{% translate "Incident notification manager" %}</h6>
                 <span id="translated-both-contact-text" class="d-none">
-                    {% translate "Person in charge and technical contact" %}
+                    {% translate "Incident notification manager and technical contact" %}
                 </span>
             </div>
             <ul class="list-group list-group-flush bg-white">

templates/modals/delete_incident.html

@@ -12,7 +12,7 @@ <h4 class="modal-title" id="delete_incident_label">
     </div>
     <div class="modal-body">
         <div>
-            {% translate "Are you sure you want to delete the incident?" %}
+            {% translate "Are you sure that you want to delete the incident?" %}
         </div>
     </div>
     <div class="modal-footer">

templates/modals/report_versions.html

@@ -5,7 +5,7 @@
 <div class="modal-content">
     <div class="modal-header bg-primary text-white">
         <h4 class="modal-title" id="report_versions_label">
-            {{ _('Report versions') }}
+            {% translate "Version control" %}
         </h4>
         <button type="button" class="btn-close" data-bs-dismiss="modal"
                 aria-label="Close"></button>

templates/observer/incidents.html

@@ -32,13 +32,13 @@
                 data-download-url="{% url 'download_incident_report_pdf' 0 %}"
                 data-bs-toggle="modal"
                 data-bs-target="#report_versions"
-                title="Report versions">
+                title="{% translate 'Version control' %}">
                 <i class="bi bi-clock-history"></i>
             </button>
             {% endif %}
             {% if filtered_workflows %}
             <a class="btn text-secondary p-0 {% if not incident_workflows %}ps-1{% endif %} border-0" href="{% url 'download_incident_report_pdf' filtered_workflows.instance.id %}"
-                title="Download">
+                title="{% translate 'Download' %}">
                 <i class="bi bi-filetype-pdf"></i>
             </a>
             {% endif %}
@@ -83,7 +83,7 @@
     }'
     data-bs-toggle="modal"
     data-bs-target="#contacts_incident"
-    title="Contacts">
+    title="{% translate 'Contacts' %}">
     <i class="bi bi-person-vcard h4"></i>
 </button>
 {% endblock %}

templates/operator/incidents.html

@@ -45,7 +45,7 @@ <h3>{% translate "My incidents" %}</h3>
                     data-download-url="{% url 'download_incident_report_pdf' 0 %}"
                     data-bs-toggle="modal"
                     data-bs-target="#report_versions"
-                    title="Report versions">
+                    title="{% translate 'Version control' %}">
                     <i class="bi bi-clock-history"></i>
                 </button>
                 {% endif %}
@@ -55,7 +55,7 @@ <h3>{% translate "My incidents" %}</h3>
                     data-workflow-comment="{{ filtered_workflows.comment }}"
                     data-bs-toggle="modal"
                     data-bs-target="#workflow_comment"
-                    title="Comment">
+                    title="{% translate 'Comment' %}">
                     <i class="bi bi-chat-left-text-fill"></i>
                 </button>
                 {% endif %}
@@ -97,7 +97,7 @@ <h3>{% translate "My incidents" %}</h3>
     data-delete-url="{% url 'delete_incident' 0 %}"
     data-bs-toggle="modal"
     data-bs-target="#delete_incident"
-    title="Delete">
+    title="{% translate 'Delete' %}">
     <i class="bi bi-file-earmark-x h4"></i>
 </button>
 {% endif %}

templates/operator/menu.html

@@ -1,17 +1,4 @@
 {% load i18n %} 
-
-<li class="nav-item d-none">
-    <a class="nav-link" href="#">{% translate "Security Objectives" %}</a>
-</li>
-<li class="nav-item d-none">
-    <a class="nav-link" href="#">{% translate "Dependencies" %}</a>
-</li>
-<li class="nav-item d-none">
-    <a class="nav-link" href="#">{% translate "Risk Management" %}</a>
-</li>
-<li class="nav-item d-none">
-    <a class="nav-link" href="#">{% translate "Communication" %}</a>
-</li>
 <li class="nav-item">
     <a class="nav-link" href="{% url 'incidents' %}">{% translate "Incident Notification" %}</a>
 </li>

templates/parts/footer.html

@@ -17,7 +17,7 @@
       <li class="nav-item"><a href="{% if regulator.privacy_policy_url %} {{ regulator.privacy_policy_url }} {% else %} {% url 'privacy' %} {% endif %}"
                                 class="nav-link px-2 text-white"
                                 target="{% if regulator.privacy_policy_url %} _blank {% endif %}"
-                                rel="noopener noreferrer">{% translate "Privacy Policy" %}</a></li>
+                                rel="noopener noreferrer">{% translate "Privacy policy" %}</a></li>
       <li class="nav-item"><a href="{% url 'about' %}" class="nav-link px-2 text-white">{% translate "About" %}</a></li>
       <li class="nav-item"><a href="{% url 'contact' %}" class="nav-link px-2 text-white">{% translate "Contact" %}</a></li>
     </ul>

templates/parts/header.html

@@ -35,7 +35,7 @@
           {% endif %}
           {% if is_staff %}
             <li class="nav-item">
-                <a class="nav-link" href="{% url 'admin:index' %}">{% translate "Administration" %}</a>
+                <a class="nav-link" href="{% url 'admin:index' %}">{% translate "Settings" %}</a>
             </li>
           {% endif %}
           <li class="nav-item dropdown">

templates/registration/login.html

@@ -33,7 +33,7 @@ <h5 class="my-3 py-3">{% trans "Enter your credentials." %}</h5>
             {% csrf_token %}
             <p>{% trans "As a last resort, you can use a backup token:" %}</p>
             <p>
-                {% bootstrap_button name="wizard_goto_step" button_type="submit" button_class="btn-secondary btn-sm" value="backup" content=_("Use Backup Token") %}
+                {% bootstrap_button name="wizard_goto_step" button_type="submit" button_class="btn-secondary btn-sm" value="backup" content=_("Use backup token") %}
             </p>
         </form>
     </div>
@@ -42,10 +42,10 @@ <h5 class="my-3 py-3">{% trans "Enter your credentials." %}</h5>
     {% if wizard.steps.current == 'auth' %}
     <p class="small mb-2 pb-lg-2">
         <a class="text-muted" href="{% url 'password_reset' %}">
-            {% translate "Have you forgotten your password or username?" %}
+            {% translate "Have you forgotten your password?" %}
         </a>
     </p>
-    <p>{% translate "Do you not have an account and need to report an incident?" %}</p>
+    <p>{% translate "No Account? Create one!" %}</p>
     <p>
         <a href="{% url 'registration' %}" class="link-info">
             {% translate "Register" %}

templates/registration/password_reset_confirm.html

@@ -9,8 +9,10 @@
 
 {% block login_content %}
 {% if validlink %}
-    <h5>{% translate "Set a new password!" %}</h5>
-    <p class="text-start">{% translate "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+    <h5>{% translate "Set new password!" %}</h5>
+    <p class="text-start">
+        {% translate "Please enter your new password twice." %}
+    </p>
     <form method="POST" class="text-start">
         {% csrf_token %}
         {% bootstrap_field form.new_password1 show_label=False %}
@@ -21,7 +23,8 @@ <h5>{% translate "Set a new password!" %}</h5>
     </form>
 {% else %}
     <h5>{% translate "Invalid link" %}</h5>
-    <p class="text-start">{% translate "The link for password recovery is invalid, likely because it has already been used. Please submit a new request for password recovery." %}</p>
-
+    <p class="text-start">
+        {% translate "The link for password recovery is invalid. It may have already been used or it has expired. Please submit a new request for password recovery." %}
+    </p>
 {% endif %}
 {% endblock login_content %}

templates/registration/password_reset_done.html

@@ -4,14 +4,16 @@
 {% load i18n %}
 
 {% block bootstrap5_title %}
-    {% block title %}{% translate "E-mail sent" %}{% endblock %}
+    {% block title %}
+        {% translate "Email sent" %}
+    {% endblock %}
 {% endblock %}
 
 {% block login_content %}
-<h5>{% translate "E-mail sent" %}</h5>
+<h5>{% translate "Email sent" %}</h5>
 <div class="text-start">
-    <p>{% translate 'We have sent you instructions to reset your password. Provided an account with the entered e-mail exists, you should receive it shortly.' %}</p>
-    <p>{% translate 'If you have not received an e-mail, please check if it is the e-mail address with which you registered or your spam folder.' %}</p>
+    <p>{% translate 'We have received your request to reset your password. Please check your email for a link to reset your password. The email should arrive within a few minutes.' %}</p>
+    <p>{% translate 'If you do not receive the email, please check your spam or junk folder. Please make sure it is the email address you have registered with.' %}</p>
 </div>
 
 {% endblock login_content %}

templates/registration/password_reset_email.html

@@ -1,5 +1,5 @@
 {% load i18n %}{% autoescape off %}
-{% blocktranslate %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktranslate %}
+{% blocktranslate %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktranslate %}
 
 {% translate "Please go to the following page and set up a new password:" %}
 {% block reset_link %}