summaryrefslogtreecommitdiff
path: root/locale/de_DE.UTF-8
diff options
context:
space:
mode:
Diffstat (limited to 'locale/de_DE.UTF-8')
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/default.mobin32481 -> 34218 bytes
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/default.po835
2 files changed, 471 insertions, 364 deletions
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 5b946e93..3e58bc2a 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
Binary files differ
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 902ef8b5..d2241761 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2014-12-28 01:31+0100\n"
-"PO-Revision-Date: 2014-12-28 01:32+0100\n"
+"POT-Creation-Date: 2015-08-15 23:36+0100\n"
+"PO-Revision-Date: 2015-08-15 23:36+0100\n"
"Last-Translator: msquare <msquare@notrademark.de>\n"
"Language-Team: \n"
"Language: de_DE\n"
@@ -18,6 +18,14 @@ msgstr ""
"X-Poedit-SearchPath-1: .\n"
#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:49
+msgid ""
+"Please enter your planned date of departure on your settings page to give us "
+"a feeling for teardown capacities."
+msgstr ""
+"Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
+"Planung bekommen."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:52
#, php-format
msgid ""
"You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -26,7 +34,7 @@ msgstr ""
"Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
"gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:59
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."
@@ -34,11 +42,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."
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:65
msgid "You need to specify a tshirt size in your settings!"
msgstr "Bitte eine T-Shirt-Größe auswählen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:71
msgid ""
"You need to specify a DECT phone number in your settings! If you don't have "
"a DECT phone, just enter \"-\"."
@@ -46,25 +54,26 @@ msgstr ""
"Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
"keine Nummer hast, bitte einfach \"-\" angeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:132
msgid "Admin"
msgstr "Admin"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:354
msgid "No data found."
msgstr "Nichts gefunden."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
msgid "Angeltypes"
msgstr "Engeltypen"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:46
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:308
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:186
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:326
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:232
msgid "Teams/Job description"
msgstr "Team-/Aufgabenbeschreibung"
@@ -90,39 +99,39 @@ msgid "Edit %s"
msgstr "%s bearbeiten"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:184
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:175
#, php-format
msgid "Team %s"
msgstr "Team %s"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:204
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
msgid "view"
msgstr "ansehen"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:209
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:64
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:18
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:77
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:52
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
msgid "edit"
msgstr "bearbeiten"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:210
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:37
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:219
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:220
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:48
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:53
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
@@ -131,13 +140,13 @@ msgstr "löschen"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:219
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:219
msgid "leave"
msgstr "verlassen"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:219
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:221
msgid "join"
msgstr "mitmachen"
@@ -161,7 +170,7 @@ msgid "Shifttype not found."
msgstr "Schichttyp nicht gefunden."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:69
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:60
msgid "Please enter a name."
msgstr "Gib bitte einen Namen an."
@@ -291,13 +300,13 @@ msgid "Removed coordinator rights for %s from %s."
msgstr "%s hat jetzt nicht mehr %s als Koordinator."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:284
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:122
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:3
msgid "Add coordinator rights"
msgstr "Koordinatorrechte geben"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:284
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:114
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:3
msgid "Remove coordinator rights"
msgstr "Koordinatorrechte entfernen"
@@ -332,67 +341,73 @@ msgstr "Du bist %s beigetreten."
msgid "Become a %s"
msgstr "Werde ein %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:60
-msgid "User got vouchers."
-msgstr "Engel hat Voucher bekommen."
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:56
+msgid "Please enter a valid number of vouchers."
+msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:60
-msgid "User didnt got vouchers."
-msgstr "Engel hat keine Voucher mehr."
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:66
+msgid "Saved the number of vouchers."
+msgstr "Anzahl der Voucher gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:118
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:26
+#, php-format
+msgid "%s's vouchers"
+msgstr "Voucher von %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62
msgid "All users"
msgstr "Alle Benutzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:146
msgid "Token is not correct."
msgstr "Der Token ist nicht in Ordnung."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:143
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:123
msgid "Your passwords don't match."
msgstr "Deine Passwörter stimmen nicht überein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:147
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:121
msgid "Your password is to short (please use at least 6 characters)."
msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:166
msgid "Password could not be updated."
msgstr "Passwort kann nicht neu gesetzt werden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:155
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:125
msgid "Password saved."
msgstr "Passwort gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:37
msgid "E-mail address is not correct."
msgstr "Die E-Mail Adresse ist nicht in Ordnung."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:66
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:41
msgid "Please enter your e-mail."
msgstr "Bitte gib Deine E-Mail-Adresse ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:218
msgid "Password recovery"
msgstr "Passwort wiederherstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:201
#, php-format
msgid "Please visit %s to recover your password."
msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:205
msgid "We sent an email containing your password recovery link."
msgstr ""
"Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
@@ -476,11 +491,11 @@ msgstr "Du wurdest aus einer Schicht ausgetragen:"
msgid "Removed from Shift"
msgstr "Von Schicht ausgetragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:4
msgid "Active angels"
msgstr "Aktive Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:23
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:28
#, php-format
msgid ""
"At least %s angels are forced to be active. The number has to be greater."
@@ -488,81 +503,86 @@ msgstr ""
"Mindestens %s engel werden als aktiv gekennzeichnet. Die Nummer muss größer "
"sein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:33
msgid "Please enter a number of angels to be marked as active."
msgstr ""
"Bitte gib eine Anzahl an Engeln ein, die als Aktiv markiert werden sollen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:57
msgid "Marked angels."
msgstr "Engel wurden markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:53
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:158
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:65
msgid "back"
msgstr "zurück"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:59
msgid "apply"
msgstr "anwenden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:69
msgid "Angel has been marked as active."
msgstr "Engel wurde als aktiv markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:20
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:30
msgid "Angel not found."
msgstr "Engel nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:78
msgid "Angel has been marked as not active."
msgstr "Engel wurde als nicht aktiv markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:87
msgid "Angel has got a t-shirt."
msgstr "Engel hat ein T-Shirt bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:96
msgid "Angel has got no t-shirt."
msgstr "Engel hat kein T-Shirt bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:136
msgid "set active"
msgstr "setze aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:138
msgid "remove active"
msgstr "entferne aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:139
msgid "got t-shirt"
msgstr "hat t-shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:142
msgid "remove t-shirt"
msgstr "entferne t-shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:149
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:144
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
msgid "Sum"
msgstr "Summe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:167
msgid "Search angel:"
msgstr "Suche Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:66
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:168
+msgid "Show all shifts"
+msgstr "Alle Schichten anzeigen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:105
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:25
@@ -570,72 +590,76 @@ msgstr "Suche Engel:"
msgid "Search"
msgstr "Suche"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:172
msgid "How much angels should be active?"
msgstr "Wie viele Engel sollten aktiv sein?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:173
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:239
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:322
msgid "Preview"
msgstr "Vorschau"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:108
msgid "Nickname"
msgstr "Nick"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:175
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78
msgid "Size"
msgstr "Größe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:217
msgid "Shifts"
msgstr "Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:180
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:311
msgid "Length"
msgstr "Länge"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:181
msgid "Active?"
msgstr "Aktiv?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:76
msgid "Forced"
msgstr "Gezwungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:183
msgid "T-shirt?"
msgstr "T-Shirt?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:186
+msgid "Shirt statistics"
+msgstr "T-Shirt Statistik"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
+msgid "Needed shirts"
+msgstr "Benötigte T-Shirts"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:190
msgid "Given shirts"
msgstr "Ausgegebene T-Shirts"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:176
-msgid "Count"
-msgstr "Anzahl"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:3
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:4
msgid "Arrived angels"
msgstr "Angekommene Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:19
msgid "Reset done. Angel has not arrived."
msgstr "Zurückgesetzt. Engel ist nicht angekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:28
msgid "Angel has been marked as arrived."
msgstr "Engel wurde als angekommen markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:62
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30
@@ -644,19 +668,53 @@ msgstr "Engel wurde als angekommen markiert."
msgid "yes"
msgstr "Ja"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63
msgid "reset"
msgstr "zurücksetzen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
msgid "arrived"
msgstr "angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:109
+msgid "Planned arrival"
+msgstr "Geplanter Ankunftstag"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:110
msgid "Arrived?"
msgstr "Angekommen?"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:111
+msgid "Arrival date"
+msgstr "Ankunftsdatum"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:112
+msgid "Planned departure"
+msgstr "Geplante Abreise"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:115
+msgid "Arrival statistics"
+msgstr "Ankunfts-Statistik"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145
+msgid "arrived sum"
+msgstr "Summe angekommen"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146
+msgid "planned departure"
+msgstr "Geplante Abreise"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71
+msgid "Date"
+msgstr "Datum"
+
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:3
msgid "Free angels"
msgstr "Freie Engel"
@@ -672,36 +730,36 @@ msgid "Only confirmed"
msgstr "Nur bestätigte"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:293
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:147
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:155
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68
msgid "Nick"
msgstr "Nick"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:152
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:168
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:71
msgid "DECT"
msgstr "DECT"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
msgid "Jabber"
msgstr "Jabber"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:154
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
msgid "E-Mail"
msgstr "E-Mail"
@@ -712,13 +770,13 @@ msgstr "Gruppenrechte"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:109
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:113
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:123
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:174
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:191
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:33
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
msgid "Name"
msgstr "Name"
@@ -729,21 +787,22 @@ msgstr "Privilegien"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:53
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:32
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:257
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:106
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:160
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:191
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:255
msgid "Save"
msgstr "Speichern"
@@ -752,8 +811,8 @@ msgid "Edit group"
msgstr "Gruppe bearbeiten"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:124
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:175
msgid "Frab import"
msgstr "Frab Import"
@@ -783,13 +842,13 @@ msgstr "Bitte lade eine Datei hoch."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
msgid "File Upload"
msgstr "Datei hochladen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:73
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
msgid "Validation"
msgstr "Überprüfen"
@@ -797,7 +856,7 @@ msgstr "Überprüfen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:104
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
msgid "Import"
msgstr "Importieren"
@@ -811,7 +870,7 @@ msgstr ""
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:301
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184
msgid "Shifttype"
msgstr "Schichttyp"
@@ -839,7 +898,7 @@ msgstr "Anzulegende Schichten"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:118
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:127
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:204
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:219
msgid "Day"
msgstr "Tag"
@@ -847,7 +906,7 @@ msgstr "Tag"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:128
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:137
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88
msgid "Start"
msgstr "Beginn"
@@ -855,7 +914,7 @@ msgstr "Beginn"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:129
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:307
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:96
msgid "End"
msgstr "Ende"
@@ -869,8 +928,8 @@ msgstr "Schichttyp"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:140
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:184
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84
msgid "Title"
msgstr "Titel"
@@ -878,7 +937,7 @@ msgstr "Titel"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:132
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:141
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:303
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:817
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:803
msgid "Room"
msgstr "Raum"
@@ -890,7 +949,7 @@ msgstr "Zu aktualisierende Schichten"
msgid "Shifts to delete"
msgstr "Zu löschende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198
msgid "It's done!"
msgstr "Erledigt!"
@@ -902,11 +961,6 @@ msgstr "Log"
msgid "Edit news entry"
msgstr "News-Eintrag bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71
-msgid "Date"
-msgstr "Datum"
-
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:28
msgid "Author"
msgstr "Autor"
@@ -929,8 +983,7 @@ msgid "Meeting"
msgstr "Treffen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:156
-#, fuzzy
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:162
msgid "Delete"
msgstr "löschen"
@@ -982,44 +1035,44 @@ msgstr "Beantwortete Fragen"
msgid "Answered by"
msgstr "Antwort von"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:3
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:830
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:816
msgid "Rooms"
msgstr "Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:83
#, php-format
msgid "Please enter needed angels for type %s."
msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:111
msgid "Room saved."
msgstr "Raum gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:125
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:176
msgid "Public"
msgstr "Öffentlich"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:132
msgid "Room number"
msgstr "Raumnummer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137
msgid "Needed angels:"
msgstr "Benötigte Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:152
#, php-format
msgid "Room %s deleted."
msgstr "Raum %s gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:160
#, php-format
msgid "Do you want to delete room %s?"
msgstr "Möchest Du den Raum %s wirklich löschen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:170
msgid "add"
msgstr "Neu"
@@ -1040,7 +1093,6 @@ msgid "Please select an end time."
msgstr "Bitte eine Endzeit auswählen."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:84
-#, fuzzy
msgid "The shifts end has to be after its start."
msgstr "Die Endzeit muss nach der Startzeit liegen."
@@ -1083,8 +1135,8 @@ msgstr "Typ und Titel"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:255
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:316
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:110
msgid "Needed angels"
msgstr "Benötigte Engel"
@@ -1121,13 +1173,12 @@ msgid "All Angels"
msgstr "Engelliste"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:21
-#, fuzzy
msgid "This user does not exist."
msgstr "Benutzer existiert nicht."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:45
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
msgid "Please send me an email if my shifts change"
msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten"
@@ -1151,12 +1202,12 @@ msgid "Credits"
msgstr "Credits"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:295
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313
msgid "Login"
msgstr "Login"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:222
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:239
msgid "Register"
msgstr "Registrieren"
@@ -1164,35 +1215,40 @@ msgstr "Registrieren"
msgid "Logout"
msgstr "Logout"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:52
#, php-format
msgid "Your nick &quot;%s&quot; already exists."
msgstr "Der Nick &quot;%s&quot; existiert schon."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:56
#, php-format
msgid "Your nick &quot;%s&quot; is too short (min. 2 characters)."
msgstr "Der Nick &quot;%s&quot; ist zu kurz (Mindestens 2 Zeichen)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:50
msgid "Please check your jabber account information."
msgstr "Bitte überprüfe deine Jabber Account Eingabe."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:86
msgid "Please select your shirt size."
msgstr "Bitte wähle Deine T-Shirt Größe."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:97
#, 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)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:64
+msgid "Please enter your planned date of arrival."
+msgstr "Bitte gib Dein geplantes Ankunftsdatum an."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:165
msgid "Angel registration successful!"
msgstr "Engel-Registrierung erfolgreich!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:162
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:172
msgid ""
"By completing this form you're registering as a Chaos-Angel. This script "
"will create you an account in the angel task sheduler."
@@ -1200,31 +1256,36 @@ msgstr ""
"Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in "
"der Engel-Aufgabenverwaltung."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:171
+msgid "Planned date of arrival"
+msgstr "Geplanter Ankunftstag"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
msgid "Shirt size"
msgstr "T-Shirt Größe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:294
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:237
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:312
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
msgid "Password"
msgstr "Passwort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:254
msgid "Confirm password"
msgstr "Passwort wiederholen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203
msgid "What do you want to do?"
msgstr "Was möchtest Du machen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203
msgid "Description of job types"
msgstr "Beschreibung der Aufgaben"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:204
msgid ""
"Restricted angel types need will be confirmed later by an archangel. You can "
"change your selection in the options section."
@@ -1232,50 +1293,50 @@ msgstr ""
"Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet "
"werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
msgid "Mobile"
msgstr "Handy"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:198
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
msgid "Phone"
msgstr "Telefon"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:204
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170
msgid "First name"
msgstr "Vorname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:207
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
msgid "Last name"
msgstr "Nachname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
msgid "Age"
msgstr "Alter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
msgid "Hometown"
msgstr "Wohnort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167
msgid "Entry required!"
msgstr "Pflichtfeld!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:254
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271
msgid "Your password is incorrect. Please try it again."
msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:275
msgid "Please enter a password."
msgstr "Gib bitte ein Passwort ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:279
msgid ""
"No user was found with that Nickname. Please try again. If you are still "
"having problems, ask an Dispatcher."
@@ -1283,31 +1344,31 @@ msgstr ""
"Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch "
"einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:283
msgid "Please enter a nickname."
msgstr "Gib bitte einen Nick an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:278
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:296
msgid "Please sign up, if you want to help us!"
msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:285
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:303
msgid "Registration is disabled."
msgstr "Registrierung ist abgeschaltet."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:297
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:315
msgid "I forgot my password"
msgstr "Passwort vergessen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:317
msgid "Please note: You have to activate cookies!"
msgstr "Hinweis: Cookies müssen aktiviert sein!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:305
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:323
msgid "What can I do?"
msgstr "Was kann ich machen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:306
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:324
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."
@@ -1372,7 +1433,7 @@ msgid "Wrong action."
msgstr "Falsche Aktion."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:320
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:298
msgid "My shifts"
msgstr "Meine Schichten"
@@ -1381,7 +1442,7 @@ msgid "Key changed."
msgstr "Key geändert."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:198
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:213
msgid "Reset API key"
msgstr "API-Key zurücksetzen"
@@ -1402,11 +1463,11 @@ msgstr "Fortfahren"
msgid "Shift saved."
msgstr "Schicht gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:97
msgid "You have been signed off from the shift."
msgstr "Du wurdest aus der Schicht ausgetragen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:99
msgid ""
"It's too late to sign yourself off the shift. If neccessary, ask the "
"dispatcher to do so."
@@ -1473,63 +1534,71 @@ msgid "No question found."
msgstr "Keine Frage gefunden."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210
msgid "Settings"
msgstr "Einstellungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72
+msgid "Please enter your planned date of departure."
+msgstr "Bitte gib Dein geplantes Abreisedatum an."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
msgid "-> not OK. Please try again."
msgstr "-> Nicht OK. Bitte erneut versuchen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:127
msgid "Failed setting password."
msgstr "Konnte Passwort nicht speichern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:140
msgid "Theme changed."
msgstr "Aussehen geändert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166
msgid "Here you can change your user details."
msgstr "Hier kannst Du Deine Details ändern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172
+msgid "Planned date of departure"
+msgstr "Geplanter Abreisetag"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
msgid "Please visit the angeltypes page to manage your angeltypes."
msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
msgid "Here you can change your password."
msgstr "Hier kannst Du Dein Passwort ändern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
msgid "Old password:"
msgstr "Altes Passwort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:190
msgid "New password:"
msgstr "Neues Passwort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:191
msgid "Password confirmation:"
msgstr "Passwort wiederholen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:195
msgid "Here you can choose your color settings:"
msgstr "Hier kannst Du das Aussehen auswählen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:196
msgid "Color settings:"
msgstr "Aussehen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:200
msgid "Here you can choose your language:"
msgstr "Hier kannst Du Deine Sprache auswählen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:201
msgid "Language:"
msgstr "Sprache:"
@@ -1546,7 +1615,6 @@ msgid "Please select a room."
msgstr "Bitte einen Raum auswählen."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:117
-#, fuzzy
msgid "Please select a shifttype."
msgstr "Bitte einen Schichttyp wählen."
@@ -1567,81 +1635,69 @@ msgstr "Die Endzeit muss nach der Startzeit liegen."
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."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:166
msgid "Shift updated."
msgstr "Schicht aktualisiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:182
msgid "This page is much more comfortable with javascript."
msgstr "Diese Seite ist mit JavaScript viel komfortabler."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:186
msgid "Room:"
msgstr "Raum:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:187
msgid "Start:"
msgstr "Start:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:188
msgid "End:"
msgstr "Ende:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:214
msgid "Shift deleted."
msgstr "Schicht gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:219
#, 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?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:242
-msgid ""
-"This shift is running now or ended already. Please contact a dispatcher to "
-"join the shift."
-msgstr ""
-"Diese Schicht läuft bereits oder ist bereits vorbei. Bitte einen Dispatcher "
-"Dich nachzutragen."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:251
msgid ""
-"You already subscribed to shift in the same timeslot. Please contact a "
-"dispatcher to join the shift."
+"You are not allowed to sign up for this shift. Maybe shift is full or "
+"already running."
msgstr ""
-"Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen Dispatcher "
-"Dich nachzutragen."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:263
-msgid "The shift is already full."
-msgstr "Diese Schicht ist bereits voll belegt."
+"Du darfst Dich nicht für diese Schicht eintragen. Vielleicht ist die Schicht "
+"voll oder sie läuft bereits."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:320
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:298
msgid "You are subscribed. Thank you!"
msgstr "Du bist eingetragen. Danke!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:329
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188
msgid "Freeloader"
msgstr "Schwänzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:359
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:337
msgid "The administration has not configured any shifts yet."
msgstr "Die Administratoren haben noch keine Schichten angelegt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:366
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:344
msgid "The administration has not configured any rooms yet."
msgstr "Die Administratoren habe noch keine Räume eingerichtet."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:379
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:357
msgid "occupied"
msgstr "belegt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:383
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:361
msgid "free"
msgstr "frei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:388
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:366
msgid ""
"The administration has not configured any angeltypes yet - or you are not "
"subscribed to any angeltype."
@@ -1649,53 +1705,49 @@ msgstr ""
"Die Administratoren haben noch keine Engeltypen konfiguriert - oder Du hast "
"noch keine Engeltypen ausgewählt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:636
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:769
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:618
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:755
#, php-format
msgid "%d helper needed"
msgid_plural "%d helpers needed"
msgstr[0] "%d Helfer benötigt"
msgstr[1] "%d Helfer benötigt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:656
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:638
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:22
msgid "Sign up"
msgstr "Eintragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:659
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:641
msgid "ended"
msgstr "vorbei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:667
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:796
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:15
-#, fuzzy, php-format
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:649
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:782
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:24
+#, php-format
msgid "Become %s"
msgstr "Werde ein %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:679
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:809
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:661
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:795
msgid "Add more angels"
msgstr "Neue Engel hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:817
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:803
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:220
msgid "Time"
msgstr "Zeit"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:818
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:804
msgid "Entries"
msgstr "Einträge"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:835
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:836
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:822
msgid "Occupancy"
msgstr "Belegung"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:837
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:823
msgid ""
"The tasks shown here are influenced by the preferences you defined in your "
"settings!"
@@ -1703,19 +1755,19 @@ msgstr ""
"Die Schichten, die hier angezeigt werden, sind von Deinen Einstellungen "
"(Engeltypen/Aufgaben) abhängig!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:837
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:823
msgid "Description of the jobs."
msgstr "Beschreibung der Aufgaben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:838
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:824
msgid "Use new style if possible"
msgstr "Wenn möglich neuen Stil verwenden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:840
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:826
msgid "iCal export"
msgstr "iCal Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:840
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:826
#, php-format
msgid ""
"Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1726,21 +1778,21 @@ msgstr ""
"\">JSON Format</a> verfügbar (Link bitte geheimhalten, sonst <a href=\"%s"
"\">API-Key zurücksetzen</a>)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:841
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:827
msgid "Filter"
msgstr "Filter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:875
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:861
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
msgid "All"
msgstr "Alle"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:876
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:862
msgid "None"
msgstr "Keine"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:28
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
msgid "Unconfirmed"
msgstr "Unbestätigt"
@@ -1771,7 +1823,7 @@ msgid "cancel"
msgstr "abbrechen"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192
msgid "Restricted"
msgstr "Beschränkt"
@@ -1793,7 +1845,7 @@ msgstr ""
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:63
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:114
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
msgid "Description"
msgstr "Beschreibung"
@@ -1820,44 +1872,44 @@ msgstr "bestätigen"
msgid "deny"
msgstr "ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:123
msgid "remove"
msgstr "entfernen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:129
msgid "Coordinators"
msgstr "Koordinatoren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151
msgid "Members"
msgstr "Mitglieder"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:154
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:70
msgid "Add"
msgstr "Hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165
msgid "confirm all"
msgstr "Alle bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:166
msgid "deny all"
msgstr "Alle ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:187
msgid "New angeltype"
msgstr "Neuer Engeltyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:193
msgid "Membership"
msgstr "Mitgliedschaft"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:207
msgid "FAQ"
msgstr "FAQ"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:209
msgid ""
"Here is the list of teams and their tasks. If you have questions, read the "
"FAQ."
@@ -1865,7 +1917,7 @@ msgstr ""
"Hier ist die Liste der Teams und ihrer Aufgaben. Wenn Du Fragen hast, schaue "
"im FAQ nach."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:226
msgid ""
"This angeltype is restricted by double-opt-in by a team coordinator. Please "
"show up at the according introduction meetings."
@@ -1882,8 +1934,8 @@ msgid "Your Question:"
msgstr "Deine Frage:"
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:17
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
msgid "Freeloaded"
msgstr "Geschwänzt"
@@ -1919,16 +1971,26 @@ msgstr "Typ:"
msgid "Comment (for your eyes only):"
msgstr "Kommentar (nur für Dich):"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:6
+#, php-format
+msgid "created at %s by %s"
+msgstr "erstellt am %s von %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:8
+#, php-format
+msgid "edited at %s by %s"
+msgstr "bearbeitet am %s von %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:74
msgid "This shift collides with one of your shifts."
msgstr "Diese Schicht kollidiert mit deinen Schichten."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:75
msgid "You are signed up for this shift."
msgstr "Du bist für diese Schicht eingetragen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:94
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221
msgid "Location"
msgstr "Ort"
@@ -1958,120 +2020,139 @@ msgstr "Neuer Schichttyp"
msgid "Please select..."
msgstr "Bitte auswählen..."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32
+msgid "Number of vouchers"
+msgstr "Anzahl Voucher"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
msgid "m/d/Y h:i a"
msgstr "d.m.Y H:i"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65
msgid "New user"
msgstr "Neuer User"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:69
msgid "Prename"
msgstr "Vorname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
msgid "Arrived"
msgstr "Angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73
msgid "Voucher"
msgstr "Voucher"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:74
msgid "Freeloads"
msgstr "Schwänzereien"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:59
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192
msgid "Active"
msgstr "Aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193
msgid "T-Shirt"
msgstr "T-Shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
msgid "Last login"
msgstr "Letzter Login"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
msgid "Free"
msgstr "Frei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101
#, php-format
msgid "Next shift %c"
msgstr "Nächste Schicht %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:106
#, php-format
msgid "Shift starts %c"
msgstr "Schicht startet %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:92
-#, fuzzy, php-format
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108
+#, php-format
msgid "Shift ends %c"
msgstr "Schicht endet %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:158
msgid "sign off"
msgstr "abmelden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:169
msgid "Sum:"
msgstr "Summe:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187
msgid "User state"
msgstr "Engelzustand"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#, php-format
+msgid "Arrived at %s"
+msgstr "Angekommen am %s"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
+#, php-format
+msgid "Not arrived (Planned: %s)"
+msgstr "Nicht angekommen (Geplant: %s)"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
msgid "Not arrived"
msgstr "Nicht angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193
-msgid "Got vouchers"
-msgstr "Voucher bekommen"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
+#, php-format
+msgid "Got %s voucher"
+msgid_plural "Got %s vouchers"
+msgstr[0] "Einen Voucher bekommen"
+msgstr[1] "%s Voucher bekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
msgid "Got no vouchers"
msgstr "Voucher nicht bekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:200
msgid "Rights"
msgstr "Rechte"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:194
-msgid "Remove vouchers"
-msgstr "Voucher entfernen"
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
+msgid "Edit vouchers"
+msgstr "Voucher bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
-#, fuzzy
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211
msgid "iCal Export"
msgstr "iCal Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:212
msgid "JSON Export"
msgstr "JSON Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:222
msgid "Name &amp; workmates"
msgstr "Name &amp; Kollegen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223
msgid "Comment"
msgstr "Kommentar"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:224
msgid "Action"
msgstr "Aktion"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:226
+msgid "Your night shifts between 2 and 8 am count twice."
+msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:227
#, php-format
msgid ""
"Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2080,7 +2161,7 @@ msgstr ""
"Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
"einzutragen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:237
msgid ""
"We will send you an e-mail with a password recovery link. Please use the "
"email address you used for registration."
@@ -2089,11 +2170,11 @@ msgstr ""
"zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung "
"verwendet hast."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
msgid "Recover"
msgstr "Wiederherstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
msgid "Please enter a new password."
msgstr "Gib bitte ein neues Passwort ein."
@@ -2140,11 +2221,11 @@ msgstr "Möchtest Du wirklich %s zu %s hinzufügen?"
msgid "save"
msgstr "Speichern"
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:223
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:143
msgid "No Access"
msgstr "Kein Zugriff"
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:224
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:144
msgid ""
"You don't have permission to view this page. You probably have to sign in or "
"register in order to gain access!"
@@ -2152,6 +2233,35 @@ msgstr ""
"Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
"bitte ein, um Zugriff zu erhalten!"
+#~ msgid "Tasks"
+#~ msgstr "Aufgaben"
+
+#~ msgid "Count"
+#~ msgstr "Anzahl"
+
+#~ msgid "User didnt got vouchers."
+#~ msgstr "Engel hat keine Voucher mehr."
+
+#~ msgid "Remove vouchers"
+#~ msgstr "Voucher entfernen"
+
+#~ msgid ""
+#~ "This shift is running now or ended already. Please contact a dispatcher "
+#~ "to join the shift."
+#~ msgstr ""
+#~ "Diese Schicht läuft bereits oder ist bereits vorbei. Bitte einen "
+#~ "Dispatcher Dich nachzutragen."
+
+#~ msgid ""
+#~ "You already subscribed to shift in the same timeslot. Please contact a "
+#~ "dispatcher to join the shift."
+#~ msgstr ""
+#~ "Du hast bereits eine Schicht im gleichen Zeitrahmen. Bitte einen "
+#~ "Dispatcher Dich nachzutragen."
+
+#~ msgid "The shift is already full."
+#~ msgstr "Diese Schicht ist bereits voll belegt."
+
#~ msgid ""
#~ "Hello %s, here you can change your personal settings i.e. password, color "
#~ "settings etc."
@@ -2177,9 +2287,6 @@ msgstr ""
#~ msgid "You are not confirmed for this angel type."
#~ msgstr "Du bist für diesen Engeltyp noch nicht freigeschaltet."
-#~ msgid "All Shifts"
-#~ msgstr "Alle Schichten"
-
#~ msgid "Exports"
#~ msgstr "Exporte"