CERT-Polska · kazet · Jan 9, 2024 · Jan 9, 2024 · Jan 9, 2024 · Jan 9, 2024
diff --git a/.github/screenshots/check_results.png b/.github/screenshots/check_results.png
diff --git a/app/templates/check_domain.html b/app/templates/check_domain.html
@@ -6,7 +6,7 @@
             <div class="col-lg mb-4">
                 <div class="card">
                     <div class="card-body">
-                        <h5 class="card-title">{% trans %}Check a domain{% endtrans %}</h5>
+                        <h5 class="card-title">{% trans %}Check domain{% endtrans %}</h5>
                         <form action="{{ url_for('check_domain_scan_post') }}" method="POST" class="card-text">
                             <div class="form-group">
                                 <label for="domain-input">{% trans %}Domain{% endtrans %}</label>

diff --git a/app/templates/check_email.html b/app/templates/check_email.html
@@ -41,7 +41,7 @@
             <div class="col-lg mb-4">
                 <div class="card">
                     <div class="card-body">
-                        <h5 class="card-title">{% trans %}Check by sending e-mail{% endtrans %}</h5>
+                        <h5 class="card-title">{% trans %}Check configuration by sending an e-mail{% endtrans %}</h5>
                         <div class="card-text">
                             <label for="email-input">
                                 {{ _("To verify e-mail configuration, send any e-mail message to the address <b>shown below</b>:")|safe }}

diff --git a/app/templates/check_results.html b/app/templates/check_results.html
@@ -110,7 +110,7 @@ <h3>
                                 {{ gettext("(e-mail message from %(date_str)s)", date_str=result.message_timestamp.strftime("%Y-%m-%d %H:%M:%S")) }}{% endif %}.<br/><br/>
                         </span>
 
-                        {% trans %}If you want to share the check results, please copy the following link:{% endtrans %}
+                        {% trans %}If you want to share check results, copy the following link:{% endtrans %}
                         <div class="input-group with-margin">
                             <input type="text" readonly value="{{ url }}" class="form-control" />
                             {{ copy_button(url) }}
@@ -136,7 +136,7 @@ <h3>
                             {% else %}
                                 {% trans %}mechanisms{% endtrans %}
                             {% endif %}
-                            {% trans %}of{% endtrans %}
+                            {% trans %}out of{% endtrans %}
                             {{ result.num_checked_mechanisms }}
                             {% if result.num_correct_mechanisms == 0 %}
                                 {{ pgettext("zero", "configured") }}

diff --git a/app/templates/root.html b/app/templates/root.html
@@ -3,19 +3,17 @@
 {% block check_by_sending_email %}
     <div class="card h-100 card-highlight">
         <div class="card-body d-flex flex-column">
-            <h5 class="card-title">{% trans %}Check your configuration by sending an e-mail{% endtrans %}</h5>
+            <h5 class="card-title">{% trans %}Check configuration by sending an e-mail{% endtrans %}</h5>
             <div class="card-text">
                 <p>
                     {% trans trimmed %}
-                        If you send a test e-mail to a specific address, the system will verify whether the
-                        <b>SPF</b>, <b>DKIM</b> and&nbsp;<b>DMARC</b> mechanisms are set up correctly.
+                        Verify your <b>DKIM</b>, <b>DMARC</b>, and <b>SPF</b> settings by sending a test e-mail.
                     {% endtrans %}
                 </p>
                 <p>
                     <b>
                         {% trans trimmed %}
-                            This path is recommended - when you send a test e-mail, we will be able to perform
-                            more accurate checks than using a domain.
+                            This is the recommended path. Sending a test e-mail allows us to perform more accurate analysis.
                         {% endtrans %}
                     </b>
                 </p>
@@ -28,16 +26,16 @@ <h5 class="card-title">{% trans %}Check your configuration by sending an e-mail{
 {% block check_domain %}
     <div class="card h-100 card-highlight">
         <div class="card-body d-flex flex-column">
-            <h5 class="card-title">{% trans %}Check a domain{% endtrans %}</h5>
+            <h5 class="card-title">{% trans %}Check domain{% endtrans %}</h5>
             <div class="card-text">
                 <p>
                     {% trans trimmed %}
-                        You may also verify the configuration by providing a domain. In that case, only the <b>SPF</b>
-                        and <b>DMARC</b> mechanisms will be checked - to check DKIM, you need to send a test e-mail.
+                        Verify your SPF and DMARC settings by providing a domain. Note: only the <b>SPF</b>
+                        and <b>DMARC</b> mechanisms will be checked. To check DKIM, you need to send a test e-mail.
                     {% endtrans %}
                 </p>
             </div>
-            <a href="{{ url_for('check_domain_form') }}" class="btn btn-primary mt-auto">{% trans %}Check a domain{% endtrans %}</a>
+            <a href="{{ url_for('check_domain_form') }}" class="btn btn-primary mt-auto">{% trans %}Check domain{% endtrans %}</a>
         </div>
     </div>
 {% endblock %}
diff --git a/app/translations/en_US/LC_MESSAGES/messages.po b/app/translations/en_US/LC_MESSAGES/messages.po
@@ -14,9 +14,9 @@ msgstr ""
 msgid "Copied"
 msgstr ""
 
-#: app/templates/check_domain.html:9 app/templates/root.html:31
-#: app/templates/root.html:40
-msgid "Check a domain"
+#: app/templates/check_domain.html:9 app/templates/root.html:29
+#: app/templates/root.html:38
+msgid "Check domain"
 msgstr ""
 
 #: app/templates/check_domain.html:12 app/templates/check_results.html:74
@@ -34,8 +34,8 @@ msgstr ""
 msgid "Check"
 msgstr ""
 
-#: app/templates/check_email.html:44
-msgid "Check by sending e-mail"
+#: app/templates/check_email.html:44 app/templates/root.html:6
+msgid "Check configuration by sending an e-mail"
 msgstr ""
 
 #: app/templates/check_email.html:47
@@ -139,7 +139,7 @@ msgid "(e-mail message from %(date_str)s)"
 msgstr ""
 
 #: app/templates/check_results.html:113
-msgid "If you want to share the check results, please copy the following link:"
+msgid "If you want to share check results, copy the following link:"
 msgstr ""
 
 #: app/templates/check_results.html:129
@@ -160,7 +160,7 @@ msgid "mechanisms"
 msgstr ""
 
 #: app/templates/check_results.html:139
-msgid "of"
+msgid "out of"
 msgstr ""
 
 #: app/templates/check_results.html:142
@@ -240,30 +240,25 @@ msgid ""
 "detected only if earlier checks complete successfully."
 msgstr ""
 
-#: app/templates/root.html:6
-msgid "Check your configuration by sending an e-mail"
-msgstr ""
-
 #: app/templates/root.html:9
 msgid ""
-"If you send a test e-mail to a specific address, the system will verify "
-"whether the <b>SPF</b>, <b>DKIM</b> and&nbsp;<b>DMARC</b> mechanisms are "
-"set up correctly."
+"Verify your <b>DKIM</b>, <b>DMARC</b>, and <b>SPF</b> settings by sending"
+" a test e-mail."
 msgstr ""
 
-#: app/templates/root.html:16
+#: app/templates/root.html:15
 msgid ""
-"This path is recommended - when you send a test e-mail, we will be able "
-"to perform more accurate checks than using a domain."
+"This is the recommended path. Sending a test e-mail allows us to perform "
+"more accurate analysis."
 msgstr ""
 
-#: app/templates/root.html:23
+#: app/templates/root.html:21
 msgid "Send an e-mail"
 msgstr ""
 
-#: app/templates/root.html:34
+#: app/templates/root.html:32
 msgid ""
-"You may also verify the configuration by providing a domain. In that "
-"case, only the <b>SPF</b> and <b>DMARC</b> mechanisms will be checked - "
-"to check DKIM, you need to send a test e-mail."
+"Verify your SPF and DMARC settings by providing a domain. Note: only the "
+"<b>SPF</b> and <b>DMARC</b> mechanisms will be checked. To check DKIM, "
+"you need to send a test e-mail."
 msgstr ""
diff --git a/app/translations/messages.pot b/app/translations/messages.pot
@@ -14,9 +14,9 @@ msgstr ""
 msgid "Copied"
 msgstr ""
 
-#: app/templates/check_domain.html:9 app/templates/root.html:31
-#: app/templates/root.html:40
-msgid "Check a domain"
+#: app/templates/check_domain.html:9 app/templates/root.html:29
+#: app/templates/root.html:38
+msgid "Check domain"
 msgstr ""
 
 #: app/templates/check_domain.html:12 app/templates/check_results.html:74
@@ -34,8 +34,8 @@ msgstr ""
 msgid "Check"
 msgstr ""
 
-#: app/templates/check_email.html:44
-msgid "Check by sending e-mail"
+#: app/templates/check_email.html:44 app/templates/root.html:6
+msgid "Check configuration by sending an e-mail"
 msgstr ""
 
 #: app/templates/check_email.html:47
@@ -139,7 +139,7 @@ msgid "(e-mail message from %(date_str)s)"
 msgstr ""
 
 #: app/templates/check_results.html:113
-msgid "If you want to share the check results, please copy the following link:"
+msgid "If you want to share check results, copy the following link:"
 msgstr ""
 
 #: app/templates/check_results.html:129
@@ -160,7 +160,7 @@ msgid "mechanisms"
 msgstr ""
 
 #: app/templates/check_results.html:139
-msgid "of"
+msgid "out of"
 msgstr ""
 
 #: app/templates/check_results.html:142
@@ -240,30 +240,25 @@ msgid ""
 "detected only if earlier checks complete successfully."
 msgstr ""
 
-#: app/templates/root.html:6
-msgid "Check your configuration by sending an e-mail"
-msgstr ""
-
 #: app/templates/root.html:9
 msgid ""
-"If you send a test e-mail to a specific address, the system will verify "
-"whether the <b>SPF</b>, <b>DKIM</b> and&nbsp;<b>DMARC</b> mechanisms are "
-"set up correctly."
+"Verify your <b>DKIM</b>, <b>DMARC</b>, and <b>SPF</b> settings by sending"
+" a test e-mail."
 msgstr ""
 
-#: app/templates/root.html:16
+#: app/templates/root.html:15
 msgid ""
-"This path is recommended - when you send a test e-mail, we will be able "
-"to perform more accurate checks than using a domain."
+"This is the recommended path. Sending a test e-mail allows us to perform "
+"more accurate analysis."
 msgstr ""
 
-#: app/templates/root.html:23
+#: app/templates/root.html:21
 msgid "Send an e-mail"
 msgstr ""
 
-#: app/templates/root.html:34
+#: app/templates/root.html:32
 msgid ""
-"You may also verify the configuration by providing a domain. In that "
-"case, only the <b>SPF</b> and <b>DMARC</b> mechanisms will be checked - "
-"to check DKIM, you need to send a test e-mail."
+"Verify your SPF and DMARC settings by providing a domain. Note: only the "
+"<b>SPF</b> and <b>DMARC</b> mechanisms will be checked. To check DKIM, "
+"you need to send a test e-mail."
 msgstr ""
diff --git a/app/translations/pl_PL/LC_MESSAGES/messages.po b/app/translations/pl_PL/LC_MESSAGES/messages.po
@@ -14,9 +14,9 @@ msgstr "przejdź do strony głównej."
 msgid "Copied"
 msgstr "Skopiowano"
 
-#: app/templates/check_domain.html:9 app/templates/root.html:31
-#: app/templates/root.html:40
-msgid "Check a domain"
+#: app/templates/check_domain.html:9 app/templates/root.html:29
+#: app/templates/root.html:38
+msgid "Check domain"
 msgstr "Sprawdź domenę"
 
 #: app/templates/check_domain.html:12 app/templates/check_results.html:74
@@ -34,8 +34,8 @@ msgstr "Nie podawaj całego adresu email, jedynie część po znaku \"@\""
 msgid "Check"
 msgstr "Sprawdź"
 
-#: app/templates/check_email.html:44
-msgid "Check by sending e-mail"
+#: app/templates/check_email.html:44 app/templates/root.html:6
+msgid "Check configuration by sending an e-mail"
 msgstr "Sprawdź wysyłając e-mail"
 
 #: app/templates/check_email.html:47
@@ -149,7 +149,7 @@ msgid "(e-mail message from %(date_str)s)"
 msgstr "(wiadomość e-mail z %(date_str)s)"
 
 #: app/templates/check_results.html:113
-msgid "If you want to share the check results, please copy the following link:"
+msgid "If you want to share check results, copy the following link:"
 msgstr ""
 "Jeśli chcą Państwo udostępnić wyniki sprawdzenia, prosimy skopiować ten "
 "link:"
@@ -172,7 +172,7 @@ msgid "mechanisms"
 msgstr "mechanizmy"
 
 #: app/templates/check_results.html:139
-msgid "of"
+msgid "out of"
 msgstr "z"
 
 #: app/templates/check_results.html:142
@@ -267,38 +267,33 @@ msgstr ""
 "Po poprawie błędów prosimy ponowić skanowanie - niektóre błędy mogą "
 "zostać znalezione dopiero po udanym wykonaniu wcześniejszych testów."
 
-#: app/templates/root.html:6
-msgid "Check your configuration by sending an e-mail"
-msgstr "Sprawdź konfigurację wysyłając wiadomość e-mail"
-
 #: app/templates/root.html:9
 msgid ""
-"If you send a test e-mail to a specific address, the system will verify "
-"whether the <b>SPF</b>, <b>DKIM</b> and&nbsp;<b>DMARC</b> mechanisms are "
-"set up correctly."
+"Verify your <b>DKIM</b>, <b>DMARC</b>, and <b>SPF</b> settings by sending"
+" a test e-mail."
 msgstr ""
 "Gdy wyślesz testową wiadomość e-mail na specjalny adres, system "
 "zweryfikuje poprawność konfiguracji mechanizmów <b>SPF</b>, <b>DKIM</b> "
 "i&nbsp;<b>DMARC</b>."
 
-#: app/templates/root.html:16
+#: app/templates/root.html:15
 msgid ""
-"This path is recommended - when you send a test e-mail, we will be able "
-"to perform more accurate checks than using a domain."
+"This is the recommended path. Sending a test e-mail allows us to perform "
+"more accurate analysis."
 msgstr ""
 "Ta ścieżka jest przez nas rekomendowana – dzięki niej będziemy "
 "w&nbsp;stanie wykonać dokładniejsze sprawdzenie, niż korzystając "
 "z&nbsp;domeny."
 
-#: app/templates/root.html:23
+#: app/templates/root.html:21
 msgid "Send an e-mail"
 msgstr "Wyślij e-mail"
 
-#: app/templates/root.html:34
+#: app/templates/root.html:32
 msgid ""
-"You may also verify the configuration by providing a domain. In that "
-"case, only the <b>SPF</b> and <b>DMARC</b> mechanisms will be checked - "
-"to check DKIM, you need to send a test e-mail."
+"Verify your SPF and DMARC settings by providing a domain. Note: only the "
+"<b>SPF</b> and <b>DMARC</b> mechanisms will be checked. To check DKIM, "
+"you need to send a test e-mail."
 msgstr ""
 "Możesz skorzystać także z&nbsp;opcji weryfikacji konfiguracji podając "
 "domenę. W tym wypadku zostaną sprawdzone tylko mechanizmy <b>SPF</b> "