summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/model/ShiftEntry_model.php2
-rw-r--r--includes/pages/admin_free.php36
-rw-r--r--includes/view/User_view.php17
-rw-r--r--resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mobin44970 -> 43682 bytes
-rw-r--r--resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po1909
5 files changed, 990 insertions, 974 deletions
diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index 248e7d1e..54837bac 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -206,7 +206,7 @@ function ShiftEntries_finished_by_user($userId)
WHERE `ShiftEntry`.`UID` = ?
AND `Shifts`.`end` < ?
AND `ShiftEntry`.`freeloaded` = 0
- ORDER BY `Shifts`.`end`
+ ORDER BY `Shifts`.`end` desc
',
[
$userId,
diff --git a/includes/pages/admin_free.php b/includes/pages/admin_free.php
index d2facbc8..1b116805 100644
--- a/includes/pages/admin_free.php
+++ b/includes/pages/admin_free.php
@@ -26,7 +26,7 @@ function admin_free()
$angel_types_source = DB::select('SELECT `id`, `name` FROM `AngelTypes` ORDER BY `name`');
$angel_types = [
- '' => 'alle Typen'
+ '' => __('Alle')
];
foreach ($angel_types_source as $angel_type) {
$angel_types[$angel_type['id']] = $angel_type['name'];
@@ -49,18 +49,21 @@ function admin_free()
->groupBy('users.id');
if (!empty($angelType)) {
- $query->join('UserAngelTypes', function ($join) use ($angelType, $request, $query) {
+ $query->join('UserAngelTypes', function ($join) use ($angelType) {
/** @var JoinClause $join */
$join->on('UserAngelTypes.user_id', '=', 'users.id')
->where('UserAngelTypes.angeltype_id', '=', $angelType);
-
- if ($request->has('confirmed_only')) {
- $join->whereNotNull('UserAngelTypes.confirm_user_id');
- }
});
+ $query->join('AngelTypes', 'UserAngelTypes.angeltype_id', 'AngelTypes.id')
+ ->whereNotNull('UserAngelTypes.confirm_user_id')
+ ->orWhere('AngelTypes.restricted', '=', '0');
}
- $users = $query->get();
+ if($request->has('submit')) {
+ $users = $query->get();
+ } else {
+ $users = [];
+ }
$free_users_table = [];
if ($search == '') {
$tokens = [];
@@ -86,6 +89,7 @@ function admin_free()
$free_users_table[] = [
'name' => User_Nick_render($usr),
'shift_state' => User_shift_state_render($usr),
+ 'last_shift' => User_last_shift_render($usr),
'dect' => $usr->contact->dect,
'email' => $usr->settings->email_human ? ($usr->contact->email ? $usr->contact->email : $usr->email) : glyph('eye-close'),
'actions' =>
@@ -96,24 +100,16 @@ function admin_free()
}
return page_with_title(admin_free_title(), [
form([
- div('row', [
- div('col-md-4', [
- form_text('search', __('Search'), $search)
- ]),
- div('col-md-4', [
- form_select('angeltype', __('Angeltype'), $angel_types, $angelType)
- ]),
- div('col-md-2', [
- form_checkbox('confirmed_only', __('Only confirmed'), $request->has('confirmed_only'))
- ]),
- div('col-md-2', [
+ div('col-md12 form-inline', [
+ form_text('search', __('Search'), $search),
+ form_select('angeltype', __('Angeltype'), $angel_types, $angelType),
form_submit('submit', __('Search'))
- ])
])
]),
table([
'name' => __('Nick'),
- 'shift_state' => '',
+ 'shift_state' => __('Next shift'),
+ 'last_shift' => __('Last shift'),
'dect' => __('DECT'),
'email' => __('E-Mail'),
'actions' => ''
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index c2bf4a06..4768f4ac 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -320,6 +320,23 @@ function User_shift_state_render($user)
. '</span>';
}
+function User_last_shift_render($user)
+{
+ if (!$user->state->arrived) {
+ return '';
+ }
+
+ $last_shifts = ShiftEntries_finished_by_user($user->id);
+ if (empty($last_shifts)) {
+ return '';
+ }
+
+ $lastShift = array_shift($last_shifts);
+ return '<span class="moment-countdown" data-timestamp="' . $lastShift['end'] . '">'
+ . __('Shift ended %c')
+ . '</span>';
+}
+
/**
* @param array $needed_angel_type
* @return string
diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo
index 7411a1be..671fe8c5 100644
--- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo
+++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.mo
Binary files differ
diff --git a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po
index 3f54c381..d4ceb846 100644
--- a/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/resources/lang/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
-"Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2017-12-29 19:01+0100\n"
-"PO-Revision-Date: 2018-10-05 15:35+0200\n"
+"Project-Id-Version: Engelsystem\n"
+"POT-Creation-Date: 2019-01-13 16:02+0100\n"
+"PO-Revision-Date: 2019-01-13 16:02+0100\n"
"Last-Translator: msquare <msquare@notrademark.de>\n"
"Language-Team: \n"
"Language: de_DE\n"
@@ -10,160 +10,160 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-KeywordsList: __;gettext;gettext_noop\n"
"X-Poedit-Basepath: .\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n"
-"X-Poedit-SearchPath-1: .\n"
-
-#: /Users/msquare/workspace/projects/engelsystem/config/config.default.php:113
-msgid "Please select..."
-msgstr "Bitte auswählen..."
+"X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem/"
+"includes\n"
+"X-Poedit-SearchPath-1: /Users/msquare/workspace/projects/engelsystem/src\n"
+"X-Poedit-SearchPath-2: .\n"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:13
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:247
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:80
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:759
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:828
msgid "Angeltypes"
msgstr "Engeltypen"
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:69
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:502
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:499
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:598
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:460
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:496
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:593
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:135
msgid "Teams/Job description"
msgstr "Team-/Aufgabenbeschreibung"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:89
#, php-format
msgid "Angeltype %s deleted."
msgstr "Engeltyp %s gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:54
#, php-format
msgid "Delete angeltype %s"
msgstr "Lösche Engeltyp %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:135
msgid "Please check the name. Maybe it already exists."
msgstr "Bitte überprüfe den Namen. Vielleicht ist er bereits vergeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:169
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:74
#, php-format
msgid "Edit %s"
msgstr "%s bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:207
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:344
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:203
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:341
#, php-format
msgid "Team %s"
msgstr "Team %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:292
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:382
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:409
msgid "view"
msgstr "ansehen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:300
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:294
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:44
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:124
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:387
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:465
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:547
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:414
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:512
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:607
msgid "edit"
msgstr "bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:305
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:243
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:60
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:76
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:174
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:15
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:22
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:28
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:57
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:31
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:16
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:470
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:517
msgid "delete"
msgstr "löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:316
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:535
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:310
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:532
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.
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:322
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:151
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:540
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:537
msgid "join"
msgstr "mitmachen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:359
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:353
msgid "Angeltype doesn't exist . "
msgstr "Engeltyp existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:114
msgid "Event config"
msgstr "Event Einstellungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:53
msgid "Please enter buildup start date."
msgstr "Bitte gib das Aufbau Start Datum an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:57
msgid "Please enter event start date."
msgstr "Bitte gib das Event Start Datum an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:61
msgid "Please enter event end date."
msgstr "Bitte gib das Event Ende Datum an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:65
msgid "Please enter teardown end date."
msgstr "Bitte gib das Abbau Ende Datum an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:71
msgid "The buildup start date has to be before the event start date."
msgstr "Das Aufbau Start Datum muss vor dem Event Start Datum liegen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:76
msgid "The event start date has to be before the event end date."
msgstr "Das Event Start Datum muss vor dem Event End Datum liegen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:81
msgid "The event end date has to be before the teardown end date."
msgstr "Das Event Ende Datum muss vor dem Abbau Ende Datum liegen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:86
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."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:89
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/public_dashboard_controller.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:275
#: /Users/msquare/workspace/projects/engelsystem/includes/view/PublicDashboard_view.php:55
msgid "Public Dashboard"
msgstr "Öffentliches Dashboard"
@@ -188,7 +188,7 @@ msgid "You need be accepted member of the angeltype."
msgstr "Du musst bestätigtes Mitglied des Engeltyps sein."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:208
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:125
msgid "This shift collides with one of your shifts."
msgstr "Diese Schicht kollidiert mit deinen Schichten."
@@ -201,19 +201,19 @@ msgid "You are not marked as arrived."
msgstr "Du bist nicht als angekommen markiert."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:129
msgid "You are signed up for this shift."
msgstr "Du bist für diese Schicht eingetragen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:265
msgid "You are subscribed. Thank you!"
msgstr "Du bist eingetragen. Danke!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:325
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:324
msgid "Shift entry not found."
msgstr "Schichteintrag nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:347
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:346
msgid ""
"You are not allowed to remove this shift entry. If necessary, ask your "
"supporter or heaven to do so."
@@ -221,300 +221,294 @@ msgstr ""
"Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage "
"deinen Supporter oder im Himmel danach."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:353
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:352
msgid "Shift entry removed."
msgstr "Schichteintrag gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:95
msgid "Please select a room."
msgstr "Bitte einen Raum auswählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:102
msgid "Please select a shifttype."
msgstr "Bitte einen Schichttyp wählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:109
msgid "Please enter a valid starting time for the shifts."
msgstr "Bitte gib eine korrekte Startzeit für die Schichten ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:116
msgid "Please enter a valid ending time for the shifts."
msgstr "Bitte gib eine korrekte Endzeit für die Schichten ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:121
msgid "The ending time has to be after the starting time."
msgstr "Die Endzeit muss nach der Startzeit liegen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:134
#, 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."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:164
msgid "Shift updated."
msgstr "Schicht aktualisiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:183
msgid "This page is much more comfortable with javascript."
msgstr "Diese Seite ist mit JavaScript viel komfortabler."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:122
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:382
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:403
msgid "Shifttype"
msgstr "Schichttyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:196
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:205
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:214
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:383
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:404
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:17
msgid "Title"
msgstr "Titel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:188
msgid "Room:"
msgstr "Raum:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:189
msgid "Start:"
msgstr "Start:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:190
msgid "End:"
msgstr "Ende:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:304
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:414
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:325
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:435
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:147
msgid "Needed angels"
msgstr "Benötigte Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:100
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:57
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:306
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:278
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:157
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:140
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:199
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:91
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:737
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:327
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:806
msgid "Save"
msgstr "Speichern"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:230
msgid "Shift deleted."
msgstr "Schicht gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:236
#, 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/controller/shifts_controller.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:266
msgid "Shift could not be found."
msgstr "Schicht konnte nicht gefunden werden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:33
#, php-format
msgid "Shifttype %s deleted."
msgstr "Schichttyp %s gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:39
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:21
#, php-format
msgid "Delete shifttype %s"
msgstr "Lösche Schichttyp %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:61
msgid "Shifttype not found."
msgstr "Schichttyp nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:77
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:88
msgid "Please enter a name."
msgstr "Gib bitte einen Namen an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:95
msgid "Updated shifttype."
msgstr "Schichttyp geändert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:100
msgid "Created shifttype."
msgstr "Schichttyp erstellt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:108
msgid "Shifttypes"
msgstr "Schichttypen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:26
-#, php-format
-msgid "There is %d unconfirmed angeltype."
-msgid_plural "There are %d unconfirmed angeltypes."
-msgstr[0] "Es gibt %d nicht freigeschalteten Engeltypen!"
-msgstr[1] "Es gibt %d nicht freigeschaltete Engeltypen!"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:33
msgid "Angel types which need approvals:"
msgstr "Engeltypen die bestätigt werden müssen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:43
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:49
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:262
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:265
msgid "Angeltype doesn't exist."
msgstr "Engeltyp existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:58
msgid "You are not allowed to delete all users for this angeltype."
msgstr "Du darfst nicht alle Benutzer von diesem Engeltyp entfernen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:66
#, php-format
msgid "Denied all users for angeltype %s."
msgstr "Alle Benutzer mit Engeltyp %s abgelehnt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:45
msgid "Deny all users"
msgstr "Alle Benutzer ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:98
msgid "You are not allowed to confirm all users for this angeltype."
msgstr "Du darfst nicht alle Benutzer für diesen Engeltyp freischalten."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:106
#, php-format
msgid "Confirmed all users for angeltype %s."
msgstr "Alle Benutzer für Engeltyp %s freigeschaltet."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:69
msgid "Confirm all users"
msgstr "Alle Benutzer bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:123
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:129
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:243
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:259
msgid "User angeltype doesn't exist."
msgstr "Benutzer-Engeltype existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:144
msgid "You are not allowed to confirm this users angeltype."
msgstr "Du darfst diesen Benutzer nicht für diesen Engeltyp freischalten."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:268
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:417
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:271
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:441
msgid "User doesn't exist."
msgstr "Benutzer existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:163
#, php-format
msgid "%s confirmed for angeltype %s."
msgstr "%s für Engeltyp %s freigeschaltet."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:89
msgid "Confirm angeltype for user"
msgstr "Engeltyp für Benutzer bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:210
msgid "You are not allowed to delete this users angeltype."
msgstr "Du darfst diesen Benutzer nicht von diesem Engeltyp entfernen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:217
#, php-format
msgid "User %s removed from %s."
msgstr "Benutzer %s von %s entfernt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:221
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:113
msgid "Remove angeltype"
msgstr "Engeltyp löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:241
msgid "You are not allowed to set supporter rights."
msgstr "Du darfst keine Supporterrechte bearbeiten."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:250
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:253
msgid "No supporter update given."
msgstr "Kein Update für Supporterrechte gegeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:280
#, php-format
msgid "Added supporter rights for %s to %s."
msgstr "%s hat %s als Supporter bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:278
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:281
#, php-format
msgid "Removed supporter rights for %s from %s."
msgstr "%s hat jetzt nicht mehr %s als Supporter."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:289
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:261
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:14
msgid "Add supporter rights"
msgstr "Supporterrechte geben"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:289
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:244
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:14
msgid "Remove supporter rights"
msgstr "Supporterrechte entfernen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:329
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:331
#, php-format
msgid "User %s added to %s."
msgstr "Benutzer %s zu %s hinzugefügt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:346
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:142
msgid "Add user to angeltype"
msgstr "Benutzer zu Engeltyp hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:363
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:365
#, php-format
msgid "You are already a %s."
msgstr "Du bist bereits %s."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:370
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:372
#, php-format
msgid "You joined %s."
msgstr "Du bist %s beigetreten."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:391
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:393
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:166
#, php-format
msgid "Become a %s"
msgstr "Werde ein %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:26
#, php-format
msgid ""
"You joined an angeltype which requires a driving license. Please edit your "
@@ -523,241 +517,222 @@ msgstr ""
"Du bist einem Engeltypen beigetreten, der Führerschein-Infos benötigt. Bitte "
"trage Deine Führerschein-Infos hier ein: %s."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:27
msgid "driving license information"
msgstr "Führerschein-Infos"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:133
msgid "Your driver license information has been saved."
msgstr "Deine Führerschein-Infos wurden gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:136
msgid "Please select at least one driving license."
msgstr "Bitte wähle mindestens einen Führerschein-Typen aus."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:141
msgid "Your driver license information has been removed."
msgstr "Deine Führerschein-Infos wurden gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:145
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
#, php-format
msgid "Edit %s driving license information"
msgstr "Bearbeite die Führerschein-Infos von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:22
msgid "Work log entry deleted."
msgstr "Arbeitseinsatz gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:52
msgid "Work log entry updated."
msgstr "Arbeitseinsatz geändert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:81
msgid "Please enter work date."
msgstr "Bitte Einsatzdatum angeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:87
msgid "Please enter work hours in format ##[.##]."
msgstr "Bitte Stunden im Format ##[.##| eingeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:93
msgid "Please enter a comment."
msgstr "Bitte Kommentar angeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_worklog_controller.php:123
msgid "Work log entry created."
msgstr "Arbeitseinsatz angelegt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:64
msgid "You cannot delete yourself."
msgstr "Du kannst Dich nicht selber löschen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:75
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:438
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:398
msgid "Your password is incorrect. Please try it again."
msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:87
msgid "User deleted."
msgstr "Engel gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:150
#, php-format
msgid "Delete %s"
msgstr "%s löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:165
msgid "Please enter a valid number of vouchers."
msgstr "Bitte gib eine korrekte Anzahl von Gutscheinen ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:172
msgid "Saved the number of vouchers."
msgstr "Anzahl der Gutscheine gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
#, php-format
msgid "%s's vouchers"
msgstr "Gutschein von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:198
msgid "User not found."
msgstr "Benutzer nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233
msgid "Enough"
msgstr "Genug"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:277
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
msgid "All users"
msgstr "Alle Benutzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:323
msgid "Token is not correct."
msgstr "Der Token ist nicht in Ordnung."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:314
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:142
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:336
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
msgid "Your passwords don't match."
msgstr "Deine Passwörter stimmen nicht überein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:318
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:340
+#: /Users/msquare/workspace/projects/engelsystem/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)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:323
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:345
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:115
msgid "Password saved."
msgstr "Passwort gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:348
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:352
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:373
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:377
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:32
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:356
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:111
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:381
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36
msgid "Please enter your e-mail."
msgstr "Bitte gib Deine E-Mail-Adresse ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:363
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:399
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:388
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:424
msgid "Password recovery"
msgstr "Passwort wiederherstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:365
+#: /Users/msquare/workspace/projects/engelsystem/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"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:369
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:394
msgid "We sent an email containing your password recovery link."
msgstr ""
"Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:20
-#, php-format
-msgid "Hi %s,"
-msgstr "Hallo %s,"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:21
-#, php-format
-msgid "here is a message for you from the %s:"
-msgstr "hier ist eine Nachricht aus dem %s für Dich:"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:23
-#, php-format
-msgid ""
-"This email is autogenerated and has not been signed. You got this email "
-"because you are registered in the %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."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:17
msgid "A Shift you are registered on has changed:"
msgstr "Eine deiner Schichten hat sich geändert:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:21
#, php-format
msgid "* Shift type changed from %s to %s"
msgstr "* Schichttyp von %s in %s geändert"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:26
#, php-format
msgid "* Shift title changed from %s to %s"
msgstr "* Schicht Titel von %s nach %s geändert"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:32
#, php-format
msgid "* Shift Start changed from %s to %s"
msgstr "* Schicht Beginn von %s nach %s geändert"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:41
#, php-format
msgid "* Shift End changed from %s to %s"
msgstr "* Schicht Ende von %s nach %s geändert"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:49
#, php-format
msgid "* Shift Location changed from %s to %s"
msgstr "* Schicht Ort von %s to %s geändert"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:59
msgid "The updated Shift:"
msgstr "Die aktualisierte Schicht:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:71
msgid "Your Shift has changed"
msgstr "Deine Schicht hat sich geändert"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:87
msgid "A Shift you are registered on was deleted:"
msgstr "Eine deiner Schichten wurde gelöscht:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:97
msgid "Your Shift was deleted"
msgstr "Deine Schicht wurde gelöscht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:114
msgid "You have been assigned to a Shift:"
msgstr "Du wurdest in eine Schicht eingetragen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:120
msgid "Assigned to Shift"
msgstr "In Schicht eingetragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:135
msgid "You have been removed from a Shift:"
msgstr "Du wurdest aus einer Schicht ausgetragen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:141
msgid "Removed from Shift"
msgstr "Von Schicht ausgetragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:13
msgid "Your account has been deleted"
msgstr "Dein Konto wurde gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:15
#, php-format
msgid ""
-"Your %s account has been deleted. If you have any questions "
-"regarding your account deletion, please contact heaven."
+"Your %s account has been deleted. If you have any questions regarding your "
+"account deletion, please contact heaven."
msgstr ""
-"Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere "
-"bitte den Himmel."
+"Dein %s-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere bitte "
+"den Himmel."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:104
msgid "Active angels"
msgstr "Aktive Engel"
@@ -769,386 +744,389 @@ msgstr ""
"Mindestens %s Engel werden als aktiv gekennzeichnet. Die Nummer muss größer "
"sein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:48
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:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:95
msgid "Marked angels."
msgstr "Engel wurden markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:98
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:155
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:300
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
msgid "back"
msgstr "zurück"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:99
msgid "apply"
msgstr "anwenden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:112
msgid "Angel has been marked as active."
msgstr "Engel wurde als aktiv markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:109
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:62
msgid "Angel not found."
msgstr "Engel nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:123
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:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:134
msgid "Angel has got a t-shirt."
msgstr "Engel hat ein T-Shirt bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:145
msgid "Angel has got no t-shirt."
msgstr "Engel hat kein T-Shirt bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:235
msgid "set active"
msgstr "setze aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:248
msgid "remove active"
msgstr "entferne aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:220
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:261
msgid "got t-shirt"
msgstr "hat t-shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:274
msgid "remove t-shirt"
msgstr "entferne t-shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:268
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:210
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:225
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:422
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:430
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:222
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:232
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:419
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:427
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
msgid "Sum"
msgstr "Summe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:305
msgid "Search angel:"
msgstr "Suche Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:306
msgid "Show all shifts"
msgstr "Alle Schichten anzeigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:277
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:172
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:105
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:36
msgid "Search"
msgstr "Suche"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:280
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:310
msgid "How much angels should be active?"
msgstr "Wie viele Engel sollten aktiv sein?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:281
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:288
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:432
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:311
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:453
msgid "Preview"
msgstr "Vorschau"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:285
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:315
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:182
msgid "Nickname"
msgstr "Nick"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:286
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:296
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:326
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:261
msgid "Size"
msgstr "Größe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:287
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:317
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:11
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:355
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:352
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:39
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:595
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:655
msgid "Shifts"
msgstr "Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:288
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:394
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:318
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:415
msgid "Length"
msgstr "Länge"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:319
msgid "Active?"
msgstr "Aktiv?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:290
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:320
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:259
msgid "Forced"
msgstr "Gezwungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:291
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:321
msgid "T-shirt?"
msgstr "T-Shirt?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:294
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:324
msgid "Shirt statistics"
msgstr "T-Shirt Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:297
-msgid "Needed shirts"
-msgstr "Benötigte T-Shirts"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:298
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:327
msgid "Given shirts"
msgstr "Ausgegebene T-Shirts"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:103
msgid "Arrived angels"
msgstr "Angekommene Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:41
msgid "Reset done. Angel has not arrived."
msgstr "Zurückgesetzt. Engel ist nicht angekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:59
msgid "Angel has been marked as arrived."
msgstr "Engel wurde als angekommen markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:33
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:112
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:123
msgid "yes"
msgstr "Ja"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:106
msgid "reset"
msgstr "zurücksetzen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:102
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:555
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:223
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:615
msgid "arrived"
msgstr "angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:183
msgid "Planned arrival"
msgstr "Geplanter Ankunftstag"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
msgid "Arrived?"
msgstr "Angekommen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:185
msgid "Arrival date"
msgstr "Ankunftsdatum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:186
msgid "Planned departure"
msgstr "Geplante Abreise"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:191
msgid "Planned arrival statistics"
msgstr "Geplante Ankunfts-Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:202
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:224
msgid "arrived sum"
msgstr "Summe angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:208
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:223
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:44
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
msgid "Date"
msgstr "Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:194
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:209
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:224
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:231
msgid "Count"
msgstr "Anzahl"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:206
msgid "Arrival statistics"
msgstr "Ankunfts-Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:221
msgid "Planned departure statistics"
msgstr "Geplante Abreise-Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:106
msgid "Free angels"
msgstr "Freie Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:108
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:29
+msgid "Alle"
+msgstr "All"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:152
msgid "Angeltype"
msgstr "Engeltyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:111
-msgid "Only confirmed"
-msgstr "Nur bestätigte"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:310
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:477
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:296
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:309
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:31
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:435
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:306
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:251
msgid "Nick"
msgstr "Nick"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:121
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:366
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:297
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:310
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:479
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:111
+msgid "Next shift"
+msgstr "Nächste Schicht"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:112
+msgid "Last shift"
+msgstr "Letzte Schicht"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:338
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:294
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:476
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:254
msgid "DECT"
msgstr "DECT"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:122
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:375
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:63
-msgid "Jabber"
-msgstr "Jabber"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:123
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:313
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:118
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:480
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:718
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:282
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:477
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:787
msgid "E-Mail"
msgstr "E-Mail"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:111
msgid "Grouprights"
msgstr "Gruppenrechte"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:51
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:188
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:161
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:211
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:116
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:478
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:502
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:141
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:475
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:499
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:253
msgid "Name"
msgstr "Name"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:53
msgid "Privileges"
msgstr "Privilegien"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:102
msgid "Edit group"
msgstr "Gruppe bearbeiten"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:8
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:212
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:112
msgid "Frab import"
msgstr "Frab Import"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:39
msgid "Webserver has no write-permission on import directory."
msgstr "Der Webserver hat keine Schreibrechte für das Verzeichnis import."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:142
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:242
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:58
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:64
msgid "Please select a shift type."
msgstr "Bitte einen Schichttyp wählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:149
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:249
msgid "Please enter an amount of minutes to add to a talk's begin."
msgstr ""
"Bitte gib eine Anzahl Minuten ein, die vor dem Talk-Beginn hinzugefügt "
"werden sollen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:256
msgid "Please enter an amount of minutes to add to a talk's end."
msgstr ""
"Bitte gib eine Anzahl Minuten ein, die nach dem Talk-Ende hinzugefügt werden "
"sollen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:87
msgid "No valid xml/xcal file provided."
msgstr "Keine valide xml/xcal Datei hochgeladen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
msgid "File upload went wrong."
msgstr "Das Hochladen der Datei ist schiefgegangen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96
msgid "Please provide some data."
msgstr "Bitte lade eine Datei hoch."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:291
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:292
msgid "File Upload"
msgstr "Datei hochladen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:112
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:294
msgid "Validation"
msgstr "Überprüfen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:114
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:126
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:217
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:295
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:296
msgid "Import"
msgstr "Importieren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121
msgid ""
"This import will create/update/delete rooms and shifts by given FRAB-export "
"file. The needed file format is xcal."
@@ -1156,91 +1134,92 @@ msgstr ""
"Dieser Import erzeugt, ändert und löscht Räume und Schichten anhand einer "
"FRAB-Export Datei. Das benötigte Format ist xcal."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:124
msgid "Add minutes to start"
msgstr "Minuten vor Talk-Beginn hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125
msgid "Add minutes to end"
msgstr "Minuten nach Talk-Ende hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:126
msgid "xcal-File (.xcal)"
msgstr "xcal-Datei (.xcal)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:231
msgid "Missing import file."
msgstr "Import-Datei nicht vorhanden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:183
msgid "Rooms to create"
msgstr "Anzulegende Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:187
msgid "Rooms to delete"
msgstr "Zu löschende Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:191
msgid "Shifts to create"
msgstr "Anzulegende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:201
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:210
-msgid "Day"
-msgstr "Tag"
-
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:193
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:202
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:211
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:387
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:24
-msgid "Start"
-msgstr "Beginn"
+msgid "Day"
+msgstr "Tag"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:194
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:203
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:212
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:388
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:32
-msgid "End"
-msgstr "Ende"
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:408
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:25
+msgid "Start"
+msgstr "Beginn"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:204
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:409
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:33
+msgid "End"
+msgstr "Ende"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:214
msgid "Shift type"
msgstr "Schichttyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:206
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:215
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:384
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:198
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:405
msgid "Room"
msgstr "Raum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:200
msgid "Shifts to update"
msgstr "Zu aktualisierende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:209
msgid "Shifts to delete"
msgstr "Zu löschende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:296
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:297
msgid "It's done!"
msgstr "Erledigt!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:113
msgid "Log"
msgstr "Log"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:18
msgid "Edit news entry"
msgstr "News-Eintrag bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38
msgid ""
"This message contains HTML. After saving the post some formatting will be "
"lost!"
@@ -1248,84 +1227,86 @@ msgstr ""
"Diese Nachricht beinhaltet HTML. Wenn du sie speicherst gehen diese "
"Formatierungen verloren!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:46
msgid "Author"
msgstr "Autor"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:46
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:275
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:271
msgid "Subject"
msgstr "Betreff"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:272
msgid "Message"
msgstr "Nachricht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:273
msgid "Meeting"
msgstr "Treffen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:57
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:197
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:161
msgid "Delete"
msgstr "löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:88
msgid "News entry updated."
msgstr "News-Eintrag gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:95
msgid "News entry deleted."
msgstr "News-Eintrag gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:107
msgid "Answer questions"
msgstr "Fragen beantworten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:29
msgid "There are unanswered questions!"
msgstr "Es gibt unbeantwortete Fragen!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:82
msgid "Unanswered questions"
msgstr "Unbeantwortete Fragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:87
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:91
msgid "From"
msgstr "Von"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:35
msgid "Question"
msgstr "Frage"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:37
msgid "Answer"
msgstr "Antwort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:33
msgid "Answered questions"
msgstr "Beantwortete Fragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:36
msgid "Answered by"
msgstr "Antwort von"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:228
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:225
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:160
msgid "Rooms"
msgstr "Räume"
@@ -1352,18 +1333,18 @@ msgstr ""
"Die Karten URL wird benutzt um auf der Raum-Seite ein iframe anzuzeigen."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:109
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:401
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:398
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:24
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:151
msgid "Description"
msgstr "Beschreibung"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:166
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:63
msgid "Please use markdown for the description."
msgstr "Bitte benutze Markdown für die Beschreibung."
@@ -1382,16 +1363,17 @@ msgstr "Raum %s gelöscht."
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:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:203
msgid "add"
msgstr "Neu"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:213
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:209
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Rooms_view.php:31
msgid "Map"
msgstr "Karte"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:109
msgid "Create shifts"
msgstr "Schichten erstellen"
@@ -1440,134 +1422,139 @@ msgstr "Bitte wähle einen Modus für benötigte Engel."
msgid "Please select needed angels."
msgstr "Bitte wähle benötigte Engel."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:323
msgid "Time and location"
msgstr "Zeit und Ort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:324
msgid "Type and title"
msgstr "Typ und Titel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:389
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:410
msgid "Mode"
msgstr "Modus"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:390
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:411
msgid "Create one shift"
msgstr "Eine Schicht erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:391
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:412
msgid "Create multiple shifts"
msgstr "Mehrere Schichten erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:401
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:422
msgid "Create multiple shifts with variable length"
msgstr "Erstelle mehrere Schichten mit unterschiedlicher Länge"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:407
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:428
msgid "Shift change hours"
msgstr "Schichtwechsel-Stunden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:417
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:438
msgid "Take needed angels from room settings"
msgstr "Übernehme benötigte Engel von den Raum-Einstellungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:423
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:444
msgid "The following angels are needed"
msgstr "Die folgenden Engel werden benötigt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:105
msgid "All Angels"
msgstr "Engelliste"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:32
msgid "This user does not exist."
msgstr "Benutzer existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:100
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73
+msgid "Please select..."
+msgstr "Bitte auswählen..."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
msgid "Yes"
msgstr "Ja"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:75
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
msgid "No"
msgstr "Nein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:91
msgid "Force active"
msgstr "Aktiv erzwingen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:108
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."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:322
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:303
msgid "Edit user"
msgstr "User bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_credits.php:8
-msgid "Credits"
-msgstr "Credits"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:472
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:479
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:430
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:437
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
msgid "Login"
msgstr "Login"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:395
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:355
msgid "Register"
msgstr "Registrieren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:69
msgid "Logout"
msgstr "Logout"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:79
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:527
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:483
msgid "Registration is disabled."
msgstr "Registrierung ist abgeschaltet."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:88
#, 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:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
#, 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:126
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:46
-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:106
+msgid "E-mail address is already used by another user."
+msgstr "Die E-Mail Adresse wurde bereits von einem anderen User benutzt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:126
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:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:138
#, 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:158
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:54
msgid ""
"Please enter your planned date of arrival. It should be after the buildup "
"start date and before teardown end date."
@@ -1575,16 +1562,16 @@ msgstr ""
"Bitte gib Dein geplantes Ankunftsdatum an. Es sollte nach dem Aufbaubeginn "
"und vor dem Abbauende liegen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:190
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:79
msgid "For dect numbers are only 40 digits allowed."
msgstr "Die DECT Nummer darf nur 40 Zeichen lang sein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:242
msgid "Angel registration successful!"
msgstr "Engel-Registrierung erfolgreich!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271
msgid ""
"By completing this form you're registering as a Chaos-Angel. This script "
"will create you an account in the angel task scheduler."
@@ -1592,51 +1579,48 @@ 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:316
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:58
#, 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)"
+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)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:321
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65
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)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:330
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40
msgid "Planned date of arrival"
msgstr "Geplanter Ankunftstag"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:308
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
msgid "Shirt size"
msgstr "T-Shirt Größe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:478
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:735
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:314
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:436
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:804
msgid "Password"
msgstr "Passwort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:345
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:736
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:805
msgid "Confirm password"
msgstr "Passwort wiederholen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:322
msgid "What do you want to do?"
msgstr "Was möchtest Du machen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:353
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:325
msgid "Description of job types"
msgstr "Beschreibung der Aufgaben"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:360
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:332
msgid ""
"Restricted angel types need will be confirmed later by a supporter. You can "
"change your selection in the options section."
@@ -1644,46 +1628,31 @@ msgstr ""
"Beschränkte Engeltypen müssen später von einem Supporter freigeschaltet "
"werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:369
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:341
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53
msgid "Mobile"
msgstr "Handy"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:372
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
-msgid "Phone"
-msgstr "Telefon"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:378
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:37
msgid "First name"
msgstr "Vorname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:381
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
msgid "Last name"
msgstr "Nachname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:386
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
-msgid "Age"
-msgstr "Alter"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:389
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
-msgid "Hometown"
-msgstr "Wohnort"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:392
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:352
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34
msgid "Entry required!"
msgstr "Pflichtfeld!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:442
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:402
msgid "Please enter a password."
msgstr "Gib bitte ein Passwort ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:446
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:406
msgid ""
"No user was found with that Nickname. Please try again. If you are still "
"having problems, ask a Dispatcher."
@@ -1691,88 +1660,88 @@ 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:450
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:410
msgid "Please enter a nickname."
msgstr "Gib bitte einen Nick an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:481
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:439
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
msgid "I forgot my password"
msgstr "Passwort vergessen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:486
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:444
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
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:497
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:455
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:132
msgid "What can I do?"
msgstr "Was kann ich machen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:498
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:456
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:133
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."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:520
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:476
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/user_messages.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:11
msgid "Messages"
msgstr "Nachrichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:49
msgid "Select recipient..."
msgstr "Empfänger auswählen..."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:98
msgid "mark as read"
msgstr "als gelesen markieren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:105
msgid "delete message"
msgstr "Nachricht löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:114
#, php-format
msgid "Hello %s, here can you leave messages for other angels"
msgstr "Hallo %s, hier kannst Du anderen Engeln Nachrichten schreiben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:117
msgid "New"
msgstr "Neu"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:119
msgid "Transmitted"
msgstr "Gesendet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:120
msgid "Recipient"
msgstr "Empfänger"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:154
msgid "Incomplete call, missing Message ID."
msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:144
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:165
msgid "No Message found."
msgstr "Keine Nachricht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:173
msgid "Transmitting was terminated with an Error."
msgstr "Übertragung wurde mit einem Fehler abgebrochen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:178
msgid "Wrong action."
msgstr "Falsche Aktion."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:141
msgid "My shifts"
msgstr "Meine Schichten"
@@ -1781,7 +1750,7 @@ msgid "Key changed."
msgstr "Key geändert."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:582
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:642
msgid "Reset API key"
msgstr "API-Key zurücksetzen"
@@ -1806,66 +1775,70 @@ msgstr "Gib bitte einen Schwänz-Kommentar ein!"
msgid "Shift saved."
msgstr "Schicht gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:11
msgid "News comments"
msgstr "News Kommentare"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:86
msgid "News"
msgstr "News"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:87
msgid "Meetings"
msgstr "Treffen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:119
msgid "Comments"
msgstr "Kommentare"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:229
msgid "Entry saved."
msgstr "Eintrag gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:181
msgid "New Comment:"
msgstr "Neuer Kommentar:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:187
msgid "Invalid request."
msgstr "Ungültige Abfrage."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:268
msgid "Create news:"
msgstr "News anlegen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:40
msgid "Ask the Heaven"
msgstr "Frag den Himmel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:55
msgid "You question was saved."
msgstr "Frage gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:59
msgid "Please enter a question!"
msgstr "Gib eine Frage ein!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:71
msgid "Incomplete call, missing Question ID."
msgstr "Unvollständiger Aufruf, fehlende Fragen ID."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:86
msgid "No question found."
msgstr "Keine Frage gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:570
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:630
msgid "Settings"
msgstr "Einstellungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:68
msgid ""
"Please enter your planned date of departure. It should be after your planned "
"arrival date and after buildup start date and before teardown end date."
@@ -1873,23 +1846,23 @@ msgstr ""
"Bitte gibt dein geplantes Abreisedatum an. Es sollte nach Deinem "
"Anreisedatum, nach dem Aufbaubeginn und vor dem Abbauende liegen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:108
msgid "-> not OK. Please try again."
msgstr "-> Nicht OK. Bitte erneut versuchen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:141
msgid "Theme changed."
msgstr "Aussehen geändert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:101
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:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:120
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:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:134
msgid ""
"The administration has not configured any angeltypes yet - or you are not "
"subscribed to any angeltype."
@@ -1897,70 +1870,70 @@ 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:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:203
msgid "occupied"
msgstr "belegt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:206
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:207
msgid "free"
msgstr "frei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:251
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:252
msgid "Own"
msgstr "Eigene"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:256
msgid "Occupancy"
msgstr "Belegung"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:259
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!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:261
msgid "Description of the jobs."
msgstr "Beschreibung der Aufgaben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:264
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:265
msgid "Filter"
msgstr "Filter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:265
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:266
msgid "Yesterday"
msgstr "Gestern"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:266
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:267
msgid "Today"
msgstr "Heute"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:268
msgid "Tomorrow"
msgstr "Morgen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:269
msgid "last 8h"
msgstr "letzte 8h"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:270
msgid "last 4h"
msgstr "letzte 4h"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:270
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:271
msgid "next 4h"
msgstr "nächste 4h"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:271
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:272
msgid "next 8h"
msgstr "nächste 8h"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:288
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:289
msgid "iCal export"
msgstr "iCal Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:290
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:291
#, php-format
msgid ""
"Export your own shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1971,68 +1944,68 @@ 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:323
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:324
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:48
msgid "All"
msgstr "Alle"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:324
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:325
msgid "None"
msgstr "Keine"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:129
msgid "Admin"
msgstr "Admin"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:151
msgid "Manage rooms"
msgstr "Verwalte Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:326
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:316
msgid "No data found."
msgstr "Nichts gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:452
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:449
msgid "Unconfirmed"
msgstr "Unbestätigt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:36
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:41
msgid "Supporter"
msgstr "Supporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:38
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:43
msgid "Member"
msgstr "Mitglied"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:55
#, php-format
msgid "Do you want to delete angeltype %s?"
msgstr "Möchtest Du den Engeltypen %s löschen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:25
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:56
#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:25
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:27
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:79
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:106
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:135
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:20
msgid "cancel"
msgstr "abbrechen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:89
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:503
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:500
msgid "Restricted"
msgstr "Beschränkt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
msgid ""
"Restricted angel types can only be used by an angel if enabled by a "
"supporter (double opt-in)."
@@ -2040,35 +2013,35 @@ msgstr ""
"Beschränkte Engeltypen müssen von einem Supporter freigeschaltet werden "
"(double-opt-in)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:92
msgid "No Self Sign Up"
msgstr "Kein Selbst-Eintragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:98
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:100
msgid "Requires driver license"
msgstr "Benötigt Führerschein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:104
msgid "Show on dashboard"
msgstr "Auf dem Dashboard anzeigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:111
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:477
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:474
msgid "Contact"
msgstr "Kontakt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:110
msgid "Primary contact person/desk for user questions."
msgstr "Ansprechpartner für Fragen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:140
msgid "my driving license"
msgstr "Meine Führerschein-Infos"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:152
msgid ""
"This angeltype requires a driver license. Please enter your driver license "
"information!"
@@ -2076,7 +2049,7 @@ msgstr ""
"Dieser Engeltyp benötigt Führerschein-Infos. Bitte trage Deine Führerschein-"
"Infos ein!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157
#, php-format
msgid ""
"You are unconfirmed for this angeltype. Please go to the introduction for %s "
@@ -2085,86 +2058,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."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:222
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:219
msgid "confirm"
msgstr "bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:230
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:227
msgid "deny"
msgstr "ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:265
msgid "remove"
msgstr "entfernen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:298
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:295
msgid "Driver"
msgstr "Fahrer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:296
msgid "Has car"
msgstr "Hat Auto"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:300
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:297
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:31
msgid "Car"
msgstr "Auto"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:298
msgid "3,5t Transporter"
msgstr "3,5t Transporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:299
msgid "7,5t Truck"
msgstr "7,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:300
msgid "12,5t Truck"
msgstr "12,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:304
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:301
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:49
msgid "Forklift"
msgstr "Gabelstapler"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:345
msgid "Info"
msgstr "Info"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:416
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:413
msgid "Supporters"
msgstr "Supporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:436
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:433
msgid "Members"
msgstr "Mitglieder"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:444
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:171
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:441
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:154
msgid "Add"
msgstr "Hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:456
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:453
msgid "confirm all"
msgstr "Alle bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:460
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:457
msgid "deny all"
msgstr "Alle ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:497
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:494
msgid "New angeltype"
msgstr "Neuer Engeltyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:504
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:501
msgid "Self Sign Up Allowed"
msgstr "Selbst-Eintragen erlaubt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:505
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:502
msgid "Membership"
msgstr "Mitgliedschaft"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:549
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:546
msgid ""
"This angeltype is restricted by double-opt-in by a team supporter. Please "
"show up at the according introduction meetings."
@@ -2172,11 +2145,11 @@ msgstr ""
"Dieser Engeltyp muss zusätzlich von einem Team-Supporter freigeschaltet "
"werden. Bitte komme zu den entsprechenden Einführungstreffen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:586
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:581
msgid "FAQ"
msgstr "FAQ"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:591
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:586
msgid ""
"Here is the list of teams and their tasks. If you have questions, read the "
"FAQ."
@@ -2184,89 +2157,68 @@ 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/EventConfig_view.php:13
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:27
#, php-format
msgid "Welcome to the %s!"
msgstr "Willkommen beim %s!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:34
msgid "Buildup starts"
msgstr "Aufbau startet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:48
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:84
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:85
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:102
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:26
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:36
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:35
msgid "Y-m-d"
msgstr "d.m.Y"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:42
msgid "Event starts"
msgstr "Event startet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:50
msgid "Event ends"
msgstr "Event endet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:58
msgid "Teardown ends"
msgstr "Abbau endet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:82
-#, php-format
-msgid "%s, from %s to %s"
-msgstr "%s, vom %s bis %s"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92
-#, php-format
-msgid "%s, starting %s"
-msgstr "%s, ab dem %s"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100
-#, php-format
-msgid "Event from %s to %s"
-msgstr "Event von %s bis %s"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:91
msgid "Event Name"
msgstr "Event Name"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:92
msgid "Event Name is shown on the start page."
msgstr "Event Name wird auf der Startseite angezeigt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:93
msgid "Event Welcome Message"
msgstr "Event Willkommens-Nachricht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:96
msgid ""
"Welcome message is shown after successful registration. You can use markdown."
msgstr ""
"Die Willkommens-Nachricht wird nach einer erfolgreichen Registrierung "
"angezeigt. Du kannst Markdown benutzen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:100
msgid "Buildup date"
msgstr "Aufbau Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:101
msgid "Event start date"
msgstr "Event Start Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:104
msgid "Teardown end date"
msgstr "Abbau Ende Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:105
msgid "Event end date"
msgstr "Event Ende Datum"
@@ -2290,11 +2242,11 @@ msgstr "Noch zu schaffende Stunden"
msgid "Fullscreen"
msgstr "Vollbild"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:28
msgid "Open questions"
msgstr "Offene Fragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:46
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:42
msgid "Your Question:"
msgstr "Deine Frage:"
@@ -2302,27 +2254,27 @@ msgstr "Deine Frage:"
msgid "No shifts found."
msgstr "Keine Schichten gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:246
msgid "Time"
msgstr "Zeit"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:314
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:312
msgid "Your shift"
msgstr "Meine Schicht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:315
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:313
msgid "Help needed"
msgstr "Hilfe benötigt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:314
msgid "Other angeltype needed / collides with my shifts"
msgstr "Andere Engeltypen benötigt / kollidiert mit meinen Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:315
msgid "Shift is full"
msgstr "Schicht ist voll"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:318
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:316
msgid "Shift running/ended or user not arrived"
msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen"
@@ -2330,34 +2282,27 @@ msgstr "Schicht läuft/vorbei oder du bist noch nicht angekommen"
msgid "Add more angels"
msgstr "Neue Engel hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:179
-#, 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/view/ShiftCalendarShiftRenderer.php:194
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:84
msgid "Sign up"
msgstr "Eintragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:198
msgid "ended"
msgstr "vorbei"
# Wie ist dies zu verstehen bitte?
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:203
msgid "please arrive for signup"
msgstr "Ankommen zum Eintragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:220
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:218
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:88
#, php-format
msgid "Become %s"
msgstr "Werde ein %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18
#, php-format
msgid "Do you want to sign off %s from shift %s from %s to %s as %s?"
msgstr "Möchtest Du %s von der Schicht %s von %s bis %s als %s austragen?"
@@ -2367,168 +2312,168 @@ msgstr "Möchtest Du %s von der Schicht %s von %s bis %s als %s austragen?"
msgid "Do you want to sign off from your shift %s from %s to %s as %s?"
msgstr "Möchtest du dich von deiner Schicht %s von %s bis %s als %s austragen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:68
msgid "Shift sign off"
msgstr "Von Schicht austragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:89
msgid "Do you want to sign up the following user for this shift?"
msgstr "Möchtest du den folgenden User für die Schicht eintragen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:91
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:116
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:153
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:45
msgid "User"
msgstr "Benutzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:114
#, php-format
msgid "Do you want to sign up the following user for this shift as %s?"
msgstr "Möchtest du den folgenden User als %s in die Schicht eintragen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:138
#, php-format
msgid "Do you want to sign up for this shift as %s?"
msgstr "Möchtest du dich für diese Schicht als %s eintragen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:198
msgid "Comment (for your eyes only):"
msgstr "Kommentar (nur für Dich):"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:151
msgid "Shift signup"
msgstr "Schicht Anmeldung"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:375
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:377
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:402
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:404
msgid "Freeloaded"
msgstr "Geschwänzt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:185
msgid "Freeload comment (Only for shift coordination):"
msgstr "Schwänzer Kommentar (Nur für die Schicht-Koordination):"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:190
msgid "Edit shift entry"
msgstr "Schichteintrag bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:193
msgid "Angel:"
msgstr "Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:194
msgid "Date, Duration:"
msgstr "Termin, Dauer:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:195
msgid "Location:"
msgstr "Ort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:196
msgid "Title:"
msgstr "Titel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:197
msgid "Type:"
msgstr "Typ:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
#, php-format
msgid "Do you want to delete shifttype %s?"
msgstr "Möchtest Du den Schichttypen %s löschen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:54
msgid "Edit shifttype"
msgstr "Schichttyp bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:54
msgid "Create shifttype"
msgstr "Schichttyp erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:79
#, php-format
msgid "for team %s"
msgstr "für Team %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:137
msgid "New shifttype"
msgstr "Neuer Schichttyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:526
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:586
msgid "Location"
msgstr "Ort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:56
#, php-format
msgid "created at %s by %s"
msgstr "erstellt am %s von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:63
#, php-format
msgid "edited at %s by %s"
msgstr "bearbeitet am %s von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:16
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:18
#, php-format
msgid "Do you really want to add supporter rights for %s to %s?"
msgstr "Sollen %s %s als neuen Supporter bekommen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
#, php-format
msgid "Do you really want to remove supporter rights for %s from %s?"
msgstr "Möchtest Du wirklich %s von %s als Supporter befreien?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:47
#, php-format
msgid "Do you really want to deny all users for %s?"
msgstr "Möchtest Du wirklich alle Benutzer als %s ablehnen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:71
#, php-format
msgid "Do you really want to confirm all users for %s?"
msgstr "Möchtest Du wirklich alle Benutzer als %s bestätigen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:92
#, php-format
msgid "Do you really want to confirm %s for %s?"
msgstr "Möchtest Du wirklich %s für %s bestätigen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:116
#, php-format
msgid "Do you really want to delete %s from %s?"
msgstr "Möchtest Du wirklich %s von %s entfernen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:169
#, php-format
msgid "Do you really want to add %s to %s?"
msgstr "Möchtest Du wirklich %s zu %s hinzufügen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:176
msgid "save"
msgstr "Speichern"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:17
msgid "Back to profile"
msgstr "Zurück zum Profil"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21
msgid "Privacy"
msgstr "Privatsphäre"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21
msgid ""
"Your driving license information is only visible for supporters and admins."
msgstr "Deine Führerschein-Infos sind nur für Supporter und Admins sichtbar."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:22
msgid "I am willing to drive a car for the event"
msgstr "Ich möchte für das Event Auto fahren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:27
msgid ""
"I have my own car with me and am willing to use it for the event (You'll get "
"reimbursed for fuel)"
@@ -2536,101 +2481,101 @@ msgstr ""
"Ich habe mein eigenes Auto dabei und möchte würde es zum Fahren für das "
"Event verwenden (Du wirst für Spritkosten entschädigt)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:30
msgid "Driver license"
msgstr "Führerschein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:34
msgid "Transporter 3,5t"
msgstr "3,5t Transporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:39
msgid "Truck 7,5t"
msgstr "7,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:44
msgid "Truck 12,5t"
msgstr "12,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:15
#, php-format
msgid "Do you want to delete the worklog entry for %s?"
msgstr "Möchtest du den Arbeitseinsatz von %s wirklich löschen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:32
msgid "Delete work log entry"
msgstr "Arbeitseinsatz gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:46
msgid "Work date"
msgstr "Einsatzdatum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:47
msgid "Work hours"
msgstr "Arbeitsstunden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:41
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:528
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:588
msgid "Comment"
msgstr "Kommentar"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:94
msgid "Edit work log entry"
msgstr "Arbeitseinsatz bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserWorkLog_view.php:102
msgid "Add work log entry"
msgstr "Arbeitseinsatz hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33
msgid "Here you can change your user details."
msgstr "Hier kannst Du Deine Details ändern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
msgid "Planned date of departure"
msgstr "Geplanter Abreisetag"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
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/view/User_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
msgid "Here you can change your password."
msgstr "Hier kannst Du Dein Passwort ändern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:82
msgid "Old password:"
msgstr "Altes Passwort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
msgid "New password:"
msgstr "Neues Passwort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:84
msgid "Password confirmation:"
msgstr "Passwort wiederholen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
msgid "Here you can choose your color settings:"
msgstr "Hier kannst Du das Aussehen auswählen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
msgid "Color settings:"
msgstr "Aussehen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:93
msgid "Here you can choose your language:"
msgstr "Hier kannst Du Deine Sprache auswählen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:94
msgid "Language:"
msgstr "Sprache:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:113
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
msgid ""
"Do you really want to delete the user including all his shifts and every "
"other piece of his data?"
@@ -2638,145 +2583,150 @@ msgstr ""
"Möchtest Du wirklich den Engel inklusive aller seiner Schichten und allen "
"anderen seiner Daten löschen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:160
msgid "Your password"
msgstr "Dein Passwort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180
#, php-format
msgid "Angel should receive at least %d vouchers."
msgstr "Engel sollte mindestens %d Gutscheine bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:185
msgid "Number of vouchers given out"
msgstr "Anzahl Gutscheine bekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:228
msgid "m/d/Y h:i a"
msgstr "d.m.Y H:i"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:248
msgid "New user"
msgstr "Neuer User"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:252
msgid "Prename"
msgstr "Vorname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:242
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:647
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:255
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:711
msgid "Arrived"
msgstr "Angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:256
msgid "Voucher"
msgstr "Gutschein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:257
msgid "Freeloads"
msgstr "Schwänzereien"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:681
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:258
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:748
msgid "Active"
msgstr "Aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:247
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:684
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:260
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:751
msgid "T-Shirt"
msgstr "T-Shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:262
msgid "Last login"
msgstr "Letzter Login"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:283
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:295
msgid "Free"
msgstr "Frei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:291
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:295
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:307
#, php-format
msgid "Next shift %c"
msgstr "Nächste Schicht %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:302
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:314
#, php-format
msgid "Shift started %c"
msgstr "Schicht startete %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:307
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:319
#, php-format
msgid "Shift ends %c"
msgstr "Schicht endet %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:394
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:336
+#, php-format
+msgid "Shift ended %c"
+msgstr "Schicht endete %c"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:421
msgid "sign off"
msgstr "abmelden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:433
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:477
msgid "Sum:"
msgstr "Summe:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:442
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:486
msgid "Your t-shirt score"
msgstr "Dein T-Shirt Score"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:480
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:527
msgid "Work log entry"
msgstr "Arbeitseinsatz"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:483
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:530
#, php-format
msgid "Added by %s at %s"
msgstr "Erstellt von %s am %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:524
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:584
msgid "Day &amp; time"
msgstr "Tag &amp; Zeit"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:525
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:585
msgid "Duration"
msgstr "Dauer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:527
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:587
msgid "Name &amp; workmates"
msgstr "Name &amp; Kollegen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:529
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:589
msgid "Action"
msgstr "Aktion"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:532
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:592
msgid "You have done enough to get a t-shirt."
msgstr "Du hast genug für ein T-Shirt gemacht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:551
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:611
msgid "driving license"
msgstr "Führerschein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:562
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:622
msgid "Edit vouchers"
msgstr "Gutschein bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:566
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:626
msgid "Add work log"
msgstr "Neuer Arbeitseinsatz"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:574
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:634
msgid "iCal Export"
msgstr "iCal Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:578
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:638
msgid "JSON Export"
msgstr "JSON Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:598
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:659
#, php-format
msgid "Your night shifts between %d and %d am count twice."
msgstr "Deine Nachtschichten zwischen %d und %d Uhr zählen doppelt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:603
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:667
#, php-format
msgid ""
"Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2785,44 +2735,37 @@ 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:629
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:693
msgid "User state"
msgstr "Engelzustand"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:649
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:713
msgid "Not arrived"
msgstr "Nicht angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:668
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:732
msgid "Freeloader"
msgstr "Schwänzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:675
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:740
#, php-format
msgid "Arrived at %s"
msgstr "Angekommen am %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:679
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:746
msgid "Active (forced)"
msgstr "Aktiv (gezwungen)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:688
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:757
#, php-format
msgid "Not arrived (Planned: %s)"
msgstr "Nicht angekommen (Geplant: %s)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:696
-#, php-format
-msgid "Got %s voucher"
-msgid_plural "Got %s vouchers"
-msgstr[0] "Einen Gutschein bekommen"
-msgstr[1] "%s Gutscheine bekommen"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:701
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:770
msgid "Got no vouchers"
msgstr "Gutschein nicht bekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:716
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:785
msgid ""
"We will send you an e-mail with a password recovery link. Please use the "
"email address you used for registration."
@@ -2831,19 +2774,19 @@ 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:719
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:788
msgid "Recover"
msgstr "Wiederherstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:733
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:802
msgid "Please enter a new password."
msgstr "Gib bitte ein neues Passwort ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:776
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:846
msgid "Rights"
msgstr "Rechte"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:825
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:897
msgid ""
"Please enter your planned date of departure on your settings page to give us "
"a feeling for teardown capacities."
@@ -2851,7 +2794,7 @@ msgstr ""
"Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
"Planung bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:841
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:911
#, php-format
msgid ""
"You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -2860,7 +2803,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/view/User_view.php:863
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:930
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."
@@ -2868,11 +2811,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/view/User_view.php:878
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:943
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/view/User_view.php:893
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:957
msgid ""
"You need to specify a DECT phone number in your settings! If you don't have "
"a DECT phone, just enter '-'."
@@ -2880,14 +2823,74 @@ msgstr ""
"Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
"keine Nummer hast, bitte einfach \"-\" angeben."
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:218
-msgid "Page not found"
-msgstr "Seite nicht gefunden"
+#~ msgid "There is %d unconfirmed angeltype."
+#~ msgid_plural "There are %d unconfirmed angeltypes."
+#~ msgstr[0] "Es gibt %d nicht freigeschalteten Engeltypen!"
+#~ msgstr[1] "Es gibt %d nicht freigeschaltete Engeltypen!"
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:219
-msgid ""
-"This page could not be found or you don't have permission to view it. You "
-"probably have to sign in or register in order to gain access!"
-msgstr ""
-"Diese Seite existiert nicht oder Du hast keinen Zugriff. Melde Dich an um Zugriff "
-"zu erhalten!"
+#~ msgid "Hi %s,"
+#~ msgstr "Hallo %s,"
+
+#~ msgid "here is a message for you from the %s:"
+#~ msgstr "hier ist eine Nachricht aus dem %s für Dich:"
+
+#~ 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."
+
+#~ msgid "Needed shirts"
+#~ msgstr "Benötigte T-Shirts"
+
+#~ msgid "Only confirmed"
+#~ msgstr "Nur bestätigte"
+
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
+
+#~ msgid "Credits"
+#~ msgstr "Credits"
+
+#~ msgid "Please check your jabber account information."
+#~ msgstr "Bitte überprüfe deine Jabber Account Eingabe."
+
+#~ msgid "Phone"
+#~ msgstr "Telefon"
+
+#~ msgid "Age"
+#~ msgstr "Alter"
+
+#~ msgid "Hometown"
+#~ msgstr "Wohnort"
+
+#~ msgid "%s, from %s to %s"
+#~ msgstr "%s, vom %s bis %s"
+
+#~ msgid "%s, starting %s"
+#~ msgstr "%s, ab dem %s"
+
+#~ msgid "Event from %s to %s"
+#~ msgstr "Event von %s bis %s"
+
+#~ msgid "%d helper needed"
+#~ msgid_plural "%d helpers needed"
+#~ msgstr[0] "%d Helfer benötigt"
+#~ msgstr[1] "%d Helfer benötigt"
+
+#~ msgid "Got %s voucher"
+#~ msgid_plural "Got %s vouchers"
+#~ msgstr[0] "Einen Gutschein bekommen"
+#~ msgstr[1] "%s Gutscheine bekommen"
+
+#~ msgid "Page not found"
+#~ msgstr "Seite nicht gefunden"
+
+#~ msgid ""
+#~ "This page could not be found or you don't have permission to view it. You "
+#~ "probably have to sign in or register in order to gain access!"
+#~ msgstr ""
+#~ "Diese Seite existiert nicht oder Du hast keinen Zugriff. Melde Dich an um "
+#~ "Zugriff zu erhalten!"