Merge branch 'develop' into error_pages_translation

2025-10-12 15:35:15 +00:00 · 2020-05-29 06:41:47 +02:00
parent d319a21b01 69725eb8c3
commit dea9e21382
222 changed files with 8119 additions and 3731 deletions
--- a/resources/views/v1/accounts/reconcile/transactions.twig
+++ b/resources/views/v1/accounts/reconcile/transactions.twig
@@ -20,9 +20,12 @@
        {# start marker #}
        {% if journal.date < start and startSet == false %}
            <tr>
-                <td colspan="5">
+                <td colspan="4">
                    &nbsp;
                </td>
+                <td>
+                    <input type="checkbox" class="check_all_btn">
+                </td>
                <td colspan="3">
                    <span class="label label-default">
                        {{ trans('firefly.start_of_reconcile_period', {period: start.formatLocalized(monthAndDayFormat) }) }}
@@ -38,9 +41,12 @@
        {# end marker #}
        {% if journal.date <= end and endSet == false %}
            <tr>
-                <td colspan="5">
+                <td colspan="4">
                    &nbsp;
                </td>
+                <td>
+                    <input type="checkbox" class="check_all_btn">
+                </td>
                <td colspan="3">
                    <span class="label label-default">
                        {{ trans('firefly.end_of_reconcile_period', {period: end.formatLocalized(monthAndDayFormat) }) }}
--- a/resources/views/v1/budgets/index.twig
+++ b/resources/views/v1/budgets/index.twig
@@ -276,6 +276,11 @@
                                                    </ul>
                                                </div>
                                            </div>
+                                            {% if not budgetLimit.in_range %}
+                                            <small class="text-muted">
+                                                {{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }}
+                                            </small><br>
+                                                {% endif %}
                                            <span class="text-danger budget_warning" data-id="{{ budget.id }}" data-budgetLimit="{{ budgetLimit.id }}"
                                                  style="display:none;"></span>
                                        {% endfor %}
--- a/resources/views/v1/debug.twig
+++ b/resources/views/v1/debug.twig
@@ -15,31 +15,43 @@
 <textarea rows="30" cols="100" name="debug_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
 Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION }}**.

-| Variable | Content |
+| Scope | Version |
+| --- | --- |
+| Firefly III | {{ FF_VERSION }} |
+| Firefly III API | {{ config('firefly.api_version') }} |
+| PHP | {{ phpVersion }} |
+| Host | {{ phpOs }} |
+
+| System info | Value |
 | --- | --- |
-| FF version | {{ FF_VERSION }} |
-| FF API version | {{ config('firefly.api_version') }} |
 | Installation ID | {{ installationId }} |
+| Using docker? | {% if isDocker %}true{% else %}false{% endif %} |
+| Telemetry | {% if telemetry %}true{% else%}false{% endif%} |
 | App environment | {{ appEnv }} |
 | App debug mode | {{ appDebug }} |
 | App cache driver | {{ cacheDriver }} |
 | App logging | {{ appLogLevel }}, {{ logChannel }} |
-| PHP version | {{ phpVersion }} |
 | Display errors | {{ displayErrors }} |
-| Session start | {{ session('start') }} |
-| Session end | {{ session('end') }} |
-| Session first | {{ session('first') }} |
 | Error reporting | {{ errorReporting }} |
-| Host | {{ phpOs }} |
 | Interface | {{ interface }} |
-| UserID | {{ Auth.user.id }} |
-{% for code,result in localeAttempts %}
-| Attempt at "{{ code }}" | {{ result }} |
-{% endfor %}
+| Default language | {{ defaultLanguage }} |
+| Default locale | {{ defaultLocale }} |
 | DB drivers | {{ drivers }} |
 | Current driver | {{ currentDriver }} |
 | Login provider | {{ loginProvider }}  |
 | Trusted proxies (.env) | {{ trustedProxies }} |
+
+| User info | Value |
+| --- | --- |
+| Session start | {{ session('start') }} |
+| Session end | {{ session('end') }} |
+| Session first | {{ session('first') }} |
+| User ID | {{ Auth.user.id }} |
+| User language | {{ userLanguage }} |
+| User locale | {{ userLocale }} |
+{% for code,result in localeAttempts %}
+| Attempt at "{{ code }}" | {{ result }} |
+{% endfor %}
 | User agent | {{ userAgent }} |
 </textarea>

--- a/resources/views/v1/emails/access-token-created-html.twig
+++ b/resources/views/v1/emails/access-token-created-html.twig
@@ -1,13 +1,13 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.
+    {{ trans('email.access_token_created_body') }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    With this token, they can access <strong>all</strong> of your financial records through the Firefly III API.
+    {{ trans('email.access_token_created_explanation')|raw }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}.
+    {{ trans('email.access_token_created_revoke', {url: route('profile.index') }) }}
 </p>
 {% include 'emails.footer-html' %}
--- a/resources/views/v1/emails/access-token-created-text.twig
+++ b/resources/views/v1/emails/access-token-created-text.twig
@@ -1,7 +1,7 @@
 {% include 'emails.header-text' %}
-Somebody (hopefully you) just created a new Firefly III API Access Token for your user account.
+{{ trans('email.access_token_created_body')|raw }}

-With this token, they can access all of your financial records through the Firefly III API.
+{{ trans('email.access_token_created_explanation')|striptags|raw }}

-If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}.
+{{ trans('email.access_token_created_revoke', {url: route('profile.index') })|raw }}
 {% include 'emails.footer-text' %}
--- a/resources/views/v1/emails/admin-test-html.twig
+++ b/resources/views/v1/emails/admin-test-html.twig
@@ -1,5 +1,5 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    This is a test message from your Firefly III instance. It was sent to {{ email }}.
+    {{ trans('email.admin_test_body', {email: email })}}
 </p>
 {% include 'emails.footer-html' %}
--- a/resources/views/v1/emails/admin-test-text.twig
+++ b/resources/views/v1/emails/admin-test-text.twig
@@ -1,3 +1,3 @@
 {% include 'emails.header-text' %}
-    This is a test message from your Firefly III instance. It was sent to {{ email }}.
+{{ trans('email.admin_test_body', {email: email })|raw }}
 {% include 'emails.footer-text' %}
--- a/resources/views/v1/emails/confirm-account-html.twig
+++ b/resources/views/v1/emails/confirm-account-html.twig
@@ -1,20 +0,0 @@
-{% include 'emails.header-html' %}
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is
-    valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
-</p>
-
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    To active your account please follow the link below.
-</p>
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    <strong>PLEASE</strong> verify that this activation link goes to the Firefly III installation you expect it to be:
-</p>
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    <a href="{{ route }}" style="color:#337ab7">{{ route }}</a>
-</p>
-
-<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You should be redirected to the index page right away. The link expires in about four hours.
-</p>
-{% include 'emails.footer-html' %}
--- a/resources/views/v1/emails/confirm-account-text.twig
+++ b/resources/views/v1/emails/confirm-account-text.twig
@@ -1,11 +0,0 @@
-{% include 'emails.header-text' %}
-To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
-
-To active your account please follow the link below.
-
-PLEASE verify that this activation link goes to the Firefly III installation you expect it to be:
-
-{{ route }}
-
-You should be redirected to the index page right away. The link expires in about four hours.
-{% include 'emails.footer-text' %}
--- a/resources/views/v1/emails/confirm-email-change-html.twig
+++ b/resources/views/v1/emails/confirm-email-change-html.twig
@@ -1,15 +1,15 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.
+    {{ trans('email.email_change_body_to_new')}}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The old email addres was: {{ oldEmail }}
+    {{trans('email.email_change_old', { email: oldEmail }) }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The new email address is: <strong>{{ newEmail }}</strong>
+    {{trans('email.email_change_new_strong', { email: newEmail })|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You cannot use Firefly III until you confirm this change. Please follow the link below to do so.
+    {{ trans('email.email_change_instructions')}}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
--- a/resources/views/v1/emails/confirm-email-change-text.twig
+++ b/resources/views/v1/emails/confirm-email-change-text.twig
@@ -1,9 +1,10 @@
 {% include 'emails.header-text' %}
-You or somebody with access to your Firefly III account has changed your email address. If you did not expect this message, please ignore and delete it.
+{{ trans('email.email_change_body_to_new')|raw }}

-The old email addres was: {{ oldEmail }}
+{{trans('email.email_change_old', { email: oldEmail })|raw }}

-The new email address is: {{ newEmail }}
+{{trans('email.email_change_new', { email: newEmail })|raw }}

-You cannot use Firefly III until you confirm this change. Please follow the link to do so: {{ uri }}
+{{ trans('email.email_change_instructions')|raw }}
+{{ uri }}
 {% include 'emails.footer-text' %}
--- a/resources/views/v1/emails/error-html.twig
+++ b/resources/views/v1/emails/error-html.twig
@@ -1,46 +1,44 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Firefly III v{{ version }} ran into an error: <span style="font-family: monospace;">{{ errorMessage }}</span>
+    {{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|raw }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The error was of type "{{ class }}".
+    {{ trans('email.error_type', {class: class }) }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The error occured on/at: {{ time }}.
+    {{ trans('email.error_timestamp', {time: time }) }}
+
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    This error occured in file <span style="font-family: monospace;">{{ file }}</span> on line {{ line }} with code {{ code }}.
+    {{ trans('email.error_location', { file: file, line: line, code: code })|raw }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
    {% if loggedIn %}
-        The error was encountered by user #{{ user.id }}, <a href="mailto:{{ user.email }}">{{ user.email }}</a>.
+        {{ trans('email.error_user', { id: user.id, email: user.email })|raw }}
    {% else %}
-        There was no user logged in for this error or no user was detected.
+        {{ trans('email.error_no_user') }}
    {% endif %}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The IP address related to this error is: {{ ip }}<br />
-    URL is: {{ url }}<br>
-    User agent: {{ userAgent }}
+    {{ trans('email.error_ip', { ip: ip }) }}<br />
+    {{ trans('email.error_url', {url :url }) }}<br />
+    {{ trans('email.error_user_agent', {userAgent: userAgent }) }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The full stacktrace is below. If you think this is a bug in Firefly III, you
-    can forward this message to
-    <a href="mailto:james@firefly-iii.org?subject=BUG!">james@firefly-iii.org</a>.
-    This can help fix the bug you just encountered.
+    {{ trans('email.error_stacktrace')|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.
+    {{ trans('email.error_github_html')|raw }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The full stacktrace is below:</p>
+    {{ trans('email.error_stacktrace_below') }}</p>
 <p style="font-family: monospace;font-size:11px;color:#aaa">
    {{ stackTrace|nl2br }}
 </p>
--- a/resources/views/v1/emails/error-text.twig
+++ b/resources/views/v1/emails/error-text.twig
@@ -1,31 +1,27 @@
 {% include 'emails.header-text' %}
-Firefly III v{{ version }} ran into an error: {{ errorMessage }}.
+{{ trans('email.error_intro', { version: version, errorMessage: errorMessage })|striptags|raw }}

-The error was of type "{{ class }}".
+{{ trans('email.error_type', {class: class })|raw }}

-The error occured on/at: {{ time }}.
+{{ trans('email.error_timestamp', {time: time })|raw }}

-This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}.
+{{ trans('email.error_location', { file: file , line: line, code: code })|striptags|raw }}

 {% if loggedIn %}
-    The error was encountered by user #{{ user.id }}, {{ user.email }}.
+{{     trans('email.error_user', { id: user.id, email: user.email })|striptags|raw }}
 {% else %}
-    There was no user logged in for this error or no user was detected.
+{{     trans('email.error_no_user')|raw }}
 {% endif %}

-The IP address related to this error is: {{ ip }}
-URL is: {{ url }}
-User agent: {{ userAgent }}
+{{ trans('email.error_ip', { ip: ip }) }}
+{{ trans('email.error_url', {url :url}) }}
+{{ trans('email.error_user_agent', {userAgent: userAgent } ) }}

-The full stacktrace is below. If you think this is a bug in Firefly III, you
-can forward this message to james@firefly-iii.org. This can help fix
-the bug you just encountered.
+{{ trans('email.error_stacktrace')|striptags|raw }}

-If you prefer, you can also open a new issue here:
+{{ trans('email.error_github_text' )|raw }}

-https://github.com/firefly-iii/firefly-iii/issues
+{{ trans('email.error_stacktrace_below')|raw }}

-The full stacktrace is below:
-
-{{ stackTrace }}
+{{ stackTrace|raw }}
 {% include 'emails.footer-text' %}
--- a/resources/views/v1/emails/footer-html.twig
+++ b/resources/views/v1/emails/footer-html.twig
@@ -1,12 +1,12 @@
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Beep boop,
+    {{ trans('email.closing') }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The Firefly III Mail Robot
+    {{ trans('email.signature') }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
-    PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it.
+    {{ trans('email.footer_ps', {ipAddress: ipAddress}) }}
 </p>

 </body>
--- a/resources/views/v1/emails/footer-text.twig
+++ b/resources/views/v1/emails/footer-text.twig
@@ -1,6 +1,6 @@

-Beep boop,
+{{ trans('email.closing')|raw }}

-The Firefly III Mail Robot
+{{ trans('email.signature')|raw }}

-PS: This message was sent because a request from IP {{ ip }}{{ userIp }}{{ ipAddress }} triggered it.
+{{ trans('email.footer_ps', {ipAddress: ipAddress})|raw }}
--- a/resources/views/v1/emails/header-html.twig
+++ b/resources/views/v1/emails/header-html.twig
@@ -6,5 +6,5 @@
 </head>
 <body>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Hi there,
+    {{ trans('email.greeting') }}
 </p>
--- a/resources/views/v1/emails/header-text.twig
+++ b/resources/views/v1/emails/header-text.twig
@@ -1,2 +1,2 @@
-Hi there,
+{{ trans('email.greeting')|raw }}

--- a/resources/views/v1/emails/oauth-client-created-html.twig
+++ b/resources/views/v1/emails/oauth-client-created-html.twig
@@ -1,14 +1,13 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}"
-    and has callback URL <span style="font-family: monospace;">{{ client.redirect }}</span>.
+    {{ trans('email.oauth_created_body', { name:client.name, url: client.redirect })|raw }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    With this client, they can access <strong>all</strong> of your financial records through the Firefly III API.
+    {{ trans('email.oauth_created_explanation')|raw }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}.
+    {{ trans('email.oauth_created_undo', { url:route('profile.index')}) }}
 </p>
 {% include 'emails.footer-html' %}
--- a/resources/views/v1/emails/oauth-client-created-text.twig
+++ b/resources/views/v1/emails/oauth-client-created-text.twig
@@ -1,9 +1,7 @@
 {% include 'emails.header-text' %}
-Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" and has callback URL:
+{{ trans('email.oauth_created_body', {name:  client.name, url: client.redirect })|striptags|raw }}

-{{ client.redirect }}
+{{ trans('email.oauth_created_explanation')|striptags|raw }}

-With this client, they can access <strong>all</strong> of your financial records through the Firefly III API.
-
-If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}.
+{{ trans('email.oauth_created_undo', { url:route('profile.index')})|raw }}
 {% include 'emails.footer-text' %}
--- a/resources/views/v1/emails/password-html.twig
+++ b/resources/views/v1/emails/password-html.twig
@@ -1,10 +1,10 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Somebody tried to reset your password. If it was you, please follow the link below to do so.
+    {{ trans('email.reset_pw_instructions') }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    <strong>PLEASE</strong> verify that the link actually goes to the Firefly III you expect it to go!
+    {{ trans('email.reset_pw_warning')|raw }}
 </p>

 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
--- a/resources/views/v1/emails/password-text.twig
+++ b/resources/views/v1/emails/password-text.twig
@@ -1,7 +1,7 @@
 {% include 'emails.header-text' %}
-Somebody tried to reset your password. If it was you, please follow the link below to do so.
+{{ trans('email.reset_pw_instructions')|raw }}

-PLEASE verify that the link actually goes to the Firefly III you expect it to go!
+{{ trans('email.reset_pw_warning')|striptags|raw }}

 {{ url }}
 {% include 'emails.footer-text' %}
--- a/resources/views/v1/emails/registered-html.twig
+++ b/resources/views/v1/emails/registered-html.twig
@@ -1,18 +1,20 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    Welcome to <a style="color:#337ab7" href="{{ address }}">Firefly III</a>. Your registration has made it, and this email is here to confirm it. Yay!
+    {{ trans('email.registered_welcome', {address: address})|raw }}
 </p>

 <ul>
    <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-        If you have forgotten your password already, please reset it using
-        <a style="color:#337ab7" href="{{ address }}/password/reset">the password reset tool</a>.
+        {{ trans('email.registered_pw', {address: address})|raw }}
    </li>
    <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-        There is a help-icon in the top right corner of each page. If you need help, click it!
+        {{ trans('email.registered_help')}}
    </li>
    <li style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-        If you haven't already, please read the <a style="color:#337ab7" href="https://docs.firefly-iii.org/about-firefly-iii/grand-theory">grand theory</a>.
+        {{ trans('email.registered_doc_html')|raw }}
    </li>
 </ul>
+<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
+    {{ trans('email.registered_closing')}}
+</p>
 {% include 'emails.footer-html' %}
--- a/resources/views/v1/emails/registered-text.twig
+++ b/resources/views/v1/emails/registered-text.twig
@@ -1,19 +1,20 @@
 {% include 'emails.header-text' %}
-Welcome to Firefly III. Your registration has made it, and this email is here to confirm it. Yay!

-* If you have forgotten your password already, please reset it using the password reset tool.
-* There is a help-icon in the top right corner of each page. If you need help, click it!
-* If you haven't already, please read the first use guide and the full description.
+{{ trans('email.registered_welcome')|striptags|raw }}

-Enjoy!
+* {{ trans('email.registered_pw')|striptags|raw }}
+* {{ trans('email.registered_help')|raw }}
+* {{ trans('email.registered_doc_text')|raw }}

-Firefly III:
+{{ trans('email.registered_closing')|raw }}
+
+{{ trans('email.registered_firefly_iii_link')|raw }}
 {{ address }}

-Password reset:
+{{ trans('email.registered_pw_reset_link')|raw }}
 {{ address }}/password/reset

-Documentation:
+{{ trans('email.registered_doc_link')}}
 https://github.com/firefly-iii/firefly-iii
 https://firefly-iii.org/

--- a/resources/views/v1/emails/report-new-journals-html.twig
+++ b/resources/views/v1/emails/report-new-journals-html.twig
@@ -1,11 +1,6 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    {% if transformed|length == 1 %}
-        Firefly III has created a transaction for you. You can find it in your Firefly III installation:
-    {% endif %}
-    {% if transformed|length > 1 %}
-        Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:
-    {% endif %}
+    {{ trans_choice('email.new_journals_header', transformed|length ) }}
 </p>

 <!-- loop groups -->
--- a/resources/views/v1/emails/report-new-journals-text.twig
+++ b/resources/views/v1/emails/report-new-journals-text.twig
@@ -1,6 +1,5 @@
 {% include 'emails.header-text' %}
-{% if transformed|length == 1 %}Firefly III has created a transaction for you. You can find it in your Firefly III installation:{% endif %}
-{% if transformed|length > 1 %}Firefly III has created {{ groups.count }} transactions for you. You can find them in your Firefly III installation:{% endif %}
+{{ trans_choice('email.new_journals_header', transformed|length )|raw }}


 {% for group in transformed %}
--- a/resources/views/v1/emails/undo-email-change-html.twig
+++ b/resources/views/v1/emails/undo-email-change-html.twig
@@ -1,18 +1,17 @@
 {% include 'emails.header-html' %}
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    You or somebody with access to your Firefly III account has changed your email address.
-    If you did not expect this to happen, you <strong>must</strong> follow the "undo"-link below to protect your account!
+    {{ trans('email.email_change_body_to_old')|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    If you initiated this change, you may safely ignore this message.
+    {{ trans('email.email_change_ignore') }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The old email addres was: <strong>{{ oldEmail }}</strong>
+    {{trans('email.email_change_old_strong', { email: oldEmail })|raw }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    The new email address is: {{ newEmail }}
+    {{trans('email.email_change_new', { email: newEmail }) }}
 </p>
 <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
-    To undo the change, follow this link: <a href="{{ uri }}">{{ uri }}</a>
+    {{trans('email.email_change_undo_link')}} <a href="{{ uri }}">{{ uri }}</a>
 </p>
 {% include 'emails.footer-html' %}
--- a/resources/views/v1/emails/undo-email-change-text.twig
+++ b/resources/views/v1/emails/undo-email-change-text.twig
@@ -1,12 +1,11 @@
 {% include 'emails.header-text' %}
-You or somebody with access to your Firefly III account has changed your email address. If you did not expect this to happen,
-you must follow the "undo"-link below to protect your account!
+{{ trans('email.email_change_body_to_old')|striptags|raw }}

-If you initiated this change, you may safely ignore this message.
+{{ trans('email.email_change_ignore')|raw }}

-The old email addres was: {{ oldEmail }}
+{{trans('email.email_change_old', { email: oldEmail })|raw }}

-The new email address is: {{ newEmail }}
+{{trans('email.email_change_new', { email: newEmail })|raw }}

-To undo the change, follow this link: {{ uri }}
+{{ trans('email.email_change_undo_link')|raw }} {{ uri }}
 {% include 'emails.footer-text' %}
--- a/resources/views/v1/list/groups.twig
+++ b/resources/views/v1/list/groups.twig
@@ -104,7 +104,7 @@ TODO: hide and show columns
                    {% endif %}

                    {% if transaction.transaction_type_type == 'Transfer' %}
-                        <i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Deposit') }}"></i>
+                        <i class="fa fa-exchange fa-fw" title="{{ trans('firefly.Transfer') }}"></i>
                    {% endif %}

                    {% if transaction.transaction_type_type == 'Reconciliation' %}
--- a/resources/views/v1/preferences/index.twig
+++ b/resources/views/v1/preferences/index.twig
@@ -69,6 +69,8 @@
                                                </select>
                                            </div></div>
                                        <ul class="text-warning">
+
+                                            {% if IS_DEMO_SITE %}<li class="text-danger">{{ 'pref_locale_no_demo'|_ }}</li>{% endif %}
                                            <li>{{ 'pref_locale_no_windows'|_ }}</li>
                                            <li>{{ 'pref_locale_no_docker'|_ }}</li>
                                        </ul>