summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weimann <mail@michael-weimann.eu>2019-12-01 15:14:52 +0100
committerIgor Scheller <igor.scheller@igorshp.de>2019-12-01 22:18:33 +0100
commitfd90679a7dd95dde94ff30f71d7dc76baa9b1253 (patch)
treeb4004a1aaf7975dcd76e28ebb17e4ca90982736a
parentebef4c5bc36717751806e6d31a0e10bfab0369ca (diff)
Update de po file
-rw-r--r--resources/lang/de_DE/default.po1393
1 files changed, 711 insertions, 682 deletions
diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po
index cb39e5b2..d5a6c59e 100644
--- a/resources/lang/de_DE/default.po
+++ b/resources/lang/de_DE/default.po
@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Engelsystem\n"
-"POT-Creation-Date: 2019-04-28 15:23+0200\n"
-"PO-Revision-Date: 2019-06-13 11:54+0200\n"
-"Last-Translator: msquare <msquare@notrademark.de>\n"
+"POT-Creation-Date: 2019-12-01 15:13+0100\n"
+"PO-Revision-Date: 2019-12-01 15:13+0100\n"
+"Last-Translator: Michael Weimann / weeman <mail@michael-weimann.eu>\n"
"Language-Team: \n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.2.4\n"
"X-Poedit-KeywordsList: __;_e:1,2;translate;translatePlural\n"
"X-Poedit-Basepath: ../../..\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -18,26 +18,273 @@ msgstr ""
"X-Poedit-SearchPath-1: src\n"
"X-Poedit-SearchPath-2: includes\n"
-#: includes/controller/angeltypes_controller.php:13
-#: includes/pages/user_shifts.php:251 includes/sys_menu.php:89
-#: includes/view/AngelTypes_view.php:76 includes/view/AngelTypes_view.php:134
-#: includes/view/User_view.php:832
-msgid "Angeltypes"
-msgstr "Engeltypen"
+#: resources/views/emails/mail.twig:1
+#, python-format
+msgid "Hi %s,"
+msgstr "Hallo %s,"
+
+#: resources/views/emails/mail.twig:3
+#, python-format
+msgid "here is a message for you from the %s:"
+msgstr "hier ist eine Nachricht aus dem %s für Dich:"
+
+#: resources/views/emails/mail.twig:6
+#, python-format
+msgid ""
+"This email is autogenerated and has not been signed. You got this email "
+"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 %s registriert bist."
+
+#: resources/views/emails/password-reset.twig:3
+#, python-format
+msgid "Please visit %s to recover your password."
+msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen"
+
+#: resources/views/errors/403.twig:3
+msgid "Forbidden"
+msgstr "Nicht erlaubt"
+
+#: resources/views/errors/403.twig:5
+msgid "You are not allowed to access this page"
+msgstr "Du darfst diese Seite nicht aufrufen"
+
+#: resources/views/errors/404.twig:3 src/Middleware/LegacyMiddleware.php:82
+msgid "Page not found"
+msgstr "Seite nicht gefunden"
+
+#: resources/views/errors/404.twig:10
+msgid "No sleep found"
+msgstr "No sleep found"
+
+#: resources/views/errors/405.twig:3 resources/views/errors/405.twig:5
+msgid "405: Method not allowed"
+msgstr ""
+
+#: resources/views/errors/419.twig:3
+msgid "Authentication expired"
+msgstr "Autorisierung ist abgelaufen"
+
+#: resources/views/errors/419.twig:6
+msgid "The provided CSRF token is invalid or has expired"
+msgstr "Das angegebene CSRF Token ist ungültig oder abgelaufen"
+
+#: resources/views/layouts/parts/footer.twig:9
+#: resources/views/layouts/parts/footer.twig:10
+#: resources/views/layouts/parts/footer.twig:15
+#: resources/views/layouts/parts/footer.twig:22
+#: resources/views/layouts/parts/footer.twig:23
+#: resources/views/pages/login.twig:25 includes/pages/admin_arrive.php:98
+#: includes/pages/admin_arrive.php:99 includes/pages/admin_arrive.php:100
+#: includes/view/EventConfig_view.php:36 includes/view/EventConfig_view.php:44
+#: includes/view/EventConfig_view.php:52 includes/view/EventConfig_view.php:60
+#: includes/view/Shifts_view.php:28 includes/view/Shifts_view.php:36
+#: includes/view/Shifts_view.php:148 includes/view/User_view.php:197
+#: includes/view/User_view.php:199
+msgid "Y-m-d"
+msgstr "d.m.Y"
+
+#: resources/views/layouts/parts/footer.twig:7
+#, fuzzy
+#| msgid "%s, from %s to %s"
+msgid "%1$s, from %2$s to %3$s"
+msgstr "%s, vom %s bis %s"
+
+#: resources/views/layouts/parts/footer.twig:13
+#, fuzzy
+#| msgid "%s, starting %s"
+msgid "%1$s, starting %2$s"
+msgstr "%s, ab dem %s"
+
+#: resources/views/layouts/parts/footer.twig:21
+#, fuzzy
+#| msgid "Event from %s to %s"
+msgid "Event from %1$s to %2$s"
+msgstr "Event von %s bis %s"
+
+#: resources/views/layouts/parts/footer.twig:34
+msgid "Bugs / Features"
+msgstr "Bugs / Features"
+
+#: resources/views/layouts/parts/footer.twig:35
+msgid "Development Platform"
+msgstr "Entwicklerplattform"
+
+#: resources/views/layouts/parts/footer.twig:36
+#: resources/views/pages/credits.twig:3 resources/views/pages/credits.twig:7
+msgid "Credits"
+msgstr "Credits"
+
+#: resources/views/layouts/parts/navbar.twig:39
+#: resources/views/pages/login.twig:83 resources/views/pages/login.twig:87
+#: includes/pages/guest_login.php:16 includes/pages/guest_login.php:353
+msgid "Register"
+msgstr "Registrieren"
+
+#: resources/views/layouts/parts/navbar.twig:43
+#: resources/views/pages/login.twig:4 resources/views/pages/login.twig:66
+#: includes/view/AngelTypes_view.php:581
+msgid "Login"
+msgstr "Login"
+
+#: resources/views/macros/form.twig:17
+msgid "form.submit"
+msgstr "Absenden"
+
+#: resources/views/pages/credits.twig:17
+#, fuzzy
+#| msgid "Force active"
+msgid "Source code"
+msgstr "Aktiv erzwingen"
+
+#: resources/views/pages/credits.twig:18
+#, python-format
+msgid "Version: _%s_"
+msgstr ""
+
+#: resources/views/pages/credits.twig:20
+msgid "credits.credit"
+msgstr ""
+"Das ursprüngliche Engelsystem wurde entwickelt von [cookie](https://github."
+"com/cookieBerlin/engelsystem). Danach wurde es von [msquare](https://"
+"notrademark.de) (Maintainer) und [MyIgel](https://myigel.name) völlig "
+"überarbeitet und verbessert."
+
+#: resources/views/pages/credits.twig:23
+msgid "credits.contributors"
+msgstr ""
+"Eine vollständige Liste der Mitwirkenden findest Du [auf GitHub](https://"
+"github.com/engelsystem/engelsystem/graphs/contributors)."
+
+#: resources/views/pages/login.twig:10 includes/view/EventConfig_view.php:27
+#, python-format, php-format
+msgid "Welcome to the %s!"
+msgstr "Willkommen beim %s!"
+
+#: resources/views/pages/login.twig:16 includes/view/EventConfig_view.php:34
+msgid "Buildup starts"
+msgstr "Aufbau startet"
+
+#: resources/views/pages/login.twig:17 includes/view/EventConfig_view.php:42
+msgid "Event starts"
+msgstr "Event startet"
+
+#: resources/views/pages/login.twig:18 includes/view/EventConfig_view.php:50
+msgid "Event ends"
+msgstr "Event endet"
+
+#: resources/views/pages/login.twig:19 includes/view/EventConfig_view.php:58
+msgid "Teardown ends"
+msgstr "Abbau endet"
+
+#: resources/views/pages/login.twig:72
+msgid "I forgot my password"
+msgstr "Passwort vergessen"
+
+#: resources/views/pages/login.twig:85
+msgid "Please sign up, if you want to help us!"
+msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
+#: resources/views/pages/login.twig:90 includes/pages/guest_login.php:61
+msgid "Registration is disabled."
+msgstr "Registrierung ist abgeschaltet."
+
+#: resources/views/pages/login.twig:95
+msgid "What can I do?"
+msgstr "Was kann ich machen?"
+
+#: resources/views/pages/login.twig:96
+msgid "Please read about the jobs you can do to help us."
+msgstr ""
+"Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst."
+
+#: resources/views/pages/login.twig:99
#: includes/controller/angeltypes_controller.php:69
-#: includes/pages/guest_login.php:472 includes/view/AngelTypes_view.php:496
-#: includes/view/AngelTypes_view.php:593 includes/view/User_view.php:139
+#: includes/view/AngelTypes_view.php:501 includes/view/AngelTypes_view.php:598
msgid "Teams/Job description"
msgstr "Team-/Aufgabenbeschreibung"
+#: resources/views/pages/login.twig:105
+msgid "Please note: You have to activate cookies!"
+msgstr "Hinweis: Cookies müssen aktiviert sein!"
+
+#: resources/views/pages/password/reset-form.twig:10
+#: includes/pages/guest_login.php:312
+msgid "Password"
+msgstr "Passwort"
+
+#: resources/views/pages/password/reset-form.twig:11
+#: includes/pages/guest_login.php:315
+msgid "Confirm password"
+msgstr "Passwort wiederholen"
+
+#: resources/views/pages/password/reset-form.twig:14
+#: includes/controller/shifts_controller.php:194
+#: includes/pages/admin_groups.php:101 includes/pages/admin_news.php:48
+#: includes/pages/admin_questions.php:55 includes/pages/admin_rooms.php:177
+#: includes/pages/admin_shifts.php:339 includes/pages/user_messages.php:78
+#: includes/pages/user_news.php:164 includes/pages/user_news.php:241
+#: includes/view/AngelTypes_view.php:120 includes/view/EventConfig_view.php:110
+#: includes/view/Questions_view.php:43 includes/view/ShiftEntry_view.php:93
+#: includes/view/ShiftEntry_view.php:118 includes/view/ShiftEntry_view.php:141
+#: includes/view/ShiftEntry_view.php:207 includes/view/ShiftTypes_view.php:64
+#: includes/view/UserDriverLicenses_view.php:54
+#: includes/view/UserWorkLog_view.php:49 includes/view/User_view.php:84
+#: includes/view/User_view.php:93 includes/view/User_view.php:98
+#: includes/view/User_view.php:103 includes/view/User_view.php:154
+msgid "Save"
+msgstr "Speichern"
+
+#: resources/views/pages/password/reset-success.twig:7
+msgid "We sent you an email containing your password recovery link."
+msgstr ""
+"Wir haben dir eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
+
+#: resources/views/pages/password/reset-success.twig:9
+#: includes/pages/user_settings.php:120
+msgid "Password saved."
+msgstr "Passwort gespeichert."
+
+#: resources/views/pages/password/reset.twig:5
+#: resources/views/pages/password/reset.twig:9
+msgid "Password recovery"
+msgstr "Passwort wiederherstellen"
+
+#: resources/views/pages/password/reset.twig:21
+msgid ""
+"We will send you an e-mail with a password recovery link. Please use the "
+"email address you used for registration."
+msgstr ""
+"Wir werden eine eMail mit einem Link schicken, mit dem du das Passwort "
+"zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
+"verwendet hast."
+
+#: resources/views/pages/password/reset.twig:22
+#: includes/pages/admin_free.php:116 includes/pages/guest_login.php:280
+#: includes/view/AngelTypes_view.php:119 includes/view/AngelTypes_view.php:482
+#: includes/view/User_view.php:62
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: resources/views/pages/password/reset.twig:25
+msgid "Recover"
+msgstr "Wiederherstellen"
+
+#: includes/controller/angeltypes_controller.php:13
+#: includes/pages/user_shifts.php:249 includes/sys_menu.php:97
+#: includes/view/AngelTypes_view.php:81 includes/view/AngelTypes_view.php:139
+#: includes/view/User_view.php:779
+msgid "Angeltypes"
+msgstr "Engeltypen"
+
#: includes/controller/angeltypes_controller.php:89
#, php-format
msgid "Angeltype %s deleted."
msgstr "Engeltyp %s gelöscht."
#: includes/controller/angeltypes_controller.php:94
-#: includes/view/AngelTypes_view.php:54
+#: includes/view/AngelTypes_view.php:59
#, php-format
msgid "Delete angeltype %s"
msgstr "Lösche Engeltyp %s"
@@ -47,60 +294,60 @@ msgid "Please check the name. Maybe it already exists."
msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben."
#: includes/controller/angeltypes_controller.php:165
-#: includes/view/AngelTypes_view.php:74
+#: includes/view/AngelTypes_view.php:79
#, php-format
msgid "Edit %s"
msgstr "%s bearbeiten"
#: includes/controller/angeltypes_controller.php:203
-#: includes/view/AngelTypes_view.php:341
+#: includes/view/AngelTypes_view.php:346
#, php-format
msgid "Team %s"
msgstr "Team %s"
-#: includes/controller/angeltypes_controller.php:286
-#: includes/view/User_view.php:413
+#: includes/controller/angeltypes_controller.php:287
+#: includes/view/User_view.php:397
msgid "view"
msgstr "ansehen"
-#: includes/controller/angeltypes_controller.php:294
+#: includes/controller/angeltypes_controller.php:295
#: includes/pages/admin_free.php:97 includes/pages/admin_groups.php:44
-#: includes/pages/admin_rooms.php:27 includes/view/AngelTypes_view.php:170
+#: includes/pages/admin_rooms.php:27 includes/view/AngelTypes_view.php:175
#: includes/view/ShiftTypes_view.php:91 includes/view/ShiftTypes_view.php:123
-#: includes/view/Shifts_view.php:135 includes/view/User_view.php:418
-#: includes/view/User_view.php:516 includes/view/User_view.php:611
+#: includes/view/Shifts_view.php:155 includes/view/User_view.php:402
+#: includes/view/User_view.php:496 includes/view/User_view.php:591
msgid "edit"
msgstr "bearbeiten"
-#: includes/controller/angeltypes_controller.php:299
-#: includes/controller/shifts_controller.php:243
-#: includes/pages/admin_questions.php:60 includes/pages/admin_questions.php:76
-#: includes/pages/admin_rooms.php:32 includes/pages/admin_user.php:179
-#: includes/view/AngelTypes_view.php:59 includes/view/AngelTypes_view.php:177
+#: includes/controller/angeltypes_controller.php:300
+#: includes/controller/shifts_controller.php:245
+#: includes/pages/admin_questions.php:58 includes/pages/admin_questions.php:74
+#: includes/pages/admin_rooms.php:32 includes/pages/admin_user.php:181
+#: includes/view/AngelTypes_view.php:64 includes/view/AngelTypes_view.php:182
#: includes/view/Questions_view.php:13 includes/view/Questions_view.php:22
#: includes/view/ShiftEntry_view.php:28 includes/view/ShiftEntry_view.php:57
#: includes/view/ShiftTypes_view.php:28 includes/view/ShiftTypes_view.php:96
-#: includes/view/ShiftTypes_view.php:128 includes/view/Shifts_view.php:136
-#: includes/view/UserWorkLog_view.php:21 includes/view/User_view.php:521
+#: includes/view/ShiftTypes_view.php:128 includes/view/Shifts_view.php:156
+#: includes/view/UserWorkLog_view.php:21 includes/view/User_view.php:501
msgid "delete"
msgstr "löschen"
-#: includes/controller/angeltypes_controller.php:310
-#: includes/view/AngelTypes_view.php:163 includes/view/AngelTypes_view.php:532
+#: includes/controller/angeltypes_controller.php:311
+#: includes/view/AngelTypes_view.php:168 includes/view/AngelTypes_view.php:537
msgid "leave"
msgstr "verlassen"
# As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation "Engel hinzufügen" for this button.
-#: includes/controller/angeltypes_controller.php:316
-#: includes/view/AngelTypes_view.php:147 includes/view/AngelTypes_view.php:537
+#: includes/controller/angeltypes_controller.php:317
+#: includes/view/AngelTypes_view.php:152 includes/view/AngelTypes_view.php:542
msgid "join"
msgstr "mitmachen"
-#: includes/controller/angeltypes_controller.php:353
+#: includes/controller/angeltypes_controller.php:354
msgid "Angeltype doesn't exist . "
msgstr "Engeltyp existiert nicht."
-#: includes/controller/event_config_controller.php:11 includes/sys_menu.php:114
+#: includes/controller/event_config_controller.php:11 includes/sys_menu.php:122
msgid "Event config"
msgstr "Event Einstellungen"
@@ -137,12 +384,12 @@ msgid "The buildup start date has to be before the teardown end date."
msgstr "Das Aufbau Start Datum muss vor dem Abbau Ende Datum liegen."
#: includes/controller/event_config_controller.php:120
-#: includes/pages/user_settings.php:89
+#: includes/pages/user_settings.php:93
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
#: includes/controller/public_dashboard_controller.php:27
-#: includes/pages/user_shifts.php:278 includes/view/PublicDashboard_view.php:55
+#: includes/pages/user_shifts.php:277 includes/view/PublicDashboard_view.php:55
msgid "Public Dashboard"
msgstr "Öffentliches Dashboard"
@@ -166,7 +413,7 @@ msgid "You need be accepted member of the angeltype."
msgstr "Du musst bestätigtes Mitglied des Engeltyps sein."
#: includes/controller/shift_entries_controller.php:208
-#: includes/view/Shifts_view.php:125
+#: includes/view/Shifts_view.php:138
msgid "This shift collides with one of your shifts."
msgstr "Diese Schicht kollidiert mit deinen Schichten."
@@ -178,23 +425,24 @@ msgstr "Die Schicht ist schon vorbei."
msgid "You are not marked as arrived."
msgstr "Du bist nicht als angekommen markiert."
+#: includes/controller/shift_entries_controller.php:216
msgid "You are not allowed to sign up yet."
msgstr "Du darfst dich noch nicht anmelden."
-#: includes/controller/shift_entries_controller.php:216
-#: includes/view/Shifts_view.php:129
+#: includes/controller/shift_entries_controller.php:218
+#: includes/view/Shifts_view.php:142
msgid "You are signed up for this shift."
msgstr "Du bist für diese Schicht eingetragen."
-#: includes/controller/shift_entries_controller.php:265
+#: includes/controller/shift_entries_controller.php:267
msgid "You are subscribed. Thank you!"
msgstr "Du bist eingetragen. Danke!"
-#: includes/controller/shift_entries_controller.php:324
+#: includes/controller/shift_entries_controller.php:326
msgid "Shift entry not found."
msgstr "Schichteintrag nicht gefunden."
-#: includes/controller/shift_entries_controller.php:346
+#: includes/controller/shift_entries_controller.php:348
msgid ""
"You are not allowed to remove this shift entry. If necessary, ask your "
"supporter or heaven to do so."
@@ -202,100 +450,83 @@ msgstr ""
"Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage "
"deinen Supporter oder im Himmel danach."
-#: includes/controller/shift_entries_controller.php:352
+#: includes/controller/shift_entries_controller.php:354
msgid "Shift entry removed."
msgstr "Schichteintrag gelöscht."
-#: includes/controller/shifts_controller.php:95
+#: includes/controller/shifts_controller.php:96
msgid "Please select a room."
msgstr "Bitte einen Raum auswählen."
-#: includes/controller/shifts_controller.php:102
+#: includes/controller/shifts_controller.php:103
msgid "Please select a shifttype."
msgstr "Bitte einen Schichttyp wählen."
-#: includes/controller/shifts_controller.php:109
+#: includes/controller/shifts_controller.php:110
msgid "Please enter a valid starting time for the shifts."
msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein."
-#: includes/controller/shifts_controller.php:116
+#: includes/controller/shifts_controller.php:117
msgid "Please enter a valid ending time for the shifts."
msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein."
-#: includes/controller/shifts_controller.php:121
+#: includes/controller/shifts_controller.php:122
msgid "The ending time has to be after the starting time."
msgstr "Die Endzeit muss nach der Startzeit liegen."
-#: includes/controller/shifts_controller.php:134
+#: includes/controller/shifts_controller.php:135
#, php-format
msgid "Please check your input for needed angels of type %s."
msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s."
-#: includes/controller/shifts_controller.php:164
+#: includes/controller/shifts_controller.php:165
msgid "Shift updated."
msgstr "Schicht aktualisiert."
-#: includes/controller/shifts_controller.php:183
+#: includes/controller/shifts_controller.php:184
msgid "This page is much more comfortable with javascript."
msgstr "Diese Seite ist mit JavaScript viel komfortabler."
-#: includes/controller/shifts_controller.php:186
-#: includes/pages/admin_import.php:123 includes/pages/admin_shifts.php:403
+#: includes/controller/shifts_controller.php:187
+#: includes/pages/admin_import.php:123 includes/pages/admin_shifts.php:415
msgid "Shifttype"
msgstr "Schichttyp"
-#: includes/controller/shifts_controller.php:187
+#: includes/controller/shifts_controller.php:188
#: includes/pages/admin_import.php:197 includes/pages/admin_import.php:206
-#: includes/pages/admin_import.php:215 includes/pages/admin_shifts.php:404
-#: includes/view/Shifts_view.php:17
+#: includes/pages/admin_import.php:215 includes/pages/admin_shifts.php:416
+#: includes/view/Shifts_view.php:18
msgid "Title"
msgstr "Titel"
-#: includes/controller/shifts_controller.php:188
+#: includes/controller/shifts_controller.php:189
msgid "Room:"
msgstr "Raum:"
-#: includes/controller/shifts_controller.php:189
+#: includes/controller/shifts_controller.php:190
msgid "Start:"
msgstr "Start:"
-#: includes/controller/shifts_controller.php:190
+#: includes/controller/shifts_controller.php:191
msgid "End:"
msgstr "Ende:"
-#: includes/controller/shifts_controller.php:191
-#: includes/pages/admin_shifts.php:325 includes/pages/admin_shifts.php:435
-#: includes/view/Shifts_view.php:147
+#: includes/controller/shifts_controller.php:192
+#: includes/pages/admin_shifts.php:337 includes/pages/admin_shifts.php:452
+#: includes/view/Shifts_view.php:167
msgid "Needed angels"
msgstr "Benötigte Engel"
-#: includes/controller/shifts_controller.php:193
-#: includes/pages/admin_groups.php:101 includes/pages/admin_news.php:50
-#: includes/pages/admin_questions.php:57 includes/pages/admin_rooms.php:177
-#: includes/pages/admin_shifts.php:327 includes/pages/user_messages.php:78
-#: includes/pages/user_news.php:184 includes/pages/user_news.php:274
-#: includes/view/AngelTypes_view.php:115 includes/view/EventConfig_view.php:110
-#: includes/view/Questions_view.php:43 includes/view/ShiftEntry_view.php:93
-#: includes/view/ShiftEntry_view.php:118 includes/view/ShiftEntry_view.php:141
-#: includes/view/ShiftEntry_view.php:200 includes/view/ShiftTypes_view.php:64
-#: includes/view/UserDriverLicenses_view.php:54
-#: includes/view/UserWorkLog_view.php:49 includes/view/User_view.php:80
-#: includes/view/User_view.php:89 includes/view/User_view.php:94
-#: includes/view/User_view.php:99 includes/view/User_view.php:190
-#: includes/view/User_view.php:810
-msgid "Save"
-msgstr "Speichern"
-
-#: includes/controller/shifts_controller.php:230
+#: includes/controller/shifts_controller.php:232
msgid "Shift deleted."
msgstr "Schicht gelöscht."
-#: includes/controller/shifts_controller.php:236
+#: includes/controller/shifts_controller.php:238
#, php-format
msgid "Do you want to delete the shift %s from %s to %s?"
msgstr "Möchtest Du die Schicht %s von %s bis %s löschen?"
-#: includes/controller/shifts_controller.php:266
+#: includes/controller/shifts_controller.php:268
msgid "Shift could not be found."
msgstr "Schicht konnte nicht gefunden werden."
@@ -327,11 +558,11 @@ msgstr "Schichttyp geändert."
msgid "Created shifttype."
msgstr "Schichttyp erstellt."
-#: includes/controller/shifttypes_controller.php:159 includes/sys_menu.php:108
+#: includes/controller/shifttypes_controller.php:159 includes/sys_menu.php:116
msgid "Shifttypes"
msgstr "Schichttypen"
-#: includes/controller/user_angeltypes_controller.php:26
+#: includes/controller/user_angeltypes_controller.php:28
#, php-format
msgid "There is %d unconfirmed angeltype."
msgid_plural "There are %d unconfirmed angeltypes."
@@ -348,7 +579,7 @@ msgstr "Engeltypen die bestätigt werden müssen:"
#: includes/controller/user_angeltypes_controller.php:93
#: includes/controller/user_angeltypes_controller.php:139
#: includes/controller/user_angeltypes_controller.php:199
-#: includes/controller/user_angeltypes_controller.php:265
+#: includes/controller/user_angeltypes_controller.php:264
msgid "Angeltype doesn't exist."
msgstr "Engeltyp existiert nicht."
@@ -384,8 +615,8 @@ msgstr "Alle Benutzer bestätigen"
#: includes/controller/user_angeltypes_controller.php:133
#: includes/controller/user_angeltypes_controller.php:187
#: includes/controller/user_angeltypes_controller.php:193
-#: includes/controller/user_angeltypes_controller.php:246
-#: includes/controller/user_angeltypes_controller.php:259
+#: includes/controller/user_angeltypes_controller.php:245
+#: includes/controller/user_angeltypes_controller.php:258
msgid "User angeltype doesn't exist."
msgstr "Benutzer-Engeltype existiert nicht."
@@ -395,8 +626,8 @@ msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten."
#: includes/controller/user_angeltypes_controller.php:150
#: includes/controller/user_angeltypes_controller.php:205
-#: includes/controller/user_angeltypes_controller.php:271
-#: includes/controller/users_controller.php:441
+#: includes/controller/user_angeltypes_controller.php:270
+#: includes/controller/users_controller.php:327
msgid "User doesn't exist."
msgstr "Benutzer existiert nicht."
@@ -414,67 +645,67 @@ msgstr "Engeltyp für Benutzer bestätigen"
msgid "You are not allowed to delete this users angeltype."
msgstr "Du darfst diesen Benutzer nicht von diesem Engeltyp entfernen."
-#: includes/controller/user_angeltypes_controller.php:217
+#: includes/controller/user_angeltypes_controller.php:218
#, php-format
msgid "User %s removed from %s."
msgstr "Benutzer %s von %s entfernt."
-#: includes/controller/user_angeltypes_controller.php:225
+#: includes/controller/user_angeltypes_controller.php:224
#: includes/view/UserAngelTypes_view.php:113
msgid "Remove angeltype"
msgstr "Engeltyp löschen"
-#: includes/controller/user_angeltypes_controller.php:241
+#: includes/controller/user_angeltypes_controller.php:240
msgid "You are not allowed to set supporter rights."
msgstr "Du darfst keine Supporterrechte bearbeiten."
-#: includes/controller/user_angeltypes_controller.php:253
+#: includes/controller/user_angeltypes_controller.php:252
msgid "No supporter update given."
msgstr "Kein Update für Supporterrechte gegeben."
-#: includes/controller/user_angeltypes_controller.php:280
+#: includes/controller/user_angeltypes_controller.php:278
#, php-format
msgid "Added supporter rights for %s to %s."
msgstr "%s hat %s als Supporter bekommen."
-#: includes/controller/user_angeltypes_controller.php:281
+#: includes/controller/user_angeltypes_controller.php:279
#, php-format
msgid "Removed supporter rights for %s from %s."
msgstr "%s hat jetzt nicht mehr %s als Supporter."
-#: includes/controller/user_angeltypes_controller.php:292
-#: includes/view/AngelTypes_view.php:258
+#: includes/controller/user_angeltypes_controller.php:295
+#: includes/view/AngelTypes_view.php:263
#: includes/view/UserAngelTypes_view.php:14
msgid "Add supporter rights"
msgstr "Supporterrechte geben"
-#: includes/controller/user_angeltypes_controller.php:292
-#: includes/view/AngelTypes_view.php:241
+#: includes/controller/user_angeltypes_controller.php:295
+#: includes/view/AngelTypes_view.php:246
#: includes/view/UserAngelTypes_view.php:14
msgid "Remove supporter rights"
msgstr "Supporterrechte entfernen"
-#: includes/controller/user_angeltypes_controller.php:331
+#: includes/controller/user_angeltypes_controller.php:334
#, php-format
msgid "User %s added to %s."
msgstr "Benutzer %s zu %s hinzugefügt."
-#: includes/controller/user_angeltypes_controller.php:348
+#: includes/controller/user_angeltypes_controller.php:351
#: includes/view/UserAngelTypes_view.php:142
msgid "Add user to angeltype"
msgstr "Benutzer zu Engeltyp hinzufügen"
-#: includes/controller/user_angeltypes_controller.php:365
+#: includes/controller/user_angeltypes_controller.php:368
#, php-format
msgid "You are already a %s."
msgstr "Du bist bereits %s."
-#: includes/controller/user_angeltypes_controller.php:372
+#: includes/controller/user_angeltypes_controller.php:375
#, php-format
msgid "You joined %s."
msgstr "Du bist %s beigetreten."
-#: includes/controller/user_angeltypes_controller.php:393
+#: includes/controller/user_angeltypes_controller.php:396
#: includes/view/UserAngelTypes_view.php:166
#, php-format
msgid "Become a %s"
@@ -539,91 +770,45 @@ msgstr "Arbeitseinsatz angelegt."
msgid "You cannot delete yourself."
msgstr "Du kannst Dich nicht selber löschen."
-#: includes/controller/users_controller.php:78
-#: includes/pages/guest_login.php:410
+#: includes/controller/users_controller.php:76
msgid "Your password is incorrect. Please try it again."
msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
-#: includes/controller/users_controller.php:87
+#: includes/controller/users_controller.php:85
msgid "User deleted."
msgstr "Engel gelöscht."
-#: includes/controller/users_controller.php:95 includes/view/User_view.php:154
+#: includes/controller/users_controller.php:93 includes/view/User_view.php:118
#, php-format
msgid "Delete %s"
msgstr "%s löschen"
-#: includes/controller/users_controller.php:165
+#: includes/controller/users_controller.php:163
msgid "Please enter a valid number of vouchers."
msgstr "Bitte gib eine korrekte Anzahl von Gutscheinen ein."
-#: includes/controller/users_controller.php:172
+#: includes/controller/users_controller.php:170
msgid "Saved the number of vouchers."
msgstr "Anzahl der Gutscheine gespeichert."
-#: includes/controller/users_controller.php:181 includes/view/User_view.php:178
+#: includes/controller/users_controller.php:179 includes/view/User_view.php:142
#, php-format
msgid "%s's vouchers"
msgstr "Gutschein von %s"
-#: includes/controller/users_controller.php:198
+#: includes/controller/users_controller.php:196
msgid "User not found."
msgstr "Benutzer nicht gefunden."
-#: includes/controller/users_controller.php:233
+#: includes/controller/users_controller.php:231
msgid "Enough"
msgstr "Genug"
-#: includes/controller/users_controller.php:299 includes/view/User_view.php:249
+#: includes/controller/users_controller.php:299 includes/view/User_view.php:247
msgid "All users"
msgstr "Alle Benutzer"
-#: includes/controller/users_controller.php:323
-msgid "Token is not correct."
-msgstr "Der Token ist nicht in Ordnung."
-
-#: includes/controller/users_controller.php:336
-#: includes/pages/guest_login.php:138 includes/pages/user_settings.php:112
-msgid "Your passwords don't match."
-msgstr "Deine Passwörter stimmen nicht überein."
-
-#: includes/controller/users_controller.php:340
-#: includes/pages/user_settings.php:110
-msgid "Your password is to short (please use at least 6 characters)."
-msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
-
-#: includes/controller/users_controller.php:345
-#: includes/pages/user_settings.php:115
-msgid "Password saved."
-msgstr "Passwort gespeichert."
-
-#: includes/controller/users_controller.php:373
-#: includes/controller/users_controller.php:377
-#: includes/pages/guest_login.php:107 includes/pages/user_settings.php:32
-msgid "E-mail address is not correct."
-msgstr "Die E-Mail Adresse ist nicht in Ordnung."
-
-#: includes/controller/users_controller.php:381
-#: includes/pages/guest_login.php:115 includes/pages/user_settings.php:36
-msgid "Please enter your e-mail."
-msgstr "Bitte gib Deine E-Mail-Adresse ein."
-
-#: includes/controller/users_controller.php:388
-#: includes/controller/users_controller.php:424
-msgid "Password recovery"
-msgstr "Passwort wiederherstellen"
-
-#: includes/controller/users_controller.php:390
-#, php-format
-msgid "Please visit %s to recover your password."
-msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen"
-
-#: includes/controller/users_controller.php:394
-msgid "We sent you an email containing your password recovery link."
-msgstr ""
-"Wir haben dir eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
-
-#: includes/helper/email_helper.php:41
+#: includes/helper/email_helper.php:50
#, php-format
msgid "User %s could not be notified by email due to an error."
msgstr ""
@@ -670,26 +855,31 @@ msgstr "Deine Schicht hat sich geändert"
msgid "A Shift you are registered on was deleted:"
msgstr "Eine deiner Schichten wurde gelöscht:"
-#: includes/mailer/shifts_mailer.php:97
+#: includes/mailer/shifts_mailer.php:99
+msgid ""
+"Since the deleted shift was already done, we added a worklog entry instead, "
+"to keep your work hours correct."
+msgstr ""
+"Da die gelöschte Schicht bereits vergangen ist, haben wir einen "
+"entsprechenden Arbeitseinsatz hinzugefügt."
+
+#: includes/mailer/shifts_mailer.php:102
msgid "Your Shift was deleted"
msgstr "Deine Schicht wurde gelöscht"
-msgid "Since the deleted shift was already done, we added a worklog entry instead, to keep your work hours correct."
-msgstr "Da die gelöschte Schicht bereits vergangen ist, haben wir einen entsprechenden Arbeitseinsatz hinzugefügt."
-
-#: includes/mailer/shifts_mailer.php:114
+#: includes/mailer/shifts_mailer.php:119
msgid "You have been assigned to a Shift:"
msgstr "Du wurdest in eine Schicht eingetragen:"
-#: includes/mailer/shifts_mailer.php:120
+#: includes/mailer/shifts_mailer.php:125
msgid "Assigned to Shift"
msgstr "In Schicht eingetragen"
-#: includes/mailer/shifts_mailer.php:135
+#: includes/mailer/shifts_mailer.php:140
msgid "You have been removed from a Shift:"
msgstr "Du wurdest aus einer Schicht ausgetragen:"
-#: includes/mailer/shifts_mailer.php:141
+#: includes/mailer/shifts_mailer.php:146
msgid "Removed from Shift"
msgstr "Von Schicht ausgetragen"
@@ -706,7 +896,12 @@ msgstr ""
"Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere bitte "
"den Himmel."
-#: includes/pages/admin_active.php:13 includes/sys_menu.php:104
+#: includes/model/UserWorkLog_model.php:167
+#: includes/model/UserWorkLog_model.php:168 includes/view/User_view.php:200
+msgid "m/d/Y h:i a"
+msgstr "d.m.Y H:i"
+
+#: includes/pages/admin_active.php:13 includes/sys_menu.php:112
msgid "Active angels"
msgstr "Aktive Engel"
@@ -728,10 +923,10 @@ msgid "Marked angels."
msgstr "Engel wurden markiert."
#: includes/pages/admin_active.php:98 includes/pages/admin_rooms.php:155
-#: includes/pages/admin_rooms.php:191 includes/pages/admin_shifts.php:321
+#: includes/pages/admin_rooms.php:198 includes/pages/admin_shifts.php:333
#: includes/view/UserAngelTypes_view.php:147
#: includes/view/UserWorkLog_view.php:64 includes/view/UserWorkLog_view.php:82
-#: includes/view/User_view.php:157 includes/view/User_view.php:181
+#: includes/view/User_view.php:121 includes/view/User_view.php:145
msgid "back"
msgstr "zurück"
@@ -779,8 +974,8 @@ msgstr "entferne t-shirt"
#: includes/pages/admin_active.php:299 includes/pages/admin_arrive.php:202
#: includes/pages/admin_arrive.php:217 includes/pages/admin_arrive.php:232
-#: includes/view/AngelTypes_view.php:419 includes/view/AngelTypes_view.php:427
-#: includes/view/User_view.php:239
+#: includes/view/AngelTypes_view.php:424 includes/view/AngelTypes_view.php:432
+#: includes/view/User_view.php:207
msgid "Sum"
msgstr "Summe"
@@ -794,8 +989,8 @@ msgstr "Alle Schichten anzeigen"
#: includes/pages/admin_active.php:307 includes/pages/admin_arrive.php:178
#: includes/pages/admin_arrive.php:179 includes/pages/admin_free.php:105
-#: includes/pages/admin_free.php:107 includes/pages/admin_log.php:35
-#: includes/pages/admin_log.php:36
+#: includes/pages/admin_free.php:107 includes/pages/admin_log.php:36
+#: includes/pages/admin_log.php:37
msgid "Search"
msgstr "Suche"
@@ -803,8 +998,8 @@ msgstr "Suche"
msgid "How much angels should be active?"
msgstr "Wie viele Engel sollten aktiv sein?"
-#: includes/pages/admin_active.php:311 includes/pages/admin_shifts.php:309
-#: includes/pages/admin_shifts.php:453
+#: includes/pages/admin_active.php:311 includes/pages/admin_shifts.php:320
+#: includes/pages/admin_shifts.php:470
msgid "Preview"
msgstr "Vorschau"
@@ -813,17 +1008,17 @@ msgid "Nickname"
msgstr "Nick"
#: includes/pages/admin_active.php:316 includes/pages/admin_active.php:326
-#: includes/view/User_view.php:265
+#: includes/view/User_view.php:233
msgid "Size"
msgstr "Größe"
#: includes/pages/admin_active.php:317 includes/pages/user_shifts.php:11
-#: includes/sys_menu.php:88 includes/view/AngelTypes_view.php:352
-#: includes/view/Rooms_view.php:39 includes/view/User_view.php:659
+#: includes/sys_menu.php:96 includes/view/AngelTypes_view.php:357
+#: includes/view/Rooms_view.php:39 includes/view/User_view.php:641
msgid "Shifts"
msgstr "Schichten"
-#: includes/pages/admin_active.php:318 includes/pages/admin_shifts.php:415
+#: includes/pages/admin_active.php:318 includes/pages/admin_shifts.php:427
msgid "Length"
msgstr "Länge"
@@ -831,7 +1026,7 @@ msgstr "Länge"
msgid "Active?"
msgstr "Aktiv?"
-#: includes/pages/admin_active.php:320 includes/view/User_view.php:263
+#: includes/pages/admin_active.php:320 includes/view/User_view.php:231
msgid "Forced"
msgstr "Gezwungen"
@@ -844,14 +1039,10 @@ msgid "Shirt statistics"
msgstr "T-Shirt Statistik"
#: includes/pages/admin_active.php:327
-msgid "Needed shirts"
-msgstr "Benötigte T-Shirts"
-
-#: includes/pages/admin_active.php:298
msgid "Given shirts"
msgstr "Ausgegebene T-Shirts"
-#: includes/pages/admin_arrive.php:10 includes/sys_menu.php:103
+#: includes/pages/admin_arrive.php:10 includes/sys_menu.php:111
msgid "Arrived angels"
msgstr "Angekommene Engel"
@@ -863,25 +1054,17 @@ msgstr "Zurückgesetzt. Engel ist nicht angekommen."
msgid "Angel has been marked as arrived."
msgstr "Engel wurde als angekommen markiert."
-#: includes/pages/admin_arrive.php:101 includes/view/UserAngelTypes_view.php:29
-#: includes/view/UserAngelTypes_view.php:57
-#: includes/view/UserAngelTypes_view.php:75
-#: includes/view/UserAngelTypes_view.php:99
-#: includes/view/UserAngelTypes_view.php:123
-msgid "yes"
-msgstr "Ja"
-
#: includes/pages/admin_arrive.php:106
msgid "reset"
msgstr "zurücksetzen"
#: includes/pages/admin_arrive.php:106 includes/pages/admin_arrive.php:193
#: includes/pages/admin_arrive.php:208 includes/pages/admin_arrive.php:223
-#: includes/view/User_view.php:619
+#: includes/view/User_view.php:601
msgid "arrived"
msgstr "angekommen"
-#: includes/pages/admin_arrive.php:183
+#: includes/pages/admin_arrive.php:183 includes/view/User_view.php:236
msgid "Planned arrival"
msgstr "Geplanter Ankunftstag"
@@ -893,7 +1076,7 @@ msgstr "Angekommen?"
msgid "Arrival date"
msgstr "Ankunftsdatum"
-#: includes/pages/admin_arrive.php:186
+#: includes/pages/admin_arrive.php:186 includes/view/User_view.php:241
msgid "Planned departure"
msgstr "Geplante Abreise"
@@ -907,7 +1090,7 @@ msgid "arrived sum"
msgstr "Summe angekommen"
#: includes/pages/admin_arrive.php:200 includes/pages/admin_arrive.php:215
-#: includes/pages/admin_arrive.php:230 includes/pages/admin_news.php:45
+#: includes/pages/admin_arrive.php:230 includes/pages/admin_news.php:43
#: includes/pages/user_messages.php:118
msgid "Date"
msgstr "Datum"
@@ -925,7 +1108,7 @@ msgstr "Ankunfts-Statistik"
msgid "Planned departure statistics"
msgstr "Geplante Abreise-Statistik"
-#: includes/pages/admin_free.php:12 includes/sys_menu.php:106
+#: includes/pages/admin_free.php:12 includes/sys_menu.php:114
msgid "Free angels"
msgstr "Freie Engel"
@@ -939,14 +1122,9 @@ msgstr "All"
msgid "Angeltype"
msgstr "Engeltyp"
-#: includes/pages/admin_free.php:111
-msgid "Only confirmed"
-msgstr "Nur bestätigte"
-
-#: includes/pages/admin_free.php:112 includes/pages/guest_login.php:289
-#: includes/pages/guest_login.php:447 includes/view/AngelTypes_view.php:293
-#: includes/view/AngelTypes_view.php:306 includes/view/User_view.php:38
-#: includes/view/User_view.php:126 includes/view/User_view.php:255
+#: includes/pages/admin_free.php:112 includes/pages/guest_login.php:275
+#: includes/view/AngelTypes_view.php:298 includes/view/AngelTypes_view.php:311
+#: includes/view/User_view.php:39 includes/view/User_view.php:218
msgid "Nick"
msgstr "Nick"
@@ -958,30 +1136,24 @@ msgstr "Nächste Schicht"
msgid "Last shift"
msgstr "Letzte Schicht"
-#: includes/pages/admin_free.php:115 includes/pages/guest_login.php:349
-#: includes/view/AngelTypes_view.php:113 includes/view/AngelTypes_view.php:294
-#: includes/view/AngelTypes_view.php:307 includes/view/AngelTypes_view.php:476
-#: includes/view/User_view.php:56 includes/view/User_view.php:258
+#: includes/pages/admin_free.php:115 includes/pages/guest_login.php:336
+#: includes/view/AngelTypes_view.php:118 includes/view/AngelTypes_view.php:299
+#: includes/view/AngelTypes_view.php:312 includes/view/AngelTypes_view.php:481
+#: includes/view/User_view.php:60 includes/view/User_view.php:225
msgid "DECT"
msgstr "DECT"
-#: includes/pages/admin_free.php:116 includes/pages/guest_login.php:293
-#: includes/view/AngelTypes_view.php:114 includes/view/AngelTypes_view.php:477
-#: includes/view/User_view.php:58 includes/view/User_view.php:791
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: includes/pages/admin_groups.php:10 includes/sys_menu.php:111
+#: includes/pages/admin_groups.php:10 includes/sys_menu.php:119
msgid "Grouprights"
msgstr "Gruppenrechte"
#: includes/pages/admin_groups.php:52 includes/pages/admin_import.php:184
#: includes/pages/admin_import.php:188 includes/pages/admin_rooms.php:161
-#: includes/pages/admin_rooms.php:207 includes/view/AngelTypes_view.php:81
-#: includes/view/AngelTypes_view.php:82 includes/view/AngelTypes_view.php:112
-#: includes/view/AngelTypes_view.php:475 includes/view/AngelTypes_view.php:499
+#: includes/pages/admin_rooms.php:214 includes/view/AngelTypes_view.php:86
+#: includes/view/AngelTypes_view.php:87 includes/view/AngelTypes_view.php:117
+#: includes/view/AngelTypes_view.php:480 includes/view/AngelTypes_view.php:504
#: includes/view/ShiftTypes_view.php:60 includes/view/ShiftTypes_view.php:140
-#: includes/view/User_view.php:257
+#: includes/view/User_view.php:222
msgid "Name"
msgstr "Name"
@@ -994,7 +1166,7 @@ msgid "Edit group"
msgstr "Gruppe bearbeiten"
#: includes/pages/admin_import.php:8 includes/pages/admin_rooms.php:162
-#: includes/pages/admin_rooms.php:208 includes/sys_menu.php:112
+#: includes/pages/admin_rooms.php:215 includes/sys_menu.php:120
msgid "Frab import"
msgstr "Frab Import"
@@ -1003,8 +1175,8 @@ msgid "Webserver has no write-permission on import directory."
msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
#: includes/pages/admin_import.php:64 includes/pages/admin_import.php:143
-#: includes/pages/admin_import.php:242 includes/pages/admin_shifts.php:58
-#: includes/pages/admin_shifts.php:64
+#: includes/pages/admin_import.php:242 includes/pages/admin_shifts.php:60
+#: includes/pages/admin_shifts.php:66
msgid "Please select a shift type."
msgstr "Bitte einen Schichttyp wählen."
@@ -1092,14 +1264,14 @@ msgid "Day"
msgstr "Tag"
#: includes/pages/admin_import.php:194 includes/pages/admin_import.php:203
-#: includes/pages/admin_import.php:212 includes/pages/admin_shifts.php:408
-#: includes/view/Shifts_view.php:25
+#: includes/pages/admin_import.php:212 includes/pages/admin_shifts.php:420
+#: includes/view/Shifts_view.php:26
msgid "Start"
msgstr "Beginn"
#: includes/pages/admin_import.php:195 includes/pages/admin_import.php:204
-#: includes/pages/admin_import.php:213 includes/pages/admin_shifts.php:409
-#: includes/view/Shifts_view.php:33
+#: includes/pages/admin_import.php:213 includes/pages/admin_shifts.php:421
+#: includes/view/Shifts_view.php:34
msgid "End"
msgstr "Ende"
@@ -1109,7 +1281,7 @@ msgid "Shift type"
msgstr "Schichttyp"
#: includes/pages/admin_import.php:198 includes/pages/admin_import.php:207
-#: includes/pages/admin_import.php:216 includes/pages/admin_shifts.php:405
+#: includes/pages/admin_import.php:216 includes/pages/admin_shifts.php:417
msgid "Room"
msgstr "Raum"
@@ -1125,15 +1297,15 @@ msgstr "Zu löschende Schichten"
msgid "It's done!"
msgstr "Erledigt!"
-#: includes/pages/admin_log.php:10 includes/sys_menu.php:113
+#: includes/pages/admin_log.php:10 includes/sys_menu.php:121
msgid "Log"
msgstr "Log"
-#: includes/pages/admin_news.php:18
+#: includes/pages/admin_news.php:16
msgid "Edit news entry"
msgstr "News-Eintrag bearbeiten"
-#: includes/pages/admin_news.php:38
+#: includes/pages/admin_news.php:36
msgid ""
"This message contains HTML. After saving the post some formatting will be "
"lost!"
@@ -1141,72 +1313,72 @@ msgstr ""
"Diese Nachricht beinhaltet HTML. Wenn du sie speicherst gehen diese "
"Formatierungen verloren!"
-#: includes/pages/admin_news.php:46
+#: includes/pages/admin_news.php:44
msgid "Author"
msgstr "Autor"
-#: includes/pages/admin_news.php:47 includes/pages/user_news.php:271
+#: includes/pages/admin_news.php:45 includes/pages/user_news.php:238
msgid "Subject"
msgstr "Betreff"
-#: includes/pages/admin_news.php:48 includes/pages/user_messages.php:121
-#: includes/pages/user_news.php:183 includes/pages/user_news.php:272
+#: includes/pages/admin_news.php:46 includes/pages/user_messages.php:121
+#: includes/pages/user_news.php:163 includes/pages/user_news.php:239
msgid "Message"
msgstr "Nachricht"
-#: includes/pages/admin_news.php:49 includes/pages/user_news.php:273
+#: includes/pages/admin_news.php:47 includes/pages/user_news.php:240
msgid "Meeting"
msgstr "Treffen"
-#: includes/pages/admin_news.php:58 includes/pages/admin_rooms.php:195
-#: includes/view/User_view.php:165
+#: includes/pages/admin_news.php:56 includes/pages/admin_rooms.php:202
+#: includes/view/User_view.php:129
msgid "Delete"
msgstr "löschen"
-#: includes/pages/admin_news.php:88
+#: includes/pages/admin_news.php:72
msgid "News entry updated."
msgstr "News-Eintrag gespeichert."
-#: includes/pages/admin_news.php:95
+#: includes/pages/admin_news.php:79
msgid "News entry deleted."
msgstr "News-Eintrag gelöscht."
-#: includes/pages/admin_questions.php:11 includes/sys_menu.php:107
+#: includes/pages/admin_questions.php:11 includes/sys_menu.php:115
msgid "Answer questions"
msgstr "Fragen beantworten"
-#: includes/pages/admin_questions.php:29
+#: includes/pages/admin_questions.php:27
msgid "There are unanswered questions!"
msgstr "Es gibt unbeantwortete Fragen!"
-#: includes/pages/admin_questions.php:82
+#: includes/pages/admin_questions.php:80
msgid "Unanswered questions"
msgstr "Unbeantwortete Fragen"
-#: includes/pages/admin_questions.php:84 includes/pages/admin_questions.php:91
+#: includes/pages/admin_questions.php:82 includes/pages/admin_questions.php:89
msgid "From"
msgstr "Von"
-#: includes/pages/admin_questions.php:85 includes/pages/admin_questions.php:92
+#: includes/pages/admin_questions.php:83 includes/pages/admin_questions.php:90
#: includes/view/Questions_view.php:30 includes/view/Questions_view.php:35
msgid "Question"
msgstr "Frage"
-#: includes/pages/admin_questions.php:86 includes/pages/admin_questions.php:94
+#: includes/pages/admin_questions.php:84 includes/pages/admin_questions.php:92
#: includes/view/Questions_view.php:37
msgid "Answer"
msgstr "Antwort"
-#: includes/pages/admin_questions.php:89 includes/view/Questions_view.php:33
+#: includes/pages/admin_questions.php:87 includes/view/Questions_view.php:33
msgid "Answered questions"
msgstr "Beantwortete Fragen"
-#: includes/pages/admin_questions.php:93 includes/view/Questions_view.php:36
+#: includes/pages/admin_questions.php:91 includes/view/Questions_view.php:36
msgid "Answered by"
msgstr "Antwort von"
-#: includes/pages/admin_rooms.php:7 includes/pages/user_shifts.php:232
-#: includes/sys_menu.php:110 includes/sys_menu.php:164
+#: includes/pages/admin_rooms.php:7 includes/pages/user_shifts.php:230
+#: includes/sys_menu.php:118 includes/sys_menu.php:172
msgid "Rooms"
msgstr "Räume"
@@ -1232,14 +1404,14 @@ msgid "The map url is used to display an iframe on the room page."
msgstr ""
"Die Karten URL wird benutzt um auf der Raum-Seite ein iframe anzuzeigen."
-#: includes/pages/admin_rooms.php:165 includes/view/AngelTypes_view.php:105
-#: includes/view/AngelTypes_view.php:398 includes/view/Rooms_view.php:24
+#: includes/pages/admin_rooms.php:165 includes/view/AngelTypes_view.php:110
+#: includes/view/AngelTypes_view.php:403 includes/view/Rooms_view.php:24
#: includes/view/ShiftTypes_view.php:62 includes/view/ShiftTypes_view.php:100
-#: includes/view/Shifts_view.php:151
+#: includes/view/Shifts_view.php:171
msgid "Description"
msgstr "Beschreibung"
-#: includes/pages/admin_rooms.php:166 includes/view/AngelTypes_view.php:106
+#: includes/pages/admin_rooms.php:166 includes/view/AngelTypes_view.php:111
#: includes/view/ShiftTypes_view.php:63
msgid "Please use markdown for the description."
msgstr "Bitte benutze Markdown für die Beschreibung."
@@ -1248,110 +1420,114 @@ msgstr "Bitte benutze Markdown für die Beschreibung."
msgid "Needed angels:"
msgstr "Benötigte Engel:"
-#: includes/pages/admin_rooms.php:185
+#: includes/pages/admin_rooms.php:192
#, php-format
msgid "Room %s deleted."
msgstr "Raum %s gelöscht."
-#: includes/pages/admin_rooms.php:193
+#: includes/pages/admin_rooms.php:200
#, php-format
msgid "Do you want to delete room %s?"
msgstr "Möchest Du den Raum %s wirklich löschen?"
-#: includes/pages/admin_rooms.php:203
+#: includes/pages/admin_rooms.php:210
msgid "add"
msgstr "Neu"
-#: includes/pages/admin_rooms.php:209 includes/view/Rooms_view.php:31
+#: includes/pages/admin_rooms.php:216 includes/view/Rooms_view.php:31
msgid "Map"
msgstr "Karte"
-#: includes/pages/admin_shifts.php:10 includes/sys_menu.php:109
+#: includes/pages/admin_shifts.php:10 includes/sys_menu.php:117
msgid "Create shifts"
msgstr "Schichten erstellen"
-#: includes/pages/admin_shifts.php:80
+#: includes/pages/admin_shifts.php:82
msgid "Please select a location."
msgstr "Bitte einen Ort auswählen."
-#: includes/pages/admin_shifts.php:87
+#: includes/pages/admin_shifts.php:89
msgid "Please select a start time."
msgstr "Bitte eine Startzeit auswählen."
-#: includes/pages/admin_shifts.php:94
+#: includes/pages/admin_shifts.php:96
msgid "Please select an end time."
msgstr "Bitte eine Endzeit auswählen."
-#: includes/pages/admin_shifts.php:99
+#: includes/pages/admin_shifts.php:101
msgid "The shifts end has to be after its start."
msgstr "Die Endzeit muss nach der Startzeit liegen."
-#: includes/pages/admin_shifts.php:111
+#: includes/pages/admin_shifts.php:113
msgid "Please enter a shift duration in minutes."
msgstr "Gib bitte eine Schichtlänge in Minuten ein."
-#: includes/pages/admin_shifts.php:128
+#: includes/pages/admin_shifts.php:130
msgid "Please split the shift-change hours by colons."
msgstr "Trenne die Schichtwechselstunden mit einem Komma."
-#: includes/pages/admin_shifts.php:133
+#: includes/pages/admin_shifts.php:137
msgid "Please select a mode."
msgstr "Bitte einen Modus auswählen."
-#: includes/pages/admin_shifts.php:146
+#: includes/pages/admin_shifts.php:150
#, php-format
msgid "Please check the needed angels for team %s."
msgstr "Bitte gib die Anzahl der benötigten Engel vom Team %s an."
-#: includes/pages/admin_shifts.php:152
+#: includes/pages/admin_shifts.php:156
msgid "There are 0 angels needed. Please enter the amounts of needed angels."
msgstr "Es werden 0 Engel benötigt. Bitte ändere das."
-#: includes/pages/admin_shifts.php:156
+#: includes/pages/admin_shifts.php:160
msgid "Please select a mode for needed angels."
msgstr "Bitte wähle einen Modus für benötigte Engel."
-#: includes/pages/admin_shifts.php:160
+#: includes/pages/admin_shifts.php:164
msgid "Please select needed angels."
msgstr "Bitte wähle benötigte Engel."
-#: includes/pages/admin_shifts.php:323
+#: includes/pages/admin_shifts.php:335
msgid "Time and location"
msgstr "Zeit und Ort"
-#: includes/pages/admin_shifts.php:324
+#: includes/pages/admin_shifts.php:336
msgid "Type and title"
msgstr "Typ und Titel"
-#: includes/pages/admin_shifts.php:410
+#: includes/pages/admin_shifts.php:422
msgid "Mode"
msgstr "Modus"
-#: includes/pages/admin_shifts.php:411
+#: includes/pages/admin_shifts.php:423
msgid "Create one shift"
msgstr "Eine Schicht erstellen"
-#: includes/pages/admin_shifts.php:412
+#: includes/pages/admin_shifts.php:424
msgid "Create multiple shifts"
msgstr "Mehrere Schichten erstellen"
-#: includes/pages/admin_shifts.php:422
+#: includes/pages/admin_shifts.php:434
msgid "Create multiple shifts with variable length"
msgstr "Erstelle mehrere Schichten mit unterschiedlicher Länge"
-#: includes/pages/admin_shifts.php:428
+#: includes/pages/admin_shifts.php:440
msgid "Shift change hours"
msgstr "Schichtwechsel-Stunden"
-#: includes/pages/admin_shifts.php:438
+#: includes/pages/admin_shifts.php:447
+msgid "Create a shift over midnight."
+msgstr ""
+
+#: includes/pages/admin_shifts.php:455
msgid "Take needed angels from room settings"
msgstr "Übernehme benötigte Engel von den Raum-Einstellungen"
-#: includes/pages/admin_shifts.php:444
+#: includes/pages/admin_shifts.php:461
msgid "The following angels are needed"
msgstr "Die folgenden Engel werden benötigt"
-#: includes/pages/admin_user.php:11 includes/sys_menu.php:105
+#: includes/pages/admin_user.php:11 includes/sys_menu.php:113
msgid "All Angels"
msgstr "Engelliste"
@@ -1359,67 +1535,44 @@ msgstr "Engelliste"
msgid "This user does not exist."
msgstr "Benutzer existiert nicht."
-#: includes/pages/admin_user.php:69 includes/pages/guest_login.php:320
-#: includes/view/User_view.php:77
+#: includes/pages/admin_user.php:71 includes/pages/guest_login.php:307
+#: includes/view/User_view.php:81
msgid "Please select..."
msgstr "Bitte auswählen..."
-#: includes/pages/admin_user.php:74 includes/pages/admin_user.php:81
-#: includes/view/AngelTypes_view.php:84 includes/view/AngelTypes_view.php:91
-#: includes/view/AngelTypes_view.php:96 includes/view/AngelTypes_view.php:103
+#: includes/pages/admin_user.php:76 includes/pages/admin_user.php:83
+#: includes/view/AngelTypes_view.php:89 includes/view/AngelTypes_view.php:96
+#: includes/view/AngelTypes_view.php:101 includes/view/AngelTypes_view.php:108
msgid "Yes"
msgstr "Ja"
-#: includes/pages/admin_user.php:75 includes/pages/admin_user.php:83
-#: includes/view/AngelTypes_view.php:84 includes/view/AngelTypes_view.php:91
-#: includes/view/AngelTypes_view.php:97 includes/view/AngelTypes_view.php:103
+#: includes/pages/admin_user.php:77 includes/pages/admin_user.php:85
+#: includes/view/AngelTypes_view.php:89 includes/view/AngelTypes_view.php:96
+#: includes/view/AngelTypes_view.php:102 includes/view/AngelTypes_view.php:108
msgid "No"
msgstr "Nein"
-#: includes/pages/admin_user.php:93
+#: includes/pages/admin_user.php:95
msgid "Force active"
msgstr "Aktiv erzwingen"
-#: includes/pages/admin_user.php:110
+#: includes/pages/admin_user.php:112
msgid ""
"Please visit the angeltypes page or the users profile to manage users "
"angeltypes."
msgstr ""
"Bitte benutze die Engeltypen-Seite um die Engeltypen des Users zu verwalten."
-#: includes/pages/admin_user.php:308
+#: includes/pages/admin_user.php:314
msgid "Edit user"
msgstr "User bearbeiten"
-#: includes/pages/guest_credits.php:8
-msgid "Credits"
-msgstr "Credits"
-
-#: includes/pages/guest_login.php:16 includes/pages/guest_login.php:442
-#: includes/pages/guest_login.php:449 includes/view/User_view.php:124
-#: includes/view/User_view.php:128 resources/views/layouts/parts/navbar.twig:45
-msgid "Login"
-msgstr "Login"
-
-#: includes/pages/guest_login.php:24 includes/pages/guest_login.php:366
-#: resources/views/layouts/parts/navbar.twig:41
-msgid "Register"
-msgstr "Registrieren"
-
-#: includes/pages/guest_login.php:32 includes/sys_menu.php:69
-msgid "Logout"
-msgstr "Logout"
-
-#: includes/pages/guest_login.php:76 includes/pages/guest_login.php:495
-msgid "Registration is disabled."
-msgstr "Registrierung ist abgeschaltet."
-
-#: includes/pages/guest_login.php:92
+#: includes/pages/guest_login.php:77
msgid "Please enter a valid nick."
msgstr "Gib bitte einen erlaubten Nick an."
-#: includes/pages/guest_login.php:92 includes/pages/guest_login.php:290
-#: includes/view/User_view.php:39
+#: includes/pages/guest_login.php:77 includes/pages/guest_login.php:277
+#: includes/view/User_view.php:42
msgid ""
"Use up to 23 letters, numbers, connecting punctuations or spaces for your "
"nickname."
@@ -1427,29 +1580,41 @@ msgstr ""
"Verwende bis zu 23 Buchstaben, Zahlen, verbindende Schriftzeichen (.-_) oder "
"Leerzeichen für deinen Nick."
-#: includes/pages/guest_login.php:96
+#: includes/pages/guest_login.php:82
#, php-format
msgid "Your nick &quot;%s&quot; already exists."
msgstr "Der Nick &quot;%s&quot; existiert schon."
-#: includes/pages/guest_login.php:100 includes/pages/guest_login.php:422
+#: includes/pages/guest_login.php:86
msgid "Please enter a nickname."
msgstr "Gib bitte einen Nick an."
-#: includes/pages/guest_login.php:111
+#: includes/pages/guest_login.php:93 includes/pages/user_settings.php:32
+msgid "E-mail address is not correct."
+msgstr "Die E-Mail Adresse ist nicht in Ordnung."
+
+#: includes/pages/guest_login.php:97
msgid "E-mail address is already used by another user."
msgstr "Die E-Mail Adresse wurde bereits von einem anderen User benutzt."
-#: includes/pages/guest_login.php:131
+#: includes/pages/guest_login.php:101 includes/pages/user_settings.php:36
+msgid "Please enter your e-mail."
+msgstr "Bitte gib Deine E-Mail-Adresse ein."
+
+#: includes/pages/guest_login.php:117
msgid "Please select your shirt size."
msgstr "Bitte wähle Deine T-Shirt Größe."
-#: includes/pages/guest_login.php:143
+#: includes/pages/guest_login.php:124 includes/pages/user_settings.php:117
+msgid "Your passwords don't match."
+msgstr "Deine Passwörter stimmen nicht überein."
+
+#: includes/pages/guest_login.php:129
#, php-format
msgid "Your password is too short (please use at least %s characters)."
msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)."
-#: includes/pages/guest_login.php:154 includes/pages/guest_login.php:158
+#: includes/pages/guest_login.php:140 includes/pages/guest_login.php:144
#: includes/pages/user_settings.php:54
msgid ""
"Please enter your planned date of arrival. It should be after the buildup "
@@ -1458,15 +1623,15 @@ msgstr ""
"Bitte gib Dein geplantes Ankunftsdatum an. Es sollte nach dem Aufbaubeginn "
"und vor dem Abbauende liegen."
-#: includes/pages/guest_login.php:180 includes/pages/user_settings.php:79
+#: includes/pages/guest_login.php:166 includes/pages/user_settings.php:82
msgid "For dect numbers are only 40 digits allowed."
msgstr "Die DECT Nummer darf nur 40 Zeichen lang sein."
-#: includes/pages/guest_login.php:252
+#: includes/pages/guest_login.php:238
msgid "Angel registration successful!"
msgstr "Engel-Registrierung erfolgreich!"
-#: includes/pages/guest_login.php:281
+#: includes/pages/guest_login.php:267
msgid ""
"By completing this form you're registering as a Chaos-Angel. This script "
"will create you an account in the angel task scheduler."
@@ -1474,41 +1639,32 @@ msgstr ""
"Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in "
"der Engel-Aufgabenverwaltung."
-#: includes/pages/guest_login.php:297 includes/view/User_view.php:62
+#: includes/pages/guest_login.php:284 includes/view/User_view.php:66
#, php-format
msgid "The %s is allowed to send me an email (e.g. when my shifts change)"
msgstr "Das %s darf mir E-Mails senden (z.B. wenn sich meine Schichten ändern)"
-#: includes/pages/guest_login.php:304 includes/view/User_view.php:69
+#: includes/pages/guest_login.php:291 includes/view/User_view.php:73
msgid "Humans are allowed to send me an email (e.g. for ticket vouchers)"
msgstr "Menschen dürfen mir eine E-Mail senden (z.B. für Ticket Gutscheine)"
-#: includes/pages/guest_login.php:313 includes/view/User_view.php:44
+#: includes/pages/guest_login.php:300 includes/view/User_view.php:48
msgid "Planned date of arrival"
msgstr "Geplanter Ankunftstag"
-#: includes/pages/guest_login.php:319 includes/view/User_view.php:74
+#: includes/pages/guest_login.php:306 includes/view/User_view.php:78
msgid "Shirt size"
msgstr "T-Shirt Größe"
-#: includes/pages/guest_login.php:325 includes/pages/guest_login.php:448
-#: includes/view/User_view.php:127 includes/view/User_view.php:808
-msgid "Password"
-msgstr "Passwort"
-
-#: includes/pages/guest_login.php:328 includes/view/User_view.php:809
-msgid "Confirm password"
-msgstr "Passwort wiederholen"
-
-#: includes/pages/guest_login.php:333
+#: includes/pages/guest_login.php:320
msgid "What do you want to do?"
msgstr "Was möchtest Du machen?"
-#: includes/pages/guest_login.php:336
+#: includes/pages/guest_login.php:323
msgid "Description of job types"
msgstr "Beschreibung der Aufgaben"
-#: includes/pages/guest_login.php:343
+#: includes/pages/guest_login.php:330
msgid ""
"Restricted angel types need will be confirmed later by a supporter. You can "
"change your selection in the options section."
@@ -1516,50 +1672,22 @@ msgstr ""
"Beschränkte Engeltypen müssen später von einem Supporter freigeschaltet "
"werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
-#: includes/pages/guest_login.php:352 includes/view/User_view.php:57
+#: includes/pages/guest_login.php:339 includes/view/User_view.php:61
msgid "Mobile"
msgstr "Handy"
-#: includes/pages/guest_login.php:357 includes/view/User_view.php:41
+#: includes/pages/guest_login.php:344 includes/view/User_view.php:45
msgid "First name"
msgstr "Vorname"
-#: includes/pages/guest_login.php:360 includes/view/User_view.php:40
+#: includes/pages/guest_login.php:347 includes/view/User_view.php:44
msgid "Last name"
msgstr "Nachname"
-#: includes/pages/guest_login.php:363 includes/view/User_view.php:37
+#: includes/pages/guest_login.php:350 includes/view/User_view.php:38
msgid "Entry required!"
msgstr "Pflichtfeld!"
-#~ msgid "auth.no-password"
-#~ msgstr "Gib bitte ein Passwort ein."
-
-#~ msgid "auth.no-nickname"
-#~ msgstr "Gib bitte einen Nick an."
-
-#: includes/pages/guest_login.php:481
-#: includes/view/User_view.php:122
-msgid "I forgot my password"
-msgstr "Passwort vergessen"
-
-#: includes/pages/guest_login.php:456 includes/view/User_view.php:132
-msgid "Please note: You have to activate cookies!"
-msgstr "Hinweis: Cookies müssen aktiviert sein!"
-
-#: includes/pages/guest_login.php:467 includes/view/User_view.php:136
-msgid "What can I do?"
-msgstr "Was kann ich machen?"
-
-#: includes/pages/guest_login.php:468 includes/view/User_view.php:137
-msgid "Please read about the jobs you can do to help us."
-msgstr ""
-"Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst."
-
-#: includes/pages/guest_login.php:488
-msgid "Please sign up, if you want to help us!"
-msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
-
#: includes/pages/user_messages.php:11
msgid "Messages"
msgstr "Nachrichten"
@@ -1609,7 +1737,7 @@ msgstr "Übertragung wurde mit einem Fehler abgebrochen."
msgid "Wrong action."
msgstr "Falsche Aktion."
-#: includes/pages/user_myshifts.php:11 includes/view/Shifts_view.php:141
+#: includes/pages/user_myshifts.php:11 includes/view/Shifts_view.php:161
msgid "My shifts"
msgstr "Meine Schichten"
@@ -1617,7 +1745,7 @@ msgstr "Meine Schichten"
msgid "Key changed."
msgstr "Key geändert."
-#: includes/pages/user_myshifts.php:42 includes/view/User_view.php:646
+#: includes/pages/user_myshifts.php:42 includes/view/User_view.php:628
msgid "Reset API key"
msgstr "API-Key zurücksetzen"
@@ -1638,43 +1766,43 @@ msgstr "Fortfahren"
msgid "Please enter a freeload comment!"
msgstr "Gib bitte einen Schwänz-Kommentar ein!"
-#: includes/pages/user_myshifts.php:108
+#: includes/pages/user_myshifts.php:111
msgid "Shift saved."
msgstr "Schicht gespeichert."
-#: includes/pages/user_news.php:11
+#: includes/pages/user_news.php:10
msgid "News comments"
msgstr "News Kommentare"
-#: includes/pages/user_news.php:19 includes/sys_menu.php:86
+#: includes/pages/user_news.php:18 includes/sys_menu.php:94
msgid "News"
msgstr "News"
-#: includes/pages/user_news.php:27 includes/sys_menu.php:87
+#: includes/pages/user_news.php:26 includes/sys_menu.php:95
msgid "Meetings"
msgstr "Treffen"
-#: includes/pages/user_news.php:119
+#: includes/pages/user_news.php:113
msgid "Comments"
msgstr "Kommentare"
-#: includes/pages/user_news.php:160 includes/pages/user_news.php:229
+#: includes/pages/user_news.php:146 includes/pages/user_news.php:199
msgid "Entry saved."
msgstr "Eintrag gespeichert."
-#: includes/pages/user_news.php:181
+#: includes/pages/user_news.php:161
msgid "New Comment:"
msgstr "Neuer Kommentar:"
-#: includes/pages/user_news.php:187
+#: includes/pages/user_news.php:167
msgid "Invalid request."
msgstr "Ungültige Abfrage."
-#: includes/pages/user_news.php:268
+#: includes/pages/user_news.php:235
msgid "Create news:"
msgstr "News anlegen:"
-#: includes/pages/user_questions.php:11 includes/sys_menu.php:90
+#: includes/pages/user_questions.php:11 includes/sys_menu.php:98
#: includes/view/Questions_view.php:40
msgid "Ask the Heaven"
msgstr "Frag den Himmel"
@@ -1695,8 +1823,8 @@ msgstr "Unvollständiger Aufruf, fehlende Fragen ID."
msgid "No question found."
msgstr "Keine Frage gefunden."
-#: includes/pages/user_settings.php:11 includes/sys_menu.php:60
-#: includes/view/User_view.php:634
+#: includes/pages/user_settings.php:11 includes/sys_menu.php:69
+#: includes/view/User_view.php:616
msgid "Settings"
msgstr "Einstellungen"
@@ -1708,11 +1836,15 @@ msgstr ""
"Bitte gibt dein geplantes Abreisedatum an. Es sollte nach Deinem "
"Anreisedatum, nach dem Aufbaubeginn und vor dem Abbauende liegen."
-#: includes/pages/user_settings.php:108
+#: includes/pages/user_settings.php:113
msgid "-> not OK. Please try again."
msgstr "-> Nicht OK. Bitte erneut versuchen."
-#: includes/pages/user_settings.php:141
+#: includes/pages/user_settings.php:115
+msgid "Your password is to short (please use at least 6 characters)."
+msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
+
+#: includes/pages/user_settings.php:146
msgid "Theme changed."
msgstr "Aussehen geändert."
@@ -1732,70 +1864,70 @@ msgstr ""
"Die Administratoren haben noch keine Engeltypen konfiguriert - oder Du hast "
"noch keine Engeltypen ausgewählt."
-#: includes/pages/user_shifts.php:206
+#: includes/pages/user_shifts.php:204
msgid "occupied"
msgstr "belegt"
-#: includes/pages/user_shifts.php:210
+#: includes/pages/user_shifts.php:208
msgid "free"
msgstr "frei"
-#: includes/pages/user_shifts.php:255
+#: includes/pages/user_shifts.php:253
msgid "Own"
msgstr "Eigene"
-#: includes/pages/user_shifts.php:259
+#: includes/pages/user_shifts.php:258
msgid "Occupancy"
msgstr "Belegung"
-#: includes/pages/user_shifts.php:262
+#: includes/pages/user_shifts.php:261
msgid ""
"The tasks shown here are influenced by the angeltypes you joined already!"
msgstr ""
"Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen "
"(Engeltypen/Aufgaben) abhängig!"
-#: includes/pages/user_shifts.php:264
+#: includes/pages/user_shifts.php:263
msgid "Description of the jobs."
msgstr "Beschreibung der Aufgaben."
-#: includes/pages/user_shifts.php:268
+#: includes/pages/user_shifts.php:267
msgid "Filter"
msgstr "Filter"
-#: includes/pages/user_shifts.php:269
+#: includes/pages/user_shifts.php:268
msgid "Yesterday"
msgstr "Gestern"
-#: includes/pages/user_shifts.php:270
+#: includes/pages/user_shifts.php:269
msgid "Today"
msgstr "Heute"
-#: includes/pages/user_shifts.php:271
+#: includes/pages/user_shifts.php:270
msgid "Tomorrow"
msgstr "Morgen"
-#: includes/pages/user_shifts.php:272
+#: includes/pages/user_shifts.php:271
msgid "last 8h"
msgstr "letzte 8h"
-#: includes/pages/user_shifts.php:273
+#: includes/pages/user_shifts.php:272
msgid "last 4h"
msgstr "letzte 4h"
-#: includes/pages/user_shifts.php:274
+#: includes/pages/user_shifts.php:273
msgid "next 4h"
msgstr "nächste 4h"
-#: includes/pages/user_shifts.php:275
+#: includes/pages/user_shifts.php:274
msgid "next 8h"
msgstr "nächste 8h"
-#: includes/pages/user_shifts.php:292
+#: includes/pages/user_shifts.php:291
msgid "iCal export"
msgstr "iCal Export"
-#: includes/pages/user_shifts.php:294
+#: includes/pages/user_shifts.php:293
#, php-format
msgid ""
"Export your own shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1806,19 +1938,23 @@ msgstr ""
"\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
"\">API-Key zurücksetzen</a>)."
-#: includes/pages/user_shifts.php:327 includes/view/ShiftTypes_view.php:48
+#: includes/pages/user_shifts.php:326 includes/view/ShiftTypes_view.php:48
msgid "All"
msgstr "Alle"
-#: includes/pages/user_shifts.php:328
+#: includes/pages/user_shifts.php:327
msgid "None"
msgstr "Keine"
-#: includes/sys_menu.php:133
+#: includes/sys_menu.php:78
+msgid "Logout"
+msgstr "Logout"
+
+#: includes/sys_menu.php:141
msgid "Admin"
msgstr "Admin"
-#: includes/sys_menu.php:155
+#: includes/sys_menu.php:163
msgid "Manage rooms"
msgstr "Verwalte Räume"
@@ -1826,24 +1962,24 @@ msgstr "Verwalte Räume"
msgid "No data found."
msgstr "Nichts gefunden."
-#: includes/view/AngelTypes_view.php:35 includes/view/AngelTypes_view.php:449
+#: includes/view/AngelTypes_view.php:40 includes/view/AngelTypes_view.php:454
msgid "Unconfirmed"
msgstr "Unbestätigt"
-#: includes/view/AngelTypes_view.php:37 includes/view/AngelTypes_view.php:41
+#: includes/view/AngelTypes_view.php:42 includes/view/AngelTypes_view.php:46
msgid "Supporter"
msgstr "Supporter"
-#: includes/view/AngelTypes_view.php:39 includes/view/AngelTypes_view.php:43
+#: includes/view/AngelTypes_view.php:44 includes/view/AngelTypes_view.php:48
msgid "Member"
msgstr "Mitglied"
-#: includes/view/AngelTypes_view.php:55
+#: includes/view/AngelTypes_view.php:60
#, php-format
msgid "Do you want to delete angeltype %s?"
msgstr "Möchtest Du den Engeltypen %s löschen?"
-#: includes/view/AngelTypes_view.php:58 includes/view/ShiftEntry_view.php:27
+#: includes/view/AngelTypes_view.php:63 includes/view/ShiftEntry_view.php:27
#: includes/view/ShiftEntry_view.php:56 includes/view/ShiftTypes_view.php:25
#: includes/view/UserAngelTypes_view.php:27
#: includes/view/UserAngelTypes_view.php:55
@@ -1855,12 +1991,12 @@ msgstr "Möchtest Du den Engeltypen %s löschen?"
msgid "cancel"
msgstr "abbrechen"
-#: includes/view/AngelTypes_view.php:84 includes/view/AngelTypes_view.php:85
-#: includes/view/AngelTypes_view.php:500
+#: includes/view/AngelTypes_view.php:89 includes/view/AngelTypes_view.php:90
+#: includes/view/AngelTypes_view.php:505
msgid "Restricted"
msgstr "Beschränkt"
-#: includes/view/AngelTypes_view.php:88
+#: includes/view/AngelTypes_view.php:93
msgid ""
"Restricted angel types can only be used by an angel if enabled by a "
"supporter (double opt-in)."
@@ -1868,31 +2004,31 @@ msgstr ""
"Beschränkte Engeltypen müssen von einem Supporter freigeschaltet werden "
"(double-opt-in)."
-#: includes/view/AngelTypes_view.php:91 includes/view/AngelTypes_view.php:92
+#: includes/view/AngelTypes_view.php:96 includes/view/AngelTypes_view.php:97
msgid "No Self Sign Up"
msgstr "Kein Selbst-Eintragen"
-#: includes/view/AngelTypes_view.php:94 includes/view/AngelTypes_view.php:100
+#: includes/view/AngelTypes_view.php:99 includes/view/AngelTypes_view.php:105
msgid "Requires driver license"
msgstr "Benötigt Führerschein"
-#: includes/view/AngelTypes_view.php:103 includes/view/AngelTypes_view.php:104
+#: includes/view/AngelTypes_view.php:108 includes/view/AngelTypes_view.php:109
msgid "Show on dashboard"
msgstr "Auf dem Dashboard anzeigen"
-#: includes/view/AngelTypes_view.php:107 includes/view/AngelTypes_view.php:474
+#: includes/view/AngelTypes_view.php:112 includes/view/AngelTypes_view.php:479
msgid "Contact"
msgstr "Kontakt"
-#: includes/view/AngelTypes_view.php:110
+#: includes/view/AngelTypes_view.php:115
msgid "Primary contact person/desk for user questions."
msgstr "Ansprechpartner für Fragen."
-#: includes/view/AngelTypes_view.php:140
+#: includes/view/AngelTypes_view.php:145
msgid "my driving license"
msgstr "Meine Führerschein-Infos"
-#: includes/view/AngelTypes_view.php:152
+#: includes/view/AngelTypes_view.php:157
msgid ""
"This angeltype requires a driver license. Please enter your driver license "
"information!"
@@ -1900,7 +2036,7 @@ msgstr ""
"Dieser Engeltyp benötigt Führerschein-Infos. Bitte trage Deine Führerschein-"
"Infos ein!"
-#: includes/view/AngelTypes_view.php:157
+#: includes/view/AngelTypes_view.php:162
#, php-format
msgid ""
"You are unconfirmed for this angeltype. Please go to the introduction for %s "
@@ -1909,86 +2045,86 @@ msgstr ""
"Du bist noch nicht für diesen Engeltyp bestätigt. Bitte gehe zur Einführung "
"für %s um bestätigt zu werden."
-#: includes/view/AngelTypes_view.php:219
+#: includes/view/AngelTypes_view.php:224
msgid "confirm"
msgstr "bestätigen"
-#: includes/view/AngelTypes_view.php:227
+#: includes/view/AngelTypes_view.php:232
msgid "deny"
msgstr "ablehnen"
-#: includes/view/AngelTypes_view.php:265
+#: includes/view/AngelTypes_view.php:270
msgid "remove"
msgstr "entfernen"
-#: includes/view/AngelTypes_view.php:295
+#: includes/view/AngelTypes_view.php:300
msgid "Driver"
msgstr "Fahrer"
-#: includes/view/AngelTypes_view.php:296
+#: includes/view/AngelTypes_view.php:301
msgid "Has car"
msgstr "Hat Auto"
-#: includes/view/AngelTypes_view.php:297
+#: includes/view/AngelTypes_view.php:302
#: includes/view/UserDriverLicenses_view.php:31
msgid "Car"
msgstr "Auto"
-#: includes/view/AngelTypes_view.php:298
+#: includes/view/AngelTypes_view.php:303
msgid "3,5t Transporter"
msgstr "3,5t Transporter"
-#: includes/view/AngelTypes_view.php:299
+#: includes/view/AngelTypes_view.php:304
msgid "7,5t Truck"
msgstr "7,5t LKW"
-#: includes/view/AngelTypes_view.php:300
+#: includes/view/AngelTypes_view.php:305
msgid "12,5t Truck"
msgstr "12,5t LKW"
-#: includes/view/AngelTypes_view.php:301
+#: includes/view/AngelTypes_view.php:306
#: includes/view/UserDriverLicenses_view.php:49
msgid "Forklift"
msgstr "Gabelstapler"
-#: includes/view/AngelTypes_view.php:345
+#: includes/view/AngelTypes_view.php:350
msgid "Info"
msgstr "Info"
-#: includes/view/AngelTypes_view.php:413
+#: includes/view/AngelTypes_view.php:418
msgid "Supporters"
msgstr "Supporter"
-#: includes/view/AngelTypes_view.php:433
+#: includes/view/AngelTypes_view.php:438
msgid "Members"
msgstr "Mitglieder"
-#: includes/view/AngelTypes_view.php:441
+#: includes/view/AngelTypes_view.php:446
#: includes/view/UserAngelTypes_view.php:154
msgid "Add"
msgstr "Hinzufügen"
-#: includes/view/AngelTypes_view.php:453
+#: includes/view/AngelTypes_view.php:458
msgid "confirm all"
msgstr "Alle bestätigen"
-#: includes/view/AngelTypes_view.php:457
+#: includes/view/AngelTypes_view.php:462
msgid "deny all"
msgstr "Alle ablehnen"
-#: includes/view/AngelTypes_view.php:494
+#: includes/view/AngelTypes_view.php:499
msgid "New angeltype"
msgstr "Neuer Engeltyp"
-#: includes/view/AngelTypes_view.php:501
+#: includes/view/AngelTypes_view.php:506
msgid "Self Sign Up Allowed"
msgstr "Selbst-Eintragen erlaubt"
-#: includes/view/AngelTypes_view.php:502
+#: includes/view/AngelTypes_view.php:507
msgid "Membership"
msgstr "Mitgliedschaft"
-#: includes/view/AngelTypes_view.php:546
+#: includes/view/AngelTypes_view.php:551
msgid ""
"This angeltype is restricted by double-opt-in by a team supporter. Please "
"show up at the according introduction meetings."
@@ -1996,11 +2132,11 @@ msgstr ""
"Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet "
"werden. Bitte komme zu den entsprechenden Einführungstreffen."
-#: includes/view/AngelTypes_view.php:581
+#: includes/view/AngelTypes_view.php:586
msgid "FAQ"
msgstr "FAQ"
-#: includes/view/AngelTypes_view.php:586
+#: includes/view/AngelTypes_view.php:591
msgid ""
"Here is the list of teams and their tasks. If you have questions, read the "
"FAQ."
@@ -2008,53 +2144,6 @@ msgstr ""
"Hier ist die Liste der Teams und ihrer Aufgaben. Wenn Du Fragen hast, schaue "
"im FAQ nach."
-#: includes/view/EventConfig_view.php:27
-#, php-format
-msgid "Welcome to the %s!"
-msgstr "Willkommen beim %s!"
-
-#: includes/view/EventConfig_view.php:34
-msgid "Buildup starts"
-msgstr "Aufbau startet"
-
-#: includes/view/EventConfig_view.php:36 includes/view/EventConfig_view.php:44
-#: includes/view/EventConfig_view.php:52 includes/view/EventConfig_view.php:60
-#: includes/view/Shifts_view.php:27 includes/view/Shifts_view.php:35
-#: resources/views/layouts/parts/footer.twig:9
-#: resources/views/layouts/parts/footer.twig:10
-#: resources/views/layouts/parts/footer.twig:15
-#: resources/views/layouts/parts/footer.twig:22
-#: resources/views/layouts/parts/footer.twig:23
-msgid "Y-m-d"
-msgstr "d.m.Y"
-
-#: includes/view/EventConfig_view.php:42
-msgid "Event starts"
-msgstr "Event startet"
-
-#: includes/view/EventConfig_view.php:50
-msgid "Event ends"
-msgstr "Event endet"
-
-#: includes/view/EventConfig_view.php:58
-msgid "Teardown ends"
-msgstr "Abbau endet"
-
-#: includes/view/EventConfig_view.php:82
-#, php-format
-msgid "%s, from %s to %s"
-msgstr "%s, vom %s bis %s"
-
-#: includes/view/EventConfig_view.php:92
-#, php-format
-msgid "%s, starting %s"
-msgstr "%s, ab dem %s"
-
-#: includes/view/EventConfig_view.php:100
-#, php-format
-msgid "Event from %s to %s"
-msgstr "Event von %s bis %s"
-
#: includes/view/EventConfig_view.php:91
msgid "Event Name"
msgstr "Event Name"
@@ -2144,41 +2233,41 @@ msgstr "Schicht ist voll"
#: includes/view/ShiftCalendarRenderer.php:316
msgid "Shift running/ended or user not arrived/allowed"
-msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen/darfst dich noch nicht anmelden"
+msgstr ""
+"Schicht läuft/vorbei oder du bist noch nicht angekommen/darfst dich noch "
+"nicht anmelden"
-#: includes/view/ShiftCalendarShiftRenderer.php:134
+#: includes/view/ShiftCalendarShiftRenderer.php:135
msgid "Add more angels"
msgstr "Neue Engel hinzufügen"
-#: includes/view/ShiftCalendarShiftRenderer.php:179
+#: includes/view/ShiftCalendarShiftRenderer.php:180
#, php-format
msgid "%d helper needed"
msgid_plural "%d helpers needed"
msgstr[0] "%d Helfer benötigt"
msgstr[1] "%d Helfer benötigt"
-#: includes/view/ShiftCalendarShiftRenderer.php:192
-#: includes/view/Shifts_view.php:84
+#: includes/view/ShiftCalendarShiftRenderer.php:193
+#: includes/view/Shifts_view.php:85
msgid "Sign up"
msgstr "Eintragen"
-#: includes/view/ShiftCalendarShiftRenderer.php:198
+#: includes/view/ShiftCalendarShiftRenderer.php:199
msgid "ended"
msgstr "vorbei"
-msgid "not yet"
-msgstr "noch nicht"
-
-msgid "This shift is in the far future and becomes available for signup at %s."
-msgstr "Diese Schicht liegt in der fernen Zukunft und du kannst dich ab %s eintragen."
-
# Wie ist dies zu verstehen bitte?
-#: includes/view/ShiftCalendarShiftRenderer.php:203
+#: includes/view/ShiftCalendarShiftRenderer.php:204
msgid "please arrive for signup"
msgstr "Ankommen zum Eintragen"
-#: includes/view/ShiftCalendarShiftRenderer.php:218
-#: includes/view/Shifts_view.php:88
+#: includes/view/ShiftCalendarShiftRenderer.php:208
+msgid "not yet"
+msgstr "noch nicht"
+
+#: includes/view/ShiftCalendarShiftRenderer.php:223
+#: includes/view/Shifts_view.php:89
#, php-format
msgid "Become %s"
msgstr "Werde ein %s"
@@ -2217,7 +2306,7 @@ msgstr "Möchtest du den folgenden User als %s in die Schicht eintragen?"
msgid "Do you want to sign up for this shift as %s?"
msgstr "Möchtest du dich für diese Schicht als %s eintragen?"
-#: includes/view/ShiftEntry_view.php:140 includes/view/ShiftEntry_view.php:198
+#: includes/view/ShiftEntry_view.php:140 includes/view/ShiftEntry_view.php:192
msgid "Comment (for your eyes only):"
msgstr "Kommentar (nur für Dich):"
@@ -2225,8 +2314,8 @@ msgstr "Kommentar (nur für Dich):"
msgid "Shift signup"
msgstr "Schicht Anmeldung"
-#: includes/view/ShiftEntry_view.php:182 includes/view/User_view.php:406
-#: includes/view/User_view.php:408
+#: includes/view/ShiftEntry_view.php:182 includes/view/User_view.php:390
+#: includes/view/User_view.php:392
msgid "Freeloaded"
msgstr "Geschwänzt"
@@ -2234,27 +2323,27 @@ msgstr "Geschwänzt"
msgid "Freeload comment (Only for shift coordination):"
msgstr "Schwänzer Kommentar (Nur für die Schicht-Koordination):"
-#: includes/view/ShiftEntry_view.php:190
+#: includes/view/ShiftEntry_view.php:197
msgid "Edit shift entry"
msgstr "Schichteintrag bearbeiten"
-#: includes/view/ShiftEntry_view.php:193
+#: includes/view/ShiftEntry_view.php:200
msgid "Angel:"
msgstr "Engel:"
-#: includes/view/ShiftEntry_view.php:194
+#: includes/view/ShiftEntry_view.php:201
msgid "Date, Duration:"
msgstr "Termin, Dauer:"
-#: includes/view/ShiftEntry_view.php:195
+#: includes/view/ShiftEntry_view.php:202
msgid "Location:"
msgstr "Ort:"
-#: includes/view/ShiftEntry_view.php:196
+#: includes/view/ShiftEntry_view.php:203
msgid "Title:"
msgstr "Titel:"
-#: includes/view/ShiftEntry_view.php:197
+#: includes/view/ShiftEntry_view.php:204
msgid "Type:"
msgstr "Typ:"
@@ -2280,20 +2369,26 @@ msgstr "für Team %s"
msgid "New shifttype"
msgstr "Neuer Schichttyp"
-#: includes/view/Shifts_view.php:41 includes/view/User_view.php:590
+#: includes/view/Shifts_view.php:42 includes/view/User_view.php:570
msgid "Location"
msgstr "Ort"
-#: includes/view/Shifts_view.php:56
+#: includes/view/Shifts_view.php:57
#, php-format
msgid "created at %s by %s"
msgstr "erstellt am %s von %s"
-#: includes/view/Shifts_view.php:63
+#: includes/view/Shifts_view.php:64
#, php-format
msgid "edited at %s by %s"
msgstr "bearbeitet am %s von %s"
+#: includes/view/Shifts_view.php:147
+#, php-format
+msgid "This shift is in the far future and becomes available for signup at %s."
+msgstr ""
+"Diese Schicht liegt in der fernen Zukunft und du kannst dich ab %s eintragen."
+
#: includes/view/UserAngelTypes_view.php:18
#, php-format
msgid "Do you really want to add supporter rights for %s to %s?"
@@ -2304,6 +2399,14 @@ msgstr "Sollen %s %s als neuen Supporter bekommen?"
msgid "Do you really want to remove supporter rights for %s from %s?"
msgstr "Möchtest Du wirklich %s von %s als Supporter befreien?"
+#: includes/view/UserAngelTypes_view.php:29
+#: includes/view/UserAngelTypes_view.php:57
+#: includes/view/UserAngelTypes_view.php:75
+#: includes/view/UserAngelTypes_view.php:99
+#: includes/view/UserAngelTypes_view.php:123
+msgid "yes"
+msgstr "Ja"
+
#: includes/view/UserAngelTypes_view.php:47
#, php-format
msgid "Do you really want to deny all users for %s?"
@@ -2355,8 +2458,8 @@ msgid ""
"I have my own car with me and am willing to use it for the event (You'll get "
"reimbursed for fuel)"
msgstr ""
-"Ich habe mein eigenes Auto dabei und möchte es zum Fahren für das "
-"Event verwenden (Du wirst für Spritkosten entschädigt)"
+"Ich habe mein eigenes Auto dabei und möchte es zum Fahren für das Event "
+"verwenden (Du wirst für Spritkosten entschädigt)"
#: includes/view/UserDriverLicenses_view.php:30
msgid "Driver license"
@@ -2391,7 +2494,7 @@ msgstr "Einsatzdatum"
msgid "Work hours"
msgstr "Arbeitsstunden"
-#: includes/view/UserWorkLog_view.php:48 includes/view/User_view.php:592
+#: includes/view/UserWorkLog_view.php:48 includes/view/User_view.php:572
msgid "Comment"
msgstr "Kommentar"
@@ -2403,55 +2506,51 @@ msgstr "Arbeitseinsatz bearbeiten"
msgid "Add work log entry"
msgstr "Arbeitseinsatz hinzufügen"
-#: includes/view/User_view.php:36
+#: includes/view/User_view.php:37
msgid "Here you can change your user details."
msgstr "Hier kannst Du Deine Details ändern."
-#: includes/view/User_view.php:51
+#: includes/view/User_view.php:55
msgid "Planned date of departure"
msgstr "Geplanter Abreisetag"
-#: includes/view/User_view.php:79
+#: includes/view/User_view.php:83
msgid "Please visit the angeltypes page to manage your angeltypes."
msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
-#: includes/view/User_view.php:85
+#: includes/view/User_view.php:89
msgid "Here you can change your password."
msgstr "Hier kannst Du Dein Passwort ändern."
-#: includes/view/User_view.php:86
+#: includes/view/User_view.php:90
msgid "Old password:"
msgstr "Altes Passwort:"
-#: includes/view/User_view.php:87
+#: includes/view/User_view.php:91
msgid "New password:"
msgstr "Neues Passwort:"
-#: includes/view/User_view.php:88
+#: includes/view/User_view.php:92
msgid "Password confirmation:"
msgstr "Passwort wiederholen:"
-#: includes/view/User_view.php:92
+#: includes/view/User_view.php:96
msgid "Here you can choose your color settings:"
msgstr "Hier kannst Du das Aussehen auswählen:"
-#: includes/view/User_view.php:93
+#: includes/view/User_view.php:97
msgid "Color settings:"
msgstr "Aussehen:"
-#: includes/view/User_view.php:97
+#: includes/view/User_view.php:101
msgid "Here you can choose your language:"
msgstr "Hier kannst Du Deine Sprache auswählen:"
-#: includes/view/User_view.php:98
+#: includes/view/User_view.php:102
msgid "Language:"
msgstr "Sprache:"
-#: includes/view/User_view.php:117
-msgid "Registration successful"
-msgstr "Registrierung erfolgreich"
-
-#: includes/view/User_view.php:160
+#: includes/view/User_view.php:124
msgid ""
"Do you really want to delete the user including all his shifts and every "
"other piece of his data?"
@@ -2459,146 +2558,142 @@ msgstr ""
"Möchtest Du wirklich den Engel inklusive aller seiner Schichten und allen "
"anderen seiner Daten löschen?"
-#: includes/view/User_view.php:164
+#: includes/view/User_view.php:128
msgid "Your password"
msgstr "Dein Passwort"
-#: includes/view/User_view.php:184
+#: includes/view/User_view.php:148
#, php-format
msgid "Angel should receive at least %d vouchers."
msgstr "Engel sollte mindestens %d Gutscheine bekommen."
-#: includes/view/User_view.php:189
+#: includes/view/User_view.php:153
msgid "Number of vouchers given out"
msgstr "Anzahl Gutscheine bekommen"
-#: includes/view/User_view.php:232
-msgid "m/d/Y h:i a"
-msgstr "d.m.Y H:i"
-
-#: includes/view/User_view.php:252
-msgid "New user"
-msgstr "Neuer User"
-
-#: includes/view/User_view.php:256
+#: includes/view/User_view.php:221
msgid "Prename"
msgstr "Vorname"
-#: includes/view/User_view.php:259 includes/view/User_view.php:715
+#: includes/view/User_view.php:227 includes/view/User_view.php:697
msgid "Arrived"
msgstr "Angekommen"
-#: includes/view/User_view.php:260
+#: includes/view/User_view.php:228
msgid "Voucher"
msgstr "Gutschein"
-#: includes/view/User_view.php:261
+#: includes/view/User_view.php:229
msgid "Freeloads"
msgstr "Schwänzereien"
-#: includes/view/User_view.php:262 includes/view/User_view.php:752
+#: includes/view/User_view.php:230 includes/view/User_view.php:734
msgid "Active"
msgstr "Aktiv"
-#: includes/view/User_view.php:264 includes/view/User_view.php:755
+#: includes/view/User_view.php:232 includes/view/User_view.php:737
msgid "T-Shirt"
msgstr "T-Shirt"
-#: includes/view/User_view.php:266
+#: includes/view/User_view.php:244
msgid "Last login"
msgstr "Letzter Login"
-#: includes/view/User_view.php:299
+#: includes/view/User_view.php:250
+msgid "New user"
+msgstr "Neuer User"
+
+#: includes/view/User_view.php:283
msgid "Free"
msgstr "Frei"
-#: includes/view/User_view.php:307 includes/view/User_view.php:311
+#: includes/view/User_view.php:291 includes/view/User_view.php:295
#, php-format
msgid "Next shift %c"
msgstr "Nächste Schicht %c"
-#: includes/view/User_view.php:318
+#: includes/view/User_view.php:302
#, php-format
msgid "Shift started %c"
msgstr "Schicht startete %c"
-#: includes/view/User_view.php:323
+#: includes/view/User_view.php:307
#, php-format
msgid "Shift ends %c"
msgstr "Schicht endet %c"
-#: includes/view/User_view.php:340
+#: includes/view/User_view.php:324
#, php-format
msgid "Shift ended %c"
msgstr "Schicht endete %c"
-#: includes/view/User_view.php:425
+#: includes/view/User_view.php:409
msgid "sign off"
msgstr "abmelden"
-#: includes/view/User_view.php:481
+#: includes/view/User_view.php:461
msgid "Sum:"
msgstr "Summe:"
-#: includes/view/User_view.php:490
+#: includes/view/User_view.php:470
msgid "Your t-shirt score"
msgstr "Dein T-Shirt Score"
-#: includes/view/User_view.php:531
+#: includes/view/User_view.php:511
msgid "Work log entry"
msgstr "Arbeitseinsatz"
-#: includes/view/User_view.php:534
+#: includes/view/User_view.php:514
#, php-format
msgid "Added by %s at %s"
msgstr "Erstellt von %s am %s"
-#: includes/view/User_view.php:588
+#: includes/view/User_view.php:568
msgid "Day &amp; time"
msgstr "Tag &amp; Zeit"
-#: includes/view/User_view.php:589
+#: includes/view/User_view.php:569
msgid "Duration"
msgstr "Dauer"
-#: includes/view/User_view.php:591
+#: includes/view/User_view.php:571
msgid "Name &amp; workmates"
msgstr "Name &amp; Kollegen"
-#: includes/view/User_view.php:593
+#: includes/view/User_view.php:573
msgid "Action"
msgstr "Aktion"
-#: includes/view/User_view.php:596
+#: includes/view/User_view.php:576
msgid "You have done enough to get a t-shirt."
msgstr "Du hast genug für ein T-Shirt gemacht."
-#: includes/view/User_view.php:615
+#: includes/view/User_view.php:595
msgid "driving license"
msgstr "Führerschein"
-#: includes/view/User_view.php:626
+#: includes/view/User_view.php:608
msgid "Edit vouchers"
msgstr "Gutschein bearbeiten"
-#: includes/view/User_view.php:630
+#: includes/view/User_view.php:612
msgid "Add work log"
msgstr "Neuer Arbeitseinsatz"
-#: includes/view/User_view.php:638
+#: includes/view/User_view.php:620
msgid "iCal Export"
msgstr "iCal Export"
-#: includes/view/User_view.php:642
+#: includes/view/User_view.php:624
msgid "JSON Export"
msgstr "JSON Export"
-#: includes/view/User_view.php:663
+#: includes/view/User_view.php:645
#, php-format
msgid "Your night shifts between %d and %d am count twice."
msgstr "Deine Nachtschichten zwischen %d und %d Uhr zählen doppelt."
-#: includes/view/User_view.php:671
+#: includes/view/User_view.php:653
#, php-format
msgid ""
"Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2607,65 +2702,48 @@ msgstr ""
"Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
"einzutragen."
-#: includes/view/User_view.php:697
+#: includes/view/User_view.php:679
msgid "User state"
msgstr "Engelzustand"
-#: includes/view/User_view.php:717
+#: includes/view/User_view.php:699
msgid "Not arrived"
msgstr "Nicht angekommen"
-#: includes/view/User_view.php:736
+#: includes/view/User_view.php:718
msgid "Freeloader"
msgstr "Schwänzer"
-#: includes/view/User_view.php:744
+#: includes/view/User_view.php:726
#, php-format
msgid "Arrived at %s"
msgstr "Angekommen am %s"
-#: includes/view/User_view.php:750
+#: includes/view/User_view.php:732
msgid "Active (forced)"
msgstr "Aktiv (gezwungen)"
-#: includes/view/User_view.php:761
+#: includes/view/User_view.php:743
#, php-format
msgid "Not arrived (Planned: %s)"
msgstr "Nicht angekommen (Geplant: %s)"
-#: includes/view/User_view.php:696
+#: includes/view/User_view.php:753
#, php-format
msgid "Got %s voucher"
msgid_plural "Got %s vouchers"
msgstr[0] "Einen Gutschein bekommen"
msgstr[1] "%s Gutscheine bekommen"
-#: includes/view/User_view.php:774
+#: includes/view/User_view.php:756
msgid "Got no vouchers"
msgstr "Gutschein nicht bekommen"
-#: includes/view/User_view.php:789
-msgid ""
-"We will send you an e-mail with a password recovery link. Please use the "
-"email address you used for registration."
-msgstr ""
-"Wir werden eine eMail mit einem Link schicken, mit dem du das Passwort "
-"zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
-"verwendet hast."
-
-#: includes/view/User_view.php:792
-msgid "Recover"
-msgstr "Wiederherstellen"
-
-#: includes/view/User_view.php:806
-msgid "Please enter a new password."
-msgstr "Gib bitte ein neues Passwort ein."
-
-#: includes/view/User_view.php:850
+#: includes/view/User_view.php:797
msgid "Rights"
msgstr "Rechte"
-#: includes/view/User_view.php:901
+#: includes/view/User_view.php:853
msgid ""
"Please enter your planned date of departure on your settings page to give us "
"a feeling for teardown capacities."
@@ -2673,7 +2751,7 @@ msgstr ""
"Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
"Planung bekommen."
-#: includes/view/User_view.php:915
+#: includes/view/User_view.php:867
#, php-format
msgid ""
"You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -2682,7 +2760,7 @@ msgstr ""
"Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
"gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
-#: includes/view/User_view.php:934
+#: includes/view/User_view.php:886
msgid ""
"You are not marked as arrived. Please go to heaven's desk, get your angel "
"badge and/or tell them that you arrived already."
@@ -2690,11 +2768,11 @@ msgstr ""
"Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
"hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
-#: includes/view/User_view.php:947
+#: includes/view/User_view.php:899
msgid "You need to specify a tshirt size in your settings!"
msgstr "Bitte eine T-Shirt-Größe auswählen"
-#: includes/view/User_view.php:961
+#: includes/view/User_view.php:913
msgid ""
"You need to specify a DECT phone number in your settings! If you don't have "
"a DECT phone, just enter '-'."
@@ -2702,78 +2780,29 @@ msgstr ""
"Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
"keine Nummer hast, bitte einfach \"-\" angeben."
-#: resources/views/emails/mail.twig:1
-#, python-format
-msgid "Hi %s,"
-msgstr "Hallo %s,"
-
-#: resources/views/emails/mail.twig:3
-#, python-format
-msgid "here is a message for you from the %s:"
-msgstr "hier ist eine Nachricht aus dem %s für Dich:"
-
-#: resources/views/emails/mail.twig:6
-#, python-format
-msgid ""
-"This email is autogenerated and has not been signed. You got this email "
-"because you are registered in the %s."
+#: src/Middleware/LegacyMiddleware.php:83
+msgid "page.404.text"
msgstr ""
-"Diese E-Mail wurde automatisch generiert und muss daher nicht unterschrieben "
-"werden. Du hast diese E-Mail bekommen, weil Du im %s registriert bist."
-
-#: resources/views/errors/403.twig:3
-msgid "Forbidden"
-msgstr "Nicht erlaubt"
-
-#: resources/views/errors/403.twig:5
-msgid "You are not allowed to access this page"
-msgstr "Du darfst diese Seite nicht aufrufen"
-
-#: resources/views/errors/404.twig:3
-msgid "Page not found"
-msgstr "Seite nicht gefunden"
-
-#: resources/views/errors/404.twig:10
-msgid "No sleep found"
-msgstr "No sleep found"
+"Diese Seite existiert nicht oder Du hast keinen Zugriff. Melde Dich an um "
+"Zugriff zu erhalten!"
-#: resources/views/errors/419.twig:3
-msgid "Authentication expired"
-msgstr "Autorisierung ist abgelaufen"
+#~ msgid "Token is not correct."
+#~ msgstr "Der Token ist nicht in Ordnung."
-#: resources/views/errors/419.twig:6
-msgid "The provided CSRF token is invalid or has expired"
-msgstr "Das angegebene CSRF Token ist ungültig oder abgelaufen"
+#~ msgid "Needed shirts"
+#~ msgstr "Benötigte T-Shirts"
-#: resources/views/layouts/parts/footer.twig:34
-msgid "Bugs / Features"
-msgstr "Bugs / Features"
+#~ msgid "Only confirmed"
+#~ msgstr "Nur bestätigte"
-#: resources/views/layouts/parts/footer.twig:35
-msgid "Development Platform"
-msgstr "Entwicklerplattform"
+#~ msgid "Registration successful"
+#~ msgstr "Registrierung erfolgreich"
-#: src/Middleware/LegacyMiddleware.php
-msgid "page.404.text"
-msgstr ""
-"Diese Seite existiert nicht oder Du hast keinen Zugriff. Melde Dich an um "
-"Zugriff zu erhalten!"
+#~ msgid "Please enter a new password."
+#~ msgstr "Gib bitte ein neues Passwort ein."
-msgid "form.submit"
-msgstr "Absenden"
-
-msgid "credits.credit"
-msgstr ""
-"Das ursprüngliche Engelsystem wurde entwickelt von "
-"[cookie](https://github.com/cookieBerlin/engelsystem)"
-". Danach wurde es von "
-"[msquare](https://notrademark.de)"
-" (Maintainer) und "
-"[MyIgel](https://myigel.name)"
-" völlig überarbeitet und verbessert."
+#~ msgid "auth.no-password"
+#~ msgstr "Gib bitte ein Passwort ein."
-msgid "credits.contributors"
-msgstr ""
-"Eine vollständige Liste der Mitwirkenden findest Du "
-"[auf GitHub](https://github.com/engelsystem/engelsystem/graphs/contributors)"
-"."
+#~ msgid "auth.no-nickname"
+#~ msgstr "Gib bitte einen Nick an."