diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo | bin | 45040 -> 44968 bytes | |||
| -rw-r--r-- | resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po | 22 | ||||
| -rw-r--r-- | resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo | bin | 41310 -> 41256 bytes | |||
| -rw-r--r-- | resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po | 17 | ||||
| -rw-r--r-- | resources/views/emails/mail.twig | 4 | ||||
| -rw-r--r-- | resources/views/layouts/app.twig | 2 | ||||
| -rw-r--r-- | resources/views/layouts/maintenance.html | 6 | ||||
| -rw-r--r-- | resources/views/layouts/parts/navbar.twig | 2 |
8 files changed, 30 insertions, 23 deletions
diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo Binary files differindex 4909145a..a1765a6b 100644 --- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo +++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po index 54e819c8..263d1641 100644 --- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-12-29 19:01+0100\n" -"PO-Revision-Date: 2018-09-17 12:10+0200\n" +"PO-Revision-Date: 2018-10-05 15:35+0200\n" "Last-Translator: msquare <msquare@notrademark.de>\n" "Language-Team: \n" "Language: de_DE\n" @@ -669,16 +669,18 @@ msgid "Hi %s," msgstr "Hallo %s," #: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:21 -msgid "here is a message for you from the engelsystem:" -msgstr "hier ist eine Nachricht aus dem Engelsystem für Dich:" +#, php-format +msgid "here is a message for you from the %s:" +msgstr "hier ist eine Nachricht aus dem %s für Dich:" #: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:23 +#, php-format msgid "" "This email is autogenerated and has not been signed. You got this email " -"because you are registered in the engelsystem." +"because you are registered in the %s." msgstr "" "Diese E-Mail wurde automatisch generiert und muss daher nicht unterschrieben " -"werden. Du hast diese E-Mail bekommen, weil Du im Engelsystem registriert " +"werden. Du hast diese E-Mail bekommen, weil Du im %s registriert " "bist." #: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:15 @@ -747,11 +749,12 @@ msgid "Your account has been deleted" msgstr "Dein Konto wurde gelöscht." #: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:12 +#, php-format msgid "" -"Your angelsystem account has been deleted. If you have any questions " +"Your %s account has been deleted. If you have any questions " "regarding your account deletion, please contact heaven." msgstr "" -"Dein Engelsystem-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere " +"Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere " "bitte den Himmel." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:10 @@ -1591,10 +1594,11 @@ msgstr "" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:316 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55 +#, php-format msgid "" -"The engelsystem is allowed to send me an email (e.g. when my shifts change)" +"The %s is allowed to send me an email (e.g. when my shifts change)" msgstr "" -"Das Engelsystem darf mir E-Mails senden (z.B. wenn sich meine Schichten " +"Das %s darf mir E-Mails senden (z.B. wenn sich meine Schichten " "ändern)" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:321 diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo Binary files differindex 5ad48984..95251feb 100644 --- a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo +++ b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.mo diff --git a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po index 19b08ad7..e7307e5d 100644 --- a/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po +++ b/resources/lang/pt_BR.UTF.8/LC_MESSAGES/pt_BR.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-04-25 05:23+0200\n" -"PO-Revision-Date: 2018-09-17 12:11+0200\n" +"PO-Revision-Date: 2018-10-05 15:35+0200\n" "Last-Translator: samba <samba@autistici.org>\n" "Language-Team: \n" "Language: pt_BR\n" @@ -560,14 +560,16 @@ msgid "Hi %s," msgstr "Oi %s," #: includes/helper/email_helper.php:12 -msgid "here is a message for you from the engelsystem:" -msgstr "aqui está uma mensagem do engelsystem para você:" +#, php-format +msgid "here is a message for you from the %s:" +msgstr "aqui está uma mensagem do %s para você:" #: includes/helper/email_helper.php:12 +#, php-format msgid "" "This email is autogenerated and has not been signed. You got this email " -"because you are registered in the engelsystem." -msgstr "Você recebeu esse email porque está registrado no engelsystem." +"because you are registered in the %s." +msgstr "Você recebeu esse email porque está registrado no %s." #: includes/mailer/shifts_mailer.php:10 msgid "A Shift you are registered on has changed:" @@ -1344,10 +1346,11 @@ msgstr "" "Esse script criará uma conta no sistema." #: includes/pages/guest_login.php:229 includes/view/User_view.php:50 +#, php-format msgid "" -"The engelsystem is allowed to send me an email (e.g. when my shifts change)" +"The %s is allowed to send me an email (e.g. when my shifts change)" msgstr "" -"Permito que o engelsystem me envie emails (por exemplo, quando meus turnos " +"Permito que o %s me envie emails (por exemplo, quando meus turnos " "mudam)" #: includes/pages/guest_login.php:230 includes/view/User_view.php:51 diff --git a/resources/views/emails/mail.twig b/resources/views/emails/mail.twig index f5ac5860..c99fc104 100644 --- a/resources/views/emails/mail.twig +++ b/resources/views/emails/mail.twig @@ -1,6 +1,6 @@ {{ __('Hi %s,', [user]) }} -{{ __('here is a message for you from the engelsystem:') }} +{{ __('here is a message for you from the %s:', [config('app_name')]) }} {{ message|raw }} -{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the engelsystem.') }} +{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the %s.', [config('app_name')]) }} diff --git a/resources/views/layouts/app.twig b/resources/views/layouts/app.twig index d8f8d10f..ed0d96af 100644 --- a/resources/views/layouts/app.twig +++ b/resources/views/layouts/app.twig @@ -3,7 +3,7 @@ <html lang="{{ session_get('locale')|split('_')[0]|escape('html_attr') }}"> <head> {% block head %} - <title>{% block title %}{{ title }}{% endblock %} - Engelsystem</title> + <title>{% block title %}{{ title }}{% endblock %} - {{ config('app_name') }}</title> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1"> diff --git a/resources/views/layouts/maintenance.html b/resources/views/layouts/maintenance.html index f7ab5772..85b95168 100644 --- a/resources/views/layouts/maintenance.html +++ b/resources/views/layouts/maintenance.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>Maintenance - Engelsystem</title> + <title>Maintenance - %APP_NAME%</title> <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" type="text/css" href="assets/theme0.css"/> @@ -19,7 +19,7 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="#"> - <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong> + <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">%APP_NAME%</strong> </a> </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> @@ -40,7 +40,7 @@ </h1> <div class="col-md-6"> <h2> - The <span class="icon-icon_angel"></span> <strong>ENGELSYSTEM</strong> is in maintenance mode. + The <span class="icon-icon_angel"></span> <strong>%APP_NAME%</strong> is in maintenance mode. </h2> <p>This may be due to...</p> <p> diff --git a/resources/views/layouts/parts/navbar.twig b/resources/views/layouts/parts/navbar.twig index 94df9013..22797a7a 100644 --- a/resources/views/layouts/parts/navbar.twig +++ b/resources/views/layouts/parts/navbar.twig @@ -21,7 +21,7 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="{{ url('/') }}"> - <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">ENGELSYSTEM</strong> + <span class="icon-icon_angel"></span> <strong class="visible-lg-inline">{{ config('app_name')|upper }}</strong> </a> </div> |