summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-11-24 12:01:19 +0100
committermsquare <msquare@notrademark.de>2017-11-24 12:01:19 +0100
commit928e707015fa5b9b3e2dd52c9493552ae1218911 (patch)
treeef7e9f297b9f3581361279cda45e46d0778b58c2
parentd8476f244dd0ee1bccaab53f123fa12f2a9c9501 (diff)
add shift calendar to angeltype view
-rw-r--r--includes/controller/angeltypes_controller.php61
-rw-r--r--includes/model/Room_model.php11
-rw-r--r--includes/model/Shifts_model.php25
-rw-r--r--includes/sys_template.php26
-rw-r--r--includes/view/AngelTypes_view.php111
-rw-r--r--includes/view/Rooms_view.php5
-rw-r--r--includes/view/ShiftCalendarRenderer.php2
-rw-r--r--includes/view/ShiftsFilterRenderer.php10
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/default.mobin40950 -> 41242 bytes
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/default.po1732
-rw-r--r--public/js/sticky-headers.js4
11 files changed, 1098 insertions, 889 deletions
diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php
index eaaa9c0f..5c3bd859 100644
--- a/includes/controller/angeltypes_controller.php
+++ b/includes/controller/angeltypes_controller.php
@@ -1,5 +1,7 @@
<?php
+use Engelsystem\ShiftsFilter;
+use Engelsystem\ShiftsFilterRenderer;
/**
* Text for Angeltype related links.
*
@@ -182,6 +184,14 @@ function angeltype_controller()
$user_angeltype = UserAngelType_by_User_and_AngelType($user, $angeltype);
$user_driver_license = UserDriverLicense($user['UID']);
$members = Users_by_angeltype($angeltype);
+
+ $days = angeltype_controller_shiftsFilterDays($angeltype);
+ $shiftsFilter = angeltype_controller_shiftsFilter($angeltype, $days);
+
+ $shiftsFilterRenderer = new ShiftsFilterRenderer($shiftsFilter);
+ $shiftsFilterRenderer->enableDaySelection($days);
+
+ $shiftCalendarRenderer = shiftCalendarRendererByShiftFilter($shiftsFilter);
return [
sprintf(_('Team %s'), $angeltype['name']),
@@ -193,12 +203,61 @@ function angeltype_controller()
in_array('admin_angel_types', $privileges),
$user_angeltype['supporter'],
$user_driver_license,
- $user
+ $user,
+ $shiftsFilterRenderer,
+ $shiftCalendarRenderer
)
];
}
/**
+ * On which days do shifts for this angeltype occur? Needed for shiftCalendar.
+ *
+ * @param Angeltype $angeltype
+ * @return array
+ */
+function angeltype_controller_shiftsFilterDays($angeltype) {
+ $all_shifts = Shifts_by_angeltype($angeltype);
+ $days = [];
+ foreach ($all_shifts as $shift) {
+ $day = date('Y-m-d', $shift['start']);
+ if (!in_array($day, $days)) {
+ $days[] = $day;
+ }
+ }
+ return $days;
+}
+
+/**
+ * Sets up the shift filter for the angeltype.
+ *
+ * @param Angeltype $angeltype
+ * @param array $days
+ * @return ShiftsFilter
+ */
+function angeltype_controller_shiftsFilter($angeltype, $days) {
+ global $privileges;
+
+ $request = request();
+ $shiftsFilter = new ShiftsFilter(
+ in_array('user_shifts_admin', $privileges),
+ Room_ids(),
+ [$angeltype['id']]
+ );
+ $selected_day = date('Y-m-d');
+ if (!empty($days)) {
+ $selected_day = $days[0];
+ }
+ if ($request->has('shifts_filter_day')) {
+ $selected_day = $request->input('shifts_filter_day');
+ }
+ $shiftsFilter->setStartTime(parse_date('Y-m-d H:i', $selected_day . ' 00:00'));
+ $shiftsFilter->setEndTime(parse_date('Y-m-d H:i', $selected_day . ' 23:59'));
+
+ return $shiftsFilter;
+}
+
+/**
* View a list of all angeltypes.
*
* @return array
diff --git a/includes/model/Room_model.php b/includes/model/Room_model.php
index 8425e5ad..74a08be4 100644
--- a/includes/model/Room_model.php
+++ b/includes/model/Room_model.php
@@ -14,6 +14,17 @@ function Rooms($show_all = false)
}
/**
+ * Returns Room id array
+ *
+ * @return array
+ */
+function Room_ids()
+{
+ $result = DB::select('SELECT `RID` FROM `Room`');
+ return select_array($result, 'RID', 'RID');
+}
+
+/**
* Delete a room
*
* @param int $room_id
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index ef02aaab..8a1b69f9 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -5,6 +5,29 @@ use Engelsystem\ShiftsFilter;
use Engelsystem\ShiftSignupState;
/**
+ * @param array $angeltype
+ * @return array
+ */
+function Shifts_by_angeltype($angeltype) {
+ return DB::select('
+ SELECT DISTINCT `Shifts`.* FROM `Shifts`
+ JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id` = `Shifts`.`SID`
+ WHERE `NeededAngelTypes`.`angel_type_id` = ?
+ AND `NeededAngelTypes`.`count` > 0
+ AND `Shifts`.`PSID` IS NULL
+
+ UNION
+
+ SELECT DISTINCT `Shifts`.* FROM `Shifts`
+ JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`room_id` = `Shifts`.`RID`
+ WHERE `NeededAngelTypes`.`angel_type_id` = ?
+ AND `NeededAngelTypes`.`count` > 0
+ AND NOT `Shifts`.`PSID` IS NULL
+ ', [$angeltype['id'], $angeltype['id']]);
+}
+
+
+/**
* @param array $room
* @return array
*/
@@ -24,7 +47,7 @@ function Shifts_by_ShiftsFilter(ShiftsFilter $shiftsFilter)
FROM `Shifts`
JOIN `Room` USING (`RID`)
JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id`
- JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id`=`Shifts`.`SID`
+ JOIN `NeededAngelTypes` ON `NeededAngelTypes`.`shift_id` = `Shifts`.`SID`
WHERE `Shifts`.`RID` IN (' . implode(',', $shiftsFilter->getRooms()) . ')
AND `start` BETWEEN ? AND ?
AND `NeededAngelTypes`.`angel_type_id` IN (' . implode(',', $shiftsFilter->getTypes()) . ')
diff --git a/includes/sys_template.php b/includes/sys_template.php
index 662283b1..96290062 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -1,6 +1,32 @@
<?php
/**
+ * Renders tabs from the array. Array key is tab name, array value is tab content.
+ *
+ * @param array $tabs
+ * @return string HTML
+ */
+function tabs($tabs)
+{
+ $tab_header = [];
+ $tab_content = [];
+ foreach($tabs as $header => $content) {
+ $class = '';
+ if(count($tab_header) == 0) {
+ $class = 'active';
+ }
+ $tab_header[] = '<li role="presentation" class="' . $class . '">
+ <a href="#' . $header . '" aria-controls="' . $header . '" role="tab" data-toggle="tab">'
+ . $header . '</a></li>';
+ $tab_content[] = '<div role="tabpanel" class="tab-pane ' . $class . '" id="' . $header . '">' . $content . '</div>';
+ }
+ return div('', [
+ '<ul class="nav nav-tabs" role="tablist">' . join($tab_header) . '</ul>',
+ '<div class="tab-content">' . join($tab_content) . '</div>'
+ ]);
+}
+
+/**
* Display muted (grey) text.
*
* @param string $text
diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php
index 6e70b3be..e42321af 100644
--- a/includes/view/AngelTypes_view.php
+++ b/includes/view/AngelTypes_view.php
@@ -1,5 +1,7 @@
<?php
+use Engelsystem\ShiftsFilterRenderer;
+use Engelsystem\ShiftCalendarRenderer;
/**
* AngelTypes
*/
@@ -320,36 +322,86 @@ function AngelType_view(
$admin_angeltypes,
$supporter,
$user_driver_license,
- $user
+ $user,
+ ShiftsFilterRenderer $shiftsFilterRenderer,
+ ShiftCalendarRenderer $shiftCalendarRenderer
) {
- $page = [
+ return page_with_title(sprintf(_('Team %s'), $angeltype['name']), [
AngelType_view_buttons($angeltype, $user_angeltype, $admin_angeltypes, $supporter, $user_driver_license, $user),
- msg()
- ];
+ msg(),
+ tabs([
+ _('Info') => AngelType_view_info(
+ $angeltype,
+ $members,
+ $admin_user_angeltypes,
+ $admin_angeltypes,
+ $supporter
+ ),
+ _('Shifts') => AngelType_view_shifts(
+ $angeltype,
+ $shiftsFilterRenderer,
+ $shiftCalendarRenderer
+ )
+ ])
+ ]);
+}
+/**
+ * @param Angeltype $angeltype
+ * @param ShiftsFilterRenderer $shiftsFilterRenderer
+ * @param ShiftCalendarRenderer $shiftCalendarRenderer
+ * @return string HTML
+ */
+function AngelType_view_shifts($angeltype, $shiftsFilterRenderer, $shiftCalendarRenderer)
+{
+ $shifts = $shiftsFilterRenderer->render(page_link_to('angeltypes', [
+ 'action' => 'view',
+ 'angeltype_id' => $angeltype['id']
+ ]));
+ $shifts .= $shiftCalendarRenderer->render();
+
+ return div('first', $shifts);
+}
+
+/**
+ * @param Angeltype $angeltype
+ * @param array $members
+ * @param bool $admin_user_angeltypes
+ * @param bool $admin_angeltypes
+ * @param bool $supporter
+ * @return string HTML
+ */
+function AngelType_view_info(
+ $angeltype,
+ $members,
+ $admin_user_angeltypes,
+ $admin_angeltypes,
+ $supporter
+) {
+ $info = [];
if(AngelType_has_contact_info($angeltype)) {
- $page[] = AngelTypes_render_contact_info($angeltype);
+ $info[] = AngelTypes_render_contact_info($angeltype);
}
- $page[] = '<h3>' . _('Description') . '</h3>';
+ $info[] = '<h3>' . _('Description') . '</h3>';
$parsedown = new Parsedown();
if ($angeltype['description'] != '') {
- $page[] = '<div class="well">' . $parsedown->parse($angeltype['description']) . '</div>';
+ $info[] = '<div class="well">' . $parsedown->parse($angeltype['description']) . '</div>';
}
-
+
list($supporters, $members_confirmed, $members_unconfirmed) = AngelType_view_members(
$angeltype,
$members,
$admin_user_angeltypes,
$admin_angeltypes
- );
+ );
$table_headers = AngelType_view_table_headers($angeltype, $supporter, $admin_angeltypes);
-
+
if (count($supporters) > 0) {
- $page[] = '<h3>' . _('supporters') . '</h3>';
- $page[] = table($table_headers, $supporters);
+ $info[] = '<h3>' . _('supporters') . '</h3>';
+ $info[] = table($table_headers, $supporters);
}
-
+
if (count($members_confirmed) > 0) {
$members_confirmed[] = [
'Nick' => _('Sum'),
@@ -357,7 +409,7 @@ function AngelType_view(
'actions' => ''
];
}
-
+
if (count($members_unconfirmed) > 0) {
$members_unconfirmed[] = [
'Nick' => _('Sum'),
@@ -365,40 +417,40 @@ function AngelType_view(
'actions' => ''
];
}
-
- $page[] = '<h3>' . _('Members') . '</h3>';
+
+ $info[] = '<h3>' . _('Members') . '</h3>';
if ($admin_user_angeltypes) {
- $page[] = buttons([
+ $info[] = buttons([
button(
page_link_to(
'user_angeltypes',
['action' => 'add', 'angeltype_id' => $angeltype['id']]
- ),
+ ),
_('Add'),
'add'
- )
+ )
]);
}
- $page[] = table($table_headers, $members_confirmed);
-
+ $info[] = table($table_headers, $members_confirmed);
+
if ($admin_user_angeltypes && $angeltype['restricted'] && count($members_unconfirmed) > 0) {
- $page[] = '<h3>' . _('Unconfirmed') . '</h3>';
- $page[] = buttons([
+ $info[] = '<h3>' . _('Unconfirmed') . '</h3>';
+ $info[] = buttons([
button(
page_link_to('user_angeltypes', ['action' => 'confirm_all', 'angeltype_id' => $angeltype['id']]),
_('confirm all'),
'ok'
- ),
+ ),
button(
page_link_to('user_angeltypes', ['action' => 'delete_all', 'angeltype_id' => $angeltype['id']]),
_('deny all'),
'cancel'
- )
+ )
]);
- $page[] = table($table_headers, $members_unconfirmed);
+ $info[] = table($table_headers, $members_unconfirmed);
}
-
- return page_with_title(sprintf(_('Team %s'), $angeltype['name']), $page);
+
+ return join($info);
}
/**
@@ -407,7 +459,8 @@ function AngelType_view(
* @param Anteltype $angeltype
* @return string HTML
*/
-function AngelTypes_render_contact_info($angeltype) {
+function AngelTypes_render_contact_info($angeltype)
+{
return heading(_('Contact'), 3) . description([
_('Name') => $angeltype['contact_name'],
_('DECT') => $angeltype['contact_dect'],
diff --git a/includes/view/Rooms_view.php b/includes/view/Rooms_view.php
index adb58a9a..bd6138e1 100644
--- a/includes/view/Rooms_view.php
+++ b/includes/view/Rooms_view.php
@@ -19,7 +19,10 @@ function Room_view($room, ShiftsFilterRenderer $shiftsFilterRenderer, ShiftCalen
}
return page_with_title(glyph('map-marker') . $room['Name'], [
- $shiftsFilterRenderer->render($room),
+ $shiftsFilterRenderer->render(page_link_to('rooms', [
+ 'action' => 'view',
+ 'room_id' => $room['RID']
+ ])),
$assignNotice,
$shiftCalendarRenderer->render()
]);
diff --git a/includes/view/ShiftCalendarRenderer.php b/includes/view/ShiftCalendarRenderer.php
index d2becb58..354d0336 100644
--- a/includes/view/ShiftCalendarRenderer.php
+++ b/includes/view/ShiftCalendarRenderer.php
@@ -143,7 +143,7 @@ class ShiftCalendarRenderer
public function render()
{
if (count($this->lanes) == 0) {
- return '';
+ return info(_('No shifts found.'), true);
}
return div('shift-calendar', [
$this->renderTimeLane(),
diff --git a/includes/view/ShiftsFilterRenderer.php b/includes/view/ShiftsFilterRenderer.php
index c3e0ccf1..27c6240a 100644
--- a/includes/view/ShiftsFilterRenderer.php
+++ b/includes/view/ShiftsFilterRenderer.php
@@ -39,21 +39,17 @@ class ShiftsFilterRenderer
/**
* Renders the filter.
*
- * @param array $room
+ * @param string $page_link Link pointing to the actual page.
* @return string Generated HTML
*/
- public function render($room)
+ public function render($page_link)
{
$toolbar = [];
if ($this->daySelectionEnabled && !empty($this->days)) {
$selected_day = date('Y-m-d', $this->shiftsFilter->getStartTime());
$day_dropdown_items = [];
foreach ($this->days as $day) {
- $link = page_link_to('rooms', [
- 'action' => 'view',
- 'room_id' => $room['RID'],
- 'shifts_filter_day' => $day,
- ]);
+ $link = $page_link . '&shifts_filter_day=' . $day;
$day_dropdown_items[] = toolbar_item_link($link, '', $day);
}
$toolbar[] = toolbar_dropdown('', $selected_day, $day_dropdown_items, 'active');
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 9d15f46a..bfe3aa42 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
Binary files differ
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index 28e9d534..c8319882 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Engelsystem 2.0\n"
-"POT-Creation-Date: 2016-12-23 16:23+0100\n"
-"PO-Revision-Date: 2016-12-23 16:24+0100\n"
+"POT-Creation-Date: 2017-11-24 11:59+0100\n"
+"PO-Revision-Date: 2017-11-24 12:00+0100\n"
"Last-Translator: msquare <msquare@notrademark.de>\n"
"Language-Team: \n"
"Language: de_DE\n"
@@ -17,149 +17,146 @@ msgstr ""
"X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n"
"X-Poedit-SearchPath-1: .\n"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:356
+#: /Users/msquare/workspace/projects/engelsystem/config/config.default.php:111
+msgid "Please select..."
+msgstr "Bitte auswählen..."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:228
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:520
msgid "Angeltypes"
msgstr "Engeltypen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:53
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:377
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:265
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:326
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:503
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:486
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:586
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:130
msgid "Teams/Job description"
msgstr "Team-/Aufgabenbeschreibung"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:88
#, php-format
msgid "Angeltype %s deleted."
msgstr "Engeltyp %s gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:50
#, php-format
msgid "Delete angeltype %s"
msgstr "Lösche Engeltyp %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:136
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:141
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:165
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:75
#, php-format
msgid "Edit %s"
msgstr "%s bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:329
#, php-format
msgid "Team %s"
msgstr "Team %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:353
msgid "view"
msgstr "ansehen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:185
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:16
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:277
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:328
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:287
+#: /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_rooms.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:163
+#: /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:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:358
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:445
msgid "edit"
msgstr "bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:186
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:178
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:120
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:45
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:5
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:12
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:16
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:68
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:57
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
+#: /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/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:99
msgid "delete"
msgstr "löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:288
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:303
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:522
msgid "leave"
msgstr "verlassen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:290
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:528
msgid "join"
msgstr "mitmachen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:220
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:119
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:235
-msgid "Angeltype doesn't exist."
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:346
+msgid "Angeltype doesn't exist . "
msgstr "Engeltyp existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:8
msgid "Event config"
msgstr "Event Einstellungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:57
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:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:61
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:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:65
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:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:69
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:66
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:75
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:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:80
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:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:85
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:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:90
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:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/event_config_controller.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:93
msgid "Settings saved."
msgstr "Einstellungen gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:96
msgid ""
"You are not allowed to sign up for this shift. Maybe shift is full or "
"already running."
@@ -167,153 +164,153 @@ msgstr ""
"Du darfst Dich nicht für diese Schicht eintragen. Vielleicht ist die Schicht "
"voll oder sie läuft bereits."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:168
msgid "You are subscribed. Thank you!"
msgstr "Du bist eingetragen. Danke!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:102
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:10
msgid "My shifts"
msgstr "Meine Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:111
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:485
msgid "Freeloader"
msgstr "Schwänzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:162
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:284
msgid "Shift entry deleted."
msgstr "Schicht-Eintrag gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:164
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:286
msgid "Entry not found."
msgstr "Eintrag nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:94
msgid "Please select a room."
msgstr "Bitte einen Raum auswählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:101
msgid "Please select a shifttype."
msgstr "Bitte einen Schichttyp wählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:108
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:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:115
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:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:120
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:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:133
#, 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:120
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:161
msgid "Shift updated."
msgstr "Schicht aktualisiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:179
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:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:319
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:371
msgid "Shifttype"
msgstr "Schichttyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:138
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:157
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:166
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:320
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:189
+#: /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_shifts.php:372
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:105
msgid "Title"
msgstr "Titel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:183
msgid "Room:"
msgstr "Raum:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:184
msgid "Start:"
msgstr "Start:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:185
msgid "End:"
msgstr "Ende:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:142
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:270
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:334
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:297
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:395
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:131
msgid "Needed angels"
msgstr "Benötigte Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:144
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:54
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:157
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:272
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:44
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:76
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:122
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:39
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:56
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:70
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:402
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:257
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:150
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:47
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:45
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:48
+#: /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:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:578
msgid "Save"
msgstr "Speichern"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:172
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:226
msgid "Shift deleted."
msgstr "Schicht gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:232
#, 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:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifts_controller.php:261
msgid "Shift could not be found."
msgstr "Schicht konnte nicht gefunden werden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:34
#, php-format
msgid "Shifttype %s deleted."
msgstr "Schichttyp %s gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:36
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:22
#, php-format
msgid "Delete shifttype %s"
msgstr "Lösche Schichttyp %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:58
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:62
msgid "Shifttype not found."
msgstr "Schichttyp nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:90
msgid "Please enter a name."
msgstr "Gib bitte einen Namen an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:96
msgid "Updated shifttype."
msgstr "Schichttyp geändert."
@@ -321,151 +318,161 @@ msgstr "Schichttyp geändert."
msgid "Created shifttype."
msgstr "Schichttyp erstellt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/shifttypes_controller.php:160
msgid "Shifttypes"
msgstr "Schichttypen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:19
+#: /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:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:28
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:40
+#: /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:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:201
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:268
+msgid "Angeltype doesn't exist."
+msgstr "Engeltyp existiert nicht."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:54
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:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:62
#, 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:53
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:47
msgid "Deny all users"
msgstr "Alle Benutzer ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:107
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:113
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:158
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:216
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:229
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:262
msgid "User angeltype doesn't exist."
msgstr "Benutzer-Engeltype existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:100
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:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:108
#, 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:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:77
msgid "Confirm all users"
msgstr "Alle Benutzer bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:146
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:130
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:176
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:241
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:309
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:207
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:274
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:407
msgid "User doesn't exist."
msgstr "Benutzer existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:165
#, 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:146
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:173
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:101
msgid "Confirm angeltype for user"
msgstr "Engeltyp für Benutzer bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:212
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:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:219
#, 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:199
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:130
msgid "Remove angeltype"
msgstr "Engeltyp löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:211
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:244
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:223
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256
msgid "No supporter update given."
msgstr "Kein Update für Supporterrechte gegeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:282
#, 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:248
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:282
#, 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:256
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:250
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:12
msgid "Add supporter rights"
msgstr "Supporterrechte geben"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:256
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:147
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:233
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:12
msgid "Remove supporter rights"
msgstr "Supporterrechte entfernen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:289
+#: /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:299
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:348
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:162
msgid "Add user to angeltype"
msgstr "Benutzer zu Engeltyp hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:312
+#: /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:319
+#: /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:332
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_angeltypes_controller.php:389
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:186
#, php-format
msgid "Become a %s"
msgstr "Werde ein %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:24
#, php-format
msgid ""
"You joined an angeltype which requires a driving license. Please edit your "
@@ -474,128 +481,128 @@ 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:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:25
msgid "driving license information"
msgstr "Führerschein-Infos"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:131
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:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:134
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:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:139
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:127
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/user_driver_licenses_controller.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:13
#, php-format
msgid "Edit %s driving license information"
msgstr "Bearbeite die Führerschein-Infos von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:61
msgid "You cannot delete yourself."
msgstr "Du kannst Dich nicht selber löschen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:59
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:315
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:439
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:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:82
msgid "User deleted."
msgstr "Engel gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145
#, php-format
msgid "Delete %s"
msgstr "%s löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160
msgid "Please enter a valid number of vouchers."
msgstr "Bitte gib eine korrekte Anzahl von Vouchern ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168
msgid "Saved the number of vouchers."
msgstr "Anzahl der Voucher gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:169
#, php-format
msgid "%s's vouchers"
msgstr "Voucher von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194
msgid "User not found."
msgstr "Benutzer nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:203
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:228
msgid "All users"
msgstr "Alle Benutzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:291
msgid "Token is not correct."
msgstr "Der Token ist nicht in Ordnung."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:224
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:102
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:304
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:142
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:116
msgid "Your passwords don't match."
msgstr "Deine Passwörter stimmen nicht überein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:228
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:308
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:114
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:233
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:313
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
msgid "Password saved."
msgstr "Passwort gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:254
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:258
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:338
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:31
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:262
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:35
msgid "Please enter your e-mail."
msgstr "Bitte gib Deine E-Mail-Adresse ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:292
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:353
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:389
msgid "Password recovery"
msgstr "Passwort wiederherstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:267
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:355
#, 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:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:359
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:12
+#: /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:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:21
msgid "here is a message for you from the engelsystem:"
msgstr "hier ist eine Nachricht aus dem Engelsystem für Dich:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/helper/email_helper.php:23
msgid ""
"This email is autogenerated and has not to be signed. You got this email "
"because you are registered in the engelsystem."
@@ -604,72 +611,72 @@ msgstr ""
"werden. Du hast diese E-Mail bekommen, weil Du im Engelsystem registriert "
"bist."
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:15
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:14
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:19
#, 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:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:24
#, 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:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:30
#, 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:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:39
#, 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:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:47
#, 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:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:57
msgid "The updated Shift:"
msgstr "Die aktualisierte Schicht:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:66
msgid "Your Shift has changed"
msgstr "Deine Schicht hat sich geändert"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:79
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:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:88
msgid "Your Shift was deleted"
msgstr "Deine Schicht wurde gelöscht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:105
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:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:111
msgid "Assigned to Shift"
msgstr "In Schicht eingetragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:122
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:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/shifts_mailer.php:128
msgid "Removed from Shift"
msgstr "Von Schicht ausgetragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:7
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:11
msgid "Your account has been deleted"
msgstr "Dein Konto wurde gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:7
+#: /Users/msquare/workspace/projects/engelsystem/includes/mailer/users_mailer.php:12
msgid ""
"Your angelsystem account has been deleted. If you have any questions "
"regarding your account deletion, please contact heaven."
@@ -677,11 +684,11 @@ msgstr ""
"Dein Engelsystem-Konto wurde gelöscht. Wenn Du dazu Fragen hast, kontaktiere "
"bitte den Himmel."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:10
msgid "Active angels"
msgstr "Aktive Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:42
#, php-format
msgid ""
"At least %s angels are forced to be active. The number has to be greater."
@@ -689,374 +696,382 @@ msgstr ""
"Mindestens %s Engel werden als aktiv gekennzeichnet. Die Nummer muss größer "
"sein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:49
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:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:83
msgid "Marked angels."
msgstr "Engel wurden markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:61
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:137
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:266
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:172
msgid "back"
msgstr "zurück"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:92
msgid "apply"
msgstr "anwenden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:103
msgid "Angel has been marked as active."
msgstr "Engel wurde als aktiv markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:103
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:23
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:135
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:56
msgid "Angel not found."
msgstr "Engel nicht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:113
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:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:123
msgid "Angel has got a t-shirt."
msgstr "Engel hat ein T-Shirt bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:133
msgid "Angel has got no t-shirt."
msgstr "Engel hat kein T-Shirt bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:191
msgid "set active"
msgstr "setze aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:208
msgid "remove active"
msgstr "entferne aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:211
msgid "got t-shirt"
msgstr "hat t-shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:223
msgid "remove t-shirt"
msgstr "entferne t-shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:170
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:259
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:221
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:229
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165
+#: /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:407
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:415
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:218
msgid "Sum"
msgstr "Summe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:266
msgid "Search angel:"
msgstr "Suche Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:267
msgid "Show all shifts"
msgstr "Alle Schichten anzeigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:179
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:141
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:142
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:78
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:23
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:268
+#: /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
msgid "Search"
msgstr "Suche"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:271
msgid "How much angels should be active?"
msgstr "Wie viele Engel sollten aktiv sein?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:183
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:254
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:272
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:281
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:408
msgid "Preview"
msgstr "Vorschau"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:187
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:276
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:175
msgid "Nickname"
msgstr "Nick"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:198
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:277
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:287
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:244
msgid "Size"
msgstr "Größe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:6
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:364
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:278
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:11
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:340
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:528
msgid "Shifts"
msgstr "Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:190
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:329
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:279
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:381
msgid "Length"
msgstr "Länge"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:280
msgid "Active?"
msgstr "Aktiv?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:192
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:281
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:242
msgid "Forced"
msgstr "Gezwungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:282
msgid "T-shirt?"
msgstr "T-Shirt?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:196
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:285
msgid "Shirt statistics"
msgstr "T-Shirt Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:288
msgid "Needed shirts"
msgstr "Benötigte T-Shirts"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:200
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:289
msgid "Given shirts"
msgstr "Ausgegebene T-Shirts"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:10
msgid "Arrived angels"
msgstr "Angekommene Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:37
msgid "Reset done. Angel has not arrived."
msgstr "Zurückgesetzt. Engel ist nicht angekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:53
msgid "Angel has been marked as arrived."
msgstr "Engel wurde als angekommen markiert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:9
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:20
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:31
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:142
msgid "yes"
msgstr "Ja"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:98
msgid "reset"
msgstr "zurücksetzen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:171
+#: /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/view/User_view.php:330
+#: /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:453
msgid "arrived"
msgstr "angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:176
msgid "Planned arrival"
msgstr "Geplanter Ankunftstag"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:177
msgid "Arrived?"
msgstr "Angekommen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:148
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178
msgid "Arrival date"
msgstr "Ankunftsdatum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:149
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179
msgid "Planned departure"
msgstr "Geplante Abreise"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
msgid "Planned arrival statistics"
msgstr "Geplante Ankunfts-Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:157
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:172
#: /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
msgid "arrived sum"
msgstr "Summe angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:163
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:178
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:193
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:30
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:76
+#: /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:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:116
msgid "Date"
msgstr "Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:179
#: /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 "Count"
msgstr "Anzahl"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:199
msgid "Arrival statistics"
msgstr "Ankunfts-Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:214
msgid "Planned departure statistics"
msgstr "Geplante Abreise-Statistik"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:10
msgid "Free angels"
msgstr "Freie Engel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:81
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:36
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:172
msgid "Angeltype"
msgstr "Engeltyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:84
+#: /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:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:225
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:354
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:190
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:97
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
+#: /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:478
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:285
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:298
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:234
msgid "Nick"
msgstr "Nick"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:94
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:255
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:178
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:191
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:184
+#: /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:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:286
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:299
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:466
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:237
msgid "DECT"
msgstr "DECT"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:264
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
+#: /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:96
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:228
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:386
+#: /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:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:467
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:559
msgid "E-Mail"
msgstr "E-Mail"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:10
msgid "Grouprights"
msgstr "Gruppenrechte"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:29
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:144
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:148
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:143
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:189
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:268
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:35
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:78
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:176
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:193
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:465
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:489
+#: /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:236
msgid "Name"
msgstr "Name"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:52
msgid "Privileges"
msgstr "Privilegien"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:97
msgid "Edit group"
msgstr "Gruppe bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:144
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:194
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:242
msgid "Frab import"
msgstr "Frab Import"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:25
+#: /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:53
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:117
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:195
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:53
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:59
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:234
+#: /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:60
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:124
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:202
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:241
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:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:248
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:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:86
msgid "No valid xml/xcal file provided."
msgstr "Keine valide xml/xcal Datei hochgeladen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:91
msgid "File upload went wrong."
msgstr "Das Hochladen der Datei ist schiefgegangen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:84
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:95
msgid "Please provide some data."
msgstr "Bitte lade eine Datei hoch."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:285
msgid "File Upload"
msgstr "Datei hochladen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:287
msgid "Validation"
msgstr "Überprüfen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:92
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:101
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:139
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:178
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:252
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:210
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:289
msgid "Import"
msgstr "Importieren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:116
msgid ""
"This import will create/update/delete rooms and shifts by given FRAB-export "
"file. The needed file format is xcal."
@@ -1064,381 +1079,387 @@ 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:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:119
msgid "Add minutes to start"
msgstr "Minuten vor Talk-Beginn hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:120
msgid "Add minutes to end"
msgstr "Minuten nach Talk-Ende hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:100
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:121
msgid "xcal-File (.xcal)"
msgstr "xcal-Datei (.xcal)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:110
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:223
msgid "Missing import file."
msgstr "Import-Datei nicht vorhanden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:175
msgid "Rooms to create"
msgstr "Anzulegende Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:147
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:179
msgid "Rooms to delete"
msgstr "Zu löschende Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:183
msgid "Shifts to create"
msgstr "Anzulegende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:153
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:162
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:171
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:366
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:185
+#: /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/view/User_view.php:530
msgid "Day"
msgstr "Tag"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:154
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:163
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:172
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:324
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:186
+#: /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_shifts.php:376
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:109
msgid "Start"
msgstr "Beginn"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:155
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:164
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:173
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:325
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:187
+#: /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_shifts.php:377
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:117
msgid "End"
msgstr "Ende"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:156
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:165
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:174
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:188
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:197
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:206
msgid "Shift type"
msgstr "Schichttyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:158
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:167
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:176
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:373
msgid "Room"
msgstr "Raum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:160
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:192
msgid "Shifts to update"
msgstr "Zu aktualisierende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:201
msgid "Shifts to delete"
msgstr "Zu löschende Schichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:253
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:290
msgid "It's done!"
msgstr "Erledigt!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:8
msgid "Log"
msgstr "Log"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:17
msgid "Edit news entry"
msgstr "News-Eintrag bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:36
msgid "Author"
msgstr "Autor"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:32
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:37
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:254
msgid "Subject"
msgstr "Betreff"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:33
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:79
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:106
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:162
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:255
msgid "Message"
msgstr "Nachricht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:163
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:256
msgid "Meeting"
msgstr "Treffen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:38
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:177
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:227
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156
msgid "Delete"
msgstr "löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:52
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:78
msgid "News entry updated."
msgstr "News-Eintrag gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:85
msgid "News entry deleted."
msgstr "News-Eintrag gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:10
msgid "Answer questions"
msgstr "Fragen beantworten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:27
msgid "There are unanswered questions!"
msgstr "Es gibt unbeantwortete Fragen!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:83
msgid "Unanswered questions"
msgstr "Unbeantwortete Fragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:63
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:70
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:92
msgid "From"
msgstr "Von"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:64
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:71
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:19
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:86
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:34
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:39
msgid "Question"
msgstr "Frage"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:65
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:73
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:87
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:41
msgid "Answer"
msgstr "Antwort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:68
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:37
msgid "Answered questions"
msgstr "Beantwortete Fragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:94
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:40
msgid "Answered by"
msgstr "Antwort von"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:172
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:219
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:210
msgid "Rooms"
msgstr "Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:86
msgid "This name is already in use."
msgstr "Dieser Name ist bereits vergeben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:120
#, php-format
msgid "Please enter needed angels for type %s."
msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:174
msgid "Room saved."
msgstr "Raum gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:145
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:191
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:195
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:243
msgid "Public"
msgstr "Öffentlich"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:146
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:196
msgid "Room number"
msgstr "Raumnummer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:151
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:201
msgid "Needed angels:"
msgstr "Benötigte Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:167
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:215
#, php-format
msgid "Room %s deleted."
msgstr "Raum %s gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:175
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:223
#, php-format
msgid "Do you want to delete room %s?"
msgstr "Möchest Du den Raum %s wirklich löschen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:185
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:237
msgid "add"
msgstr "Neu"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:10
msgid "Create shifts"
msgstr "Schichten erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:80
msgid "Please select a location."
msgstr "Bitte einen Ort auswählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:87
msgid "Please select a start time."
msgstr "Bitte eine Startzeit auswählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:94
msgid "Please select an end time."
msgstr "Bitte eine Endzeit auswählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:99
msgid "The shifts end has to be after its start."
msgstr "Die Endzeit muss nach der Startzeit liegen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:111
msgid "Please enter a shift duration in minutes."
msgstr "Gib bitte eine Schichtlänge in Minuten ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:122
msgid "Please split the shift-change hours by colons."
msgstr "Trenne die Schichtwechselstunden mit einem Komma."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:127
msgid "Please select a mode."
msgstr "Bitte einen Modus auswählen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:140
#, php-format
msgid "Please check the needed angels for team %s."
msgstr "Bitte gib die Anzahl der benötigten Engel vom Team %s an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:146
msgid "There are 0 angels needed. Please enter the amounts of needed angels."
msgstr "Es werden 0 Engel benötigt. Bitte ändere das."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:150
msgid "Please select a mode for needed angels."
msgstr "Bitte wähle einen Modus für benötigte Engel."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:154
msgid "Please select needed angels."
msgstr "Bitte wähle benötigte Engel."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:268
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:295
msgid "Time and location"
msgstr "Zeit und Ort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:296
msgid "Type and title"
msgstr "Typ und Titel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:326
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:378
msgid "Mode"
msgstr "Modus"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:327
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:379
msgid "Create one shift"
msgstr "Eine Schicht erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:328
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:380
msgid "Create multiple shifts"
msgstr "Mehrere Schichten erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:330
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:384
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:331
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:390
msgid "Shift change hours"
msgstr "Schichtwechsel-Stunden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:335
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:398
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:336
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:402
msgid "The following angels are needed"
msgstr "Die folgenden Engel werden benötigt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:10
msgid "All Angels"
msgstr "Engelliste"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:20
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:38
msgid "This user does not exist."
msgstr "Benutzer existiert nicht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:46
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
msgid "Yes"
msgstr "Ja"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:47
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:85
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
msgid "No"
msgstr "Nein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:88
msgid "Force active"
msgstr "Aktiv erzwingen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:107
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:204
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:313
msgid "Edit user"
msgstr "User bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_credits.php:3
+#: /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:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:349
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:356
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:95
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:99
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:473
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:480
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
msgid "Login"
msgstr "Login"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:285
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:396
msgid "Register"
msgstr "Registrieren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:26
msgid "Logout"
msgstr "Logout"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:528
+msgid "Registration is disabled."
+msgstr "Registrierung ist abgeschaltet."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
#, 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:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:98
#, 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:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36
+#: /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:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:135
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:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:147
#, 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:115
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:52
+#: /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
msgid ""
"Please enter your planned date of arrival. It should be after the buildup "
"start date and before teardown end date."
@@ -1446,11 +1467,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:189
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:190
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:85
+msgid "For dect numbers are only 5 digits allowed."
+msgstr "Die DECT Nummer darf nur 5 Zeichen lang sein."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:274
msgid "Angel registration successful!"
msgstr "Engel-Registrierung erfolgreich!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:217
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:302
msgid ""
"By completing this form you're registering as a Chaos-Angel. This script "
"will create you an account in the angel task scheduler."
@@ -1458,50 +1484,50 @@ 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:229
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:316
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
msgid ""
"The engelsystem is allowed to send me an email (e.g. when my shifts change)"
msgstr ""
"Das Engelsystem darf mir E-Mails senden (z.B. wenn sich meine Schichten "
"ändern)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:230
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:321
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:60
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 Voucher)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:330
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:36
msgid "Planned date of arrival"
msgstr "Geplanter Ankunftstag"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:238
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:336
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:67
msgid "Shirt size"
msgstr "T-Shirt Größe"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:243
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:355
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:98
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:400
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:342
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:479
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:576
msgid "Password"
msgstr "Passwort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:246
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:401
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:345
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:577
msgid "Confirm password"
msgstr "Passwort wiederholen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:350
msgid "What do you want to do?"
msgstr "Was möchtest Du machen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:249
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:353
msgid "Description of job types"
msgstr "Beschreibung der Aufgaben"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:250
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:360
msgid ""
"Restricted angel types need will be confirmed later by a supporter. You can "
"change your selection in the options section."
@@ -1509,46 +1535,46 @@ 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:258
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:369
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:51
msgid "Mobile"
msgstr "Handy"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:261
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46
+#: /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:267
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:378
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:33
msgid "First name"
msgstr "Vorname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:270
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:381
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32
msgid "Last name"
msgstr "Nachname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:275
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:45
+#: /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:278
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:53
+#: /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:281
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:392
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30
msgid "Entry required!"
msgstr "Pflichtfeld!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:319
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:443
msgid "Please enter a password."
msgstr "Gib bitte ein Passwort ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:323
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:447
msgid ""
"No user was found with that Nickname. Please try again. If you are still "
"having problems, ask a Dispatcher."
@@ -1556,100 +1582,96 @@ 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:327
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:451
msgid "Please enter a nickname."
msgstr "Gib bitte einen Nick an."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:358
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:482
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
msgid "I forgot my password"
msgstr "Passwort vergessen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:363
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:487
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:123
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:374
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:498
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:127
msgid "What can I do?"
msgstr "Was kann ich machen?"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:375
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:499
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:128
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:390
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:521
msgid "Please sign up, if you want to help us!"
msgstr "Bitte registriere Dich, wenn Du helfen möchtest!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:397
-msgid "Registration is disabled."
-msgstr "Registrierung ist abgeschaltet."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:10
msgid "Messages"
msgstr "Nachrichten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:47
msgid "Select recipient..."
msgstr "Empfänger auswählen..."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:96
msgid "mark as read"
msgstr "als gelesen markieren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:65
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:103
msgid "delete message"
msgstr "Nachricht löschen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:112
#, 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:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:115
msgid "New"
msgstr "Neu"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:117
msgid "Transmitted"
msgstr "Gesendet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:78
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:118
msgid "Recipient"
msgstr "Empfänger"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:90
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:152
msgid "Incomplete call, missing Message ID."
msgstr "Unvollständiger Aufruf, fehlende Nachrichten ID."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:98
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:114
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:163
msgid "No Message found."
msgstr "Keine Nachricht gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:122
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:172
msgid "Transmitting was terminated with an Error."
msgstr "Übertragung wurde mit einem Fehler abgebrochen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:177
msgid "Wrong action."
msgstr "Falsche Aktion."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:23
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:39
msgid "Key changed."
msgstr "Key geändert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:26
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:335
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:470
msgid "Reset API key"
msgstr "API-Key zurücksetzen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:44
msgid ""
"If you reset the key, the url to your iCal- and JSON-export and your atom "
"feed changes! You have to update it in every application using one of these "
@@ -1658,23 +1680,23 @@ msgstr ""
"Wenn du den API-Key zurücksetzt, ändert sich die URL zu deinem iCal-, JSON-"
"Export und Atom Feed! Du musst diesen überall ändern, wo er in Benutzung ist."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:47
msgid "Continue"
msgstr "Fortfahren"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:60
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:86
msgid "Please enter a freeload comment!"
msgstr "Gib bitte einen Schwänz-Kommentar ein!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:108
msgid "Shift saved."
msgstr "Schicht gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:158
msgid "Shift canceled."
msgstr "Schichteintrag gelöscht."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_myshifts.php:160
msgid ""
"It's too late to sign yourself off the shift. If neccessary, ask the "
"dispatcher to do so."
@@ -1682,70 +1704,66 @@ msgstr ""
"Es ist zu spät um Dich aus der Schicht auszutragen. Wenn notwendig, frage "
"einen Dispatcher dafür."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:4
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:10
msgid "News comments"
msgstr "News Kommentare"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:8
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:18
msgid "News"
msgstr "News"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:12
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:26
msgid "Meetings"
msgstr "Treffen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:103
msgid "Comments"
msgstr "Kommentare"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:86
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:144
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:212
msgid "Entry saved."
msgstr "Eintrag gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:104
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:165
msgid "New Comment:"
msgstr "Neuer Kommentar:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:171
msgid "Invalid request."
msgstr "Ungültige Abfrage."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:251
msgid "Create news:"
msgstr "News anlegen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:44
msgid "Ask the Heaven"
msgstr "Frag den Himmel"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:27
-msgid "Unable to save question."
-msgstr "Konnte Frage nicht speichern."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:53
msgid "You question was saved."
msgstr "Frage gespeichert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:57
msgid "Please enter a question!"
msgstr "Gib eine Frage ein!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:41
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:65
msgid "Incomplete call, missing Question ID."
msgstr "Unvollständiger Aufruf, fehlende Fragen ID."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_questions.php:80
msgid "No question found."
msgstr "Keine Frage gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:4
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:332
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:459
msgid "Settings"
msgstr "Einstellungen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72
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."
@@ -1753,27 +1771,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:92
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
msgid "-> not OK. Please try again."
msgstr "-> Nicht OK. Bitte erneut versuchen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:100
-msgid "Failed setting password."
-msgstr "Konnte Passwort nicht speichern."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:154
msgid "Theme changed."
msgstr "Aussehen geändert."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:98
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:95
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:117
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:105
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:131
msgid ""
"The administration has not configured any angeltypes yet - or you are not "
"subscribed to any angeltype."
@@ -1781,34 +1795,34 @@ 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:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:197
msgid "occupied"
msgstr "belegt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:158
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:201
msgid "free"
msgstr "frei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:230
msgid "Occupancy"
msgstr "Belegung"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:233
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:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:235
msgid "Description of the jobs."
msgstr "Beschreibung der Aufgaben."
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:239
msgid "iCal export"
msgstr "iCal Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:240
#, php-format
msgid ""
"Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1819,76 +1833,79 @@ 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:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:245
msgid "Filter"
msgstr "Filter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:204
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:278
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:49
msgid "All"
msgstr "Alle"
-#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:205
+#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:279
msgid "None"
msgstr "Keine"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:139
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:168
msgid "Admin"
msgstr "Admin"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:161
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:192
msgid "Manage rooms"
msgstr "Verwalte Räume"
-#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:292
msgid "No data found."
msgstr "Nichts gefunden."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:27
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:244
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:437
msgid "Unconfirmed"
msgstr "Unbestätigt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:29
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:33
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:37
msgid "supporter"
msgstr "Supporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:31
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:35
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:39
msgid "Member"
msgstr "Mitglied"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:42
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:51
#, 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:44
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:15
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:41
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:52
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:53
+#: /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:56
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:192
msgid "cancel"
msgstr "abbrechen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:269
+#: /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:490
msgid "Restricted"
msgstr "Beschränkt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:89
msgid "No Self Sign Up"
msgstr "Kein Selbst-Eintragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:91
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:94
msgid "Requires driver license"
msgstr "Benötigt Führerschein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:99
msgid ""
"Restricted angel types can only be used by an angel if enabled by a "
"supporter (double opt-in)."
@@ -1896,24 +1913,33 @@ msgstr ""
"Beschränkte Engeltypen müssen von einem Supporter freigeschaltet werden "
"(double-opt-in)."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:74
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:205
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:37
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:58
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:93
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:386
+#: /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:135
msgid "Description"
msgstr "Beschreibung"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:75
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:102
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:64
msgid "Please use markdown for the description."
msgstr "Bitte benutze Markdown für die Beschreibung."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:90
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:103
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:464
+msgid "Contact"
+msgstr "Kontakt"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:106
+msgid "Primary contact person/desk for user questions."
+msgstr "Ansprechpartner für Fragen."
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:134
msgid "my driving license"
msgstr "Meine Führerschein-Infos"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:145
msgid ""
"This angeltype requires a driver license. Please enter your driver license "
"information!"
@@ -1921,7 +1947,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:101
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:150
#, php-format
msgid ""
"You are unconfirmed for this angeltype. Please go to the introduction for %s "
@@ -1930,82 +1956,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:140
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:211
msgid "confirm"
msgstr "bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:141
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:219
msgid "deny"
msgstr "ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:257
msgid "remove"
msgstr "entfernen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:179
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:287
msgid "Driver"
msgstr "Fahrer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:180
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:288
msgid "Has car"
msgstr "Hat Auto"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:181
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:289
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:29
msgid "Car"
msgstr "Auto"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:290
msgid "3,5t Transporter"
msgstr "3,5t Transporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:183
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:291
msgid "7,5t Truck"
msgstr "7,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:184
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:292
msgid "12,5t Truck"
msgstr "12,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:185
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:293
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:45
msgid "Forklift"
msgstr "Gabelstapler"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:215
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:333
+msgid "Info"
+msgstr "Info"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:401
msgid "supporters"
msgstr "Supporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:235
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:421
msgid "Members"
msgstr "Mitglieder"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:238
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:429
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:174
msgid "Add"
msgstr "Hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:246
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:441
msgid "confirm all"
msgstr "Alle bestätigen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:247
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:446
msgid "deny all"
msgstr "Alle ablehnen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:264
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:484
msgid "New angeltype"
msgstr "Neuer Engeltyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:270
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:491
msgid "Self Sign Up Allowed"
msgstr "Kein Selbst-Eintragen erlaubt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:271
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:492
msgid "Membership"
msgstr "Mitgliedschaft"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:296
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:537
msgid ""
"This angeltype is restricted by double-opt-in by a team supporter. Please "
"show up at the according introduction meetings."
@@ -2013,11 +2043,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:317
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:574
msgid "FAQ"
msgstr "FAQ"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:319
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:579
msgid ""
"Here is the list of teams and their tasks. If you have questions, read the "
"FAQ."
@@ -2025,289 +2055,295 @@ 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:10
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:18
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:22
#, php-format
msgid "Welcome to the %s!"
msgstr "Willkommen beim %s!"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:30
msgid "Buildup starts"
msgstr "Aufbau startet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:26
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:34
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:42
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:50
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:67
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:72
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:69
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:77
+#: /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:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:97
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:98
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:111
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:119
msgid "Y-m-d"
msgstr "d.m.Y"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:38
msgid "Event starts"
msgstr "Event startet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:40
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:46
msgid "Event ends"
msgstr "Event endet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:54
msgid "Teardown ends"
msgstr "Abbau endet"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:67
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:78
#, php-format
msgid "%s, from %s to %s"
msgstr "%s, vom %s bis %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:88
#, php-format
msgid "%s, starting %s"
msgstr "%s, ab dem %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:77
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:96
#, php-format
msgid "Event from %s to %s"
msgstr "Event von %s bis %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:106
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:134
msgid "Event Name"
msgstr "Event Name"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:135
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:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:136
msgid "Event Welcome Message"
msgstr "Event Willkommens-Nachricht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:109
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:137
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:112
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:140
msgid "Buildup date"
msgstr "Aufbau Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:141
msgid "Event start date"
msgstr "Event Start Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:116
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:144
msgid "Teardown end date"
msgstr "Abbau Ende Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:117
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/EventConfig_view.php:145
msgid "Event end date"
msgstr "Event Ende Datum"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
msgid "Open questions"
msgstr "Offene Fragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:46
msgid "Your Question:"
msgstr "Deine Frage:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:200
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:367
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:146
+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/User_view.php:531
msgid "Time"
msgstr "Zeit"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:239
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:304
msgid "Your shift"
msgstr "Meine Schicht"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:240
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:305
msgid "Help needed"
msgstr "Hilfe benötigt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:306
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:242
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:307
msgid "Shift is full"
msgstr "Schicht ist voll"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarRenderer.php:308
msgid "Shift running/ended"
msgstr "Schicht läuft/vorbei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:82
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:130
msgid "Add more angels"
msgstr "Neue Engel hinzufügen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:113
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:166
#, 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:118
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:181
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:46
msgid "Sign up"
msgstr "Eintragen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:123
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:187
msgid "ended"
msgstr "vorbei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:132
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftCalendarShiftRenderer.php:199
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:51
#, php-format
msgid "Become %s"
msgstr "Werde ein %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:18
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:267
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:269
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:31
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:346
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:348
msgid "Freeloaded"
msgstr "Geschwänzt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:19
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32
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:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:35
msgid "Edit shift entry"
msgstr "Schichteintrag bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:25
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:38
msgid "Angel:"
msgstr "Engel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:39
msgid "Date, Duration:"
msgstr "Termin, Dauer:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:27
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:40
msgid "Location:"
msgstr "Ort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:41
msgid "Title:"
msgstr "Titel:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:42
msgid "Type:"
msgstr "Typ:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:43
msgid "Comment (for your eyes only):"
msgstr "Kommentar (nur für Dich):"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:13
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:23
#, 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:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
msgid "Edit shifttype"
msgstr "Schichttyp bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:55
msgid "Create shifttype"
msgstr "Schichttyp erstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:48
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:80
#, php-format
msgid "for team %s"
msgstr "für Team %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:75
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftTypes_view.php:138
msgid "New shifttype"
msgstr "Neuer Schichttyp"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:7
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:14
#, php-format
msgid "created at %s by %s"
msgstr "erstellt am %s von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:10
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:21
#, php-format
msgid "edited at %s by %s"
msgstr "bearbeitet am %s von %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:53
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:92
msgid "This shift collides with one of your shifts."
msgstr "Diese Schicht kollidiert mit deinen Schichten."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:54
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:95
msgid "You are signed up for this shift."
msgstr "Du bist für diese Schicht eingetragen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:83
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:368
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/Shifts_view.php:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:532
msgid "Location"
msgstr "Ort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:6
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:16
#, 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:6
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:17
#, 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:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:49
#, 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:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:79
#, 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:39
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:103
#, 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:50
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:132
#, 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:71
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:173
msgid "User"
msgstr "Benutzer"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:80
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:188
#, 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:83
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:200
msgid "save"
msgstr "Speichern"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:17
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:15
msgid "Back to profile"
msgstr "Zurück zum Profil"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:19
msgid "Privacy"
msgstr "Privatsphäre"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:21
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:19
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:22
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:20
msgid "I am willing to drive a car for the event"
msgstr "Ich möchte für das Event Auto fahren"
@@ -2316,78 +2352,74 @@ msgid ""
"I have my own car with me and am willing to use it for the event (You'll get "
"reimbursed for fuel)"
msgstr ""
-"Ich habe mein eigenes Auto dabei und möchte würde es zum Fahren für das Event "
-"verwenden (Du wirst für Spritkosten entschädigt)"
+"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:26
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:28
msgid "Driver license"
msgstr "Führerschein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:32
msgid "Transporter 3,5t"
msgstr "3,5t Transporter"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:29
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:37
msgid "Truck 7,5t"
msgstr "7,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserDriverLicenses_view.php:42
msgid "Truck 12,5t"
msgstr "12,5t LKW"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:7
-msgid "Please select..."
-msgstr "Bitte auswählen..."
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:38
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:29
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:44
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43
msgid "Planned date of departure"
msgstr "Geplanter Abreisetag"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:55
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:71
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:61
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:77
msgid "Here you can change your password."
msgstr "Hier kannst Du Dein Passwort ändern."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:78
msgid "Old password:"
msgstr "Altes Passwort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:63
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
msgid "New password:"
msgstr "Neues Passwort:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:64
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:80
msgid "Password confirmation:"
msgstr "Passwort wiederholen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:84
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:69
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:85
msgid "Color settings:"
msgstr "Aussehen:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
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:74
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
msgid "Language:"
msgstr "Sprache:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:108
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:151
msgid ""
"Do you really want to delete the user including all his shifts and every "
"other piece of his data?"
@@ -2395,152 +2427,152 @@ 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:128
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:155
msgid "Your password"
msgstr "Dein Passwort"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:143
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174
#, php-format
msgid "Angel should receive at least %d vouchers."
msgstr "Engel sollte mindestens %d Voucher bekommen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177
msgid "Number of vouchers given out"
msgstr "Anzahl Voucher bekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:159
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:212
msgid "m/d/Y h:i a"
msgstr "d.m.Y H:i"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:231
msgid "New user"
msgstr "Neuer User"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:235
msgid "Prename"
msgstr "Vorname"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:185
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:238
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:502
msgid "Arrived"
msgstr "Angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:186
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
msgid "Voucher"
msgstr "Voucher"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:187
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:240
msgid "Freeloads"
msgstr "Schwänzereien"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:188
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:352
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:241
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:516
msgid "Active"
msgstr "Aktiv"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:190
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:353
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:243
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:517
msgid "T-Shirt"
msgstr "T-Shirt"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:192
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:245
msgid "Last login"
msgstr "Letzter Login"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:275
msgid "Free"
msgstr "Frei"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:214
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:282
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:284
#, php-format
msgid "Next shift %c"
msgstr "Nächste Schicht %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:221
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:289
#, php-format
msgid "Shift starts %c"
msgstr "Schicht startet %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:223
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:291
#, php-format
msgid "Shift ends %c"
msgstr "Schicht endet %c"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:280
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:375
msgid "sign off"
msgstr "abmelden"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:305
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:408
msgid "Sum:"
msgstr "Summe:"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:329
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:449
msgid "driving license"
msgstr "Führerschein"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:331
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:457
msgid "Edit vouchers"
msgstr "Voucher bearbeiten"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:333
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:462
msgid "iCal Export"
msgstr "iCal Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:334
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:466
msgid "JSON Export"
msgstr "JSON Export"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:347
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:483
msgid "User state"
msgstr "Engelzustand"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:494
#, php-format
msgid "Arrived at %s"
msgstr "Angekommen am %s"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:497
#, php-format
msgid "Not arrived (Planned: %s)"
msgstr "Nicht angekommen (Geplant: %s)"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:350
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:503
msgid "Not arrived"
msgstr "Nicht angekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:351
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:510
#, php-format
msgid "Got %s voucher"
msgid_plural "Got %s vouchers"
msgstr[0] "Einen Voucher bekommen"
msgstr[1] "%s Voucher bekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:351
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:514
msgid "Got no vouchers"
msgstr "Voucher nicht bekommen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:360
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:524
msgid "Rights"
msgstr "Rechte"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:369
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:533
msgid "Name &amp; workmates"
msgstr "Name &amp; Kollegen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:370
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:534
msgid "Comment"
msgstr "Kommentar"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:371
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:535
msgid "Action"
msgstr "Aktion"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:373
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:537
msgid "Your night shifts between 2 and 8 am count twice."
msgstr "Deine Nachtschichten zwischen 2 und 8 Uhr zählen doppelt."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:374
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:540
#, php-format
msgid ""
"Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -2549,7 +2581,7 @@ msgstr ""
"Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
"einzutragen."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:384
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:557
msgid ""
"We will send you an e-mail with a password recovery link. Please use the "
"email address you used for registration."
@@ -2558,15 +2590,15 @@ 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:387
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:560
msgid "Recover"
msgstr "Wiederherstellen"
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:398
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:574
msgid "Please enter a new password."
msgstr "Gib bitte ein neues Passwort ein."
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:447
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:659
msgid ""
"Please enter your planned date of departure on your settings page to give us "
"a feeling for teardown capacities."
@@ -2574,7 +2606,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:457
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:675
#, php-format
msgid ""
"You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@@ -2583,7 +2615,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:468
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:693
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."
@@ -2591,30 +2623,36 @@ 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:478
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:707
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:488
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:722
msgid ""
"You need to specify a DECT phone number in your settings! If you don't have "
-"a DECT phone, just enter \"-\"."
+"a DECT phone, just enter '-'."
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:155
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:206
msgid "No Access"
msgstr "Kein Zugriff"
-#: /Users/msquare/workspace/projects/engelsystem/public/index.php:156
+#: /Users/msquare/workspace/projects/engelsystem/public/index.php:207
msgid ""
-"You don't have permission to view this page. You probably have to sign in or "
-"register in order to gain access!"
+"You don't have permission to view this page . You probably have to sign in "
+"or register in order to gain access!"
msgstr ""
"Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
"bitte ein, um Zugriff zu erhalten!"
+#~ msgid "Unable to save question."
+#~ msgstr "Konnte Frage nicht speichern."
+
+#~ msgid "Failed setting password."
+#~ msgstr "Konnte Passwort nicht speichern."
+
#~ msgid "Please enter your planned date of arrival."
#~ msgstr "Bitte gib Dein geplantes Ankunftsdatum an."
diff --git a/public/js/sticky-headers.js b/public/js/sticky-headers.js
index 60f294b3..6e6a75e2 100644
--- a/public/js/sticky-headers.js
+++ b/public/js/sticky-headers.js
@@ -6,8 +6,6 @@ $(document).ready(function () {
var timeLanes = $(".shift-calendar .time");
var headers = $(".shift-calendar .header");
var topReference = $(".container-fluid .row");
- var top = headers.offset().top;
- var left = 15;
timeLanes.css({
"position": "relative",
"z-index": 999
@@ -18,6 +16,8 @@ $(document).ready(function () {
});
$(window).scroll(
function () {
+ var top = headers.parent().offset().top;
+ var left = 15;
timeLanes.css({
"left": Math.max(0, $(window).scrollLeft() - left) + "px"
});